@colijnit/transaction 255.1.39 → 255.1.41

package/bundles/colijnit-transaction.umd.js

@@ -33,8 +33,8 @@
         function Version() {
             this.name = "@colijnit/transaction";
             this.description = "Colijn IT transaction package";
-            this.symVer = "255.1.39";
-            this.publishDate = "20-9-2024 17:21:27";
+            this.symVer = "255.1.41";
+            this.publishDate = "25-9-2024 17:27:58";
         }
         return Version;
     }());
@@ -11581,6 +11581,8 @@
         TransactionCfgName["StickerAmount"] = "stickerAmount";
         TransactionCfgName["LineWarehouseLocationReceived"] = "lineWarehouseLocationReceived";
         /* Invoice_check rubric */
+        /* Service Overview Tab*/
+        TransactionCfgName["ServiceMessage"] = "serviceMessage";
     })(exports.TransactionCfgName || (exports.TransactionCfgName = {}));
 
     var TransactionScreenConfigurationService = /** @class */ (function (_super) {
@@ -12216,7 +12218,7 @@
     DialogTransactionLineWarehouseCcComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-dialog-transaction-line-warehouse-cc",
-                    template: "\n    <co-dialog\n      [customCssClass]=\"'co-small-scrollbar'\"\n      [headerTemplate]=\"dialogHeader\"\n      [footerTemplate]=\"footerTemplate\"\n      (closeClick)=\"handleCloseDialog($event, buttonType.Cancel)\">\n      <div class=\"transaction-line-warehouse-cc-section flex\">\n        <co-input-number-picker\n          class=\"quantity-number-picker\"\n          [(model)]=\"quantity\" [min]=\"1\"\n          [decimals]=\"decimals\"\n          [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n          (modelChange)=\"handleQuantityChange($event)\">\n        </co-input-number-picker>\n        <co-button\n          *ngIf=\"showDirectSell\"\n          class=\"bordered\"\n          [iconData]=\"iconCacheService.getIcon(icons.IndustryRegular)\"\n          (click)=\"directSellModalVisible = true\">\n        </co-button>\n      </div>\n      <div class=\"transaction-line-warehouse-cc-section\" *ngIf=\"transactionKind !== transKind.PurchaseOrder\">\n        <div class=\"transaction-line-warehouse-cc-section-label\" [textContent]=\"'COMMISSION_CODE' | localize\"></div>\n        <co-transaction-line-commission-code\n          [transactionLine]=\"transactionLine\"\n          [value]=\"commissionCode\"\n          [useModel]=\"false\"\n          (valueChange)=\"handleCommissionCodeChange($event)\"></co-transaction-line-commission-code>\n      </div>\n      <div class=\"transaction-line-warehouse-cc-section\">\n        <div class=\"transaction-line-warehouse-cc-section-label\" [textContent]=\"'WAREHOUSE' | localize\"></div>\n        <co-transaction-line-warehouse\n          [transactionLine]=\"transactionLine\"\n          [value]=\"warehouse\"\n          [useModel]=\"false\"\n          (valueChange)=\"handleWarehouseChange($event)\"></co-transaction-line-warehouse>\n      </div>\n    </co-dialog>\n    <ng-template #dialogHeader>\n      <div class=\"co-dialog-header-title\" [textContent]=\"'COMMISSION_CODE_WAREHOUSE_SELECTION' | localize\"></div>\n    </ng-template>\n    <ng-template #footerTemplate>\n      <div class=\"co-dialog-footer-button-wrapper\">\n        <co-button class=\"save-button\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CheckDuotone)\"\n                   (click)=\"handleOkClick()\"></co-button>\n        <co-button class=\"close-button\"\n                   [iconData]=\"iconCacheService.getIcon(icons.Crossskinny)\"\n                   (click)=\"handleCloseDialog($event, buttonType.Cancel)\"></co-button>\n      </div>\n    </ng-template>\n\n    <co-dialog-sell\n      *ngIf=\"directSellModalVisible\"\n      [transactionUuid]=\"transactionInfo.uuid\"\n      [lineUuid]=\"transactionLine.uuid\"\n      [goodId]=\"transactionLine.goodId\"\n      (showDirectSellModal)=\"showDirectSellModal($event)\">\n    </co-dialog-sell>\n  ",
+                    template: "\n    <co-dialog\n      [customCssClass]=\"'co-small-scrollbar'\"\n      [headerTemplate]=\"dialogHeader\"\n      [footerTemplate]=\"footerTemplate\"\n      (closeClick)=\"handleCloseDialog($event, buttonType.Cancel)\">\n      <div class=\"transaction-line-warehouse-cc-section flex\">\n        <co-input-number-picker\n          class=\"quantity-number-picker\"\n          [(model)]=\"quantity\" [min]=\"1\"\n          [decimals]=\"decimals\"\n          [leftIconData]=\"iconCacheService.getIcon(icons.CartShoppingRegular)\"\n          (modelChange)=\"handleQuantityChange($event)\">\n        </co-input-number-picker>\n        <co-button\n          *ngIf=\"showDirectSell\"\n          class=\"bordered\"\n          [iconData]=\"iconCacheService.getIcon(icons.IndustryRegular)\"\n          (click)=\"directSellModalVisible = true\">\n        </co-button>\n      </div>\n      <div class=\"transaction-line-warehouse-cc-section\" *ngIf=\"transactionKind !== transKind.PurchaseOrder\">\n        <div class=\"transaction-line-warehouse-cc-section-label\" [textContent]=\"'COMMISSION_CODE' | localize\"></div>\n        <co-transaction-line-commission-code\n          [transactionLine]=\"transactionLine\"\n          [value]=\"commissionCode\"\n          [useModel]=\"false\"\n          (valueChange)=\"handleCommissionCodeChange($event)\"></co-transaction-line-commission-code>\n      </div>\n      <div class=\"transaction-line-warehouse-cc-section\">\n        <div class=\"transaction-line-warehouse-cc-section-label\" [textContent]=\"'WAREHOUSE' | localize\"></div>\n        <co-transaction-line-warehouse\n          [transactionLine]=\"transactionLine\"\n          [value]=\"warehouse\"\n          [useModel]=\"false\"\n          [transactionInfo]=\"transactionInfo\"\n          (valueChange)=\"handleWarehouseChange($event)\"></co-transaction-line-warehouse>\n      </div>\n    </co-dialog>\n    <ng-template #dialogHeader>\n      <div class=\"co-dialog-header-title\" [textContent]=\"'COMMISSION_CODE_WAREHOUSE_SELECTION' | localize\"></div>\n    </ng-template>\n    <ng-template #footerTemplate>\n      <div class=\"co-dialog-footer-button-wrapper\">\n        <co-button class=\"save-button\"\n                   [iconData]=\"iconCacheService.getIcon(icons.CheckDuotone)\"\n                   (click)=\"handleOkClick()\"></co-button>\n        <co-button class=\"close-button\"\n                   [iconData]=\"iconCacheService.getIcon(icons.Crossskinny)\"\n                   (click)=\"handleCloseDialog($event, buttonType.Cancel)\"></co-button>\n      </div>\n    </ng-template>\n\n    <co-dialog-sell\n      *ngIf=\"directSellModalVisible\"\n      [transactionUuid]=\"transactionInfo.uuid\"\n      [lineUuid]=\"transactionLine.uuid\"\n      [goodId]=\"transactionLine.goodId\"\n      (showDirectSellModal)=\"showDirectSellModal($event)\">\n    </co-dialog-sell>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -15408,27 +15410,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*/, Promise.reject()];
+                            }
+                            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];
+                    }
                 });
             });
         };
