23167 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt-Yorkley	1cbb0d8bbd	Update all locales with the latest Transifex translations v4.1.13	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
Matt-Yorkley	632d94ee37	Merge pull request #8733 from Matt-Yorkley/bump-stimulusjs ... Update to StimulusJS 3.0.1	2022-01-17 20:56:54 +00:00
Filipe	067f90b17c	Merge pull request #8712 from Matt-Yorkley/oc-mails ... OC notifications	2022-01-17 20:30:40 +00:00
Filipe	8114eb1c9f	Merge pull request #8666 from openfoodfoundation/stripe-controller ... Extract new StripeController	2022-01-17 20:21:40 +00:00
Filipe	62f0de75ee	Merge pull request #8679 from Matt-Yorkley/drop-jquery-ujs ... Drop jquery_ujs	2022-01-17 16:30:25 +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
Matt-Yorkley	ac9fef883d	Fix Jest issue with updated StimulusJS package	2022-01-16 12:25:54 +00:00
Matt-Yorkley	c499f0757f	Bump StimulusJS to 3.0.1	2022-01-16 12:25:54 +00:00
Matt-Yorkley	11578a8852	Merge pull request #8730 from filipefurtad0/address_label_fix ... Fixes translation/rendering inconsistency on Country label (step 3)	2022-01-15 20:33:02 +00:00
Transifex-Openfoodnetwork	f7e5034f69	Updating translations for config/locales/de_DE.yml	2022-01-16 07:02:27 +11:00
filipefurtad0	e7aa19c95d	Fixes translation/rendering inconsistency on Country label(step 3)	2022-01-15 19:43:57 +00: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	11c6ce16ea	Move payment-authorizing tests to stripe controller spec	2022-01-14 19:41:08 +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	5a2c14e79a	Use new return URL when authorizing Stripe payments in backoffice or subs	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	6c2b623f8b	Tidy up OrderController	2022-01-14 19:41:08 +00:00
Matt-Yorkley	5a70664a6a	Pull stripe-related tests into new controller spec	2022-01-14 19:41:08 +00:00
Matt-Yorkley	c65beae869	Extract some methods and move to simpler callbacks with guard clauses	2022-01-14 19:41:08 +00:00
Matt-Yorkley	c4d55feac8	Extract #last_payment	2022-01-14 19:41:08 +00:00
Matt-Yorkley	ddf6e7eadd	Use proper module/namespace	2022-01-14 19:41:08 +00:00
Matt-Yorkley	48c4ecde08	Update checkout specs using deleted OrderCompletionReset	2022-01-14 19:41:08 +00:00
Matt-Yorkley	410485fbf4	Use #order_failed_route in #process_order_completion!	2022-01-14 19:41:08 +00:00
Matt-Yorkley	072f4f4c60	Use new stripe confirm path and remove dead code	2022-01-14 19:41:08 +00:00
Matt-Yorkley	3f3bfadb59	Simplify StripeScaPaymentAuthorize and clarify both return URL types (checkout and off-session)	2022-01-14 19:41:08 +00:00
Matt-Yorkley	7b8e1f5c30	Update/improve paypal controller specs	2022-01-14 19:41:08 +00:00
Matt-Yorkley	9583a3cc3d	Use order token param in specs	2022-01-14 19:41:08 +00:00
Matt-Yorkley	9b2801db24	Fix calls to private method #expire_current_order in specs	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	789c29f678	Extract #load_checkout_order	2022-01-14 19:41:08 +00:00
Matt-Yorkley	daee5b49b5	Extract #process_payment_completion!	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	28d89103eb	Extract #gateway_error	2022-01-14 19:41:08 +00:00
Matt-Yorkley	7633255bea	Extract #order_failed_route	2022-01-14 19:41:08 +00:00
Matt-Yorkley	414e1eb299	Tidy up OrdersController#load_order	2022-01-14 19:41:08 +00:00
Matt-Yorkley	6385d9a782	Simplify interface of #order_completion_route	2022-01-14 19:41:08 +00:00
Matt-Yorkley	7cbdb7c1a2	Remove paypal-specific workaround from OrdersController ... The previous commit means this is no longer needed here.	2022-01-14 19:41:08 +00:00
Matt-Yorkley	1b459b2491	Extract #processing_failed	2022-01-14 19:41:08 +00:00
Matt-Yorkley	c1defdb1ff	Extract #order_processing_error	2022-01-14 19:41:08 +00:00
Matt-Yorkley	5c44614a8d	Extract and standardise payment/checkout #processing_succeeded	2022-01-14 19:41:08 +00:00
Matt-Yorkley	96f30133a7	Don't reset order for split checkout ... The various places where we "reset" an order to cart state if a checkout submission does not succeed are an artifact of the process-all-the-steps-at-once approach of the current checkout.	2022-01-14 19:41:08 +00:00
Matt-Yorkley	1e21a6a32f	Extract and standardise use of #handle_insufficient_stock	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	4d6c4f850f	Remove pointless callbacks in CheckoutController ... These exact same checks are already made in #load_order (and #order_invalid_for_checkout?), which is called before these other two (later) callbacks.	2022-01-14 19:41:08 +00:00
Matt-Yorkley	77d89ec7d0	Extract and standardise use of #order_completion_route	2022-01-14 19:41:08 +00:00
Matt-Yorkley	4c1fc2b326	Standardise use of #order_completion_reset	2022-01-14 19:41:08 +00:00
Matt-Yorkley	124b63fad0	Remove unused flash assignment	2022-01-14 19:41:08 +00:00