Fix order cancellation when source items have been removed

AmpersandHQ · Jul 14, 2023 · 9cbfbb7 · 9cbfbb7
1 parent 9a95e10
commit 9cbfbb7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Observer/CancelOrderItemObserver.php b/src/Observer/CancelOrderItemObserver.php
@@ -52,6 +52,6 @@ public function execute(EventObserver $observer): void
             return;
         }
 
-        $this->executeSourceDeductionForItems->executeSourceDeductionForItems($orderItem, $itemsToCancel);
+        $this->executeSourceDeductionForItems->executeSourceDeductionForItems($orderItem, $itemsToCancel, true);
     }
 }
diff --git a/src/Service/ExecuteSourceDeductionForItems.php b/src/Service/ExecuteSourceDeductionForItems.php
@@ -113,9 +113,10 @@ public function __construct(
     /**
      * @param OrderItem $orderItem
      * @param array $itemsToCancel
+     * @param bool $graceful
      * @throws NoSuchEntityException
      */
-    public function executeSourceDeductionForItems(OrderItem $orderItem, array $itemsToCancel)
+    public function executeSourceDeductionForItems(OrderItem $orderItem, array $itemsToCancel, bool $graceful = false)
     {
         $order = $orderItem->getOrder();
 
@@ -163,7 +164,13 @@ public function executeSourceDeductionForItems(OrderItem $orderItem, array $item
                     'salesEvent' => $salesEvent
                 ]);
 
-                $this->sourceDeductionService->execute($sourceDeductionRequest);
+                try {
+                    $this->sourceDeductionService->execute($sourceDeductionRequest);
+                } catch (NoSuchEntityException $noSuchEntityException) {
+                    if (!$graceful) {
+                        throw $noSuchEntityException;
+                    }
+                }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,6 @@ public function execute(EventObserver $observer): void @@
                 return;
             }
-            $this->executeSourceDeductionForItems->executeSourceDeductionForItems($orderItem, $itemsToCancel);
+            $this->executeSourceDeductionForItems->executeSourceDeductionForItems($orderItem, $itemsToCancel, true);
         }
     }