@colijnit/transaction 12.1.178 → 12.1.179

package/bundles/colijnit-transaction.umd.js

@@ -31,8 +31,8 @@
         function Version() {
             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";
         }
         return Version;
     }());
@@ -10309,13 +10309,14 @@
                             })];
                         case 1:
                             response = _a.sent();
-                            if (response && response.isSuccess) {
-                                this.resetLockTransaction();
-                                if (rememberTransaction) {
-                                    this.rememberCurrentTransaction(response);
-                                }
-                            }
-                            return [2 /*return*/, response];
+                            if (!(response && response.isSuccess)) return [3 /*break*/, 3];
+                            this.resetLockTransaction();
+                            if (!rememberTransaction) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3: return [2 /*return*/, response];
                     }
                 });
             });
@@ -10514,21 +10515,23 @@
                             this._setAmount();
                             this._checkHeaderStatus();
                             this.checkRefTransaction(); // todo: get from the header status
-                            if (!this.getRelationOnRememberCurrentTransaction) return [3 /*break*/, 4];
-                            if (!(this.currentTransaction.transactionInfo.relation && this.currentTransaction.transactionInfo.relation.relationId)) return [3 /*break*/, 3];
+                            if (!this.getRelationOnRememberCurrentTransaction) return [3 /*break*/, 5];
+                            if (!(this.currentTransaction.transactionInfo.relation && this.currentTransaction.transactionInfo.relation.relationId)) return [3 /*break*/, 4];
+                            if (!(!this.relation || this.relation.relationId !== this.currentTransaction.transactionInfo.relation.relationId)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this._getRelation(this.currentTransaction.transactionInfo.relation)];
                         case 2:
                             _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
+                            _a.label = 3;
+                        case 3: return [3 /*break*/, 5];
+                        case 4:
                             this.relation = new customerFullObject_bo.CustomerFullObject();
                             this.relation.type = relationNameKind_enum.RelationNameKind.Private;
-                            _a.label = 4;
-                        case 4:
+                            _a.label = 5;
+                        case 5:
                             this.transactionUpdated.next(this.currentTransaction);
                             this.transactionEventService.transactionSet.next(this.currentTransaction);
                             return [4 /*yield*/, this._handleAfterRememberCurrentTransaction()];
-                        case 5:
+                        case 6:
                             _a.sent();
                             return [2 /*return*/];
                     }
@@ -10752,15 +10755,15 @@
                             return [3 /*break*/, 1];
                         case 5:
                             hasPendingReasons = response.headerOperationStatuses.filter(function (los) { return los.pendingReason !== "REASON_NONE"; }).length > 0;
-                            if (!hasPendingReasons) {
-                                if ((this.autoSave && saveTransaction) || overrideSave) {
-                                    return [2 /*return*/, this.saveTransactionAndCommit(response)];
-                                }
-                                else { // just replace transaction object
-                                    this.rememberCurrentTransaction(response);
-                                }
-                            }
-                            return [2 /*return*/, success];
+                            if (!!hasPendingReasons) return [3 /*break*/, 8];
+                            if (!((this.autoSave && saveTransaction) || overrideSave)) return [3 /*break*/, 6];
+                            return [2 /*return*/, this.saveTransactionAndCommit(response)];
+                        case 6: // just replace transaction object
+                        return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 7:
+                            _b.sent();
+                            _b.label = 8;
+                        case 8: return [2 /*return*/, success];
                     }
                 });
             });
@@ -10807,25 +10810,24 @@
                             return [3 /*break*/, 1];
                         case 4:
                             hasPendingReasons = response.lineOperationStatuses.filter(function (los) { return los.pendingReason !== "REASON_NONE"; }).length > 0;
