François Turbelin
9abe41f6cb
Use OrderTaxAdjustmentsFetcher service
2020-06-16 14:01:27 +02:00
Pau Pérez Fabregat
257b311e04
Merge pull request #5158 from openfoodfoundation/3-0-stable
...
Merge 3-0-stable to master
2020-06-15 13:35:58 +02:00
Matt-Yorkley
e84e0aebe6
Fix fatal error in reports helper for orders without payments
2020-06-11 11:22:07 +02:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Cillian O'Ruanaidh
deafe32354
Add support for using Open Street Map on the Map and Group pages.
...
The map is displayed using https://leafletjs.com/
To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.
The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers )
Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.
Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.
The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
2020-05-31 18:42:55 +02:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
0a6bd1424c
Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only
...
Adding both unit and feature tests as this is important enough for that
2020-05-08 12:59:17 +01:00
Luis Ramos
0996c28c09
Memoize helper methods that are called several times in the views
2020-05-07 12:17:43 +01:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Pau Pérez Fabregat
f9f4bdae8f
Merge pull request #5238 from Matt-Yorkley/moar-performance
...
Improve Pain Points
2020-04-29 16:36:15 +02:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
ab16931d70
Merge pull request #5257 from luisramos0/stripe_sca_payments_last
...
StripeSCA - reuse better method to fetch last payment of an order to avoid nasty bugs in the future
2020-04-27 18:34:35 +01:00
Luis Ramos
568e570b4b
Move method to more generic helper to use it in mailers
2020-04-23 16:08:10 +10:00
Luis Ramos
52becf6abc
Extract payment method logic from OrderPaymentFinder into the orders helper
2020-04-23 16:08:10 +10:00
Matt-Yorkley
53183b8598
Eager-load properties in inject_enterprise_and_relatives
2020-04-21 11:13:20 +02:00
Luis Ramos
2ff8356c63
Delete dead code from products helper
2020-04-09 16:33:17 +01:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Luis Ramos
9fa604db0d
Merge pull request #5076 from luisramos0/rails_f_helper
...
Remove Rails Foundation Helper and improve error display and logging in checkout controller
2020-04-01 18:54:45 +01:00
Luis Ramos
9317549103
Merge pull request #4813 from luisramos0/oc_selector
...
If there's only one OC available to the customer because there are tag rules hidding other OCs, select that OC by default
2020-04-01 10:44:58 +01:00
Luis Ramos
ac0a62e962
Merge pull request #5050 from Matt-Yorkley/bullet_tweaks
...
Performance tweaks 2
2020-03-25 18:32:49 +00:00
Luis Ramos
523faa670d
Remove FoundationRailsHelper, this is dead code now
2020-03-25 17:31:56 +00:00
Luis Ramos
2c5db8935b
Merge pull request #5022 from Matt-Yorkley/performance_tweaks
...
Performance tweaks
2020-03-25 15:42:07 +00:00
Matt-Yorkley
d847560d7c
Fix rubocop issues
2020-03-25 10:15:03 +01:00
Matt-Yorkley
7110f9e6ee
Eager-load data used in EnterpriseGroupsController
...
Cuts page load time by ~75%
2020-03-23 19:33:13 +01:00
Luis Ramos
1c628fac58
Merge branch 'master' into 3-0-stable-mar20
2020-03-20 11:28:06 +00:00
Luis Ramos
540b26105f
Delete dead code in oc helper
2020-03-20 09:46:05 +00:00
Matt-Yorkley
3de887e1d8
Remove some N+1s relating to address (found with bullet gem)
2020-03-19 23:41:47 +01:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Matt-Yorkley
d969b68c8c
Add placeholder to order cycle selector
2020-03-17 20:32:18 +01:00
Maikel Linke
c64493ca77
Continue shopping with the products list
2020-03-17 10:28:03 +11:00
Luis Ramos
4b21aaafc4
Convert ActiveRecord_Associations_CollectionProxy to array so that the modifications the tagRuleApplicator does on it will remain
...
Reject on ActiveRecord_Associations_CollectionProxy wont work
2020-03-06 13:51:53 +00:00
Matt-Yorkley
5b8552f541
Fix ActiveRecord::Relation issue
...
Rails 4 now returns an Activerecord::Relation when using `SomeModel.all`. To get all the objects (as in Rails 3) we need to use `SomeModel.all.to_a`. See: https://stackoverflow.com/a/22417170
2020-02-22 11:05:24 +00:00
luisramos0
8dbe4accaf
Upgrade to the spree branch 2-1-0-stable and rails 4.0.0
2020-02-22 11:05:24 +00:00
luisramos0
e5c9468d09
Fix rubocop issues in navigation_helper
2020-02-05 22:16:20 +00:00
luisramos0
694995ea5d
Prefix root_path with main_app so that ofn's route is used. The spree root path is no longer defined, we dont need it
2020-02-05 16:02:43 +00:00
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
