Merge remote-tracking branch 'gl_magento2ce/AC3023' into DHL_AC-3023_JULY_28_22

UI required Changes

Author: glo05363

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml

@@ -30,7 +30,7 @@
             </div>
         </div>
         <div class="admin__control-table-wrapper admin__page-subsection">
-            <table class="data-table admin__control-table">
+            <table class="data-table admin__control-table admin__control-table">
                 <thead>
                     <tr>
                         <th class="col-type"><?= $block->escapeHtml(__('Type')) ?></th>
@@ -46,9 +46,9 @@
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none', 'th.col-custom') ?>
                         <?php endif ?>
                         <th class="col-total-weight"><?= $block->escapeHtml(__('Total Weight')) ?></th>
-                        <th class="col-length"><?= $block->escapeHtml(__('Length')) ?></th>
-                        <th class="col-width"><?= $block->escapeHtml(__('Width')) ?></th>
-                        <th class="col-height"><?= $block->escapeHtml(__('Height')) ?></th>
+                        <th class="col-length _required"><span><?= $block->escapeHtml(__('Length')) ?></span></th>
+                        <th class="col-width _required"><span><?= $block->escapeHtml(__('Width')) ?></span></th>
+                        <th class="col-height _required"><span><?= $block->escapeHtml(__('Height')) ?></span></th>
                         <th>&nbsp;</th>
                         <?php if ($block->getDeliveryConfirmationTypes()): ?>
                         <th class="col-signature"><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>

app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js

@@ -71,6 +71,15 @@ define(['prototype'], function () {
             if (this.packagesContent.childElements().length == 0) {
                 this.newPackage();
             }
+            const allowedPackageTypes = ["N","D"];
+
+            if (!Object.values(this.customizableContainers).some(packageType => allowedPackageTypes.includes(packageType))) {
+                $('packaging_window').select(
+                    'th.col-length,th.col-width,th.col-height'
+                ).forEach(element => {
+                    element.classList.remove('_required')
+                });
+            }
             jQuery(this.window).modal('openModal');
         },
 
@@ -270,7 +279,7 @@ define(['prototype'], function () {
                 });
             }
 
-            return result = $$('[id^="package_block_"] input').collect(function (element) {
+            return result = $$('[id^="package_block_"]      input').collect(function (element) {
                 return this.validateElement(element);
             }, this).all();
         },