diff --git a/templates/pdf/default/I18n/en_US.php b/templates/pdf/default/I18n/en_US.php index 2b562ab6a..45754e233 100755 --- a/templates/pdf/default/I18n/en_US.php +++ b/templates/pdf/default/I18n/en_US.php @@ -1,18 +1,22 @@ 'Custmer Number', + 'Customer Number' => 'Customer Number', 'DELIVERY' => 'DELIVERY', + 'Delivery address' => 'Delivery address', 'Delivery module' => 'Delivery module', + 'Discount' => 'Discount', + 'Email: ' => 'Email: ', 'INVOICE' => 'INVOICE', 'Invoice REF' => 'Invoice REF', + 'Invoice address' => 'Invoice address', 'Invoice date' => 'Invoice date', 'Payment module' => 'Payment module', + 'Phone: ' => 'Phone: ', 'Postage' => 'Postage', 'Product' => 'Product', 'Quantity' => 'Quantity', 'Ref' => 'Ref', - 'THANK YOU' => 'THANK YOU', 'Tax' => 'Tax', 'Taxed total' => 'Taxed total', 'Total' => 'Total', @@ -20,9 +24,6 @@ return array( 'Total without tax' => 'Total without tax', 'Unit taxed price' => 'Unit taxed price', 'Unit. price' => 'Unit. price', - 'delivery adress' => 'Delivery Adress', - 'delivery module' => 'delivery module', - 'invoice address' => 'invoice address', 'page' => 'page', 'product' => 'product', ); diff --git a/templates/pdf/default/I18n/fr_FR.php b/templates/pdf/default/I18n/fr_FR.php index fdfc48491..e0996502a 100755 --- a/templates/pdf/default/I18n/fr_FR.php +++ b/templates/pdf/default/I18n/fr_FR.php @@ -1,18 +1,22 @@ 'Numéro client', + 'Customer Number' => 'Numéro Client', 'DELIVERY' => 'LIVRAISON', + 'Delivery address' => 'Adresse de livraison', 'Delivery module' => 'Module de livraison', + 'Discount' => 'Remise', + 'Email: ' => 'Email :', 'INVOICE' => 'FACTURE', 'Invoice REF' => 'Ref de facture', + 'Invoice address' => 'Adresse de facturation', 'Invoice date' => 'Date de facturation', 'Payment module' => 'Module de paiement', + 'Phone: ' => 'Tél.: ', 'Postage' => 'Frais de livraison', 'Product' => 'Produit', 'Quantity' => 'Quantité', 'Ref' => 'Ref', - 'THANK YOU' => 'MERCI', 'Tax' => 'Taxes', 'Taxed total' => 'Total TTC', 'Total' => 'Total', @@ -20,9 +24,6 @@ return array( 'Total without tax' => 'Total HT', 'Unit taxed price' => 'Prix unitaire TTC', 'Unit. price' => 'Prix unitaire', - 'delivery adress' => 'adresse de livraison', - 'delivery module' => 'Mode de livraison', - 'invoice address' => 'Adresse de facturation', 'page' => 'page', 'product' => 'Produit', ); diff --git a/templates/pdf/default/delivery.html b/templates/pdf/default/delivery.html index 3cad6a9b5..51133ff63 100644 --- a/templates/pdf/default/delivery.html +++ b/templates/pdf/default/delivery.html @@ -15,33 +15,39 @@ {/literal} @@ -67,19 +128,30 @@ - - + + - - - - @@ -91,69 +163,54 @@ {assign "orderCurrency" $SYMBOL} {/loop} -
-

{intl l="THANK YOU"}

+ + {config key="store_name"} + - {config key="store_address1"} {config key="store_address2"} {config key="store_address3"} + - {config key="store_zipcode"} {config key="store_city"} + {if {config key="store_country"} } + {loop type="country" name="address.country.title" id={config key="store_country"}} - {$TITLE}{/loop} + {/if} + {if {config key="store_business_id"} } + - {config key="store_business_id"} + {/if} +
+ {if {config key="store_phone"} } + {intl l="Phone: "}{config key="store_phone"} + {/if} + {if {config key="store_email"} } + {intl l="Email: "}{config key="store_email"} + {/if} + 		-

{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} {$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} -

-
+ + + + + + + + + + + + +
+

{intl l="DELIVERY"}

+

{intl l="Invoice date"} : {format_date date=$INVOICE_DATE}

{intl l="Invoice REF"} : {$REF}

{intl l="Customer Number"} : {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} {$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} +

+
+ + @@ -182,17 +239,21 @@ {/loop} +
- - -

{intl l='Delivery module'}

-

{$DELIVERY_REF}

- - - - - - - + + + + + + + + +
+

