Skip to content

Commit

Permalink
Fix PostNL location on label
Browse files Browse the repository at this point in the history
  • Loading branch information
reindertvetter committed Jul 4, 2016
1 parent 5231401 commit f03d83a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions app/code/community/TIG/MyParcel2014/Model/Sales/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ public function getShippingAddress() {
$helper = Mage::helper('tig_myparcel');
$usePgAddress = $helper->getConfig('pakjegemak_use_shipment_address') === '1';

$parentFunctions = debug_backtrace();
if($parentFunctions[3]['function'] == '_getConsignmentData') {
$usePgAddress = false;
}

$pgAddress = false;
$shippingAddress = false;

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.5.6</version>
<version>1.5.7</version>
</TIG_MyParcel2014>
</modules>
<global>
Expand Down

0 comments on commit f03d83a

Please sign in to comment.