Skip to content

Commit

Permalink
Merge pull request #324 from myparcelnl/Support.-Mobassistantconnector
Browse files Browse the repository at this point in the history 
Support. Mobassistantconnector
  • Loading branch information
Reindert authored Jun 20, 2017
2 parents fe75e48 + 60a31e8 commit 8a40d33
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
9 changes: 8 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,4 +831,11 @@ app/etc/modules/Idev_OneStepCheckout.xml
/.htaccess.sample
/app/locale/en_US/Mage_Uploader.csv
/skin/frontend/base/default/images/window_overlay.png
workspace.xml
/pkginfo/
/app/locale/pt_BR/
/app/locale/zh_CN/
/app/locale/fr_FR/
/app/locale/es_ES/
/app/locale/de_DE/
/app/locale/nl_NL/Mage_AmazonPayments.csv
workspace.xml
2 changes: 2 additions & 0 deletions app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*/
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')) {
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 { }
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/TIG/MyParcel2014/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<TIG_MyParcel2014>
<version>1.13.2</version>
<version>1.13.3</version>
</TIG_MyParcel2014>
</modules>
<global>
Expand Down

2 comments on commit 8a40d33

@ajvwaay
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Er wordt een check gedaan of de class exists maar als file waarin deze class wordt gedefinieerd niet bestaat krijg je de foutmelding:
Warning: include(Emagicone/Mobassistantconnector/Model/Order.php): failed to open stream: No such file or directory

De check moet dus uitgebreid worden met de check of de class file wel bestaat, net zoals er bij de check op /MDN/AdvancedStock..... gedaan wordt.

@reindert-vetter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in: https://github.com/myparcelnl/magento1/releases/tag/v1.13.4

Please sign in to comment.