Commit Graph

1831 Commits

Author SHA1 Message Date
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2
Rails 4 prep: admin dashboard route
2020-01-16 14:16:32 +11:00
Luis Ramos
0432c73f19 Merge pull request #4510 from luisramos0/backend_ctrl_resource
Bring spree_backend resource controller to OFN
2020-01-15 22:22:24 +00:00
Luis Ramos
3080eb9dfd Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api
Removing duplicate API method soft_delete for both products and variants
2020-01-14 11:32:10 +00:00
Luis Ramos
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
b9edea7c0e Rename 'admin/overview#index' route from :admin to :admin_dashboard
Fixes issues with route declarations in Rails 4
2020-01-12 13:11:33 +01:00
luisramos0
108f57a705 Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict 2020-01-02 16:58:11 +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
luisramos0
8fe3abfd45 Add resource_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-27 17:03:39 +00:00
Luis Ramos
9f1eaf0b66 Merge pull request #4512 from luisramos0/backend_ctrl_base
Bring spree_backend base controller to OFN
2019-12-24 12:01:07 +00:00
Luis Ramos
1606f9900f Merge pull request #4507 from luisramos0/backend_ctrl_reports
Bring spree_backend reports controller to OFN
2019-12-23 16:14:07 +00:00
Luis Ramos
ba7f78ef60 Merge pull request #4515 from luisramos0/backend_ctrl_adjustments
Bring spree_backend adjustments controller to OFN
2019-12-23 16:05:04 +00:00
Luis Ramos
3063439ed1 Merge pull request #4541 from Matt-Yorkley/new_fee_errors
Handle validation messages when saving new fees
2019-12-18 13:35:45 +00:00
Matt-Yorkley
a3ee6674ea Use asynchronous requests for order capture and ship actions 2019-12-18 14:15:46 +01:00
luisramos0
f587bbb7d5 Remove unnecessary helper 2019-12-15 21:03:53 +00:00
luisramos0
2793693a7c Improve if clause readability 2019-12-15 21:03:53 +00:00
luisramos0
07e2317369 Replace deprecated URI.unescape with CGI.unescape 2019-12-15 21:03:53 +00:00
luisramos0
042162eda8 Delete unused method 2019-12-15 21:03:53 +00:00
luisramos0
795f13d73a Remove spree alerts feature that would check spree website for security alerts
This is not something we need running such an old version of spree
2019-12-15 21:03:53 +00:00
luisramos0
f1814f1b67 Fix most rubocop issues in spree/admin/base_controller 2019-12-15 21:03:53 +00:00
luisramos0
4ab7b78cb8 Merge base_controller with its decorator 2019-12-15 21:03:53 +00:00
luisramos0
11631c3a33 Add base_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-15 21:03:53 +00:00
Konstantin Shlyk
e6ca6bacac soft_delete api method deleted for products and variants 2019-12-14 01:05:35 +03:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
luisramos0
b2c5be775e Fix some rubocop issues 2019-12-13 16:44:46 +00:00
luisramos0
d22212ccfa Merge spree/admin/reports_controller with its decorator 2019-12-13 16:44:44 +00:00
luisramos0
dd600cd163 Add reports_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-13 15:20:03 +00:00
luisramos0
00478cc57c Add count variants endpoint and use it instead of loading exchange products 2019-12-12 18:48:35 +00:00
luisramos0
d5e42ee1e5 Paginate exchange products results
This commit breaks the OC page when there are more than 100 products in an exchange
2019-12-12 18:48:35 +00:00
luisramos0
ff584f9be9 Adapt exchange products routes to make api/exchanges/products (without exchange_id) also go to exchange_products#index 2019-12-12 18:44:45 +00:00
luisramos0
a589ba38da Rename exchanges_products_controller to better exchange_products_controller 2019-12-12 18:44:45 +00:00
luisramos0
197fb36524 Extract ExchangeProductsRenderer from ExchangesProductsController 2019-12-12 18:44:45 +00:00
luisramos0
62e6f09d94 Make exchange products more simple 2019-12-12 18:44:45 +00:00
luisramos0
79b2460664 Make simple create and edit OC load exchange products on init
Simple create makes a new type of call to exchange products with no exchange_id and no prder_cycle_id, it simply lists supplied products for a given enterprise
2019-12-12 18:44:44 +00:00
luisramos0
6b087adab8 Add route to process requests to exchanges/products without exchange id
This is needed when products for an exchange that is not yet saved are requested
2019-12-12 18:44:44 +00:00
luisramos0
3653b88da6 Make exchanges_products_controller more independent of the exchange field 2019-12-12 18:44:44 +00:00
luisramos0
89628c27f3 Move exchange products endpoint to api namespace and make it work for outgoing exchanges 2019-12-12 18:44:44 +00:00
luisramos0
9adbdc377d Add new admin/exchange/products endpoint that replaces Enterprise/for_order_cycle#supplied_products 2019-12-12 18:44:44 +00:00
Luis Ramos
71bf3f5f71 Merge pull request #4514 from luisramos0/backend_ctrl_overview
Bring spree_backend overview controller to OFN
2019-12-09 23:36:32 +00:00
Matt-Yorkley
54a40fe79c Handle validation messages when saving new fees 2019-12-07 14:51:17 +01:00
Luis Ramos
6db15a0a20 Merge pull request #4524 from Matt-Yorkley/packing_reports
Packing reports performance
2019-12-02 17:32:52 +00:00
Matt-Yorkley
38c327dae0 Improve N+1 issues around #suppliers_of_products_distributed_by
There's still some real mess here with repeating queries, but resolving it is out of scope for this quick PR
2019-11-29 20:16:03 +01:00
luisramos0
cc3368704a Fix rubocop issues in reports_controller_decorator and in report line_items 2019-11-29 13:54:30 +00:00
luisramos0
3959f16d65 Switch some more references from Permissions to Permissions::Order 2019-11-29 12:22:50 +00:00
luisramos0
da6d035a1d Rename some reports permissions to order_permissions 2019-11-29 11:23:17 +00:00
luisramos0
842e191c5f Remove toggle_state action that is not used in OFN 2019-11-28 16:20:35 +00:00
luisramos0
c8d359a0da Merge spree/admin/overview_controller with its decorator 2019-11-27 22:08:46 +00:00