Skip to content

Commit

Permalink
Merge pull request #192 from myparcelnl/hotfix-postnl-location-label
Browse files Browse the repository at this point in the history
hot fix 1.7.15
  • Loading branch information
Reindert authored Oct 19, 2016
2 parents 3ab589b + f68a11b commit f3d532c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function copyAddressToOrder(Varien_Event_Observer $observer)
$myParcelData['browser'] = $_SERVER['HTTP_USER_AGENT'];
$order->setMyparcelData(json_encode($myParcelData));

if(key_exists('location', $myParcelData)){
if($myParcelData === null || !key_exists('location', $myParcelData)){
Mage::getModel('tig_myparcel/checkout_service')->removePgAddress($quote);
return $this;
}
Expand All @@ -139,6 +139,7 @@ public function copyAddressToOrder(Varien_Event_Observer $observer)
$order->setMyparcelSendDate($sDropOff);
}


/**
* Get the PakjeGemak address for this quote.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/TIG/MyParcel2014/etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<TIG_MyParcel2014>
<version>1.7.14</version>
<version>1.7.15</version>
</TIG_MyParcel2014>
</modules>
<global>
Expand Down

0 comments on commit f3d532c

Please sign in to comment.