Skip to content

Commit 468c832

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-5995: Resolved issue #24779 #24845
- Merge Pull Request #24845 from drpayyne/magento2:issue-24779 - Merged commits: 1. 8baeec3 2. 5fc4b45
2 parents db0dce6 + 5fc4b45 commit 468c832

File tree

6 files changed

+100
-15
lines changed

6 files changed

+100
-15
lines changed

‎app/code/Magento/Checkout/view/frontend/templates/button.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
88

99
<?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
10-
<a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>" target="_blank" class="print">
10+
<a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>"
11+
class="action print"
12+
target="_blank"
13+
rel="noopener">
1114
<?= $block->escapeHtml(__('Print receipt')) ?>
1215
</a>
1316
<?= $block->getChildHtml() ?>

‎app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest">
11+
<annotations>
12+
<features value="Customer"/>
13+
<stories value="Customer Order"/>
14+
<title value="Place an order and click print"/>
15+
<description value="Admin panel is not frozen if Storefront is opened via Customer View"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="https://github.com/magento/magento2/pull/24845"/>
18+
<group value="customer"/>
19+
</annotations>
20+
<before>
21+
<createData entity="Simple_US_Customer" stepKey="simpleCustomer"/>
22+
<createData entity="SimpleSubCategory" stepKey="createSimpleCategory"/>
23+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
24+
<requiredEntity createDataKey="createSimpleCategory"/>
25+
</createData>
26+
<actionGroup ref="LoginAsAdmin" stepKey="login"/>
27+
</before>
28+
<after>
29+
<deleteData createDataKey="createSimpleCategory" stepKey="deleteCategory"/>
30+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
31+
<actionGroup ref="logout" stepKey="logout"/>
32+
</after>
33+
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrderPage">
34+
<argument name="customer" value="$simpleCustomer$"/>
35+
</actionGroup>
36+
<actionGroup ref="addSimpleProductToOrder" stepKey="addSecondProduct">
37+
<argument name="product" value="$createSimpleProduct$"/>
38+
</actionGroup>
39+
<actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerInfo">
40+
<argument name="customer" value="$simpleCustomer$"/>
41+
<argument name="address" value="US_Address_TX"/>
42+
</actionGroup>
43+
<actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
44+
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
45+
<grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
46+
47+
<actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
48+
<actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
49+
<actionGroup ref="goToShipmentIntoOrder" stepKey="goToShipment"/>
50+
<actionGroup ref="submitShipmentIntoOrder" stepKey="submitShipment"/>
51+
52+
<!--Create Credit Memo-->
53+
<actionGroup ref="StartToCreateCreditMemoActionGroup" stepKey="startToCreateCreditMemo">
54+
<argument name="orderId" value="{$getOrderId}"/>
55+
</actionGroup>
56+
<actionGroup ref="SubmitCreditMemoActionGroup" stepKey="submitCreditMemo"/>
57+
58+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInCustomer">
59+
<argument name="Customer" value="$$simpleCustomer$$"/>
60+
</actionGroup>
61+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToMyOrdersPage">
62+
<argument name="menu" value="My Orders"/>
63+
</actionGroup>
64+
<click selector="{{StorefrontCustomerOrderSection.viewOrder}}" stepKey="clickViewOrder"/>
65+
<click selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="clickPrintOrderLink"/>
66+
<waitForPageLoad stepKey="waitPageReload"/>
67+
<switchToWindow stepKey="switchToWindow"/>
68+
<switchToPreviousTab stepKey="switchToPreviousTab"/>
69+
70+
<actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBook">
71+
<argument name="menu" value="Address Book"/>
72+
</actionGroup>
73+
<see selector="{{CheckoutOrderSummarySection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}} {{US_Address_TX.city}}, {{US_Address_TX.state}}, {{US_Address_TX.postcode}}" stepKey="checkShippingAddress"/>
74+
</test>
75+
</tests>

‎app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
<?php $_order = $block->getOrder() ?>
88
<div class="actions-toolbar">
99
<a href="<?= $block->escapeUrl($block->getPrintAllCreditmemosUrl($_order)) ?>"
10-
onclick="this.target='_blank'"
11-
class="action print">
10+
class="action print"
11+
target="_blank"
12+
rel="noopener">
1213
<span><?= $block->escapeHtml(__('Print All Refunds')) ?></span>
1314
</a>
1415
</div>
1516
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo) : ?>
1617
<div class="order-title">
1718
<strong><?= $block->escapeHtml(__('Refund #')) ?><?= $block->escapeHtml($_creditmemo->getIncrementId()) ?> </strong>
1819
<a href="<?= $block->escapeUrl($block->getPrintCreditmemoUrl($_creditmemo)) ?>"
19-
onclick="this.target='_blank'"
20-
class="action print">
20+
class="action print"
21+
target="_blank"
22+
rel="noopener">
2123
<span><?= $block->escapeHtml(__('Print Refund')) ?></span>
2224
</a>
2325
</div>

‎app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
<span><?= $block->escapeHtml(__('Reorder')) ?></span>
1717
</a>
1818
<?php endif ?>
19-
<a class="action print"
20-
href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
21-
onclick="this.target='_blank';">
19+
<a href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
20+
class="action print"
21+
target="_blank"
22+
rel="noopener">
2223
<span><?= $block->escapeHtml(__('Print Order')) ?></span>
2324
</a>
2425
<?= $block->getChildHtml() ?>

‎app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
<?php $_order = $block->getOrder() ?>
88
<div class="actions-toolbar">
99
<a href="<?= $block->escapeUrl($block->getPrintAllInvoicesUrl($_order)) ?>"
10+
class="action print"
1011
target="_blank"
11-
class="action print">
12+
rel="noopener">
1213
<span><?= $block->escapeHtml(__('Print All Invoices')) ?></span>
1314
</a>
1415
</div>
1516
<?php foreach ($_order->getInvoiceCollection() as $_invoice) : ?>
1617
<div class="order-title">
1718
<strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
1819
<a href="<?= $block->escapeUrl($block->getPrintInvoiceUrl($_invoice)) ?>"
19-
onclick="this.target='_blank'"
20-
class="action print">
20+
class="action print"
21+
target="_blank"
22+
rel="noopener">
2123
<span><?= $block->escapeHtml(__('Print Invoice')) ?></span>
2224
</a>
2325
</div>

‎app/code/Magento/Shipping/view/frontend/templates/items.phtml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,19 @@
1515
<?= $block->getChildHtml('track-all-link') ?>
1616
<?php endif; ?>
1717
<a href="<?= $block->escapeUrl($block->getPrintAllShipmentsUrl($_order)) ?>"
18-
onclick="this.target='_blank'"
19-
class="action print">
18+
class="action print"
19+
target="_blank"
20+
rel="noopener">
2021
<span><?= $block->escapeHtml(__('Print All Shipments')) ?></span>
2122
</a>
2223
</div>
2324
<?php foreach ($_order->getShipmentsCollection() as $_shipment) : ?>
2425
<div class="order-title">
2526
<strong><?= $block->escapeHtml(__('Shipment #')) ?><?= $block->escapeHtml($_shipment->getIncrementId()) ?></strong>
2627
<a href="<?= $block->escapeUrl($block->getPrintShipmentUrl($_shipment)) ?>"
27-
onclick="this.target='_blank'"
28-
class="action print">
28+
class="action print"
29+
target="_blank"
30+
rel="noopener">
2931
<span><?= $block->escapeHtml(__('Print Shipment')) ?></span>
3032
</a>
3133
<a href="#"

0 commit comments

Comments
 (0)