@colijnit/transaction 12.1.169 → 12.1.170

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.169";
-            this.publishDate = "22-11-2023 17:29:35";
+            this.symVer = "12.1.170";
+            this.publishDate = "23-11-2023 17:21:38";
         }
         return Version;
     }());
@@ -1281,6 +1281,7 @@
             this.allLinesSelectedForInvoice = new rxjs.Subject();
             this.transactionLineDraggedOver = new rxjs.Subject();
             this.orderConfirmationDropped = new rxjs.Subject();
+            this.showLoader = new rxjs.Subject();
         }
         return TransactionEventService;
     }());
@@ -2232,21 +2233,25 @@
     ]; };
 
     var TransactionConnectorAdapterService = /** @class */ (function () {
-        function TransactionConnectorAdapterService(_optionsService, _selectMultipleCacheService, _selectMultipleParameterizedCacheService, _errorService, _relationConnectorService, _articleConnectorService) {
+        function TransactionConnectorAdapterService(_optionsService, _selectMultipleCacheService, _selectMultipleParameterizedCacheService, _errorService, _relationConnectorService, _articleConnectorService, _transactionEventService) {
             this._optionsService = _optionsService;
             this._selectMultipleCacheService = _selectMultipleCacheService;
             this._selectMultipleParameterizedCacheService = _selectMultipleParameterizedCacheService;
             this._errorService = _errorService;
             this._relationConnectorService = _relationConnectorService;
             this._articleConnectorService = _articleConnectorService;
+            this._transactionEventService = _transactionEventService;
             this._boFactory = new businessObjectFactory.BusinessObjectFactory();
         }
         TransactionConnectorAdapterService.prototype.connect = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             this.connector = new transaction.Transaction(this._optionsService.settings);
+                            // @ts-ignore
+                            this._loaderSub = this.connector.showLoader.subscribe(function (value) { return _this._transactionEventService.showLoader.next(value); });
                             return [4 /*yield*/, this.connector.connect()];
                         case 1:
                             _a.sent();
@@ -2263,7 +2268,9 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.connector.logOut()];
+                        case 0:
+                            this._loaderSub.unsubscribe();
+                            return [4 /*yield*/, this.connector.logOut()];
                         case 1:
                             _a.sent();
                             return [2 /*return*/];
@@ -5548,12 +5555,12 @@
                 });
             });
         };
-        TransactionConnectorAdapterService.prototype.getPurchaseAdviceLines = function (filters, goodId) {
+        TransactionConnectorAdapterService.prototype.getPurchaseAdviceLines = function (filters, goodId, showLoader) {
             return __awaiter(this, void 0, void 0, function () {
                 var response;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.connector.getPurchaseAdviceLines(filters, goodId)];
+                        case 0: return [4 /*yield*/, this.connector.getPurchaseAdviceLines(filters, goodId, showLoader)];
                         case 1:
                             response = _a.sent();
                             if (response && response.validationResult && response.validationResult.success) {
@@ -6799,7 +6806,7 @@
         };
         return TransactionConnectorAdapterService;
     }());
-    TransactionConnectorAdapterService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TransactionConnectorAdapterService_Factory() { return new TransactionConnectorAdapterService(i0__namespace.ɵɵinject(TransactionSettingsService), i0__namespace.ɵɵinject(SelectMultipleCacheService), i0__namespace.ɵɵinject(SelectMultipleParameterizedCacheService), i0__namespace.ɵɵinject(ErrorService), i0__namespace.ɵɵinject(RelationConnectorService), i0__namespace.ɵɵinject(ArticleConnectorService)); }, token: TransactionConnectorAdapterService, providedIn: "root" });
+    TransactionConnectorAdapterService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function TransactionConnectorAdapterService_Factory() { return new TransactionConnectorAdapterService(i0__namespace.ɵɵinject(TransactionSettingsService), i0__namespace.ɵɵinject(SelectMultipleCacheService), i0__namespace.ɵɵinject(SelectMultipleParameterizedCacheService), i0__namespace.ɵɵinject(ErrorService), i0__namespace.ɵɵinject(RelationConnectorService), i0__namespace.ɵɵinject(ArticleConnectorService), i0__namespace.ɵɵinject(TransactionEventService)); }, token: TransactionConnectorAdapterService, providedIn: "root" });
     TransactionConnectorAdapterService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: "root"
