Andy Brett
edefe1d4bc
use correct cache key for old preference
2020-09-18 14:35:51 -07:00
Andy Brett
b9ee945062
fix nomethod error by interpolating integer inside string
2020-09-18 10:10:27 -07:00
Andy Brett
dc7b9ed8fa
use sql query to update weight calculator prefs
2020-09-18 09:55:29 -07:00
Andy Brett
843f43eb78
delete cached per_kg preference for all weight calculators
2020-09-17 17:30:43 -07:00
Andy Brett
96fb65600e
refactor views to oneliners without single letter variable names
2020-09-17 16:45:55 -07:00
Andy Brett
fdb1019ee2
fix styles per rubocop
2020-09-17 16:41:49 -07:00
Andy Brett
bd25e8b40d
Revert "schema update"
...
This reverts commit 73149dc695
2020-09-17 08:46:03 -07:00
Andy Brett
66099239aa
add translation for calculator preferred unit error
2020-09-17 08:42:08 -07:00
Andy Brett
988abf7a8c
update preference field interface to be more clear
2020-09-17 08:27:45 -07:00
Andy Brett
73149dc695
schema update
2020-09-17 07:36:38 -07:00
Andy Brett
977e4e46f3
remove explicit raise from convert_weight
2020-09-17 07:36:28 -07:00
Andy Brett
6466829bdc
fix typo in weight calculator migration
2020-09-17 07:17:25 -07:00
Andy Brett
246934d8ba
update preference name in factor and specs
2020-09-12 14:49:42 -07:00
Andy Brett
37cfe65688
migrate existing weight calculators
2020-09-12 12:32:06 -07:00
Andy Brett
4123eb7c10
update specs; add specs to validate weight calculator preference is kg or lb
2020-09-12 11:53:45 -07:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Andy Brett
adb29a9c8f
add preferred_unit to weight shipping calculator
2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d
Revert "Add a per-pound calculator and a spec for it"
...
This reverts commit e8eadcbf39
2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39
Add a per-pound calculator and a spec for it
2020-09-06 09:03:06 -07:00
Luis Ramos
8256a20aea
Update all locales with the latest Transifex translations
2020-09-03 13:27:16 +01:00
Luis Ramos
07e17d7931
Merge pull request #5979 from mkllnk/fix-locale-for-transifex
...
Add required plural form to locale
2020-09-03 13:21:13 +01:00
Luis Ramos
e177ba5e29
Merge pull request #5977 from openfoodfoundation/transifex
...
Transifex
2020-09-03 13:19:33 +01:00
Transifex-Openfoodnetwork
d3f48bf684
Updating translations for config/locales/nb.yml
2020-09-03 22:16:04 +10:00
Transifex-Openfoodnetwork
63a6ceede3
Updating translations for config/locales/en_NZ.yml
2020-09-03 19:57:50 +10:00
Luis Ramos
185c246a83
Merge pull request #5965 from coopdevs/ignore-pyenv-file
...
Gitignore pyenv's Python version file
2020-09-02 23:50:42 +01:00
Luis Ramos
83361255aa
Merge pull request #5969 from luisramos0/fungi
...
Replace beef with fungi in sample data 🐮
2020-09-02 23:47:43 +01:00
Luis Ramos
b4759ff869
Merge pull request #5869 from luisramos0/images
...
[Bye bye Spree] Bring models image and asset from spree_core
2020-09-02 19:44:40 +01:00
Transifex-Openfoodnetwork
5bc0eca493
Updating translations for config/locales/en_FR.yml
2020-09-02 23:08:34 +10:00
Transifex-Openfoodnetwork
f6eb05a6f1
Updating translations for config/locales/fr.yml
2020-09-02 23:07:46 +10:00
Maikel Linke
09f0035bbd
Add required plural form to locale
...
Transifex complained:
> Key 'spree.activerecord.models.spree/payment' has the wrong number of plurals
While our application may not need that translation, Transifex won't
accept the source file and our updates were broken.
2020-09-02 15:06:15 +10:00
Luis Ramos
2cb6124b7a
Use existing product factory, the custom product is not needed here
2020-09-01 17:13:07 +01:00
Luis Ramos
653b71dbd4
Remove duplicated spec
2020-09-01 17:10:51 +01:00
Luis Ramos
b36d0bc4f3
Fix easy rubocop isssues
2020-09-01 17:09:22 +01:00
Luis Ramos
b2cf414fb8
Use exiting translation
2020-09-01 17:09:22 +01:00
Luis Ramos
5958c2f68c
Rubocop autocorrect
2020-09-01 17:09:22 +01:00
Luis Ramos
13f0a46bc2
Merge decorator with original file from spree
2020-09-01 17:09:22 +01:00
Luis Ramos
b9f7a98c46
Bring image, asset and images_helper from spree_core
2020-09-01 17:09:22 +01:00
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10:00
Luis Ramos
ea053552b9
Merge pull request #5938 from cillian/bulk-coop-report-filter-fixes
...
Fix the bulk coop report date and distributor filters.
2020-09-01 16:21:31 +01:00
Luis Ramos
52fb3c92f0
Merge pull request #5954 from romale/patch-10
...
Missing translation key en.credit_owed and en.new_adjustment
2020-09-01 16:21:22 +01:00
Luis Ramos
5e49e03477
Merge pull request #5964 from coopdevs/fix-flaky-product-update-spec
...
Check taxon's attribute instead of object identity
2020-09-01 12:06:02 +01:00
Pau Pérez Fabregat
c56962b949
Merge pull request #5966 from openfoodfoundation/dependabot/bundler/bugsnag-6.17.0
...
Bump bugsnag from 6.16.0 to 6.17.0
2020-09-01 09:55:11 +02:00
Luis Ramos
3df5a0644f
Make sample data vegetarian
2020-08-31 10:57:07 +01:00
Pau Perez
6bb37a3942
Check taxon's attribute instead of object identity
...
We don't care about the Ruby object instance but the actual DB record it
represents.
2020-08-31 11:05:12 +02:00
Maikel
a029a86f0d
Merge pull request #5893 from arku/chore/resend-button-removal
...
Remove resend button on the orders edit page
2020-08-31 11:18:05 +10:00
Luis Ramos
c9758b8b0b
Merge pull request #5957 from coopdevs/improve-stripe-connection-spec
...
Improve StripeAccountsController#connect spec
2020-08-30 22:02:22 +01:00
Arun Kumar Mohan
bf07da6267
Fix the order resend message translation
2020-08-29 20:47:28 -05:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
