Skip to content

Commit 320d74c

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-7658: Cleanup duplicate html class #28639
- Merge Pull Request #28639 from mrtuvn/magento2:cleanup-duplicate-class - Merged commits: 1. f35fb2b 2. add79e6
2 parents 4b41a17 + add79e6 commit 320d74c

File tree

2 files changed

+40
-24
lines changed
  • app/code/Magento/Sales/view/frontend/templates/order/print
  • dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder

2 files changed

+40
-24
lines changed

‎app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,38 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/**
8+
* @var \Magento\Sales\Block\Order\PrintOrder\Shipment $block
9+
* @var \Magento\Framework\Escaper $escaper
10+
*/
611
?>
7-
<?php /* @var $block \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
812
<?php $order = $block->getOrder(); ?>
9-
<?php if (!$block->getObjectData($order, 'is_virtual')) : ?>
10-
<?php foreach ($block->getShipmentsCollection() as $shipment) : ?>
13+
<?php if (!$block->getObjectData($order, 'is_virtual')): ?>
14+
<?php foreach ($block->getShipmentsCollection() as $shipment): ?>
1115
<div class="order-details-items shipments">
1216
<div class="order-title">
13-
<strong><?= $block->escapeHtml(__('Shipment #%1', $block->getObjectData($shipment, 'increment_id'))) ?></strong>
17+
<strong>
18+
<?= $escaper->escapeHtml(
19+
__(
20+
'Shipment #%1',
21+
$block->getObjectData($shipment, 'increment_id')
22+
)
23+
) ?>
24+
</strong>
1425
</div>
1526
<div class="table-wrapper order-items-shipment">
16-
<table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $block->getObjectData($shipment, 'id') ?>">
17-
<caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
27+
<table class="data table table-order-items shipment"
28+
id="my-shipment-table-<?= (int)$block->getObjectData($shipment, 'id') ?>">
29+
<caption class="table-caption"><?= $escaper->escapeHtml(__('Items Invoiced')) ?></caption>
1830
<thead>
19-
<tr>
20-
<th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
21-
<th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
22-
<th class="col price"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
23-
</tr>
31+
<tr>
32+
<th class="col name"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
33+
<th class="col sku"><?= $escaper->escapeHtml(__('SKU')) ?></th>
34+
<th class="col price"><?= $escaper->escapeHtml(__('Qty Shipped')) ?></th>
35+
</tr>
2436
</thead>
25-
<?php foreach ($block->getShipmentItems($shipment) as $item) : ?>
37+
<?php foreach ($block->getShipmentItems($shipment) as $item): ?>
2638
<tbody>
2739
<?= $block->getItemHtml($item) ?>
2840
</tbody>
@@ -31,12 +43,12 @@
3143
</div>
3244
<div class="block block-order-details-view">
3345
<div class="block-title">
34-
<strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
46+
<strong><?= $escaper->escapeHtml(__('Order Information')) ?></strong>
3547
</div>
3648
<div class="block-content">
3749
<div class="box box-order-shipping-address">
3850
<div class="box-title">
39-
<strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
51+
<strong><?= $escaper->escapeHtml(__('Shipping Address')) ?></strong>
4052
</div>
4153
<div class="box-content">
4254
<address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
@@ -45,25 +57,29 @@
4557

4658
<div class="box box-order-shipping-method">
4759
<div class="box-title">
48-
<strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
60+
<strong><?= $escaper->escapeHtml(__('Shipping Method')) ?></strong>
4961
</div>
5062
<div class="box-content">
51-
<?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
63+
<?= $escaper->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
5264
<?php $tracks = $block->getShipmentTracks($shipment);
53-
if ($tracks) : ?>
65+
if ($tracks): ?>
5466
<dl class="order-tracking">
55-
<?php foreach ($tracks as $track) : ?>
56-
<dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
57-
<dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
67+
<?php foreach ($tracks as $track): ?>
68+
<dt class="tracking-title">
69+
<?= $escaper->escapeHtml($block->getObjectData($track, 'title')) ?>
70+
</dt>
71+
<dd class="tracking-content">
72+
<?= $escaper->escapeHtml($block->getObjectData($track, 'number')) ?>
73+
</dd>
5874
<?php endforeach; ?>
5975
</dl>
6076
<?php endif; ?>
6177
</div>
6278
</div>
6379

64-
<div class="box box-order-billing-method">
80+
<div class="box box-order-billing-address">
6581
<div class="box-title">
66-
<strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
82+
<strong><?= $escaper->escapeHtml(__('Billing Address')) ?></strong>
6783
</div>
6884
<div class="box-content">
6985
<address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
@@ -72,7 +88,7 @@
7288

7389
<div class="box box-order-billing-method">
7490
<div class="box-title">
75-
<strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
91+
<strong><?= $escaper->escapeHtml(__('Payment Method')) ?></strong>
7692
</div>
7793
<div class="box-content">
7894
<?= $block->getPaymentInfoHtml() ?>

‎dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/ShipmentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private function assertOrderInformation(OrderInterface $order, string $html): vo
151151
foreach ([$order->getShippingAddress(), $order->getBillingAddress()] as $address) {
152152
$addressBoxXpath = ($address->getAddressType() == 'shipping')
153153
? "//div[contains(@class, 'box-order-shipping-address')]//address[contains(., '%s')]"
154-
: "//div[contains(@class, 'box-order-billing-method')]//address[contains(., '%s')]";
154+
: "//div[contains(@class, 'box-order-billing-address')]//address[contains(., '%s')]";
155155
$this->assertEquals(
156156
1,
157157
Xpath::getElementsCountForXpath(sprintf($addressBoxXpath, $address->getName()), $html),

0 commit comments

Comments
 (0)