-                            if (!hasPendingReasons) {
-                                if (this.transactionLineAdded) {
-                                    try {
-                                        this.transactionEventService.transactionLineAdded.next(response.lineOperationStatuses[0].lineNr);
-                                    }
-                                    catch (e) {
-                                    }
-                                    this.transactionLineAdded = false;
+                            if (!!hasPendingReasons) return [3 /*break*/, 7];
+                            if (this.transactionLineAdded) {
+                                try {
+                                    this.transactionEventService.transactionLineAdded.next(response.lineOperationStatuses[0].lineNr);
                                 }
-                                if (this.autoSave && saveTransaction) {
-                                    return [2 /*return*/, this.saveTransactionAndCommit(response)];
-                                }
-                                else {
-                                    if (rememberTransaction) {
-                                        this.rememberCurrentTransaction(response);
-                                    }
+                                catch (e) {
                                 }
+                                this.transactionLineAdded = false;
                             }
-                            return [2 /*return*/, success];
+                            if (!(this.autoSave && saveTransaction)) return [3 /*break*/, 5];
+                            return [2 /*return*/, this.saveTransactionAndCommit(response)];
+                        case 5:
+                            if (!rememberTransaction) return [3 /*break*/, 7];
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 6:
+                            _a.sent();
+                            _a.label = 7;
+                        case 7: return [2 /*return*/, success];
                     }
                 });
             });
@@ -11026,9 +11028,16 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     this.cancelAddTransactionLine(uuid)
-                        .then(function (response) {
-                        _this.rememberCurrentTransaction(response);
-                    });
+                        .then(function (response) { return __awaiter(_this, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                                case 1:
+                                    _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); });
                     return [2 /*return*/];
                 });
             });
@@ -11983,7 +11992,7 @@
         };
         TransactionService.prototype.saveRelation = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, locked, _b, response;
+                var _a, locked, _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -12011,7 +12020,7 @@
                             if (!(!this.currentTransaction.transactionInfo.relation || (this.currentTransaction.transactionInfo.relation.relationId !== this.relation.relationId))) return [3 /*break*/, 8];
                             return [4 /*yield*/, this.addRelationToTransaction(this.relation.relationId)];
                         case 7:
-                            response = _c.sent();
+                            _c.sent();
                             _c.label = 8;
                         case 8: return [2 /*return*/, true];
                     }
@@ -12029,27 +12038,24 @@
         };
         TransactionService.prototype.createSalesOrder = function (request) {
             return __awaiter(this, void 0, void 0, function () {
-                var _this = this;
+                var response;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.checkBranch()];
-                                    case 1:
-                                        _a.sent();
-                                        if (!this.currentBranch) {
-                                            return [2 /*return*/, reject()];
-                                        }
-                                        request.branchNr = this.currentBranch;
-                                        this.connector.createSalesOrder(request).then(function (response) {
-                                            _this.rememberCurrentTransaction(response);
-                                            resolve(true);
-                                        });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.checkBranch()];
+                        case 1:
+                            _a.sent();
+                            if (!this.currentBranch) {
+                                return [2 /*return*/, false];
+                            }
+                            request.branchNr = this.currentBranch;
+                            return [4 /*yield*/, this.connector.createSalesOrder(request)];
+                        case 2:
+                            response = _a.sent();
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 3:
+                            _a.sent();
+                            return [2 /*return*/, true];
+                    }
                 });
             });
         };
