tba-git/shop-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(kasse): Anrede beim Express-Kauf wirklich keine Pflicht -- Inline-JS-Pruefung und Label

Browse Source 
Die Aenderung vom 14.09. nahm nur die CSS-Klasse, die Absende-Pruefung in
content_cash_desk.tpl verlangte die Anrede weiter (Alert 'vollstaendige Rechnungsadresse').
Im Express-Weg sind stattdessen Vor- und Nachname Pflicht.
This commit is contained in:
Thomas Bartelt
2026-09-18 07:45:26 +02:00
parent f65901060f
commit 6f0036b819
3 changed files with 320 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/easyshop_advanced/templates/content_cash_desk.tpl
+9 -4
View File
@@ -77,13 +77,17 @@
{/if} {/if}
{if isset($guest_order) && $guest_order == 1} {if isset($guest_order) && $guest_order == 1}
{* 18.09.2026 -- Express-Kauf (PayPal liefert keine Anrede): Anrede ist keine Pflicht,
dafuer Vor- und Nachname immer. Sonst unveraendert. *}
var expressActive = {if isset($express_active) && $express_active}true{else}false{/if};
{literal} {literal}
$('#send_order_button').click(function(e) { $('#send_order_button').click(function(e) {
e.preventDefault(); e.preventDefault();
if ($('#guest_order_email').val() == '' || if ($('#guest_order_email').val() == '' ||
$('#billing_honorific').val() == '' || (!expressActive && $('#billing_honorific').val() == '') ||
(($('#billing_honorific').val() == '0' || $('#billing_honorific').val() == 1) && ( $('#billing_firstname').val() == '' || $('#billing_surname').val() == '')) || (expressActive && ( $('#billing_firstname').val() == '' || $('#billing_surname').val() == '')) ||
(!expressActive && ($('#billing_honorific').val() == '0' || $('#billing_honorific').val() == 1) && ( $('#billing_firstname').val() == '' || $('#billing_surname').val() == '')) ||
($('#billing_honorific').val() == 2 && $('#billing_company').val() == '') || ($('#billing_honorific').val() == 2 && $('#billing_company').val() == '') ||
$('#billing_zip_code').val() == '' || $('#billing_zip_code').val() == '' ||
$('#billing_city').val() == '' || $('#billing_city').val() == '' ||
@@ -95,8 +99,9 @@
} }
else if ($('#shipping_address_select').val() != -1 && else if ($('#shipping_address_select').val() != -1 &&
( (
$('#shipping_honorific').val() == '' || (!expressActive && $('#shipping_honorific').val() == '') ||
(($('#shipping_honorific').val() == '0' || $('#shipping_honorific').val() == 1) && ( $('#shipping_firstname').val() == '' || $('#shipping_surname').val() == '')) || (expressActive && ( $('#shipping_firstname').val() == '' || $('#shipping_surname').val() == '')) ||
(!expressActive && ($('#shipping_honorific').val() == '0' || $('#shipping_honorific').val() == 1) && ( $('#shipping_firstname').val() == '' || $('#shipping_surname').val() == '')) ||
($('#shipping_honorific').val() == 2 && $('#shipping_company').val() == '') || ($('#shipping_honorific').val() == 2 && $('#shipping_company').val() == '') ||
$('#shipping_zip_code').val() == '' || $('#shipping_zip_code').val() == '' ||
$('#shipping_city').val() == '' || $('#shipping_city').val() == '' ||
themes/easyshop_advanced/templates/content_cash_desk/address_invoice.tpl
+1 -1
View File
@@ -35,7 +35,7 @@
{/if} {/if}
<div class="consists_of_3"> <div class="consists_of_3">
<div style="width:213px;float:left;"> <div style="width:213px;float:left;">
<label class="obligatory">Anrede <span>*</span></label> <label class="{if !isset($express_active) || !$express_active}obligatory{/if}">Anrede{if !isset($express_active) || !$express_active} <span>*</span>{/if}</label>
{* Express-Kauf: der Anbieter liefert keine Anrede, darum hier keine Pflicht (14.09.2026) *} {* Express-Kauf: der Anbieter liefert keine Anrede, darum hier keine Pflicht (14.09.2026) *}
<select id="billing_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="billing[honorific]" title=""> <select id="billing_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="billing[honorific]" title="">
<option value="">Bitte w&auml;hlen...</option> <option value="">Bitte w&auml;hlen...</option>
themes/easyshop_advanced/templates/content_cash_desk/address_shipping.tpl
+1 -1
View File
@@ -39,7 +39,7 @@
<div class="shipping_address_form_container" style="display:none;"> <div class="shipping_address_form_container" style="display:none;">
<div class="consists_of_3"> <div class="consists_of_3">
<div style="width:213px;float:left;"> <div style="width:213px;float:left;">
<label class="obligatory">Anrede <span>*</span></label> <label class="{if !isset($express_active) || !$express_active}obligatory{/if}">Anrede{if !isset($express_active) || !$express_active} <span>*</span>{/if}</label>
<select id="shipping_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="shipping[honorific]" title=""> <select id="shipping_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="shipping[honorific]" title="">
<option value=""{if $personal_data.shipping.honorific == ''} selected{/if}>Bitte w&auml;hlen...</option> <option value=""{if $personal_data.shipping.honorific == ''} selected{/if}>Bitte w&auml;hlen...</option>
<option value="0"{if $personal_data.shipping.honorific == 0} selected{/if}>Herr</option> <option value="0"{if $personal_data.shipping.honorific == 0} selected{/if}>Herr</option>