diff --git a/app/models/spree/payment.rb b/app/models/spree/payment.rb
index 1151d94e92..d2d6bf9e97 100644
--- a/app/models/spree/payment.rb
+++ b/app/models/spree/payment.rb
@@ -206,7 +206,7 @@ module Spree
     end
 
     def update_order
-      order.update!
+      OrderManagement::Order::Updater.new(order).after_payment_update(self)
     end
 
     # Necessary because some payment gateways will refuse payments with
diff --git a/engines/order_management/app/services/order_management/order/updater.rb b/engines/order_management/app/services/order_management/order/updater.rb
index 0aa3a932ef..ade2663328 100644
--- a/engines/order_management/app/services/order_management/order/updater.rb
+++ b/engines/order_management/app/services/order_management/order/updater.rb
@@ -42,7 +42,7 @@ module OrderManagement
       # - adjustment_total - total value of all adjustments
       # - total - order total, it's the equivalent to item_total plus adjustment_total
       def update_totals
-        order.payment_total = payments.completed.sum(:amount)
+        update_payment_total
         update_item_total
         update_adjustment_total
         update_order_total
@@ -53,6 +53,10 @@ module OrderManagement
         shipments.each { |shipment| shipment.update!(order) }
       end
 
+      def update_payment_total
+        order.payment_total = payments.completed.sum(:amount)
+      end
+
       def update_item_total
         order.item_total = line_items.sum('price * quantity')
         update_order_total
@@ -141,6 +145,22 @@ module OrderManagement
         order.ship_address = order.address_from_distributor
       end
 
+      def after_payment_update(payment)
+        if payment.completed? || payment.void?
+          update_payment_total
+        end
+
+        if order.completed?
+          update_payment_state
+          update_shipments
+          update_shipment_state
+        end
+
+        if payment.completed? || order.completed?
+          persist_totals
+        end
+      end
+
       private
 
       def round_money(value)
diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
index 5ec3543894..e7ec842625 100644
--- a/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
+++ b/spec/controllers/spree/admin/orders/payments/payments_controller_refunds_spec.rb
@@ -8,7 +8,7 @@ describe Spree::Admin::PaymentsController, type: :controller do
 
   let!(:shop) { create(:enterprise) }
   let!(:user) { shop.owner }
-  let!(:order) { create(:order, distributor: shop, state: 'complete') }
+  let!(:order) { create(:completed_order_with_totals, distributor: shop) }
   let!(:line_item) { create(:line_item, order: order, price: 5.0) }
 
   before do
diff --git a/spec/models/spree/payment_spec.rb b/spec/models/spree/payment_spec.rb
index 635578ba68..44f9b586bd 100644
--- a/spec/models/spree/payment_spec.rb
+++ b/spec/models/spree/payment_spec.rb
@@ -531,15 +531,46 @@ describe Spree::Payment do
     end
 
     context "#save" do
-      it "should call order#update!" do
-        gateway.name = 'Gateway'
-        gateway.distributors << create(:distributor_enterprise)
-        gateway.save!
+      context "completed payments" do
+        it "updates order payment total" do
+          payment = create(:payment, amount: 100, order: order, state: "completed")
+          expect(order.payment_total).to eq payment.amount
+        end
+      end
 
-        order = create(:order)
-        payment = Spree::Payment.create(amount: 100, order: order, payment_method: gateway)
-        expect(order).to receive(:update!)
-        payment.save
+      context "non-completed payments" do
+        it "doesn't update order payment total" do
+          expect {
+            create(:payment, amount: 100, order: order)
+          }.not_to change { order.payment_total }
+        end
+      end
+
+      context 'when the payment was completed but now void' do
+        let(:payment) { create(:payment, amount: 100, order: order, state: 'completed') }
+
+        it 'updates order payment total' do
+          payment.void
+          expect(order.payment_total).to eq 0
+        end
+      end
+
+      context "completed orders" do
+        let(:order_updater) { OrderManagement::Order::Updater.new(order) }
+
+        before { allow(order).to receive(:completed?) { true } }
+
+        it "updates payment_state and shipments" do
+          expect(OrderManagement::Order::Updater).to receive(:new).with(order).
+            and_return(order_updater)
+
+          expect(order_updater).to receive(:after_payment_update).with(kind_of(Spree::Payment)).
+            and_call_original
+
+          expect(order_updater).to receive(:update_payment_state)
+          expect(order_updater).to receive(:update_shipment_state)
+          create(:payment, amount: 100, order: order)
+        end
       end
 
       context "when profiles are supported" do