Skip to content
Code-Schnipsel Gruppen Projekte
Bestätigt Commit 35c41987 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: same user do not delete delivery address

Übergeordneter d63e7756
No related branches found
No related tags found
3 Merge Requests!140Update 'next-4.x' with latest changes from 'main',!100Next 3.x,!99Dev archive
......@@ -173,10 +173,15 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
this.$userId = this.$Customer.getValue();
this.$Customer.addEvent('onChange', () => {
// same user needs no change
if (this.$Customer.getValue() === this.$userId) {
return;
}
this.$userId = this.$Customer.getValue();
this.$getDeliveryAddressFromUser().then((result) => {
if (!result) {
if (!result) {
this.$Checked.checked = false;
this.$checkBoxChange();
return;
......@@ -314,8 +319,8 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
firstname: '',
lastname: ''
};
Object.merge(Address, value);
this.$displayAddressData(Address);
this.$Checked.checked = true;
......@@ -384,15 +389,13 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
* @param {DocumentEvent} [event]
*/
$checkBoxChange: function(event) {
const self = this,
Checkbox = this.getElm().getElement('[name="differentDeliveryAddress"]'),
closables = this.getElm().getElements('.closable');
const closables = this.getElm().getElements('.closable');
if (event) {
event.stop();
}
if (!Checkbox) {
if (!this.$Checked) {
return;
}
......@@ -411,16 +414,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
}
if (!this.$userId) {
Checkbox.checked = false;
/*
QUI.getMessageHandler().then(function(MH) {
MH.addInformation(
QUILocale.get('quiqqer/erp', 'controls.DeliveryAddress.msg.select_customer'),
self.$Customer.getElm()
);
});
*/
this.$Checked.checked = false;
this.$AddressSelectBtn.disable();
return;
......@@ -428,7 +422,7 @@ define('package/quiqqer/erp/bin/backend/controls/DeliveryAddress', [
this.$AddressSelectBtn.enable();
if (Checkbox.checked) {
if (this.$Checked.checked) {
closables.setStyle('display', null);
return;
}
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren