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

// Context part 12

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-19 09:28:11 +00:00
parent 8a0a62ae03
commit 89213e18e5
53 changed files with 184 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/AddressesController.php
+7 -8
View File
@@ -50,15 +50,15 @@ class AddressesControllerCore extends FrontController
$multipleAddressesFormated = array();
$ordered_fields = array();
$customer = new Customer((int)(self::$cookie->id_customer));
$customer = $context->customer;
if (!Validate::isLoadedObject($customer))
die(Tools::displayError('Customer not found'));
// Retro Compatibility Theme < 1.4.1
$this->smarty->assign('addresses', $customer->getAddresses((int)(self::$cookie->id_lang)));
$this->smarty->assign('addresses', $customer->getAddresses($context->language->id));
$customerAddressesDetailed = $customer->getAddresses((int)(self::$cookie->id_lang));
$customerAddressesDetailed = $customer->getAddresses($context->language->id);
$total = 0;
foreach($customerAddressesDetailed as $addressDetailed)
@@ -74,12 +74,12 @@ class AddressesControllerCore extends FrontController
++$total;
// Retro theme < 1.4.2
$ordered_fields = AddressFormat::getOrderedAddressFields($addressDetailed['id_country']);
$ordered_fields = AddressFormat::getOrderedAddressFields($addressDetailed['id_country']);
}
// Retro theme 1.4.2
if (($key = array_search('Country:name', $ordered_fields)))
$ordered_fields[$key] = 'country';
if (($key = array_search('Country:name', $ordered_fields)))
$ordered_fields[$key] = 'country';
$this->smarty->assign('addresses_style', array(
'company' => 'address_company'
@@ -98,7 +98,6 @@ class AddressesControllerCore extends FrontController
$this->smarty->assign(array(
'multipleAddresses' => $multipleAddressesFormated,
'ordered_fields' => $ordered_fields));
unset($customer);
}
public function displayContent()