Project-Pro/drmaterac.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/drmaterac.pl

Browse Source
This commit is contained in:
Jacek Pyziak
2025-06-03 00:46:48 +02:00
parent 6e424dd198 df14ddc2e0
commit b2766d40cc
8 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mails/pl/order_conf.html
View File

@@ -444,24 +444,12 @@
</td> </td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_discounts} </td> <td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_discounts} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Pakowanie prezentowe
</td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_wrapping} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> <td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Wysyłka Wysyłka
</td> </td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_shipping} </td> <td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_shipping} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Z podatkiem
</td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_tax_paid} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> <td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Zapłacono w sumie Zapłacono w sumie

12
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 }}

12
modules/leoproductsearch/views/js/leosearch.js
View File

@@ -41,9 +41,19 @@ $(document).ready(function()
lps_html_result += '<div class="lps-result-content"><div class="lps-result-title">' + result[i].name + '</div>'; lps_html_result += '<div class="lps-result-content"><div class="lps-result-title">' + result[i].name + '</div>';
const excludedIds = [31069, 31067, 34327, 31070];
console.log("result: ", result[i].id_product)
console.log("excludedIds: ", !excludedIds.includes(Number(result[i].id_product)))
if (typeof lps_show_product_price != 'undefined' && lps_show_product_price) if (typeof lps_show_product_price != 'undefined' && lps_show_product_price)
{ {
if (result[i].manufacturer_name != 'Gomarco') { if (
result[i].manufacturer_name != 'Gomarco' &&
!excludedIds.includes(Number(result[i].id_product))
) {
lps_html_result += '<div class="lps-result-price">' + result[i].price + '</div>'; lps_html_result += '<div class="lps-result-price">' + result[i].price + '</div>';
console.log(result[i]) console.log(result[i])
} }

12
modules/ps_emailalerts/mails/pl/new_order.html
View File

@@ -443,24 +443,12 @@
</td> </td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_discounts} </td> <td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_discounts} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Pakowanie prezentowe
</td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_wrapping} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> <td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Wysyłka Wysyłka
</td> </td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_shipping} </td> <td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_shipping} </td>
</tr> </tr>
<tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Z podatkiem
</td>
<td bgcolor="#FDFDFD" colspan="3" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> {total_tax_paid} </td>
</tr>
<tr class="order_summary"> <tr class="order_summary">
<td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;"> <td bgcolor="#FDFDFD" colspan="3" align="right" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Open sans, Arial, sans-serif; background-color: #FDFDFD; color: #353943; font-weight: 600; font-size: 14px; padding: 10px; border: 1px solid #DFDFDF;">
Zapłacono w sumie Zapłacono w sumie

2
themes/leo_gstore/assets/css/dr_materac.css
View File

File diff suppressed because one or more lines are too long

2
themes/leo_gstore/assets/css/dr_materac.css.map
View File

File diff suppressed because one or more lines are too long

1
themes/leo_gstore/assets/css/dr_materac.scss
View File

@@ -2678,6 +2678,7 @@ body#checkout #order-summary-content .order-confirmation-table {
#cart .cart-detailed-actions .btn.btn-outline { #cart .cart-detailed-actions .btn.btn-outline {
background-color: #34d6ad; background-color: #34d6ad;
border: none; border: none;
text-wrap: auto;
} }
.cart-grid-body a.label:hover { .cart-grid-body a.label:hover {

2
themes/leo_gstore/modules/appagebuilder/views/templates/front/details/detail1526395446.tpl
View File

@@ -421,7 +421,7 @@
Zapraszamy do kontaktu Zapraszamy do kontaktu
</a> </a>
</br> </br>
{elseif in_array($product.id, array(23634, 23636, 23637, 34518, 34519)) } {elseif in_array($product.id, array(23634, 23636, 23637, 34518, 34519, 31069, 31067, 34327, 31070)) }
</br> </br>
<a href="/kontakt" class="btn btn-primary add-to-cart"> <a href="/kontakt" class="btn btn-primary add-to-cart">
Zapraszamy do kontaktu Zapraszamy do kontaktu