Skip to content

Commit 424474b

Browse files
topanoktopanok
committed
Issue-27474 Removed info blocks and transferred logic from info block templates to form templates
1 parent 2530e04 commit 424474b

File tree

12 files changed

+182
-248
lines changed

12 files changed

+182
-248
lines changed

‎app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form/Info.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form/Info.php

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<referenceContainer name="content">
1313
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View" name="sales_creditmemo_view">
1414
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form" name="form" template="Magento_Sales::order/creditmemo/view/form.phtml">
15-
<block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form\Info" name="creditmemo_info" template="Magento_Sales::order/creditmemo/view/form/info.phtml"/>
1615
<block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml">
1716
<container name="extra_customer_info"/>
1817
</block>

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<referenceContainer name="content">
1414
<block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View" name="sales_invoice_view">
1515
<block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form" name="form" template="Magento_Sales::order/invoice/view/form.phtml">
16-
<block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form\Info" name="invoice_info" template="Magento_Sales::order/invoice/view/form/info.phtml"/>
1716
<block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml">
1817
<container name="extra_customer_info"/>
1918
</block>

‎app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,63 @@
88

99
/* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form $block */
1010
/* @var \Magento\Tax\Helper\Data $helper */
11+
/* @var \Magento\Framework\Escaper $escaper */
1112
?>
1213

1314
<?php $helper = $this->helper(\Magento\Tax\Helper\Data::class); ?>
14-
<?php $_order = $block->getCreditmemo()->getOrder() ?>
15-
<?= $block->getChildHtml('creditmemo_info') ?>
15+
<?php $_creditMemo = $block->getCreditmemo(); ?>
16+
<?php $_order = $_creditMemo->getOrder() ?>
17+
18+
<?php
19+
$creditMemoStatus = isset($_creditMemo->getStates()[$_creditMemo->getState()])
20+
? $_creditMemo->getStates()[$_creditMemo->getState()]
21+
: null;
22+
$memoAdminDate = $block->formatDate(
23+
$block->getCreatedAtAdminDate($_creditMemo->getCreatedAt()),
24+
\IntlDateFormatter::MEDIUM,
25+
true
26+
);
27+
?>
28+
29+
<div class="admin__page-section creditmemo-view-information">
30+
<div class="admin__page-section-title">
31+
<span class="title"><?= $escaper->escapeHtml(__('Credit Memo Information')) ?></span>
32+
</div>
33+
<div class="admin__page-section-content">
34+
<div class="admin__page-section-item creditmemo-information">
35+
<div class="admin__page-section-item-title">
36+
<?php $confirmationEmailStatusMessage = $_creditMemo->getEmailSent()
37+
? __('The credit memo confirmation email was sent')
38+
: __('The credit memo confirmation email is not sent');
39+
?>
40+
<span class="title">
41+
<?= $escaper->escapeHtml(__('Memo # %1', $_creditMemo->getIncrementId())) ?>
42+
(<span><?= $escaper->escapeHtml($confirmationEmailStatusMessage) ?></span>)
43+
</span>
44+
</div>
45+
<div class="admin__page-section-item-content">
46+
<table class="admin__table-secondary creditmemo-information-table">
47+
<tr>
48+
<th><?= $escaper->escapeHtml(__('Credit Memo Date')) ?></th>
49+
<td><?= $escaper->escapeHtml($memoAdminDate) ?></td>
50+
</tr>
51+
<?php if ($creditMemoStatus): ?>
52+
<tr>
53+
<th><?= $escaper->escapeHtml(__('Status')) ?></th>
54+
<td><?= $escaper->escapeHtml($creditMemoStatus) ?></td>
55+
</tr>
56+
<?php endif; ?>
57+
</table>
58+
</div>
59+
</div>
60+
</div>
61+
</div>
62+
1663
<?= $block->getChildHtml('order_info') ?>
64+
1765
<section class="admin__page-section">
1866
<div class="admin__page-section-title">
19-
<span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
67+
<span class="title"><?= $escaper->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
2068
</div>
2169
<div class="admin__page-section-content">
2270

