Merge pull request #308 from myparcelnl/fix-mailbox-not-active

v1.11.5 check mailbox not active
myparcelnl · Apr 6, 2017 · 4f683b6 · 4f683b6
2 parents 8069836 + a143bfb
commit 4f683b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/code/community/TIG/MyParcel2014/Helper/Data.php b/app/code/community/TIG/MyParcel2014/Helper/Data.php
@@ -571,6 +571,9 @@ public function getPackageType($items, $country, $getAdminTitle = false, $hasExt
      */
     private function fitInLetterbox($items)
     {
+        if ($this->getConfig('mailbox_active', 'mailbox') == '0')
+            return false;
+
         $mailboxWeight = (float)$this->getConfig('mailbox_weight', 'mailbox');
         $itemWeight = 0;
 

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.11.4</version>
+            <version>1.11.5</version>
         </TIG_MyParcel2014>
     </modules>
     <global>