@@ -12079,53 +12085,47 @@
         };
         TransactionService.prototype.createPurchaseOrder = function (request) {
             return __awaiter(this, void 0, void 0, function () {
-                var _this = this;
+                var response;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.checkBranch()];
-                                    case 1:
-                                        _a.sent();
-                                        if (!this.currentBranch) {
-                                            return [2 /*return*/, reject()];
-                                        }
-                                        request.branchNr = this.currentBranch;
-                                        this.connector.createPurchaseOrder(request).then(function (response) {
-                                            _this.rememberCurrentTransaction(response);
-                                            resolve(true);
-                                        });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.checkBranch()];
+                        case 1:
+                            _a.sent();
+                            if (!this.currentBranch) {
+                                return [2 /*return*/, false];
+                            }
+                            request.branchNr = this.currentBranch;
+                            return [4 /*yield*/, this.connector.createPurchaseOrder(request)];
+                        case 2:
+                            response = _a.sent();
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 3:
+                            _a.sent();
+                            return [2 /*return*/, true];
+                    }
                 });
             });
         };
         TransactionService.prototype.createServiceOrder = function (request) {
             return __awaiter(this, void 0, void 0, function () {
-                var _this = this;
+                var response;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, this.checkBranch()];
-                                    case 1:
-                                        _a.sent();
-                                        if (!this.currentBranch) {
-                                            return [2 /*return*/, reject()];
-                                        }
-                                        request.branchNr = this.currentBranch;
-                                        this.connector.createServiceOrder(request).then(function (response) {
-                                            _this.rememberCurrentTransaction(response);
-                                            resolve(true);
-                                        });
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.checkBranch()];
+                        case 1:
+                            _a.sent();
+                            if (!this.currentBranch) {
+                                return [2 /*return*/, false];
+                            }
+                            request.branchNr = this.currentBranch;
+                            return [4 /*yield*/, this.connector.createServiceOrder(request)];
+                        case 2:
+                            response = _a.sent();
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 3:
+                            _a.sent();
+                            return [2 /*return*/, true];
+                    }
                 });
             });
         };
@@ -12144,10 +12144,17 @@
                                             return [2 /*return*/, reject()];
                                         }
                                         request.branchNr = this.currentBranch;
-                                        this.connector.createSalesQuotation(request).then(function (response) {
-                                            _this.rememberCurrentTransaction(response);
-                                            resolve(true);
-                                        });
+                                        this.connector.createSalesQuotation(request).then(function (response) { return __awaiter(_this, void 0, void 0, function () {
+                                            return __generator(this, function (_a) {
+                                                switch (_a.label) {
+                                                    case 0: return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                                                    case 1:
+                                                        _a.sent();
+                                                        resolve(true);
+                                                        return [2 /*return*/];
+                                                }
+                                            });
+                                        }); });
                                         return [2 /*return*/];
                                 }
                             });
@@ -12169,10 +12176,10 @@
                             return [4 /*yield*/, this.connector.addRelationToTransaction(this.currentTransaction.transactionInfo.uuid, relationId)];
                         case 2:
                             response = _a.sent();
-                            if (response) {
-                                return [2 /*return*/, this.handleHeaderOperationStatuses(response)];
-                            }
-                            return [2 /*return*/, false];
+                            if (!response) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.handleHeaderOperationStatuses(response)];
+                        case 3: return [2 /*return*/, _a.sent()];
+                        case 4: return [2 /*return*/, false];
                     }
                 });
             });
@@ -13970,30 +13977,27 @@
         };
         TransactionService.prototype._checkAndCreateTransaction = function () {
             return __awaiter(this, void 0, void 0, function () {
-                var createMethod_1;
+                var createMethod, request;
                 return __generator(this, function (_a) {
-                    if (!this.currentTransaction || !this.currentTransaction.transactionInfo || !this.currentTransaction.transactionInfo.transactionNr) {
-                        createMethod_1 = this._createTransactionMethods.get(this.transactionKind);
-                        if (createMethod_1) {
-                            return [2 /*return*/, new Promise(function (resolve) {
-                                    var request = new createTransactionRequest.CreateTransactionRequest();
-                                    createMethod_1(request)
-                                        .then(function () {
-                                        resolve(true);
-                                    })
-                                        .catch(function () {
-                                        resolve(false);
-                                    });
-                                })];
-                        }
-                        else {
+                    switch (_a.label) {
+                        case 0:
+                            if (!(!this.currentTransaction || !this.currentTransaction.transactionInfo || !this.currentTransaction.transactionInfo.transactionNr)) return [3 /*break*/, 4];
+                            createMethod = this._createTransactionMethods.get(this.transactionKind);
+                            if (!createMethod) return [3 /*break*/, 2];
+                            request = new createTransactionRequest.CreateTransactionRequest();
+                            this.getRelationOnRememberCurrentTransaction = false;
+                            return [4 /*yield*/, createMethod(request)];
+                        case 1:
+                            _a.sent();
+                            this.getRelationOnRememberCurrentTransaction = true;
+                            return [2 /*return*/, true];
+                        case 2:
                             rxjs.throwError("Failed to create transaction");
-                        }
-                    }
-                    else {
-                        return [2 /*return*/, Promise.resolve(true)];
+                            return [2 /*return*/, false];
+                        case 3: return [3 /*break*/, 5];
+                        case 4: return [2 /*return*/, true];
+                        case 5: return [2 /*return*/];
                     }
-                    return [2 /*return*/];
                 });
             });
         };
@@ -14176,34 +14180,24 @@
         };
         CheckoutComponent.prototype.handleCreateTransaction = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                var success, _a, saveSuccess;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                var saveSuccess;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            success = true;
