TheCoreDev/domokits
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
TheCoreDev
2022-01-23 11:56:18 +01:00
parent 73bd26a96b f2eb63ddbb
commit 3b0b4c3466
404 changed files with 11353 additions and 16558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
templates/email/default2020/assets/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 32 KiB

2
templates/email/default2020/email-layout.tpl
View File

@@ -473,7 +473,7 @@
{if $image == null}
{$image = {image file='assets/img/logo.gif' failsafe=true}}
{/if}
<img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 60px;width: 346px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="346" height="60">
<img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;width: 346px;height: 110px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="346" height="110">
</td>
</tr>
</table>

2
templates/email/default2020/order_status_changed.html
View File

@@ -15,7 +15,7 @@
<tr>
<td class="headerContent" style="mso-table-lspace: 0pt;mso-table-rspace: 0pt;color: #202020;font-family: Helvetica;font-size: 20px;font-weight: bold;line-height: 100%;padding-top: 40px;padding-right: 0;padding-bottom: 20px;padding-left: 0;text-align: left;vertical-align: middle;border-collapse: collapse !important;">
{$image = {image file='assets/img/logo.png' failsafe=true}}
<img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 60px;width: 346px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="346" height="60">
<img src="{$image}" alt="{$company_name}" border="0" style="border: 0px none;border-color: ;border-style: none;border-width: 0px;height: 110px;width: 346px;margin: 0;padding: 0;line-height: 100%;outline: none;text-decoration: none;" width="346" height="110">
</td>
</tr>
</table>

2
templates/frontOffice/default2020/assets/dist/css/custom.min.css vendored
View File

@@ -1 +1 @@
div.container{width:90%!important}.container{width:95%}.navbar li.cart-not-empty>a.cart:before{color:#fff}
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}

4
templates/frontOffice/default2020/assets/dist/css/thelia.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
templates/frontOffice/default2020/assets/dist/img/logo_en.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 115 KiB

BIN
templates/frontOffice/default2020/assets/dist/img/logo_fr.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 115 KiB

BIN
templates/frontOffice/default2020/assets/dist/img/logo_fr.png.BKP vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

11
templates/frontOffice/default2020/assets/src/css/custom.css
View File

@@ -8,4 +8,15 @@ div.container {
.navbar li.cart-not-empty>a.cart:before {
color: white;
}
h2.name {
line-height: 1;
}
.logo-custom img {
width: 250px;
}
header .logo-custom {
height: 80px;
}

11
templates/frontOffice/default2020/assets/src/css/thelia.css
View File

@@ -11041,10 +11041,19 @@ header .header-custom {
}
header .logo-custom {
grid-area: logo;
height: 60px;
width: 350px;
padding-left: 15px;
}
header .logo-custom img {
width: 346px;
}
@media screen and (max-width: 480px) {
header .logo-custom img {
width: 320px;
}
}
header .secondary-custom {
grid-area: content;
height: 45px;

BIN
templates/frontOffice/default2020/assets/src/img/logo.png.BKP
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

0
templates/frontOffice/default2020/assets/src/img/logo_en.png → templates/frontOffice/default2020/assets/src/img/logo_en.OLD.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
templates/frontOffice/default2020/assets/src/img/logo_fr.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 140 KiB

6
templates/frontOffice/default2020/includes/addedToCart.html
View File

@@ -11,10 +11,11 @@
</td>
</tr>
<tr>
<td class="col-md-4">p={$ID}
<td class="col-md-4">
{ifloop rel="pse-first-image"}
{loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id={$smarty.get.pse_id} limit="1"}
{loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID source="product" limit="1" width="720" height="482" resize_mode="borders"}
{loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID source="product" limit="1" width="218" height="146" resize_mode="borders"}
<!-- TheCoreDev le 16/12/2021 : valeurs avant modif = width="720" height="482" -->
<img itemprop="image" src="{$IMAGE_URL nofilter}" alt="Product #{$LOOP_COUNT}">
{/loop}
{/loop}
@@ -35,7 +36,6 @@
{loop type="product_sale_elements" name="product_price" id={$smarty.get.pse_id}}
{$price = $TAXED_PRICE}
{$promoPrice = $TAXED_PROMO_PRICE}
{loop type="digressive" name="digressivePrice" pse_id={$smarty.get.pse_id} quantity={$smarty.get.quantity} limit=1}
{$price = $TAXED_PRICE}
{$promoPrice = $TAXED_PROMO_PRICE}

BIN
templates/pdf/default2020/assets/img/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
templates/pdf/default2020/assets/img/logo.png.BKP
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

20
templates/pdf/default2020/delivery.html
View File

@@ -168,22 +168,24 @@
</page_footer>
{loop name="order.invoice" type="order" id=$order_id customer="*"}
<table class="table-info">
<col style="width: 100%; padding: 0mm;" />
<tr>
<td>
<td rowspan="3">
<img src="{image file='assets/img/logo.png'}" style="height:110px; margin-right: 60px">
</td>
<td style="vertical-align: top">
<h1>{intl l="DELIVERY"}</h1>
</td>
</tr>
<tr>
<td><h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE output="date"}</span></h3></td>
<td>
<h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE output="date"}</span></h3>
</td>
</tr>
<tr>
<td><h3>{intl l="Invoice REF"} : <span>{$REF}</span></h3></td>
</tr>
<tr>
<td><h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3></td>
<td>
<h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3>
</td>
</tr>
{hookblock name="delivery.information" order=$order_id fields="title,value"}
{forhook rel="delivery.information"}
@@ -193,7 +195,7 @@
{/forhook}
{/hookblock}
</table>
{hook name="delivery.after-information" order=$order_id}
<table class="table-address">

