v1.0.49

Author: ShinCode

Controller/Adminhtml/Authentication/TestAuthentication.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Authentication;

Controller/Adminhtml/Shipment/Download.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

Controller/Adminhtml/Shipment/Labelrequest.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

Controller/Adminhtml/Shipment/PrintAction.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

Controller/Adminhtml/Shipment/UndoShipped.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Controller\Adminhtml\Shipment;

Helper/Data.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Helper;

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);

Setup/InstallSchema.php

@@ -13,7 +13,7 @@
  * @package   DHLParcel\Shipping
  * @author    Ron Oerlemans <ron.oerlemans@dhl.com>
  * @copyright 2017 DHLParcel
- * @link      https://www.dhlparcel.nl/
+ * @link      https://www.dhlecommerce.nl/
  */
 
 namespace DHLParcel\Shipping\Setup;

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"
   ],

etc/adminhtml/routes.xml

@@ -13,7 +13,7 @@
   ~ @package   DHLParcel\Shipping
   ~ @author    Ron Oerlemans <ron.oerlemans@dhl.com>
   ~ @copyright 2017 DHLParcel
-  ~ @link      https://www.dhlparcel.nl/
+  ~ @link      https://www.dhlecommerce.nl/
   -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"