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

fix(UserData): use correct user id & nobody has no adresses

Übergeordneter 6de1f558
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
2 Merge Requests!97Next,!96Dev
Pipeline-Nr. 8107 bestanden
......@@ -399,12 +399,14 @@ 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.$AddressSelectBtn.disable();
return;
......
......@@ -55,6 +55,7 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
Binds: [
'toggleExtras',
'editCustomer',
'$setDataByUserId',
'$onInject',
'$fireChange',
'setValue'
......@@ -261,10 +262,10 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
if ('userId' in data && data.userId) {
if (this.$CustomerSelect) {
this.$setValues = true;
this.$CustomerSelect.addItem(data.userUuid);
this.$CustomerSelect.addItem(data.userId);
}
dataPromise = this.$setDataByUserId(data.userUuid);
dataPromise = this.$setDataByUserId(data.userId);
}
if ('addressId' in data && data.addressId) {
......@@ -345,8 +346,7 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
* @param {Object} [address] - Build address label based on given address; if omitted, use attributes.
* @return {string}
*/
$getAddressLabel(address)
{
$getAddressLabel: function(address) {
const getVal = (key) => {
let val;
......@@ -401,9 +401,9 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
$setDataByUserId: function(userId) {
this.$oldUserId = this.getAttribute('userId');
this.$clearData();
//this.$clearData();
this.setAttribute('userId', userId);
this.setAttribute('userUuid', userId);
if (this.$CustomerEdit) {
this.$CustomerEdit.setStyle('display', 'inline');
......@@ -574,6 +574,10 @@ define('package/quiqqer/erp/bin/backend/controls/userData/UserData', [
*/
getAddressList: function(User) {
return new Promise((resolve, reject) => {
if (!User.getId()) {
return resolve([]);
}
return User.getAddressList().then((result) => {
if (result.length) {
return resolve(result);
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren