Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 13193b1a

Von Tamino Steinert vor mehr als 2 Jahren hinzugefügt

  • ID 13193b1a843d41ae09a72e7c002148b2c0564ab8
  • Vorgänger 5cada5ab
  • Nachfolger 912e5eff

Reclamation: [FIX] überprüfe Felder bei use_direkt_delivery

Unterschiede anzeigen:

js/kivi.Reclamation.js
ns.purchase_reclamation_check_for_direct_delivery = function() {
if ($('#type').val() != 'sales_reclamation') {
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
return alert(kivi.t8("Error: This is not a sales reclamation."));
}
var empty = true;
......
shipto = $('#reclamation_shipto_id option:selected').text();
} else {
$('#shipto_inputs [id^="shipto"]').each(function(idx, elt) {
if (!empty) return true;
if (/^shipto_to_copy/.test($(elt).prop('id'))) return true;
if (/^shiptocp_gender/.test($(elt).prop('id'))) return true;
if (/^shiptocvar_/.test($(elt).prop('id'))) return true;
if (!empty) return;
if (/^shipto_to_copy/.test($(elt).prop('id'))) return;
if (/^shiptocp_gender/.test($(elt).prop('id'))) return;
if (/^shiptocvar_/.test($(elt).prop('id'))) return;
if ($(elt).val() !== '') {
empty = false;
return false;
return;
}
});
var shipto_elements = [];
......
shipto = shipto_elements.join('; ');
}
var use_it = false;
if (!empty) {
ns.direct_delivery_dialog(shipto);
} else {
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
ns.save('save_and_purchase_reclamation');
}
};
......
$('<input type="hidden" name="use_shipto">').appendTo('#reclamation_form').val('1');
}
kivi.submit_form_with_action($('#reclamation_form'), 'Reclamation/save_and_purchase_reclamation');
ns.save('save_and_purchase_reclamation');
};
ns.direct_delivery_dialog = function(shipto) {

Auch abrufbar als: Unified diff