// Shop name on invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12201 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-01-05 15:38:04 +00:00
parent 079954fb15
commit f6235d99d6
2 changed files with 29 additions and 15 deletions
+1 -5
View File
@@ -121,15 +121,11 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
public function getFooter()
{
$this->address = $this->address_warehouse;
$shop_address = '';
if (isset($this->address) && $this->address instanceof Address)
$shop_address = AddressFormat::generateAddress($this->address, array(), ' - ', ' ');
$free_text = self::l('DE: Discount excluded ');
$free_text .= self::l(' DI: Discount included');
$this->smarty->assign(array(
'shop_address' => $shop_address,
'shop_address' => $this->getShopAddress(),
'shop_fax' => Configuration::get('PS_SHOP_FAX'),
'shop_phone' => Configuration::get('PS_SHOP_PHONE'),
'shop_details' => Configuration::get('PS_SHOP_DETAILS'),