fix(kasse): Anrede beim Express-Kauf wirklich keine Pflicht -- Inline-JS-Pruefung und Label
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:
@@ -77,13 +77,17 @@
|
||||
{/if}
|
||||
|
||||
{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}
|
||||
$('#send_order_button').click(function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
if ($('#guest_order_email').val() == '' ||
|
||||
$('#billing_honorific').val() == '' ||
|
||||
(($('#billing_honorific').val() == '0' || $('#billing_honorific').val() == 1) && ( $('#billing_firstname').val() == '' || $('#billing_surname').val() == '')) ||
|
||||
(!expressActive && $('#billing_honorific').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_zip_code').val() == '' ||
|
||||
$('#billing_city').val() == '' ||
|
||||
@@ -95,8 +99,9 @@
|
||||
}
|
||||
else if ($('#shipping_address_select').val() != -1 &&
|
||||
(
|
||||
$('#shipping_honorific').val() == '' ||
|
||||
(($('#shipping_honorific').val() == '0' || $('#shipping_honorific').val() == 1) && ( $('#shipping_firstname').val() == '' || $('#shipping_surname').val() == '')) ||
|
||||
(!expressActive && $('#shipping_honorific').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_zip_code').val() == '' ||
|
||||
$('#shipping_city').val() == '' ||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
{/if}
|
||||
<div class="consists_of_3">
|
||||
<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) *}
|
||||
<select id="billing_honorific" class="formatted {if !isset($express_active) || !$express_active}obligatory{/if}" name="billing[honorific]" title="">
|
||||
<option value="">Bitte wählen...</option>
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
<div class="shipping_address_form_container" style="display:none;">
|
||||
<div class="consists_of_3">
|
||||
<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="">
|
||||
<option value=""{if $personal_data.shipping.honorific == ''} selected{/if}>Bitte wählen...</option>
|
||||
<option value="0"{if $personal_data.shipping.honorific == 0} selected{/if}>Herr</option>
|
||||
|
||||
Reference in New Issue
Block a user