Merge pull request #309 from myparcelnl/develop

Develop
myparcelnl · Apr 6, 2017 · af5548f · af5548f
2 parents 4f683b6 + ada65a3
commit af5548f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/code/community/TIG/MyParcel2014/Model/Api/MyParcel.php b/app/code/community/TIG/MyParcel2014/Model/Api/MyParcel.php
@@ -756,8 +756,14 @@ protected function _getConsignmentData(TIG_MyParcel2014_Model_Shipment $myParcel
                         );
                     }
 
+                    $itemDescription = $item->getName();
+
+                    if (strlen($itemDescription) > 50) {
+                        $itemDescription = substr($itemDescription, 0, 50);
+                    }
+
                     $data['customs_declaration']['items'][] = array(
-                        'description'       => $item->getName(),
+                        'description'       => $itemDescription,
                         'amount'            => $qty,
                         'weight'            => (int)$weight * 1000,
                         'item_value'        => array('amount' => $price * 100, 'currency' => 'EUR'),

diff --git a/...d/base/default/template/TIG/MyParcel2014/checkout/onepage/shipping_method/available.phtml b/...d/base/default/template/TIG/MyParcel2014/checkout/onepage/shipping_method/available.phtml
@@ -149,7 +149,7 @@ $toggleOptions = $helper->getConfig('toggle_options', 'checkout') == '1' ? true
 
             <?php if ($code == 'myparcel' && $useMyParcel): ?>
                 <div id="mypa-load" style="<?php echo $toggleOptions && $_rate->getCode() !== $this->getAddressShippingMethod() ? 'display: none;' : ''; ?>">
-                    <iframe id="myparcel-iframe" src="<?php echo str_replace('/?___SID=S', '', Mage::getUrl('myparcel2014/checkout/checkout_options',array('_secure'=>false)));?>" frameborder="0" scrolling="auto" style="width: 100%;" >Bezig met laden...</iframe>
+                    <iframe id="myparcel-iframe" src="<?php echo str_replace('/?___SID=S', '', Mage::getUrl('myparcel2014/checkout/checkout_options'));?>" frameborder="0" scrolling="auto" style="width: 100%;" >Bezig met laden...</iframe>
                     <input style="display: none;" id="mypa-input" name="mypa-post-nl-data">
                     <input style="display: none;" type="checkbox" name='mypa-signed' id="mypa-signed">
                     <input style="display: none;" type="checkbox" name='mypa-recipient-only' id="mypa-recipient-only">