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

// Refacto AddressesController

Browse Source
This commit is contained in:
rMalie
2011-09-28 16:16:20 +00:00
parent 68fc08c0f8
commit ec34ad9328
1 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressesController.php
+40 -33
View File
@@ -32,6 +32,9 @@ class AddressesControllerCore extends FrontController
public $authRedirection = 'addresses'; public $authRedirection = 'addresses';
public $ssl = true; public $ssl = true;
/**
* Set default medias for this controller
*/
public function setMedia() public function setMedia()
{ {
parent::setMedia(); parent::setMedia();
@@ -39,54 +42,58 @@ class AddressesControllerCore extends FrontController
$this->addJS(_THEME_JS_DIR_.'tools.js'); $this->addJS(_THEME_JS_DIR_.'tools.js');
} }
public function process() /**
* Initialize addresses controller
* @see FrontController::init()
*/
public function init()
{ {
$multipleAddressesFormated = array(); if (!Validate::isLoadedObject($this->context->customer))
$ordered_fields = array();
$customer = $this->context->customer;
if (!Validate::isLoadedObject($customer))
die(Tools::displayError('Customer not found')); die(Tools::displayError('Customer not found'));
}
// Retro Compatibility Theme < 1.4.1 /**
$this->context->smarty->assign('addresses', $customer->getAddresses($this->context->language->id)); * Assign template vars related to page content
* @see FrontController::initContent()
$customerAddressesDetailed = $customer->getAddresses($this->context->language->id); */
public function initContent()
{
$total = 0; $total = 0;
foreach($customerAddressesDetailed as $addressDetailed) $multiple_addresses_formated = array();
$ordered_fields = array();
$addresses = $this->context->customer->getAddresses($this->context->language->id);
// @todo getAddresses() should send back objects
foreach ($addresses as $detail)
{ {
$address = new Address($addressDetailed['id_address']); $address = new Address($detail['id_address']);
$multiple_addresses_formated[$total] = AddressFormat::getFormattedLayoutData($address);
$multipleAddressesFormated[$total] = AddressFormat::getFormattedLayoutData($address);
unset($address); unset($address);
++$total; ++$total;
// Retro theme < 1.4.2 // Retro theme < 1.4.2
$ordered_fields = AddressFormat::getOrderedAddressFields($addressDetailed['id_country'], false, true); $ordered_fields = AddressFormat::getOrderedAddressFields($detail['id_country'], false, true);
} }
// Retro theme 1.4.2 // Retro theme 1.4.2
if (($key = array_search('Country:name', $ordered_fields))) if ($key = array_search('Country:name', $ordered_fields))
$ordered_fields[$key] = 'country'; $ordered_fields[$key] = 'country';
$this->context->smarty->assign('addresses_style', array( $this->context->smarty->assign('addresses_style', array(
'company' => 'address_company' 'company' => 'address_company',
,'vat_number' => 'address_company' 'vat_number' => 'address_company',
,'firstname' => 'address_name' 'firstname' => 'address_name',
,'lastname' => 'address_name' 'lastname' => 'address_name',
,'address1' => 'address_address1' 'address1' => 'address_address1',
,'address2' => 'address_address2' 'address2' => 'address_address2',
,'city' => 'address_city' 'city' => 'address_city',
,'country' => 'address_country' 'country' => 'address_country',
,'phone' => 'address_phone' 'phone' => 'address_phone',
,'phone_mobile' => 'address_phone_mobile' 'phone_mobile' => 'address_phone_mobile',
,'alias' => 'address_title' 'alias' => 'address_title',
)); 'multipleAddresses' => $multiple_addresses_formated,
'ordered_fields' => $ordered_fields,
$this->context->smarty->assign(array( 'addresses' => $addresses, // Retro Compatibility Theme < 1.4.1
'multipleAddresses' => $multipleAddressesFormated, ));
'ordered_fields' => $ordered_fields));
$this->setTemplate(_PS_THEME_DIR_.'addresses.tpl'); $this->setTemplate(_PS_THEME_DIR_.'addresses.tpl');
} }