From 2d647be8b4c266abaaff069273e8cdf6ed683ddf Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sat, 3 Apr 2021 16:14:38 +0100
Subject: [PATCH] Rename #charge_shipping_and_payment_fees! to
 #set_payment_amount!

This method sets the order's payment amount during the checkout. It doesn't really have anything to do with shipping or payment fees...
---
 app/models/spree/order.rb          | 2 +-
 app/models/spree/order/checkout.rb | 2 +-
 spec/models/spree/order_spec.rb    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index faac4a7089..847502d0aa 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -788,7 +788,7 @@ module Spree
     # before the shipping method is set. This results in the customer not being
     # charged for their order's shipping. To fix this, we refresh the payment
     # amount here.
-    def charge_shipping_and_payment_fees!
+    def set_payment_amount!
       update_totals
       return unless pending_payments.any?
 
diff --git a/app/models/spree/order/checkout.rb b/app/models/spree/order/checkout.rb
index 9ffdebe724..bb12e58261 100644
--- a/app/models/spree/order/checkout.rb
+++ b/app/models/spree/order/checkout.rb
@@ -82,7 +82,7 @@ module Spree
               after_transition to: :delivery, do: :create_tax_charge!
               after_transition to: :resumed,  do: :after_resume
               after_transition to: :canceled, do: :after_cancel
-              after_transition to: :payment, do: :charge_shipping_and_payment_fees!
+              after_transition to: :payment, do: :set_payment_amount!
             end
           end
 
diff --git a/spec/models/spree/order_spec.rb b/spec/models/spree/order_spec.rb
index 58895613e9..a6129dc4cb 100644
--- a/spec/models/spree/order_spec.rb
+++ b/spec/models/spree/order_spec.rb
@@ -1268,7 +1268,7 @@ describe Spree::Order do
     end
   end
 
-  describe '#charge_shipping_and_payment_fees!' do
+  describe '#set_payment_amount!' do
     let(:order) do
       shipment = build(:shipment_with, :shipping_method, shipping_method: build(:shipping_method))
       build(:order, shipments: [shipment] )
@@ -1281,8 +1281,8 @@ describe Spree::Order do
         allow(order).to receive(:payment_required?) { true }
       end
 
-      it 'calls charge_shipping_and_payment_fees! and updates totals' do
-        expect(order).to receive(:charge_shipping_and_payment_fees!)
+      it 'calls #set_payment_amount! and updates totals' do
+        expect(order).to receive(:set_payment_amount!)
         expect(order).to receive(:update_totals).at_least(:once)
 
         order.next