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"/> + 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 + */ ?>
- - - - - - displayCustomsValue()): ?> - renderStyleAsTag('display: none;', 'th.custom-value') ?> - - - - + + + + + + displayCustomsValue()): ?> + renderStyleAsTag('display: none;', 'th.custom-value') ?> + + + + - + getCollection() as $item): ?> getShipment()->getOrder(); @@ -54,12 +57,12 @@ - renderStyleAsTag('display: none;', 'td.custom-value') ?> - renderEventListenerAsTag( - 'onblur', - 'packaging.recalcContainerWeightAndCustomsValue(this);', - 'td.custom-value' - ) ?> + displayCustomsValue()): ?> + renderStyleAsTag( + 'display:none', + 'td#custom-value-' . $randomId . '-' . $id + ) ?> +
- - escapeHtml(__('Product Name')) ?>escapeHtml(__('Weight')) ?> - escapeHtml(__('Customs Value')) ?> - escapeHtml(__('Qty Ordered')) ?>escapeHtml(__('Qty')) ?>
+ + escapeHtml(__('Product Name')) ?>escapeHtml(__('Weight')) ?> + escapeHtml(__('Customs Value')) ?> + escapeHtml(__('Qty Ordered')) ?>escapeHtml(__('Qty')) ?>
- getId() ? $item->getId() : $item->getOrderItemId(); ?> + getId() ?? $item->getOrderItemId(); ?> @@ -78,47 +81,55 @@ } ?> - + - getOrderItem()->getQtyOrdered()*1 ?> + getOrderItem()->getQtyOrdered() * 1 ?>   - renderStyleAsTag('display:none', 'button.action-delete') ?> - renderEventListenerAsTag( - 'onclick', - 'packaging.deleteItem(this);', - 'button#packaging-delete-item-' . $item->getId() + renderStyleAsTag( + 'display:none', + 'button#packaging-delete-item-' . $randomId . '-' . $id ) ?>
+ + renderTag('script', [], $scriptString, false) ?>
diff -Nuar a/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/popup_content.phtml --- a/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/popup_content.phtml +++ b/vendor/magento/module-shipping/view/adminhtml/templates/order/packaging/popup_content.phtml @@ -5,7 +5,7 @@ */ /** - * @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging + * @var \Magento\Shipping\Block\Adminhtml\Order\Packaging $block * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?> @@ -22,21 +22,11 @@ data-action="package-save-items"> escapeHtml(__('Add Selected Product(s) to Package')) ?> - renderEventListenerAsTag( - 'onclick', - 'packaging.packItems(this);', - "button[data-action='package-save-items']" - ) ?> - renderEventListenerAsTag( - 'onclick', - 'packaging.getItemsForPack(this);', - "button[data-action='package-add-items']" - ) ?>
@@ -87,12 +77,6 @@ - renderEventListenerAsTag( - 'onchange', - "packaging.changeContainerType(this); - packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});", - "select[name='package_container']" - ) ?> @@ -103,11 +87,6 @@ - renderEventListenerAsTag( - 'onchange', - "packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});", - "select[name='package_size']" - ) ?> escapeHtml(__('cm')) ?> - renderEventListenerAsTag( - 'onchange', - "packaging.changeMeasures(this);", - "select[name='container_girth_dimension_units']" - ) ?> escapeHtml(__('kg')) ?> - renderEventListenerAsTag( - 'onchange', - "packaging.changeMeasures(this);", - "select[name='container_weight_units']" - ) ?>
@@ -202,11 +171,6 @@ escapeHtml(__('cm')) ?> - renderEventListenerAsTag( - 'onchange', - "packaging.changeMeasures(this);", - "select[name='container_dimension_units']" - ) ?> getDeliveryConfirmationTypes()): ?> @@ -224,11 +188,6 @@ class="action-delete DeletePackageBtn"> escapeHtml(__('Delete Package')) ?> - renderEventListenerAsTag( - 'onclick', - 'packaging.deletePackage(this);', - "button.action-delete.DeletePackageBtn" - ) ?> @@ -252,11 +211,6 @@ - renderEventListenerAsTag( - 'onchange', - "packaging.changeContentTypes(this);", - "select[name='content_type']" - ) ?> - renderStyleAsTag("display:none;", 'div#package_template') ?> + renderStyleAsTag('display:none', '#package_template') ?>
+ escapeJs($girthEnabled)}) + }); + $("div#packages_content").on('change', "select[name='container_weight_units']", + function(){packaging.changeMeasures(this)}); + $("div#packages_content").on('change', "select[name='container_dimension_units']", + function(){packaging.changeMeasures(this)}); + $("div#packages_content").on('click', "button.action-delete.DeletePackageBtn", + function(){packaging.deletePackage(this)}); +script; + if ($girthEnabled == 1 && !empty($sizeSource)) { + $scriptString .= <<