@colijnit/transaction 255.1.39 → 255.1.40

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 = "255.1.39";
-        this.publishDate = "20-9-2024 17:21:27";
+        this.symVer = "255.1.40";
+        this.publishDate = "23-9-2024 18:21:43";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU1LjEuMzlcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMC05LTIwMjQgMTc6MjE6MjdcIjtcbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU1LjEuNDBcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyMy05LTIwMjQgMTg6MjE6NDNcIjtcbn0iXX0=

package/fesm2015/colijnit-transaction.js

@@ -268,8 +268,8 @@ class Version {
     constructor() {
         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.40";
+        this.publishDate = "23-9-2024 18:21:43";
     }
 }
 
@@ -7921,6 +7921,8 @@ var TransactionCfgName;
     TransactionCfgName["StickerAmount"] = "stickerAmount";
     TransactionCfgName["LineWarehouseLocationReceived"] = "lineWarehouseLocationReceived";
     /* Invoice_check rubric */
+    /* Service Overview Tab*/
+    TransactionCfgName["ServiceMessage"] = "serviceMessage";
 })(TransactionCfgName || (TransactionCfgName = {}));
 
 class TransactionScreenConfigurationService extends BaseModuleScreenConfigService {
@@ -8527,6 +8529,7 @@ DialogTransactionLineWarehouseCcComponent.decorators = [
           [transactionLine]="transactionLine"
           [value]="warehouse"
           [useModel]="false"
+          [transactionInfo]="transactionInfo"
           (valueChange)="handleWarehouseChange($event)"></co-transaction-line-warehouse>
       </div>
     </co-dialog>
@@ -11360,9 +11363,16 @@ class TransactionService extends PendingReasonService {
     getWarehouses() {
         return this.connector.getWarehouses(this.currentBranch);
     }
-    getWarehouseStockInfoByGoodAndBranch(goodId) {
-        const transactionBranch = this.currentTransaction && this.currentTransaction.transactionInfo && this.currentTransaction.transactionInfo.branch ?
-            this.currentTransaction.transactionInfo.branch.relationNr : this.currentBranch;
+    getWarehouseStockInfoByGoodAndBranch(goodId, transactionInfo) {
+        let 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);
     }
     getMaxConfirmedDeliveryDateForPurchaseOrder(transId) {
@@ -23411,12 +23421,26 @@ class TransactionLinesSidePanelCashDeskComponent extends TransactionBaseComponen
         });
     }
     paymentMethodSelected(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* () {
+            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 we don't have a cashregister id or printer like we should.
+            if ((this.cashRegisterDrawerId === undefined || this.cashRegisterDrawerId === null) ||
+                (this.printerName === undefined || this.printerName === null)) {
+                let registers = yield this.transactionService.getCashRegisters(this.transactionInfo.branch.relationNr, this.cashRegisterGroupId);
+                let register = registers.find(c => 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;
+                }
+            }
+            this.selectedPaymentMethod = method;
+            this.showCashRegisterPaymentDialog = true;
+        });
     }
     _getPaymentMethods() {
         this.paymentMethods.length = 0;
@@ -23454,6 +23478,7 @@ TransactionLinesSidePanelCashDeskComponent.decorators = [
                                                   [cashRegisterNr]="cashRegisterNr"
                                                   [cashRegisterGroupId]="cashRegisterGroupId"
                                                   [cashRegisterDrawerId]="cashRegisterDrawerId"
+                                                  [cashRegisterDrawerNr]="cashRegisterDrawerNr"
                                                   [printerName]="printerName"
                                                   [emailLayout]="emailLayout"
                                                   [printerLayout]="printerLayout"
@@ -26323,7 +26348,7 @@ class TransactionLineWarehouseComponent extends TransactionFilterPopupBaseCompon
     }
     ngOnInit() {
         this.viewModels.length = 0;
-        this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId).then((warehouses) => {
+        this.transactionService.getWarehouseStockInfoByGoodAndBranch(this.transactionLine.goodId, this.transactionInfo).then((warehouses) => {
             this.collection = !this.transactionLine.dropShipment ? warehouses.slice() : warehouses.slice().filter((warehouse) => warehouse.dropShipment);
             this.detectChanges();
         });
@@ -30644,11 +30669,17 @@ class TransactionPaymentService {
     }
     set cashRegisterDrawerNr(value) {
         this._cashRegisterDrawerNr = value;
-        this.setCashDrawerIdIfValifDrawer(this._cashRegisterDrawerNr);
+        this.setCashDrawerIdIfValidDrawer(this._cashRegisterDrawerNr);
     }
     get cashRegisterDrawerNr() {
         return this._cashRegisterDrawerNr;
     }
+    set cashRegisterDrawerId(value) {
+        this._cashRegisterDrawerId = value;
+    }
+    get cashRegisterDrawerId() {
+        return this._cashRegisterDrawerId;
+    }
     ngOnDestroy() {
         this._clearInterval();
     }
@@ -30832,7 +30863,7 @@ class TransactionPaymentService {
     _dataUriToBase64(uri, mimeType) {
         return uri ? "data:" + mimeType + ";base64," + uri : "";
     }
-    setCashDrawerIdIfValifDrawer(drawerNr) {
+    setCashDrawerIdIfValidDrawer(drawerNr) {
         return __awaiter(this, void 0, void 0, function* () {
             this._cashRegisterDrawerId = NaN;
             if (!drawerNr) {
@@ -30942,11 +30973,18 @@ class TransactionPaymentBaseComponent {
     }
     set cashRegisterDrawerId(value) {
         this._cashRegisterDrawerId = value;
-        this.paymentService.cashRegisterDrawerNr = this._cashRegisterDrawerId;
+        this.paymentService.cashRegisterDrawerId = this._cashRegisterDrawerId;
     }
     get cashRegisterDrawerId() {
         return this._cashRegisterDrawerId;
     }
+    set cashRegisterDrawerNr(value) {
+        this._cashRegisterDrawerNr = value;
+        this.paymentService.cashRegisterDrawerNr = this._cashRegisterDrawerNr;
+    }
+    get cashRegisterDrawerNr() {
+        return this._cashRegisterDrawerNr;
+    }
     set printerName(value) {
         this._printerName = value;
         this.paymentService.printerName = this._printerName;
@@ -31013,7 +31051,7 @@ class TransactionPaymentBaseComponent {
         this.cashRegisterIdx = index;
         this.cashRegisterNr = cashRegister.nr;
         this.cashRegisterGroupId = cashRegister.group;
-        this.cashRegisterDrawerId = cashRegister.defaultDrawerNumber;
+        this.cashRegisterDrawerNr = cashRegister.defaultDrawerNumber;
         this.paymentService.printerName = cashRegister.defaultPrinter;
     }
     handlePayment() {
@@ -31053,7 +31091,7 @@ class TransactionPaymentBaseComponent {
             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;
             }
@@ -31092,6 +31130,7 @@ TransactionPaymentBaseComponent.propDecorators = {
     cashRegisterNr: [{ type: Input }],
     cashRegisterGroupId: [{ type: Input }],
     cashRegisterDrawerId: [{ type: Input }],
+    cashRegisterDrawerNr: [{ type: Input }],
     printerName: [{ type: Input }],
     emailLayout: [{ type: Input }],
     printerLayout: [{ type: Input }],
@@ -36663,7 +36702,17 @@ class TransactionCreateService extends TransactionService {
             }));
         });
     }
-}
+    //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.
+    getSeparateTransactionById(transactionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.connector.getTransactionById(transactionId);
+        });
+    }
+}
+TransactionCreateService.decorators = [
+    { type: Injectable }
+];
 
 class TransactionHeaderPopupServiceFieldsComponent {
     constructor(transactionService) {
@@ -51995,6 +52044,7 @@ class TransactionServiceOverviewComponent extends TransactionBaseComponent {
         this._dialogService = _dialogService;
         this.TableName = TableName;
         this.WorkflowCategoryType = WorkflowCategoryType;
+        this.cfgNames = TransactionCfgName;
         this.Icon = Icon;
         this._editMode = false;
         this.priorityDomainColl = [];
@@ -52131,8 +52181,8 @@ TransactionServiceOverviewComponent.decorators = [
         <div class="service-message-and-image-wrapper">
           <div class="service-message-wrapper">
             <label class="label service-label" [textContent]="'SERVICE_REPORT'| localize"></label>
-            <span *ngIf="transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers"
-                               [textContent]="transactionServiceInfo.wizardQuestionsAndAnswers"></span>
+            <span  *ngIf="transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers"
+                               [textContent]="transactionServiceInfo.wizardQuestionsAndAnswers"></span> <!--[screenConfigurationObject]="" screenConfigNativeElement-->
             <co-transaction-service-message  class="transaction-service-message" [transaction]="transaction">
             </co-transaction-service-message>
           </div>
@@ -52231,9 +52281,9 @@ TransactionServiceMessageComponent.decorators = [
                 template: `
     <co-input-textarea #input
                    [model]="transactionServiceInfo.reportMessage"
-                   [readonly]="readonly"
+                   [forceReadonly]="readonly"
                    [showSaveCancel]="true"
-    ></co-input-textarea>
+    ></co-input-textarea> <!--[screenConfigurationObject]="cfgNames.ServiceMessage"-->
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -52250,7 +52300,8 @@ TransactionServiceMessageModule.decorators = [
                     CommonModule,
                     InputTextModule,
                     PipeModule,
-                    InputTextareaModule
+                    InputTextareaModule,
+                    ScreenConfigurationModule
                 ],
                 declarations: [
                     TransactionServiceMessageComponent