LYNX-240: Cancel order after refund for offline-paid orders

Author: svera

app/code/Magento/OrderCancellation/Model/CancelOrder.php

@@ -94,14 +94,18 @@ public function execute(
         } else {
             if ($payment->getMethodInstance()->isOffline()) {
                 $this->refundOrder->execute($order->getEntityId());
+                // for partially invoiced orders we need to cancel after doing the refund
+                // so not invoiced items are cancelled and the whole order is set to cancelled
+                $order = $this->orderRepository->get($order->getId());
+                $order->cancel();
             } else {
                 /** @var Order\Invoice $invoice */
                 foreach ($order->getInvoiceCollection() as $invoice) {
                     $this->refundInvoice->execute($invoice->getEntityId());
                 }
+                // in this case order needs to be re-instantiated
+                $order = $this->orderRepository->get($order->getId());
             }
-            // in this case order needs to be re-instantiated
-            $order = $this->orderRepository->get($order->getId());
         }
 
         $result = $this->sender->send(

dev/tests/api-functional/testsuite/Magento/GraphQl/OrderCancellation/CancelOrderTest.php

@@ -559,6 +559,92 @@ public function testCancelOrderAttemptingXSSPassedThroughReasonField()
         $this->assertEquals('closed', $comment->getStatus());
     }
 
+    #[
+        DataFixture(Store::class),
+        DataFixture(
+            Customer::class,
+            [
+                'email' => 'customer@example.com',
+                'password' => 'password'
+            ],
+            'customer'
+        ),
+        DataFixture(ProductFixture::class, as: 'product1'),
+        DataFixture(ProductFixture::class, as: 'product2'),
+        DataFixture(CustomerCart::class, ['customer_id' => '$customer.id$'], as: 'cart'),
+        DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$product1.id$']),
+        DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$product2.id$']),
+        DataFixture(SetBillingAddressFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(SetShippingAddressFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(SetDeliveryMethodFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(SetPaymentMethodFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(PlaceOrderFixture::class, ['cart_id' => '$cart.id$'], 'order'),
+        DataFixture(
+            InvoiceFixture::class,
+            [
+                'order_id' => '$order.id$',
+                'items' => ['$product1.sku$']
+            ],
+            'invoice'
+        ),
+        Config('sales/cancellation/enabled', 1)
+    ]
+    public function testCancelPartiallyInvoicedOrder()
+    {
+        /**
+         * @var $order OrderInterface
+         */
+        $order = DataFixtureStorageManager::getStorage()->get('order');
+        $query = <<<QUERY
+        mutation {
+            cancelOrder(
+              input: {
+                order_id: "{$order->getEntityId()}"
+                reason: "Cancel sample reason"
+              }
+            ){
+                error
+                order {
+                    status
+                }
+            }
+          }
+QUERY;
+        $customerToken = $this->getHeaders();
+
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $customerToken
+        );
+
+        $this->assertEquals(
+            [
+                'cancelOrder' =>
+                    [
+                        'error' => null,
+                        'order' => [
+                            'status' => 'Canceled'
+                        ]
+                    ]
+            ],
+            $response
+        );
+
+        $comments = $order->getStatusHistories();
+
+        $comment = array_pop($comments);
+        $this->assertEquals("We refunded $20.00 offline.", $comment->getComment());
+
+        $comment = array_pop($comments);
+        $this->assertEquals("Order cancellation notification email was sent.", $comment->getComment());
+
+        $comment = array_pop($comments);
+        $this->assertEquals('Cancel sample reason', $comment->getComment());
+        $this->assertEquals('canceled', $comment->getStatus());
+    }
+
     /**
      * @return string[]
      * @throws AuthenticationException|LocalizedException