Skip to content

Commit 00941cb

Browse files
ENGCOM-6108: [Shipping] Changing the tracking number confirmation modal style #25094
2 parents a8c2bf8 + 18fa0eb commit 00941cb

File tree

4 files changed

+79
-4
lines changed

4 files changed

+79
-4
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminDeleteTrackingNumberActionGroup">
12+
<arguments>
13+
<argument name="message" type="string" defaultValue="Are you sure?"/>
14+
</arguments>
15+
16+
<click selector="{{AdminShipmentTrackingSection.deleteTrackingNumber}}" stepKey="clickDeleteButton"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
<waitForElementVisible selector="{{AdminGridConfirmActionSection.message}}" stepKey="waitForConfirmModal"/>
19+
<see selector="{{AdminGridConfirmActionSection.message}}" userInput="{{message}}" stepKey="seeRemoveMessage"/>
20+
<click selector="{{AdminGridConfirmActionSection.ok}}" stepKey="clickOkButton"/>
21+
</actionGroup>
22+
</actionGroups>

app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentTrackingSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<element name="trackingNumber" type="text" selector="#tracking-shipping-form #tracking_number"/>
1313
<element name="trackingTitle" type="text" selector="#tracking-shipping-form #tracking_title"/>
1414
<element name="addTrackingNumber" type="button" selector="#tracking-shipping-form button.save"/>
15+
<element name="deleteTrackingNumber" type="button" selector="#tracking-shipping-form button.action-delete"/>
1516
<element name="trackingInfoErrorElement" type="text" selector="#tracking-shipping-form #{{inputName}}-error" parameterized="true" />
1617
</section>
1718
</sections>
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCheckTheConfirmationPopupTest">
12+
<annotations>
13+
<stories value="Admin confirmation modal should be in Magento style"/>
14+
<title value="Admin confirmation modal should be in Magento style"/>
15+
<description value="Testing the confirmation modal for removing the tracking number"/>
16+
<severity value="CRITICAL"/>
17+
<group value="shipping"/>
18+
</annotations>
19+
<before>
20+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
21+
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
22+
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
23+
</before>
24+
<after>
25+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
26+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
27+
<actionGroup ref="logout" stepKey="logout"/>
28+
</after>
29+
<actionGroup ref="CreateOrderActionGroup" stepKey="goToCreateOrderPage">
30+
<argument name="customer" value="$$createCustomer$$"/>
31+
<argument name="product" value="$$createSimpleProduct$$"/>
32+
</actionGroup>
33+
<grabTextFrom selector="|Order # (\d+)|" stepKey="orderId"/>
34+
<actionGroup ref="AdminShipThePendingOrderActionGroup" stepKey="createShipmentForOrder"/>
35+
<actionGroup ref="FilterShipmentGridByOrderIdActionGroup" stepKey="filterForNewlyCreatedShipment">
36+
<argument name="orderId" value="$orderId"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="selectShipmentFromGrid"/>
39+
<actionGroup ref="AdminAddTrackingNumberToShipmentActionGroup" stepKey="addTrackingNumber">
40+
<argument name="trackingNumber" value="123123"/>
41+
</actionGroup>
42+
<actionGroup ref="AdminDeleteTrackingNumberActionGroup" stepKey="deleteTrackingNumber"/>
43+
</test>
44+
</tests>

app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</div>
7474

7575
<script>
76-
require(['prototype', 'jquery'], function(prototype, $j) {
76+
require(['prototype', 'jquery', 'Magento_Ui/js/modal/confirm'], function(prototype, $j, confirm) {
7777
//<![CDATA[
7878
function selectCarrier(elem) {
7979
var option = elem.options[elem.selectedIndex];
@@ -89,9 +89,17 @@ function saveTrackingInfo(node, url) {
8989
}
9090

9191
function deleteTrackingNumber(url) {
92-
if (confirm('<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>')) {
93-
submitAndReloadArea($('shipment_tracking_info').parentNode, url)
94-
}
92+
confirm({
93+
content: '<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>',
94+
actions: {
95+
/**
96+
* Confirm action.
97+
*/
98+
confirm: function () {
99+
submitAndReloadArea($('shipment_tracking_info').parentNode, url);
100+
}
101+
}
102+
});
95103
}
96104

97105
window.selectCarrier = selectCarrier;

0 commit comments

Comments
 (0)