@@ -27,12 +75,14 @@
2775
<?php endif; ?>
2876
<?php /* Billing Address */?>
2977
<div class="admin__page-section-item-title">
30-
<span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
78+
<span class="title"><?= $escaper->escapeHtml(__('Payment Information')) ?></span>
3179
</div>
3280
<div class="admin__page-section-item-content">
3381
<div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
3482
<div class="order-payment-currency">
35-
<?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
83+
<?= $escaper->escapeHtml(
84+
__('The order was placed using %1.', $_order->getOrderCurrencyCode())
85+
); ?>
3686
</div>
3787
<div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
3888
</div>
@@ -42,14 +92,14 @@
4292
<div class="admin__page-section-item order-shipping-address">
4393
<?php /* Shipping Address */ ?>
4494
<div class="admin__page-section-item-title">
45-
<span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
95+
<span class="title"><?= $escaper->escapeHtml(__('Shipping Information')) ?></span>
4696
</div>
4797
<div class="shipping-description-wrapper admin__page-section-item-content">
4898
<div class="shipping-description-title">
49-
<?= $block->escapeHtml($_order->getShippingDescription()) ?>
99+
<?= $escaper->escapeHtml($_order->getShippingDescription()) ?>
50100
</div>
51101
<div class="shipping-description-content">
52-
<?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
102+
<?= $escaper->escapeHtml(__('Total Shipping Charges')) ?>:
53103

54104
<?php if ($helper->displayShippingPriceIncludingTax()): ?>
55105
<?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -60,7 +110,7 @@
60110

