Changed OrderAfterUpdated implementation.

Author: Blair2004

app/Events/OrderAfterUpdatedEvent.php

@@ -18,7 +18,7 @@ class OrderAfterUpdatedEvent implements ShouldBroadcast
      *
      * @return void
      */
-    public function __construct( public Order $order, public $fields = [] )
+    public function __construct( public Order $newOrder, public Order $prevOrder, public $fields = [] )
     {
         // ...
     }

app/Listeners/OrderAfterUpdatedEventListener.php

@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use App\Events\OrderAfterPaymentStatusChangedEvent;
 use App\Events\OrderAfterUpdatedEvent;
 use App\Jobs\ComputeDayReportJob;
 use App\Jobs\IncreaseCashierStatsJob;
@@ -32,13 +33,25 @@ public function __construct()
     public function handle( OrderAfterUpdatedEvent $event )
     {
         Bus::chain( [
-            new ProcessCashRegisterHistoryJob( $event->order ),
-            new IncreaseCashierStatsJob( $event->order ),
-            new ProcessCustomerOwedAndRewardsJob( $event->order ),
-            new TrackOrderCouponsJob( $event->order ),
-            new ResolveInstalmentJob( $event->order ),
-            new ProcessAccountingRecordFromSale( $event->order ),
+            new ProcessCashRegisterHistoryJob( $event->newOrder ),
+            new IncreaseCashierStatsJob( $event->newOrder ),
+            new ProcessCustomerOwedAndRewardsJob( $event->newOrder ),
+            new TrackOrderCouponsJob( $event->newOrder ),
+            new ResolveInstalmentJob( $event->newOrder ),
+            new ProcessAccountingRecordFromSale( $event->newOrder ),
             new ComputeDayReportJob,
         ] )->dispatch();
+
+        /**
+         * if the order payment status has changed from the 
+         * previous order, we need to dispatch an event OrderAfterPaymentStatusChangedEvent
+         */
+        if ( $event->newOrder->payment_status != $event->prevOrder->payment_status ) {
+            event( new OrderAfterPaymentStatusChangedEvent( 
+                order: $event->newOrder, 
+                previous: $event->prevOrder->payment_status,
+                new: $event->newOrder->payment_status 
+            ) );
+        }
     }
 }

app/Services/OrdersService.php

@@ -87,6 +87,20 @@ public function __construct(
     public function create( $fields, ?Order $order = null )
     {
         $isNew = ! $order instanceof Order;
+
+        /**
+         * if the order is being edited, we need to
+         * keep a reference to the previous order to be able to compare
+         * the changes that has been made.
+         */
+        if ( $order instanceof Order ) {
+            $order->load( 'payments' );
+            $order->load( 'products' );
+            $order->load( 'coupons' );
+
+            $previousOrder =  clone $order;
+        }
+
         $customer = $this->__customerIsDefined( $fields );
         $fields[ 'products' ] = $this->__buildOrderProducts( $fields['products'] );
 
@@ -210,7 +224,11 @@ public function create( $fields, ?Order $order = null )
          */
         $isNew ?
             event( new OrderAfterCreatedEvent( $order, $fields ) ) :
-            event( new OrderAfterUpdatedEvent( $order, $fields ) );
+            event( new OrderAfterUpdatedEvent(
+                newOrder: $order, 
+                prevOrder: $previousOrder,
+                fields: $fields 
+            ) );
 
         return [
             'status' => 'success',
@@ -2080,7 +2098,7 @@ public function addProducts( Order $order, $products )
      */
     public function refreshOrder( Order $order )
     {
-        $previousPaymentStatus = $order->payment_status;
+        $prevOrder  =   clone $order;
 
         $products = $this->getOrderProducts( $order->id );
 
@@ -2152,9 +2170,10 @@ public function refreshOrder( Order $order )
 
         $order->save();
 
-        if ( $previousPaymentStatus !== $order->payment_status ) {
-            OrderAfterPaymentStatusChangedEvent::dispatch( $order, $previousPaymentStatus, $order->payment_status );
-        }
+        event( new OrderAfterUpdatedEvent(
+            newOrder: $order,
+            prevOrder: $prevOrder
+        ) );
 
         return [
             'status' => 'success',