FrontendOSCOP/oscop
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wprowadzenie zmian związanych z walidacją telefonu

Browse Source
This commit is contained in:
pawel.gaca
2024-06-28 09:00:09 +02:00
parent effa463126
commit 5d1eab59d9
5 changed files with 3653 additions and 3085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
index.xslt
View File

@@ -55,6 +55,9 @@
</iaixsl:attribute> </iaixsl:attribute>
<iai:variable vid="Kontynuuj zakupy w sklepie"/> <iai:variable vid="Kontynuuj zakupy w sklepie"/>
</a> </a>
<div class="bm-oscop__container" id="place-order"> <div class="bm-oscop__container" id="place-order">
<div class="bm-oscop__form-data"> <div class="bm-oscop__form-data">
<!-- DANE KLIENTA --> <!-- DANE KLIENTA -->
@@ -129,10 +132,13 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="has-feedback f-feedback"> <div class="has-feedback f-feedback --phone">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')"> <iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute> <iaixsl:attribute name="class">has-feedback f-feedback --success has-success --phone</iaixsl:attribute>
</iaixsl:if> </iaixsl:if>
<div class="phone_number__code">
+<input class="phone_number__code_number" disabled="true"></input>
</div>
<input id="client_phone" type="tel" class="form-control validate f-control" name="client_phone" data-serialize="#client_region"> <input id="client_phone" type="tel" class="form-control validate f-control" name="client_phone" data-serialize="#client_region">
<iaixsl:if test="/shop/basket/@login"> <iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute> <iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
@@ -784,10 +790,13 @@
</iaixsl:for-each> </iaixsl:for-each>
<div class="form-group --hide"> <div class="form-group --hide">
<div class="has-feedback f-feedback"> <div class="has-feedback f-feedback --phone">
<iaixsl:if test="@use = 'yes' and not(@phone = '')"> <iaixsl:if test="@use = 'yes' and not(@phone = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute> <iaixsl:attribute name="class">has-feedback f-feedback has-success --success --phone</iaixsl:attribute>
</iaixsl:if> </iaixsl:if>
<div class="phone_number__code">
+<input class="phone_number__code_number" disabled="true"></input>
</div>
<input id="delivery_phone" type="text" class="form-control validate f-control" name="delivery_phone" data-serialize="#delivery_region"> <input id="delivery_phone" type="text" class="form-control validate f-control" name="delivery_phone" data-serialize="#delivery_region">
<iaixsl:if test="@use = 'yes' and not(@phone = '')"> <iaixsl:if test="@use = 'yes' and not(@phone = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute> <iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
@@ -921,26 +930,28 @@
<h2><i class="icon-list1"></i> <iai:variable vid="Podsumowanie"/></h2> <h2><i class="icon-list1"></i> <iai:variable vid="Podsumowanie"/></h2>
<div class="summary__products"> <div class="summary__products">
<iaixsl:for-each select="basket/product"> <iaixsl:for-each select="basket/product">
<div class="cop_product_wrap"> <div class="oscop_product_wrap">
<iaixsl:if test="position() &gt; 2"><iaixsl:attribute name="class">cop_product_wrap --hide</iaixsl:attribute></iaixsl:if> <iaixsl:attribute name="data-id"><iaixsl:value-of select="@id"></iaixsl:value-of></iaixsl:attribute>
<iaixsl:if test="position() = '2' and not(position() = last())"><iaixsl:attribute name="class">cop_product_wrap --last-visible</iaixsl:attribute></iaixsl:if>
<iaixsl:if test="position() = last()"><iaixsl:attribute name="class">cop_product_wrap --last</iaixsl:attribute></iaixsl:if> <iaixsl:if test="position() &gt; 2"><iaixsl:attribute name="class">oscop_product_wrap --hide</iaixsl:attribute></iaixsl:if>
<iaixsl:if test="position() = last() and not(position() &lt; 3)"><iaixsl:attribute name="class">cop_product_wrap --hide --last-hidden</iaixsl:attribute></iaixsl:if> <iaixsl:if test="position() = '2' and not(position() = last())"><iaixsl:attribute name="class">oscop_product_wrap --last-visible</iaixsl:attribute></iaixsl:if>
<a class="cop_icon"> <iaixsl:if test="position() = last()"><iaixsl:attribute name="class">oscop_product_wrap --last</iaixsl:attribute></iaixsl:if>
<iaixsl:if test="position() = last() and not(position() &lt; 3)"><iaixsl:attribute name="class">oscop_product_wrap --hide --last-hidden</iaixsl:attribute></iaixsl:if>
<a class="oscop_icon">
<iaixsl:attribute name="href"> <iaixsl:attribute name="href">
<iaixsl:value-of select="@link"/></iaixsl:attribute> <iaixsl:value-of select="@link"/></iaixsl:attribute>
<iaixsl:attribute name="title"> <iaixsl:attribute name="title">
<iaixsl:value-of select="name/text()"/></iaixsl:attribute> <iaixsl:value-of select="name/text()"/></iaixsl:attribute>
<img class="cop_icon-img" width="90" height="90"> <img class="oscop_icon-img" width="90" height="90">
<iaixsl:attribute name="src"> <iaixsl:attribute name="src">
<iaixsl:value-of select="icon/text()"/></iaixsl:attribute> <iaixsl:value-of select="icon/text()"/></iaixsl:attribute>
<iaixsl:attribute name="alt"> <iaixsl:attribute name="alt">
<iaixsl:value-of select="name/text()"/></iaixsl:attribute> <iaixsl:value-of select="name/text()"/></iaixsl:attribute>
</img> </img>
</a> </a>
<div class="cop_product_wrap_r"> <div class="oscop_product_wrap_r">
<iaixsl:if test="size/@ordered or size/@ordered_points"> <iaixsl:if test="size/@ordered or size/@ordered_points">
<strong class="cop_quantity"> <strong class="oscop_quantity">
<iaixsl:choose> <iaixsl:choose>
<iaixsl:when test="size/@ordered"> <iaixsl:when test="size/@ordered">
<iaixsl:value-of select="size/@ordered"/> <iaixsl:value-of select="size/@ordered"/>
@@ -951,7 +962,7 @@
</iaixsl:choose>x </iaixsl:choose>x
</strong> </strong>
</iaixsl:if> </iaixsl:if>
<a class="cop_product_name"> <a class="oscop_product_name">
<iaixsl:attribute name="href"> <iaixsl:attribute name="href">
<iaixsl:value-of select="@link"/></iaixsl:attribute> <iaixsl:value-of select="@link"/></iaixsl:attribute>
<iaixsl:attribute name="title"> <iaixsl:attribute name="title">
@@ -960,7 +971,7 @@
<iaixsl:value-of select="@id"/></iaixsl:attribute> <iaixsl:value-of select="@id"/></iaixsl:attribute>
<iaixsl:value-of select="name/text()"/> <iaixsl:value-of select="name/text()"/>
</a> </a>
<span class="cop_price"> <span class="oscop_price">
<iaixsl:choose> <iaixsl:choose>
<iaixsl:when test="number(price/@value) &gt; 0"> <iaixsl:when test="number(price/@value) &gt; 0">
<iaixsl:value-of select="price/@worth_formatted"/> <iaixsl:value-of select="price/@worth_formatted"/>

