Pau Pérez Fabregat
3a3485614d
Merge pull request #6839 from openfoodfoundation/transifex
...
Transifex
2021-02-10 18:52:35 +01:00
Pau Pérez Fabregat
b7af92abb2
Merge pull request #6801 from coopdevs/toggle-customer-balance-to-entire-instance
...
Toggle customer balance to entire instance
2021-02-10 17:32:35 +01:00
Transifex-Openfoodnetwork
66c331542c
Updating translations for config/locales/it.yml
2021-02-09 18:39:59 +11:00
Pau Pérez Fabregat
a820304166
Merge pull request #6819 from openfoodfoundation/transifex
...
Transifex
2021-02-08 22:10:59 +01:00
Transifex-Openfoodnetwork
f6d47bc3e4
Updating translations for config/locales/de_DE.yml
2021-02-09 07:00:15 +11: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
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
Transifex-Openfoodnetwork
5c96b3e070
Updating translations for config/locales/en_IE.yml
2021-02-06 03:50:32 +11: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
Pau Perez
5832bce1e4
Update all locales with the latest Transifex translations
2021-02-05 11:28:29 +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
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
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
Pau Perez
14cee0e45d
Add new Feature class to toggle based on a closure
...
This enables toggling features as best fits us in each case. With this
new approach we can then toggle :customer_balance to an entire instance,
which is what we want in France.
2021-02-04 10:20:54 +01:00
Transifex-Openfoodnetwork
6c4f74e4e4
Updating translations for config/locales/es.yml
2021-02-04 20:06:10 +11:00
Transifex-Openfoodnetwork
3505ced3c2
Updating translations for config/locales/ca.yml
2021-02-04 20:05:50 +11:00
Transifex-Openfoodnetwork
ea134d4600
Updating translations for config/locales/en_FR.yml
2021-02-04 19:07:08 +11:00
Transifex-Openfoodnetwork
e3b7736c68
Updating translations for config/locales/fr.yml
2021-02-04 19:06:37 +11:00
Transifex-Openfoodnetwork
439280d046
Updating translations for config/locales/de_DE.yml
2021-02-04 10:52:26 +11:00
Luis Ramos
60667e23d9
Remove en.yml migs entry
2021-02-03 21:47:37 +00:00
Luis Ramos
e69eefdc0f
Remove Migs payment gateway
2021-02-03 21:41:40 +00:00
Matt-Yorkley
d7b130d293
Update all locales with the latest Transifex translations
2021-02-02 12:23:25 +00:00
Pau Perez
063d44fecc
Disable mail methods form fields except mails_from
...
This moves a step closer to having a simple and straightforward way to
configure the app's mail delivery which doesn't require to be a nuclear
engineer to troubleshoot mail issues.
It happens way too often that servers have mail config broken when
restarted or redeployed and it takes too much brain power to fix it. No
doubt; it's way too complex.
I chose to leave this page's form fields but "Send mails as" as
read-only. This other field is still used by instance manager to
troubleshoot mail issues.
2021-02-01 18:45:02 +01:00
Transifex-Openfoodnetwork
38dde5e063
Updating translations for config/locales/es.yml
2021-02-02 03:04:56 +11:00
Transifex-Openfoodnetwork
fe79186bec
Updating translations for config/locales/ca.yml
2021-02-02 03:03:33 +11:00
Transifex-Openfoodnetwork
8f163cf5b5
Updating translations for config/locales/en_CA.yml
2021-01-30 06:08:22 +11:00
Matt-Yorkley
b97734d918
Merge pull request #6720 from cillian/cancel-email-for-shop
...
When an order is cancelled by a customer send an email to the shop.
2021-01-29 18:30:28 +01:00
Matt-Yorkley
d03be3b8dc
Update all locales with the latest Transifex translations
2021-01-29 11:42:09 +00:00
Matt-Yorkley
e4d7e03903
Merge pull request #6740 from Matt-Yorkley/carts-cleanup
...
Remove old abandoned carts
2021-01-29 12:32:16 +01:00
Cillian O'Ruanaidh
899dffec96
When an order is cancelled by a customer send an email to the shop.
...
Fixes #6435 i.e. If the customer paid for their order by Stripe/Paypal then the Enterprise needs to know that the order was cancelled in order to arrange a refund. Refunds are not automatically processed when an order is cancelled.
This will send a very basic email to the shop, it only includes a link to view the cancelled order in the admin area initially.
I created a CustomerOrderCancellation object here because orders can be cancelled in two ways (1) by the customer, so an email should be sent to the shop. (2) by the shop, so an email doesn't need to be sent. However the code for cancelling order happens in Order#cancel via the state machine. Rather than passing some sort of parameter into #cancel to indicate whether it is a customer or shop cancelled order it might be clearer to have a CustomerOrderCancellation object, there could be other differences between customer or shop cancelled orders in future maybe.
2021-01-29 11:23:05 +00:00
Matt-Yorkley
9791287712
Run data cleanup job at 4:30am
2021-01-28 21:51:50 +00:00
Pau Pérez Fabregat
abe2cb9fac
Merge pull request #6728 from emclaughlin1215/add_tax_rates_i18n_key
...
Adding a tax_rates key to en.yml to match the key used everywhere.
2021-01-28 21:04:22 +01:00
Pau Pérez Fabregat
2668747237
Merge pull request #6723 from luisramos0/spree_routes_2
...
Move spree orders routes out of the spree engine routes into the main app routes
2021-01-28 16:31:49 +01:00
Luis Ramos
12dac82b8a
Delete dead route
2021-01-27 22:08:06 +00:00
Luis Ramos
c604f4c0c6
Remove dead endpoint
2021-01-27 22:05:04 +00:00
Pau Pérez Fabregat
9fe2cb1a30
Merge pull request #6681 from luisramos0/css
...
[Rails 5] Make the app work in rails 5
2021-01-27 12:08:27 +01:00
Maikel Linke
0393e902c4
Update translations from Transifex
2021-01-27 08:28:37 +11:00
Luis Ramos
11fdbe5e9f
Switch spree from namespace to scope in routes so helpers like order_path keep working
2021-01-25 20:01:08 +00:00
Luis Ramos
e98d97ae0d
Move spree orders routes out of the spree engine routes into the main app routes, still inside the spree namespace
2021-01-25 19:52:48 +00:00
Erin McLaughlin
609db647bb
Adding a tax_rates key to en.yml to match the key used everywhere.
2021-01-23 22:07:07 -05:00
Matt-Yorkley
a328a9bc1b
Use included boolean in tax adjustments
2021-01-23 03:59:32 +00:00
