Luis Ramos
7db519ab62
Merge pull request #5570 from luisramos0/ship_methods_form
...
[Spree 2.1] Make Shipping methods form save calculator details
2020-06-15 15:05:50 +01:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Matt-Yorkley
86db1b6d68
Fix "subquery has too many columns" in reports query
2020-06-12 12:55:50 +02:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Luis Ramos
13a4a3edbe
Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight
...
Fix admin config separator without highlight
2020-06-10 23:00:30 +01:00
Luis Ramos
113533e3b1
Merge pull request #5557 from Matt-Yorkley/reports-improvement
...
Improve performance in various reports
2020-06-10 18:54:51 +01:00
Luis Ramos
f05b0d1a57
Add missing fields to ship method controller permitted params list
2020-06-09 12:02:59 +01:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Matt-Yorkley
9e278d5b2f
Improve performance in various reports
2020-06-05 16:39:01 +02:00
Luis Ramos
cce26cb453
Merge branch '3-0-stable' into 3-0-stable-jun-2
2020-06-03 19:51:43 +01:00
Luis Ramos
4438f620e9
Merge pull request #5421 from luisramos0/more_strong_params
...
[Spree 2.1] Add missing strong params to less important controllers missed by specs
2020-06-02 16:59:27 +01:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
a4a6431faf
Fix strong params problem where order object is not sent to controller
2020-06-01 13:42:22 +01:00
Luis Ramos
754b657f81
Move controller methods to protected to keeep consitency and isolation
2020-06-01 13:40:59 +01:00
Luis Ramos
e77d9aba7b
Add missing strong params to less important controllers not tested in specs
2020-06-01 13:40:59 +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
Matt-Yorkley
1e3bf7fec4
Merge pull request #5487 from coopdevs/fix-schedule-factory
...
[Spree 2.1] Allow to create order_cycle_schedules
2020-05-30 13:49:47 +02:00
Lucas Hiago
19ef66f3ad
Change mail method config route
2020-05-29 21:51:57 -03:00
Pau Perez
538c53fe9e
Improve code readability
...
Also removing an useless vars
2020-05-29 15:56:05 +02:00
Pau Pérez Fabregat
c0ad992352
Merge pull request #5465 from luisramos0/rename_accessible_by
...
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
2020-05-29 12:04:19 +02:00
Pau Perez
032dce1a88
Move OC save within success block
...
This makes more evident there are two scenarios: schedule save success
or failure. We deal with OCs failures raising an exception.
2020-05-29 10:46:29 +02:00
Pau Perez
768568c75c
Rename @object to @schedule
...
This level of abstraction makes sense in the framework-like code in
ResourceController but here it just makes things more difficult.
2020-05-29 10:44:43 +02:00
Pau Perez
4f3d01bd93
Remove unused HTML response format
2020-05-29 10:43:16 +02:00
Pau Perez
56b590a6f8
Extract #sync_subscription
...
This makes it far easier to spot what's the difference between create
and update regarding subs syncing without having to mess with `#update`
and its callbacks (for now).
2020-05-29 10:41:42 +02:00
Pau Perez
65c53df2ef
Remove unnecessary callback invocations
...
There are no registered callback methods to execute.
2020-05-29 10:25:38 +02:00
Pau Perez
f25ee8c998
Extract #editable_order_cycles
...
This makes it far easier to spot what's the difference between create
and update regarding the editable order cycles.
I stop here before a slightly deeper refactor which would make the PR
quite hard to review. This will come an upcoming one.
2020-05-29 10:25:37 +02:00
Pau Perez
4f635339e3
Fix schedule creation and subs syncing
2020-05-29 10:24:42 +02:00
Pau Perez
9a29e634fc
Deal with Schedule creation in its own controller
...
This way it can assign the order cycles to the schedule when this is
persisted. An OrderCycleSchedule (the join table) can't be created until
both schedule and order_cycle got an id.
Also, we do not call `#adapt_params` when creating the Schedule as that
assigns `order_cycle_ids` to `@object.attributes` thus, attempting to
create the OrderCycleSchedule without a schedule_id.
2020-05-28 17:49:36 +02:00
Luis Ramos
4026e072d5
Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor
2020-05-26 11:13:16 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Pau Pérez Fabregat
16dfb3c7e9
Merge pull request #5408 from luisramos0/columns_params
...
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Luis Ramos
a438317d69
Extract order_cart_reset service from enterprises_controller
2020-05-15 19:30:00 +01:00
Luis Ramos
35824c7aa1
Rename restartCheckout to order_checkout_restart to make it follow service naming convention
2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1
Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders
2020-05-15 19:29:37 +01:00
Luis Ramos
21d1a7bc04
Remove dead code
2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b
If selected OC is not in the available OCs, empty the order
2020-05-15 19:29:35 +01:00
Luis Ramos
52e7ca2417
Select first default OC only if no OC is already selected
2020-05-15 14:26:56 +01:00
Luis Ramos
c3f0c0ed7f
Extract method to prepare work ahead
2020-05-15 14:25:20 +01:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
7804c740a6
Add name to permitted params and fix some rubocop issues
2020-05-12 15:35:47 +01:00
Matt-Yorkley
3ca491683a
Merge pull request #5317 from Matt-Yorkley/caching-timed-shops
...
[Caching] Timed caching on shops data
2020-05-09 15:33:26 +02:00
Luis Ramos
052dbca1ba
Merge pull request #5370 from Matt-Yorkley/dont-render-twice
...
Don't render twice
2020-05-07 18:15:47 +01:00
Matt-Yorkley
37821beb1b
Extract home stats caching to method in service
2020-05-07 13:20:30 +02:00
Matt-Yorkley
545ca85644
Extract caching of homepage stats to service
2020-05-07 13:11:28 +02:00
Luis Ramos
1e9b4516cb
Merge pull request #5318 from Matt-Yorkley/caching-api
...
[Caching] API Action Caching on shop filters
2020-05-07 11:42:52 +01:00
Luis Ramos
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Matt-Yorkley
4f4b3fb206
Don't render twice 🙈
2020-05-05 15:21:05 +02:00
Matt-Yorkley
068c8feea7
Merge pull request #5289 from Matt-Yorkley/cart-populate
...
Cart populate
2020-05-05 13:56:17 +02:00
Luis Ramos
8a107bee98
Merge pull request #5235 from luisramos0/mail_methods
...
Remove smtp config from admin config page
2020-04-29 19:10:02 +01:00
