Project-Pro/masimmo.pl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/masimmo.pl

Browse Source
This commit is contained in:
Jacek Pyziak
2025-06-06 00:36:24 +02:00
parent 20ff0ff6e8 e552c096ca
commit a4be3e3b20
6 changed files with 2451 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3104
mails/pl/order_conf.html
View File

File diff suppressed because it is too large Load Diff

21
mails/themes/modern/core/order_conf.html.twig
View File

@@ -202,24 +202,12 @@
</td> </td>
<td bgcolor="#FDFDFD" colspan="3"> {total_discounts} </td> <td bgcolor="#FDFDFD" colspan="3"> {total_discounts} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Gift-wrapping'|trans({}, 'Emails.Body', locale)|raw }}
</td>
<td bgcolor="#FDFDFD" colspan="3"> {total_wrapping} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}"> <td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }}
</td> </td>
<td bgcolor="#FDFDFD" colspan="3"> {total_shipping} </td> <td bgcolor="#FDFDFD" colspan="3"> {total_shipping} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Including total tax'|trans({}, 'Emails.Body', locale)|raw }}
</td>
<td bgcolor="#FDFDFD" colspan="3"> {total_tax_paid} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}"> <td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Total paid'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Total paid'|trans({}, 'Emails.Body', locale)|raw }}
@@ -257,7 +245,7 @@
<tbody> <tbody>
<tr> <tr>
<td align="{{ align_left }}" style="font-size:0px;padding:0;word-break:break-word;"> <td align="{{ align_left }}" style="font-size:0px;padding:0;word-break:break-word;">
<div style="font-family:Open sans, arial, sans-serif;font-size:16px;font-weight:600;line-height:25px;text-align:{{ align_left }};color:#363A41;"><img src="{{ mailThemesUrl }}/modern/assets/baseline-local_shipping-24px.png" style="margin-{{ align_right }}:10px"> <div style="font-family:Open sans, arial, sans-serif;font-size:16px;font-weight:600;line-height:25px;text-align:{{ align_left }};color:#363A41;">
{{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }}
</div> </div>
</td> </td>
@@ -302,11 +290,6 @@
<div style="font-family:Open sans, arial, sans-serif;font-size:16px;line-height:25px;text-align:{{ align_left }};color:#363A41;"><span class="label">{{ 'Payment:'|trans({}, 'Emails.Body', locale)|raw }}</span> {payment}</div> <div style="font-family:Open sans, arial, sans-serif;font-size:16px;line-height:25px;text-align:{{ align_left }};color:#363A41;"><span class="label">{{ 'Payment:'|trans({}, 'Emails.Body', locale)|raw }}</span> {payment}</div>
</td> </td>
</tr> </tr>
<tr>
<td align="{{ align_left }}" style="font-size:0px;padding:10px 25px;padding-top:0;word-break:break-word;">
<div style="font-family:Open sans, arial, sans-serif;font-size:16px;line-height:25px;text-align:{{ align_left }};color:#363A41;"><span class="label">{{ 'Recycled packaging:'|trans({}, 'Emails.Body', locale)|raw }}</span> {recycled_packaging_label}</div>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</td> </td>
@@ -343,7 +326,6 @@
<tr> <tr>
<td> <td>
<p style="font-weight:600;"> <p style="font-weight:600;">
<img src="{{ mailThemesUrl }}/modern/assets/baseline-location_on-24px.png" style="width:15px;margin-{{ align_right }}:10px">
{{ 'Delivery address'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Delivery address'|trans({}, 'Emails.Body', locale)|raw }}
</p> </p>
<p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> <p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px">
@@ -366,7 +348,6 @@
<tr> <tr>
<td> <td>
<p style="font-weight:600;"> <p style="font-weight:600;">
<img src="{{ mailThemesUrl }}/modern/assets/baseline-credit_card-24px.png" style="width:25px;margin-{{ align_right }}:10px">
{{ 'Billing address'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Billing address'|trans({}, 'Emails.Body', locale)|raw }}
</p> </p>
<p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> <p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px">

16
mails/themes/modern/modules/ps_emailalerts/new_order.html.twig
View File

@@ -191,24 +191,12 @@
</td> </td>
<td bgcolor="#FDFDFD" colspan="3"> {total_discounts} </td> <td bgcolor="#FDFDFD" colspan="3"> {total_discounts} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Gift-wrapping'|trans({}, 'Emails.Body', locale)|raw }}
</td>
<td bgcolor="#FDFDFD" colspan="3"> {total_wrapping} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}"> <td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Shipping'|trans({}, 'Emails.Body', locale)|raw }}
</td> </td>
<td bgcolor="#FDFDFD" colspan="3"> {total_shipping} </td> <td bgcolor="#FDFDFD" colspan="3"> {total_shipping} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Including total tax'|trans({}, 'Emails.Body', locale)|raw }}
</td>
<td bgcolor="#FDFDFD" colspan="3"> {total_tax_paid} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}"> <td bgcolor="#FDFDFD" colspan="3" align="{{ align_right }}">
{{ 'Total paid'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Total paid'|trans({}, 'Emails.Body', locale)|raw }}
@@ -246,7 +234,7 @@
<tbody> <tbody>
<tr> <tr>
<td align="{{ align_left }}" style="font-size:0px;padding:0;word-break:break-word;"> <td align="{{ align_left }}" style="font-size:0px;padding:0;word-break:break-word;">
<div style="font-family:Open sans, arial, sans-serif;font-size:16px;font-weight:600;line-height:25px;text-align:{{ align_left }};color:#363A41;"><img src="{{ mailThemesUrl }}/modern/assets/baseline-local_shipping-24px.png" style="margin-{{ align_right }}:10px"> <div style="font-family:Open sans, arial, sans-serif;font-size:16px;font-weight:600;line-height:25px;text-align:{{ align_left }};color:#363A41;">
{{ 'Carrier'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Carrier'|trans({}, 'Emails.Body', locale)|raw }}
</div> </div>
</td> </td>
@@ -327,7 +315,6 @@
<tr> <tr>
<td> <td>
<p style="font-weight:600;"> <p style="font-weight:600;">
<img src="{{ mailThemesUrl }}/modern/assets/baseline-location_on-24px.png" style="width:15px;margin-{{ align_right }}:10px">
{{ 'Delivery address'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Delivery address'|trans({}, 'Emails.Body', locale)|raw }}
</p> </p>
<p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> {delivery_block_html} </p> <p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> {delivery_block_html} </p>
@@ -343,7 +330,6 @@
<tr> <tr>
<td> <td>
<p style="font-weight:600;"> <p style="font-weight:600;">
<img src="{{ mailThemesUrl }}/modern/assets/baseline-credit_card-24px.png" style="width:25px;margin-{{ align_right }}:10px">
{{ 'Billing address'|trans({}, 'Emails.Body', locale)|raw }} {{ 'Billing address'|trans({}, 'Emails.Body', locale)|raw }}
</p> </p>
<p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> {invoice_block_html} </p> <p style="border: 1px solid #DFDFDF;background-color: #FEFEFE;padding:20px;font-size:14px"> {invoice_block_html} </p>

2
themes/classic/assets/css/custom.css
View File

File diff suppressed because one or more lines are too long

2
themes/classic/assets/css/custom.css.map
View File

File diff suppressed because one or more lines are too long

58
themes/classic/assets/css/custom.scss
View File

@@ -1577,16 +1577,66 @@ body#cart {
} }
td { td {
text-align: right;
position: relative; position: relative;
padding-left: 50%; // padding-left: 0;
border: none !important; text-align: right;
// border: none !important;
padding: 15px 10px 15px 50% !important;
&::before {
position: absolute;
left: 10px;
top: 50%;
transform: translateY(-50%);
white-space: nowrap;
font-weight: bold;
text-align: left;
}
.product-card-qty { .product-card-qty {
display: block; display: block;
margin: 0 auto; margin-left: auto;
width: fit-content; width: fit-content;
} }
.product-card-action {
width: fit-content;
margin-left: auto;
.remove-from-cart {
&::before {
width: 15px !important;
height: 2px !important;
}
&::after {
width: 15px !important;
height: 2px !important;
}
}
}
> div {
padding-top: 0 !important;
}
}
td:nth-child(1)::before {
content: 'Obrazek';
}
td:nth-child(2)::before {
content: 'Nazwa produktu';
}
td:nth-child(3)::before {
content: 'Cena jednostkowa';
}
td:nth-child(4)::before {
content: 'Ilość';
}
td:nth-child(5)::before {
content: 'Cena łączna';
}
td:nth-child(6)::before {
content: 'Usuń';
} }
.product-card-img img { .product-card-img img {