Merge pull request #188 from michielgerritsen/bugfix/cancel-order

Bugfix: A canceled order would result in an exception
mollie · Aug 9, 2019 · 07c2131 · 07c2131
2 parents 0a72757 + 67b0687
commit 07c2131
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Helper/General.php b/Helper/General.php
@@ -817,7 +817,7 @@ public function registerCancellation(OrderInterface $order, $status = null)
             $this->addTolog('info', $order->getIncrementId() . ' ' . $comment);
             $this->orderCommentHistory->add($order, $comment);
             $order->getPayment()->setMessage($comment);
-            $this->orderManagement->cancel($order);
+            $this->orderManagement->cancel($order->getId());
 
             if ($order->getCouponCode()) {
                 $this->resetCouponAfterCancellation($order);

diff --git a/Test/Unit/Helper/GeneralTest.php b/Test/Unit/Helper/GeneralTest.php
@@ -129,7 +129,7 @@ public function testRegisterCancellationReturnsFalseWhenAlreadyCanceled()
     public function testRegisterCancellationCancelsTheOrder()
     {
         $orderManagementMock = $this->createMock(OrderManagementInterface::class);
-        $orderManagementMock->expects($this->once())->method('cancel');
+        $orderManagementMock->expects($this->once())->method('cancel')->with(999);
 
         /** @var OrderModel $order */
         $order = $this->createPartialMock(OrderModel::class, ['cancel']);