Catch GatewayError exception and handle by updating flash.now[:error]

openfoodfoundation · Apr 1, 2022 · 4f10b92 · 4f10b92
1 parent e2b1c0d
commit 4f10b92
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb
@@ -23,14 +23,14 @@ def edit
   end
 
   def update
-    if confirm_order || update_order
+    if confirm_or_update_order
       return if performed?
 
       clear_invalid_payments
       advance_order_state
       redirect_to_step
     else
-      flash.now[:error] = I18n.t('split_checkout.errors.global')
+      flash.now[:error] ||= I18n.t('split_checkout.errors.global')
 
       render status: :unprocessable_entity, operations: cable_car.
         replace("#checkout", partial("split_checkout/checkout")).
@@ -40,6 +40,13 @@ def update
 
   private
 
+  def confirm_or_update_order
+    confirm_order || update_order
+  rescue Spree::Core::GatewayError => e
+    flash.now[:error] = I18n.t(:spree_gateway_error_flash_for_checkout, error: e.message)
+    false
+  end
+
   def clear_invalid_payments
     @order.payments.with_state(:invalid).delete_all
   end