Fix bugów + wybór czasu i daty dostawy

This commit is contained in:
2024-11-18 09:16:17 +01:00
parent 35c25e176a
commit 79a5dc709e
5 changed files with 3309 additions and 2457 deletions

View File

@@ -6,7 +6,7 @@
<iaixsl:variable name="returns_agree_control"></iaixsl:variable>
<iaixsl:if test="not(/shop/page/client-data/@edit='true')">
<div id="signin-form">
<div id="signin-form" style="display: none;">
<h2>
<iai:variable vid="Moje konto"/>
</h2>
@@ -117,7 +117,6 @@
</iaixsl:if>
<input id="client_email" type="email" class="form-control validate f-control" name="client_email">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/contact_data/@email"/></iaixsl:attribute>
@@ -131,31 +130,49 @@
<span class="form-control-feedback"/>
</div>
</div>
<div class="form-group">
<div class="has-feedback f-feedback --phone">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success --phone</iaixsl:attribute>
</iaixsl:if>
<div class="phone_number__code">
+<input class="phone_number__code_number" disabled="true"></input>
<div class="form-group --phone">
<div class="row">
<div class="input_wrapper__first col-md-5 has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">input_wrapper__first col-md-5 has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<div class="phone_number__code">
<span class="phone_number__code_alpha2"></span>
(+
<span class="phone_number__code_text"></span>
)
<input class="phone_number__code_number" disabled="true" type="hidden"></input>
<span class="phone_number__description">
<iai:variable vid="Kierunkowy"/>
</span>
<ul class="phone_number__code_list"></ul>
</div>
</div>
<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:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
<div class="input_wrapper__second col-md-7 has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">input_wrapper__second col-md-7 has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/contact_data/@phone"/></iaixsl:attribute>
<iaixsl:if test="/shop/page/client-data/contact_data/@mandatory_phone = 'true'">
<iaixsl:attribute name="required">required</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="data-copy">delivery_phone</iaixsl:attribute>
</input>
<label for="client_phone" class="f-label">
<iai:variable vid="Numer telefonu"/>
</label>
<span class="form-control-feedback"/>
<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:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/contact_data/@phone"/></iaixsl:attribute>
<iaixsl:if test="/shop/page/client-data/contact_data/@mandatory_phone = 'true'">
<iaixsl:attribute name="required">required</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="data-copy">delivery_phone</iaixsl:attribute>
</input>
<label for="client_phone" class="f-label">
<iai:variable vid="Numer telefonu"/>
</label>
<span class="form-control-feedback"/>
</div>
</div>
</div>
</form>
<!--OKNO REJESTRACJI-->
<iaixsl:if test="not(/shop/basket/@login)">
@@ -211,7 +228,6 @@
<label class="radio-inline">
<input type="radio" id="client_type2" value="private" name="client_type">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:if test="$is_firm = 'false'">
<iaixsl:attribute name="checked">checked</iaixsl:attribute>
@@ -222,7 +238,6 @@
<label class="radio-inline">
<input type="radio" id="client_type1" value="firm" name="client_type">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:if test="$is_firm = 'true'">
<iaixsl:attribute name="checked">checked</iaixsl:attribute>
@@ -244,7 +259,6 @@
<input type="text" class="form-control validate f-control" name="client_firm" id="client_firm">
<iaixsl:attribute name="required">required</iaixsl:attribute>
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@additional"/></iaixsl:attribute>
@@ -270,7 +284,6 @@
</iaixsl:if>
<input type="text" class="form-control validate f-control" name="client_nip" id="client_nip" data-serialize="#client_region">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:if test="/shop/page/client-data/nip/@active = 'required'">
@@ -295,7 +308,6 @@
</iaixsl:if>
<input id="client_firstname" type="text" class="form-control validate f-control" name="client_firstname">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@name"/></iaixsl:attribute>
@@ -319,7 +331,6 @@
<input id="client_lastname" type="text" class="form-control validate f-control" name="client_lastname">
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@lastname"/></iaixsl:attribute>
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/invoice_data/@lastname"/></iaixsl:attribute>
@@ -343,7 +354,6 @@
</iaixsl:if>
<input id="birth_date" type="text" class="form-control validate f-control" name="birth_date">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@birthdate"/></iaixsl:attribute>
@@ -366,7 +376,6 @@
</iaixsl:if>
<input id="client_street" type="text" class="form-control validate f-control" name="client_street" data-serialize="#client_region">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@addres"/></iaixsl:attribute>
@@ -384,13 +393,12 @@
<div class="form-group">
<div class="row">
<div class="zipcode_wrapper col-md-5 has-feedback f-feedback">
<div class="input_wrapper__first col-md-5 has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">zipcode_wrapper col-md-5 has-feedback f-feedback --success has-success</iaixsl:attribute>
<iaixsl:attribute name="class">input_wrapper__first col-md-5 has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_zipcode" type="text" class="form-control validate f-control" name="client_zipcode" data-serialize="#client_region">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/invoice_data/@zipcode"/></iaixsl:attribute>
@@ -403,14 +411,13 @@
</label>
<span class="form-control-feedback"/>
</div>
<div class="city_wrapper col-md-7 has-feedback f-feedback">
<div class="input_wrapper__second col-md-7 has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">city_wrapper col-md-7 has-feedback f-feedback --success has-success</iaixsl:attribute>
<iaixsl:attribute name="class">input_wrapper__second col-md-7 has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_city" type="text" class="form-control validate f-control" name="client_city">
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@city"/></iaixsl:attribute>
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/client-data/invoice_data/@city"/></iaixsl:attribute>
@@ -429,9 +436,6 @@
<iaixsl:choose>
<iaixsl:when test="count(/shop/page/options/countries/country) = 1 and (/shop/page/options/countries/country/@id = 1143020003)">
<input id="client_region" type="hidden" name="client_region">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="/shop/page/options/countries/country/@id"/></iaixsl:attribute>
<iaixsl:attribute name="data-vat_company"><iaixsl:value-of select="/shop/page/options/countries/country/@vat_company"/></iaixsl:attribute>
<iaixsl:attribute name="data-vat"><iaixsl:value-of select="/shop/page/options/countries/country/@vat"/></iaixsl:attribute>
@@ -448,7 +452,6 @@
</iaixsl:if>
<select class="form-control delivery_countries" id="client_region" name="client_region" data-revalidate="#client_street,#client_zipcode">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
<iaixsl:attribute name="class">form-control delivery_countries f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="data-copy">delivery_region</iaixsl:attribute>
@@ -496,9 +499,6 @@
<select class="form-control" name="client_province">
<iaixsl:if test="page/client-data/@disallow_change_company_data = 'true'"><iaixsl:attribute name="readonly">readonly</iaixsl:attribute></iaixsl:if>
<iaixsl:if test="not(@selected = 'true')"><iaixsl:attribute name="disabled">disabled</iaixsl:attribute></iaixsl:if>
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="id">client_province_<iaixsl:value-of select="@id"/></iaixsl:attribute>
<iaixsl:attribute name="data-copy">delivery_province</iaixsl:attribute>
<iaixsl:for-each select="provinces/province">
@@ -681,9 +681,9 @@
<div class="form-group --hide">
<div class="row">
<div class="zipcode_wrapper col-md-5 has-feedback f-feedback">
<div class="input_wrapper__first col-md-5 has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@zipcode = '')">
<iaixsl:attribute name="class">zipcode_wrapper col-md-5 has-feedback f-feedback has-success --success</iaixsl:attribute>
<iaixsl:attribute name="class">input_wrapper__first col-md-5 has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_zipcode" type="text" class="form-control validate f-control" name="delivery_zipcode" data-serialize="#delivery_region">
<iaixsl:if test="@use = 'yes' and not(@zipcode = '')">
@@ -698,9 +698,9 @@
</label>
<span class="form-control-feedback"/>
</div>
<div class="city_wrapper col-md-7 has-feedback f-feedback">
<div class="input_wrapper__second col-md-7 has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@city = '')">
<iaixsl:attribute name="class">city_wrapper col-md-7 has-feedback f-feedback has-success --success</iaixsl:attribute>
<iaixsl:attribute name="class">input_wrapper__second col-md-7 has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_city" type="text" class="form-control validate f-control" name="delivery_city">
<iaixsl:if test="@use = 'yes' and not(@city = '')">
@@ -789,28 +789,37 @@
</iaixsl:if>
</iaixsl:for-each>
<div class="form-group --hide">
<div class="has-feedback f-feedback --phone">
<iaixsl:if test="@use = 'yes' and not(@phone = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success --phone</iaixsl:attribute>
</iaixsl:if>
<div class="phone_number__code">
+<input class="phone_number__code_number" disabled="true"></input>
<div class="form-group --phone --hide">
<div class="row">
<div class="input_wrapper__first col-md-5 has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:attribute name="class">input_wrapper__first col-md-5 has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<div class="phone_number__code">
<span class="phone_number__code_alpha2"></span>
(+
<span class="phone_number__code_text"></span>
)
<input class="phone_number__code_number" disabled="true" type="hidden"></input>
<span class="phone_number__description">
<iai:variable vid="Kierunkowy"/>
</span>
<ul class="phone_number__code_list"></ul>
</div>
</div>
<div class="input_wrapper__second col-md-7 has-feedback f-feedback">
<input id="delivery_phone" type="tel" class="form-control validate f-control" name="delivery_phone" data-serialize="#delivery_phone">
<iaixsl:attribute name="value"><iaixsl:value-of select="@phone"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@phone"/></iaixsl:attribute>
<iaixsl:if test="/shop/page/client-data/contact_data/@mandatory_phone = 'true'">
<iaixsl:attribute name="required">required</iaixsl:attribute>
</iaixsl:if>
</input>
<label for="client_phone" class="f-label">
<iai:variable vid="Numer telefonu"/>
</label>
<span class="form-control-feedback"/>
</div>
<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:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@phone"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@phone"/></iaixsl:attribute>
<iaixsl:if test="/shop/page/client-data/contact_data/@mandatory_phone = 'true'">
<iaixsl:attribute name="required">required</iaixsl:attribute>
</iaixsl:if>
</input>
<label for="delivery_phone" class="f-label">
<iai:variable vid="Numer telefonu"/>
</label>
<span class="form-control-feedback"/>
</div>
</div>
</iaixsl:for-each>
@@ -822,19 +831,19 @@
<div id="FBS_faktura">
<span><iai:variable vid="Chcę otrzymać"/>:</span>
<input type="hidden" name="checkinvoice" value="true"/>
<div class="order2_terms_wrapper_sub newsletter fbs_inpfaktura">
<div class="order2_terms_wrapper_sub fbs_inpfaktura">
<label>
<input type="radio" class="order2_radio_document" name="invoice" id="order2_document_confirmation" value="0" checked=""/>
<span><iai:variable vid="Potwierdzenie zakupu"/></span>
</label>
</div>
<div class="order2_terms_wrapper_sub newsletter fbs_inpfaktura">
<div class="order2_terms_wrapper_sub fbs_inpfaktura">
<label>
<input type="radio" class="order2_radio_document" name="invoice" id="order2_document_e-invoice" value="2"/>
<span><iai:variable vid="Fakturę w formie elektronicznej"/></span>
</label>
</div>
<div class="order2_terms_wrapper_sub newsletter fbs_inpfaktura">
<div class="order2_terms_wrapper_sub fbs_inpfaktura">
<label>
<input type="radio" class="order2_radio_document" name="invoice" id="order2_document_invoice" value="1"/>
<span>
@@ -1069,29 +1078,27 @@
</div>
</iaixsl:if>
<iaixsl:if test="not(/shop/basket/@login)">
<div class="order2_terms_wrapper_sub newsletter email">
<label for="client_mailing">
<input id="client_mailing" type="checkbox" name="client_mailing" value="1">
<iaixsl:if test="/shop/page/client-data/contact_data/@mailing != '0'"><iaixsl:attribute name="checked">checked</iaixsl:attribute></iaixsl:if>
<div class="order2_terms_wrapper_sub newsletter email">
<label for="client_mailing">
<input id="client_mailing" type="checkbox" name="client_mailing" value="1">
<iaixsl:if test="/shop/page/client-data/contact_data/@mailing != '0'"><iaixsl:attribute name="checked">checked</iaixsl:attribute></iaixsl:if>
</input>
<span>
<iai:variable vid="Chcę otrzymywać E-mail Newsletter (możliwość późniejszej rezygnacji)"/>
</span>
</label>
</div>
<iaixsl:if test="/shop/page/client-data/contact_data/@send_sms">
<div class="order2_terms_wrapper_sub newsletter sms">
<label for="client_sms">
<input id="client_sms" type="checkbox" name="client_sms" value="1">
<iaixsl:if test="/shop/page/client-data/contact_data/@send_sms = 'y' or /shop/page/client-data/contact_data/@send_sms = 'd' or /shop/page/client-data/contact_data/@send_sms = '1'"><iaixsl:attribute name="checked"><![CDATA[checked]]></iaixsl:attribute></iaixsl:if>
</input>
<span>
<iai:variable vid="Chcę otrzymywać E-mail Newsletter (możliwość późniejszej rezygnacji)"/>
<iai:variable vid="Chcę otrzymywać SMS Newsletter (możliwość późniejszej rezygnacji)"/>
</span>
</label>
</div>
<iaixsl:if test="/shop/page/client-data/contact_data/@send_sms">
<div class="order2_terms_wrapper_sub newsletter sms">
<label for="client_sms">
<input id="client_sms" type="checkbox" name="client_sms" value="1">
<iaixsl:if test="/shop/page/client-data/contact_data/@send_sms = 'y' or /shop/page/client-data/contact_data/@send_sms = 'd' or /shop/page/client-data/contact_data/@send_sms = '1'"><iaixsl:attribute name="checked"><![CDATA[checked]]></iaixsl:attribute></iaixsl:if>
</input>
<span>
<iai:variable vid="Chcę otrzymywać SMS Newsletter (możliwość późniejszej rezygnacji)"/>
</span>
</label>
</div>
</iaixsl:if>
</iaixsl:if>
<iaixsl:if test="page/order2/ordersproducts//product[@product_type = 'product_virtual']">