@colijnit/transaction 12.1.178 → 12.1.179

package/esm2015/lib/transaction-version.js

@@ -3,8 +3,8 @@ export class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.178";
-        this.publishDate = "27-12-2023 17:14:05";
+        this.symVer = "12.1.179";
+        this.publishDate = "28-12-2023 18:39:19";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcscUJBQXFCLENBQUM7SUFDN0MsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNzhcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyNy0xMi0yMDIzIDE3OjE0OjA1XCI7XG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcscUJBQXFCLENBQUM7SUFDN0MsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNzlcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyOC0xMi0yMDIzIDE4OjM5OjE5XCI7XG59Il19

package/fesm2015/colijnit-transaction.js

@@ -209,8 +209,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "12.1.178";
-        this.publishDate = "27-12-2023 17:14:05";
+        this.symVer = "12.1.179";
+        this.publishDate = "28-12-2023 18:39:19";
     }
 }
 
@@ -7443,7 +7443,7 @@ class TransactionBaseService extends BaseModuleService {
             if (response && response.isSuccess) {
                 this.resetLockTransaction();
                 if (rememberTransaction) {
-                    this.rememberCurrentTransaction(response);
+                    yield this.rememberCurrentTransaction(response);
                 }
             }
             return response;
@@ -7574,7 +7574,9 @@ class TransactionBaseService extends BaseModuleService {
             this.checkRefTransaction(); // todo: get from the header status
             if (this.getRelationOnRememberCurrentTransaction) {
                 if (this.currentTransaction.transactionInfo.relation && this.currentTransaction.transactionInfo.relation.relationId) {
-                    yield this._getRelation(this.currentTransaction.transactionInfo.relation);
+                    if (!this.relation || this.relation.relationId !== this.currentTransaction.transactionInfo.relation.relationId) {
+                        yield this._getRelation(this.currentTransaction.transactionInfo.relation);
+                    }
                 }
                 else {
                     this.relation = new CustomerFullObject();
@@ -7755,7 +7757,7 @@ class PendingReasonService extends TransactionBaseService {
                     return this.saveTransactionAndCommit(response);
                 }
                 else { // just replace transaction object
-                    this.rememberCurrentTransaction(response);
+                    yield this.rememberCurrentTransaction(response);
                 }
             }
             return success;
@@ -7787,7 +7789,7 @@ class PendingReasonService extends TransactionBaseService {
                 }
                 else {
                     if (rememberTransaction) {
-                        this.rememberCurrentTransaction(response);
+                        yield this.rememberCurrentTransaction(response);
                     }
                 }
             }
@@ -7908,9 +7910,9 @@ class PendingReasonService extends TransactionBaseService {
     _cancelArticle(uuid) {
         return __awaiter(this, void 0, void 0, function* () {
             this.cancelAddTransactionLine(uuid)
-                .then((response) => {
-                this.rememberCurrentTransaction(response);
-            });
+                .then((response) => __awaiter(this, void 0, void 0, function* () {
+                yield this.rememberCurrentTransaction(response);
+            }));
         });
     }
 }
@@ -8511,7 +8513,7 @@ class TransactionService extends PendingReasonService {
             }
             // await this.relationService.commit();
             if (!this.currentTransaction.transactionInfo.relation || (this.currentTransaction.transactionInfo.relation.relationId !== this.relation.relationId)) {
-                const response = yield this.addRelationToTransaction(this.relation.relationId);
+                yield this.addRelationToTransaction(this.relation.relationId);
             }
             return true;
         });
@@ -8527,17 +8529,14 @@ class TransactionService extends PendingReasonService {
     }
     createSalesOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                yield this.checkBranch();