@@ -15459,27 +15458,24 @@
         };
         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*/, Promise.reject()];
+                            }
+                            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];
+                    }
                 });
             });
         };
@@ -15559,27 +15555,24 @@
         };
         TransactionService.prototype.createSalesQuotation = 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.createSalesQuotation(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*/, Promise.reject()];
+                            }
+                            request.branchNr = this.currentBranch;
+                            return [4 /*yield*/, this.connector.createSalesQuotation(request)];
+                        case 2:
+                            response = _a.sent();
+                            return [4 /*yield*/, this.rememberCurrentTransaction(response)];
+                        case 3:
+                            _a.sent();
+                            return [2 /*return*/, true];
+                    }
                 });
             });
         };
@@ -16262,9 +16255,16 @@
         TransactionService.prototype.getWarehouses = function () {
             return this.connector.getWarehouses(this.currentBranch);
         };
-        TransactionService.prototype.getWarehouseStockInfoByGoodAndBranch = function (goodId) {
-            var transactionBranch = this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch ?
-                this.currentTransaction.transactionInfo.branch.relationNr : this.currentBranch;
+        TransactionService.prototype.getWarehouseStockInfoByGoodAndBranch = function (goodId, transactionInfo) {
+            var transactionBranch;
+            if (transactionInfo && transactionInfo.branch) {
+                transactionBranch = transactionInfo.branch.relationNr;
+            }
+            else if (this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch)
+                transactionBranch = this.currentTransaction.transactionInfo.branch.relationNr;
+            else {
+                transactionBranch = this.currentBranch;
+            }
             return this.connector.getWarehouseStockInfoByGoodAndBranch(goodId, transactionBranch);
         };
         TransactionService.prototype.getMaxConfirmedDeliveryDateForPurchaseOrder = function (transId) {
@@ -17890,30 +17890,29 @@
         };
         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);