{intl l="Delivery module"}

+

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

+
{/loop} diff --git a/templates/pdf/default/invoice.html b/templates/pdf/default/invoice.html index 9d71c337a..68d518639 100644 --- a/templates/pdf/default/invoice.html +++ b/templates/pdf/default/invoice.html @@ -15,20 +15,62 @@ {/literal} @@ -61,7 +133,26 @@ - + + + {config key="store_name"} + - {config key="store_address1"} {config key="store_address2"} {config key="store_address3"} + - {config key="store_zipcode"} {config key="store_city"} + {if {config key="store_country"} } + {loop type="country" name="address.country.title" id={config key="store_country"}} - {$TITLE}{/loop} + {/if} + {if {config key="store_business_id"} } + - {config key="store_business_id"} + {/if} +
+ {if {config key="store_phone"} } + {intl l="Phone: "}{config key="store_phone"} + {/if} + {if {config key="store_email"} } + {intl l="Email: "}{config key="store_email"} + {/if} + + {intl l="page"} [[page_cu]]/[[page_nb]] @@ -74,39 +165,30 @@ {loop name="currency.order" type="currency" id=$CURRENCY} {assign "orderCurrency" $SYMBOL} {/loop} - +
- - + - + - + - +

{intl l="INVOICE"}
-

{intl l="Invoice date"}

- {format_date date=$INVOICE_DATE} -

{intl l="Invoice date"} : {format_date date=$INVOICE_DATE}
-

{intl l="Invoice REF"}

- {$REF} -

{intl l="Invoice REF"} : {$REF}
-

{intl l="Custmer Number"}

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

{intl l="Customer Number"} : {loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}
- - + +
+ - -
-

{intl l="delivery adress"}

+ 		+

{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}
@@ -116,8 +198,8 @@ {/loop}

-

{intl l="invoice address"}

+ 		+

{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}
@@ -130,104 +212,117 @@

- - - - - - - +
+ + + + + + - - - - - - - - - {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 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} - {$taxes[{$TAX_RULE_TITLE}][] = $realTax * $QUANTITY} + {$taxes[{$TAX_RULE_TITLE}][] = $realTax * $QUANTITY} - - - - - - - - - {/loop} + + + + + + + + + {/loop} +

{intl l="Product"}

{intl l="Unit. price"}

{intl l="Tax"}

{intl l="Unit taxed price"}

{intl l="Quantity"}

{intl l="Taxed total"}

{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} - [[ {$TAX_RULE_TITLE} = {$realTax * $QUANTITY} ]] -

{$orderCurrency} {$realPrice}

{$orderCurrency} {$realTax}

{$orderCurrency} {$realTaxedPrice}

{$QUANTITY}

{$orderCurrency} {$realTaxedPrice * $QUANTITY}

+

{$TITLE}

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

{format_money number=$realPrice symbol=$orderCurrency}

{format_money number=$realTax symbol=$orderCurrency}

{format_money number=$realTaxedPrice symbol=$orderCurrency}

{$QUANTITY}

{format_money number="$realTaxedPrice * $QUANTITY" symbol=$orderCurrency}

- - - - - - - - - - - - - - - - - - - - - - - - - - -

{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}

- - - - - {foreach $taxes as $name=>$prices} - {assign var="_price_taxe_" value="0"} - {foreach $prices as $price} - {$_price_taxe_= $_price_taxe_ + $price} - {/foreach} - {if $_price_taxe_ != 0} +
+ + - - {/if} - {/foreach} -
- {$name} + + +

{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} +

+ 		- {format_number number={$_price_taxe_}} {$orderCurrency} + + + + {if $DISCOUNT} + + + + + {/if} + + + + + + + + + {foreach $taxes as $name=>$prices} + {assign var="_price_taxe_" value="0"} + {foreach $prices as $price} + {$_price_taxe_= $_price_taxe_ + $price} + {/foreach} + {if $_price_taxe_ != 0} + + + + + {/if} + {/foreach} + + + + + + + + + + + + +

{intl l="Discount"}

{format_money number=$DISCOUNT symbol=$orderCurrency}

{intl l="Total without tax"}

{format_money number={$TOTAL_AMOUNT - $POSTAGE} symbol=$orderCurrency}

{intl l="Tax"}

{format_money number=$TOTAL_TAX symbol=$orderCurrency}

{$name}

{format_money number=$_price_taxe_ symbol=$orderCurrency}

{intl l="Total with tax"}

{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} symbol=$orderCurrency}

{intl l="Postage"}

{format_money number=$POSTAGE symbol=$orderCurrency}

{intl l="Total"}

{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}
+ + {/loop} \ No newline at end of file