23 Commits

Author	SHA1	Message	Date
Luis Ramos	3ebc8145df	Avoid calling update with nil values	2020-11-27 13:59:46 +00:00
Matt-Yorkley	3bfa903912	Revert "Move Spree::Admin::BaseController to Admin::BaseController"	2020-11-27 14:11:57 +01:00
Andy Brett	85d99f3bf2	Merge branch 'master' into controllers	2020-11-20 08:12:03 -08:00
Andy Brett	17202ff39c	move gateway_error require to lib/spree/core.rb	2020-11-10 14:55:56 -08:00
Luis Ramos	c9972189d0	Change usage of Spree::Admin::BaseController to Admin::BaseController	2020-10-31 09:56:59 +00:00
Luis Ramos	1a513567f2	Fix easy rubocop issues	2020-09-17 13:59:41 +01:00
Luis Ramos	d5d62894a5	Use spree url helpers	2020-09-17 13:59:41 +01:00
Luis Ramos	66f27aad32	Explicitly use spree url helpers for spree routes	2020-09-17 13:59:41 +01:00
Arun Kumar Mohan	bf07da6267	Fix the order resend message translation	2020-08-29 20:47:28 -05:00
Luis Ramos	26eee4631f	Rename AdvanceOrderService to OrderWorkflow	2020-07-28 23:40:49 +01:00
Luis Ramos	1666ffb191	Remove try_spree_current_user ... This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers	2020-07-15 14:53:35 +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	a4a6431faf	Fix strong params problem where order object is not sent to controller	2020-06-01 13:42:22 +01:00
Luis Ramos	384ca310a3	Merge branch 'master' into 3-0-stable-apr3	2020-04-03 18:26:26 +01:00
Matt-Yorkley	ac38b2735c	Eager-load data in OrdersController	2020-03-23 22:38:57 +01:00
Matt-Yorkley	f77194875c	Add strong parameters to orders_controller.rb	2020-02-22 16:24:30 +01:00
luisramos0	bbb3748d3c	Simplify orders events logic	2020-02-04 11:51:13 +00:00
luisramos0	6e26841817	Fix load_order before filter and remove unused open and close adjustments actions	2020-02-04 11:50:44 +00:00
luisramos0	ab60c4a9dd	Remove unnecessary index action override because this is no longer a decorator ... Remove useless todo comment	2020-02-04 11:50:44 +00:00
luisramos0	76b6a85509	Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues	2020-02-04 11:50:03 +00:00
luisramos0	a1d4b4ee98	Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator	2020-02-04 11:50:03 +00:00