From cf4d36dffaae486b4625490b7e4ff6f654fc0b80 Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 7 Feb 2012 17:02:34 +0000 Subject: [PATCH] // Improved Supply Order Form (PDF) --- classes/pdf/HTMLTemplateSupplyOrderForm.php | 30 +++++++-- themes/default/pdf/supply-order-footer.tpl | 4 +- themes/default/pdf/supply-order-header.tpl | 55 ++++++++++++++++ themes/default/pdf/supply-order.tpl | 72 ++++++++++----------- 4 files changed, 120 insertions(+), 41 deletions(-) create mode 100644 themes/default/pdf/supply-order-header.tpl diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index ba9e967ba..4706e0ce3 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php @@ -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 = HTMLTemplateSupplyOrderForm::l('Supply order form').sprintf(' %s', $supply_order->reference); + $this->title = HTMLTemplateSupplyOrderForm::l('Supply order form'); } /** @@ -116,15 +116,37 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate return $results; } + /** + * @see HTMLTemplate::getHeader() + */ + public function getHeader() + { + $shop_name = ''; + if (Validate::isLoadedObject($this->shop)) + $shop_name = $this->shop->name; + + $this->smarty->assign(array( + 'logo_path' => $this->getLogo(), + 'img_ps_dir' => 'http://'.Tools::getMediaServer(_PS_IMG_)._PS_IMG_, + 'img_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'), + 'title' => $this->title, + 'reference' => $this->supply_order->reference, + 'date' => $this->date, + 'shop_name' => $shop_name + )); + + return $this->smarty->fetch(_PS_THEME_DIR_.'/pdf/supply-order-header.tpl'); + } + /** * @see HTMLTemplate::getFooter() */ public function getFooter() { $this->address = $this->address_warehouse; - $free_text = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded '); - $free_text .= ' - '; - $free_text .= HTMLTemplateSupplyOrderForm::l(' DI: Discount included'); + $free_text = array(); + $free_text[] = HTMLTemplateSupplyOrderForm::l('DE: Discount excluded '); + $free_text[] = HTMLTemplateSupplyOrderForm::l(' DI: Discount included'); $this->smarty->assign(array( 'shop_address' => $this->getShopAddress(), diff --git a/themes/default/pdf/supply-order-footer.tpl b/themes/default/pdf/supply-order-footer.tpl index d51f79405..8e7ccca80 100755 --- a/themes/default/pdf/supply-order-footer.tpl +++ b/themes/default/pdf/supply-order-footer.tpl @@ -45,7 +45,9 @@ {/if} {if isset($free_text)} - {$free_text|escape:'htmlall':'UTF-8'}
+ {foreach $free_text as $text} + {$text|escape:'htmlall':'UTF-8'}
+ {/foreach} {/if} diff --git a/themes/default/pdf/supply-order-header.tpl b/themes/default/pdf/supply-order-header.tpl new file mode 100644 index 000000000..15889a915 --- /dev/null +++ b/themes/default/pdf/supply-order-header.tpl @@ -0,0 +1,55 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + + +
 
