Skip to content

Commit 87d9218

Browse files
MTA-3901: Add variation for Partial Refund an order placed through Braintree with Partial capture
1 parent df4fbec commit 87d9218

File tree

7 files changed

+23
-30
lines changed

7 files changed

+23
-30
lines changed

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreePaypalTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
</data>
5555
<data name="order/data/price/refund" xsi:type="array">
5656
<item name="0" xsi:type="array">
57+
<item name="grand_creditmemo_total" xsi:type="string">621.20</item>
58+
</item>
59+
<item name="1" xsi:type="array">
5760
<item name="grand_creditmemo_total" xsi:type="string">606.20</item>
5861
</item>
5962
</data>

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOnlineCreditMemoBraintreeTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@
8383
</data>
8484
<data name="order/data/price/refund" xsi:type="array">
8585
<item name="0" xsi:type="array">
86-
<item name="grand_creditmemo_total" xsi:type="string">1.08</item>
86+
<item name="grand_creditmemo_total" xsi:type="string">134.07</item>
8787
</item>
8888
<item name="1" xsi:type="array">
89-
<item name="grand_creditmemo_total" xsi:type="string">134.07</item>
89+
<item name="grand_creditmemo_total" xsi:type="string">1.08</item>
9090
</item>
9191
</data>
9292
<data name="transactions/refund" xsi:type="array">

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractItems.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public function getData()
111111
* @param ElementInterface $item
112112
* @return null|int
113113
*/
114-
private function getQty(ElementInterface $item)
114+
protected function getQty(ElementInterface $item)
115115
{
116116
$qty = null;
117117
$elements = $item->getElements($this->qty);
@@ -127,7 +127,7 @@ private function getQty(ElementInterface $item)
127127
* @param ElementInterface $item
128128
* @return string
129129
*/
130-
private function getSku(ElementInterface $item)
130+
protected function getSku(ElementInterface $item)
131131
{
132132
$itemContent = $item->find($this->sku)->getText();
133133
$itemContent = preg_replace('/\n|\r/', '', $itemContent);

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Shipment/View/Items.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
use Magento\Sales\Test\Block\Adminhtml\Order\AbstractItems;
1010

1111
/**
12-
* Class Items
13-
* Shipment Items block on Shipment view page
12+
* Shipment Items block on Shipment view page.
1413
*/
1514
class Items extends AbstractItems
1615
{
1716
/**
18-
* Get items data
17+
* Get items data.
1918
*
2019
* @return array
2120
*/
@@ -27,8 +26,9 @@ public function getData()
2726
foreach ($items as $item) {
2827
$itemData = [];
2928

30-
$itemData += $this->parseProductName($item->find($this->product)->getText());
31-
$itemData['qty'] = $item->find($this->qty)->getText();
29+
$itemData['product'] = preg_replace('/\n|\r/', '', $item->find($this->title)->getText());
30+
$itemData['sku'] = $this->getSku($item);
31+
$itemData['qty'] = $this->getQty($item);
3232

3333
$data[] = $itemData;
3434
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function processAssert(
3939
$salesOrder->open();
4040
$salesOrder->getSalesOrderGrid()->searchAndOpen(['id' => $orderId]);
4141
$refundedPrices = $order->getPrice()['refund'];
42-
$actualRefundedAmount = $salesOrderView->getOrderHistoryBlock()->getRefundedAmount();
42+
$actualRefundedAmount = array_reverse($salesOrderView->getOrderHistoryBlock()->getRefundedAmount());
4343
foreach ($refundedPrices as $key => $refundedPrice) {
4444
\PHPUnit_Framework_Assert::assertRegExp(
4545
sprintf(self::REFUNDED_AMOUNT_PATTERN, $refundedPrice['grand_creditmemo_total']),

dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/SubmitOrderStep.php

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
use Magento\Customer\Test\Fixture\Address;
1010
use Magento\Customer\Test\Fixture\Customer;
11-
use Magento\Sales\Test\Fixture\OrderInjectable;
1211
use Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex;
1312
use Magento\Sales\Test\Page\Adminhtml\SalesOrderView;
1413
use Magento\Mtf\Fixture\FixtureFactory;
@@ -61,20 +60,12 @@ class SubmitOrderStep implements TestStepInterface
6160
*/
6261
private $products;
6362

64-
/**
65-
* Fixture OrderInjectable.
66-
*
67-
* @var OrderInjectable
68-
*/
69-
private $order;
70-
7163
/**
7264
* @param OrderCreateIndex $orderCreateIndex
7365
* @param SalesOrderView $salesOrderView
7466
* @param FixtureFactory $fixtureFactory
7567
* @param Customer $customer
7668
* @param \Magento\Mtf\Fixture\FixtureInterface[] $products
77-
* @param OrderInjectable|null $order
7869
* @param Address|null $billingAddress
7970
*/
8071
public function __construct(
@@ -83,16 +74,15 @@ public function __construct(
8374
FixtureFactory $fixtureFactory,
8475
Customer $customer,
8576
array $products,
86-
OrderInjectable $order = null,
8777
Address $billingAddress = null
8878
) {
8979
$this->orderCreateIndex = $orderCreateIndex;
9080
$this->salesOrderView = $salesOrderView;
9181
$this->fixtureFactory = $fixtureFactory;
9282
$this->customer = $customer;
9383
$this->products = $products;
94-
$this->order = $order;
9584
$this->billingAddress = $billingAddress;
85+
$this->products = $products;
9686
}
9787

9888
/**
@@ -105,16 +95,16 @@ public function run()
10595
$this->orderCreateIndex->getCreateBlock()->submitOrder();
10696
$this->salesOrderView->getMessagesBlock()->waitSuccessMessage();
10797
$orderId = trim($this->salesOrderView->getTitleBlock()->getTitle(), '#');
108-
$data = [
109-
'id' => $orderId,
110-
'customer_id' => ['customer' => $this->customer],
111-
'entity_id' => ['products' => $this->products],
112-
'billing_address_id' => ['billingAddress' => $this->billingAddress],
113-
];
114-
$orderData = $this->order !== null ? $this->order->getData() : [];
11598
$order = $this->fixtureFactory->createByCode(
11699
'orderInjectable',
117-
['data' => array_merge($data, $orderData)]
100+
[
101+
'data' => [
102+
'id' => $orderId,
103+
'customer_id' => ['customer' => $this->customer],
104+
'entity_id' => ['products' => $this->products],
105+
'billing_address_id' => ['billingAddress' => $this->billingAddress],
106+
]
107+
]
118108
);
119109

120110
return ['orderId' => $orderId, 'order' => $order];

dev/tests/functional/tests/app/Magento/Shipping/Test/Block/Adminhtml/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function fillData(array $data, $products = null)
7474
}
7575
if (isset($data['items_data']) && $products !== null) {
7676
foreach ($products as $key => $product) {
77-
$this->getItemsBlock()->getItemProductBlock($product)->fillProduct($data['items_data'][$key]);
77+
$this->getItemsBlock()->getItemProductBlock($product->getSku())->fillProduct($data['items_data'][$key]);
7878
}
7979
}
8080
}

0 commit comments

Comments
 (0)