Luis Ramos
0e7dafea46
Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice
...
Billing address in pdf invoice fixed
2019-12-27 16:45:06 +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
d796e96470
Merge pull request #4575 from Matt-Yorkley/admin_orders
...
Fix route on "continue" button on admin adjustments page
2019-12-23 16:12:28 +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
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
luisramos0
c59326743b
Remove sales total report
2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a
Convert reports index and sales_total views from erb to haml
2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29
Add sales total report view
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
Matt-Yorkley
f189ca8004
Fix route on "continue" button on admin adjustments page
2019-12-13 13:51:41 +01:00
Luis Ramos
db7146014c
Rename exchange products file names to increase clarity
2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae
Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form
2019-12-13 12:24:16 +00:00
luisramos0
7ad8951375
DRY exchange products templates by extracting header and footer content to partial templates
2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4
Add spinner when loading all products in an exchange
2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d
Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded
2019-12-12 18:48:36 +00:00
luisramos0
a9598c5d97
Only show load more and load all if not all products are loaded already
2019-12-12 18:48:36 +00:00
luisramos0
3e5b7ebbf1
Show exchange products list only after first page of products is loaded
2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0
Make select all work again in incoming exchanges by loading alll products before triggering the select all process
2019-12-12 18:48:35 +00:00
luisramos0
2f7fd1482a
Add link to load all products at the top of the list of products and include summary of number of products loaded already
2019-12-12 18:48:35 +00:00
luisramos0
0416521772
Add load all prouducts button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e
Add load more button to list of exchange products
2019-12-12 18:48:35 +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
9451f1b66d
Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template
2019-12-12 18:44:45 +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
a4a2f98b6e
Rename Product service to more appropriate ExchangeProduct
2019-12-12 18:44:45 +00:00
luisramos0
f5ddbfbac3
Make Product service more simple, there's no need to keep the data structure, that is already kept in the controller
2019-12-12 18:44:45 +00:00
luisramos0
a66a4c3edb
Remove unnecessary passing of scopes around in controllers
2019-12-12 18:44:45 +00:00
luisramos0
8179252924
Replace the use of this with
2019-12-12 18:44:45 +00:00
luisramos0
0bec492208
Fix some rubocop issues
2019-12-12 18:44:45 +00:00
luisramos0
5cf50f0adf
Convert the manipulation of arrays into active record relations: let the DB do the matching job
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
66f3656bb5
Register products panel listeners after OrderCycle is loaded instead of using recurrent timeouts
...
Also, use this same approach for the case where a new distributor or new supplier is added to the list of exchanges
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
3223bf930d
Make total number of products in exchange work again.
...
Currently we are just loading the products from the server and count them.
This can be improved easily in two ways:
- we can switch this to a specific product count call to the server so that we dont load all products all the time
- or we paginate the products result and fetch the total_number from the payload of the first page.
2019-12-12 18:44:44 +00:00
