diff --git a/templates/email/default2020/assets/img/logo.png b/templates/email/default2020/assets/img/logo.png index ec2c13a1..7383cc70 100644 Binary files a/templates/email/default2020/assets/img/logo.png and b/templates/email/default2020/assets/img/logo.png differ diff --git a/templates/email/default2020/email-layout.tpl b/templates/email/default2020/email-layout.tpl index d843b30c..34dc628e 100644 --- a/templates/email/default2020/email-layout.tpl +++ b/templates/email/default2020/email-layout.tpl @@ -473,7 +473,7 @@ {if $image == null} {$image = {image file='assets/img/logo.gif' failsafe=true}} {/if} - {$company_name} + IMG {$company_name} diff --git a/templates/email/default2020/order_status_changed.html b/templates/email/default2020/order_status_changed.html index 0d9fa5ca..093feabe 100644 --- a/templates/email/default2020/order_status_changed.html +++ b/templates/email/default2020/order_status_changed.html @@ -15,7 +15,7 @@ {$image = {image file='assets/img/logo.png' failsafe=true}} - {$company_name} + {$company_name} diff --git a/templates/frontOffice/default2020/assets/dist/css/custom.min.css b/templates/frontOffice/default2020/assets/dist/css/custom.min.css index 2e601761..976c0ef1 100644 --- a/templates/frontOffice/default2020/assets/dist/css/custom.min.css +++ b/templates/frontOffice/default2020/assets/dist/css/custom.min.css @@ -1 +1 @@ -div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1} \ No newline at end of file +div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}h2.name{line-height:1}.logo-custom img{width:250px}header .logo-custom{height:80px} \ No newline at end of file diff --git a/templates/frontOffice/default2020/assets/dist/img/logo_fr.png b/templates/frontOffice/default2020/assets/dist/img/logo_fr.png index 444c6901..20f62a4c 100644 Binary files a/templates/frontOffice/default2020/assets/dist/img/logo_fr.png and b/templates/frontOffice/default2020/assets/dist/img/logo_fr.png differ diff --git a/templates/frontOffice/default2020/assets/src/css/custom.css b/templates/frontOffice/default2020/assets/src/css/custom.css index 67c7c53e..637a6167 100644 --- a/templates/frontOffice/default2020/assets/src/css/custom.css +++ b/templates/frontOffice/default2020/assets/src/css/custom.css @@ -13,3 +13,10 @@ div.container { h2.name { line-height: 1; } + +.logo-custom img { + width: 250px; +} +header .logo-custom { + height: 80px; +} \ No newline at end of file diff --git a/templates/frontOffice/default2020/assets/src/img/logo.png.BKP b/templates/frontOffice/default2020/assets/src/img/logo.png.BKP deleted file mode 100644 index ec2b2519..00000000 Binary files a/templates/frontOffice/default2020/assets/src/img/logo.png.BKP and /dev/null differ diff --git a/templates/frontOffice/default2020/assets/src/img/logo_fr.png b/templates/frontOffice/default2020/assets/src/img/logo_fr.png index 67b19167..8e01d247 100644 Binary files a/templates/frontOffice/default2020/assets/src/img/logo_fr.png and b/templates/frontOffice/default2020/assets/src/img/logo_fr.png differ diff --git a/templates/pdf/default2020/assets/img/logo.png b/templates/pdf/default2020/assets/img/logo.png index ec2c13a1..f181d895 100644 Binary files a/templates/pdf/default2020/assets/img/logo.png and b/templates/pdf/default2020/assets/img/logo.png differ diff --git a/templates/pdf/default2020/assets/img/logo.png.BKP b/templates/pdf/default2020/assets/img/logo.png.BKP deleted file mode 100644 index ec2b2519..00000000 Binary files a/templates/pdf/default2020/assets/img/logo.png.BKP and /dev/null differ diff --git a/templates/pdf/default2020/delivery.html b/templates/pdf/default2020/delivery.html index 299410f4..e92868ec 100644 --- a/templates/pdf/default2020/delivery.html +++ b/templates/pdf/default2020/delivery.html @@ -167,6 +167,8 @@ {hook name="delivery.footer-bottom" order=$order_id} + + {loop name="order.invoice" type="order" id=$order_id customer="*"} diff --git a/templates/pdf/default2020/invoice.html b/templates/pdf/default2020/invoice.html index 2088a317..644db834 100644 --- a/templates/pdf/default2020/invoice.html +++ b/templates/pdf/default2020/invoice.html @@ -19,7 +19,7 @@ } h1 { - font-size: 48px; + font-size: 30px; } h2 { @@ -132,7 +132,7 @@ {/literal} - + {hook name="invoice.header" order=$order_id} @@ -140,8 +140,8 @@ {hook name="invoice.footer-top" order=$order_id}
- - + +
@@ -175,25 +175,31 @@ {hook name="invoice.footer-bottom" order=$order_id} - {$taxes = []} {loop name="order.invoice" type="order" id=$order_id customer="*"} - - + - + - - - - + +
-

{intl l="INVOICE"}

+
+ + +

{intl l="INVOICE"} : {if $INVOICE_REF == null}{$REF}{else}{$INVOICE_REF}{/if}

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

+

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

+

{intl l="Invoice REF"} : {if $INVOICE_REF == null}{$REF}{else}{$INVOICE_REF}{/if}

{intl l="Customer 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}

+
+ + + {hookblock name="invoice.information" order=$order_id fields="title,value"} {forhook rel="invoice.information"}