From 144b7360630034ef6a0d8b6dfa2ea5c08c91c160 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 22 Apr 2014 12:34:51 +0200 Subject: [PATCH] update pdf --- templates/pdf/default/I18n/en_US.php | 13 +- templates/pdf/default/I18n/fr_FR.php | 13 +- templates/pdf/default/delivery.html | 293 ++++++++++---------- templates/pdf/default/invoice.html | 389 ++++++++++++--------------- 4 files changed, 331 insertions(+), 377 deletions(-) diff --git a/templates/pdf/default/I18n/en_US.php b/templates/pdf/default/I18n/en_US.php index e7e1d6202..2b562ab6a 100755 --- a/templates/pdf/default/I18n/en_US.php +++ b/templates/pdf/default/I18n/en_US.php @@ -1,13 +1,18 @@ 'Custmer Number', + 'DELIVERY' => 'DELIVERY', 'Delivery module' => 'Delivery module', - 'Page' => 'Page', + 'INVOICE' => 'INVOICE', + 'Invoice REF' => 'Invoice REF', + 'Invoice date' => 'Invoice date', 'Payment module' => 'Payment module', 'Postage' => 'Postage', 'Product' => 'Product', 'Quantity' => 'Quantity', 'Ref' => 'Ref', + 'THANK YOU' => 'THANK YOU', 'Tax' => 'Tax', 'Taxed total' => 'Taxed total', 'Total' => 'Total', @@ -15,13 +20,9 @@ return array( 'Total without tax' => 'Total without tax', 'Unit taxed price' => 'Unit taxed price', 'Unit. price' => 'Unit. price', - 'customer number' => 'customer number', - 'delivery address' => 'delivery address', + 'delivery adress' => 'Delivery Adress', 'delivery module' => 'delivery module', - 'invoice' => 'invoice', 'invoice address' => 'invoice address', - 'invoice date' => 'invoice date', - 'invoice ref' => 'invoice ref', 'page' => 'page', 'product' => 'product', ); diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php index fe039d8df..faa75085e 100755 --- a/templates/pdf/default/I18n/fr_FR.php +++ b/templates/pdf/default/I18n/fr_FR.php @@ -1,13 +1,18 @@ 'Numéro client', + 'DELIVERY' => 'LIVRAISON', 'Delivery module' => 'Module de livraison', - 'Page' => 'Page', + 'INVOICE' => 'FACTURE', + 'Invoice REF' => 'Ref de facture', + 'Invoice date' => 'Date de facturation', 'Payment module' => 'Module de paiement', 'Postage' => 'Frais de livraison', 'Product' => 'Produit', 'Quantity' => 'Quantité', 'Ref' => 'Ref', + 'THANK YOU' => 'MERCI', 'Tax' => 'Taxes', 'Taxed total' => 'Montant total des taxes', 'Total' => 'Total', @@ -15,13 +20,9 @@ return array( 'Total without tax' => 'Total HT', 'Unit taxed price' => 'Prix unitaire TTC', 'Unit. price' => 'Prix unitaire', - 'customer number' => 'Numéro client', - 'delivery address' => 'Adresse de livraison', + 'delivery adress' => 'adresse de livraison', 'delivery module' => 'Mode de livraison', - 'invoice' => 'Facture', 'invoice address' => 'Adresse de facturation', - 'invoice date' => 'Date de la facture', - 'invoice ref' => 'Référence de la facture', 'page' => 'page', 'product' => 'Produit', ); diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html index c8939c3ed..8ff2f6ae2 100644 --- a/templates/pdf/default/delivery.html +++ b/templates/pdf/default/delivery.html @@ -11,49 +11,73 @@ {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *} {default_translation_domain domain='pdf.default'} +{literal} + - +{/literal} - - + + + + + @@ -67,139 +91,108 @@ {assign "orderCurrency" $SYMBOL} {/loop} - -
+

{intl l="THANK YOU"}

+ 		+

{config key="store_name"}

+
{intl l="page"} [[page_cu]]/[[page_nb]]
+
+ + - - + + + + + + + + + + + + - - + + + + + + + + - + + + +
+

{intl l="DELIVERY"}

+
+

{intl l="Invoice date"}

+

{format_date date=$INVOICE_DATE}

+
+

{intl l="Invoice REF"}

+

{$REF}

+
+

{intl l="Custmer Number"}

+

{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}

+
+
+

{intl l="delivery adress"}

+