61111
<?= /* @noEscape */ $_excl ?>
62112
<?php if ($helper->displayShippingBothPrices() && $_incl != $_excl): ?>
63-
(<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
113+
(<?= $escaper->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
64114
<?php endif; ?>
65115
</div>
66116
</div>
@@ -77,26 +127,26 @@
77127
<?php else: ?>
78128
<section class="admin__page-section">
79129
<div class="admin__page-section-title">
80-
<span class="title"><?= $block->escapeHtml(__('Items Refunded')) ?></span>
130+
<span class="title"><?= $escaper->escapeHtml(__('Items Refunded')) ?></span>
81131
</div>
82-
<div class="no-items admin__page-section-content"><?= $block->escapeHtml(__('No Items')) ?></div>
132+
<div class="no-items admin__page-section-content"><?= $escaper->escapeHtml(__('No Items')) ?></div>
83133
</section>
84134
<?php endif; ?>
85135

86136
<section class="admin__page-section">
87137
<div class="admin__page-section-title">
88-
<span class="title"><?= $block->escapeHtml(__('Memo Total')) ?></span>
138+
<span class="title"><?= $escaper->escapeHtml(__('Memo Total')) ?></span>
89139
</div>
90140
<div class="admin__page-section-content">
91141
<div class="admin__page-section-item order-comments-history">
92142
<div class="admin__page-section-item-title">
93-
<span class="title"><?= $block->escapeHtml(__('Credit Memo History')) ?></span>
143+
<span class="title"><?= $escaper->escapeHtml(__('Credit Memo History')) ?></span>
94144
</div>
95145
<div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
96146
</div>
97147
<div class="admin__page-section-item order-totals" id="history_form">
98148
<div class="admin__page-section-item-title">
99-
<span class="title"><?= $block->escapeHtml(__('Credit Memo Totals')) ?></span>
149+
<span class="title"><?= $escaper->escapeHtml(__('Credit Memo Totals')) ?></span>
100150
</div>
101151
<div class="admin__page-section-content"><?= $block->getChildHtml('creditmemo_totals') ?></div>
102152
</div>

‎app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form/info.phtml

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml

Lines changed: 55 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,71 @@
88

99
/* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form $block */
1010
/* @var \Magento\Tax\Helper\Data $helper */
11+
/* @var \Magento\Framework\Escaper $escaper */
1112
?>
13+
1214
<?php $helper = $this->helper(\Magento\Tax\Helper\Data::class); ?>
1315
<?php $_invoice = $block->getInvoice() ?>
1416
<?php $_order = $_invoice->getOrder() ?>
15-
<?= $block->getChildHtml('invoice_info') ?>
17+
18+
<?php $invoiceAdminDate = $block->formatDate(
19+
$block->getCreatedAtAdminDate($_invoice->getCreatedAt()),
20+
\IntlDateFormatter::MEDIUM,
21+
true
22+
);
23+
?>
24+
25+
<section class="admin__page-section invoice-view-information">
26+
<div class="admin__page-section-title">
27+
<span class="title"><?= $escaper->escapeHtml(__('Invoice Information')) ?></span>
28+
</div>
29+
<div class="admin__page-section-content">
30+
<div class="invoice-information">
31+
<div class="admin__page-section-item-title">
32+
<?php $confirmationEmailStatusMessage = $_invoice->getEmailSent()
33+
? __('The invoice confirmation email was sent')
34+
: __('The invoice confirmation email is not sent');
35+
?>
36+
<span class="title">
37+
<?= $escaper->escapeHtml(__('Invoice # %1', $_invoice->getIncrementId())) ?>
38+
(<span><?= $escaper->escapeHtml($confirmationEmailStatusMessage) ?></span>)
39+
</span>
40+
</div>
41+
<div class="admin__page-section-item-content">
42+
<table class="admin__table-secondary invoice-information-table">
43+
<tr>
44+
<th><?= $escaper->escapeHtml(__('Invoice Date')) ?></th>
45+
<td><?= $escaper->escapeHtml($invoiceAdminDate) ?></td>
46+
</tr>
47+
<?php if ($_invoice->getTransactionId()): ?>
48+
<tr>
49+
<th><?= $escaper->escapeHtml(__('Transaction ID')) ?></th>
50+
<td><?= $escaper->escapeHtml($_invoice->getTransactionId()) ?></td>
51+
</tr>
52+
<?php endif; ?>
53+
</table>
54+
</div>
55+
</div>
56+
</div>
57+
</section>
58+
1659
<?= $block->getChildHtml('order_info') ?>
1760

1861
<section class="admin__page-section order-view-billing-shipping">
1962
<div class="admin__page-section-title">
20-
<span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
63+
<span class="title"><?= $escaper->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
2164
</div>
2265
<div class="admin__page-section-content">
2366
<?php $additionalClass = $_order->getIsVirtual() ? ' order-payment-method-virtual' : '' ?>
2467
<div class="admin__page-section-item order-payment-method<?= /* @noEscape */ $additionalClass ?>">
2568
<?php /*Billing Address */ ?>
2669
<div class="admin__page-section-item-title">
27-
<span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
70+
<span class="title"><?= $escaper->escapeHtml(__('Payment Information')) ?></span>
2871
</div>
2972
<div class="admin__page-section-item-content">
3073
<div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
3174
<div class="order-payment-currency">
32-
<?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
75+
<?= $escaper->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
3376
</div>
3477
<div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
3578
</div>
@@ -39,14 +82,14 @@
3982
<div class="admin__page-section-item order-shipping-address">
4083
<?php /*Shipping Address */ ?>
4184
<div class="admin__page-section-item-title">
42-
<span class="title"><?= $block->escapeHtml(__('Shipping Information')) ?></span>
85+
<span class="title"><?= $escaper->escapeHtml(__('Shipping Information')) ?></span>
4386
</div>
4487
<div class="admin__page-section-item-content shipping-description-wrapper">
4588
<div class="shipping-description-title">
46-
<?= $block->escapeHtml($_order->getShippingDescription()) ?>
89+
<?= $escaper->escapeHtml($_order->getShippingDescription()) ?>
4790
</div>
4891
<div class="shipping-description-content">
49-
<?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
92+
<?= $escaper->escapeHtml(__('Total Shipping Charges')) ?>:
5093

5194
<?php if ($helper->displayShippingPriceIncludingTax()): ?>
5295
<?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -57,20 +100,19 @@
57100

58101
<?= /* @noEscape */ $_excl ?>
59102
<?php if ($helper->displayShippingBothPrices() && $_incl != $_excl): ?>
60-
(<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
103+
(<?= $escaper->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
61104
<?php endif; ?>
62105
<div><?= $block->getChildHtml('shipment_tracking') ?></div>
63106
</div>
64107
</div>
65108
</div>
66109
<?php endif; ?>
67-
68110
</div>
69111
</section>
70112

71113
<section class="admin__page-section">
72114
<div class="admin__page-section-title">
73-
<span class="title"><?= $block->escapeHtml(__('Items Invoiced')) ?></span>
115+
<span class="title"><?= $escaper->escapeHtml(__('Items Invoiced')) ?></span>
74116
</div>
75117

76118
<div id="invoice_item_container" class="admin__page-section-content">
@@ -80,12 +122,12 @@
80122

81123
<section class="admin__page-section">
82124
<div class="admin__page-section-title">
83-
<span class="title"><?= $block->escapeHtml(__('Order Total')) ?></span>
125+
<span class="title"><?= $escaper->escapeHtml(__('Order Total')) ?></span>
84126
</div>
85127
<div class="admin__page-section-content">
86128
<div class="admin__page-section-item order-comments-history">
87129
<div class="admin__page-section-item-title">
88-
<span class="title"><?= $block->escapeHtml(__('Invoice History')) ?></span>
130+
<span class="title"><?= $escaper->escapeHtml(__('Invoice History')) ?></span>
89131
</div>
90132
<div class="admin__page-section-item-content">
91133
<?= $block->getChildHtml('order_comments') ?>
@@ -94,7 +136,7 @@
94136

95137
<div id="history_form" class="admin__page-section-item order-totals">
96138
<div class="admin__page-section-item-title">
97-
<span class="title"><?= $block->escapeHtml(__('Invoice Totals')) ?></span>
139+
<span class="title"><?= $escaper->escapeHtml(__('Invoice Totals')) ?></span>
98140
</div>
99141
<?= $block->getChildHtml('invoice_totals') ?>
100142
</div>

0 commit comments

Comments
 (0)