@colijnit/transaction 12.1.169 → 12.1.170

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.169";
-        this.publishDate = "22-11-2023 17:29:35";
+        this.symVer = "12.1.170";
+        this.publishDate = "23-11-2023 17:21:38";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcscUJBQXFCLENBQUM7SUFDN0MsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNjlcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMi0xMS0yMDIzIDE3OjI5OjM1XCI7XG59Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcscUJBQXFCLENBQUM7SUFDN0MsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMTIuMS4xNzBcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMy0xMS0yMDIzIDE3OjIxOjM4XCI7XG59Il19

package/fesm2015/colijnit-transaction.js

@@ -205,8 +205,8 @@ class Version {
     constructor() {
         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";
     }
 }
 
@@ -1026,6 +1026,7 @@ class TransactionEventService {
         this.allLinesSelectedForInvoice = new Subject();
         this.transactionLineDraggedOver = new Subject();
         this.orderConfirmationDropped = new Subject();
+        this.showLoader = new Subject();
     }
 }
 TransactionEventService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionEventService_Factory() { return new TransactionEventService(); }, token: TransactionEventService, providedIn: "root" });
@@ -1799,18 +1800,21 @@ ArticleConnectorService.ctorParameters = () => [
 ];
 
 class TransactionConnectorAdapterService {
-    constructor(_optionsService, _selectMultipleCacheService, _selectMultipleParameterizedCacheService, _errorService, _relationConnectorService, _articleConnectorService) {
+    constructor(_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();
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             this.connector = new Transaction(this._optionsService.settings);
+            // @ts-ignore
+            this._loaderSub = this.connector.showLoader.subscribe((value) => this._transactionEventService.showLoader.next(value));
             yield this.connector.connect();
             this._relationConnectorService.connect(this._optionsService.settings);
             this._articleConnectorService.connect(this._optionsService.settings);
@@ -1820,6 +1824,7 @@ class TransactionConnectorAdapterService {
     }
     logOut() {
         return __awaiter(this, void 0, void 0, function* () {
+            this._loaderSub.unsubscribe();
             yield this.connector.logOut();
         });
     }
@@ -4004,9 +4009,9 @@ class TransactionConnectorAdapterService {
             }
         });
     }
-    getPurchaseAdviceLines(filters, goodId) {
+    getPurchaseAdviceLines(filters, goodId, showLoader) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.connector.getPurchaseAdviceLines(filters, goodId);
+            const response = yield this.connector.getPurchaseAdviceLines(filters, goodId, showLoader);
             if (response && response.validationResult && response.validationResult.success) {
                 return this._boFactory.makeBOArrayFromRawBackendDataArray(PurchaseAdviceLine, response.resultObjects);
             }
@@ -4772,7 +4777,7 @@ class TransactionConnectorAdapterService {
         this._errorService.showValidationError(result);
     }
 }
