Andy Brett
55f9fef2c3
denote that weight is in grams on the bulk order management page
2020-09-03 09:11:00 -07:00
Transifex-Openfoodnetwork
8f896a806a
Updating translations for config/locales/es.yml
2020-09-03 23:36:07 +10:00
Transifex-Openfoodnetwork
71b1c5a3b3
Updating translations for config/locales/ca.yml
2020-09-03 23:35:02 +10: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
Luis Ramos
f28241cc5e
Merge duplicate Spree::User#superadmin? into existing Spree::admin?
2020-09-02 22:41:42 +01:00
Luis Ramos
ebf4175662
MErge user class extensions into the User class
2020-09-02 22:41:39 +01:00
Luis Ramos
caf61e3a7e
Run rubocop -a
2020-09-02 22:40:28 +01:00
Luis Ramos
dfa00a770a
Bring user and ability related files from spree_core
2020-09-02 22:37:27 +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
cd940bd140
Rewrite error message for failed credit card sending
2020-09-02 15:22:23 +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
Luis Ramos
ffa0d202be
Add states api endpoint to support existing code on the customer details page when user changes country
2020-09-01 15:46:22 +01:00
Luis Ramos
66587ccc00
Allow user to remove terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
a3e9226878
Add option to remove existing terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Luis Ramos
5a10a2861e
Reduce the size of the terms and conditions message on the checkout page
2020-08-31 17:40:34 +01:00
Luis Ramos
b9511d4f07
Show terms and conditions on checkout if enterprise has an associated PDF file
2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +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 Linke
5d48da72c7
Notify Bugsnag on Stripe payment errors
2020-08-27 11:09:16 +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