+ {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} + {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
+ {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
+ {$ZIPCODE} {$COUNTRY}
+ {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} + {/loop} +

+ 		+

{intl l="invoice address"}

+

+ {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} + {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
+ {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
+ {$ZIPCODE} {$COUNTRY}
+ {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} + {/loop} +

+
-
-

- {config key="store_name"} - -

+ + + + + + + + + + {loop type="order_product" name="order-products" order=$ID} + + + + + + {/loop} - - -

{intl l='Delivery module'}
{$DELIVERY_REF}

- - -
+

{intl l="Ref"}

+ 		+

{intl l="product"}

+ 		+

{intl l="Quantity"}

+
+

{$REF}

+ 		+

{$TITLE}

+ 		+

{$QUANTITY}

+
- - - - - - - - - - - - -
{intl l="invoice ref"}{intl l="invoice date"}
{$REF}{format_date date=$INVOICE_DATE}
- - - - - - - - - - - - - -
{intl l="invoice"} {intl l="customer number"}
{$INVOICE_REF}{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}
- - - - - - - - - - - - - - -
{intl l="delivery address"}
- {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} - {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
- {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
- {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} - {/loop} -
- - - - - - - - - -
{intl l="invoice address"}
- {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} - {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
- {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$COUNTRY}
- {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} - {/loop} -
- - - - - - - - - - - - - - - - - - - - - {loop type="order_product" name="order-products" order=$ID} - - - - - - {/loop} - -
{intl l="Ref"}{intl l="product"}{intl l="Quantity"}
{$REF}{$TITLE}{$QUANTITY}
- - - - - - - - - - - - -
{intl l="delivery module"}{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}
+ + +

{intl l='Delivery module'}

+

{$DELIVERY_REF}

+ + + + + + {/loop} diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html index de993de19..6117a04b8 100644 --- a/templates/pdf/default/invoice.html +++ b/templates/pdf/default/invoice.html @@ -11,235 +11,194 @@ {* Set the default translation domain, that will be used by {intl} when the 'd' parameter is not set *} {default_translation_domain domain='pdf.default'} - - - - - +{/literal} + + - - - - - - - - - - - - - -
{intl l="Page"} [[page_cu]]/[[page_nb]]
- + + + + + + + + + + +
{intl l="page"} [[page_cu]]/[[page_nb]]
+ {loop name="order.invoice" type="order" id=$order_id customer="*"} {loop name="currency.order" type="currency" id=$CURRENCY} - {assign "orderCurrency" $SYMBOL} + {assign "orderCurrency" $SYMBOL} + {/loop} + + + + + + + + + + + + + + + +
+

{intl l="INVOICE"}

+
+

{intl l="Invoice date"}

+ {format_date date=$INVOICE_DATE} +
+

{intl l="Invoice REF"}

+ {$REF} +
+

{intl l="Custmer Number"}

+ {loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop} +
+ + + + + + + +
+

{intl l="delivery adress"}

+

+ {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} + {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
+ {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
+ {$ZIPCODE} {$COUNTRY}
+ {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} + {/loop} +

+ 		+

{intl l="invoice address"}

+

+ {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} + {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
+ {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
+ {$ZIPCODE} {$COUNTRY}
+ {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} + {/loop} +

+
+ + + + + + + + + + + + + + + + + + {loop type="order_product" name="order-products" order=$ID} + {if $WAS_IN_PROMO == 1} + {assign "realPrice" $PROMO_PRICE} + {assign "realTax" $PROMO_PRICE_TAX} + {assign "realTaxedPrice" $TAXED_PROMO_PRICE} + {else} + {assign "realPrice" $PRICE} + {assign "realTax" $PRICE_TAX} + {assign "realTaxedPrice" $TAXED_PRICE} + {/if} + + + + + + + + {/loop} -

{intl l="Product"}

{intl l="Unit. price"}

{intl l="Tax"}

{intl l="Unit taxed price"}

{intl l="Quantity"}

{intl l="Taxed total"}

{$TITLE}

+ {ifloop rel="combinations"} + {loop type="order_product_attribute_combination" name="combinations" order_product=$ID} + {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}
+ {/loop} + {/ifloop} +

{$orderCurrency} {$realPrice}

{$orderCurrency} {$realTax}

{$orderCurrency} {$realTaxedPrice}

{$QUANTITY}

{$orderCurrency} {$realTaxedPrice * $QUANTITY}

- - - - - -
- -
-

{config key="store_name"}

-

-

{intl l="invoice"} {$INVOICE_REF}

-
- - - - - - - - - - - - - -
{intl l="invoice ref"}{intl l="customer number"}{intl l="invoice date"}
{$REF}{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}{format_date date=$INVOICE_DATE}
- 		- - - - - - - - - -
{intl l="delivery address"}
- {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS} - {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
- {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$CITY}
- {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} - {/loop} -
- - - - - - - - - -
{intl l="invoice address"}
- {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS} - {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}
- {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}
- {$ZIPCODE} {$CITY}
- {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop} - {/loop} -
-
- - - - - - - - - - - - - - - - - - - - - - - - {loop type="order_product" name="order-products" order=$ID} - {if $WAS_IN_PROMO == 1} - {assign "realPrice" $PROMO_PRICE} - {assign "realTax" $PROMO_PRICE_TAX} - {assign "realTaxedPrice" $TAXED_PROMO_PRICE} - {else} - {assign "realPrice" $PRICE} - {assign "realTax" $PRICE_TAX} - {assign "realTaxedPrice" $TAXED_PRICE} - {/if} - - - - - - - - - {/loop} - -
{intl l="Product"}{intl l="Unit. price"}{intl l="Tax"}{intl l="Unit taxed price"}{intl l="Quantity"}{intl l="Taxed total"}
- {$TITLE} - {ifloop rel="combinations"} - {loop type="order_product_attribute_combination" name="combinations" order_product=$ID} - {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}
- {/loop} - {/ifloop} - 		{$orderCurrency} {$realPrice}{$orderCurrency} {$realTax}{$orderCurrency} {$realTaxedPrice}{$QUANTITY}{$orderCurrency} {$realTaxedPrice * $QUANTITY}
- - - - - - - - - - - - -
- - - - - - - - - - - - - - - - -
{intl l="Payment module"}{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}
{intl l="delivery module"}{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}
- 		- - - - - - - - - - - - - - - - - - - - - - - - - - -
{intl l="Total without tax"}{$orderCurrency} {$TOTAL_AMOUNT}
{intl l="Total with tax"}{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}
{intl l="Postage"}{$orderCurrency} {$POSTAGE}
{intl l="Total"}{$orderCurrency} {$TOTAL_TAXED_AMOUNT}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +

{intl l="Payment module"}

+ {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop} +

{intl l="Total without tax"}

{$orderCurrency} {$TOTAL_AMOUNT}

{intl l="delivery module"}

+ {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}

{intl l="Total with tax"}

{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}

{intl l="Postage"}

{$orderCurrency} {$POSTAGE}

{intl l="Total"}

{$orderCurrency} {$TOTAL_TAXED_AMOUNT}

{/loop} - + \ No newline at end of file