Merge pull request #8807 from Matt-Yorkley/closed-oc-payment-auth

Fix Stripe payment authorizing for closed order cycles

app/controllers/application_controller.rb

@@ -139,17 +139,6 @@ class ApplicationController < ActionController::Base
       !current_distributor.ready_for_checkout?
   end
 
-  def check_order_cycle_expiry
-    if current_order_cycle&.closed?
-      Bugsnag.notify("Notice: order cycle closed during checkout completion", order: current_order)
-      current_order.empty!
-      current_order.set_order_cycle! nil
-      flash[:info] = I18n.t('order_cycle_closed')
-
-      redirect_to main_app.shop_path
-    end
-  end
-
   # All render calls within the block will be performed with the specified format
   # Useful for rendering html within a JSON response, particularly if the specified
   # template or partial then goes on to render further partials without specifying

app/controllers/base_controller.rb

@@ -12,7 +12,6 @@ class BaseController < ApplicationController
   include OrderCyclesHelper
 
   before_action :set_locale
-  before_action :check_order_cycle_expiry
 
   private
 

app/controllers/concerns/order_stock_check.rb

@@ -18,6 +18,17 @@ module OrderStockCheck
     redirect_to main_app.cart_path
   end
 
+  def check_order_cycle_expiry
+    return unless current_order_cycle&.closed?
+
+    Bugsnag.notify("Notice: order cycle closed during checkout completion", order: current_order)
+    current_order.empty!
+    current_order.set_order_cycle! nil
+
+    flash[:info] = I18n.t('order_cycle_closed')
+    redirect_to main_app.shop_path
+  end
+
   private
 
   def sufficient_stock?

app/controllers/payment_gateways/paypal_controller.rb

@@ -8,6 +8,7 @@ module PaymentGateways
     before_action :destroy_orphaned_paypal_payments, only: :confirm
     before_action :load_checkout_order, only: [:express, :confirm]
     before_action :handle_insufficient_stock, only: [:express, :confirm]
+    before_action :check_order_cycle_expiry, only: [:express, :confirm]
     before_action :permit_parameters!
 
     after_action :reset_order_when_complete, only: :confirm

app/controllers/payment_gateways/stripe_controller.rb

@@ -7,6 +7,7 @@ module PaymentGateways
 
     before_action :load_checkout_order, only: :confirm
     before_action :validate_payment_intent, only: :confirm
+    before_action :check_order_cycle_expiry, only: :confirm
     before_action :validate_stock, only: :confirm
 
     def confirm

spec/controllers/base_controller_spec.rb

@@ -99,17 +99,4 @@ describe BaseController, type: :controller do
       controller.current_order(true)
     end
   end
-
-  it "redirects to shopfront with message if order cycle is expired" do
-    expect(controller).to receive(:current_order_cycle).and_return(oc)
-    expect(controller).to receive(:current_order).and_return(order).at_least(:twice)
-    expect(oc).to receive(:closed?).and_return(true)
-    expect(order).to receive(:empty!)
-    expect(order).to receive(:set_order_cycle!).with(nil)
-
-    get :index
-
-    expect(response).to redirect_to shop_url
-    expect(flash[:info]).to eq I18n.t('order_cycle_closed')
-  end
 end

spec/controllers/checkout_controller_spec.rb

@@ -25,6 +25,20 @@ describe CheckoutController, type: :controller do
     expect(response).to redirect_to shop_path
   end
 
+  it "redirects to shopfront with message if order cycle is expired" do
+    allow(controller).to receive(:current_distributor).and_return(distributor)
+    expect(controller).to receive(:current_order_cycle).and_return(order_cycle).at_least(:once)
+    expect(controller).to receive(:current_order).and_return(order).at_least(:once)
+    expect(order_cycle).to receive(:closed?).and_return(true)
+    expect(order).to receive(:empty!)
+    expect(order).to receive(:set_order_cycle!).with(nil)
+
+    get :edit
+
+    expect(response).to redirect_to shop_url
+    expect(flash[:info]).to eq I18n.t('order_cycle_closed')
+  end
+
   it "redirects home with message if hub is not ready for checkout" do
     allow(distributor).to receive(:ready_for_checkout?) { false }
     allow(order).to receive_messages(distributor: distributor, order_cycle: order_cycle)

spec/controllers/payment_gateways/stripe_controller_spec.rb

@@ -70,6 +70,22 @@ module PaymentGateways
           }.to change { Customer.count }.by(1)
         end
 
+        context "when the order cycle has closed" do
+          it "redirects to shopfront with message if order cycle is expired" do
+            allow(controller).to receive(:current_distributor).and_return(distributor)
+            expect(controller).to receive(:current_order_cycle).and_return(order_cycle)
+            expect(controller).to receive(:current_order).and_return(order).at_least(:once)
+            expect(order_cycle).to receive(:closed?).and_return(true)
+            expect(order).to receive(:empty!)
+            expect(order).to receive(:set_order_cycle!).with(nil)
+
+            get :confirm, params: { payment_intent: "pi_123" }
+
+            expect(response).to redirect_to shop_url
+            expect(flash[:info]).to eq I18n.t('order_cycle_closed')
+          end
+        end
+
         context "using split checkout" do
           before do
             allow(Flipper).to receive(:enabled?).with(:split_checkout) { true }
@@ -236,6 +252,21 @@ module PaymentGateways
               expect(payment.cvv_response_message).to be nil
             end
           end
+
+          context "when the order cycle has closed" do
+            it "should still authorize the payment successfully" do
+              expect(order).to receive(:process_payments!) do
+                payment.complete!
+              end
+
+              get :authorize, params: { order_number: order.number, payment_intent: payment_intent }
+
+              expect(response).to redirect_to order_path(order)
+              payment.reload
+              expect(payment.state).to eq("completed")
+              expect(payment.cvv_response_message).to be nil
+            end
+          end
         end
 
         context "when the payment intent response has errors" do