Merge pull request #17 from mijora/mij744-omx_tracking

MIJ-744: Use OMX for shipment tracking
mijora · Jan 21, 2025 · 62ad1f4 · 62ad1f4
2 parents e753e66 + b61e5d1
commit 62ad1f4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Version 1.3.3
+Use OMX for shipment tracking
+
 ### Version 1.3.2
 Added international shipping support
 

diff --git a/app/code/Omnivalt/Shipping/Model/Carrier.php b/app/code/Omnivalt/Shipping/Model/Carrier.php
@@ -523,29 +523,23 @@ public function getTracking($trackings) {
         try {
             $username = $this->getConfigData('account');
             $password = $this->getConfigData('password');
-            $api_url = $this->getConfigData('production_webservices_url');
 
-            $tracking = new Tracking();
-            $tracking->setAuth($username, $password, $api_url);
+            $api_tracking = new Tracking();
+            $api_tracking->setAuth($username, $password);
 
-            $results = $tracking->getTracking($trackings);
+            $results = $api_tracking->getTrackingOmx($trackings[0]);
 
             if (is_array($results)) {
-                foreach ($results as $barcode => $tracking_data) {
-                    $awbinfoData = [];
-                    $packageProgress = [];
-
-                    foreach ($tracking_data as $data) {
-                        $shipmentEventArray = [];
-                        $shipmentEventArray['activity'] = $data['state'];
-                        $shipmentEventArray['deliverydate'] = $data['date']->format('Y-m-d'); //date("Y-m-d", strtotime((string)$awbinfo->eventDate));
-                        $shipmentEventArray['deliverytime'] = $data['date']->format('H:i:s'); //date("H:i:s", strtotime((string)$awbinfo->eventDate));
-                        $shipmentEventArray['deliverylocation'] = $data['event'];
-                        $packageProgress[] = $shipmentEventArray;
-                    }
-                    $awbinfoData['progressdetail'] = $packageProgress;
-                    $resultArr[$barcode] = $awbinfoData;
+                $packageProgress = [];
+                foreach ($results as $event) {
+                    $shipmentEventArray = [];
+                    $shipmentEventArray['activity'] = $event['eventName'];
+                    $shipmentEventArray['deliverydate'] = date('Y-m-d', strtotime($event['eventDate']));
+                    $shipmentEventArray['deliverytime'] = date('H:i:s', strtotime($event['eventDate']));
+                    $shipmentEventArray['deliverylocation'] = isset($event['location']['locationName']) ? $event['location']['locationName'] : '-';
+                    $packageProgress[] = $shipmentEventArray;
                 }
+                $resultArr[$trackings[0]] = ['progressdetail' => $packageProgress];
             }
 
             if (!empty($resultArr)) {

diff --git a/app/code/Omnivalt/Shipping/composer.json b/app/code/Omnivalt/Shipping/composer.json
@@ -2,7 +2,7 @@
     "name": "omnivalt/shipping",
     "description": "Omniva shipping module for Magento 2.*",
     "type": "magento2-module",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "authors": [
         {
             "name": "Mijora",

diff --git a/app/code/Omnivalt/Shipping/etc/module.xml b/app/code/Omnivalt/Shipping/etc/module.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Omnivalt_Shipping" setup_version="1.3.2">
+    <module name="Omnivalt_Shipping" setup_version="1.3.3">
     </module>
 </config>