@colijnit/transaction 255.1.44 → 255.1.46

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.44";
-        this.publishDate = "02/10/2024, 09:45:49";
+        this.symVer = "255.1.46";
+        this.publishDate = "03/10/2024, 16:19:52";
     }
 }
 
@@ -7940,6 +7940,17 @@ var TransactionCfgName;
     /* Invoice_check rubric */
     /* Service Overview Tab*/
     TransactionCfgName["ServiceMessage"] = "serviceMessage";
+    TransactionCfgName["ServiceWizardMessage"] = "serviceWizardMessage";
+    TransactionCfgName["ServiceOverviewImage"] = "serviceOverviewImage";
+    TransactionCfgName["ServicePriority"] = "servicePriority";
+    TransactionCfgName["ServiceCauseCode"] = "serviceCauseCode";
+    TransactionCfgName["ServiceEntryType"] = "serviceEntryType";
+    TransactionCfgName["HeaderTaskCreator"] = "headerTaskCreator";
+    TransactionCfgName["HeaderActivityList"] = "headerActivityList";
+    TransactionCfgName["HeaderHistActivities"] = "headerHistActivities";
+    TransactionCfgName["HeaderProductDetails"] = "headerProductDetails";
+    TransactionCfgName["HeaderOrderDetails"] = "headerOrderDetails";
+    TransactionCfgName["HeaderPurchaseDetails"] = "headerPurchaseDetails";
 })(TransactionCfgName || (TransactionCfgName = {}));
 
 class TransactionScreenConfigurationService extends BaseModuleScreenConfigService {
@@ -8058,6 +8069,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 +8085,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 +8273,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 +8319,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 +8377,7 @@ TransactionBaseComponent.ctorParameters = () => [
 ];
 TransactionBaseComponent.propDecorators = {
     cfgName: [{ type: Input }],
+    forceWritable: [{ type: Input }],
     transaction: [{ type: Input }],
     transactionLine: [{ type: Input }],
     transactionMarginInfo: [{ type: Input }],
@@ -8538,6 +8562,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 +8571,7 @@ DialogTransactionLineWarehouseCcComponent.decorators = [
           [transactionLine]="transactionLine"
           [value]="warehouse"
           [useModel]="false"
+          [forceWritable]="true"
           [transactionInfo]="transactionInfo"
           (valueChange)="handleWarehouseChange($event)"></co-transaction-line-warehouse>
       </div>
@@ -11159,15 +11185,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 +21531,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 +21582,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 +21627,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 +21647,8 @@ TransactionSalesPickingButtonBarButtonComponent.decorators = [
 TransactionSalesPickingButtonBarButtonComponent.ctorParameters = () => [
     { type: IconCacheService },
     { type: TransactionMappingService },
-    { type: TransactionEventService }
+    { type: TransactionEventService },
+    { type: TransactionService }
 ];
 TransactionSalesPickingButtonBarButtonComponent.propDecorators = {
     buttonClicked: [{ type: Output }],
@@ -23488,8 +23556,8 @@ TransactionLinesSidePanelCashDeskComponent.decorators = [
                                                   [paymentViewModel]="selectedPaymentMethod"
                                                   [cashRegisterNr]="cashRegisterNr"
                                                   [cashRegisterGroupId]="cashRegisterGroupId"
-                                                  [cashRegisterDrawerId]="cashRegisterDrawerId"
                                                   [cashRegisterDrawerNr]="cashRegisterDrawerNr"
+                                                  [cashRegisterDrawerId]="cashRegisterDrawerId"
                                                   [printerName]="printerName"
                                                   [emailLayout]="emailLayout"
                                                   [printerLayout]="printerLayout"
@@ -24030,104 +24098,109 @@ TransactionCardPurchaseConfirmationComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-card-purchase-confirmation',
                 template: `
-      <co-transaction-base-card
-              [transactionInfo]="transactionInfo"
+    <co-transaction-base-card
+      [transactionInfo]="transactionInfo"
+      [transactionLine]="transactionLine"
+      [showColorIndicator]="showColorIndicator"
+      [colorIndicatorColor]="colorIndicatorColor"
+      (dragover)="handleDragOver($event)"
+      (drop)="handleDrop($event)"
+      (dragleave)="handleDragLeave($event)"
+    >
+      <div class="transaction-card-wrapper">
+        <co-transaction-card-header
+          [transactionLine]="transactionLine"
+          [showActionButtons]="true"
+          [showCheckbox]="showCheckboxForLine"
+          [showThumbnail]="false"
+          [expanded]="expanded"
+        >
+        </co-transaction-card-header>
+
+        <div class="transaction-card-content-wrapper">
+          <div class="content-base top-base">
+            <co-transaction-line-commission-button [transactionLine]="transactionLine"
+                                                   [transactionInfo]="transactionInfo"></co-transaction-line-commission-button>
+            <co-transaction-line-supplier-button [transactionLine]="transactionLine"
+                                                 [transactionInfo]="transactionInfo"></co-transaction-line-supplier-button>
+            <co-transaction-line-statusbar data-action="openSidePanel"
+                                           [screenConfigurationObject]="cfgNames.StatusBar"
+                                           [configNames]="statusBarConfigNames"
+                                           [transactionInfo]="transactionInfo"
+                                           [transactionLine]="transactionLine"
+                                           [activeCategory]="transactionTypeCategory.PurchaseOrderOrderConfirmation"
+            ></co-transaction-line-statusbar>
+          </div>
+          <div class="content-base bottom-base">
+            <co-input-text
+              class="transaction-line-totals-price"
+              [class.warning]="showColorIndicator && transactionLine.purchasePortalLine.grossOrderPrice != transactionLine.purchasePortalLine.confirmedPrice"
+              [model]="transactionLine.purchasePortalLine.grossOrderPrice | coCurrency"
+              [readonly]="true"
+              [customHeight]="true">
+            </co-input-text>
+            <co-transaction-line-discount-button
+              [screenConfigurationObject]="cfgNames.LineDiscount"
               [transactionLine]="transactionLine"
-              [showColorIndicator]="showColorIndicator"
-              [colorIndicatorColor]="colorIndicatorColor"
-              (dragover)="handleDragOver($event)"
-              (drop)="handleDrop($event)"
-              (dragleave)="handleDragLeave($event)"
-      >
-        <div class="transaction-card-wrapper">
-            <co-transaction-card-header
-                    [transactionLine]="transactionLine"
-                    [showActionButtons]="true"
-                    [showCheckbox]="showCheckboxForLine"
-                    [showThumbnail]="false"
-                    [expanded]="expanded"
-            >
-             </co-transaction-card-header>
-
-            <div class="transaction-card-content-wrapper">
-                <div class="content-base top-base">
-                    <co-transaction-line-commission-button [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-commission-button>
-                    <co-transaction-line-supplier-button [transactionLine]="transactionLine" [transactionInfo]="transactionInfo"></co-transaction-line-supplier-button>
-                    <co-transaction-line-statusbar data-action="openSidePanel"
-                                                   [screenConfigurationObject]="cfgNames.StatusBar"
-                                                   [configNames]="statusBarConfigNames"
-                                                   [transactionInfo]="transactionInfo"
-                                                   [transactionLine]="transactionLine"
-                                                   [activeCategory]="transactionTypeCategory.PurchaseOrderOrderConfirmation"
-                    ></co-transaction-line-statusbar>
-                </div>
-                <div class="content-base bottom-base">
-                  <co-input-text class="transaction-line-totals-price"
-                                 [model]="transactionLine.purchasePortalLine.grossOrderPrice | coCurrency"
-                                 [readonly]="true"
-                                 [customHeight]="true"
-                  ></co-input-text>
-                  <co-transaction-line-discount-button
-                    [screenConfigurationObject]="cfgNames.LineDiscount"
-                    [transactionLine]="transactionLine"
-                    [transactionInfo]="transactionInfo"
-                  ></co-transaction-line-discount-button>
-                  <div class="transaction-line-totals-amount">
-                    <co-input-text
-                      [model]="transactionLine.amount"
-                      [leftIconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"
-                      [readonly]="true"
-                      [customHeight]="true"
-                    ></co-input-text>
-                  </div>
-                  <co-input-text class="transaction-line-totals-total"
-                                 [model]="transactionLine.displayNetLineTotal | coCurrency"
-                                 [readonly]="true"
-                                 [customHeight]="true"
-                  ></co-input-text>
-                </div>
-                <div class="content-expanded" *ngIf="expanded">
-                  <co-input-text
-                    [model]="transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'"
-                    [leftIconData]="iconCacheService.getIcon(icons.RegularIndustryTag)"
-                    [customHeight]="true"
-                    [readonly]="true"
-                  ></co-input-text>
-                  <co-transaction-line-supplier-delivery-date-button
-                    [screenConfigurationObject]="cfgNames.LineConfirmedDate"
-                    [transactionLine]="transactionLine"
-                  ></co-transaction-line-supplier-delivery-date-button>
-                </div>
-                <div class="content-expanded" *ngIf="expanded">
-                  <co-input-number-picker class="amount-number-picker"
-                                          [screenConfigurationObject]="cfgNames.LineConfirmedAmount"
-                                          [required]="true"
-                                          [(model)]="+transactionLine.quantityPurchaseToConfirm"
-                                          [decimals]="decimals"
-                                          [min]="1"
-                                          [max]="+transactionLine.purchasePortalLine.amountOrdered"
-                                          [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"
-                  ></co-input-number-picker>
-                  <co-transaction-line-confirmed-price class="transaction-line-confirmed-price price"
-                                                       [screenConfigurationObject]="cfgNames.LineConfirmedPrice"
-                                                       [(price)]="transactionLine.purchasePortalLine.confirmedPrice"
-                                                       [showLabel]="false"
-                                                       [defaultEditMode]="false"
-                  ></co-transaction-line-confirmed-price>
-                </div>
+              [transactionInfo]="transactionInfo"
+            ></co-transaction-line-discount-button>
+            <div class="transaction-line-totals-amount">
+              <co-input-text
+                [class.warning]="showColorIndicator && transactionLine.amount !== transactionLine.quantityPurchaseToConfirm"
+                [model]="transactionLine.amount"
+                [leftIconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"
+                [readonly]="true"
+                [customHeight]="true"
+              ></co-input-text>
             </div>
-
-            <co-transaction-card-footer
-                    [statusBarConfigNames]="statusBarConfigNames"
-                    [transaction]="transaction"
-                    [transactionLine]="transactionLine"
-                    [transactionTypeCategory]="transactionTypeCategory.SalesOrderPurchase"
-                    [expanded]="expanded"
-                    (expandClicked)="expanded = !expanded"
-            ></co-transaction-card-footer>
+            <co-input-text class="transaction-line-totals-total"
+                           [model]="transactionLine.displayNetLineTotal | coCurrency"
+                           [readonly]="true"
+                           [customHeight]="true"
+            ></co-input-text>
+          </div>
+          <div class="content-expanded" *ngIf="expanded">
+            <co-input-text
+              [model]="transactionLine.purchasePortalLine.articleNoSupplier ? transactionLine.purchasePortalLine.articleNoSupplier : '-'"
+              [leftIconData]="iconCacheService.getIcon(icons.RegularIndustryTag)"
+              [customHeight]="true"
+              [readonly]="true"
+            ></co-input-text>
+            <co-transaction-line-supplier-delivery-date-button
+              [screenConfigurationObject]="cfgNames.LineConfirmedDate"
+              [transactionLine]="transactionLine"
+            ></co-transaction-line-supplier-delivery-date-button>
+          </div>
+          <div class="content-expanded" *ngIf="expanded">
+            <co-input-number-picker class="amount-number-picker"
+                                    [screenConfigurationObject]="cfgNames.LineConfirmedAmount"
+                                    [required]="true"
+                                    [(model)]="+transactionLine.quantityPurchaseToConfirm"
+                                    [decimals]="decimals"
+                                    [min]="1"
+                                    [max]="+transactionLine.purchasePortalLine.amountOrdered"
+                                    [leftIconData]="iconCacheService.getIcon(icons.FileCircleInfoRegular)"
+            ></co-input-number-picker>
+            <co-transaction-line-confirmed-price class="transaction-line-confirmed-price price"
+                                                 [screenConfigurationObject]="cfgNames.LineConfirmedPrice"
+                                                 [(price)]="transactionLine.purchasePortalLine.confirmedPrice"
+                                                 [showLabel]="false"
+                                                 [defaultEditMode]="false"
+            ></co-transaction-line-confirmed-price>
+          </div>
         </div>
-      </co-transaction-base-card>
-    `,
+
+        <co-transaction-card-footer
+          [statusBarConfigNames]="statusBarConfigNames"
+          [transaction]="transaction"
+          [transactionLine]="transactionLine"
+          [transactionTypeCategory]="transactionTypeCategory.SalesOrderPurchase"
+          [expanded]="expanded"
+          (expandClicked)="expanded = !expanded"
+        ></co-transaction-card-footer>
+      </div>
+    </co-transaction-base-card>
+  `,
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -24146,6 +24219,7 @@ class TransactionLinesSidePanelServiceOrderComponent extends TransactionBaseComp
         this.transactionService = transactionService;
         this.changeDetector = changeDetector;
         this.Icon = Icon;
+        this.cfgNames = TransactionCfgName;
         this.showDetails = false;
     }
     showClass() {
@@ -24169,7 +24243,7 @@ TransactionLinesSidePanelServiceOrderComponent.decorators = [
                 selector: 'co-transaction-lines-side-panel-service-order',
                 template: `
     <div class="full-details-wrapper">
-      <div class="details-wrapper">
+      <div class="details-wrapper" [screenConfigurationObject]="cfgNames.HeaderProductDetails" screenConfigNativeElement>
         <div class="details-label-wrapper clickable" (click)="showDetailsClick()">
           <label class="detail-label" [textContent]="'ARTICLE_DETAILS' | localize"
           ></label>
@@ -24200,7 +24274,7 @@ TransactionLinesSidePanelServiceOrderComponent.decorators = [
       <div class="show-details-wrapper"
            *ngIf="showDetails"
            [@slideToggle]="showDetails ? 'open' : 'closed'">
-        <div class="details-wrapper">
+        <div class="details-wrapper" [screenConfigurationObject]="cfgNames.HeaderOrderDetails" screenConfigNativeElement>
           <div class="details-label-wrapper">
             <label class="detail-label" [textContent]="'SALESORDER_DETAIL' | localize"
             ></label>
@@ -24227,7 +24301,7 @@ TransactionLinesSidePanelServiceOrderComponent.decorators = [
             </div>
           </div>
         </div>
-        <div class="details-wrapper">
+        <div class="details-wrapper" [screenConfigurationObject]="cfgNames.HeaderPurchaseDetails" screenConfigNativeElement>
           <div class="details-label-wrapper">
             <label class="detail-label" [textContent]="'PURCHASEORDER_DETAIL' | localize"
             ></label>
@@ -24880,6 +24954,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 +26044,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 +26474,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 +27780,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 }
@@ -30549,6 +30630,11 @@ AvatarComponent.decorators = [
       </svg>
     </ng-template>
   `,
+                providers: [{
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
+                        useExisting: forwardRef(() => AvatarComponent)
+                    }
+                ],
                 changeDetection: ChangeDetectionStrategy.OnPush,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -30667,8 +30753,8 @@ class TransactionPaymentService {
         this.pollingForStatusStarted = new Subject();
         this.pollingForStatusEnded = new Subject();
         this.doNotFetchAmountToPayForRemaining = false;
-        this._paymentStatusPollIntervalMs = 5000;
-        this._paymentStatusMaxPollInterval = 60;
+        this._paymentStatusPollIntervalMs = 1000;
+        this._paymentStatusMaxPollInterval = 300; // give the customer 5 minutes (300 x 1 second interval) to pay
         this._paymentStatusPollIntervalCount = 0;
     }
     set currentPaymentMethod(value) {
@@ -30876,10 +30962,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") + "'";
@@ -32332,12 +32418,11 @@ TransactionHeaderDeliveryComponent.decorators = [
                                                     [transactionInfo]="transactionInfo"
       ></co-transaction-header-delivery-method-button>
 
-      <!--div class="header-delivery-preferred-deliverydate-label co-transaction-label" [textContent]="'PREFERRED_DATE' | localize"></div>
       <co-transaction-header-preferred-delivery-date class="header-delivery-deliverydate"
                                                      [transactionInfo]="transactionInfo"
                                                      [defaultEditMode]="false"
                                                      [showLabel]="false"
-      ></co-transaction-header-preferred-delivery-date-->
+      ></co-transaction-header-preferred-delivery-date>
      </ng-template>
     <ng-template #hiddenBlock>
       <co-transaction-header-partial-delivery class="transaction-header-partial-delivery co-transaction-label"
@@ -33980,6 +34065,10 @@ TransactionHeaderPopupOrderComponent.decorators = [
       </co-project-code-modal>
     </div>
   `,
+                providers: [{
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
+                        useExisting: forwardRef(() => TransactionHeaderPopupOrderComponent)
+                    }],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -39239,11 +39328,6 @@ TransactionInternalComponent.decorators = [
       </div>
     </ng-container>
   `,
-                providers: [{
-                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
-                        useExisting: forwardRef(() => TransactionInternalComponent)
-                    }
-                ],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -52354,27 +52438,28 @@ TransactionServiceOverviewComponent.decorators = [
           <div class="service-message-wrapper">
             <label class="label service-label" [textContent]="'SERVICE_REPORT'| localize"></label>
             <span  *ngIf="transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers"
-                               [textContent]="transactionServiceInfo.wizardQuestionsAndAnswers"></span> <!--[screenConfigurationObject]="" screenConfigNativeElement-->
+                               [textContent]="transactionServiceInfo.wizardQuestionsAndAnswers" [screenConfigurationObject]="cfgNames.ServiceWizardMessage" screenConfigNativeElement
+                               ></span> <!---->
             <co-transaction-service-message  class="transaction-service-message" [transaction]="transaction">
             </co-transaction-service-message>
           </div>
-          <co-files-upload (documentChangeEvent)="upsertDocument($event)"
+          <co-files-upload (documentChangeEvent)="upsertDocument($event)" [screenConfigurationObject]="cfgNames.ServiceOverviewImage"
                            (documentDeleted)="deleteDocument($event)"
                            [label]="'ADD_IMAGES' | localize"
                            [documents]="documents"
-                           [isEditable]="false">
+                           [isEditable]="false" > <!---->
           </co-files-upload>
           <div class="service-order-lines-wrapper">
             <div class="service-message-extra-wrapper">
               <co-list-of-values [label]="'PRIORITY'| localize" displayField="description" [model]="priorityModel"
-                                 [collection]="priorityDomainColl"
-                                 (modelChange)="setPriority($event)"></co-list-of-values>
+                                 [collection]="priorityDomainColl" [screenConfigurationObject]="cfgNames.ServicePriority"
+                                 (modelChange)="setPriority($event)"></co-list-of-values> <!---->
               <co-list-of-values [label]="'CAUSE_CODE' | localize" displayField="description" [model]="causeCodeModel"
-                                 [collection]="causeCodeColl"
-                                 (modelChange)="setCauseCode($event)"></co-list-of-values>
+                                 [collection]="causeCodeColl" [screenConfigurationObject]="cfgNames.ServiceCauseCode"
+                                 (modelChange)="setCauseCode($event)"></co-list-of-values> <!---->
               <co-list-of-values [label]="'ENTRY_TYPE' | localize" displayField="description" [model]="entryTypeModel"
-                                 [collection]="entryTypeColl"
-                                 (modelChange)="setEntryType($event)"></co-list-of-values>
+                                 [collection]="entryTypeColl" [screenConfigurationObject]="cfgNames.ServiceEntryType"
+                                 (modelChange)="setEntryType($event)"></co-list-of-values> <!---->
             </div>
             <co-transaction-lines-side-panel
               class="higher-max-width"
@@ -52386,22 +52471,27 @@ TransactionServiceOverviewComponent.decorators = [
         </div>
         <div class="activity-list-component-wrapper">
           <div class="activity-task-creator-wrapper">
-            <co-component-activity-list #openActivities [showActivityHeader]="showActivityHeader" [table]="TableName.Transactions" [key]="transactionInfo.id.toString()" (refreshRequested)="finishedActivitiesRefreshRequested()">
+            <co-component-activity-list #openActivities [showActivityHeader]="showActivityHeader" [screenConfigurationObject]="cfgNames.HeaderActivityList"
+                                        [table]="TableName.Transactions" [key]="transactionInfo.id.toString()" (refreshRequested)="finishedActivitiesRefreshRequested()">
             </co-component-activity-list>
             <co-task-creator [table]="TableName.Transactions" [remarkAndWorkKey]="transactionInfo.id.toString()" [taskKey]="transactionInfo.transactionNr.toString()"
                              [author]="transactionService.loggedInUser" [branchNo]="transactionInfo.branch.relationNr.toString()"
-                             [workflowCategoryType]="WorkflowCategoryType.ServiceOrder"
+                             [workflowCategoryType]="WorkflowCategoryType.ServiceOrder" [screenConfigurationObject]="cfgNames.HeaderTaskCreator"
                              (activityCreated)="fullActivitiesRefreshRequested()"></co-task-creator>
           </div>
           <div class="activity-list-conv-wrapper">
-            <label class="label history-label" [textContent]="'HISTORIC_ACTIVITY_CHAT'| localize"></label>
-            <co-activity-list [activities]="activities"></co-activity-list>
+            <label class="label history-label" [textContent]="'HISTORIC_ACTIVITY_CHAT'| localize" [screenConfigurationObject]="cfgNames.HeaderHistActivities" screenConfigNativeElement></label>
+            <co-activity-list [activities]="activities" [screenConfigurationObject]="cfgNames.HeaderHistActivities"></co-activity-list>
           </div>
         </div>
       </div>
     </div>
 
   `,
+                providers: [{
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
+                        useExisting: forwardRef(() => TransactionServiceOverviewComponent)
+                    }],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -52455,7 +52545,8 @@ TransactionServiceMessageComponent.decorators = [
                    [model]="transactionServiceInfo.reportMessage"
                    [forceReadonly]="readonly"
                    [showSaveCancel]="true"
-    ></co-input-textarea> <!--[screenConfigurationObject]="cfgNames.ServiceMessage"-->
+                   [screenConfigurationObject]="cfgNames.ServiceMessage"
+    ></co-input-textarea>
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -53584,7 +53675,8 @@ TransactionLinesSidePanelServiceOrderModule.decorators = [
                     CommonModule,
                     InputTextareaModule,
                     InputTextModule,
-                    IconModule
+                    IconModule,
+                    ScreenConfigurationModule
                 ],
                 declarations: [
                     TransactionLinesSidePanelServiceOrderComponent
@@ -53631,7 +53723,8 @@ TransactionServiceOverviewModule.decorators = [
                     ComponentActivityListModule,
                     TaskCreatorModule,
                     TransactionLinesSidePanelModule,
-                    TransactionServiceMessageModule
+                    TransactionServiceMessageModule,
+                    ScreenConfigurationModule,
                 ],
                 declarations: [
                     TransactionServiceOverviewComponent
@@ -55240,7 +55333,7 @@ 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) {
+        if (this.activeCashDrawer && this.activePrinter && defaultPrintLayout && defaultEmailLayout && this.cashRegisters.length === 1) {
             this.saveButtonClick();
         }
     }
@@ -55275,7 +55368,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"
@@ -55286,7 +55379,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"