@colijnit/transaction 255.1.43 → 255.1.45

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.43";
-        this.publishDate = "30-9-2024 11:15:28";
+        this.symVer = "255.1.45";
+        this.publishDate = "2-10-2024 17:30:09";
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU1LjEuNDNcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIzMC05LTIwMjQgMTE6MTU6MjhcIjtcbn0iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJhbnNhY3Rpb24tdmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL3RyYW5zYWN0aW9uL3NyYy9saWIvdHJhbnNhY3Rpb24tdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsTUFBTSxPQUFPLE9BQU87SUFBcEI7UUFDUyxTQUFJLEdBQUcsdUJBQXVCLENBQUM7UUFDL0IsZ0JBQVcsR0FBRywrQkFBK0IsQ0FBQztRQUM5QyxXQUFNLEdBQUcsVUFBVSxDQUFDO1FBQ3BCLGdCQUFXLEdBQUcsb0JBQW9CLENBQUM7SUFDNUMsQ0FBQztDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gdGhpcyBmaWxlIGlzIGR5bmFtaWNhbGx5IGNyZWF0ZWQsIGRvIG5vdCBjaGFuZ2UgdGhpc1xuZXhwb3J0IGNsYXNzIFZlcnNpb24ge1xuICBwdWJsaWMgbmFtZSA9IFwiQGNvbGlqbml0L3RyYW5zYWN0aW9uXCI7XG4gIHB1YmxpYyBkZXNjcmlwdGlvbiA9IFwiQ29saWpuIElUIHRyYW5zYWN0aW9uIHBhY2thZ2VcIjtcbiAgcHVibGljIHN5bVZlciA9IFwiMjU1LjEuNDVcIjtcbiAgcHVibGljIHB1Ymxpc2hEYXRlID0gXCIyLTEwLTIwMjQgMTc6MzA6MDlcIjtcbn0iXX0=

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.43";
-        this.publishDate = "30-9-2024 11:15:28";
+        this.symVer = "255.1.45";
+        this.publishDate = "2-10-2024 17:30:09";
     }
 }
 
