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
Maikel
0f588dbe0b
Merge pull request #4561 from openfoodfoundation/transifex
...
Transifex
2019-12-13 17:02:32 +11:00
dependabot-preview[bot]
9c14d8ff36
Bump rack-mini-profiler from 1.0.0 to 1.1.4
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.0.0 to 1.1.4.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.0.0...v1.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-12 19:14:17 +00:00
luisramos0
a104bf8efd
Add feature spec to validate load all and select all exchange products
2019-12-12 18:49:11 +00:00
luisramos0
a039ef13f4
Add spec for exchange products controller pagination
2019-12-12 18:49:11 +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
3264355f12
Add some basic test coverage to exchange_products_controller and exchange_products_renderer
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
luisramos0
2b3bc6d1ff
Remove supplied products from enterprise serializer and from UI side
...
This list of products s now loaded in a specific call to ExchangeProducts and for each specific exchange
2019-12-12 18:44:44 +00:00
luisramos0
24d7672abb
Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges
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
luisramos0
883cd81058
Load enterprise supplied products when the exchange products panel is opened for the first time
2019-12-12 18:44:44 +00:00
Transifex-Openfoodnetwork
0d7d029255
Updating translations for config/locales/en_GB.yml
2019-12-13 02:07:44 +11:00
Kristina Lim
ce31a059bf
Merge pull request #4553 from openfoodfoundation/transifex
...
Transifex
2019-12-12 22:46:22 +08:00
Luis Ramos
17bac20c65
Merge pull request #4550 from luisramos0/fix_of_report
...
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
2019-12-12 14:15:19 +00:00
Pau Pérez Fabregat
066243057f
Merge pull request #4545 from coopdevs/fix-db-backups
...
Make whenever properly read the S3 bucket
2019-12-12 11:39:54 +01:00
Transifex-Openfoodnetwork
ea40547fd7
Updating translations for config/locales/fr_CA.yml
2019-12-12 10:22:26 +11:00
Transifex-Openfoodnetwork
0ebc6d4b1e
Updating translations for config/locales/en_CA.yml
2019-12-12 09:28:07 +11:00
Transifex-Openfoodnetwork
62c2e4709a
Updating translations for config/locales/en_CA.yml
2019-12-12 09:25:01 +11:00
Konstantin Shlyk
c5229dd763
billing address in pdf invoice fixed
2019-12-11 23:10:51 +03:00
dependabot-preview[bot]
99d4190814
Bump selenium-webdriver from 3.141.0 to 3.142.6
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:45 +00:00
dependabot-preview[bot]
f086c02e13
Bump mini_racer from 0.1.15 to 0.2.4
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.1.15 to 0.2.4.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.1.15...v0.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:03 +00:00
