[Checkout] Shipping fees update, remove order callback

app/models/spree/order.rb

@@ -673,10 +673,6 @@ def process_each_payment
         break if payment_total >= total
 
         yield payment
-
-        if payment.completed?
-          self.payment_total += payment.amount
-        end
       end
     end
 

app/views/spree/orders/_totals_footer.html.haml

@@ -29,7 +29,7 @@
       %td.text-right{colspan: "3"}
         %strong
           = t :order_amount_paid
-      %td.text-right.total
+      %td.text-right.total{id: "amount-paid"}
         %strong
           = order.display_payment_total.to_html
   - if order.outstanding_balance.positive?

spec/controllers/admin/customers_controller_spec.rb

@@ -83,13 +83,9 @@ module Admin
               let!(:variant) { create(:variant, price: 10.0) }
 
               before do
-                allow_any_instance_of(Spree::Payment).to receive(:completed?).and_return(true)
-
                 order.contents.add(variant)
-                order.payments << create(:payment, order:, amount: order.total)
-                order.reload
+                order.payments << create(:payment, :completed, order:, amount: order.total)
 
-                order.process_payments!
                 order.update_attribute(:state, 'canceled')
               end
 

spec/models/spree/order/payment_spec.rb

@@ -15,13 +15,13 @@ module Spree
       create(:credit_card)
     }
     let(:payment1) {
-      create(:payment, amount: 50, payment_method:, source:, response_code: "12345")
+      create(:payment, order:, amount: 50, payment_method:, source:, response_code: "12345")
     }
     let(:payment2) {
-      create(:payment, amount: 50, payment_method:, source:, response_code: "12345")
+      create(:payment, order:, amount: 50, payment_method:, source:, response_code: "12345")
     }
     let(:payment3) {
-      create(:payment, amount: 50, payment_method:, source:, response_code: "12345")
+      create(:payment, order:, amount: 50, payment_method:, source:, response_code: "12345")
     }
     let(:failed_payment) {
       create(:payment, amount: 50, state: 'failed', payment_method:, source:,

spec/models/spree/order_spec.rb

@@ -280,40 +280,31 @@
     end
   end
 
-  context "#process_payments!" do
+  describe "#process_payments!" do
     let(:payment) { build(:payment) }
     before { allow(order).to receive_messages pending_payments: [payment], total: 10 }
 
-    it "should return false if no pending_payments available" do
+    it "returns false if no pending_payments available" do
       allow(order).to receive_messages pending_payments: []
       expect(order.process_payments!).to be_falsy
     end
 
     context "when the processing is sucessful" do
-      it "should process the payments" do
+      it "processes the payments" do
         expect(payment).to receive(:process!)
         expect(order.process_payments!).to be_truthy
       end
-
-      it "stores the payment total on the order" do
-        allow(payment).to receive(:process!)
-        allow(payment).to receive(:completed?).and_return(true)
-
-        order.process_payments!
-
-        expect(order.payment_total).to eq(payment.amount)
-      end
     end
 
     context "when a payment raises a GatewayError" do
       before { expect(payment).to receive(:process!).and_raise(Spree::Core::GatewayError) }
 
-      it "should return true when configured to allow checkout on gateway failures" do
+      it "returns true when configured to allow checkout on gateway failures" do
         Spree::Config.set allow_checkout_on_gateway_error: true
         expect(order.process_payments!).to be_truthy
       end
 
-      it "should return false when not configured to allow checkout on gateway failures" do
+      it "returns false when not configured to allow checkout on gateway failures" do
         Spree::Config.set allow_checkout_on_gateway_error: false
         expect(order.process_payments!).to be_falsy
       end
@@ -1247,8 +1238,7 @@
 
         order.update_shipping_fees!
 
-        item_num = order.line_items.sum(&:quantity)
-        expect(order.reload.adjustment_total).to eq(item_num * shipping_fee)
+        expect(order.reload.adjustment_total).to eq(15) # 3 items * 5
       end
     end
   end

spec/system/consumer/shopping/checkout_paypal_spec.rb

@@ -69,6 +69,7 @@
 
         click_on "Complete order"
         expect(page).to have_content "Your order has been processed successfully"
+        expect(page.find("#amount-paid").text).to have_content "$19.99"
 
         expect(order.reload.state).to eq "complete"
         expect(order.payments.count).to eq 1

spec/system/consumer/shopping/checkout_stripe_spec.rb

@@ -71,6 +71,8 @@
           checkout_with_stripe
 
           expect(page).to have_content "Confirmed"
+          expect(page.find("#amount-paid").text).to have_content "$19.99"
+
           expect(order.reload.completed?).to eq true
           expect(order.payments.first.state).to eq "completed"
         end