Matt-Yorkley
|
ac38b2735c
|
Eager-load data in OrdersController
|
2020-03-23 22:38:57 +01:00 |
|
Maikel
|
c4e4beb912
|
Revert "Inner join visible orders"
|
2020-03-19 12:01:00 +11:00 |
|
Luis Ramos
|
1049525e50
|
Merge pull request #4963 from luisramos0/variants_fix
Fix 2 broken buttons in the product variants list page
|
2020-03-12 23:48:50 +00:00 |
|
Luis Ramos
|
676d949972
|
Make variants collection show deleted again by bypassing the default scope that removed deleted variants
|
2020-03-10 14:21:20 +00:00 |
|
Pau Perez
|
461b1b26f3
|
Add controller tests to cover totals by supplier
|
2020-03-05 17:45:06 +01:00 |
|
Luis Ramos
|
dad21a52b2
|
Merge pull request #4672 from luisramos0/stripe_sca_method
Add new Stripe payment method compatible with the new Stripe Payment Intents API
|
2020-03-02 17:19:05 +00:00 |
|
Pau Pérez Fabregat
|
a396a7f0af
|
Merge pull request #4818 from luisramos0/delete_dead_code
Delete dead code after PRs 4512 and 4508
|
2020-02-25 13:32:23 +01:00 |
|
Luis Ramos
|
1bdeda4a21
|
Delete dead code after PRs 4512 and 4508
|
2020-02-21 12:25:07 +00:00 |
|
luisramos0
|
b3ac5d8f41
|
Improve code readability a little
|
2020-02-21 10:52:56 +00:00 |
|
luisramos0
|
f691d1aafd
|
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
|
2020-02-21 10:52:29 +00:00 |
|
luisramos0
|
2acf8e5125
|
Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice
|
2020-02-05 16:02:43 +00:00 |
|
Luis Ramos
|
9313a57d19
|
Merge pull request #4511 from luisramos0/backend_ctrl_search
Bring spree_backend search controller to OFN
|
2020-02-05 15:54:30 +00:00 |
|
Luis Ramos
|
ea75714561
|
Merge pull request #4635 from luisramos0/main_app_routes
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
|
2020-02-04 16:02:48 +00:00 |
|
luisramos0
|
44d1b3f00c
|
Remove unused search/users controller action
|
2020-02-04 14:55:34 +00:00 |
|
luisramos0
|
88464d58c2
|
Fix some rubocop issues and extract ransack hash to reduce repetition
|
2020-02-04 14:55:34 +00:00 |
|
luisramos0
|
962779bba1
|
Merge search controller with decorator
|
2020-02-04 14:54:51 +00:00 |
|
luisramos0
|
1ae73dd6ae
|
Add search_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-02-04 14:54:51 +00:00 |
|
Pau Pérez Fabregat
|
246235b921
|
Merge pull request #4667 from Matt-Yorkley/rails-4-prep
Rails 4 prep
|
2020-02-04 15:20:28 +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
|
7009cd89e0
|
Fix rubocop issues in customer details controller and update rubocop manual todo accordingly
|
2020-02-04 11:50:44 +00:00 |
|
luisramos0
|
b93af37ea9
|
Merge customer details decorator with controller
|
2020-02-04 11:50:03 +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 |
|
luisramos0
|
51bca7ce2f
|
Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-02-04 11:50:03 +00:00 |
|
luisramos0
|
e192207f4e
|
Fix bug in before filters migration, needs to load payment for the show action
|
2020-01-30 10:27:26 +00:00 |
|
luisramos0
|
74226fbdf8
|
Fix one rubocop issue and update rubocop todo manual for the new controller
|
2020-01-22 20:22:28 +00:00 |
|
luisramos0
|
dc5374e284
|
Merge filter_payment_methods and load_data
|
2020-01-22 20:21:21 +00:00 |
|
luisramos0
|
f6ecf57737
|
Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller
|
2020-01-22 20:21:21 +00:00 |
|
luisramos0
|
61ce849546
|
Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues
|
2020-01-22 20:21:21 +00:00 |
|
luisramos0
|
12158d73fa
|
Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-01-22 20:21:21 +00:00 |
|
Matt-Yorkley
|
5f3abbf00e
|
Refactor BaseController
|
2020-01-22 12:17:23 +01:00 |
|
Matt-Yorkley
|
59ebfb9bd4
|
Fix subquery errors triggered by #warn_invalid_order_cycles
|
2020-01-22 12:17:23 +01:00 |
|
Matt-Yorkley
|
57ca1d54bb
|
Fix issue with each_serializer not being called in some cases in Rails 4.
|
2020-01-22 12:17:23 +01:00 |
|
luisramos0
|
1e203ae419
|
Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend
|
2020-01-16 11:59:36 +00:00 |
|
luisramos0
|
70a24b25e2
|
Update rubocop manual todo and Remove some unnecessary comments
|
2020-01-16 11:59:36 +00:00 |
|
luisramos0
|
f7490ae28b
|
Remove unused stock and destroy actions and bring product routes from spree_backend
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
836abbec92
|
Fix rubocop issues in variant controller
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
d153237b69
|
Merge variants decorator with controller
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
56b6bf82bb
|
Fix some rubocop issues
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
0d44f298fe
|
Merge spree/admin/products_controller with its decorator
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
ff3611f52a
|
Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
7fa9b4699c
|
Add products_controller from spree_backend so that we can now merge it with the OFN's decorator
|
2020-01-16 11:58:59 +00:00 |
|
luisramos0
|
a8a6fce385
|
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
|
2019-12-28 18:45:57 +00:00 |
|
luisramos0
|
d54850f097
|
Move ActionCallBacks out of the spree namespace
|
2019-12-27 17:04:40 +00:00 |
|
luisramos0
|
f8451a2511
|
Bring needed action_callbacks from spree_backend
|
2019-12-27 17:04:31 +00:00 |
|
luisramos0
|
f79182253a
|
Fix some rubocop issues
|
2019-12-27 17:03:39 +00:00 |
|
luisramos0
|
8cfd7c610b
|
Use nested module instead of class Spree::Admin::
|
2019-12-27 17:03:39 +00:00 |
|
luisramos0
|
486b5e9edc
|
Merge resource_decorator into resource controller
|
2019-12-27 17:03:39 +00:00 |
|