-                            _a = this.stepper.activeStep === 0;
-                            if (!_a) return [3 /*break*/, 2];
+                            if (!(this.stepper.activeStep === 0)) return [3 /*break*/, 5];
                             return [4 /*yield*/, this.handleRelationValidation()];
                         case 1:
-                            _a = (_b.sent());
-                            _b.label = 2;
-                        case 2:
-                            if (!_a) return [3 /*break*/, 5];
-                            return [4 /*yield*/, this.service.saveRelation()];
-                        case 3:
-                            success = _b.sent();
-                            if (!(success && this.transactionType !== this.transKind.SalesQuotation)) return [3 /*break*/, 5];
+                            if (!_a.sent()) return [3 /*break*/, 4];
+                            if (!(this.transactionType !== this.transKind.SalesQuotation)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.service.updateHeaderTransactionDefinitive(this.service.currentTransaction.transactionInfo.uuid, true, true)];
-                        case 4:
-                            _b.sent();
-                            _b.label = 5;
-                        case 5:
-                            if (!success) {
-                                return [2 /*return*/];
-                            }
-                            return [4 /*yield*/, this.service.saveTransactionAndCommit()];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3: return [3 /*break*/, 5];
+                        case 4: return [2 /*return*/];
+                        case 5: return [4 /*yield*/, this.service.saveTransactionAndCommit()];
                         case 6:
-                            saveSuccess = _b.sent();
+                            saveSuccess = _a.sent();
                             if (saveSuccess) {
                                 this.handleTransactionFinished(this.service.currentTransaction.transactionInfo.transactionNr);
                             }
@@ -14516,8 +14510,9 @@
                 this._componentRef.destroy();
             }
         };
