Improved pdf template

templates/pdf/default/I18n/en_US.php

@@ -1,18 +1,22 @@
 <?php
 
 return array(
-    'Custmer Number' => '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',
 );

templates/pdf/default/I18n/fr_FR.php

@@ -1,18 +1,22 @@
 <?php
 
 return array(
-    'Custmer Number' => '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',
 );

templates/pdf/default/delivery.html

@@ -15,33 +15,39 @@
 <style>
     h1, h2, h3, h4 {
         color:#f6993c;
+        margin: .5em 0;
     }
 
     h1 {
-        font-size: 60px;
+        font-size: 48px;
+    }
+
+    h2 {
+        font-size: 16px;
     }
 
     h3 {
         font-size: 14px;
     }
 
-    p {
+    h4 {
-        font-size: 9px;
+        color:#58585a;
+        font-size: 12px;
     }
 
     p, td {
         color:#58585a;
+        font-size: 9px;
     }
 
-    li {
+    p {
-        list-style: none;
+        margin: .5em 0;
     }
 
-    footer p{
+    span {
-        color: #bcbdc0;
+        font-size: 9px;
     }
 
-    <!--
     table {
         border-collapse: collapse;
         width: 100%;
@@ -50,6 +56,62 @@
     tr {
         width: 100%;
     }
+
+    td {
+        vertical-align: top;
+    }
+
+    .table-info h3 {
+        font-size: 18px;
+        color: #58585a;
+        margin-top: 0;
+        margin-bottom: 15px;
+    }
+
+    .table-info h3 span {
+        font-size: 18px;
+        color: #f6993c;
+    }
+
+    .table-1 td {
+        background: #f1f3f4;
+        border:solid 1px #bcbdc0;
+    }
+
+    .table-2 td {
+        border:solid 1px #bcbdc0;
+    }
+
+
+    .table-3-1, .table-3-2 {
+        border: solid 1px #bcbdc0;
+    }
+    .table-3-1 p {
+        font-size: 10px;
+    }
+    .table-3-2 p {
+        font-size: 9px;
+        color: #747475;
+    }
+
+    .table-3-module h3 {
+        margin-top: 1.5em;
+    }
+
+    .table-3-module span {
+        font-size: 11px;
+    }
+
+    .align-left {
+        text-align: left;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .align-right{
+        text-align: right;
+    }
+
     .clear {
         padding: 0.5%;
         border-bottom:solid 1px #dddddd;
@@ -58,7 +120,6 @@
     .clear-none {
         padding: 0.5%;
     }
-
 </style>
 {/literal}
 <page backtop="10mm" backleft="10mm" backright="10mm" backbottom="10mm">
@@ -67,19 +128,30 @@
 
     <page_footer>
         <table>
-            <col style="width: 80%; padding: 3mm; border: none; text-align: left;" />
+            <col style="width: 80%; padding: 1mm; border: none; text-align: left;" />
-            <col style="width: 20%; padding: 3mm; border: none; text-align: right;" />
+            <col style="width: 20%; padding: 1mm; border: none; text-align: right;" />
             <tbody>
             <tr>
                 <td>
-                    <h1 style="color:#58585a;font-size:34px;">{intl l="THANK YOU"}</h1>
+                    <!-- Imprint -->
+                    {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}
+                    <br>
+                    {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}
+
                 </td>
-                <td style="text-align:right;">
-                    <h4>{config key="store_name"}</h4>
-                </td>
-            </tr>
-            <tr>
-                <td><!-- Insérer ici les mentions légales --></td>
                 <td>{intl l="page"} [[page_cu]]/[[page_nb]]</td>
             </tr>
             </tbody>
@@ -91,47 +163,31 @@
     {assign "orderCurrency" $SYMBOL}
     {/loop}
 
-<table style="padding-top: 5mm;">
+    <table class="table-info">
-    <col style="width: 50%;" />
+        <col style="width: 100%; padding: 0mm;" />
-    <col style="width: 50%;" />
+        <tr>
-
+            <td>
-    <tr >
-        <td colspan="2">
                 <h1>{intl l="DELIVERY"}</h1>
             </td>
         </tr>
         <tr>
-        <td colspan="2">
+            <td><h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE}</span></h3></td>
-            <h3>{intl l="Invoice date"}</h3>
-            <p>{format_date date=$INVOICE_DATE}</p>
-        </td>
         </tr>
         <tr>
-        <td colspan="2">
+            <td><h3>{intl l="Invoice REF"} : <span>{$REF}</span></h3></td>
-            <h3>{intl l="Invoice REF"}</h3>
-            <p>{$REF}</p>
-        </td>
         </tr>
         <tr>
-        <td colspan="2">
+            <td><h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3></td>
-            <h3>{intl l="Custmer Number"}</h3>
-            <p>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</p>
-        </td>
         </tr>
+    </table>
 
+    <table class="table-address">
+        <col style="width: 50%; padding: 3mm;" />
+        <col style="padding: 3mm;" />
         <tr>
-        <td class="clear" colspan="2"></td>
+            <td style="border-left: solid 1mm #f6993c;" >
-        <td class="clear"></td>
+                <h3>{intl l="Delivery address"}</h3>
-    </tr>
+                <p>
-    <tr>
-        <td class="clear-none" colspan="2"></td>
-        <td class="clear-none"></td>
-    </tr>
-
-    <tr>
-        <td style="border-left:solid 3px #f6993c;" >
-            <h3 style="margin-left:1%">{intl l="delivery adress"}</h3>
-            <p style="margin-left:1%">
                     {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
@@ -140,9 +196,9 @@
                     {/loop}
                 </p>
             </td>
-        <td style="border-left:solid 3px #f6993c;">
+            <td style="border-left: solid 1mm #f6993c;">
-            <h3 style="margin-left:1%">{intl l="invoice address"}</h3>
+                <h3>{intl l="Invoice address"}</h3>
-            <p style="margin-left:1%">
+                <p>
                     {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
                     {$ADDRESS1} {$ADDRESS2} {$ADDRESS3}<br />
@@ -154,6 +210,7 @@
         </tr>
     </table>
 
+
     <table style="padding-top: 5mm;">
         <col style="width: 40%; padding: 3mm;" />
         <col style="width: 40%; padding: 3mm;" />
@@ -182,17 +239,21 @@
             </td>
         </tr>
         {/loop}
+    </table>
 
+    <table style="padding-top: 5mm;">
+        <col style="width: 40%; padding: 3mm;" />
         <tr>
-        <td style="border-left:solid 3px #f6993c;padding-top: 2mm">
+            <td  class="table-3-module" style="border-left:solid 3px #f6993c; padding-top: 2mm">
-            <h3>{intl l='Delivery module'}</h3>
+                <h3>{intl l="Delivery module"}</h3>
-            <p>{$DELIVERY_REF}</p>
+                <p>
+                    <span>{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</span>
+                </p>
             </td>
         </tr>
         <tr>
             <td class="clear-none"></td>
         </tr>
-
+    </table>
-</table>
 {/loop}
 </page>

templates/pdf/default/invoice.html

@@ -15,20 +15,62 @@
 <style>
     h1, h2, h3, h4 {
         color:#f6993c;
+        margin: .5em 0;
     }
 
     h1 {
-        font-size: 60px;
+        font-size: 48px;
+    }
+
+    h2 {
+        font-size: 16px;
+    }
+
+    h3 {
+        font-size: 14px;
     }
 
     h4 {
         color:#58585a;
-        font-size: 14px;
+        font-size: 12px;
     }
 
-
     p, td {
         color:#58585a;
+        font-size: 9px;
+    }
+
+    p {
+        margin: .5em 0;
+    }
+
+    span {
+        font-size: 9px;
+    }
+
+    table {
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    tr {
+        width: 100%;
+    }
+
+    td {
+        vertical-align: top;
+    }
+
+    .table-info h3 {
+        font-size: 18px;
+        color: #58585a;
+        margin-top: 0;
+        margin-bottom: 15px;
+    }
+
+    .table-info h3 span {
+        font-size: 18px;
+        color: #f6993c;
     }
 
     .table-1 td {
@@ -41,14 +83,44 @@
     }
 
 
-    .table-3-1 {
+    .table-3-1, .table-3-2 {
-        border:solid 1px #bcbdc0;
+        border: solid 1px #bcbdc0;
-
     }
-
+    .table-3-1 p {
-    span {
+        font-size: 10px;
+    }
+    .table-3-2 p {
         font-size: 9px;
+        color: #747475;
     }
+
+    .table-3-module h3 {
+        margin-top: 1.5em;
+    }
+
+    .table-3-module span {
+        font-size: 11px;
+    }
+
+    .align-left {
+        text-align: left;
+    }
+    .align-center {
+        text-align: center;
+    }
+    .align-right{
+        text-align: right;
+    }
+
+    .clear {
+        padding: 0.5%;
+        border-bottom:solid 1px #dddddd;
+    }
+
+    .clear-none {
+        padding: 0.5%;
+    }
+
 </style>
 {/literal}
 <page backtop="10mm" backleft="10mm" backright="10mm" backbottom="10mm">
@@ -61,7 +133,26 @@
             <col style="width: 20%; padding: 1mm; border: none; text-align: right;" />
             <tbody>
             <tr>
-                <td><!-- Insérer ici les mentions légales --></td>
+                <td>
+                    <!-- Imprint -->
+                    {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}
+                    <br>
+                    {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}
+
+                </td>
                 <td>{intl l="page"} [[page_cu]]/[[page_nb]]</td>
             </tr>
             </tbody>
@@ -74,39 +165,30 @@
     {loop name="currency.order" type="currency" id=$CURRENCY}
     {assign "orderCurrency" $SYMBOL}
     {/loop}
-    <table>
+    <table class="table-info">
         <col style="width: 100%; padding: 0mm;" />
-
+        <tr>
-        <tr >
             <td>
                 <h1>{intl l="INVOICE"}</h1>
             </td>
         </tr>
         <tr>
-            <td>
+            <td><h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE}</span></h3></td>
-                <h3>{intl l="Invoice date"}</h3>
-                <span>{format_date date=$INVOICE_DATE}</span>
-            </td>
         </tr>
         <tr>
-            <td>
+            <td><h3>{intl l="Invoice REF"} : <span>{$REF}</span></h3></td>
-                <h3>{intl l="Invoice REF"}</h3>
-                <span>{$REF}</span>
-            </td>
         </tr>
         <tr>
-            <td>
+            <td><h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3></td>
-                <h3>{intl l="Custmer Number"}</h3>
-                <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span>
-            </td>
         </tr>
     </table>
-    <table>
+
-        <col style="width: 50%; padding: 3mm;" />
+    <table class="table-address">
         <col style="width: 50%; padding: 3mm;" />
+        <col style="padding: 3mm;" />
         <tr>
-            <td style="border-left:solid 1mm #f6993c;" >
+            <td style="border-left: solid 1mm #f6993c;" >
-                <h3>{intl l="delivery adress"}</h3>
+                <h3>{intl l="Delivery address"}</h3>
                 <p>
                     {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
@@ -116,8 +198,8 @@
                     {/loop}
                 </p>
             </td>
-            <td style="border-left:solid 1mm #f6993c;">
+            <td style="border-left: solid 1mm #f6993c;">
-                <h3>{intl l="invoice address"}</h3>
+                <h3>{intl l="Invoice address"}</h3>
                 <p>
                     {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}
                     {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}<br />
@@ -130,7 +212,7 @@
         </tr>
     </table>
 
-<table cellspacing="0" cellpadding="0" style="padding-top: 5mm;">
+    <table cellspacing="0" cellpadding="0" style="padding-top: 5mm;">
         <col style="width: 40%; padding: 1mm;" />
         <col style="width: 12%; padding: 1mm;" />
         <col style="width: 12%; padding: 1mm;" />
@@ -140,11 +222,11 @@
 
         <tr class="table-1">
             <td><h4>{intl l="Product"}</h4></td>
-        <td><h4>{intl l="Unit. price"}</h4></td>
+            <td><h4 class="align-center">{intl l="Unit. price"}</h4></td>
-        <td><h4>{intl l="Tax"}</h4></td>
+            <td><h4 class="align-center">{intl l="Tax"}</h4></td>
-        <td><h4>{intl l="Unit taxed price"}</h4></td>
+            <td><h4 class="align-center">{intl l="Unit taxed price"}</h4></td>
-        <td><h4>{intl l="Quantity"}</h4></td>
+            <td><h4 class="align-center">{intl l="Quantity"}</h4></td>
-        <td style="background:#f6993c"><h3 style="color:white;">{intl l="Taxed total"}</h3></td>
+            <td style="background:#f6993c"><h4 style="color:white;" class="align-center">{intl l="Taxed total"}</h4></td>
         </tr>
         {loop type="order_product" name="order-products" order=$ID}
             {if $WAS_IN_PROMO == 1}
@@ -167,51 +249,52 @@
                         {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}<br>
                     {/loop}
                     {/ifloop}
-            [[ {$TAX_RULE_TITLE} = {$realTax * $QUANTITY} ]]
                 </td>
-        <td><p>{$orderCurrency} {$realPrice}</p></td>
+                <td><p class="align-right">{format_money number=$realPrice symbol=$orderCurrency}</p></td>
-        <td><p>{$orderCurrency} {$realTax}</p></td>
+                <td><p class="align-right">{format_money number=$realTax symbol=$orderCurrency}</p></td>
-        <td><p>{$orderCurrency} {$realTaxedPrice}</p></td>
+                <td><p class="align-right">{format_money number=$realTaxedPrice symbol=$orderCurrency}</p></td>
-        <td><p>{$QUANTITY}</p></td>
+                <td><p class="align-center">{$QUANTITY}</p></td>
-        <td><p>{$orderCurrency} {$realTaxedPrice * $QUANTITY}</p></td>
+                <td><p class="align-right">{format_money number="$realTaxedPrice * $QUANTITY" symbol=$orderCurrency}</p></td>
             </tr>
         {/loop}
+    </table>
 
-</table>
 
-<table class="table-3" cellspacing="0" cellpadding="0" tyle="padding-top: 5mm;">
+    <table cellspacing="0" cellpadding="0" style="padding-top: 5mm;">
-    <col style="width: 60%; padding: 1mm;" />
-    <col style="width: 20%; padding: 1mm;" />
-    <col style="width: 20%; padding: 1mm;" />
-
-    <tr>
-        <td style="border-left:solid 1mm #bcbdc0"><h3>{intl l="Payment module"}</h3>
-            <span>{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span>
-        </td>
-        <td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
-        <td class="table-3-1"><p>{$orderCurrency} {$TOTAL_AMOUNT}</p></td>
-    </tr>
-    <tr>
-        <td style="border-left:solid 1mm #bcbdc0"><h3>{intl l="delivery module"}</h3>
-            <span>{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</span></td>
-        <td class="table-3-1"><p>{intl l="Total with tax"}</p></td>
-        <td class="table-3-1"><P>{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}</P></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td class="table-3-1"><p>{intl l="Postage"}</p></td>
-        <td class="table-3-1"><p>{$orderCurrency} {$POSTAGE}</p></td>
-    </tr>
-    <tr>
-        <td></td>
-        <td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td>
-        <td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{$orderCurrency} {$TOTAL_TAXED_AMOUNT}</h3></td>
-    </tr>
-</table>
-
-<table class="table-3" cellspacing="0" cellpadding="0" tyle="padding-top: 5mm;">
         <col style="width: 60%; padding: 1mm;" />
         <col style="width: 40%; padding: 1mm;" />
+        <tr>
+            <td class="table-3-module">
+
+                <h3>{intl l="Payment module"}</h3>
+                <p>
+                    <span>{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span>
+                </p>
+
+                <h3>{intl l="Delivery module"}</h3>
+                <p>
+                    <span>{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</span>
+                </p>
+
+            </td>
+            <td>
+                <table class="table-3">
+                    <col style="width: 50%; padding: 1mm;">
+                    <col style="width: 50%; padding: 1mm;">
+                    {if $DISCOUNT}
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Discount"}</p></td>
+                        <td class="table-3-1 align-right"><p>{format_money number=$DISCOUNT symbol=$orderCurrency}</p></td>
+                    </tr>
+                    {/if}
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Total without tax"}</p></td>
+                        <td class="table-3-1 align-right"><p>{format_money number={$TOTAL_AMOUNT - $POSTAGE} symbol=$orderCurrency}</p></td>
+                    </tr>
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Tax"}</p></td>
+                        <td class="table-3-1 align-right"><P>{format_money number=$TOTAL_TAX symbol=$orderCurrency}</P></td>
+                    </tr>
                     {foreach $taxes as $name=>$prices}
                         {assign var="_price_taxe_" value="0"}
                         {foreach $prices as $price}
@@ -219,15 +302,27 @@
                         {/foreach}
                         {if $_price_taxe_ != 0}
                         <tr>
-            <td>
+                            <td class="table-3-2"><p>{$name}</p></td>
-                {$name}
+                            <td class="table-3-2 align-right"><P>{format_money number=$_price_taxe_ symbol=$orderCurrency}</P></td>
-            </td>
-            <td>
-                {format_number number={$_price_taxe_}} {$orderCurrency}
-            </td>
                         </tr>
                         {/if}
                     {/foreach}
-</table>
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Total with tax"}</p></td>
+                        <td class="table-3-1 align-right"><P>{format_money number={$TOTAL_TAXED_AMOUNT - $POSTAGE} symbol=$orderCurrency}</P></td>
+                    </tr>
+                    <tr>
+                        <td class="table-3-1"><p>{intl l="Postage"}</p></td>
+                        <td class="table-3-1 align-right"><p>{format_money number=$POSTAGE symbol=$orderCurrency}</p></td>
+                    </tr>
+                    <tr>
+                        <td class="table-3-1" style="background:#f6993c;"><h3 style="color:white;">{intl l="Total"}</h3></td>
+                        <td class="table-3-1 align-right" style="background:#f6993c;"><h3 style="color:white;">{format_money number=$TOTAL_TAXED_AMOUNT symbol=$orderCurrency}</h3></td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+
 {/loop}
 </page>