Skip to content

Commit 380e29d

Browse files
committed
MAGETWO-91802: Refund amounts are off when Rewards, Store Credit and Gift Card used
- Added math rounding for Reward Points balance - Fixed Gift Card account order comments history - Fixed Gift Card totals block - Added possibility to update totals for changed Store Credit during refund
1 parent a1776ac commit 380e29d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Form/Items.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public function getItemProductBlock($productSku)
5151
*/
5252
public function clickUpdateQty()
5353
{
54-
$this->_rootElement->find($this->updateQty)->click();
54+
$button = $this->_rootElement->find($this->updateQty);
55+
if (!$button->isDisabled()) {
56+
$button->click();
57+
}
5558
}
5659
}

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function processAssert(SalesOrderView $salesOrderView, OrderIndex $orderI
3030
$orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
3131
\PHPUnit\Framework\Assert::assertFalse(
3232
$salesOrderView->getPageActions()->isActionButtonVisible('Credit Memo'),
33-
'Credit memo button is present on order view page.'
33+
'Credit memo button should not be present on order view page.'
3434
);
3535
}
3636

0 commit comments

Comments
 (0)