-        RelationSuggestionsService.prototype.init = function () {
+        RelationSuggestionsService.prototype.init = function (relationKind) {
             var _this = this;
+            this.relationKind = relationKind;
             if (this._componentRef) {
                 this._componentRef.destroy();
             }
@@ -14642,7 +14637,7 @@
                     if (this._relation instanceof customerFullObject_bo.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);
@@ -14674,7 +14669,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_a) {
-                    this._suggestionsService.init();
+                    this._suggestionsService.init(this._relationKind);
                     this._subs.push(this._screenConfigService.configSet.subscribe(function (configObjects) {
                         if (configObjects && configObjects.length > 0) {
                             _this.showPreferences = _this._screenConfigService.getObjectConfigurationFor(_this.cfgNames.RelationPreferencesHeader).immediatelyVisible();
@@ -14784,6 +14779,48 @@
             this.invoiceAddressNawNr = this.deliveryAddressNawNr;
             this.invoiceAddressChange.next(this.invoiceAddressNawNr);
         };
+        CheckoutOverviewRelationEditComponent.prototype._getFirstActiveAddressOrCreateNew = function (relation) {
+            if (!relation.addresses || relation.addresses.length === 0) {
+                return this._createNewAddress(relation);
+            }
+            var firstAvailableAddress = this._getFirstAddress(relation, [
+                addressType_enum.AddressType.DeliveryAddress,
+                addressType_enum.AddressType.BillingAddress,
+                addressType_enum.AddressType.VisitingAddress,
+                addressType_enum.AddressType.MailingAddress,
+                addressType_enum.AddressType.NursingAddress
+            ]);
+            return firstAvailableAddress ? firstAvailableAddress : this._createNewAddress(relation);
+        };
+        CheckoutOverviewRelationEditComponent.prototype._getFirstAddress = function (relation, order) {
+            if (order === void 0) { order = []; }
+            var activeAddresses = relation.addresses.filter(function (a) { return a.isActive; });
+            var len = order.length;
+            for (var i = 0; i < len; i++) {
+                var address = this._getFirstAddressOfType(activeAddresses, order[i]);
+                if (address) {
+                    return address;
+                }
+            }
+        };
+        CheckoutOverviewRelationEditComponent.prototype._getFirstAddressOfType = function (addresses, type) {
+            if (addresses) {
+                var len = addresses.length;
+                for (var i = 0; i < len; i++) {
+                    if (addresses[i].addressType === type) {
+                        return addresses[i];
+                    }
+                }
+            }
+        };
+        CheckoutOverviewRelationEditComponent.prototype._createNewAddress = function (relation) {
+            var address = new address_bo.Address();
+            address.addressType = addressType_enum.AddressType.DeliveryAddress;
+            address.startDate = new Date();
+            address.sequence = relation.getNextAddressSequence();
+            relation.addresses.push(address);
+            return address;
+        };
         CheckoutOverviewRelationEditComponent.prototype._setCountryNameToAddress = function (address) {
             return __awaiter(this, void 0, void 0, function () {
                 var country;
@@ -30063,7 +30100,7 @@
                 var _this = this;
                 return __generator(this, function (_a) {
                     _super.ngOnInit.call(this);
-                    this._suggestionsService.init();
+                    this._suggestionsService.init(this.relation.relationType);
                     this.subs.push(this.screenConfigService.configSet.subscribe(function (configObjects) {
                         if (configObjects && configObjects.length > 0) {
                             _this.categories.length = 0;
@@ -41778,10 +41815,11 @@
     ];
 
     var TransactionTagsComponent = /** @class */ (function () {
-        function TransactionTagsComponent(_transactionService, _transactionEventService, iconCacheService) {
+        function TransactionTagsComponent(_transactionService, _transactionEventService, _transactionConnectorService, iconCacheService) {
             var _this = this;
             this._transactionService = _transactionService;
             this._transactionEventService = _transactionEventService;
+            this._transactionConnectorService = _transactionConnectorService;
             this.iconCacheService = iconCacheService;
             this.icons = Icon;
             this.tags = [];
@@ -41790,11 +41828,17 @@
             this.showEditTagsDialog = false;
             this._table = tableName_enum.TableName.Transactions;
             this._subs = [];
+            this._loaded = false;
             this._subs.push(this._transactionEventService.transactionSet.subscribe(function (transaction) {
                 if (transaction && transaction.transactionInfo.id) {
                     _this._key = transaction.transactionInfo.transactionNr.toString();
                     _this._getJoinedTags();
                 }
+            }), this._transactionConnectorService.connectionInitialized.subscribe(function (initialized) {
+                if (initialized) {
+                    _this._loaded = true;
+                    _this._getJoinedTags();
+                }
             }));
         }
         TransactionTagsComponent.prototype.showClass = function () {
@@ -41805,10 +41849,12 @@
         };
         TransactionTagsComponent.prototype._getJoinedTags = function () {
             var _this = this;
-            this._transactionService.getJoinedTags(this._table, this._key).then(function (tags) {
-                _this.tags = tags;
-                _this.editingTags = __spreadArray([], __read(tags));
-            });
+            if (this._key && this._loaded && this.tags.length === 0) {
+                this._transactionService.getJoinedTags(this._table, this._key).then(function (tags) {
+                    _this.tags = tags;
+                    _this.editingTags = __spreadArray([], __read(tags));
+                });
+            }
         };
         TransactionTagsComponent.prototype._getTabCategory = function () {
             switch (this._transactionService.transactionKind) {
@@ -41870,6 +41916,7 @@
     TransactionTagsComponent.ctorParameters = function () { return [
         { type: TransactionService },
         { type: TransactionEventService },
+        { type: TransactionConnectorService },
         { type: IconCacheService }
     ]; };
     TransactionTagsComponent.propDecorators = {