Release V1.0.23

dhlparcel · Jul 6, 2021 · cb25a8b · cb25a8b
1 parent d2308d1
commit cb25a8b
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 32 deletions.
diff --git a/Model/Data/TimeSelection.php b/Model/Data/TimeSelection.php
@@ -16,14 +16,11 @@ public function getDisplayString()
 
         $betweenTimes = $dateTimeStringStart->format('H:i') . ' - ' . $dateTimeStringEnd->format('H:i');
 
-        return implode(' ',
-            [
+        return implode(' ', [
                 $dateTimeStringStart->format('d'),
                 __($dateTimeStringStart->format('M')) . '.',
                 $dateTimeStringStart->format('Y'),
                 $betweenTimes
-            ]
-        );
-
+        ]);
     }
 }
diff --git a/Model/Service/Returns.php b/Model/Service/Returns.php
@@ -2,7 +2,6 @@
 
 namespace DHLParcel\Shipping\Model\Service;
 
-
 use DHLParcel\Shipping\Model\Piece;
 use DHLParcel\Shipping\Model\PieceFactory;
 use DHLParcel\Shipping\Model\ResourceModel\Piece as PieceResource;
@@ -54,5 +53,4 @@ public function cleanupReturnTracks($tracks)
 
         return $tracks;
     }
-
 }
diff --git a/Observer/Shipment.php b/Observer/Shipment.php
@@ -106,17 +106,15 @@ protected function processGrid($order)
         $defaultOptions = $this->checkMailboxOverride($defaultOptions);
         $defaultOptions = $this->additionalServices($defaultOptions);
 
-        $sizes = $this->capabilityService->getSizes($storeId, $toCountry, $toPostalCode, $toBusiness,
-            array_keys($defaultOptions));
+        $sizes = $this->capabilityService->getSizes($storeId, $toCountry, $toPostalCode, $toBusiness, array_keys($defaultOptions));
 
         if (empty($sizes) || !is_array($sizes)) {
             $skippableOptions = $this->presetService->filterSkippableDefaults($defaultOptions, $storeId);
             $requiredOptions = $this->presetService->getDefaultOptions($order, true);
             $requiredOptions = $this->checkMailboxOverride($requiredOptions);
             $requiredOptions = $this->additionalServices($requiredOptions);
 
-            $options = $this->capabilityService->getOptions($storeId, $toCountry, $toPostalCode, $toBusiness,
-                array_keys($requiredOptions));
+            $options = $this->capabilityService->getOptions($storeId, $toCountry, $toPostalCode, $toBusiness, array_keys($requiredOptions));
 
             $allowedOptions = [];
             foreach ($skippableOptions as $skippableOption) {
@@ -126,14 +124,12 @@ protected function processGrid($order)
             }
 
             $defaultOptions = array_merge($requiredOptions, $allowedOptions);
-            $sizes = $this->capabilityService->getSizes($storeId, $toCountry, $toPostalCode, $toBusiness,
-                array_keys($defaultOptions));
+            $sizes = $this->capabilityService->getSizes($storeId, $toCountry, $toPostalCode, $toBusiness, array_keys($defaultOptions));
 
             if (empty($sizes) || !is_array($sizes)) {
                 $translations = $this->presetService->getTranslations();
                 $translatedOptions = array_intersect_key($translations, $defaultOptions);
-                throw new FaultyServiceOptionException(__('No DHL services could be found for this order with the selected service options: %1',
-                    implode(', ', $translatedOptions)));
+                throw new FaultyServiceOptionException(__('No DHL services could be found for this order with the selected service options: %1', implode(', ', $translatedOptions)));
             }
         }
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "dhlparcel/magento2-plugin",
   "description": "DHL Parcel plugin for Magento 2",
   "type": "magento2-module",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "license": [
     "OSL-3.0"
   ],