2
script.js
View File

@@ -12,7 +12,7 @@ if(window.location.pathname.includes("return.html") && window.location.search.in
} }
// Przekierowanie ze strony order1 na OSCOP // Przekierowanie ze strony order1 na OSCOP
if(window.location.pathname.includes("order1.html") || window.location.pathname.includes("order1.php")){ if(window.location.pathname.includes("order1.html") || window.location.pathname.includes("order1.php") || (window.location.pathname.includes("signin.html") && window.location.search.includes("operation=onceorder"))){
app_shop.fn.ajaxLoadSite(1);// W starszych szablonach nie działa i trzeba zakomentować app_shop.fn.ajaxLoadSite(1);// W starszych szablonach nie działa i trzeba zakomentować
window.location = "/place-order.php"; window.location = "/place-order.php";
} }

79
style.css
View File

@@ -286,15 +286,15 @@
} }
// Zmiana fontsize na 16px na desktop // Zmiana fontsize na 16px na desktop
.order__voucher_headlines strong, .order__voucher_button, #signin-form .signin-form__button, .delivery__address-list-name, .osc_item-modal h2, .propose_title, #bm-oscop-remarks h3, #summary-points, #fbs_z02_wrapper .big_label, .propose_main .button_password_recover, .rebate__title{ .bm-oscop-deliveries__message, .order__voucher_headlines strong, .order__voucher_button, #signin-form .signin-form__button, .delivery__address-list-name, .osc_item-modal h2, .propose_title, #bm-oscop-remarks h3, #summary-points, #fbs_z02_wrapper .big_label, .propose_main .button_password_recover, .rebate__title{
font-size: 1.6rem!important; font-size: 1.6rem!important;
} }
// Zmiana fontsize na 14px na desktop // Zmiana fontsize na 14px na desktop
.order2_terms_checkall, .register_client_checkbox, .firm-form, #delivery_box_switcher label, #bm-oscop-payments .name, .client_type-text{ .phone_number__code, .order2_terms_checkall, .register_client_checkbox, .firm-form, #delivery_box_switcher label, #bm-oscop-payments .name, .client_type-text{
font-size: 1.4rem!important; font-size: 1.4rem!important;
} }
// Zmiana fontsize na 13px na desktop // Zmiana fontsize na 13px na desktop
.cop_product_wrap, .order_pay_wrapper, .order2_shiptime, .signin_header, .delivery_date, .remarks__container span, .delivery__address-list-street, .delivery__address-list-city, .delivery__address-list-zipcode, .delivery__address-list-phone, .delivery__address-country_name, .propose_text, .register__hide-password::before, #locationField .btn, .rebate__active-options button{ .oscop_product_wrap, .order_pay_wrapper, .order2_shiptime, .signin_header, .delivery_date, .remarks__container span, .delivery__address-list-street, .delivery__address-list-city, .delivery__address-list-zipcode, .delivery__address-list-phone, .delivery__address-country_name, .propose_text, .register__hide-password::before, #locationField .btn, .rebate__active-options button{
font-size: 1.3rem!important; font-size: 1.3rem!important;
} }
// Zmiana fontsize na 12px na desktop // Zmiana fontsize na 12px na desktop
@@ -664,6 +664,36 @@
.client_type-text{ .client_type-text{
margin-right: 1rem; margin-right: 1rem;
} }
.--phone{
display: grid;
grid-template-columns: minmax(auto, 50px) 1fr;
.help-block.validate_message.text-danger{
grid-column: span 2;
}
.f-label{
left: 76px!important;
}
.form-control{
border-radius: 0 8px 8px 0!important;
}
}
.phone_number__code{
background: #f2f2f2;
display: flex;
align-items: center;
padding: 0 0.5rem;
font-weight: 600;
border: 1px solid #c4c7c8;
border-radius: 8px 0 0 8px;
border-right: none!important;
&_number{
height: 100%;
border: none;
max-width: 36px;
padding-left: 4px;
font-weight: 600;
}
}
} }
// Sekcja dostawa i płatności // Sekcja dostawa i płatności
#bm-oscop-payments .osc_item{ #bm-oscop-payments .osc_item{
@@ -672,6 +702,21 @@
#bm-oscop-deliveries .osc_item{ #bm-oscop-deliveries .osc_item{
grid-template-columns: 13px 70px 1fr auto; grid-template-columns: 13px 70px 1fr auto;
} }
.bm-oscop-deliveries__message{
background: 1px solid @warning_color;
background: #fcca83;
padding: 1rem 2rem;
border-radius: 8px;
}
.bm-oscop-deliveries__message::before{
content: '\F06A';
font-family: fontawesome;
color: @warning_color;
display: block;
text-align: center;
font-size: 3.2rem;
}
#bm-oscop-section2{ #bm-oscop-section2{
.osc_item { .osc_item {
gap: 1.2rem; gap: 1.2rem;
@@ -715,6 +760,7 @@
.fselectedPoint{ .fselectedPoint{
display: flex; display: flex;
align-items: center; align-items: center;
grid-column: 1 / span 3;
} }
.pickup_point{ .pickup_point{
border: none!important; border: none!important;
@@ -797,7 +843,7 @@
.less_scrollbar(); .less_scrollbar();
} }
} }
.cop_product_wrap{ .oscop_product_wrap{
display: grid; display: grid;
grid-template-columns: 90px 1fr; grid-template-columns: 90px 1fr;
align-items: center; align-items: center;
@@ -814,15 +860,15 @@
.--last-visible, .--last-hidden{ .--last-visible, .--last-hidden{
border-bottom: none; border-bottom: none;
} }
.cop_product_wrap_r, .cop_icon{ .oscop_product_wrap_r, .oscop_icon{
display: flex; display: flex;
align-items: center; align-items: center;
} }
.cop_product_wrap_r { .oscop_product_wrap_r {
justify-content: space-between; justify-content: space-between;
gap: 1rem; gap: 1rem;
} }
.cop_icon{ .oscop_icon{
justify-content: center; justify-content: center;
overflow: hidden; overflow: hidden;
height: 90px; height: 90px;
@@ -830,13 +876,13 @@
border-radius: 10px; border-radius: 10px;
background: #fff; background: #fff;
} }
.cop_icon-img{ .oscop_icon-img{
transition: all 0.25s; transition: all 0.25s;
} }
.cop_icon-img:hover{ .oscop_icon-img:hover{
transform: scale(1.1); transform: scale(1.1);
} }
.cop_price{ .oscop_price{
min-width: 60px; min-width: 60px;
text-align: right; text-align: right;
} }
@@ -1016,15 +1062,15 @@
grid-template-columns: 1fr!important; grid-template-columns: 1fr!important;
} }
// Zmiana fontsize na 12px mobile // Zmiana fontsize na 12px mobile
.cop_product_wrap_r .cop_quantity{ .oscop_product_wrap_r .oscop_quantity{
font-size: 1.2rem!important; font-size: 1.2rem!important;
} }
// Zmiana fontsize na 13px mobile // Zmiana fontsize na 13px mobile
.delivery_date, .cop_product_wrap_r .cop_price, .order2_terms_wrapper_sub:not(.needed-text), #mail_propose_signin, #mail_propose_close { .delivery_date, .oscop_product_wrap_r .oscop_price, .order2_terms_wrapper_sub:not(.needed-text), #mail_propose_signin, #mail_propose_close {
font-size: 1.3rem!important; font-size: 1.3rem!important;
} }
// Zmiana fontsize na 14px mobile // Zmiana fontsize na 14px mobile
.bm-oscop__btn, .cop_product_wrap_r .cop_product_name, .rebate__options, .order2_terms_wrapper_sub.newsletter, .propose_text, .propose_json_mail, .button_password_recover, #bm-oscop-section2 #bm-oscop-remarks h3, .rebate__title{ .bm-oscop__btn, .oscop_product_wrap_r .oscop_product_name, .rebate__options, .order2_terms_wrapper_sub.newsletter, .propose_text, .propose_json_mail, .button_password_recover, #bm-oscop-section2 #bm-oscop-remarks h3, .rebate__title{
font-size: 1.4rem!important; font-size: 1.4rem!important;
} }
#delivery_box_switcher label, #FBS_faktura > span, #bm-oscop-payments .osc_item .name{ #delivery_box_switcher label, #FBS_faktura > span, #bm-oscop-payments .osc_item .name{
@@ -1150,11 +1196,11 @@
img{ img{
max-width: 100%!important; max-width: 100%!important;
} }
.cop_product_wrap_r{ .oscop_product_wrap_r{
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
gap: 0.8rem; gap: 0.8rem;
.cop_price{ .oscop_price{
text-align: left; text-align: left;
padding-top: 0.8rem; padding-top: 0.8rem;
} }
@@ -1329,6 +1375,7 @@
height: 500px; height: 500px;
width: 100%; width: 100%;
margin-bottom: 25px; margin-bottom: 25px;
position: relative;
} }
.loadingPoints { .loadingPoints {
background: #ffffff; background: #ffffff;
@@ -1538,7 +1585,7 @@
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
} }
.order2_button_order{ order2_button_order{
display: inline-block!important; display: inline-block!important;
width: 100%; width: 100%;
padding: 1.4rem; padding: 1.4rem;

372
wydzielonyScript.js
View File

File diff suppressed because one or more lines are too long

368
wydzielonyScriptLiteraly.js
View File

File diff suppressed because one or more lines are too long