Pau Perez
106dcbae01
Add test coverage to the two distinct output rows
2021-02-08 19:34:42 +01:00
Pau Perez
412bb24e42
Ensure report rows are always in the same order
...
I saw the row were returned not respecting any ordering when refreshing
the page locally. It made it hard to debug whether or not the customer
balance was right.
It's less than ideal to use `allow_any_instance_of` but with this legacy
and very coupled code, it's the best we can do.
2021-02-08 19:34:42 +01:00
Pau Pérez Fabregat
d7cf265f0e
Merge pull request #6831 from Matt-Yorkley/netread-timeout
...
Add retry handling for flaky spec timeouts
2021-02-08 19:26:01 +01:00
Andy Brett
8f59d76eb2
remove variants with no product
2021-02-08 08:57:11 -08:00
Pau Pérez Fabregat
ed1c1e5607
Merge pull request #6823 from Matt-Yorkley/dead-code-shipment
...
Dead code: Shipment#total_cost
2021-02-08 13:44:14 +01:00
Pau Pérez Fabregat
8fcfcfe813
Merge pull request #6826 from openfoodfoundation/dependabot/bundler/rswag-2.3.3
...
Bump rswag from 2.3.2 to 2.3.3
2021-02-08 13:43:23 +01:00
Pau Pérez Fabregat
8d1354f07a
Merge pull request #6827 from openfoodfoundation/dependabot/bundler/timecop-0.9.3
...
Bump timecop from 0.9.2 to 0.9.3
2021-02-08 13:42:58 +01:00
Matt-Yorkley
dcc3d933bc
Add retry handling for flaky spec timeouts
2021-02-08 12:38:22 +00:00
Transifex-Openfoodnetwork
af7ba5c535
Updating translations for config/locales/ru.yml
2021-02-08 23:32:39 +11:00
Transifex-Openfoodnetwork
fe04295ea5
Updating translations for config/locales/en_GB.yml
2021-02-08 22:33:05 +11:00
Transifex-Openfoodnetwork
6a9f6c82ef
Updating translations for config/locales/es.yml
2021-02-08 20:19:50 +11:00
Transifex-Openfoodnetwork
c638729df2
Updating translations for config/locales/ca.yml
2021-02-08 20:19:34 +11:00
Transifex-Openfoodnetwork
96c017939c
Updating translations for config/locales/en_FR.yml
2021-02-08 19:27:38 +11:00
Transifex-Openfoodnetwork
662c65665c
Updating translations for config/locales/fr.yml
2021-02-08 19:27:27 +11:00
dependabot[bot]
da71cd0b84
Bump timecop from 0.9.2 to 0.9.3
...
Bumps [timecop](https://github.com/travisjeffery/timecop ) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/travisjeffery/timecop/releases )
- [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md )
- [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.2...v0.9.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-08 05:59:25 +00:00
dependabot[bot]
c49122461c
Bump rswag from 2.3.2 to 2.3.3
...
Bumps [rswag](https://github.com/rswag/rswag ) from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/rswag/rswag/releases )
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rswag/rswag/compare/2.3.2...2.3.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-02-08 05:47:09 +00:00
Maikel
173cf9e536
Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive
...
[Adjustments] Improve inclusive/additional tax recording
2021-02-08 09:38:31 +11:00
Transifex-Openfoodnetwork
f97fd8f8a7
Updating translations for config/locales/de_DE.yml
2021-02-08 02:01:06 +11:00
Matt-Yorkley
14530ddbc5
Remove dead code: Shipment#total_cost
2021-02-07 13:41:44 +00:00
Matt-Yorkley
8d6468dab1
Remove dead code: Shipment#display_total_cost
2021-02-07 13:41:40 +00:00
Matt-Yorkley
b9f46d4253
Increase precision on database columns that involve prices
...
Increases the maximum number of digits (on the left side of the decimal place) that the column can hold, to allow larger values. This change is made in Spree 2.2 and is relevant in cases with either large order values, or certain currencies that have large values as standard. For example, 100 UK Pounds is roughly 4000 Thai Baht. 1 million pounds is unlikely to ever be needed as a value, but 1 million Baht is not so unlikely...
2021-02-07 00:16:32 +00:00
Matt-Yorkley
7bf31d120b
Add price field test
2021-02-07 00:05:39 +00:00
Arun Kumar Mohan
beece545de
Remove cost price field from product variant form
2021-02-06 18:48:06 -05:00
Luis Ramos
e9aa6a5cd4
Rename Pin payment methods to check
2021-02-06 11:17:11 +00:00
Luis Ramos
c0ddeceb1e
Remove Pin Payments
2021-02-06 11:15:48 +00:00
Transifex-Openfoodnetwork
5c96b3e070
Updating translations for config/locales/en_IE.yml
2021-02-06 03:50:32 +11:00
Cillian O'Ruanaidh
1fcf797d4e
Include sort direction parameter during bulk product update to prevent JS error causing 'Saving' text to hang
...
Before if you did a bulk product update there was an error:
> TypeError: Cannot set property 'variants' of null
It only seemed to happen if pagination was required i.e. more than 15 products. It seemed to be happening because the default sort order on the products API endpoint which handles the bulk update is 'created desc' but 'name asc' on the /admin/products controller.
Another fix included here is for the sorting direction arrows which were not displaying on the admin products page. The sorting arrows require the sorting expression to be on the :sorting var instead of :q.sorting.
Fixes #6399
2021-02-05 16:08:08 +00:00
Transifex-Openfoodnetwork
5eb88f60e4
Updating translations for config/locales/fr_CA.yml
2021-02-06 00:23:51 +11:00
Transifex-Openfoodnetwork
52fc9cee31
Updating translations for config/locales/en_CA.yml
2021-02-06 00:14:49 +11:00
Matt-Yorkley
9851c9a762
Merge pull request #6678 from Matt-Yorkley/soft-deprecate-tax-rates
...
Introduce soft-deprecation strategy when modifying tax rates
2021-02-05 13:16:40 +01:00
Transifex-Openfoodnetwork
1dcdbd83a2
Updating translations for config/locales/es.yml
2021-02-05 21:46:31 +11:00
Transifex-Openfoodnetwork
f941ce1c7a
Updating translations for config/locales/ca.yml
2021-02-05 21:46:27 +11:00
Pau Perez
5832bce1e4
Update all locales with the latest Transifex translations
2021-02-05 11:28:29 +01:00
Pau Pérez Fabregat
6ccf4b0245
Merge pull request #6817 from openfoodfoundation/transifex
...
Transifex
2021-02-05 11:24:00 +01:00
Transifex-Openfoodnetwork
dd2baf7e96
Updating translations for config/locales/en_FR.yml
2021-02-05 20:23:24 +11:00
Transifex-Openfoodnetwork
4a619e596e
Updating translations for config/locales/fr.yml
2021-02-05 20:22:32 +11:00
Pau Pérez Fabregat
aee56f6331
Merge pull request #6812 from openfoodfoundation/transifex
...
Transifex
2021-02-05 08:45:46 +01:00
Andy Brett
d3ad997964
Merge pull request #6792 from andrewpbrett/migrate-variant-unit-values
...
Migrate variants with nil unit_value
2021-02-04 18:00:23 -08:00
Andy Brett
f746dec537
update spec
2021-02-04 13:52:45 -08:00
Andy Brett
1e863c6e65
Merge branch 'master' into migrate-variant-unit-values
2021-02-04 13:27:30 -08:00
Andy Brett
9c135ee0f7
add default to unit_value and weight
2021-02-04 13:17:43 -08:00
Pau Pérez Fabregat
3ab6da03e7
Merge pull request #6296 from luisramos0/remove_migs
...
Remove Migs payment gateway
2021-02-04 22:07:35 +01:00
Pau Pérez Fabregat
4b892d408e
Merge pull request #6809 from andrewpbrett/remove-bogus-providers
...
Remove "Bogus" payment providers from staging and production
2021-02-04 21:09:16 +01:00
Pau Pérez Fabregat
35a76a313a
Merge pull request #6807 from jibees/6798-new-product-form-fill-all-space
...
New Product Form: Fill all space available
2021-02-04 21:08:56 +01:00
Andy Brett
212186e059
check all variants, not just where we use 'items'
2021-02-04 11:45:36 -08:00
Andy Brett
d642984261
add db constraint; check for existing nil/nan in migration
2021-02-04 11:24:35 -08:00
Pau Pérez Fabregat
f6e6b6041c
Merge pull request #6734 from coopdevs/disable-ui-mail-settings
...
Disable mail methods form so no one can edit
2021-02-04 17:57:32 +01:00
Andy Brett
91245ae6ab
also set weight to default to 0.0
2021-02-04 08:05:48 -08:00
Pau Pérez Fabregat
76fa63fd71
Merge pull request #6789 from coopdevs/authorize-only-changed-vos
...
Authorize only changed vos
2021-02-04 15:22:50 +01:00
Pau Perez
655fe887f9
Distinguish user not present and list empty
...
This is a bit more thorough.
2021-02-04 13:19:04 +01:00
