Luma Plugin - v1.0.53

Author: annagos

Model/Service/Logic/Shipment.php

@@ -22,6 +22,7 @@
 use DHLParcel\Shipping\Model\Data\Api\Response\Shipment\Piece as PieceResponse;
 use DHLParcel\Shipping\Model\ResourceModel\Piece as PieceResource;
 
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Sales\Model\Order\Shipment\Track;
@@ -40,6 +41,7 @@ class Shipment
     protected $trackFactory;
     protected $helper;
     protected $capabilityService;
+    protected $moduleManager;
 
     public function __construct(
         Connector                $connector,
@@ -53,7 +55,8 @@ public function __construct(
         OrderRepositoryInterface $orderRepository,
         TrackFactory             $trackFactory,
         Data                     $helper,
-        Capability               $capabilityService
+        Capability               $capabilityService,
+        ModuleManager            $moduleManager
     ) {
         $this->connector = $connector;
         $this->pieceFactory = $pieceFactory;
@@ -67,6 +70,7 @@ public function __construct(
         $this->trackFactory = $trackFactory;
         $this->helper = $helper;
         $this->capabilityService = $capabilityService;
+        $this->moduleManager = $moduleManager;
     }
 
     /**
@@ -97,7 +101,9 @@ public function getRequestData($order, $options, $pieces, $isBusiness)
         $shipmentRequest->accountId = $accountId;
         $shipmentRequest->options = $options;
         $shipmentRequest->pieces = $pieces;
-        $shipmentRequest->application = 'Magento2';
+        $shipmentRequest->application = $this->moduleManager->isEnabled('DHLParcel_ShippingHyva')
+            ? 'Magento2-Hyva'
+            : 'Magento2';
 
         return $shipmentRequest;
     }

composer.json

@@ -2,7 +2,7 @@
   "name": "dhlparcel/magento2-plugin",
   "description": "DHL Parcel plugin for Magento 2",
   "type": "magento2-module",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "license": [
     "OSL-3.0"
   ],

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.52">
+    <module name="DHLParcel_Shipping" setup_version="1.0.53">
         <sequence>
             <module name="Magento_Shipping"/>
             <module name="Magento_Checkout"/>