Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

Commit

Permalink
Fixed issue #24779
Browse files Browse the repository at this point in the history
  • Loading branch information
drpayyne committed Oct 4, 2019
1 parent 419fbf3 commit 8baeec3
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
<?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>

<?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
<a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>" target="_blank" class="print">
<a href="<?= $block->escapeUrl($block->getPrintUrl()) ?>"
class="action print"
target="_blank"
rel="noopener">
<?= $block->escapeHtml(__('Print receipt')) ?>
</a>
<?= $block->getChildHtml() ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
<?php $_order = $block->getOrder() ?>
<div class="actions-toolbar">
<a href="<?= $block->escapeUrl($block->getPrintAllCreditmemosUrl($_order)) ?>"
onclick="this.target='_blank'"
class="action print">
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print All Refunds')) ?></span>
</a>
</div>
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo) : ?>
<div class="order-title">
<strong><?= $block->escapeHtml(__('Refund #')) ?><?= $block->escapeHtml($_creditmemo->getIncrementId()) ?> </strong>
<a href="<?= $block->escapeUrl($block->getPrintCreditmemoUrl($_creditmemo)) ?>"
onclick="this.target='_blank'"
class="action print">
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print Refund')) ?></span>
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
<span><?= $block->escapeHtml(__('Reorder')) ?></span>
</a>
<?php endif ?>
<a class="action print"
href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
onclick="this.target='_blank';">
<a href="<?= $block->escapeUrl($block->getPrintUrl($_order)) ?>"
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print Order')) ?></span>
</a>
<?= $block->getChildHtml() ?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
<?php $_order = $block->getOrder() ?>
<div class="actions-toolbar">
<a href="<?= $block->escapeUrl($block->getPrintAllInvoicesUrl($_order)) ?>"
class="action print"
target="_blank"
class="action print">
rel="noopener">
<span><?= $block->escapeHtml(__('Print All Invoices')) ?></span>
</a>
</div>
<?php foreach ($_order->getInvoiceCollection() as $_invoice) : ?>
<div class="order-title">
<strong><?= $block->escapeHtml(__('Invoice #')) ?><?= $block->escapeHtml($_invoice->getIncrementId()) ?></strong>
<a href="<?= $block->escapeUrl($block->getPrintInvoiceUrl($_invoice)) ?>"
onclick="this.target='_blank'"
class="action print">
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print Invoice')) ?></span>
</a>
</div>
Expand Down
10 changes: 6 additions & 4 deletions app/code/Magento/Shipping/view/frontend/templates/items.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
<?= $block->getChildHtml('track-all-link') ?>
<?php endif; ?>
<a href="<?= $block->escapeUrl($block->getPrintAllShipmentsUrl($_order)) ?>"
onclick="this.target='_blank'"
class="action print">
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print All Shipments')) ?></span>
</a>
</div>
<?php foreach ($_order->getShipmentsCollection() as $_shipment) : ?>
<div class="order-title">
<strong><?= $block->escapeHtml(__('Shipment #')) ?><?= $block->escapeHtml($_shipment->getIncrementId()) ?></strong>
<a href="<?= $block->escapeUrl($block->getPrintShipmentUrl($_shipment)) ?>"
onclick="this.target='_blank'"
class="action print">
class="action print"
target="_blank"
rel="noopener">
<span><?= $block->escapeHtml(__('Print Shipment')) ?></span>
</a>
<a href="#"
Expand Down

0 comments on commit 8baeec3

Please sign in to comment.