-                if (!this.currentBranch) {
-                    return reject();
-                }
-                request.branchNr = this.currentBranch;
-                this.connector.createSalesOrder(request).then((response) => {
-                    this.rememberCurrentTransaction(response);
-                    resolve(true);
-                });
-            }));
+            yield this.checkBranch();
+            if (!this.currentBranch) {
+                return false;
+            }
+            request.branchNr = this.currentBranch;
+            const response = yield this.connector.createSalesOrder(request);
+            yield this.rememberCurrentTransaction(response);
+            return true;
         });
     }
     createCashRegisterOrder(request) {
@@ -8552,32 +8551,26 @@ class TransactionService extends PendingReasonService {
     }
     createPurchaseOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                yield this.checkBranch();
-                if (!this.currentBranch) {
-                    return reject();
-                }
-                request.branchNr = this.currentBranch;
-                this.connector.createPurchaseOrder(request).then((response) => {
-                    this.rememberCurrentTransaction(response);
-                    resolve(true);
-                });
-            }));
+            yield this.checkBranch();
+            if (!this.currentBranch) {
+                return false;
+            }
+            request.branchNr = this.currentBranch;
+            const response = yield this.connector.createPurchaseOrder(request);
+            yield this.rememberCurrentTransaction(response);
+            return true;
         });
     }
     createServiceOrder(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                yield this.checkBranch();
-                if (!this.currentBranch) {
-                    return reject();
-                }
-                request.branchNr = this.currentBranch;
-                this.connector.createServiceOrder(request).then((response) => {
-                    this.rememberCurrentTransaction(response);
-                    resolve(true);
-                });
-            }));
+            yield this.checkBranch();
+            if (!this.currentBranch) {
+                return false;
+            }
+            request.branchNr = this.currentBranch;
+            const response = yield this.connector.createServiceOrder(request);
+            yield this.rememberCurrentTransaction(response);
+            return true;
         });
     }
     createSalesQuotation(request) {
@@ -8588,10 +8581,10 @@ class TransactionService extends PendingReasonService {
                     return reject();
                 }
                 request.branchNr = this.currentBranch;
-                this.connector.createSalesQuotation(request).then((response) => {
-                    this.rememberCurrentTransaction(response);
+                this.connector.createSalesQuotation(request).then((response) => __awaiter(this, void 0, void 0, function* () {
+                    yield this.rememberCurrentTransaction(response);
                     resolve(true);
-                });
+                }));
             }));
         });
     }
@@ -8603,7 +8596,7 @@ class TransactionService extends PendingReasonService {
             }
             const response = yield this.connector.addRelationToTransaction(this.currentTransaction.transactionInfo.uuid, relationId);
             if (response) {
-                return this.handleHeaderOperationStatuses(response);
+                return yield this.handleHeaderOperationStatuses(response);
             }
             return false;
         });
@@ -9621,23 +9614,19 @@ class TransactionService extends PendingReasonService {
             if (!this.currentTransaction || !this.currentTransaction.transactionInfo || !this.currentTransaction.transactionInfo.transactionNr) {
                 const createMethod = this._createTransactionMethods.get(this.transactionKind);
                 if (createMethod) {
-                    return new Promise((resolve) => {
-                        const request = new CreateTransactionRequest();
-                        createMethod(request)
-                            .then(() => {
-                            resolve(true);
-                        })
-                            .catch(() => {
-                            resolve(false);
-                        });
-                    });
+                    const request = new CreateTransactionRequest();
+                    this.getRelationOnRememberCurrentTransaction = false;
+                    yield createMethod(request);
+                    this.getRelationOnRememberCurrentTransaction = true;
+                    return true;
                 }
                 else {
                     throwError("Failed to create transaction");
+                    return false;
                 }
             }
             else {
-                return Promise.resolve(true);
+                return true;
             }
         });
     }
