Merge pull request #74 from dpdconnect/1.3.0

1.3.0

Author: dpdplugin

Controller/Adminhtml/Order/Shipment/Save.php

@@ -148,13 +148,16 @@ public function execute()
 
                 // Create rows from all packages
                 $packages = $this->getRequest()->getParam('packages');
+                $packageId = 1;
                 $rows = [];
                 foreach($packages as $package) {
+                   $newPackage[$packageId] = $package;
+
                     $row = [
                         'code' => $package['params']['shipping_product'],
                         'productType' => $package['params']['product_type'],
                         'shipmentGeneralData' => $data,
-                        'packageData' => $package,
+                        'packageData' => $newPackage,
                     ];
 
                     if (isset($package['params']['expiration_date'])) {
@@ -164,7 +167,7 @@ public function execute()
                     if (isset($package['params']['goods_description'])) {
                         $row['description'] = $package['params']['goods_description'];
                     }
-
+                    $packageId = $packageId + 1;
                     $rows[] = $row;
                 }
 

Model/CheckoutConfigProvider.php

@@ -144,6 +144,7 @@ public function getConfig()
             $availableShippingProducts[] = [
                 'code' => $product['code'],
                 'title' => $title,
+                'checkoutDescription' => $shippingProductsConfig[$product['code']]['checkoutDescription'],
                 'price' => $shippingProductsConfig[$product['code']]['price'],
                 'onlySpecificCountries' => $shippingProductsConfig[$product['code']]['onlySpecificCountries'],
                 'allowedCountries' => isset($shippingProductsConfig[$product['code']]['allowedCountries']) ? $shippingProductsConfig[$product['code']]['allowedCountries'] : [],

composer.json

@@ -3,7 +3,8 @@
     "description": "DPD Connect - Magento2 Shipping",
     "require": {
         "php": ">=7.2",
-        "dpdconnect/php-sdk": "1.1.8"
+        "dpdconnect/php-sdk": "1.1.8",
+        "magento/framework": ">=103.0.6"
     },
     "type": "magento2-module",
     "license": "GPL-3.0-or-later",

composer.lock

@@ -8,6 +8,7 @@
 
 /**
  * @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
@@ -61,7 +62,7 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
                         weight_units:               pack.select('select[name="container_weight_units"]')[0].value,
                         dimension_units:            pack.select('select[name="container_dimension_units"]')[0].value,
                         shipping_product:           pack.select('select[name="shipping_product"]')[0].value,
-                        product_type:               pack.select('input[name="product_type"]')[0].value
+                        product_type:               'default'
                     };
 
                     if ('undefined' != typeof pack.select('input[name="expiration_date"]')[0]) {
@@ -247,32 +248,6 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
                     });
                     packItems = packagePrepareGrid.removeClassName('grid_prepare').addClassName('package_items');
                     packItems.select('.grid tbody tr').each(function (item) {
-                        // Set the package type if not currently set
-                        if ("" === packageBlock.select('input[name="product_type"]')[0].value) {
-                            var productType = jQuery(item).data('product-type');
-                            packageBlock.select('input[name="product_type"]')[0].value = productType;
-
-                            // Lock the label type if needed and hide fields if needed
-                            switch(productType) {
-                                case 'fresh':
-                                    packageBlock.select('select[name="shipping_product"]')[0].value = 'FRESH';
-                                    break;
-
-                                case 'freeze':
-                                    packageBlock.select('select[name="shipping_product"]')[0].value = 'FREEZE';
-                                    break;
-
-                                case 'default':
-                                default:
-                                    packageBlock.select('.freshfreeze').each(function(item) { item.remove(); });
-                                    break;
-                            }
-                        }
-                        // Don't allow different product types in one package
-                        else if (jQuery(item).data('product_type') !== packageBlock.select('input[name="product_type"]')[0].value) {
-                            item.remove();
-                            return;
-                        }
 
                         var itemId = item.select('[type="checkbox"]')[0].value;
                         var qtyValue  = parseFloat(item.select('[name="qty"]')[0].value);
@@ -294,11 +269,6 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
                     }.bind(packaging));
                 } else {
                     packagePrepareGrid.select('.grid tbody tr').each(function (item) {
-                        // Skip the product if the type is not the same as the package product type
-                        if (jQuery(item).data('product-type') !== packageBlock.select('input[name="product_type"]')[0].value) {
-                            item.remove();
-                            return;
-                        }
 
                         var itemId = item.select('[type="checkbox"]')[0].value;
                         var qtyValue  = parseFloat(item.select('[name="qty"]')[0].value);
@@ -367,21 +337,21 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
                 click: function () {
                     packaging.cancelPackaging();
                     this.closeModal();
-                    }
-                }, {
+                }
+            }, {
                 text: '<?php echo $block->escapeJs(__('Save')) ?>',
                 'attr': {'disabled':'disabled', 'data-action':'save-packages'},
                 'class': 'action-primary _disabled',
                 click: function () {
                     packaging.confirmPackaging();
-                    }
-                }, {
-                    text: '<?php echo $block->escapeJs(__('Add Package')) ?>',
-                    'attr': {'data-action':'add-packages'},
-                    'class': 'action-secondary',
-                    click: function () {
-                        packaging.newPackage();
-                    }
+                }
+            }, {
+                text: '<?php echo $block->escapeJs(__('Add Package')) ?>',
+                'attr': {'data-action':'add-packages'},
+                'class': 'action-secondary',
+                click: function () {
+                    packaging.newPackage();
+                }
             }]
         });
         jQuery(document).trigger('packaging:inited');