32
templates/pdf/default2020/invoice.html
View File

@@ -19,7 +19,7 @@
}
h1 {
font-size: 48px;
font-size: 30px;
}
h2 {
@@ -132,7 +132,7 @@
</style>
{/literal}
<page backtop="10mm" backleft="10mm" backright="10mm" backbottom="10mm">
<page backtop="5mm" backleft="10mm" backright="10mm" backbottom="5mm">
<page_header>
{hook name="invoice.header" order=$order_id}
</page_header>
@@ -140,8 +140,8 @@
<page_footer>
{hook name="invoice.footer-top" order=$order_id}
<table>
<col style="width: 80%; padding: 1mm; border: none; text-align: left;" />
<col style="width: 20%; padding: 1mm; border: none; text-align: right;" />
<col style="width: 80%; padding: 3mm; border: none; text-align: left;" />
<col style="width: 20%; padding: 3mm; border: none; text-align: right;" />
<tbody>
<tr>
<td>
@@ -175,25 +175,31 @@
{hook name="invoice.footer-bottom" order=$order_id}
</page_footer>
<img src="{image file="assets/img/logo.png"}" style="height:60px;margin:30px">
{$taxes = []}
{loop name="order.invoice" type="order" id=$order_id customer="*"}
<table class="table-info">
<col style="width: 100%; padding: 0mm;" />
<tr>
<td>
<h1>{intl l="INVOICE"}</h1>
<td rowspan="3">
<img src="{image file='assets/img/logo.png'}" style="height:110px; margin-right: 60px">
</td>
<td style="vertical-align: top">
<h3>{intl l="INVOICE"} : <span>{if $INVOICE_REF == null}{$REF}{else}{$INVOICE_REF}{/if}</span></h3>
</td>
</tr>
<tr>
<td><h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE output="date"}</span></h3></td>
<td>
<h3>{intl l="Invoice date"} : <span>{format_date date=$INVOICE_DATE output="date"}</span></h3>
</td>
</tr>
<tr>
<td><h3>{intl l="Invoice REF"} : <span>{if $INVOICE_REF == null}{$REF}{else}{$INVOICE_REF}{/if}</span></h3></td>
</tr>
<tr>
<td><h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3></td>
<td>
<h3>{intl l="Customer Number"} : <span>{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}{$REF}{/loop}</span></h3>
</td>
</tr>
</table>
<table class="table-info" style="margin-top: 30px">
<col style="width: 100%; padding: 0mm;" />
{hookblock name="invoice.information" order=$order_id fields="title,value"}
{forhook rel="invoice.information"}
<tr>