diff --git a/etc/module.xml b/etc/module.xml
@@ -18,7 +18,7 @@
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="DHLParcel_Shipping" setup_version="1.0.22">
+    <module name="DHLParcel_Shipping" setup_version="1.0.23">
         <sequence>
             <module name="Magento_Shipping"/>
             <module name="Magento_Checkout"/>

diff --git a/package.json b/package.json
diff --git a/view/frontend/web/js/view/deliveryoptions-info.js b/view/frontend/web/js/view/deliveryoptions-info.js
@@ -143,7 +143,7 @@ define([
             this.showDeliveryTimes = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                     return false;
                 }
 
@@ -175,7 +175,7 @@ define([
             this.showDayTimes = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                     return false;
                 }
 
@@ -198,7 +198,7 @@ define([
             this.showNightTimes = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                     return false;
                 }
 
@@ -253,7 +253,7 @@ define([
             this.showDeliveryServices = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                     return false;
                 }
 

diff --git a/view/frontend/web/js/view/deliveryservices-validate-mixin.js b/view/frontend/web/js/view/deliveryservices-validate-mixin.js
@@ -10,7 +10,7 @@ define([
                 errorDeliveryValidationMessage: ko.observable(false),
                 validateShippingInformation: function () {
                     var method = quote.shippingMethod();
-                    if (method !== null) {
+                    if (typeof method !== 'undefined' && method !== null && typeof method.carrier_code !== 'undefined' && typeof method.method_code !== 'undefined') {
                         if (method.carrier_code === 'dhlparcel') {
                             if (method.method_code === 'door') {
                                 if (window.dhlparcel_shipping_deliveryservices_enabled === true) {

diff --git a/view/frontend/web/js/view/deliverytimes-validate-mixin.js b/view/frontend/web/js/view/deliverytimes-validate-mixin.js
@@ -10,7 +10,7 @@ define([
                 errorDeliveryValidationMessage: ko.observable(false),
                 validateShippingInformation: function () {
                     var method = quote.shippingMethod();
-                    if (method !== null) {
+                    if (typeof method !== 'undefined' && method !== null && typeof method.carrier_code !== 'undefined' && typeof method.method_code !== 'undefined') {
                         if (method.carrier_code === 'dhlparcel') {
                             if (
                                 method.method_code === 'door' ||

diff --git a/view/frontend/web/js/view/servicepoint-info.js b/view/frontend/web/js/view/servicepoint-info.js
@@ -17,7 +17,7 @@ define([
             this.DHLParcel_Shipping_SelectedMethod = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                     return null;
                 }
 
@@ -28,7 +28,7 @@ define([
             this.DHLParcel_Shipping_ServicePointName = ko.computed(function() {
 
                 var method = quote.shippingMethod();
-                if (method === null) {
+                if (typeof method === 'undefined' || method === null || typeof method.method_title === 'undefined') {
                     return null;
                 }
 

diff --git a/view/frontend/web/js/view/servicepoint-loader.js b/view/frontend/web/js/view/servicepoint-loader.js
@@ -171,7 +171,7 @@ define([
 
         // Save shipping method to global
         quote.shippingMethod.subscribe(function(method) {
-            if (method === null) {
+            if (typeof method === 'undefined' || method === null || typeof method.carrier_code === 'undefined' || typeof method.method_code === 'undefined') {
                 return;
             }
 

diff --git a/view/frontend/web/js/view/servicepoint-validate-mixin.js b/view/frontend/web/js/view/servicepoint-validate-mixin.js
@@ -10,7 +10,7 @@ define([
                 errorDeliveryValidationMessage: ko.observable(false),
                 validateShippingInformation: function () {
                     var method = quote.shippingMethod();
-                    if (method !== null) {
+                    if (typeof method !== 'undefined' && method !== null && typeof method.carrier_code !== 'undefined' && typeof method.method_code !== 'undefined') {
                         if (method.carrier_code === 'dhlparcel' && method.method_code === 'servicepoint') {
                             if (window.dhlparcel_shipping_servicepoint_validate !== true) {
                                 $('#dhlparcel-shipping-servicepoint-info-error').show();