+ + + + + + +
+ {if $logo_path} + + {/if} + + + + + + + + + + + + + + +
{$shop_name|escape:'htmlall':'UTF-8'}
{$date|escape:'htmlall':'UTF-8'}
{$title|escape:'htmlall':'UTF-8'}
{$reference|escape:'htmlall':'UTF-8'}
+
+ diff --git a/themes/default/pdf/supply-order.tpl b/themes/default/pdf/supply-order.tpl index 9fcd7e479..adc8486d5 100644 --- a/themes/default/pdf/supply-order.tpl +++ b/themes/default/pdf/supply-order.tpl @@ -81,28 +81,28 @@
- - - - - - - - - + + + + + + + + + {* for each product ordered *} {foreach $supply_order_details as $supply_order_detail} - - - - - - - - - + + + + + + + + + {/foreach}
{l s='Reference' pdf='true'}{l s='Designation' pdf='true'}{l s='Qty' pdf='true'}{l s='Unit Price TE' pdf='true'}{l s='Total TE' pdf='true'}
{l s='Before discount' pdf='true'}		{l s='Discount Rate' pdf='true'}{l s='Total TE' pdf='true'}
{l s='After discount' pdf='true'}		{l s='Tax rate' pdf='true'}{l s='Total TI' pdf='true'}{l s='Reference' pdf='true'}{l s='Designation' pdf='true'}{l s='Qty' pdf='true'}{l s='Unit Price TE' pdf='true'}{l s='Total TE' pdf='true'}
{l s='Before discount' pdf='true'}		{l s='Discount Rate' pdf='true'}{l s='Total TE' pdf='true'}
{l s='After discount' pdf='true'}		{l s='Tax rate' pdf='true'}{l s='Total TI' pdf='true'}
{$supply_order_detail->supplier_reference}{$supply_order_detail->name}{$supply_order_detail->quantity_expected}{$currency->prefix} {$supply_order_detail->unit_price_te} {$currency->suffix}{$currency->prefix} {$supply_order_detail->price_te} {$currency->suffix}{$supply_order_detail->discount_rate}{$currency->prefix} {$supply_order_detail->price_with_discount_te} {$currency->suffix}{$supply_order_detail->tax_rate}{$currency->prefix} {$supply_order_detail->price_ti} {$currency->suffix}{$supply_order_detail->supplier_reference}{$supply_order_detail->name}{$supply_order_detail->quantity_expected}{$currency->prefix} {$supply_order_detail->unit_price_te} {$currency->suffix}{$currency->prefix} {$supply_order_detail->price_te} {$currency->suffix}{$supply_order_detail->discount_rate}{$currency->prefix} {$supply_order_detail->price_with_discount_te} {$currency->suffix}{$supply_order_detail->tax_rate}{$currency->prefix} {$supply_order_detail->price_ti} {$currency->suffix}
@@ -118,15 +118,15 @@
- - - + + + {foreach $tax_order_summary as $entry} - - - + + + {/foreach}
{l s='Base TE' pdf='true'}{l s='Tax Rate' pdf='true'}{l s='Tax Value' pdf='true'}{l s='Base TE' pdf='true'}{l s='Tax Rate' pdf='true'}{l s='Tax Value' pdf='true'}
{$currency->prefix} {$entry['base_te']} {$currency->suffix}{$entry['tax_rate']}{$currency->prefix} {$entry['total_tax_value']} {$currency->suffix}{$currency->prefix} {$entry['base_te']} {$currency->suffix}{$entry['tax_rate']}{$currency->prefix} {$entry['total_tax_value']} {$currency->suffix}
@@ -142,28 +142,28 @@
- - + + - - + + - - + + - - + + - - + + - - + +
{l s='Total TE' pdf='true'}
{l s='(Discount excluded)' pdf='true'}		{$currency->prefix} {$supply_order->total_te} {$currency->suffix}{l s='Total TE' pdf='true'}
{l s='(Discount excluded)' pdf='true'}		{$currency->prefix} {$supply_order->total_te} {$currency->suffix}
{l s='Order Discount' pdf='true'}{$currency->prefix} {$supply_order->discount_value_te} {$currency->suffix}{l s='Order Discount' pdf='true'}{$currency->prefix} {$supply_order->discount_value_te} {$currency->suffix}
{l s='Total TE' pdf='true'}
{l s='(Discount included)' pdf='true'}		{$currency->prefix} {$supply_order->total_with_discount_te} {$currency->suffix}{l s='Total TE' pdf='true'}
{l s='(Discount included)' pdf='true'}		{$currency->prefix} {$supply_order->total_with_discount_te} {$currency->suffix}
{l s='Tax value' pdf='true'}{$currency->prefix} {$supply_order->total_tax} {$currency->suffix}{l s='Tax value' pdf='true'}{$currency->prefix} {$supply_order->total_tax} {$currency->suffix}
{l s='Total TI' pdf='true'}{$currency->prefix} {$supply_order->total_ti} {$currency->suffix}{l s='Total TI' pdf='true'}{$currency->prefix} {$supply_order->total_ti} {$currency->suffix}
{l s='TOTAL TO PAY' pdf='true'}{$currency->prefix} {$supply_order->total_ti} {$currency->suffix}{l s='TOTAL TO PAY' pdf='true'}{$currency->prefix} {$supply_order->total_ti} {$currency->suffix}