-                                    });
+                    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 || transactionKind_enum.TransactionKind.SalesOrder);
+                            if (!createMethod) return [3 /*break*/, 2];
+                            request = new createTransactionRequest.CreateTransactionRequest();
+                            return [4 /*yield*/, createMethod(request)
+                                    .then(function () {
+                                    return true;
+                                })
+                                    .catch(function () {
+                                    return false;
                                 })];
-                        }
-                        else {
+                        case 1: return [2 /*return*/, _a.sent()];
+                        case 2:
                             rxjs.throwError("Failed to create transaction");
-                        }
-                    }
-                    else {
-                        return [2 /*return*/, Promise.resolve(true)];
+                            _a.label = 3;
+                        case 3: return [3 /*break*/, 5];
+                        case 4: return [2 /*return*/, Promise.resolve(true)];
+                        case 5: return [2 /*return*/];
                     }
-                    return [2 /*return*/];
                 });
             });
         };
@@ -22864,7 +22863,7 @@
     TransactionSendDocumentsComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-send-documents",
-                    template: "\n    <div class=\"send-documents-wrapper\" *ngIf=\"historicReports.length > 0\">\n      <div class=\"amount-send-indicator\">\n        <span [textContent]=\"historicReports.length\"></span>\n      </div>\n      <div class=\"send-button\" [class.no-pointer]=\"historicReports.length === 0\"\n           [class.selected]=\"selected\"\n           (click)=\"toggleSendDocumentsDialog()\">\n        <co-icon [iconData]=\"iconCacheService.getIcon(icons.FileCircleInfoSolid)\"></co-icon>\n        <span [textContent]=\"'SENT' | localize\"></span>\n      </div>\n      <co-dialog-wizard *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n        <ng-container header>\n          <div class=\"dialog-title\" [textContent]=\"'ALREADY_SENT' | localize\"></div>\n        </ng-container>\n        <div class=\"dialog-container\">\n          <div class=\"historic-report-line\" *ngFor=\"let report of historicReports\" (click)=\"handleShowHistoricDocumentLines(report)\">\n            <co-icon [iconData]=\"iconCacheService.getIcon(getSendMethodIcon(report))\"></co-icon>\n            <span [textContent]=\"report.reportId + '   ' + (report.reportCreationDate | date)\"></span>\n          </div>\n        </div>\n      </co-dialog-wizard>\n    </div>\n  ",
+                    template: "\n    <div class=\"send-documents-wrapper\" *ngIf=\"historicReports?.length > 0\">\n      <div class=\"amount-send-indicator\">\n        <span [textContent]=\"historicReports.length\"></span>\n      </div>\n      <div class=\"send-button\" [class.no-pointer]=\"historicReports.length === 0\"\n           [class.selected]=\"selected\"\n           (click)=\"toggleSendDocumentsDialog()\">\n        <co-icon [iconData]=\"iconCacheService.getIcon(icons.FileCircleInfoSolid)\"></co-icon>\n        <span [textContent]=\"'SENT' | localize\"></span>\n      </div>\n      <co-dialog-wizard *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n        <ng-container header>\n          <div class=\"dialog-title\" [textContent]=\"'ALREADY_SENT' | localize\"></div>\n        </ng-container>\n        <div class=\"dialog-container\">\n          <div class=\"historic-report-line\" *ngFor=\"let report of historicReports\" (click)=\"handleShowHistoricDocumentLines(report)\">\n            <co-icon [iconData]=\"iconCacheService.getIcon(getSendMethodIcon(report))\"></co-icon>\n            <span [textContent]=\"report.reportId + '   ' + (report.reportCreationDate | date)\"></span>\n          </div>\n        </div>\n      </co-dialog-wizard>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -27040,12 +27039,36 @@
             });
         };
         TransactionLinesSidePanelCashDeskComponent.prototype.paymentMethodSelected = function (method, index) {
-            this.cashRegisterNr = this.posOrderData ? this.posOrderData.cashRegisterNr : this.transaction.transactionInfo.cashRegisterNr;
-            this.cashRegisterGroupId = this.posOrderData ? this.posOrderData.cashRegisterGroupId : this.transaction.transactionInfo.cashRegisterGroupId;
-            this.cashRegisterDrawerId = this.posOrderData ? this.posOrderData.cashDrawerId : undefined;
-            this.printerName = this.posOrderData ? this.posOrderData.printerName : undefined;
-            this.selectedPaymentMethod = method;
-            this.showCashRegisterPaymentDialog = true;
+            return __awaiter(this, void 0, void 0, function () {
+                var registers, register;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.cashRegisterNr = this.posOrderData ? this.posOrderData.cashRegisterNr : this.transaction.transactionInfo.cashRegisterNr;
+                            this.cashRegisterGroupId = this.posOrderData ? this.posOrderData.cashRegisterGroupId : this.transaction.transactionInfo.cashRegisterGroupId;
+                            this.cashRegisterDrawerId = this.posOrderData ? this.posOrderData.cashDrawerId : undefined;
+                            this.printerName = this.posOrderData ? this.posOrderData.printerName : undefined;
+                            if (!((this.cashRegisterDrawerId === undefined || this.cashRegisterDrawerId === null) ||
+                                (this.printerName === undefined || this.printerName === null))) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.transactionService.getCashRegisters(this.transactionInfo.branch.relationNr, this.cashRegisterGroupId)];
+                        case 1:
+                            registers = _a.sent();
+                            register = registers.find(function (c) { return c.nr === _this.cashRegisterNr; });
+                            if (register !== undefined && register !== null) {
+                                if (this.cashRegisterDrawerId === undefined || this.cashRegisterDrawerId === null) {
+                                    this.cashRegisterDrawerNr = register.defaultDrawerNumber;
+                                }
+                                this.printerName = this.printerName ? this.printerName : register.defaultPrinter;
+                            }
+                            _a.label = 2;
+                        case 2:
+                            this.selectedPaymentMethod = method;
+                            this.showCashRegisterPaymentDialog = true;
+                            return [2 /*return*/];
+                    }
+                });
+            });
         };
         TransactionLinesSidePanelCashDeskComponent.prototype._getPaymentMethods = function () {
             var _this = this;
@@ -27059,7 +27082,7 @@
     TransactionLinesSidePanelCashDeskComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'co-transaction-lines-side-panel-cash-desk',
-                    template: "\n     <div class=\"cash-register-button-wrapper\">\n       <co-button class=\"expense-button\" [iconData]=\"iconCacheService.getIcon(icons.UpFromLineRegular)\"\n                  [label]=\"'EXPENSE' | localize\" (click)=\"showExpenseDialog = true\">\n       </co-button>\n     </div>\n     <div class=\"cash-register-payment-methods-wrapper\">\n         <co-payment-tile *ngFor=\"let paymentMethod of paymentMethods; let index = index\"\n                          [image]=\"paymentMethod.image\"\n                          [description]=\"paymentMethod.payment.description\"\n                          [showRadioButton]=\"false\"\n                          (selectedChange)=\"paymentMethodSelected(paymentMethod, index)\"\n         ></co-payment-tile>\n     </div>\n     <co-transaction-cash-register-payment-dialog *ngIf=\"showCashRegisterPaymentDialog\"\n                                                  [transactionNr]=\"transaction.transactionInfo.transactionNr\"\n                                                  [transId]=\"transaction.transactionInfo.id\"\n                                                  [branch]=\"transaction.transactionInfo.branch?.relationNr\"\n                                                  [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                                  [amount]=\"transaction.transactionTotal.netAmount\"\n                                                  [currencyId]=\"transaction.transactionInfo.currencyId\"\n                                                  [relation]=\"relation\"\n                                                  [paymentViewModel]=\"selectedPaymentMethod\"\n                                                  [cashRegisterNr]=\"cashRegisterNr\"\n                                                  [cashRegisterGroupId]=\"cashRegisterGroupId\"\n                                                  [cashRegisterDrawerId]=\"cashRegisterDrawerId\"\n                                                  [printerName]=\"printerName\"\n                                                  [emailLayout]=\"emailLayout\"\n                                                  [printerLayout]=\"printerLayout\"\n                                                  (posOrderPayed)=\"handlePayed()\"\n                                                  (closeDialog)=\"showCashRegisterPaymentDialog = false\"\n     >\n     </co-transaction-cash-register-payment-dialog>\n     <co-transaction-cash-register-order-expense-dialog *ngIf=\"showExpenseDialog\"\n                                                         [transaction]=\"this.transaction\"\n                                                         (cancelClicked)=\"showExpenseDialog = false\"\n                                                         (okayClicked)=\"createExpenseForOrder($event)\"\n      >\n      </co-transaction-cash-register-order-expense-dialog>\n  ",
+                    template: "\n     <div class=\"cash-register-button-wrapper\">\n       <co-button class=\"expense-button\" [iconData]=\"iconCacheService.getIcon(icons.UpFromLineRegular)\"\n                  [label]=\"'EXPENSE' | localize\" (click)=\"showExpenseDialog = true\">\n       </co-button>\n     </div>\n     <div class=\"cash-register-payment-methods-wrapper\">\n         <co-payment-tile *ngFor=\"let paymentMethod of paymentMethods; let index = index\"\n                          [image]=\"paymentMethod.image\"\n                          [description]=\"paymentMethod.payment.description\"\n                          [showRadioButton]=\"false\"\n                          (selectedChange)=\"paymentMethodSelected(paymentMethod, index)\"\n         ></co-payment-tile>\n     </div>\n     <co-transaction-cash-register-payment-dialog *ngIf=\"showCashRegisterPaymentDialog\"\n                                                  [transactionNr]=\"transaction.transactionInfo.transactionNr\"\n                                                  [transId]=\"transaction.transactionInfo.id\"\n                                                  [branch]=\"transaction.transactionInfo.branch?.relationNr\"\n                                                  [transactionUuid]=\"transaction.transactionInfo.uuid\"\n                                                  [amount]=\"transaction.transactionTotal.netAmount\"\n                                                  [currencyId]=\"transaction.transactionInfo.currencyId\"\n                                                  [relation]=\"relation\"\n                                                  [paymentViewModel]=\"selectedPaymentMethod\"\n                                                  [cashRegisterNr]=\"cashRegisterNr\"\n                                                  [cashRegisterGroupId]=\"cashRegisterGroupId\"\n                                                  [cashRegisterDrawerId]=\"cashRegisterDrawerId\"\n                                                  [cashRegisterDrawerNr]=\"cashRegisterDrawerNr\"\n                                                  [printerName]=\"printerName\"\n                                                  [emailLayout]=\"emailLayout\"\n                                                  [printerLayout]=\"printerLayout\"\n                                                  (posOrderPayed)=\"handlePayed()\"\n                                                  (closeDialog)=\"showCashRegisterPaymentDialog = false\"\n     >\n     </co-transaction-cash-register-payment-dialog>\n     <co-transaction-cash-register-order-expense-dialog *ngIf=\"showExpenseDialog\"\n                                                         [transaction]=\"this.transaction\"\n                                                         (cancelClicked)=\"showExpenseDialog = false\"\n                                                         (okayClicked)=\"createExpenseForOrder($event)\"\n      >\n      </co-transaction-cash-register-order-expense-dialog>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -29411,7 +29434,7 @@
         TransactionLineWarehouseComponent.prototype.ngOnInit = function () {
             var _this = this;
             this.viewModels.length = 0;
-            this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId).then(function (warehouses) {
+            this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId, this.transactionInfo).then(function (warehouses) {
                 _this.collection = !_this.transactionLine.dropShipment ? warehouses.slice() : warehouses.slice().filter(function (warehouse) { return warehouse.dropShipment; });
                 _this.detectChanges();
             });
@@ -33788,7 +33811,17 @@
             },
             set: function (value) {
                 this._cashRegisterDrawerNr = value;
-                this.setCashDrawerIdIfValifDrawer(this._cashRegisterDrawerNr);
+                this.setCashDrawerIdIfValidDrawer(this._cashRegisterDrawerNr);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionPaymentService.prototype, "cashRegisterDrawerId", {
+            get: function () {
+                return this._cashRegisterDrawerId;
+            },
+            set: function (value) {
+                this._cashRegisterDrawerId = value;
             },
             enumerable: false,
             configurable: true
@@ -34033,7 +34066,7 @@
         TransactionPaymentService.prototype._dataUriToBase64 = function (uri, mimeType) {
             return uri ? "data:" + mimeType + ";base64," + uri : "";
         };
-        TransactionPaymentService.prototype.setCashDrawerIdIfValifDrawer = function (drawerNr) {
+        TransactionPaymentService.prototype.setCashDrawerIdIfValidDrawer = function (drawerNr) {
             return __awaiter(this, void 0, void 0, function () {
                 var request, drawers;
                 var _this = this;
@@ -34186,7 +34219,18 @@
             },
             set: function (value) {
                 this._cashRegisterDrawerId = value;
-                this.paymentService.cashRegisterDrawerNr = this._cashRegisterDrawerId;
+                this.paymentService.cashRegisterDrawerId = this._cashRegisterDrawerId;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(TransactionPaymentBaseComponent.prototype, "cashRegisterDrawerNr", {
+            get: function () {
+                return this._cashRegisterDrawerNr;
+            },
+            set: function (value) {
+                this._cashRegisterDrawerNr = value;
+                this.paymentService.cashRegisterDrawerNr = this._cashRegisterDrawerNr;
             },
             enumerable: false,
             configurable: true
@@ -34292,7 +34336,7 @@
             this.cashRegisterIdx = index;
             this.cashRegisterNr = cashRegister.nr;
             this.cashRegisterGroupId = cashRegister.group;
-            this.cashRegisterDrawerId = cashRegister.defaultDrawerNumber;
+            this.cashRegisterDrawerNr = cashRegister.defaultDrawerNumber;
             this.paymentService.printerName = cashRegister.defaultPrinter;
         };
         TransactionPaymentBaseComponent.prototype.handlePayment = function () {
@@ -34335,7 +34379,7 @@
                 if (currentCashRegister) {
                     _this.cashRegisterNr = currentCashRegister.nr;
                     _this.cashRegisterGroupId = currentCashRegister.group;
-                    _this.cashRegisterDrawerId = currentCashRegister.defaultDrawerNumber;
+                    _this.cashRegisterDrawerNr = currentCashRegister.defaultDrawerNumber;
                     _this.prepareCashDrawers(currentCashRegister.group);
                     _this.paymentService.printerName = currentCashRegister.defaultPrinter;
                 }
@@ -34376,6 +34420,7 @@
         cashRegisterNr: [{ type: i0.Input }],
         cashRegisterGroupId: [{ type: i0.Input }],
         cashRegisterDrawerId: [{ type: i0.Input }],
+        cashRegisterDrawerNr: [{ type: i0.Input }],
         printerName: [{ type: i0.Input }],
         emailLayout: [{ type: i0.Input }],
         printerLayout: [{ type: i0.Input }],
@@ -39455,8 +39500,23 @@
                 });
             });
         };
+        //In this case we need information about a separate transaction to add info from it to the transaction we actually wish to create.
+        //As such we need to fetch a transaction but just return it. Not set it on the service.
+        TransactionCreateService.prototype.getSeparateTransactionById = function (transactionId) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.connector.getTransactionById(transactionId)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
+        };
         return TransactionCreateService;
-    }(TransactionService));
+    }(TransactionService));
+    TransactionCreateService.decorators = [
+        { type: i0.Injectable }
+    ];
 
     var TransactionHeaderPopupServiceFieldsComponent = /** @class */ (function () {
         function TransactionHeaderPopupServiceFieldsComponent(transactionService) {
@@ -42948,7 +43008,7 @@
     TransactionUndoDeliveryComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-undo-delivery",
-                    template: "\n    <div class=\"send-documents-wrapper\" *ngIf=\"historicReports.length > 0 && allowToUndoDelivery\">\n      <div class=\"amount-send-indicator\">\n        <span [textContent]=\"historicReports.length\"></span>\n      </div>\n      <div class=\"send-button\" [class.no-pointer]=\"historicReports.length === 0\"\n           [class.selected]=\"selected\"\n           (click)=\"toggleUndoDeliveryDialog()\">\n        <co-icon [iconData]=\"iconCacheService.getIcon(icons.SyncAlt)\"></co-icon>\n        <span [textContent]=\"'UNDO_DELIVERY' | localize\"></span>\n      </div>\n      <co-dialog-wizard *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n        <ng-container header>\n          <div class=\"dialog-title\" [textContent]=\"'DELIVERY_NOTE' | localize\"></div>\n        </ng-container>\n        <div class=\"dialog-container\">\n          <div class=\"historic-report-line\" *ngFor=\"let report of historicReports\"\n               (click)=\"undoDelivery(report.reportId)\">\n            <span [textContent]=\"report.reportId + '   ' + (report.reportCreationDate | date)\"></span>\n            <co-icon [iconData]=\"iconCacheService.getIcon(icons.TrashBin)\"></co-icon>\n          </div>\n        </div>\n        <co-loader *ngIf=\"showUndoLoader\"></co-loader>\n      </co-dialog-wizard>\n    </div>\n  ",
+                    template: "\n    <div class=\"send-documents-wrapper\" *ngIf=\"historicReports?.length > 0 && allowToUndoDelivery\">\n      <div class=\"amount-send-indicator\">\n        <span [textContent]=\"historicReports.length\"></span>\n      </div>\n      <div class=\"send-button\" [class.no-pointer]=\"historicReports.length === 0\"\n           [class.selected]=\"selected\"\n           (click)=\"toggleUndoDeliveryDialog()\">\n        <co-icon [iconData]=\"iconCacheService.getIcon(icons.SyncAlt)\"></co-icon>\n        <span [textContent]=\"'UNDO_DELIVERY' | localize\"></span>\n      </div>\n      <co-dialog-wizard *ngIf=\"showDialog\" (closeClick)=\"showDialog = false\">\n        <ng-container header>\n          <div class=\"dialog-title\" [textContent]=\"'DELIVERY_NOTE' | localize\"></div>\n        </ng-container>\n        <div class=\"dialog-container\">\n          <div class=\"historic-report-line\" *ngFor=\"let report of historicReports\"\n               (click)=\"undoDelivery(report.reportId)\">\n            <span [textContent]=\"report.reportId + '   ' + (report.reportCreationDate | date)\"></span>\n            <co-icon [iconData]=\"iconCacheService.getIcon(icons.TrashBin)\"></co-icon>\n          </div>\n        </div>\n        <co-loader *ngIf=\"showUndoLoader\"></co-loader>\n      </co-dialog-wizard>\n    </div>\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -51960,6 +52020,7 @@
             _this._dialogService = _dialogService;
             _this.TableName = tableName_enum.TableName;
             _this.WorkflowCategoryType = workflowCategory_enum.WorkflowCategoryType;
+            _this.cfgNames = exports.TransactionCfgName;
             _this.Icon = Icon;
             _this._editMode = false;
             _this.priorityDomainColl = [];
@@ -52171,7 +52232,7 @@
     TransactionServiceOverviewComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-service-overview",
-                    template: "\n    <div class=\"service-overview-wrapper\">\n      <div class=\"message-and-task-wrapper\">\n        <div class=\"service-message-and-image-wrapper\">\n          <div class=\"service-message-wrapper\">\n            <label class=\"label service-label\" [textContent]=\"'SERVICE_REPORT'| localize\"></label>\n            <span *ngIf=\"transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers\"\n                               [textContent]=\"transactionServiceInfo.wizardQuestionsAndAnswers\"></span>\n            <co-transaction-service-message  class=\"transaction-service-message\" [transaction]=\"transaction\">\n            </co-transaction-service-message>\n          </div>\n          <co-files-upload (documentChangeEvent)=\"upsertDocument($event)\"\n                           (documentDeleted)=\"deleteDocument($event)\"\n                           [label]=\"'ADD_IMAGES' | localize\"\n                           [documents]=\"documents\"\n                           [isEditable]=\"false\">\n          </co-files-upload>\n          <div class=\"service-order-lines-wrapper\">\n            <div class=\"service-message-extra-wrapper\">\n              <co-list-of-values [label]=\"'PRIORITY'| localize\" displayField=\"description\" [model]=\"priorityModel\"\n                                 [collection]=\"priorityDomainColl\"\n                                 (modelChange)=\"setPriority($event)\"></co-list-of-values>\n              <co-list-of-values [label]=\"'CAUSE_CODE' | localize\" displayField=\"description\" [model]=\"causeCodeModel\"\n                                 [collection]=\"causeCodeColl\"\n                                 (modelChange)=\"setCauseCode($event)\"></co-list-of-values>\n              <co-list-of-values [label]=\"'ENTRY_TYPE' | localize\" displayField=\"description\" [model]=\"entryTypeModel\"\n                                 [collection]=\"entryTypeColl\"\n                                 (modelChange)=\"setEntryType($event)\"></co-list-of-values>\n            </div>\n            <co-transaction-lines-side-panel\n              class=\"higher-max-width\"\n              [posOrderData]=\"posOrderData\"\n              [transaction]=\"transaction\">\n            </co-transaction-lines-side-panel>\n          </div>\n\n        </div>\n        <div class=\"activity-list-component-wrapper\">\n          <div class=\"activity-task-creator-wrapper\">\n            <co-component-activity-list #openActivities [showActivityHeader]=\"showActivityHeader\" [table]=\"TableName.Transactions\" [key]=\"transactionInfo.id.toString()\" (refreshRequested)=\"finishedActivitiesRefreshRequested()\">\n            </co-component-activity-list>\n            <co-task-creator [table]=\"TableName.Transactions\" [remarkAndWorkKey]=\"transactionInfo.id.toString()\" [taskKey]=\"transactionInfo.transactionNr.toString()\"\n                             [author]=\"transactionService.loggedInUser\" [branchNo]=\"transactionInfo.branch.relationNr.toString()\"\n                             [workflowCategoryType]=\"WorkflowCategoryType.ServiceOrder\"\n                             (activityCreated)=\"fullActivitiesRefreshRequested()\"></co-task-creator>\n          </div>\n          <div class=\"activity-list-conv-wrapper\">\n            <label class=\"label history-label\" [textContent]=\"'HISTORIC_ACTIVITY_CHAT'| localize\"></label>\n            <co-activity-list [activities]=\"activities\"></co-activity-list>\n          </div>\n        </div>\n      </div>\n    </div>\n\n  ",
+                    template: "\n    <div class=\"service-overview-wrapper\">\n      <div class=\"message-and-task-wrapper\">\n        <div class=\"service-message-and-image-wrapper\">\n          <div class=\"service-message-wrapper\">\n            <label class=\"label service-label\" [textContent]=\"'SERVICE_REPORT'| localize\"></label>\n            <span  *ngIf=\"transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers\"\n                               [textContent]=\"transactionServiceInfo.wizardQuestionsAndAnswers\"></span> <!--[screenConfigurationObject]=\"\" screenConfigNativeElement-->\n            <co-transaction-service-message  class=\"transaction-service-message\" [transaction]=\"transaction\">\n            </co-transaction-service-message>\n          </div>\n          <co-files-upload (documentChangeEvent)=\"upsertDocument($event)\"\n                           (documentDeleted)=\"deleteDocument($event)\"\n                           [label]=\"'ADD_IMAGES' | localize\"\n                           [documents]=\"documents\"\n                           [isEditable]=\"false\">\n          </co-files-upload>\n          <div class=\"service-order-lines-wrapper\">\n            <div class=\"service-message-extra-wrapper\">\n              <co-list-of-values [label]=\"'PRIORITY'| localize\" displayField=\"description\" [model]=\"priorityModel\"\n                                 [collection]=\"priorityDomainColl\"\n                                 (modelChange)=\"setPriority($event)\"></co-list-of-values>\n              <co-list-of-values [label]=\"'CAUSE_CODE' | localize\" displayField=\"description\" [model]=\"causeCodeModel\"\n                                 [collection]=\"causeCodeColl\"\n                                 (modelChange)=\"setCauseCode($event)\"></co-list-of-values>\n              <co-list-of-values [label]=\"'ENTRY_TYPE' | localize\" displayField=\"description\" [model]=\"entryTypeModel\"\n                                 [collection]=\"entryTypeColl\"\n                                 (modelChange)=\"setEntryType($event)\"></co-list-of-values>\n            </div>\n            <co-transaction-lines-side-panel\n              class=\"higher-max-width\"\n              [posOrderData]=\"posOrderData\"\n              [transaction]=\"transaction\">\n            </co-transaction-lines-side-panel>\n          </div>\n\n        </div>\n        <div class=\"activity-list-component-wrapper\">\n          <div class=\"activity-task-creator-wrapper\">\n            <co-component-activity-list #openActivities [showActivityHeader]=\"showActivityHeader\" [table]=\"TableName.Transactions\" [key]=\"transactionInfo.id.toString()\" (refreshRequested)=\"finishedActivitiesRefreshRequested()\">\n            </co-component-activity-list>\n            <co-task-creator [table]=\"TableName.Transactions\" [remarkAndWorkKey]=\"transactionInfo.id.toString()\" [taskKey]=\"transactionInfo.transactionNr.toString()\"\n                             [author]=\"transactionService.loggedInUser\" [branchNo]=\"transactionInfo.branch.relationNr.toString()\"\n                             [workflowCategoryType]=\"WorkflowCategoryType.ServiceOrder\"\n                             (activityCreated)=\"fullActivitiesRefreshRequested()\"></co-task-creator>\n          </div>\n          <div class=\"activity-list-conv-wrapper\">\n            <label class=\"label history-label\" [textContent]=\"'HISTORIC_ACTIVITY_CHAT'| localize\"></label>\n            <co-activity-list [activities]=\"activities\"></co-activity-list>\n          </div>\n        </div>\n      </div>\n    </div>\n\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -52237,7 +52298,7 @@
     TransactionServiceMessageComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "co-transaction-service-message",
-                    template: "\n    <co-input-textarea #input\n                   [model]=\"transactionServiceInfo.reportMessage\"\n                   [readonly]=\"readonly\"\n                   [showSaveCancel]=\"true\"\n    ></co-input-textarea>\n  ",
+                    template: "\n    <co-input-textarea #input\n                   [model]=\"transactionServiceInfo.reportMessage\"\n                   [forceReadonly]=\"readonly\"\n                   [showSaveCancel]=\"true\"\n    ></co-input-textarea> <!--[screenConfigurationObject]=\"cfgNames.ServiceMessage\"-->\n  ",
                     encapsulation: i0.ViewEncapsulation.None
                 },] }
     ];
@@ -52256,7 +52317,8 @@
                         common.CommonModule,
                         corecomponents_v12.InputTextModule,
                         PipeModule,
-                        corecomponents_v12.InputTextareaModule
+                        corecomponents_v12.InputTextareaModule,
+                        corecomponents_v12.ScreenConfigurationModule
                     ],
                     declarations: [
                         TransactionServiceMessageComponent