Remplacement du logo dans email, pdf et dans le front

This commit is contained in:
2024-01-02 14:48:48 +01:00
parent dc001f84e1
commit 1865ce3d3e
31 changed files with 135 additions and 13150 deletions

View File

@@ -14,7 +14,7 @@
{literal}
<style>
h1, h2, h3, h4 {
color:#000044;
color:#143058;
margin: .5em 0;
}
@@ -68,7 +68,7 @@
.table-info h3 {
font-size: 18px;
color: #000044;
color: #143058;
margin-top: 0;
margin-bottom: 15px;
}
@@ -82,17 +82,17 @@
font-size: 12px;
}
.table-1 td {
background: #000044;
border:solid 1px #bcbdc0;
background: #143058;
border:solid 1px #143058;
}
.table-2 td {
border:solid 1px #bcbdc0;
border:solid 1px #143058;
}
.table-3-1, .table-3-2 {
border: solid 1px #bcbdc0;
border: solid 1px #143058;
}
.table-3-1 p {
font-size: 10px;
@@ -147,7 +147,7 @@
{hook name="delivery.imprint" order=$order_id}
{elsehook rel="delivery.imprint"}
<!-- Imprint -->
{config key="store_name"}
{config key="store_name"}
{$addresses="{config key='store_address1'} {config key='store_address2'} {config key='store_address3'}"}
{$city="{config key='store_zipcode'} {config key='store_city'}"}
{if $addresses != " "}- {$addresses}{/if}
@@ -164,7 +164,8 @@
{if {config key="store_email"} }
{intl l="Email: "}{config key="store_email"}
{/if}
{/elsehook}
{/elsehook}
</td>
<td>{intl l="page"} [[page_cu]]/[[page_nb]]</td>
</tr>
@@ -184,15 +185,30 @@
{$image = {image file='img/logo.png' failsafe=true}}
<img src="{$image}" alt="{$store_name}">
</td>
<td style="vertical-align: middle;">
<td style="vertical-align: middle; padding-left: 100px">
<h2>{intl l="DELIVERY"}</h2>
<span>{intl l="Invoice date"} : {format_date date=$INVOICE_DATE output="date"}</span>
<br />
<span>{intl l="Invoice REF"} : {$REF}</span>
<br />
{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}
<span>{intl l="Customer Number"} : {$REF}</span>
<br />
<span>{intl l="Phone"} : {loop type="address" name="phone.default" customer=$ID default="true"}{$PHONE} - {$CELLPHONE}{/loop}</span>
<br />
<span>{intl l="Email"} : {loop type="address" name="email.default" customer=$ID default="true"}{$EMAIL}{/loop}</span>
{/loop}
<!--
<span style="font-size: 7mm; color: #000044;">{config key="store_name"}</span>
<br />
<span style="font-size: 3.3mm;">{config key="store_description"}</span>
</td>
-->
</td>
</tr>
</table>
</td>
</tr>
</tr>
<!--
<tr>
<td>
<h2>{intl l="DELIVERY"}</h2>
@@ -215,6 +231,7 @@
<td>{intl l="Email"} : {loop type="address" name="email.default" customer=$ID default="true"}{$EMAIL}{/loop}</td>
</tr>
{/loop}
//-->
{hookblock name="delivery.information" order=$order_id fields="title,value"}
{forhook rel="delivery.information"}
<tr>
@@ -257,14 +274,14 @@
<col style="width: 65%; padding: 3mm;" />
<col style="width: 12%; padding: 3mm;" />
<tr>
<td style="border:solid 1px #dddddd;background:#000044;" >
<td style="border:solid 1px #143058; background:#143058;" >
<h5 style="color:#ffffff;">{intl l="Ref"}</h5>
</td>
<td style="border:solid 1px #dddddd;background:#000044;">
<h5 style="color:#ffffff;">{intl l="product"}</h5>
<td style="border:solid 1px #143058; background:#143058;">
<h5 style="color:#ffffff;">{intl l="Product"}</h5>
</td>
<td style="border:solid 1px #dddddd;background-color:#dddddd;">
<h5 style="color:#000044; text-align:center;">{intl l="Quantity"}</h5>
<td style="border:solid 1px #143058; background-color:#143058;">
<h5 style="color:#ffffff; text-align:center;">{intl l="Quantity"}</h5>
</td>
</tr>
{loop type="order_product" name="order-products" order=$ID}
@@ -292,7 +309,7 @@
<table style="padding-top: 5mm;">
<col style="width: 40%; padding: 3mm;" />
<tr>
<td class="table-3-module" style="border-left:solid 3px #000044; padding-top: 2mm">
<td class="table-3-module" style="border-left:solid 3px #143058; padding-top: 2mm">
<h3>{intl l="Delivery module"}</h3>
<span>{loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}</span>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -14,7 +14,7 @@
{literal}
<style>
h1, h2, h3, h4 {
color:#000044;
color:#143058;
margin: .5em 0;
}
@@ -36,7 +36,7 @@
}
h5 {
color:#000044;//#ffffff;
color:#143058;//#ffffff;
font-size: 12px;
}
@@ -68,7 +68,7 @@
.table-info h3 {
font-size: 18px;
color: #000044;
color: #143058;
margin-top: 0;
margin-bottom: 15px;
}
@@ -82,11 +82,14 @@
font-size: 12px;
}
.table-1 td {
background: #f1f3f4;//#000044;
border:solid 1px #bcbdc0;
background: #143058; //#f1f3f4
border:solid 1px #143058;
}
.table-1 td h5 {
color: white;
}
.table-2 td {
.table-2 td {
border:solid 1px #bcbdc0;
}
@@ -186,15 +189,30 @@
{$image = {image file='img/logo.png' failsafe=true}}
<img src="{$image}" alt="{$store_name}">
</td>
<td style="vertical-align: middle;">
<td style="vertical-align: middle; padding-left: 100px">
<h2>{intl l="INVOICE"}</h2>
<span>{intl l="Invoice date"} : {format_date date=$INVOICE_DATE output="date"}</span>
<br />
<span>{intl l="Invoice REF"} : {$REF}</span>
<br />
{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}
<span>{intl l="Customer Number"} : {$REF}</span>
<br />
<span>{intl l="Phone"} : {loop type="address" name="phone.default" customer=$ID default="true"}{$PHONE} - {$CELLPHONE}{/loop}</span>
<br />
<span>{intl l="Email"} : {loop type="address" name="email.default" customer=$ID default="true"}{$EMAIL}{/loop}</span>
{/loop}
<!--
<span style="font-size: 7mm; color: #000044; text-transform:uppercase;">{config key="store_name"}</span>
<br />
<span style="font-size: 3.3mm; text-transform:uppercase;">{config key="store_description"}</span>
//-->
</td>
</tr>
</table>
</tr>
</table>
</td>
</tr>
</tr>
<!--
<tr>
<td>
<h2>{intl l="INVOICE"}</h2>
@@ -217,6 +235,7 @@
<td>{intl l="Email"} : {loop type="address" name="email.default" customer=$ID default="true"}{$EMAIL}{/loop}</td>
</tr>
{/loop}
//-->
{hookblock name="invoice.information" order=$order_id fields="title,value"}
{forhook rel="invoice.information"}
<tr>
@@ -261,14 +280,13 @@
<col style="width: 12%; padding: 1mm;" />
<col style="width: 12%; padding: 1mm;" />
<col style="width: 12%; padding: 1mm;" />
<tr class="table-1">
<td><h5>{intl l="Product"}</h5></td>
<td><h5 class="align-center">{intl l="Unit. price"}</h5></td>
<td><h5 class="align-center">{intl l="Tax"}</h5></td>
<td><h5 class="align-center">{intl l="Unit taxed price"}</h5></td>
<td><h5 class="align-center">{intl l="Quantity"}</h5></td>
<td style="background:#f1f3f4"><h5 style="color:#000044;" class="align-center">{intl l="Taxed total"}</h5></td>
<td><h5 class="align-center">{intl l="Taxed total"}</h5></td>
</tr>
{loop type="order_product" name="order-products" order=$ID}
{if $WAS_IN_PROMO == 1}