Commit Graph

3695 Commits

Author SHA1 Message Date
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
Transifex-Openfoodnetwork
2cc1b6a2f8 Updating translations for config/locales/fr.yml 2022-01-13 22:43:21 +11:00
Maikel
72edd9fa36 Merge pull request #8690 from apricot12/8489-Mising-stripe-translations
Add translations for all stripe decline codes
2022-01-13 16:30:24 +11:00
Maikel
50a94931d4 Merge pull request #8645 from Matt-Yorkley/initialization-deprecations
Initialization deprecations
2022-01-13 16:06:56 +11:00
Maikel
696bbdc2e2 Merge pull request #8649 from Matt-Yorkley/deprecation-fixes
Deprecation fixes
2022-01-13 15:59:47 +11:00
Maikel
5257361df8 Merge pull request #8651 from Matt-Yorkley/custom-errors
Remove custom errors gem
2022-01-13 15:54:50 +11:00
Filipe
7709e86d41 Merge pull request #8676 from jibees/8668-split-checkout-as-guest
Handle checkout as guest feature on split checkout
2022-01-12 20:22:01 +00:00
Matt-Yorkley
80342e258b Update all locales with the latest Transifex translations 2022-01-11 20:34:55 +00:00
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name
Enable sorting orders by order full name
2022-01-11 11:27:36 +00:00
SarvarKhalimov
5523b91364 Add translation for already_signed_out key in en.yml file
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
2022-01-10 22:20:21 +05:00
Nihal M. Kelanthodika
000c59ffa7 Add translations for all stripe decline codes 2022-01-10 20:47:47 +05:30
Jean-Baptiste Bellet
3e14501337 Create a new step: the guest view 2022-01-10 09:39:45 +01:00
SarvarKhalimov
945969ba0c Add flash message translation for log out 2022-01-06 16:25:15 +05:00
Matt-Yorkley
f42abe8268 Remove configs which are already enabled in framework defaults 2022-01-05 15:36:16 +00:00
Matt-Yorkley
8a0646704a Bump framework defaults to 6.1 2022-01-05 15:35:22 +00:00
Matt-Yorkley
037c647336 Bump framework defaults to 6.0 2022-01-05 15:35:22 +00:00
Matt-Yorkley
973c60babd Disable some incompatible defaults
Using `config.load_defaults` applies a large number of recommended config options, but some of them introduce breaking changes. By selectively disabling the ones that don't work nicely with OFN we can still get the benefits of all the other enabled options.

These options currently don't play nicely with OFN, and break the CI build in various places.
2022-01-05 15:35:22 +00:00
Matt-Yorkley
a19335d247 Enable framework defaults for Rails 5.2 2022-01-05 15:35:22 +00:00
Filipe
59661f3a27 Merge pull request #7784 from Matt-Yorkley/webpacker-assets
Webpacker assets
2022-01-03 15:12:15 +00:00
Jean-Baptiste Bellet
35c58ca5c9 Update all locales with the latest Transifex translations 2022-01-03 14:30:05 +01:00
jibees
bb7c423de4 Merge pull request #8644 from openfoodfoundation/transifex
Transifex
2022-01-03 14:28:38 +01:00
Transifex-Openfoodnetwork
1a0843fad4 Updating translations for config/locales/fr_CM.yml 2022-01-03 21:30:28 +11:00
Matt-Yorkley
f5ebd47751 Replace customisations with explicit patch in an initializer
See previous commit.

This isn't nice, but it does the same job as the gem did. We can also update this code now as Rails changes (the gem was incompatible with Rails 7).
2021-12-28 10:19:35 +00:00
Matt-Yorkley
7cff1e01a8 Tell Zeitwerk to ignore app/webpacker directory.
The files here are not Ruby classes
2021-12-27 17:45:06 +00:00
Matt-Yorkley
09b9c3d4d0 Fix postcss-loader config
The configuration keys have some issues across different versions of postcss
2021-12-27 17:45:06 +00:00
Matt-Yorkley
297e2f1b38 Update webpacker css config 2021-12-27 17:45:06 +00:00
Matt-Yorkley
3c9d461f5f Provide #image_pack_path helper method 2021-12-27 17:45:06 +00:00
Matt-Yorkley
825aeeae04 Migrate images and update assets 2021-12-27 17:45:06 +00:00
Matt-Yorkley
8dfc30438b Move CSS to Webpacker 2021-12-27 17:45:05 +00:00
Transifex-Openfoodnetwork
6a312b8cca Updating translations for config/locales/it.yml 2021-12-28 03:49:53 +11:00
Matt-Yorkley
aaf5d1ba38 Patch CanCan deprecated keyword arguments
Solves an issue with use of deprecated positional args. The version of CanCan which fixes this is not currently compatible with OFN...
2021-12-27 16:27:04 +00:00