-TransactionConnectorAdapterService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionConnectorAdapterService_Factory() { return new TransactionConnectorAdapterService(i0.ɵɵinject(TransactionSettingsService), i0.ɵɵinject(SelectMultipleCacheService), i0.ɵɵinject(SelectMultipleParameterizedCacheService), i0.ɵɵinject(ErrorService), i0.ɵɵinject(RelationConnectorService), i0.ɵɵinject(ArticleConnectorService)); }, token: TransactionConnectorAdapterService, providedIn: "root" });
+TransactionConnectorAdapterService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionConnectorAdapterService_Factory() { return new TransactionConnectorAdapterService(i0.ɵɵinject(TransactionSettingsService), i0.ɵɵinject(SelectMultipleCacheService), i0.ɵɵinject(SelectMultipleParameterizedCacheService), i0.ɵɵinject(ErrorService), i0.ɵɵinject(RelationConnectorService), i0.ɵɵinject(ArticleConnectorService), i0.ɵɵinject(TransactionEventService)); }, token: TransactionConnectorAdapterService, providedIn: "root" });
 TransactionConnectorAdapterService.decorators = [
     { type: Injectable, args: [{
                 providedIn: "root"
@@ -4784,7 +4789,8 @@ TransactionConnectorAdapterService.ctorParameters = () => [
     { type: SelectMultipleParameterizedCacheService },
     { type: ErrorService },
     { type: RelationConnectorService },
-    { type: ArticleConnectorService }
+    { type: ArticleConnectorService },
+    { type: TransactionEventService }
 ];
 
 class SelectSingleCacheService {
@@ -5613,9 +5619,9 @@ class TransactionConnectorService {
             return yield this._adapterService.generateAndSendPurchaseOrdersForSalesOrder(transactionId, lineNumbers);
         });
     }
-    getPurchaseAdviceLines(filters, goodId) {
+    getPurchaseAdviceLines(filters, goodId, showLoader) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._adapterService.getPurchaseAdviceLines(filters, goodId);
+            return yield this._adapterService.getPurchaseAdviceLines(filters, goodId, showLoader);
         });
     }
     generateAndSendPurchaseOrders(purchaseAdviceLines) {
@@ -7272,6 +7278,9 @@ class TransactionBaseService extends BaseModuleService {
     get transactionDirty() {
         return this._transactionDirty;
     }
+    get transactionLocked() {
+        return this._alreadyLocked;
+    }
     init(options, resetCurrentTransaction = true) {
         return __awaiter(this, void 0, void 0, function* () {
             if (resetCurrentTransaction) {
@@ -7305,7 +7314,7 @@ class TransactionBaseService extends BaseModuleService {
                 return null;
             });
             if (response && response.isSuccess) {
-                this._resetLockTransaction();
+                this.resetLockTransaction();
                 if (rememberTransaction) {
                     this.rememberCurrentTransaction(response);
                 }
@@ -7314,14 +7323,14 @@ class TransactionBaseService extends BaseModuleService {
         });
     }
     commit() {
-        this._resetLockTransaction();
+        this.resetLockTransaction();
         return this.connector.commit();
     }
     rollback(refresh = false) {
         return __awaiter(this, void 0, void 0, function* () {
             const rollbackSuccess = yield this.connector.rollback();
             if (rollbackSuccess) {
-                this._resetLockTransaction();
+                this.resetLockTransaction();
                 if (refresh && this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.id) {
                     this.getTransactionById(this.currentTransaction.transactionInfo.id);
                 }
@@ -7497,6 +7506,10 @@ class TransactionBaseService extends BaseModuleService {
     updateHeaderTransactionDepositPercentage(uuid, amount, saveTransaction) {
         return Promise.resolve(true);
     }
+    resetLockTransaction() {
+        this._alreadyLocked = false;
+        this.transactionDirty = false;
+    }
     _handleBeforeRememberCurrentTransaction(transactionInfoResponse) {
         return Promise.resolve();
     }
@@ -7575,10 +7588,6 @@ class TransactionBaseService extends BaseModuleService {
     _isValidTransaction() {
         return !!(this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.id);
     }
-    _resetLockTransaction() {
-        this._alreadyLocked = false;
-        this.transactionDirty = false;
-    }
     _lockTransaction(transId, version) {
         return this.connector.lockTransactionById(transId, version);
     }
@@ -8998,9 +9007,9 @@ class TransactionService extends PendingReasonService {
             }
         });
     }
-    getPurchaseAdviceLines(filters, goodId) {
+    getPurchaseAdviceLines(filters, goodId, showLoader) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.connector.getPurchaseAdviceLines(filters, goodId);
+            return yield this.connector.getPurchaseAdviceLines(filters, goodId, showLoader);
         });
     }
     generateAndSendPurchaseOrders(purchaseAdviceLines) {
@@ -9675,7 +9684,8 @@ class CheckoutComponent {
     }
     ngOnDestroy() {
         this._subs.forEach(s => s.unsubscribe());
-        if (this._relationService.relationLocked) {
+        if (this._relationService.relationLocked || this.service.transactionLocked) {
+            this.service.resetLockTransaction();
             this.service.rollback();
         }
     }
@@ -25651,6 +25661,14 @@ class CheckoutOverviewPaymentComponent {
                 this.invoiceAddress = invAddress;
             }
         }
+        this._transactionService.getDeliveryMethods().then((methods) => {
+            if (this.transaction && this.transaction.transactionInfo && methods && methods.length > 0) {
+                const currentMethod = methods.find(m => m.code === this.transaction.transactionInfo.deliveryMethod);
+                if (currentMethod) {
+                    this.deliveryMethod = currentMethod.description;
+                }
+            }
+        });
     }
     handlePayed() {
         const id = this._transactionService.currentTransaction.transactionInfo.transactionNr;
@@ -25695,7 +25713,7 @@ CheckoutOverviewPaymentComponent.decorators = [
             <span [textContent]="'EXPECTED_DELIVERY_DATE' | localize | append:':'"></span><span [textContent]="transaction.transactionInfo.deliveryDate | date:'dd MMM yyyy'"></span>
         </div>
         <div class="overview-row">
-            <span [textContent]="'DELIVERY_METHOD' | localize | append:':'"></span><span [textContent]="transaction.transactionInfo.deliveryMethod"></span>
+            <span [textContent]="'DELIVERY_METHOD' | localize | append:':'"></span><span [textContent]="deliveryMethod"></span>
         </div>
       </div>
       <div class="overview-section-change-link">