Merge pull request #326 from myparcelnl/reindert-vetter-patch-1

Reindert vetter patch 1
myparcelnl · Jun 24, 2017 · aa39c07 · aa39c07
2 parents 8a40d33 + 927d9b2
commit aa39c07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php b/app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
@@ -11,7 +11,7 @@
  */
     if (file_exists(Mage::getBaseDir() . '/app/code/community/MDN/AdvancedStock/Model/Sales/Order.php') && class_exists('MDN_AdvancedStock_Model_Sales_Order')) {
         class TIG_MyParcel2014_Model_Sales_Order_OverrideCheck extends MDN_AdvancedStock_Model_Sales_Order { }
-    } else if (class_exists('Emagicone_Mobassistantconnector_Model_Order')) {
+    } else if (file_exists(Mage::getBaseDir() . '/app/code/community/Emagicone/Mobassistantconnector/Model/Sales/Order.php') && class_exists('Emagicone_Mobassistantconnector_Model_Order')) {
         class TIG_MyParcel2014_Model_Sales_Order_OverrideCheck extends Emagicone_Mobassistantconnector_Model_Order { }
     } else {
         class TIG_MyParcel2014_Model_Sales_Order_OverrideCheck extends Mage_Sales_Model_Order { }
@@ -68,4 +68,4 @@ public function getShippingAddress() {
             return false;
         }
 
-    }
+    }
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.13.3</version>
+            <version>1.13.4</version>
         </TIG_MyParcel2014>
     </modules>
     <global>