raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

9694 Commits

Author SHA1 Message Date
luisramos0
7fa9b4699c Add products_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
Maikel
0da6275d41 Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3 
Rails 4 prep continued
 2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2 
Rails 4 prep: admin dashboard route
 2020-01-16 14:16:32 +11:00
Luis Ramos
0432c73f19 Merge pull request #4510 from luisramos0/backend_ctrl_resource 
Bring spree_backend resource controller to OFN
 2020-01-15 22:22:24 +00:00
Matt-Yorkley
103902c006 Replace deprecated arguments in #find_by 
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')

       ActiveRecord::StatementInvalid:
         PG::UndefinedColumn: ERROR:  column enterprises.select does not exist
         LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
         : SELECT  "enterprises".* FROM "enterprises"  WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
       # ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
       # ./app/models/product_import/spreadsheet_data.rb:43:in `each'
 2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1 Explicitly require Spree::Admin::BaseHelper 
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
 2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7 Explicitly require Spree::Admin::NavigationHelper 
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
 2020-01-15 13:07:46 +01:00
Matt-Yorkley
d511763733 Replace deprecated #in? method 2020-01-15 12:57:38 +01:00
Matt-Yorkley
d4311a848e Fix default_scope deprecated syntax 2020-01-15 12:57:38 +01:00
Luis Ramos
3bf38b7c08 Merge pull request #4549 from luisramos0/arelize_order_permissions 
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
 2020-01-14 14:24:34 +00:00
Luis Ramos
3080eb9dfd Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api 
Removing duplicate API method soft_delete for both products and variants
 2020-01-14 11:32:10 +00:00
Luis Ramos
f87a553230 Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0 
Bump rubocop from 0.68.1 to 0.79.0
 2020-01-13 19:35:50 +00:00
Luis Ramos
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture 
Use asynchronous requests for order capture and ship actions
 2020-01-13 17:14:40 +00:00
Matt-Yorkley
94afc70ea7 Refactor conditionals in contact tab view 2020-01-13 17:14:22 +01:00
Matt-Yorkley
d14d6fe865 Refactor open order cycle checks 2020-01-13 17:11:27 +01:00
Matt-Yorkley
0546acd6f9 Refactor #shop_tabs use and remove #first_visible_tab 2020-01-13 17:05:28 +01:00
Matt-Yorkley
aedaec8365 Improve layout of orders closed message 2020-01-13 17:05:28 +01:00
Matt-Yorkley
d508e7772c Fix angular templates bug 
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
 2020-01-13 17:05:28 +01:00
Matt-Yorkley
43eef0c8c6 Adjust layout for fullwidth enterprise image 2020-01-13 17:05:28 +01:00
Matt-Yorkley
e658893e70 Fix ancient display bug where the order cycle selection popover shows over the top of the floating navigtion bar 2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9 Move "orders closed" message to "shop" tab and adjust "home" tab message display logic 2020-01-13 17:05:28 +01:00
Matt-Yorkley
56223bb960 Improve about tab mobile and tablet display 2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99 Always keep one shop tab open (don't toggle closed) 2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f Change row nesting to fix product list layout display issues 2020-01-13 17:05:28 +01:00
Matt-Yorkley
c8c4f3e746 Improve mobile display 2020-01-13 17:05:28 +01:00
Matt-Yorkley
219f6ad78e Select first visible tab on page load if none are specified in the URL 2020-01-13 17:05:27 +01:00
Matt-Yorkley
48f329a716 Rework layout and CSS 2020-01-13 17:05:26 +01:00
Luis Ramos
516398fbd6 Merge pull request #4638 from luisramos0/fix_cart_s2 
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
 2020-01-13 14:16:56 +00:00
Luis Ramos
4a1b74c136 Merge pull request #4634 from luisramos0/remove_dead_code 
Remove some dead code
 2020-01-13 11:09:04 +00:00
luisramos0
5fccd5fe58 Add rubocop exception for application controller class length and fix one line length issue 2020-01-12 19:42:07 +00:00
Matt-Yorkley
b9edea7c0e Rename 'admin/overview#index' route from :admin to :admin_dashboard 
Fixes issues with route declarations in Rails 4
 2020-01-12 13:11:33 +01:00
Maikel Linke
abcfb5ce8d Update Rubocop config for new version 
- A couple of cops moved into a different namespace.
- The target ruby version doesn't have to be specified, it's read from
  .ruby-version which has been updated to Ruby 2.3.
- Some files were missing in the todo lists.
 2020-01-10 08:59:44 +11:00
Luis Ramos
02dec1d6cd Merge pull request #4649 from tomekr/4623-remove-additional-footeer-links 
Remove duplicate footer links
 2020-01-09 18:04:30 +00:00
Luis Ramos
df04c837a5 Merge pull request #4631 from Matt-Yorkley/oc_buttons 
Increase space for buttons in savebar layout
 2020-01-09 17:56:01 +00:00
Matt-Yorkley
14bcba081d Adapt shopfront_helper to show/hide panels and display new tabs 2020-01-08 14:50:27 +01:00
Matt-Yorkley
fa0b365b28 Move "shop messages" and product list from main view into new "Home" and "Shop" tabs 2020-01-08 13:26:21 +01:00
Matt-Yorkley
673c587c3b Move tab templates to their own directory for clarity 2020-01-08 13:26:21 +01:00
Luis Ramos
18e5f9ba64 Merge pull request #4647 from jeduardo824/remove-groups-tab 
remove group link from shop menu when there are no groups
 2020-01-08 11:44:51 +00:00
Luis Ramos
e9a5b889de Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428 
Select by default single Hub/Shop option on creation of payment/shipping method
 2020-01-08 11:44:16 +00:00
Eduardo
c45a3c2303 remove group tabs from shop view when there are no groups 2020-01-07 11:24:46 -03:00
Maikel Linke
3204d0b37c Remove unused presenter 
The usage of this presenter got removed seven years ago:
c5d031a6d7
 2020-01-07 17:30:42 +11:00
Tomek Rabczak
b948312de7 Remove additional footer links 2020-01-06 13:47:54 -06:00
Matt-Yorkley
91d959b7d6 Remove "previous" button from order cycle savebar 2020-01-03 16:25:26 +01:00
luisramos0
108f57a705 Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict 2020-01-02 16:58:11 +00:00
luisramos0
f63c7cf54f Extract visible_orders_where_values to a private method 2019-12-29 19:01:44 +00:00
luisramos0
13633e8bea Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses 
The | operators here were converting the relations to long lists of IDs, in our current particular issue, an IN clause with 100k order_ids
 2019-12-29 19:01:44 +00:00
luisramos0
4658b7a533 Fix rubocop issues in app/controllers/application_controller 2019-12-28 19:10:02 +00:00
luisramos0
d0f33e7c8a Avoid code in devise that is not needed and simply return the root path 
This fixes a broken spec with error "No route matches {:controller=>"home"}"
 2019-12-28 18:47:14 +00:00
luisramos0
55bb328d48 Prefix all calls to root_url with main_app 2019-12-28 18:46:50 +00:00
luisramos0
a8a6fce385 Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped 2019-12-28 18:45:57 +00:00