Merge pull request #307 from myparcelnl/develop

Develop
myparcelnl · Apr 5, 2017 · 8069836 · 8069836
2 parents d3c9ff3 + d4c9ade
commit 8069836
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/code/community/TIG/MyParcel2014/Model/Api/Curl.php b/app/code/community/TIG/MyParcel2014/Model/Api/Curl.php
@@ -74,7 +74,7 @@ class TIG_MyParcel2014_Model_Api_Curl implements Zend_Http_Client_Adapter_Interf
      */
     protected function _applyConfig()
     {
-        curl_setopt_array($this->_getResource(), $this->_options);
+        @curl_setopt_array($this->_getResource(), $this->_options);
 
         if (empty($this->_config)) {
             return $this;

diff --git a/app/code/community/TIG/MyParcel2014/etc/config.xml b/app/code/community/TIG/MyParcel2014/etc/config.xml
@@ -278,22 +278,22 @@
                 <delivery_title>Thuis of op het werk bezorgd</delivery_title>
                 <only_recipient_active>1</only_recipient_active>
                 <only_recipient_title>Niet bij de buren bezorgen</only_recipient_title>
-                <only_recipient_fee>0.27</only_recipient_fee>
+                <only_recipient_fee>0.33</only_recipient_fee>
                 <signature_active>1</signature_active>
                 <signature_title>Handtekening voor ontvangst</signature_title>
-                <signature_fee>0.34</signature_fee>
-                <signature_and_only_recipient_fee>0.42</signature_and_only_recipient_fee>
+                <signature_fee>0.42</signature_fee>
+                <signature_and_only_recipient_fee>0.51</signature_and_only_recipient_fee>
             </delivery>
             <mailbox>
                 <mailbox_with_other_options>1</mailbox_with_other_options>
             </mailbox>
             <morningdelivery>
                 <morningdelivery_active>1</morningdelivery_active>
-                <morningdelivery_fee>10</morningdelivery_fee>
+                <morningdelivery_fee>12.10</morningdelivery_fee>
             </morningdelivery>
             <eveningdelivery>
                 <eveningdelivery_active>1</eveningdelivery_active>
-                <eveningdelivery_fee>1.25</eveningdelivery_fee>
+                <eveningdelivery_fee>1.51</eveningdelivery_fee>
             </eveningdelivery>
             <pickup>
                 <pickup_active>1</pickup_active>
@@ -302,7 +302,7 @@
             </pickup>
             <pickup_express>
                 <pickup_express_active>1</pickup_express_active>
-                <pickup_express_fee>1.25</pickup_express_fee>
+                <pickup_express_fee>1.51</pickup_express_fee>
             </pickup_express>
         </tig_myparcel>
     </default>