dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/GuestTrackingController.php
+4 -3
View File
@@ -27,6 +27,8 @@
class GuestTrackingControllerCore extends FrontController
{
public $php_self = 'guest-tracking.php';
public function preProcess()
{
parent::preProcess();
@@ -136,9 +138,8 @@ class GuestTrackingControllerCore extends FrontController
private function processAddressFormat(Address $delivery, Address $invoice)
{
$inv_adr_fields = AddressFormat::getOrderedAddressFields($invoice->id_country);
$dlv_adr_fields = AddressFormat::getOrderedAddressFields($delivery->id_country);
$inv_adr_fields = AddressFormat::getOrderedAddressFields($invoice->id_country, false, true);
$dlv_adr_fields = AddressFormat::getOrderedAddressFields($delivery->id_country, false, true);
$this->context->smarty->assign('inv_adr_fields', $inv_adr_fields);
$this->context->smarty->assign('dlv_adr_fields', $dlv_adr_fields);