@@ -6811,7 +6818,8 @@
         { type: SelectMultipleParameterizedCacheService },
         { type: ErrorService },
         { type: RelationConnectorService },
-        { type: ArticleConnectorService }
+        { type: ArticleConnectorService },
+        { type: TransactionEventService }
     ]; };
 
     var SelectSingleCacheService = /** @class */ (function () {
@@ -8015,11 +8023,11 @@
                 });
             });
         };
-        TransactionConnectorService.prototype.getPurchaseAdviceLines = function (filters, goodId) {
+        TransactionConnectorService.prototype.getPurchaseAdviceLines = function (filters, goodId, showLoader) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this._adapterService.getPurchaseAdviceLines(filters, goodId)];
+                        case 0: return [4 /*yield*/, this._adapterService.getPurchaseAdviceLines(filters, goodId, showLoader)];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -10068,6 +10076,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(TransactionBaseService.prototype, "transactionLocked", {
+            get: function () {
+                return this._alreadyLocked;
+            },
+            enumerable: false,
+            configurable: true
+        });
         TransactionBaseService.prototype.init = function (options, resetCurrentTransaction) {
             if (resetCurrentTransaction === void 0) { resetCurrentTransaction = true; }
             return __awaiter(this, void 0, void 0, function () {
@@ -10126,7 +10141,7 @@
                         case 1:
                             response = _a.sent();
                             if (response && response.isSuccess) {
-                                this._resetLockTransaction();
+                                this.resetLockTransaction();
                                 if (rememberTransaction) {
                                     this.rememberCurrentTransaction(response);
                                 }
@@ -10137,7 +10152,7 @@
             });
         };
         TransactionBaseService.prototype.commit = function () {
-            this._resetLockTransaction();
+            this.resetLockTransaction();
             return this.connector.commit();
         };
         TransactionBaseService.prototype.rollback = function (refresh) {
@@ -10150,7 +10165,7 @@
                         case 1:
                             rollbackSuccess = _a.sent();
                             if (rollbackSuccess) {
-                                this._resetLockTransaction();
+                                this.resetLockTransaction();
                                 if (refresh && this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.id) {
                                     this.getTransactionById(this.currentTransaction.transactionInfo.id);
                                 }
@@ -10420,6 +10435,10 @@
         TransactionBaseService.prototype.updateHeaderTransactionDepositPercentage = function (uuid, amount, saveTransaction) {
             return Promise.resolve(true);
         };
+        TransactionBaseService.prototype.resetLockTransaction = function () {
+            this._alreadyLocked = false;
+            this.transactionDirty = false;
+        };
         TransactionBaseService.prototype._handleBeforeRememberCurrentTransaction = function (transactionInfoResponse) {
             return Promise.resolve();
         };
@@ -10521,10 +10540,6 @@
         TransactionBaseService.prototype._isValidTransaction = function () {
             return !!(this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.id);
         };
-        TransactionBaseService.prototype._resetLockTransaction = function () {
-            this._alreadyLocked = false;
-            this.transactionDirty = false;
-        };
         TransactionBaseService.prototype._lockTransaction = function (transId, version) {
             return this.connector.lockTransactionById(transId, version);
         };
@@ -12868,11 +12883,11 @@
                 });
             });
         };
-        TransactionService.prototype.getPurchaseAdviceLines = function (filters, goodId) {
+        TransactionService.prototype.getPurchaseAdviceLines = function (filters, goodId, showLoader) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.connector.getPurchaseAdviceLines(filters, goodId)];
+                        case 0: return [4 /*yield*/, this.connector.getPurchaseAdviceLines(filters, goodId, showLoader)];
                         case 1: return [2 /*return*/, _a.sent()];
                     }
                 });
