raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,190 Commits 20 Branches 451 Tags
ebe7456b666c19450cb4e30ca55f74c8abe470b3
Commit Graph

499 Commits

Author SHA1 Message Date
luisramos0
bbb3748d3c Simplify orders events logic 2020-02-04 11:51:13 +00:00
luisramos0
08dd992344 Merge orders_helper with decorator 2020-02-04 11:51:13 +00:00
luisramos0
914244a1ee Bring orders helper from spree_backend 2020-02-04 11:51:13 +00:00
Luis Ramos
c4bf4f001f Merge pull request #4509 from luisramos0/backend_ctrl_payments 
Bring spree_backend payments controller to OFN
 2020-02-04 11:46:23 +00:00
luisramos0
3e68dc5bb2 Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages 2020-01-28 18:05:30 +00:00
luisramos0
919242d9ec Fix rubocop issues in spree/admin/base_helper 2020-01-28 18:05:15 +00:00
luisramos0
109f2866ae Merge base_helper with decorator 2020-01-28 18:04:36 +00:00
luisramos0
76eafa8415 Bring base_helper from spree_backend 2020-01-28 18:04:36 +00:00
Luis Ramos
5e61ba8136 Merge pull request #4587 from luisramos0/navigation_helper 
Bring navigation helper from spree_backend
 2020-01-28 17:58:18 +00:00
luisramos0
1548eaeb7e Add frozen_string_literal magic comment 2020-01-23 14:42:19 +00:00
luisramos0
4b0ddcda01 Add require to fix loading issue. Some other Permissions module was being loaded 2020-01-23 11:42:10 +00:00
luisramos0
766303b332 Add required payment_helper from spree_backend 2020-01-22 20:22:28 +00:00
luisramos0
cccff6b500 Remove unused methods from navigation helper 2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68 Remove alias_method klass_for_with_sym_fallback 2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02 Remove redundant method tab_with_cancan_check 
This was introduced to work with previous versions of spree
 2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d Fix rubocop issues in nav helper 2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94 Merge navigator_helper with decorator 2020-01-21 22:49:55 +00:00
luisramos0
8987121058 Add navigation helper from spree_backend 2020-01-21 22:48:44 +00:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs 
Mobile: shop tabs
 2020-01-20 08:51:59 +00: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
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
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
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
14bcba081d Adapt shopfront_helper to show/hide panels and display new tabs 2020-01-08 14:50:27 +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
Eduardo
c45a3c2303 remove group tabs from shop view when there are no groups 2020-01-07 11:24:46 -03:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue 
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
 2019-12-19 21:08:34 +01:00
cyrillefr
e59077e63e Select by default single Hub/Shop option on creation of payment/shipping method 
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
 2019-12-18 10:45:00 +01:00
luisramos0
73ee14cc7c Fix long line in injection helper 2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19 Fix a few more rubocop issues manually 2019-11-10 19:14:12 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00
luisramos0
30aa31252b Fix simple rubocop issues in helpers 2019-10-02 21:26:09 +01:00
luisramos0
b83d74a609 Bring general_settings_helper from spree_backend 2019-10-02 21:26:09 +01:00
luisramos0
c66579a22f Fix simple rubocop issues in helper 2019-09-20 15:24:06 +01:00
luisramos0
9291bf5c82 Bring taxons_helper from spree 2019-09-20 15:24:06 +01:00
Luis Ramos
cd263b761c Merge pull request #4055 from luisramos0/remove_spree_api 
Remove dependency to spree_api - step 1 - controllers and routes
 2019-08-28 15:34:08 +01:00
Luis Ramos
34ed86cf2d Merge pull request #4132 from Matt-Yorkley/import_launch 
Product Import beta
 2019-08-19 17:17:16 +01:00
Pau Pérez Fabregat
92b05c76a3 Merge pull request #4068 from luisramos0/replace_oc_rabl 
Convert order_cycle.rabl to Api::OrderCycleSerializer
 2019-08-08 12:23:09 +02:00
Matt-Yorkley
b3728568a8 Enable product import for non-superadmin users 
This class_eval hack for premissions on the #tab method was really hard to find, and is obviously quite ugly, but refactoring it is maybe outside of the scope here...
 2019-08-06 18:59:12 +01:00
luisramos0
e4a6b3880f Fix some more simple rubocop issues 2019-07-31 09:36:48 +01:00
luisramos0
a3c179bd3f Fix some more simple rubocop issues 2019-07-31 09:36:48 +01:00
luisramos0
50765563f8 Bring spree/api_helpers from spree_api 2019-07-31 09:35:46 +01:00
luisramos0
3c0e6eeee2 Make inject_current_order_cycle render {} instad of null if current_order_cycle is null 2019-07-29 18:13:29 +01:00
luisramos0
ca5a5bf301 Convert oc.rabl to oc serializer and use it in both haml file and controller 2019-07-29 18:13:29 +01:00
luisramos0
9b567a6710 Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials 2019-07-21 23:55:59 +01:00
luisramos0
a8ce31fa90 Replace views/json/_flash.rabl with an ams injector with serializer 2019-07-21 22:56:15 +01:00
luisramos0
4c964fea0d Replace views/json/_current_user.rabl with an ams injector with serializer 2019-07-21 22:48:36 +01:00
Luis Ramos
6872ccfb72 Merge pull request #3963 from luisramos0/hide_invoices 
Hide invoices feature
 2019-07-09 14:20:50 +01:00