Odblokowanie edycji danych adresowych dla użytkowników wchodzących na OSCOPa przez "Zamów bez rejestracji"

This commit is contained in:
2024-01-26 13:45:38 +01:00
parent 7c1c1b97dd
commit 5493bb6a81
2 changed files with 76 additions and 32 deletions

View File

@@ -42,10 +42,10 @@ Trzeba je później podmienić w kodzie w Wydzielonym Javascript na np.:
- Sprawdzenie czy wpisano dobry bon towarowy przed złożeniem zamówienia
- Lepiej zabezpieczony numer telefonu(na standardzie to +2+++++++++1 przejdzie)
- Autouzupełnianie metod płatności i dostawy w edycji
- Autouzupełnianie metod płatności i dostawy na podstawie poprzednio wykonanego zakupu
- Autouzupełnianie metod płatności i dostawy na podstawie poprzednio wykonanego zakupu(za pomocą localStorage, czyli tylko w obszarze jednej przeglądarki na jednym urządzeniu)
### Wady ###
- Nie ma faktury na inne dane(żeby nie używać tego samego zapytania co OSCOP Idosella, na wszelki wypadek żeby nie pobierało opłat)
- Nie ma faktury na inne dane(żeby nie używać tego samego zapytania co OSCOP Idosella, żeby nie pobierało opłat)
### Dodatkowe pomysły do zrealizowania ###
- Sprawdzanie logina w trakcie pisania(może być słabe dla ochrony danych klienta)
@@ -58,3 +58,5 @@ Trzeba je później podmienić w kodzie w Wydzielonym Javascript na np.:
- Długie zdjęcia produktu źle wyglądają(najlepsze kwadratowe)
- W przypadku edycji zamówienia z zapłatą za pobraniem nie można pobrać danych takiego zamówienia przed dokonaniem zapłaty. Idosell sprawdza ten problem w komunikacie na zooart6.
- Dziwna rzecz którą zauważyłem. Jak składasz zamówienie wraz z zakładaniem konta, ale okazuje się że brakuje któregoś produktu w koszyku, to konto dalej się zakłada(ponieważ w takiej sytuacji najpierw zakłada się konto, a później składa się zamówienie)
- nie można wybierać hurtownika w place-order
- Jak się klika Zamów bez rejestracji to jest faktura na inne dane. Schować?

View File