@@ -8058,6 +8058,14 @@ class TransactionBaseComponent {
         this._orderLineSets = [];
         this._transactionTotal = new TransactionTotal();
         this._baseSubs = [];
+        this.handleCommit = (value) => __awaiter(this, void 0, void 0, function* () {
+            if (yield this.lockTransaction()) {
+                this.committing = true;
+                const response = yield this.commit(value);
+                this.committing = false;
+                return response;
+            }
+        });
     }
     set cfgName(value) {
         this._cfgName = value;
@@ -8066,6 +8074,17 @@ class TransactionBaseComponent {
     get cfgName() {
         return this._cfgName;
     }
+    set forceWritable(value) {
+        this._forceWritable = value;
+        if (this._forceWritable) {
+            this.readonly = false;
+            this.headerReadonly = false;
+            this.tooltipMessage = undefined;
+        }
+    }
+    get forceWritable() {
+        return this._forceWritable;
+    }
     set transaction(value) {
         this._transaction = value;
         if (this._transaction) {
@@ -8243,16 +8262,6 @@ class TransactionBaseComponent {
     ngOnDestroy() {
         this._baseSubs.forEach(s => s.unsubscribe());
     }
-    handleCommit(value) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (yield this.lockTransaction()) {
-                this.committing = true;
-                const response = yield this.commit(value);
-                this.committing = false;
-                return response;
-            }
-        });
-    }
     deleteTransactionLineClick(event) {
         return __awaiter(this, void 0, void 0, function* () {
             event.preventDefault();
@@ -8299,6 +8308,9 @@ class TransactionBaseComponent {
         }
     }
     prepareTooltipMessage() {
+        if (this.forceWritable) { // should not check readonly-ness
+            return;
+        }
         this.tooltipMessage = '';
         let tooltips = [];
         if (this.headerTooltipMessages.length > 0 || this.lineTooltipMessages.length > 0) {
@@ -8354,6 +8366,7 @@ TransactionBaseComponent.ctorParameters = () => [
 ];
 TransactionBaseComponent.propDecorators = {
     cfgName: [{ type: Input }],
+    forceWritable: [{ type: Input }],
     transaction: [{ type: Input }],
     transactionLine: [{ type: Input }],
     transactionMarginInfo: [{ type: Input }],
@@ -8538,6 +8551,7 @@ DialogTransactionLineWarehouseCcComponent.decorators = [
           [transactionLine]="transactionLine"
           [value]="commissionCode"
           [useModel]="false"
+          [forceWritable]="true"
           (valueChange)="handleCommissionCodeChange($event)"></co-transaction-line-commission-code>
       </div>
       <div class="transaction-line-warehouse-cc-section">
@@ -8546,6 +8560,7 @@ DialogTransactionLineWarehouseCcComponent.decorators = [
           [transactionLine]="transactionLine"
           [value]="warehouse"
           [useModel]="false"
+          [forceWritable]="true"
           [transactionInfo]="transactionInfo"
           (valueChange)="handleWarehouseChange($event)"></co-transaction-line-warehouse>
       </div>
@@ -11159,15 +11174,30 @@ class TransactionService extends PendingReasonService {
     deleteTransactionLine(transactionUuid, TransactionLineUuid) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.connector.deleteTransactionLine(transactionUuid, TransactionLineUuid);
-            this.transactionDirty = true;
-            return this.handleLineOperationStatuses(response);
+            if (response) {
+                this.transactionDirty = true;
+                return this.handleLineOperationStatuses(response);
+            }
+            if (!this.manualSaveParam) {
+                yield this.rollback();
+            }
+            return false;
         });
     }
     changeTransactionLineQuantity(transactionUuid, lineUuid, newQuantity) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.connector.changeTransactionLineQuantity(transactionUuid, lineUuid, newQuantity);
-            this.transactionDirty = true;
-            return this.handleLineOperationStatuses(response);
+            const response = yield this.connector.changeTransactionLineQuantity(transactionUuid, lineUuid, newQuantity)
+                .catch(() => {
+                return null;
+            });
+            if (response) {
+                this.transactionDirty = true;
+                return this.handleLineOperationStatuses(response);
+            }
+            if (!this.manualSaveParam) {
+                yield this.rollback();
+            }
+            return false;
         });
     }
     getGoodsReceiptHistory(transId, lineNr) {
@@ -21490,14 +21520,23 @@ TransactionCardOrderDeliveryComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-transaction-card-order-delivery",] }]
 };
 
+var TransactionPickingButtonCategory;
+(function (TransactionPickingButtonCategory) {
+    TransactionPickingButtonCategory["OrderPicking"] = "serviceOrderPicking";
+    TransactionPickingButtonCategory["OrderToBePicked"] = "serviceOrderToBePicked";
+    TransactionPickingButtonCategory["OrderPicked"] = "serviceOrderPicked";
+})(TransactionPickingButtonCategory || (TransactionPickingButtonCategory = {}));
+
 class TransactionSalesPickingButtonBarButtonComponent extends TransactionButtonBarButtonBaseComponent {
-    constructor(iconCacheService, _mappingService, _transactionEventService) {
+    constructor(iconCacheService, _mappingService, _transactionEventService, _transactionService) {
         super();
         this.iconCacheService = iconCacheService;
         this._mappingService = _mappingService;
         this._transactionEventService = _transactionEventService;
+        this._transactionService = _transactionService;
         this.icons = Icon;
         this.category = TransactionTypeCategory;
+        this.buttonCategory = TransactionPickingButtonCategory;
         this.buttonClicked = new EventEmitter();
         this.showClass = true;
         this.showCategories = false;
@@ -21532,18 +21571,35 @@ class TransactionSalesPickingButtonBarButtonComponent extends TransactionButtonB
         this.showCategories = !this.showCategories;
     }
     handlePickingCategoryClicked(event, category) {
-        const pickingButton = this._mappingService.getButtonBar(TransactionKind.SalesOrder)
-            .find((button) => button.title === 'LOGISTICS');
+        let pickingButton;
+        if (this._transactionService.transactionKind === TransactionKind.SalesOrder) {
+            pickingButton = this._mappingService.getButtonBar(TransactionKind.SalesOrder)
+                .find((button) => button.title === 'LOGISTICS');
+        }
+        else {
+            pickingButton = this._mappingService.getButtonBar(TransactionKind.ServiceOrder)
+                .find((button) => button.title === 'LOGISTICS');
+        }
         this.showCategories = false;
         event.preventDefault();
         event.stopPropagation();
-        if (category === TransactionTypeCategory.SalesOrderToBePicked) {
+        if (category === TransactionPickingButtonCategory.OrderToBePicked) {
             pickingButton.icon = this.icons.BoxesPackingRegular;
-            pickingButton.category = TransactionTypeCategory.SalesOrderToBePicked;
+            if (this._transactionService.transactionKind === TransactionKind.SalesOrder) {
+                pickingButton.category = TransactionTypeCategory.SalesOrderToBePicked;
+            }
+            else {
+                pickingButton.category = TransactionTypeCategory.ServiceOrderToBePicked;
+            }
         }
         else {
             pickingButton.icon = this.icons.RegularBoxesPackingCircleCheck;
-            pickingButton.category = TransactionTypeCategory.SalesOrderPicked;
+            if (this._transactionService.transactionKind === TransactionKind.SalesOrder) {
+                pickingButton.category = TransactionTypeCategory.SalesOrderPicked;
+            }
+            else {
+                pickingButton.category = TransactionTypeCategory.ServiceOrderPicked;
+            }
         }
         this.buttonClicked.next(pickingButton);
     }
@@ -21560,12 +21616,12 @@ TransactionSalesPickingButtonBarButtonComponent.decorators = [
       <co-icon class="co-transaction-button-bar-icon" [iconData]="iconCacheService.getIcon(iconName)"></co-icon>
       <span class="button-title" [textContent]="title | localize"></span>
       <div class="picking-type-wrapper" *ngIf="showCategories">
-        <div class="button-wrapper" (click)="handlePickingCategoryClicked($event, category.SalesOrderToBePicked)">
+        <div class="button-wrapper" (click)="handlePickingCategoryClicked($event, buttonCategory.OrderToBePicked)">
           <co-animated-checkbox [checked]="toBePickedChecked"></co-animated-checkbox>
           <co-icon class="co-transaction-button-bar-icon" [iconData]="iconCacheService.getIcon(icons.BoxesPackingRegular)"></co-icon>
           <span class="button-title" [textContent]="'TO_PICK' | localize"></span>
         </div>
-        <div class="button-wrapper" (click)="handlePickingCategoryClicked($event, category.SalesOrderPicked)">
+        <div class="button-wrapper" (click)="handlePickingCategoryClicked($event, buttonCategory.OrderPicked)">
           <co-animated-checkbox [checked]="pickedChecked"></co-animated-checkbox>
           <co-icon class="co-transaction-button-bar-icon"
                    [iconData]="iconCacheService.getIcon(icons.RegularBoxesPackingCircleCheck)"></co-icon>
@@ -21580,7 +21636,8 @@ TransactionSalesPickingButtonBarButtonComponent.decorators = [
 TransactionSalesPickingButtonBarButtonComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: TransactionMappingService },
-    { type: TransactionEventService }
+    { type: TransactionEventService },
+    { type: TransactionService }
 ];
 TransactionSalesPickingButtonBarButtonComponent.propDecorators = {
     buttonClicked: [{ type: Output }],
@@ -23488,8 +23545,8 @@ TransactionLinesSidePanelCashDeskComponent.decorators = [
                                                   [paymentViewModel]="selectedPaymentMethod"
                                                   [cashRegisterNr]="cashRegisterNr"
                                                   [cashRegisterGroupId]="cashRegisterGroupId"
-                                                  [cashRegisterDrawerId]="cashRegisterDrawerId"
                                                   [cashRegisterDrawerNr]="cashRegisterDrawerNr"
+                                                  [cashRegisterDrawerId]="cashRegisterDrawerId"
                                                   [printerName]="printerName"
                                                   [emailLayout]="emailLayout"
                                                   [printerLayout]="printerLayout"
@@ -24880,6 +24937,14 @@ class TransactionMappingService {
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderToBePicked }, TransactionQuickAccessToBePickedComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderPicked }, TransactionQuickAccessPickedComponent],
             [{ type: TransactionKind.SalesOrder, category: TransactionTypeCategory.SalesOrderPlanning }, TransactionQuickAccessPlanningComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderOverview }, TransactionQuickAccessOverviewComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderPurchase }, TransactionQuickAccessOrderPurchaseComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderAllocation }, TransactionQuickAccessGoodsAllocationComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderDeliveryNote }, TransactionQuickAccessOrderDeliveryComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderInvoice }, TransactionQuickAccessInvoiceComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderToBePicked }, TransactionQuickAccessToBePickedComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderPicked }, TransactionQuickAccessPickedComponent],
