Commit Graph

3725 Commits

Author SHA1 Message Date
Matt-Yorkley
8c33dc16e8 Update all locales with the latest Transifex translations 2022-01-27 18:24:01 +00:00
Matt-Yorkley
b588ab78b7 Merge pull request #8777 from openfoodfoundation/transifex
Transifex
2022-01-27 18:17:06 +00:00
Transifex-Openfoodnetwork
2eed23d14b Updating translations for config/locales/fr.yml 2022-01-28 00:24:38 +11:00
Transifex-Openfoodnetwork
2e3bc758e3 Updating translations for config/locales/en_FR.yml 2022-01-28 00:24:36 +11:00
Matt-Yorkley
0bec693655 Merge pull request #8791 from Matt-Yorkley/split-checkout-terms
[Split Checkout] Update terms of service handling
2022-01-27 13:07:04 +00:00
Transifex-Openfoodnetwork
9a46eaffba Updating translations for config/locales/en_FR.yml 2022-01-27 19:18:10 +11:00
Transifex-Openfoodnetwork
135b629134 Updating translations for config/locales/fr.yml 2022-01-27 19:17:46 +11:00
Filipe
75395f6f29 Merge pull request #8648 from Matt-Yorkley/csp
Configure CSP
2022-01-26 19:55:11 +00:00
Filipe
404fb4cb7f Merge pull request #8771 from tsara27/8458-missing-translation
Missing translation: table headers in product import validation table #8458
2022-01-26 17:22:44 +00:00
Filipe
53b96896a9 Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +00:00
Matt-Yorkley
6e8bb777e6 Show platform and distributor terms and conditions 2022-01-25 15:16:43 +00:00
Maikel Linke
f22c2b0e73 Remove option to create StripeConnect methods 2022-01-24 12:35:45 +11:00
Transifex-Openfoodnetwork
61b09a456b Updating translations for config/locales/it.yml 2022-01-22 21:20:24 +11:00
Tsara Sudrajat
56ac2e4e61 Convert product headings to load from translation 2022-01-21 18:30:38 +07:00
Deepak Chauhan
5a6f322fd7 Merge branch 'master' into 8457-missng-translation-or-between-buttons 2022-01-20 15:41:15 +05:30
Deepak Chauhan
3b3eb1e522 removed translation or from en.yml 2022-01-20 10:15:44 +05:30
Maikel
ae38d94d71 Merge pull request #8743 from openfoodfoundation/transifex
Transifex
2022-01-20 10:54:10 +11:00
Transifex-Openfoodnetwork
ec2bb34023 Updating translations for config/locales/ru.yml 2022-01-20 01:30:50 +11:00
Matt-Yorkley
8ce27bed86 Move guest checkout handling to the frontend 2022-01-19 13:14:10 +00:00
Matt-Yorkley
931e68ef6f Update script sources for google maps and bugnsag 2022-01-18 12:22:06 +00:00
Matt-Yorkley
4c9e64589b Update style sources 2022-01-18 12:22:06 +00:00
Matt-Yorkley
6af5f46d30 Update CSP; re-enable Angular templates
We really need to remove all those Angular templates as soon as possible, and then revert this commit...
2022-01-18 12:22:06 +00:00
Matt-Yorkley
6a3ca98ac6 Add frame-ancestors to CSP 2022-01-18 12:19:54 +00:00
Matt-Yorkley
05abb63036 Remove X-Frame-Options header
This header is largely deprecated, and is functionally replaced here by use of the frame-ancestors CSP configuration
2022-01-18 12:19:54 +00:00
Matt-Yorkley
114a9d8993 Allow unsafe_inline 2022-01-18 12:19:54 +00:00
Matt-Yorkley
0fc6b4c882 Add some whitelisting 2022-01-18 12:19:54 +00:00
Matt-Yorkley
0dd97a631e Set CSP configuration 2022-01-18 12:19:54 +00:00
Transifex-Openfoodnetwork
98968591fc Updating translations for config/locales/de_DE.yml 2022-01-18 21:25:22 +11:00
Transifex-Openfoodnetwork
7d55bf9184 Updating translations for config/locales/en_FR.yml 2022-01-18 20:18:34 +11:00
Transifex-Openfoodnetwork
f8a9d9ecfa Updating translations for config/locales/fr.yml 2022-01-18 20:18:22 +11:00
Matt-Yorkley
1cbb0d8bbd Update all locales with the latest Transifex translations 2022-01-17 21:00:43 +00:00
Matt-Yorkley
bf6b221aa5 Merge pull request #8720 from openfoodfoundation/transifex
Transifex
2022-01-17 20:58:26 +00:00
Filipe
8114eb1c9f Merge pull request #8666 from openfoodfoundation/stripe-controller
Extract new StripeController
2022-01-17 20:21:40 +00:00
Transifex-Openfoodnetwork
084bbe576c Updating translations for config/locales/en_FR.yml 2022-01-17 21:19:59 +11:00
Transifex-Openfoodnetwork
d870e972ae Updating translations for config/locales/fr.yml 2022-01-17 21:11:58 +11:00
Transifex-Openfoodnetwork
f7e5034f69 Updating translations for config/locales/de_DE.yml 2022-01-16 07:02:27 +11:00
Filipe
dfdeb7368e Merge pull request #8681 from SarvarKh/translation-correction
Add flash message translation for log out
2022-01-15 14:55:26 +00:00
Matt-Yorkley
2f39f5bac4 Add re-routing for any unprocessed payments still using old return URL 2022-01-14 19:41:08 +00:00
Matt-Yorkley
c209be9c17 Clarify params
Spree::Order.to_param outputs the order *number* (not the id) when used to build URLs. This makes it a bit more explicit.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
12f7fc98fa Move payment authorization to StripeController
This Stripe-payment-authorizing logic is used by backoffice and subscriptions orders (but not the checkout), and was previously being handled by the #show action in Spree::OrdersController. It involves the user being redirected back to OFN after visiting a Stripe URL.
2022-01-14 19:41:08 +00:00
Matt-Yorkley
7fe770a855 Add route to catch pre-existing payments which may still use Checkout#edit as return URL 2022-01-14 19:41:08 +00:00
Matt-Yorkley
76647863e8 Add new Stripe controller 2022-01-14 19:41:08 +00:00
Matt-Yorkley
b6cf6483f2 Extract and standardise use of order loading around checkout processing 2022-01-14 19:41:08 +00:00
Matt-Yorkley
01bd77e437 Remove duplicate translation key 2022-01-14 19:41:08 +00:00
Transifex-Openfoodnetwork
3daaa9d50b Updating translations for config/locales/es.yml 2022-01-15 05:45:15 +11:00
Transifex-Openfoodnetwork
93ecc894c6 Updating translations for config/locales/de_DE.yml 2022-01-14 07:09:03 +11:00
Transifex-Openfoodnetwork
f374186b8d Updating translations for config/locales/fr_CA.yml 2022-01-14 05:20:05 +11:00
Transifex-Openfoodnetwork
883e137a43 Updating translations for config/locales/en_CA.yml 2022-01-14 04:27:24 +11:00
Transifex-Openfoodnetwork
d89bfd30c9 Updating translations for config/locales/en_CA.yml 2022-01-14 03:57:37 +11:00
Transifex-Openfoodnetwork
646bd05973 Updating translations for config/locales/en_FR.yml 2022-01-13 23:00:00 +11:00