@@ -68,7 +68,7 @@
<div class="cop_box_sub">
<h2>1. <iai:variable vid="Dane kontaktowe"/></h2>
<!--OPCJE LOGOWANIA-->
<iaixsl:if test="/shop/page/client-data/profile_data/@login = ''">
<iaixsl:if test="not(/shop/basket/@login)">
<div class="signin">
<span class="signin_header">
<iai:variable vid="Masz już u nas konto"/>?
@@ -110,7 +110,8 @@
</iaixsl:if>
<!--EMAIL I TELEFON-->
<form id="client_contact_info" onsubmit="return false" class="f-group">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<!--<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">-->
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="class">f-group --logged</iaixsl:attribute>
</iaixsl:if>
<div class="form-group">
@@ -119,7 +120,7 @@
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_email" type="email" class="form-control validate f-control" name="client_email">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -140,7 +141,7 @@
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_phone" type="tel" class="form-control validate f-control" name="client_phone" data-serialize="#client_region">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -158,7 +159,7 @@
</div>
</form>
<!--OKNO REJESTRACJI-->
<iaixsl:if test="/shop/page/client-data/profile_data/@login = ''">
<iaixsl:if test="not(/shop/basket/@login)">
<div class="register">
<div class="register__option">
<input type="checkbox" name="register_client" id="register_client_checkbox"/>
@@ -204,7 +205,7 @@
<h2>2. <iai:variable vid="Dane adresowe"/></h2>
<form id="client_form" onsubmit="return false" class="f-group">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="class">f-group --logged</iaixsl:attribute>
</iaixsl:if>
<div class="client_box cn_wrapper">
@@ -213,7 +214,7 @@
<span class="client_type-text"><iai:variable vid="Zamawiasz jako"/>:</span>
<label class="radio-inline">
<input type="radio" id="client_type2" value="private" name="client_type">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:if test="$is_firm = 'false'">
@@ -224,7 +225,7 @@
</label>
<label class="radio-inline">
<input type="radio" id="client_type1" value="firm" name="client_type">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:if test="/shop/basket/@login">
<iaixsl:attribute name="disabled">disabled</iaixsl:attribute>
</iaixsl:if>
<iaixsl:if test="$is_firm = 'true'">
@@ -241,12 +242,12 @@
<iaixsl:attribute name="class">form-group firm-group --fade-in</iaixsl:attribute>
</iaixsl:if>
<div class="has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '') and not(/shop/page/client-data/invoice_data/@firm = '')">
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -268,11 +269,11 @@
<iaixsl:attribute name="class">form-group firm-group --fade-in</iaixsl:attribute>
</iaixsl:if>
<div class="has-feedback f-feedback">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '') and not(/shop/page/client-data/invoice_data/@nip = '')">
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input type="text" class="form-control validate f-control" name="client_nip" id="client_nip" data-serialize="#client_region">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -297,7 +298,7 @@
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_firstname" type="text" class="form-control validate f-control" name="client_firstname">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -321,7 +322,7 @@
</iaixsl:if>
<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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -345,7 +346,7 @@
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="birth_date" type="text" class="form-control validate f-control" name="birth_date">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -368,7 +369,7 @@
<iaixsl:attribute name="class">has-feedback f-feedback --success has-success</iaixsl:attribute>
</iaixsl:if>
<input id="client_street" type="text" class="form-control validate f-control" name="client_street" data-serialize="#client_region">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -392,7 +393,7 @@
<iaixsl:attribute name="class">zipcode_wrapper 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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -412,7 +413,7 @@
</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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -432,7 +433,7 @@
<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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -450,7 +451,7 @@
<iaixsl:attribute name="class">f-feedback --success</iaixsl:attribute>
</iaixsl:if>
<select class="form-control delivery_countries" id="client_region" name="client_region" data-revalidate="#client_street,#client_zipcode">
<iaixsl:if test="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -499,7 +500,7 @@
<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="not(/shop/page/client-data/profile_data/@login = '')">
<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>
@@ -536,7 +537,11 @@
<iaixsl:if test="not(/shop/page/client-data/@edit = 'true') and (/shop/page/client-data/delivery_data/@use != 'hide')">
<div class="form-group" id="delivery_box_switcher">
<label class="control-label" for="deliver_to_billingaddr">
<input type="checkbox" name="deliver_to_billingaddr" id="deliver_to_billingaddr" value="0"></input>
<input type="checkbox" name="deliver_to_billingaddr" id="deliver_to_billingaddr" value="0">
<iaixsl:if test="/shop/page/client-data/delivery_data/@use = 'yes' and not(/shop/basket/@login)">
<iaixsl:attribute name="checked">checked</iaixsl:attribute>
</iaixsl:if>
</input>
<iai:variable vid="Dostawa na inny adres"/>:
</label>
<iaixsl:if test="/shop/page/client-data/addresses-list/@count &gt; 0">
@@ -602,15 +607,21 @@
</iaixsl:if>
</div>
</iaixsl:if>
<iaixsl:if test="not(/shop/page/client-data/@edit = 'true') and (/shop/page/client-data/delivery_data/@use != 'hide')">
<div class="delivery_box cn_wrapper f-group">
<iaixsl:if test="(/shop/page/client-data/delivery_data/@use = 'yes')"><iaixsl:attribute name="style">display:block;</iaixsl:attribute>
<iaixsl:if test="(/shop/page/client-data/delivery_data/@use = 'yes') and not(/shop/basket/@login)">
<iaixsl:attribute name="class">delivery_box cn_wrapper f-group --more</iaixsl:attribute>
</iaixsl:if>
<iaixsl:for-each select="/shop/page/client-data/delivery_data">
<div class="form-group --hide">
<div class="has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@firstname = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_firstname" type="text" class="form-control validate f-control" name="delivery_firstname">
<iaixsl:if test="@use = 'yes' and not(@firstname = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@firstname"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@name"/></iaixsl:attribute>
<iaixsl:attribute name="required">required</iaixsl:attribute>
@@ -624,7 +635,13 @@
<div class="form-group --hide">
<div class="has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@lastname = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_lastname" type="text" class="form-control validate f-control" name="delivery_lastname">
<iaixsl:if test="@use = 'yes' and not(@lastname = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@lastname"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@name"/></iaixsl:attribute>
<iaixsl:if test="/shop/page/client-data/profile_data/@mandatory_lastname = 'true'"><iaixsl:attribute name="required">required</iaixsl:attribute></iaixsl:if>
@@ -638,7 +655,13 @@
<div class="form-group --hide">
<div class="has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@additional = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_additional" type="text" class="form-control validate f-control" name="delivery_additional">
<iaixsl:if test="@use = 'yes' and not(@additional = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@additional"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@additional"/></iaixsl:attribute>
</input>
@@ -650,7 +673,13 @@
<div class="form-group --hide">
<div class="has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@street = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<input id="delivery_street" type="text" class="form-control validate f-control" name="delivery_street" data-serialize="#delivery_region">
<iaixsl:if test="@use = 'yes' and not(@street = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@street"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@addres"/></iaixsl:attribute>
<iaixsl:attribute name="required">required</iaixsl:attribute>
@@ -665,7 +694,13 @@
<div class="form-group --hide">
<div class="row">
<div class="zipcode_wrapper 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: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 = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@zipcode"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@zipcode"/></iaixsl:attribute>
<iaixsl:attribute name="required">required</iaixsl:attribute>
@@ -676,7 +711,13 @@
<span class="form-control-feedback"/>
</div>
<div class="city_wrapper 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:if>
<input id="delivery_city" type="text" class="form-control validate f-control" name="delivery_city">
<iaixsl:if test="@use = 'yes' and not(@city = '')">
<iaixsl:attribute name="class">form-control validate f-control focused</iaixsl:attribute>
</iaixsl:if>
<iaixsl:attribute name="value"><iaixsl:value-of select="@city"/></iaixsl:attribute>
<iaixsl:attribute name="maxlength"><iaixsl:value-of select="/shop/page/input_option/@city"/></iaixsl:attribute>
<iaixsl:attribute name="required">required</iaixsl:attribute>
@@ -709,9 +750,6 @@
<iaixsl:attribute name="value"><iaixsl:value-of select="@id"/></iaixsl:attribute>
<iaixsl:attribute name="data-vat_company"><iaixsl:value-of select="@vat_company"/></iaixsl:attribute>
<iaixsl:attribute name="data-vat"><iaixsl:value-of select="@vat"/></iaixsl:attribute>
<!--<iaixsl:if test="(@id = /shop/page/client-data/delivery_data/@region) or (@id = /shop/page/options/countries/@delivery_active)">-->
<!-- <iaixsl:attribute name="selected">selected</iaixsl:attribute>-->
<!--</iaixsl:if>-->
<iaixsl:choose>
<iaixsl:when test="/shop/page/client-data/invoice_data/@region > 0">
<iaixsl:if test="@id = /shop/page/client-data/invoice_data/@region">
@@ -765,7 +803,13 @@
<div class="form-group --hide">
<div class="has-feedback f-feedback">
<iaixsl:if test="@use = 'yes' and not(@phone = '')">
<iaixsl:attribute name="class">has-feedback f-feedback has-success --success</iaixsl:attribute>
</iaixsl:if>
<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'">
@@ -782,8 +826,6 @@
</div>
</iaixsl:if>
</div>
</div>
<!-- FAKTURY -->