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
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
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
Transifex-Openfoodnetwork
a65bd8edac
Updating translations for config/locales/en_US.yml
2020-09-02 01:28:57 +10: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
Pau Perez
defb6e4fa4
Update all locales with the latest Transifex translations
2020-08-28 13:19:39 +02:00
Pau Perez
9b2cb1c3ef
Fix payment translation
...
One in the i18n key refers to singular/plural not the copy itself. Now
we see `Order #R587218174 -> Payment -> Cash on collection` instead of
`Order #R587218174 -> One -> Cash on collection`.
2020-08-28 10:06:19 +02:00
Pau Perez
58c0b1e0fd
Update all locales with the latest Transifex translations
2020-08-28 09:51:53 +02:00
Maikel
2a71af7c6b
Merge pull request #5944 from romale/patch-9
...
Missing translation key en.spree.activerecord.models.spree/payment.one
2020-08-28 09:48:46 +10:00
Maikel
819a445547
Merge pull request #5712 from mbudm/issue/5208
...
Add payment details to invoice
2020-08-28 09:46:49 +10:00
Pau Pérez Fabregat
2fa8cd54fd
Merge pull request #5769 from Matt-Yorkley/customer-names
...
Customer names in reports
2020-08-27 15:39:47 +02:00
romale
8583ac5573
Update en.yml
2020-08-27 14:38:10 +03:00
romale
8f59b048f3
Update en.yml
2020-08-27 13:53:13 +03:00
Transifex-Openfoodnetwork
8290acfd91
Updating translations for config/locales/es.yml
2020-08-27 18:15:46 +10:00
Transifex-Openfoodnetwork
a8bfedd847
Updating translations for config/locales/ca.yml
2020-08-27 18:15:32 +10:00
Maikel
da1569abda
Merge pull request #5914 from romale/patch-8
...
Missing translation key 'listing_reports'
2020-08-27 11:02:40 +10:00
Maikel
7a0b036edd
Merge pull request #5899 from andrewpbrett/dashboard-link
...
Update dashboard link to point to enterprise shop
2020-08-27 10:53:43 +10:00
Luis Ramos
9264badaaf
Merge pull request #5879 from luisramos0/payments
...
[Bye bye Spree] Bring models payment_method, credit_card and gateway from spree_core
2020-08-26 22:09:16 +01:00
Transifex-Openfoodnetwork
5ce51a4abb
Updating translations for config/locales/nb.yml
2020-08-25 18:23:24 +10:00
Transifex-Openfoodnetwork
1c7ce9997a
Updating translations for config/locales/es.yml
2020-08-25 18:21:19 +10:00
Transifex-Openfoodnetwork
489665f3f9
Updating translations for config/locales/ca.yml
2020-08-25 18:21:04 +10:00
Transifex-Openfoodnetwork
f9e29c5aa7
Updating translations for config/locales/ar.yml
2020-08-25 07:24:29 +10:00
romale
ad9d9afd6a
Update en.yml
2020-08-24 17:51:06 +03:00
Transifex-Openfoodnetwork
e5395709cc
Updating translations for config/locales/en_NZ.yml
2020-08-22 21:18:58 +10:00
Transifex-Openfoodnetwork
2515b1ae2c
Updating translations for config/locales/en_IE.yml
2020-08-22 00:58:13 +10:00
Luis Ramos
9fd8613107
Update all locales with the latest Transifex translations
2020-08-21 14:56:26 +01:00
Luis Ramos
bea8c2035f
Merge pull request #5909 from openfoodfoundation/transifex
...
Transifex
2020-08-21 14:54:49 +01:00
Luis Ramos
d1b60e3778
Merge pull request #5905 from mkllnk/lost-decorators
...
Load previously lost decorator code and don't delete orders
2020-08-21 12:34:37 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Luis Ramos
d6160b5759
Merge pull request #5758 from luisramos0/order_updater
...
Bring Order Updater from spree_core
2020-08-19 20:47:27 +01:00
romale
0efcf1536f
Update en.yml
2020-08-17 23:10:43 +03:00
Transifex-Openfoodnetwork
4c3a3d5d1a
Updating translations for config/locales/en_GB.yml
2020-08-17 18:19:09 +10:00
Matt-Yorkley
0b91991919
Add explanatory user message for viewing customer names
2020-08-14 20:48:33 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Maikel Linke
23706ec1d6
Load our version of the Spree environment
...
We didn't actually change any logic in our version of the Spree
environment file but if we do that in the future, we want to be sure
that it takes effect. Our file was ignored and not loaded before.
2020-08-14 15:38:10 +10:00
Maikel Linke
271d1ec103
Update translations from Transifex
2020-08-13 10:52:55 +10:00
Andy Brett
7c223a43fc
remove unused key from en.yml
2020-08-12 12:59:38 -07:00
Transifex-Openfoodnetwork
95e048b37f
Updating translations for config/locales/en_CA.yml
2020-08-13 02:50:37 +10:00
Transifex-Openfoodnetwork
47bde1e77c
Updating translations for config/locales/tr.yml
2020-08-12 00:50:03 +10:00
Transifex-Openfoodnetwork
acf984699e
Updating translations for config/locales/en_US.yml
2020-08-11 12:02:26 +10:00
Transifex-Openfoodnetwork
f6c85af4da
Updating translations for config/locales/fr.yml
2020-08-08 00:21:32 +10:00
Luis Ramos
b21a969502
Fix new credit_card_spec
2020-08-07 13:45:25 +01:00
Matt-Yorkley
766b7449d8
Update all locales with the latest Transifex translations
2020-08-07 10:00:21 +01:00
