v1.0.49

dhlparcel · Jul 19, 2024 · d929411 · d929411
1 parent cea5fb4
commit d929411
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 32 deletions.
diff --git a/Controller/Adminhtml/Authentication/TestAuthentication.php b/Controller/Adminhtml/Authentication/TestAuthentication.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Authentication;

diff --git a/Controller/Adminhtml/Shipment/Download.php b/Controller/Adminhtml/Shipment/Download.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

diff --git a/Controller/Adminhtml/Shipment/Labelrequest.php b/Controller/Adminhtml/Shipment/Labelrequest.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

diff --git a/Controller/Adminhtml/Shipment/PrintAction.php b/Controller/Adminhtml/Shipment/PrintAction.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

diff --git a/Controller/Adminhtml/Shipment/UndoShipped.php b/Controller/Adminhtml/Shipment/UndoShipped.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Helper;

diff --git a/Observer/AutoShipment.php b/Observer/AutoShipment.php
@@ -53,27 +53,31 @@ public function __construct(
 
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        if (!$this->helper->getConfigData('active')) {
+        /** @var Order $observerOrder */
+        $observerOrder = $observer->getEvent()->getOrder();
+        if (!$observerOrder || !$observerOrder->getId()) {
             return;
         }
 
-        // Don't do anything when auto shipment is disabled.
-        if (!boolval($this->helper->getConfigData('usability/automation/shipment'))
-            || strval($this->helper->getConfigData('usability/automation/on_order_status')) === '') {
+        $storeId = $observerOrder->getStoreId();
+
+        if (!$this->helper->getConfigData('active', $storeId)) {
             return;
         }
 
-        // Only continue if the event trigger name matches
-        if ($this->helper->getConfigData('usability/automation/event_trigger') !== $observer->getEvent()->getName()) {
+        // Don't do anything when auto shipment is disabled.
+        if (!boolval($this->helper->getConfigData('usability/automation/shipment', $storeId))
+            || strval($this->helper->getConfigData('usability/automation/on_order_status', $storeId)) === '') {
             return;
         }
 
-        $observerOrder = $observer->getEvent()->getOrder();
-        if (!$observerOrder || !$observerOrder->getId()) {
+        // Only continue if the event trigger name matches
+        if ($this->helper->getConfigData('usability/automation/event_trigger', $storeId) !== $observer->getEvent()->getName()) {
             return;
         }
 
-        if ($observerOrder->getStatus() !== $this->helper->getConfigData('usability/automation/on_order_status')) {
+
+        if ($observerOrder->getStatus() !== $this->helper->getConfigData('usability/automation/on_order_status', $storeId)) {
             return;
         }
         if (!$observerOrder->canShip() || $observerOrder->hasShipments() || $observerOrder->getShipmentsCollection()->count() > 0) {
@@ -90,7 +94,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
 
-        if (intval($this->helper->getConfigData('usability/automation/shipment')) === YesNoDHL::OPTION_DHL && !$this->presetService->exists($order)) {
+        if (intval($this->helper->getConfigData('usability/automation/shipment', $storeId)) === YesNoDHL::OPTION_DHL && !$this->presetService->exists($order)) {
             return;
         }
 
@@ -104,7 +108,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         $shipment = $this->orderService->createShipment($order->getId());
 
-        if (boolval($this->helper->getConfigData('usability/automation/print'))) {
+        if (boolval($this->helper->getConfigData('usability/automation/print', $storeId))) {
             // Reload shipment (not the shipment data in memory but from database with the newly created tracks) and send to printer
             $shipment = $this->shipmentService->getShipmentById($shipment->getId());
             $labelIds = $this->labelService->getShipmentLabelIds($shipment);

diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Setup;

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.47",
+  "version": "1.0.49",
   "license": [
     "OSL-3.0"
   ],

diff --git a/etc/adminhtml/routes.xml b/etc/adminhtml/routes.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/etc/config.xml b/etc/config.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">

diff --git a/etc/events.xml b/etc/events.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_before">

diff --git a/etc/frontend/routes.xml b/etc/frontend/routes.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">

diff --git a/etc/module.xml b/etc/module.xml
@@ -13,12 +13,12 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 
 <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.47">
+    <module name="DHLParcel_Shipping" setup_version="1.0.49">
         <sequence>
             <module name="Magento_Shipping"/>
             <module name="Magento_Checkout"/>

diff --git a/registration.php b/registration.php
@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 \Magento\Framework\Component\ComponentRegistrar::register(

diff --git a/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/view/adminhtml/layout/adminhtml_order_shipment_new.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">

diff --git a/view/adminhtml/layout/default.xml b/view/adminhtml/layout/default.xml
@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <[email protected]>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column"

diff --git a/view/adminhtml/web/css/legacy.css b/view/adminhtml/web/css/legacy.css
@@ -12,7 +12,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <[email protected]>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 .dhl-button {

diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
@@ -2,7 +2,7 @@
     <head>
         <css src="DHLParcel_Shipping::css/deliveryoptions.css" />
         <css src="DHLParcel_Shipping::css/servicepoint.modal.css" />
-        <css src="https://static.dhlparcel.nl/fonts/Delivery.css" src_type="url" />
+        <css src="https://static.dhlecommerce.nl/fonts/Delivery.css" src_type="url" />
     </head>
     <body>
         <referenceContainer name="after.body.start">

diff --git a/view/frontend/layout/onestepcheckout_index_index.xml b/view/frontend/layout/onestepcheckout_index_index.xml
@@ -2,7 +2,7 @@
     <head>
         <css src="DHLParcel_Shipping::css/deliveryoptions.css" />
         <css src="DHLParcel_Shipping::css/servicepoint.modal.css" />
-        <css src="https://static.dhlparcel.nl/fonts/Delivery.css" src_type="url" />
+        <css src="https://static.dhlecommerce.nl/fonts/Delivery.css" src_type="url" />
     </head>
     <body>
         <referenceContainer name="after.body.start">

diff --git a/view/frontend/web/js/view/servicepoint-loader.js b/view/frontend/web/js/view/servicepoint-loader.js
@@ -51,7 +51,7 @@ define([
 
                 // Disable getScript from adding a custom timestamp
                 // $.ajaxSetup({cache: true});
-                $.getScript("https://static.dhlparcel.nl/components/servicepoint-locator-component@latest/servicepoint-locator-component.js").done(function() {
+                $.getScript("https://static.dhlecommerce.nl/components/servicepoint-locator-component@latest/servicepoint-locator-component.js").done(function() {
                     // Load ServicePoint Locator
                     var configElement = $('#dhl-servicepoint-locator-component');
                     var limit = $(configElement).attr('data-limit');