@@ -9803,15 +9792,16 @@ class CheckoutComponent {
     }
     handleCreateTransaction(event) {
         return __awaiter(this, void 0, void 0, function* () {
-            let success = true;
-            if (this.stepper.activeStep === 0 && (yield this.handleRelationValidation())) {
-                success = yield this.service.saveRelation();
-                if (success && this.transactionType !== this.transKind.SalesQuotation) {
-                    yield this.service.updateHeaderTransactionDefinitive(this.service.currentTransaction.transactionInfo.uuid, true, true);
+            if (this.stepper.activeStep === 0) {
+                if (yield this.handleRelationValidation()) {
+                    // success = await this.service.saveRelation();
+                    if (this.transactionType !== this.transKind.SalesQuotation) {
+                        yield this.service.updateHeaderTransactionDefinitive(this.service.currentTransaction.transactionInfo.uuid, true, true);
+                    }
+                }
+                else {
+                    return;
                 }
-            }
-            if (!success) {
-                return;
             }
             const saveSuccess = yield this.service.saveTransactionAndCommit();
             if (saveSuccess) {
@@ -10132,7 +10122,8 @@ class RelationSuggestionsService {
             this._componentRef.destroy();
         }
     }
-    init() {
+    init(relationKind) {
+        this.relationKind = relationKind;
         if (this._componentRef) {
             this._componentRef.destroy();
         }
@@ -10247,7 +10238,7 @@ class CheckoutOverviewRelationEditComponent {
             if (this._relation instanceof CustomerFullObject) {
                 this.customerGroup = this._relation.customerGroup;
             }
-            this.address = this._relation.getFirstAddressOrCreateNew();
+            this.address = this._getFirstActiveAddressOrCreateNew(this._relation);
             if (this.address) {
                 this.deliveryAddressNawNr = this.address.nawNr;
                 this.deliveryAddressChange.emit(this.deliveryAddressNawNr);
@@ -10273,7 +10264,7 @@ class CheckoutOverviewRelationEditComponent {
     }
     ngOnInit() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._suggestionsService.init();
+            this._suggestionsService.init(this._relationKind);
             this._subs.push(this._screenConfigService.configSet.subscribe((configObjects) => {
                 if (configObjects && configObjects.length > 0) {
                     this.showPreferences = this._screenConfigService.getObjectConfigurationFor(this.cfgNames.RelationPreferencesHeader).immediatelyVisible();
@@ -10371,6 +10362,47 @@ class CheckoutOverviewRelationEditComponent {
         this.invoiceAddressNawNr = this.deliveryAddressNawNr;
         this.invoiceAddressChange.next(this.invoiceAddressNawNr);
     }
+    _getFirstActiveAddressOrCreateNew(relation) {
+        if (!relation.addresses || relation.addresses.length === 0) {
+            return this._createNewAddress(relation);
+        }
+        const firstAvailableAddress = this._getFirstAddress(relation, [
+            AddressType.DeliveryAddress,
+            AddressType.BillingAddress,
+            AddressType.VisitingAddress,
+            AddressType.MailingAddress,
+            AddressType.NursingAddress
+        ]);
+        return firstAvailableAddress ? firstAvailableAddress : this._createNewAddress(relation);
+    }
+    _getFirstAddress(relation, order = []) {
+        const activeAddresses = relation.addresses.filter(a => a.isActive);
+        const len = order.length;
+        for (let i = 0; i < len; i++) {
+            const address = this._getFirstAddressOfType(activeAddresses, order[i]);
+            if (address) {
+                return address;
+            }
+        }
+    }
+    _getFirstAddressOfType(addresses, type) {
+        if (addresses) {
+            const len = addresses.length;
+            for (let i = 0; i < len; i++) {
+                if (addresses[i].addressType === type) {
+                    return addresses[i];
+                }
+            }
+        }
+    }
+    _createNewAddress(relation) {
+        const address = new Address();
+        address.addressType = AddressType.DeliveryAddress;
+        address.startDate = new Date();
+        address.sequence = relation.getNextAddressSequence();
+        relation.addresses.push(address);
+        return address;
+    }
     _setCountryNameToAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
             if (address.countryId && !address.countryName) {
@@ -27638,7 +27670,7 @@ class TransactionHeaderPopupRelationComponent extends TransactionHeaderPopupBase
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.ngOnInit.call(this);
-            this._suggestionsService.init();
+            this._suggestionsService.init(this.relation.relationType);
             this.subs.push(this.screenConfigService.configSet.subscribe((configObjects) => {
                 if (configObjects && configObjects.length > 0) {
                     this.categories.length = 0;
@@ -41268,9 +41300,10 @@ TransactionLineGridModule.decorators = [
 ];
 
 class TransactionTagsComponent {
-    constructor(_transactionService, _transactionEventService, iconCacheService) {
+    constructor(_transactionService, _transactionEventService, _transactionConnectorService, iconCacheService) {
         this._transactionService = _transactionService;
         this._transactionEventService = _transactionEventService;
+        this._transactionConnectorService = _transactionConnectorService;
         this.iconCacheService = iconCacheService;
         this.icons = Icon;
         this.tags = [];
@@ -41279,11 +41312,17 @@ class TransactionTagsComponent {
         this.showEditTagsDialog = false;
         this._table = TableName.Transactions;
         this._subs = [];
+        this._loaded = false;
         this._subs.push(this._transactionEventService.transactionSet.subscribe((transaction) => {
             if (transaction && transaction.transactionInfo.id) {
                 this._key = transaction.transactionInfo.transactionNr.toString();
                 this._getJoinedTags();
             }
+        }), this._transactionConnectorService.connectionInitialized.subscribe((initialized) => {
+            if (initialized) {
+                this._loaded = true;
+                this._getJoinedTags();
+            }
         }));
     }
     showClass() {
@@ -41293,10 +41332,12 @@ class TransactionTagsComponent {
         this._subs.forEach(s => s.unsubscribe());
     }
     _getJoinedTags() {
-        this._transactionService.getJoinedTags(this._table, this._key).then((tags) => {
-            this.tags = tags;
-            this.editingTags = [...tags];
-        });
+        if (this._key && this._loaded && this.tags.length === 0) {
+            this._transactionService.getJoinedTags(this._table, this._key).then((tags) => {
+                this.tags = tags;
+                this.editingTags = [...tags];
+            });
+        }
     }
     _getTabCategory() {
         switch (this._transactionService.transactionKind) {
@@ -41362,6 +41403,7 @@ TransactionTagsComponent.decorators = [
 TransactionTagsComponent.ctorParameters = () => [
     { type: TransactionService },
     { type: TransactionEventService },
+    { type: TransactionConnectorService },
     { type: IconCacheService }
 ];
 TransactionTagsComponent.propDecorators = {