Luis Ramos
4ee30d7cac
Remove spree.root route and respective controller. Also move
...
unauthorized route to main app.
This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Matt-Yorkley
0c2fd4bfd2
Fix ensure_valid_locale_persisted and change public interface of service
2020-07-03 16:39:24 +02:00
Matt-Yorkley
02549d1b0f
Extract all locale-setting logic to a service
2020-07-03 13:44:13 +02:00
Matt-Yorkley
7a00a3ba1e
Rename method and add explanatory comment
2020-07-03 11:52:21 +02:00
Luis Ramos
7a03f57da0
Merge shipment decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Matt-Yorkley
4e08d2049f
Ensure a valid locale is persisted during login
...
This action has to be performed here and not in I18nHelper, as spree_current_user is not initialized yet during the other checks / setting the selected locale value in the app
2020-07-02 15:33:19 +02:00
Luis Ramos
2d4326ded3
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
...
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
3b91dd9dea
Use rubocop auto-correct to fix more issues
2020-06-22 12:51:47 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Luis Ramos
f6e3e01a10
Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller
...
Add spec to verify payment source attributes are passed
2020-06-18 09:54:34 +01:00
Luis Ramos
3f7fb0ecc2
Add missing permitted attributes to zones
2020-06-16 13:56:39 +01:00
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
Cillian O'Ruanaidh
ba126d5afc
Move the bulk coop controller specs to the order management engine.
...
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
bcf79ef803
Fix code climate violations related to removing blockenspiel.
2020-06-13 13:27:44 +01: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
f05b0d1a57
Add missing fields to ship method controller permitted params list
2020-06-09 12:02:59 +01:00
Cillian O'Ruanaidh
406309c577
Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
...
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +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
Lucas Hiago
19ef66f3ad
Change mail method config route
2020-05-29 21:51:57 -03:00
Cillian O'Ruanaidh
d02f64da06
Define bulk coop report summary row and columns with lists of method names instead of Procs.
2020-05-29 11:34:12 +01: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
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01: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
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
be4104d6f3
Merge branch 'master' into 3-0-stable-may-5
2020-05-05 19:11:20 +01:00
Luis Ramos
a38b18bd0d
Remove smtp config from admin config page
2020-04-29 13:34:19 +01:00
Luis Ramos
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01:00
Luis Ramos
868929eed3
Merge pull request #4993 from luisramos0/move_ent_fees
...
Change engine routes to better work with specs in rails 4
2020-04-28 11:48:41 +01:00
Luis Ramos
6e23f5bdac
Merge pull request #5233 from luisramos0/stripe_sca_bo
...
[StripeSCA] Fix card payments in the Backoffice
2020-04-27 13:00:24 +01:00
Luis Ramos
23f4faf192
Merge pull request #4841 from luisramos0/kill_rabl
...
Hide broken product taxons field, remove last rabl template and rabl itself
2020-04-21 18:49:12 +01:00
Luis Ramos
8f7b3df9b5
Make payment controller authorize stripe_sca payments before processing them or advancing order workflow (that also calls payment.process)
2020-04-15 16:07:34 +01:00
Luis Ramos
07264446e6
Add strong params implementation to properties controller
2020-04-04 11:17:38 +01:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Pau Pérez Fabregat
a218eab67b
Merge pull request #4987 from Matt-Yorkley/3-0-packing
...
[Spree 2.1] Packing report deleted variants
2020-03-26 17:37:51 +01:00
Matt-Yorkley
0cc5cbd1d2
Merge pull request #5038 from luisramos0/strong_params_prod
...
[Spree 2.1] Implement strong params in products, variants, variant_overrides and resource controllers
2020-03-25 18:35:58 +01:00