+            [{ type: TransactionKind.ServiceOrder, category: TransactionTypeCategory.ServiceOrderPlanning }, TransactionQuickAccessPlanningComponent],
             [{ type: TransactionKind.SalesQuotation, category: TransactionTypeCategory.SalesOrderQuotation }, TransactionQuickAccessSalesQuotationComponent]
         ]);
         this._transactionGridComponent = new Map([
@@ -25962,7 +26027,7 @@ TransactionLineCommissionCodeComponent.decorators = [
     <co-transaction-line-checkbox-list
       [committing]="committing"
       [collection]="viewModelsFiltered"
-      [readonly]="readonly"
+      [readonly]="readonly && !forceWritable"
       [tooltip]="tooltipMessage"
       (checked)="handleChecked($event)"
     ></co-transaction-line-checkbox-list>
@@ -26392,7 +26457,7 @@ TransactionLineWarehouseComponent.decorators = [
     <co-transaction-line-checkbox-list
       [committing]="committing"
       [collection]="viewModelsFiltered"
-      [readonly]="readonly"
+      [readonly]="readonly && !forceWritable"
       [tooltip]="tooltipMessage"
       (checked)="handleChecked($event)"
     ></co-transaction-line-checkbox-list>
@@ -27698,23 +27763,22 @@ class TransactionLineAmountComponent extends TransactionBaseComponent {
     constructor() {
         super(...arguments);
         this.isReturn = false;
-    }
-    showClass() {
-        return true;
-    }
-    commit(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
+        this.commit = (amount) => __awaiter(this, void 0, void 0, function* () {
             if (this.transactionInfo && this.transactionLine && this.transactionLine.amount !== amount) {
+                this.localAmount = amount;
                 const oldAmount = this.transactionLine.amount;
                 const success = yield this.transactionService.changeTransactionLineQuantity(this.transactionInfo.uuid, this.transactionLine.uuid, amount);
                 if (!success) {
-                    this.localAmount = amount;
+                    this.localAmount = oldAmount;
                 }
                 return success;
             }
             return true;
         });
     }
+    showClass() {
+        return true;
+    }
     transactionLineSet() {
         const _super = Object.create(null, {
             transactionLineSet: { get: () => super.transactionLineSet }
@@ -30876,10 +30940,10 @@ class TransactionPaymentService {
     }
     setCashDrawerIdIfValidDrawer(drawerNr) {
         return __awaiter(this, void 0, void 0, function* () {
-            this._cashRegisterDrawerId = NaN;
             if (!drawerNr) {
                 return;
             }
+            this._cashRegisterDrawerId = NaN;
             let request = new CashDrawersRequest();
             request.group = this.cashRegisterGroupId;
             request.date = "?='" + this._datePipe.transform(new Date(), "dd-MM-yyyy") + "'";
@@ -51372,8 +51436,10 @@ class TransactionLineSidePanelSalesReservationComponent {
             request.reservationLines = [...this.reservationOrderLines.filter(line => line.selected)];
             let response = yield this._transactionService.processReservation(request);
             if (response) {
+                this._transactionService.currentTransaction = response;
+                yield this._transactionService.saveTransaction();
                 yield this._transactionService.checkRefTransaction();
-                yield this._transactionService.rememberCurrentTransaction(this._transactionService.currentTransaction);
+                // await this._transactionService.rememberCurrentTransaction(this._transactionService.currentTransaction);
                 this.handleCloseSidePanel();
             }
         });
@@ -55238,9 +55304,9 @@ class TransactionCashRegisterDialogComponent extends TransactionBaseComponent {
         this.selectedPrinterLayout = defaultPrintLayout ? defaultPrintLayout : null;
         const defaultEmailLayout = this.emailLayouts.find((layout) => layout.isDefault);
         this.selectedEmailLayout = defaultEmailLayout ? defaultEmailLayout : null;
-        if (this.activeCashDrawer && this.activePrinter && defaultPrintLayout && defaultEmailLayout) {
-            this.saveButtonClick();
-        }
+        /*if (this.activeCashDrawer && this.activePrinter && defaultPrintLayout && defaultEmailLayout) {
+          this.saveButtonClick();
+        }*/
     }
     _prepareDialogData() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -55273,7 +55339,7 @@ TransactionCashRegisterDialogComponent.decorators = [
                   ></co-payment-tile>
               </div>
 
-              <co-list-of-values [label]="'CASH_DRAWER' | localize"
+              <co-list-of-values [label]="'CASH_DRAWER' | localize"  *ngIf="!activeCashRegister?.defaultDrawerNumber"
                                  [(model)]="activeCashDrawer"
                                  [displayField]="'nr'"
                                  [collection]="cashDrawers"
@@ -55284,7 +55350,7 @@ TransactionCashRegisterDialogComponent.decorators = [
                                  (modelChange)="handleDrawerChanged($event)"
               ></co-list-of-values>
 
-              <co-list-of-values [label]="'PRINTER' | localize"
+              <co-list-of-values [label]="'PRINTER' | localize" *ngIf="!activeCashRegister?.defaultPrinter"
                                  [(model)]="activePrinter"
                                  [displayField]="'name'"
                                  [collection]="printerList"