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

[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-19 10:14:10 +00:00
parent 81832703f2
commit 6887541bdd
82 changed files with 432 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplateDeliverySlip.php
+1 -1
View File
@@ -40,7 +40,7 @@ class HTMLTemplateDeliverySlipCore extends HTMLTemplate
// header informations
$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
$this->title = self::l('Delivery').' #'.Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id).sprintf('%06d', $this->order_invoice->delivery_number);
$this->title = HTMLTemplateDeliverySlip::l('Delivery').' #'.Configuration::get('PS_DELIVERY_PREFIX', Context::getContext()->language->id).sprintf('%06d', $this->order_invoice->delivery_number);
// footer informations
$this->shop = new Shop((int)$this->order->id_shop);
classes/pdf/HTMLTemplateInvoice.php
+1 -1
View File
@@ -42,7 +42,7 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
// header informations
$this->date = Tools::displayDate($order_invoice->date_add, (int)$this->order->id_lang);
$this->title = self::l('Invoice ').' #'.Configuration::get('PS_INVOICE_PREFIX', Context::getContext()->language->id).sprintf('%06d', $order_invoice->number);
$this->title = HTMLTemplateInvoice::l('Invoice ').' #'.Configuration::get('PS_INVOICE_PREFIX', Context::getContext()->language->id).sprintf('%06d', $order_invoice->number);
// footer informations
$this->shop = new Shop((int)$this->order->id_shop);
classes/pdf/HTMLTemplateOrderSlip.php
+1 -1
View File
@@ -47,7 +47,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
// header informations
$this->date = Tools::displayDate($this->order->invoice_date, (int)$this->order->id_lang);
$this->title = self::l('Slip #').sprintf('%06d', $this->order_slip->id);
$this->title = HTMLTemplateOrderSlip::l('Slip #').sprintf('%06d', $this->order_slip->id);
// footer informations
$this->shop = new Shop((int)$this->order->id_shop);
classes/pdf/HTMLTemplateSupplyOrderForm.php
+4 -4
View File
@@ -47,7 +47,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
// header informations
$this->date = Tools::displayDate($supply_order->date_add, (int)$this->supply_order->id_lang);
$this->title = self::l('Supply order form').sprintf(' %s', $supply_order->reference);
$this->title = HTMLTemplateSupplyOrderForm::l('Supply order form').sprintf(' %s', $supply_order->reference);
}
/**
@@ -88,7 +88,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
*/
public function getFilename()
{
return (self::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
return (HTMLTemplateSupplyOrderForm::l('SupplyOrderForm').sprintf('_%s', $this->supply_order->reference).'.pdf');
}
protected function getTaxOrderSummary()
@@ -121,8 +121,8 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
public function getFooter()
{
$this->address = $this->address_warehouse;
$free_text = self::l('DE: Discount excluded ');
$free_text .= self::l(' DI: Discount included');
$free_text = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded ');
$free_text .= HTMLTemplateSupplyOrderForm::l(' DI: Discount included');
$this->smarty->assign(array(
'shop_address' => $this->getShopAddress(),