@@ -13990,7 +14005,8 @@
         };
         CheckoutComponent.prototype.ngOnDestroy = function () {
             this._subs.forEach(function (s) { return s.unsubscribe(); });
-            if (this._relationService.relationLocked) {
+            if (this._relationService.relationLocked || this.service.transactionLocked) {
+                this.service.resetLockTransaction();
                 this.service.rollback();
             }
         };
@@ -28231,6 +28247,14 @@
                     this.invoiceAddress = invAddress;
                 }
             }
+            this._transactionService.getDeliveryMethods().then(function (methods) {
+                if (_this.transaction && _this.transaction.transactionInfo && methods && methods.length > 0) {
+                    var currentMethod = methods.find(function (m) { return m.code === _this.transaction.transactionInfo.deliveryMethod; });
+                    if (currentMethod) {
+                        _this.deliveryMethod = currentMethod.description;
+                    }
+                }
+            });
         };
         CheckoutOverviewPaymentComponent.prototype.handlePayed = function () {
             var id = this._transactionService.currentTransaction.transactionInfo.transactionNr;
@@ -28241,7 +28265,7 @@
     CheckoutOverviewPaymentComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-checkout-overview-payment",
-                    template: "\n    <div class=\"checkout-label-column\">\n      <span class=\"label-description\" [textContent]=\"'SUMMARY' | localize\"></span>\n    </div>\n    <div class=\"checkout-overview-section\">\n      <span class=\"overview-section-title\" [textContent]=\"'YOUR_DATA' | localize\"></span>\n      <div class=\"two-column-grid\">\n        <div class=\"overview-address\">\n            <span class=\"overview-address-title\" [textContent]=\"'DELIVERY_ADDRESS' | localize\"></span>\n            <span [textContent]=\"relation.displayName\"></span>\n            <span [textContent]=\"deliveryAddress.displayAddress\"></span>\n            <span [textContent]=\"deliveryAddress.displayPostal\"></span>\n        </div>\n        <div class=\"overview-address\">\n          <span class=\"overview-address-title\" [textContent]=\"'INVOICE_ADDRESS' | localize\"></span>\n          <span [textContent]=\"relation.displayName\"></span>\n          <span [textContent]=\"invoiceAddress.displayAddress\"></span>\n          <span [textContent]=\"invoiceAddress.displayPostal\"></span>\n        </div>\n      </div>\n      <div class=\"overview-address\">\n        <span class=\"overview-address-title\" [textContent]=\"'CONTACT_DETAILS' | localize\"></span>\n        <span [textContent]=\"relation.primaryEmail\"></span>\n        <span [textContent]=\"relation.primaryPhoneNumber\"></span>\n      </div>\n      <div class=\"overview-section-change-link\">\n        <icon class=\"overview-section-change-icon\" [icon]=\"icons.ArrowPointRight\"></icon>\n        <div [textContent]=\"'CHANGE_DATA' | localize\" (click)=\"changeYourDataClick.emit()\"></div>\n      </div>\n      <span class=\"overview-section-title\" [textContent]=\"'DELIVERY' | localize\"></span>\n      <div class=\"overview-address\">\n        <div class=\"overview-row\">\n            <span [textContent]=\"'EXPECTED_DELIVERY_DATE' | localize | append:':'\"></span><span [textContent]=\"transaction.transactionInfo.deliveryDate | date:'dd MMM yyyy'\"></span>\n        </div>\n        <div class=\"overview-row\">\n            <span [textContent]=\"'DELIVERY_METHOD' | localize | append:':'\"></span><span [textContent]=\"transaction.transactionInfo.deliveryMethod\"></span>\n        </div>\n      </div>\n      <div class=\"overview-section-change-link\">\n        <icon class=\"overview-section-change-icon\" [icon]=\"icons.ArrowPointRight\"></icon>\n        <div [textContent]=\"'CHANGE_DATA' | localize\" (click)=\"changeDeliveryClick.emit()\"></div>\n      </div>\n    </div>\n    <div *ngIf=\"showPayment\" class=\"checkout-label-column\">\n      <span class=\"label-description\" [textContent]=\"'PAYMENT' | localize\"></span>\n    </div>\n    <co-payment *ngIf=\"showPayment\"\n      [transId]=\"transaction.transactionInfo.id\"\n      [branch]=\"transaction.transactionInfo.branch?.relationNr\"\n      [transactionUuid]=\"transaction.transactionInfo.uuid\"\n      [amount]=\"transaction.transactionInfo.depositAmount || transaction.transactionTotal.netAmount\"\n      [currencyId]=\"transaction.transactionInfo.currencyId\"\n      (payed)=\"handlePayed()\"\n    ></co-payment>\n  ",
+                    template: "\n    <div class=\"checkout-label-column\">\n      <span class=\"label-description\" [textContent]=\"'SUMMARY' | localize\"></span>\n    </div>\n    <div class=\"checkout-overview-section\">\n      <span class=\"overview-section-title\" [textContent]=\"'YOUR_DATA' | localize\"></span>\n      <div class=\"two-column-grid\">\n        <div class=\"overview-address\">\n            <span class=\"overview-address-title\" [textContent]=\"'DELIVERY_ADDRESS' | localize\"></span>\n            <span [textContent]=\"relation.displayName\"></span>\n            <span [textContent]=\"deliveryAddress.displayAddress\"></span>\n            <span [textContent]=\"deliveryAddress.displayPostal\"></span>\n        </div>\n        <div class=\"overview-address\">\n          <span class=\"overview-address-title\" [textContent]=\"'INVOICE_ADDRESS' | localize\"></span>\n          <span [textContent]=\"relation.displayName\"></span>\n          <span [textContent]=\"invoiceAddress.displayAddress\"></span>\n          <span [textContent]=\"invoiceAddress.displayPostal\"></span>\n        </div>\n      </div>\n      <div class=\"overview-address\">\n        <span class=\"overview-address-title\" [textContent]=\"'CONTACT_DETAILS' | localize\"></span>\n        <span [textContent]=\"relation.primaryEmail\"></span>\n        <span [textContent]=\"relation.primaryPhoneNumber\"></span>\n      </div>\n      <div class=\"overview-section-change-link\">\n        <icon class=\"overview-section-change-icon\" [icon]=\"icons.ArrowPointRight\"></icon>\n        <div [textContent]=\"'CHANGE_DATA' | localize\" (click)=\"changeYourDataClick.emit()\"></div>\n      </div>\n      <span class=\"overview-section-title\" [textContent]=\"'DELIVERY' | localize\"></span>\n      <div class=\"overview-address\">\n        <div class=\"overview-row\">\n            <span [textContent]=\"'EXPECTED_DELIVERY_DATE' | localize | append:':'\"></span><span [textContent]=\"transaction.transactionInfo.deliveryDate | date:'dd MMM yyyy'\"></span>\n        </div>\n        <div class=\"overview-row\">\n            <span [textContent]=\"'DELIVERY_METHOD' | localize | append:':'\"></span><span [textContent]=\"deliveryMethod\"></span>\n        </div>\n      </div>\n      <div class=\"overview-section-change-link\">\n        <icon class=\"overview-section-change-icon\" [icon]=\"icons.ArrowPointRight\"></icon>\n        <div [textContent]=\"'CHANGE_DATA' | localize\" (click)=\"changeDeliveryClick.emit()\"></div>\n      </div>\n    </div>\n    <div *ngIf=\"showPayment\" class=\"checkout-label-column\">\n      <span class=\"label-description\" [textContent]=\"'PAYMENT' | localize\"></span>\n    </div>\n    <co-payment *ngIf=\"showPayment\"\n      [transId]=\"transaction.transactionInfo.id\"\n      [branch]=\"transaction.transactionInfo.branch?.relationNr\"\n      [transactionUuid]=\"transaction.transactionInfo.uuid\"\n      [amount]=\"transaction.transactionInfo.depositAmount || transaction.transactionTotal.netAmount\"\n      [currencyId]=\"transaction.transactionInfo.currencyId\"\n      (payed)=\"handlePayed()\"\n    ></co-payment>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];