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

Refactor billing form templates and improve error handling

Browse Source 
- Updated billing code label from "Kod" to "Kod pocztowy" for clarity.
- Enhanced error message handling in createFirstUserDataSuccess.php for better user feedback.
- Removed deprecated userdata_order_form.html and userdata_order_form_billing.html.bck templates.
- Adjusted layout in userdata_order_form.html for better responsiveness.
- Added input formatting for postal code in userdata_order_form.html to enforce correct input format.
This commit is contained in:
Jacek Pyziak
2025-06-17 23:20:19 +02:00
parent d1145f82bd
commit 426a128c97
8 changed files with 196 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.vscode/ftp-kr.sync.cache.json vendored
View File

@@ -3,12 +3,6 @@
"domains": { "domains": {
"grzanieplus.pl": { "grzanieplus.pl": {
"public_html": { "public_html": {
".gitignore": {
"type": "-",
"size": 32,
"lmtime": 0,
"modified": false
},
"apps": { "apps": {
"frontend": { "frontend": {
"modules": { "modules": {
@@ -1578,8 +1572,8 @@
}, },
"one_column.html": { "one_column.html": {
"type": "-", "type": "-",
"size": 2730, "size": 3068,
"lmtime": 1725624369265, "lmtime": 1748290022761,
"modified": false "modified": false
}, },
"two_column.html": { "two_column.html": {
@@ -3814,6 +3808,12 @@
}, },
"doc": {}, "doc": {},
"fastcache": {}, "fastcache": {},
".gitignore": {
"type": "-",
"size": 32,
"lmtime": 0,
"modified": false
},
"install": {}, "install": {},
"lib": {}, "lib": {},
"log": {}, "log": {},

7
apps/frontend/modules/stUserData/actions/actions.class.php
View File

@@ -1008,6 +1008,13 @@ class stUserDataActions extends stActions
$error_exists = true; $error_exists = true;
} }
// address_number
if ( !isset($user_data_billing['address_number']) || !$user_data_billing['address_number'])
{
$this->getRequest()->setError('user_data_billing{address_number}', $i18n->__('Brak numeru domu/mieszkania.'));
$error_exists = true;
}
if (!isset($user_data_billing['code']) || !$user_data_billing['code']) if (!isset($user_data_billing['code']) || !$user_data_billing['code'])
{ {
$this->getRequest()->setError('user_data_billing{code}', $i18n->__('Brak kodu.')); $this->getRequest()->setError('user_data_billing{code}', $i18n->__('Brak kodu.'));

6
apps/frontend/modules/stUserData/templates/_orderForm.php
View File

@@ -101,7 +101,7 @@ $smarty->assign('input_billing_address_more', input_tag('user_data_billing[addre
$smarty->assign('label_billing_region', label_for('region_billing', __('Województwo'))); $smarty->assign('label_billing_region', label_for('region_billing', __('Województwo')));
$smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'region_billing', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{region}') ? 'st_form-error' : ''))); $smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'region_billing', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{region}') ? 'st_form-error' : '')));
$smarty->assign('label_billing_code', label_for('code_billing', "* " . __('Kod'))); $smarty->assign('label_billing_code', label_for('code_billing', "* " . __('Kod pocztowy')));
$smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'code_billing', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{code}') ? 'st_form-error' : ''))); $smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'code_billing', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{code}') ? 'st_form-error' : '')));
$smarty->assign('label_billing_town', label_for('town_billing', "* " . __('Miasto'))); $smarty->assign('label_billing_town', label_for('town_billing', "* " . __('Miasto')));
@@ -261,7 +261,7 @@ if (stTheme::is_responsive()) {
$smarty->assign('input_billing_address', input_tag('user_data_billing[address]', $user_data_billing['address'], array('id' => 'address_billing', 'placeholder' => '* ' . __("Ulica nr domu / nr lokalu"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_address', input_tag('user_data_billing[address]', $user_data_billing['address'], array('id' => 'address_billing', 'placeholder' => '* ' . __("Ulica nr domu / nr lokalu"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_billing_address_more', input_tag('user_data_billing[address_more]', $user_data_billing['address_more'], array('id' => 'address_more_billing', 'placeholder' => __("Adres ciąg dalszy"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_address_more', input_tag('user_data_billing[address_more]', $user_data_billing['address_more'], array('id' => 'address_more_billing', 'placeholder' => __("Adres ciąg dalszy"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'region_billing', 'placeholder' => __("Województwo"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'region_billing', 'placeholder' => __("Województwo"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'code_billing', 'placeholder' => '* ' . __("Kod"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'code_billing', 'placeholder' => '* ' . __("Kod pocztowy"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_billing_town', input_tag('user_data_billing[town]', $user_data_billing['town'], array('id' => 'town_billing', 'placeholder' => '* ' . __("Miasto"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_town', input_tag('user_data_billing[town]', $user_data_billing['town'], array('id' => 'town_billing', 'placeholder' => '* ' . __("Miasto"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('select_billing_country', countries_select_tag('user_data_billing[country]', isset($user_data_billing['country']) ? $user_data_billing['country'] : $delivery_country_id)); $smarty->assign('select_billing_country', countries_select_tag('user_data_billing[country]', isset($user_data_billing['country']) ? $user_data_billing['country'] : $delivery_country_id));
$smarty->assign('input_billing_phone', input_tag('user_data_billing[phone]', $user_data_billing['phone'], array('id' => 'phone_billing', 'placeholder' => $phone_label, 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_billing_phone', input_tag('user_data_billing[phone]', $user_data_billing['phone'], array('id' => 'phone_billing', 'placeholder' => $phone_label, 'maxlength' => '255', 'class' => 'form-control')));
@@ -272,7 +272,7 @@ if (stTheme::is_responsive()) {
$smarty->assign('input_delivery_address', input_tag('user_data_delivery[address]', $user_data_delivery['address'], array('id' => 'address_delivery', 'placeholder' => '* ' . __("Ulica nr domu / nr lokalu"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_address', input_tag('user_data_delivery[address]', $user_data_delivery['address'], array('id' => 'address_delivery', 'placeholder' => '* ' . __("Ulica nr domu / nr lokalu"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_delivery_address_more', input_tag('user_data_delivery[address_more]', $user_data_delivery['address_more'], array('id' => 'address_more_delivery', 'placeholder' => __("Adres ciąg dalszy"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_address_more', input_tag('user_data_delivery[address_more]', $user_data_delivery['address_more'], array('id' => 'address_more_delivery', 'placeholder' => __("Adres ciąg dalszy"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_delivery_region', input_tag('user_data_delivery[region]', $user_data_delivery['region'], array('id' => 'region_delivery', 'placeholder' => __("Województwo"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_region', input_tag('user_data_delivery[region]', $user_data_delivery['region'], array('id' => 'region_delivery', 'placeholder' => __("Województwo"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_delivery_code', input_tag('user_data_delivery[code]', $user_data_delivery['code'], array('id' => 'code_delivery', 'placeholder' => '* ' . __("Kod"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_code', input_tag('user_data_delivery[code]', $user_data_delivery['code'], array('id' => 'code_delivery', 'placeholder' => '* ' . __("Kod pocztowy"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_delivery_town', input_tag('user_data_delivery[town]', $user_data_delivery['town'], array('id' => 'town_delivery', 'placeholder' => '* ' . __("Miasto"), 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_town', input_tag('user_data_delivery[town]', $user_data_delivery['town'], array('id' => 'town_delivery', 'placeholder' => '* ' . __("Miasto"), 'maxlength' => '255', 'class' => 'form-control')));
$smarty->assign('input_delivery_phone', input_tag('user_data_delivery[phone]', $user_data_delivery['phone'], array('id' => 'phone_delivery', 'placeholder' => $phone_label, 'maxlength' => '255', 'class' => 'form-control'))); $smarty->assign('input_delivery_phone', input_tag('user_data_delivery[phone]', $user_data_delivery['phone'], array('id' => 'phone_delivery', 'placeholder' => $phone_label, 'maxlength' => '255', 'class' => 'form-control')));
} }

2
apps/frontend/modules/stUserData/templates/_orderFormBilling.php
View File

@@ -49,7 +49,7 @@ $smarty->assign('input_billing_address_more', input_tag('user_data_billing[addre
$smarty->assign('label_billing_region', label_for('billing-region', __('Województwo'))); $smarty->assign('label_billing_region', label_for('billing-region', __('Województwo')));
$smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'billing-region', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{region}') ? 'st_form-error billing-region' : 'billing-region'))); $smarty->assign('input_billing_region', input_tag('user_data_billing[region]', $user_data_billing['region'], array('id' => 'billing-region', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{region}') ? 'st_form-error billing-region' : 'billing-region')));
$smarty->assign('label_billing_code', label_for('billing-code', "* " . __('Kod'))); $smarty->assign('label_billing_code', label_for('billing-code', "* " . __('Kod pocztowy')));
$smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'billing-code', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{code}') ? 'st_form-error billing-code' : 'billing-code'))); $smarty->assign('input_billing_code', input_tag('user_data_billing[code]', $user_data_billing['code'], array('id' => 'billing-code', 'maxlength' => '255', 'class' => form_has_error('user_data_billing{code}') ? 'st_form-error billing-code' : 'billing-code')));
$smarty->assign('label_billing_town', label_for('billing-town', "* " . __('Miasto'))); $smarty->assign('label_billing_town', label_for('billing-town', "* " . __('Miasto')));

2
apps/frontend/modules/stUserData/templates/createFirstUserDataSuccess.php
View File

@@ -157,7 +157,7 @@ if($user_config->get('validate_phone')==1){
<?php $smarty->assign('input_address', input_tag('user_data_billing[address]', $userDataBilling->getAddress(), array('id'=>'address_billing', 'placeholder'=> '* '.__("Ulica nr domu / nr lokalu"), 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_address', input_tag('user_data_billing[address]', $userDataBilling->getAddress(), array('id'=>'address_billing', 'placeholder'=> '* '.__("Ulica nr domu / nr lokalu"), 'maxlength'=>'255', 'class'=>'form-control'))); ?>
<?php $smarty->assign('input_address_more', input_tag('user_data_billing[address_more]', $userDataBilling->getAddressMore(), array('id'=>'address_more_billing', 'placeholder'=>__("Adres ciąg dalszy"), 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_address_more', input_tag('user_data_billing[address_more]', $userDataBilling->getAddressMore(), array('id'=>'address_more_billing', 'placeholder'=>__("Adres ciąg dalszy"), 'maxlength'=>'255', 'class'=>'form-control'))); ?>
<?php $smarty->assign('input_region', input_tag('user_data_billing[region]', $userDataBilling->getRegion(), array('id'=>'region_billing', 'placeholder'=>__("Województwo"), 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_region', input_tag('user_data_billing[region]', $userDataBilling->getRegion(), array('id'=>'region_billing', 'placeholder'=>__("Województwo"), 'maxlength'=>'255', 'class'=>'form-control'))); ?>
<?php $smarty->assign('input_code', input_tag('user_data_billing[code]', $userDataBilling->getCode(), array('id'=>'code_billing', 'placeholder'=> '* '.__("Kod"), 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_code', input_tag('user_data_billing[code]', $userDataBilling->getCode(), array('id'=>'code_billing', 'placeholder'=> '* '.__("Kod pocztowy"), 'maxlength'=>'255', 'class'=>'form-control'))); ?>
<?php $smarty->assign('input_town', input_tag('user_data_billing[town]', $userDataBilling->getTown(), array('id'=>'town_billing', 'placeholder'=> '* '.__("Miasto"), 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_town', input_tag('user_data_billing[town]', $userDataBilling->getTown(), array('id'=>'town_billing', 'placeholder'=> '* '.__("Miasto"), 'maxlength'=>'255', 'class'=>'form-control'))); ?>
<?php $smarty->assign('select_country', object_select_tag($userDataBilling->getCountriesId(), 'getId', array('id'=>'billing_country', 'class'=>'form-control', 'related_class' => 'Countries', 'peer_method'=>"doSelectActive", 'control_name' => 'user_data_billing[country]'))) ?> <?php $smarty->assign('select_country', object_select_tag($userDataBilling->getCountriesId(), 'getId', array('id'=>'billing_country', 'class'=>'form-control', 'related_class' => 'Countries', 'peer_method'=>"doSelectActive", 'control_name' => 'user_data_billing[country]'))) ?>
<?php $smarty->assign('input_phone', input_tag('user_data_billing[phone]', $userDataBilling->getPhone(), array('id'=>'phone_billing', 'placeholder'=> $phone_label, 'maxlength'=>'255', 'class'=>'form-control'))); ?> <?php $smarty->assign('input_phone', input_tag('user_data_billing[phone]', $userDataBilling->getPhone(), array('id'=>'phone_billing', 'placeholder'=> $phone_label, 'maxlength'=>'255', 'class'=>'form-control'))); ?>

485
apps/frontend/modules/stUserData/templates/theme/default2/userdata_order_form.html
View File

@@ -1,485 +0,0 @@
<div id="order_form">
<div id="order_form_billing" class="roundies box_form">
<h3><b>5</b> {__ text="Dane płatnika"}</h3>
<div class="box_form_content">
{slot name="user_before_order_fieldset_billing" hidden="true"}{/slot}
<fieldset>
<div class="st_row">
<div class="st_field">
</div>
</div>
<div class="st_row">
<div style="float:left;margin-right: 10px;">{$radio_billing_customer_type1} <i class="gray_text">{$label_billing_customer_type1}</i></div>
<div style="float:left;">{$radio_billing_customer_type2} <i class="gray_text">{$label_billing_customer_type2}</i></div>
<div class="clear"></div>
</div>
<div id="company_billing_fields">
<div class="st_row row_company">
<div class="error_tooltip">
{if $error_billing_company!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_company}" alt="{$error_billing_company}">
{/if}
</div>
<div class="st_field">
{$label_billing_company}
{$input_billing_company}
</div>
</div>
<div class="st_row row_nip">
<div class="error_tooltip">
{if $error_billing_vat!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_vat}" alt="{$error_billing_vat}">
{/if}
</div>
<div class="st_field">
{$label_billing_nip}
{$input_billing_nip}
</div>
</div>
</div>
<div class="st_row row_full_name">
<div class="error_tooltip">
{if $error_billing_full_name!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_full_name}" alt="{$error_billing_full_name}">
{/if}
</div>
<div class="st_field">
{$label_billing_full_name}
{$input_billing_full_name}
</div>
</div>
<div class="st_row row_address">
<div class="error_tooltip">
{if $error_billing_address!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_address}" alt="{$error_billing_address}">
{/if}
</div>
<div class="st_field">
{$label_billing_address}
{$input_billing_address}
</div>
</div>
{if $show_address_more==1}
<div class="st_row row_address_more">
<div class="st_field">
{$label_billing_address_more}
{$input_billing_address_more}
</div>
</div>
{/if}
{if $show_region==1}
<div class="st_row row_region">
<div class="st_field">
{$label_billing_region}
{$input_billing_region}
</div>
</div>
{/if}
<div class="st_row row_code_town">
<div class="error_tooltip">
{if $error_billing_code_town!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_code_town}" alt="{$error_billing_code_town}">
{/if}
</div>
<div class="st_field left">
{$label_billing_code}
{$input_billing_code}
</div>
<div class="st_field left" style="margin-left:4px;">
{$label_billing_town}
{$input_billing_town}
</div>
<div class="clear"></div>
</div>
<div class="st_row row_country">
<div class="st_field">
{$select_billing_country}
</div>
</div>
{if $show_pesel==1}
<div class="st_row row_pesel">
<div class="st_field">
{$label_billing_pesel}
{$input_billing_pesel}
</div>
</div>
{/if}
<div class="st_row row_phone">
<div class="error_tooltip">
{if $error_billing_phone!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_phone}" alt="{$error_billing_phone}">
{/if}
</div>
<div class="st_field">
{$label_billing_phone}
{$input_billing_phone}
</div>
</div>
<div class="st_row row_email">
<div class="error_tooltip">
{if $error_billing_email!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_email}" alt="{$error_billing_email}">
{/if}
</div>
<div class="st_field left">
{$label_billing_email}
{$input_billing_email}
</div>
</div>
<div class="st_row row_email">
<div class="st_field left gray_text vertical-align-middle">
{$checkbox_create_account}
<span >{__ text="Załóż konto"}</span>
</div>
</div>
<div id="account_fields">
<div class="st_row row_password1">
<div class="error_tooltip">
{if $error_billing_password1!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_password1}" alt="{$error_billing_password1}">
{/if}
</div>
<div class="st_field">
{$label_billing_password1}
{$input_billing_password1}
</div>
</div>
<div class="st_row row_password2">
<div class="error_tooltip">
{if $error_billing_password2!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_password2}" alt="{$error_billing_password2}">
{/if}
</div>
<div class="st_field">
{$label_billing_password2}
{$input_billing_password2}
</div>
</div>
</div>
{if $show_invoice_request==1 && $auto_invoice_request!=1}
<div class="st_row">
<div class="st_field gray_text vertical-align-middle">
{$checkbox_invoice}
<span >{__ text="Chcę otrzymać fakturę vat"}</span>
</div>
</div>
{/if}
<div class="st_row row_email">
<div class="st_field left gray_text vertical-align-middle">
{$checkbox_different_delivery}
<span >{__ text="Inne dane wysyłkowe"}</span>
</div>
</div>
</fieldset>
</div>
<div id="order_form_delivery">
<h3><b>6</b> {__ text="Dane wysyłkowe"}</h3>
<div class="box_form_content">
<fieldset>
<div class="st_row">
<div style="float:left;">{$radio_delivery_customer_type1} <i class="gray_text">{$label_delivery_customer_type1}</i></div>
<div style="float:left;">{$radio_delivery_customer_type2} <i class="gray_text">{$label_delivery_customer_type2}</i></div>
<div class="clear"></div>
</div>
<div id="company_delivery_fields">
<div class="st_row row_company">
<div class="error_tooltip">
{if $error_delivery_company!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_delivery_company}" alt="{$error_delivery_company}">
{/if}
</div>
<div class="st_field">
{$label_delivery_company}
{$input_delivery_company}
</div>
</div>
</div>
<div class="st_row row_full_name">
<div class="error_tooltip">
{if $error_delivery_full_name!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_delivery_full_name}" alt="{$error_delivery_full_name}">
{/if}
</div>
<div class="st_field">
{$label_delivery_full_name}
{$input_delivery_full_name}
</div>
</div>
<div class="st_row row_address">
<div class="error_tooltip">
{if $error_delivery_address!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_delivery_address}" alt="{$error_delivery_address}">
{/if}
</div>
<div class="st_field">
{$label_delivery_address}
{$input_delivery_address}
</div>
</div>
{if $show_address_more==1}
<div class="st_row row_address_more">
<div class="st_field">
{$label_delivery_address_more}
{$input_delivery_address_more}
</div>
</div>
{/if}
{if $show_region==1}
<div class="st_row row_region">
<div class="st_field">
{$label_delivery_region}
{$input_delivery_region}
</div>
</div>
{/if}
<div class="st_row row_code_town">
<div class="error_tooltip">
{if $error_delivery_code_town!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_delivery_code_town}" alt="{$error_delivery_code_town}">
{/if}
</div>
<div class="st_field left">
{$label_delivery_code}
{$input_delivery_code}
</div>
<div class="st_field left" style="margin-left:4px;">
{$label_delivery_town}
{$input_delivery_town}
</div>
<div class="clear"></div>
</div>
<div class="st_row row_country">
<div class="st_field">
{$select_delivery_country}
</div>
</div>
<div class="st_row row_phone" style="margin-bottom:15px;">
<div class="error_tooltip">
{if $error_delivery_phone!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_delivery_phone}" alt="{$error_delivery_phone}">
{/if}
</div>
<div class="st_field">
{$label_delivery_phone}
{$input_delivery_phone}
</div>
</div>
</fieldset>
</div>
</div>
<div id="footer_form">
<fieldset>
{$description}
{$under_basket_socket}
<div class="st_row">
<div class="st_field vertical-align-middle {if $error_billing_privacy==1} red {/if}">
{$checkbox_privacy}
{$link_to_privacy}
</div>
</div>
{if isset($captcha_on)}
<div id="captcha_form" class="st_row">
<div style="margin-bottom: 2px;">
{$get_captcha}
</div>
<div class="error_tooltip">
{if $error_captcha!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_captcha}" alt="{$error_captcha}">
{/if}
</div>
<div class="st_field">
{$label_captcha}
{$input_captcha}
</div>
</div>
{/if}
<div class="st_row">
<div class="st_field gray_text vertical-align-middle">
<span>&nbsp;&nbsp;*&nbsp;{__ text="Pola wymagane"}</span>
</div>
</div>
</fieldset>
</div>
</div>
</div>
{$hidden_is_authenticated}
{literal}
<script type="text/javascript">
jQuery(function ($)
{
$(document).ready(function()
{
$(".error_tooltip img[title]").tooltip({
effect: 'slide',
opacity: 1,
position: 'bottom right',
offset: [15,4],
tipClass: 'alert_tooltip'
});
$("#password1_billing").pstrength();
$("label").inFieldLabels();
if($('#create_account').attr('checked'))
{
$("#account_fields").show();
}else{
$("#account_fields").hide();
}
$('#create_account').click(function(){
$("#account_fields").toggle();
});
if($('#different_delivery').attr('checked'))
{
$("#order_form_delivery").show();
}else{
$("#order_form_delivery").hide();
}
var countryId = $('#user_data_delivery_country').val();
stUser.updateAnonymousForms(countryId);
$('#different_delivery').click(function(){
$("#order_form_delivery").toggle();
});
if($('#user_data_billing_customer_type_2').attr('checked'))
{
$("#company_billing_fields").show();
$("#full_name_billing_label").text({/literal}"{$label_billing_full_name_text}"{literal});
}else{
$("#company_billing_fields").hide();
}
$('#user_data_billing_customer_type_1').click(function(){
$("#company_billing_fields").hide();
$("#full_name_billing_label").text({/literal}"* {$label_billing_full_name_text}"{literal});
});
$('#user_data_billing_customer_type_2').click(function(){
$("#company_billing_fields").show();
$("#full_name_billing_label").text({/literal}"{$label_billing_full_name_text}"{literal});
});
if($('#user_data_delivery_customer_type_2').attr('checked'))
{
$("#company_delivery_fields").show();
$("#full_name_delivery_label").text({/literal}"{$label_delivery_full_name_text}"{literal});
}else{
$("#company_delivery_fields").hide();
}
$('#user_data_delivery_customer_type_1').click(function(){
$("#company_delivery_fields").hide();
$("#full_name_delivery_label").text({/literal}"* {$label_delivery_full_name_text}"{literal});
});
$('#user_data_delivery_customer_type_2').click(function(){
$("#company_delivery_fields").show();
$("#full_name_delivery_label").text({/literal}"{$label_delivery_full_name_text}"{literal});
});
$('#user_data_billing_privacy').click(function(){
$("#captcha_form").toggle();
});
if($('#user_data_billing_privacy').attr('checked'))
{
$("#captcha_form").show()
}else{
$("#captcha_form").hide();
}
});
$('#user_data_billing_country').change(function() {
$('#delivery_country').change();
});
$('#user_data_delivery_country').change(function() {
$('#delivery_country').val($(this).val()).change();
});
$("#order_description_text").change(function () {
$("#order_description").val($("#order_description_text").val());
});
});
</script>
{/literal}

296
apps/frontend/modules/stUserData/templates/theme/default2/userdata_order_form_billing.html.bck
View File

@@ -1,296 +0,0 @@
<div class="box_form_content">
<fieldset>
<div class="st_row">
<div style="float:left;margin-right: 10px;">{$radio_billing_customer_type1} <i class="gray_text">{$label_billing_customer_type1}</i></div>
<div style="float:left;">{$radio_billing_customer_type2} <i class="gray_text">{$label_billing_customer_type2}</i></div>
<div class="clear"></div>
</div>
{if $is_authenticated && $external_account}
<div id="external_account">
<img src="/images/frontend/theme/default2/{$external_account}_icon.png" alt="{$external_account}" />
<a href="/user_data/userPanel" name="external_account">{$username}</a>
</div>
{/if}
<div id="company_billing_fields">
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_company!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_company}" alt="{$error_billing_company}">
{/if}
</div>
<div class="st_field">
{$label_billing_company}
{$input_billing_company}
</div>
</div>
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_vat!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_vat}" alt="{$error_billing_vat}">
{/if}
</div>
<div class="st_field">
{$label_billing_nip}
{$input_billing_nip}
</div>
</div>
</div>
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_full_name!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_full_name}" alt="{$error_billing_full_name}">
{/if}
</div>
<div class="st_field">
{$label_billing_full_name}
{$input_billing_full_name}
</div>
</div>
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_address!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_address}" alt="{$error_billing_address}">
{/if}
</div>
<div class="st_field">
{$label_billing_address}
{$input_billing_address}
</div>
</div>
{if $show_address_more==1}
<div class="st_row">
<div class="st_field">
{$label_billing_address_more}
{$input_billing_address_more}
</div>
</div>
{/if}
{if $show_region==1}
<div class="st_row">
<div class="st_field">
{$label_billing_region}
{$input_billing_region}
</div>
</div>
{/if}
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_code_town!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_code_town}" alt="{$error_billing_code_town}">
{/if}
</div>
<div class="st_field left">
{$label_billing_code}
{$input_billing_code}
</div>
<div class="st_field left" style="margin-left:4px;">
{$label_billing_town}
{$input_billing_town}
</div>
<div class="clear"></div>
</div>
<div class="st_row">
<div class="st_field">
{$select_billing_country}
</div>
</div>
{if $show_pesel==1}
<div class="st_row">
<div class="st_field">
{$label_billing_pesel}
{$input_billing_pesel}
</div>
</div>
{/if}
<div class="st_row">
<div class="error_tooltip">
{if $error_billing_phone!=""}
<img src="{image_path image='exclamation.png'}" title="{$error_billing_phone}" alt="{$error_billing_phone}">
{/if}
</div>
<div class="st_field">
{$label_billing_phone}
{$input_billing_phone}
</div>
</div>
{$description}
{$under_basket_socket}
</fieldset>
</div>
{literal}
<script type="text/javascript">
jQuery(function ($) {
$(document).ready(function () {
$(".error_tooltip img[title]").tooltip({
effect: 'slide',
opacity: 1,
position: 'bottom right',
offset: [15, 4],
tipClass: 'alert_tooltip'
});
$("label").inFieldLabels();
function equalHeight(group) {
tallest = 0;
group.each(function () {
$(this).css("height", "auto");
thisHeight = $(this).height();
if (thisHeight > tallest) {
tallest = thisHeight;
}
});
group.height(tallest);
}
if ($('#user_data_billing_customer_type_2').attr('checked')) {
$("#company_billing_fields").show();
$("#full_name_billing_label").text({/ literal} "{$label_billing_full_name_text}"{ literal });
}else {
$("#company_billing_fields").hide();
}
$('#user_data_billing_customer_type_1').click(function () {
$("#company_billing_fields").hide();
$("#full_name_billing_label").text({/ literal}"* {$label_billing_full_name_text}"{ literal });
equalHeight($(".data_frame"));
});
$('#user_data_billing_customer_type_2').click(function () {
$("#company_billing_fields").show();
$("#full_name_billing_label").text({/ literal}"{$label_billing_full_name_text}"{ literal });
equalHeight($(".data_frame"));
});
equalHeight($(".data_frame"));
$("#billing-company").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#company").val();
$(".row_company label").hide();
if (word_billing == word_delivery) {
$("#company").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-full_name").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#full_name").val();
$(".row_full_name label").hide();
if (word_billing == word_delivery) {
$("#full_name").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-address").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#address").val();
$(".row_address label").hide();
if (word_billing == word_delivery) {
$("#address").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-address-more").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#address-more").val();
$(".row_address-more label").hide();
if (word_billing == word_delivery) {
$("#address-more").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-code").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#code").val();
$("#label_code").hide();
if (word_billing == word_delivery) {
$("#code").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-town").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#town").val();
$("#label_town").hide();
if (word_billing == word_delivery) {
$("#town").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$("#billing-phone").change(function () {
var word_billing = $(this).get(0).defaultValue;
var word_delivery = $("#phone").val();
$(".row_phone label").hide();
if (word_billing == word_delivery) {
$("#phone").val($(this).val());
$(this).get(0).defaultValue = $(this).val();
return false;
}
});
$('#user_data_billing_country').change(function () {
$('#delivery_country').change();
});
$("#order_description_text").change(function () {
$("#order_description").val($("#order_description_text").val());
});
});
});
</script>
{/literal}

17
apps/frontend/modules/stUserData/templates/theme/mojszablon/userdata_order_form.html
View File

@@ -66,14 +66,14 @@
<div class="row"> <div class="row">
<div class="col-sm-6 col-lg-4"> <div class="col-sm-6 col-lg-5">
<div class="form-group {if $error_billing_code!=''}has-error{/if}"> <div class="form-group {if $error_billing_code!=''}has-error{/if}">
{if $error_billing_code!=""}<label class="control-label" for="code_billing">{$error_billing_code}</label>{/if} {if $error_billing_code!=""}<label class="control-label" for="code_billing">{$error_billing_code}</label>{/if}
{$input_billing_code} {$input_billing_code}
</div> </div>
</div> </div>
<div class="col-sm-6 col-lg-8"> <div class="col-sm-6 col-lg-7">
<div class="form-group {if $error_billing_town!=''}has-error{/if}"> <div class="form-group {if $error_billing_town!=''}has-error{/if}">
{if $error_billing_town!=""}<label class="control-label" for="town_billing">{$error_billing_town}</label>{/if} {if $error_billing_town!=""}<label class="control-label" for="town_billing">{$error_billing_town}</label>{/if}
{$input_billing_town} {$input_billing_town}
@@ -407,5 +407,18 @@
}); });
}); });
$(document).ready(function () {
$('#code_billing').on('input', function () {
let value = $(this).val().replace(/[^\d]/g, ''); // usuń wszystkie niedozwolone znaki
if (value.length > 5) value = value.substring(0, 5);
if (value.length > 2) {
value = value.substring(0, 2) + '-' + value.substring(2);
}
$(this).val(value);
});
});
</script> </script>
{/literal} {/literal}