Merge pull request #107 from myparcelnl/hotfix-status-orderlist

1.5.9
myparcelnl · Aug 12, 2016 · be0c984 · be0c984
2 parents aa082b7 + f9163f0
commit be0c984
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/...community/TIG/MyParcel2014/Block/Adminhtml/Widget/Grid/Column/Renderer/ShippingStatus.php b/...community/TIG/MyParcel2014/Block/Adminhtml/Widget/Grid/Column/Renderer/ShippingStatus.php
@@ -75,10 +75,13 @@ public function render(Varien_Object $row)
          * Check if any data is available.
          * If not available, show send link and country code
          */
-        $value = $row->getData($this->getColumn()->getIndex());
         $order = Mage::getModel('sales/order')->load($row->getId());
+        $value = $row->getData($this->getColumn()->getIndex());
+        $barcodes = explode(',', $row->getData(self::BARCODE_COLUMN));
+        $barcodeData = array();
+        $statusses = explode(',', $value);
 
-        if (!$value) {
+        if (empty($barcodes[0])) {
             if($order->canShip()) {
 
                 $orderSendUrl = Mage::helper('adminhtml')->getUrl("adminhtml/sales_order_shipment/start", array('order_id' => $row->getId()));
@@ -100,16 +103,16 @@ public function render(Varien_Object $row)
             'postcode'    => $postcode,
         );
 
-        $barcodeData = array();
-        $barcodes = explode(',', $row->getData(self::BARCODE_COLUMN));
-        $statusses = explode(',', $value);
-        foreach ($statusses as $key => $status) {
-            if (!empty($barcodes[$key])) {
-                $barcodeUrl = Mage::helper('tig_myparcel')->getBarcodeUrl($barcodes[$key], $destinationData, false, true);
-                $oneBarcodeData = "<a href='{$barcodeUrl}' target='_blank'>{$barcodes[$key]}</a> - <small>{$status}</small>";
-                if(!in_array($oneBarcodeData, $barcodeData)) {
-                    $barcodeData[] = $oneBarcodeData;
-                }
+        foreach ($barcodes as $key => $barcode) {
+            if (!empty($statusses[$key])) {
+                $status = " - <small>{$statusses[$key]}</small>";
+            } else {
+                $status = '';
+            }
+            $barcodeUrl = Mage::helper('tig_myparcel')->getBarcodeUrl($barcode, $destinationData, false, true);
+            $oneBarcodeData = "<a href='{$barcodeUrl}' target='_blank'>{$barcode}</a>$status";
+            if(!in_array($oneBarcodeData, $barcodeData)) {
+                $barcodeData[] = $oneBarcodeData;
             }
         }
 

diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <TIG_MyParcel2014>
-            <version>1.5.8</version>
+            <version>1.5.9</version>
         </TIG_MyParcel2014>
     </modules>
     <global>