diff -Nuar a/vendor/magento/module-shipping/Block/Adminhtml/Order/Packaging.php b/vendor/magento/module-shipping/Block/Adminhtml/Order/Packaging.php --- a/vendor/magento/module-shipping/Block/Adminhtml/Order/Packaging.php +++ b/vendor/magento/module-shipping/Block/Adminhtml/Order/Packaging.php @@ -3,8 +3,12 @@ * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ + namespace Magento\Shipping\Block\Adminhtml\Order; +use Magento\Framework\App\ObjectManager; +use Magento\Shipping\Helper\Carrier; + /** * Adminhtml shipment packaging * @@ -44,6 +48,7 @@ class Packaging extends \Magento\Backend\Block\Template * @param \Magento\Framework\Registry $coreRegistry * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory * @param array $data + * @param Carrier|null $carrierHelper */ public function __construct( \Magento\Backend\Block\Template\Context $context, @@ -51,12 +56,14 @@ public function __construct( \Magento\Shipping\Model\Carrier\Source\GenericInterface $sourceSizeModel, \Magento\Framework\Registry $coreRegistry, \Magento\Shipping\Model\CarrierFactory $carrierFactory, - array $data = [] + array $data = [], + ?Carrier $carrierHelper = null ) { $this->_jsonEncoder = $jsonEncoder; $this->_coreRegistry = $coreRegistry; $this->_sourceSizeModel = $sourceSizeModel; $this->_carrierFactory = $carrierFactory; + $data['carrierHelper'] = $carrierHelper ?? ObjectManager::getInstance()->get(Carrier::class); parent::__construct($context, $data); } diff -Nuar a/vendor/magento/module-shipping/view/adminhtml/templates/create/items.phtml b/vendor/magento/module-shipping/view/adminhtml/templates/create/items.phtml --- a/vendor/magento/module-shipping/view/adminhtml/templates/create/items.phtml +++ b/vendor/magento/module-shipping/view/adminhtml/templates/create/items.phtml @@ -77,14 +77,14 @@ name="shipment[create_shipping_label]" value="1" type="checkbox"/> + = /* @noEscape */ $secureRenderer->renderEventListenerAsTag( 'onclick', 'toggleCreateLabelCheckbox();', 'input#create_shipping_label' ) ?> - diff -Nuar a/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/grid.phtml b/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/grid.phtml --- a/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/grid.phtml +++ b/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/grid.phtml @@ -4,42 +4,45 @@ * See COPYING.txt for license details. */ //phpcs:disable Squiz.PHP.NonExecutableCode.Unreachable -/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ +/** + * @var \Magento\Shipping\Block\Adminhtml\Order\Packaging $block + * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer + */ ?>
| - - | -= $block->escapeHtml(__('Product Name')) ?> | -= $block->escapeHtml(__('Weight')) ?> | -- = $block->escapeHtml(__('Customs Value')) ?> - | - displayCustomsValue()): ?> - = /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?> - -= $block->escapeHtml(__('Qty Ordered')) ?> | -= $block->escapeHtml(__('Qty')) ?> | -
|---|---|---|---|---|---|
|
+ |
+ = $block->escapeHtml(__('Product Name')) ?> | += $block->escapeHtml(__('Weight')) ?> | ++ = $block->escapeHtml(__('Customs Value')) ?> + | + displayCustomsValue()): ?> + = /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?> + += $block->escapeHtml(__('Qty Ordered')) ?> | += $block->escapeHtml(__('Qty')) ?> | +
|
- getId() ? $item->getId() : $item->getOrderItemId(); ?>
+ getId() ?? $item->getOrderItemId(); ?>
| + | - = /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'td.custom-value') ?> - = /* @noEscape */ $secureRenderer->renderEventListenerAsTag( - 'onblur', - 'packaging.recalcContainerWeightAndCustomsValue(this);', - 'td.custom-value' - ) ?> + displayCustomsValue()): ?> + = /* @noEscape */ $secureRenderer->renderStyleAsTag( + 'display:none', + 'td#custom-value-' . $randomId . '-' . $id + ) ?> + | - = /* @noEscape */ $item->getOrderItem()->getQtyOrdered()*1 ?> + = /* @noEscape */ $item->getOrderItem()->getQtyOrdered() * 1 ?> | - = /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'button.action-delete') ?> - = /* @noEscape */ $secureRenderer->renderEventListenerAsTag( - 'onclick', - 'packaging.deleteItem(this);', - 'button#packaging-delete-item-' . $item->getId() + = /* @noEscape */ $secureRenderer->renderStyleAsTag( + 'display:none', + 'button#packaging-delete-item-' . $randomId . '-' . $id ) ?> |