Skip to content

Commit 04049c0

Browse files
committed
MC-20639: MyAccount :: Order Details :: Refund (creditMemo) Details by Order Number
- CR comments
1 parent 8eba387 commit 04049c0

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Magento\Sales\Model\Order;
1818
use Magento\Sales\Model\Order\CreditmemoFactory;
1919
use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
20+
use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection;
2021
use Magento\Sales\Model\Service\CreditmemoService;
2122
use Magento\TestFramework\Helper\Bootstrap;
2223
use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -53,9 +54,6 @@ class CreditmemoTest extends GraphQlAbstract
5354
/** @var SearchCriteriaBuilder */
5455
private $searchCriteriaBuilder;
5556

56-
/** @var string */
57-
private $orderNumber;
58-
5957
/**
6058
* Set up
6159
*/
@@ -76,8 +74,8 @@ protected function setUp(): void
7674

7775
protected function tearDown(): void
7876
{
77+
$this->cleanUpCreditMemos();
7978
$this->deleteOrder();
80-
$this->cleanUpCreditMemos($this->orderNumber);
8179
}
8280

8381
/**
@@ -174,10 +172,9 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
174172
['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
175173
);
176174
$orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
177-
$this->orderNumber = $orderNumber;
178-
$this->prepareInvoice($this->orderNumber, 2);
175+
$this->prepareInvoice($orderNumber, 2);
179176

180-
$order = $this->order->loadByIncrementId($this->orderNumber);
177+
$order = $this->order->loadByIncrementId($orderNumber);
181178
/** @var Order\Item $orderItem */
182179
$orderItem = current($order->getAllItems());
183180
$orderItem->setQtyRefunded(1);
@@ -277,10 +274,8 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
277274
['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
278275
);
279276
$orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
280-
$this->orderNumber = $orderNumber;
281-
$this->prepareInvoice($this->orderNumber, 2);
282-
283-
$order = $this->order->loadByIncrementId($this->orderNumber);
277+
$this->prepareInvoice($orderNumber, 2);
278+
$order = $this->order->loadByIncrementId($orderNumber);
284279
/** @var Order\Item $orderItem */
285280
$orderItem = current($order->getAllItems());
286281
$orderItem->setQtyRefunded(1);
@@ -427,17 +422,21 @@ private function deleteOrder(): void
427422
}
428423

429424
/**
430-
* @param $orderNumber
425+
* @return void
431426
*/
432-
private function cleanUpCreditMemos($orderNumber): void
427+
private function cleanUpCreditMemos(): void
433428
{
429+
/** @var \Magento\Framework\Registry $registry */
430+
$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
431+
$registry->unregister('isSecureArea');
432+
$registry->register('isSecureArea', true);
434433
$creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
435-
$searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
436-
->create();
437-
$creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
438-
foreach ($creditmemos as $creditmemo) {
434+
$creditmemoCollection = Bootstrap::getObjectManager()->create(Collection::class);
435+
foreach ($creditmemoCollection as $creditmemo) {
439436
$creditmemoRepository->delete($creditmemo);
440437
}
438+
$registry->unregister('isSecureArea');
439+
$registry->register('isSecureArea', false);
441440
}
442441

443442
/**

0 commit comments

Comments
 (0)