@colijnit/transaction 255.1.45 → 255.1.47

package/fesm2015/colijnit-transaction.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import * as i0 from '@angular/core';
-import { Injectable, Component, ViewEncapsulation, Input, HostBinding, EventEmitter, ChangeDetectorRef, Output, Injector, ComponentFactoryResolver, ApplicationRef, Directive, ViewChild, ViewChildren, ElementRef, forwardRef, Pipe, NgModule, ContentChildren, HostListener, ChangeDetectionStrategy, Renderer2, QueryList } from '@angular/core';
+import { Injectable, Component, ViewEncapsulation, Input, HostBinding, EventEmitter, ChangeDetectorRef, Output, Injector, ComponentFactoryResolver, ApplicationRef, Directive, ViewChild, ViewChildren, ElementRef, forwardRef, Pipe, NgModule, ContentChildren, HostListener, ChangeDetectionStrategy, Renderer2 } from '@angular/core';
 import { SequenceName } from '@colijnit/transactionapi/build/enum/sequence-name.enum';
 import { BehaviorSubject, Subject, throwError } from 'rxjs';
 import { PendingReasonType } from '@colijnit/transactionapi/build/enum/pending-reason-type.enum';
@@ -268,8 +268,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "255.1.45";
-        this.publishDate = "2-10-2024 17:30:09";
+        this.symVer = "255.1.47";
+        this.publishDate = "7-10-2024 18:54:44";
     }
 }
 
@@ -6133,6 +6133,17 @@ class TransactionConnectorAdapterService {
             }
         });
     }
+    restoreDeliverySettings(ordersToBeRestored) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.connector.restoreDeliverySettings(ordersToBeRestored);
+            if (response && response.validationResult.success) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        });
+    }
     _openPdfContent(content) {
         if (content) {
             try {
@@ -7701,6 +7712,11 @@ class TransactionConnectorService {
             return yield this._adapterService.getUserGroups();
         });
     }
+    restoreDeliverySettings(ordersToBeRestored) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._adapterService.restoreDeliverySettings(ordersToBeRestored);
+        });
+    }
 }
 TransactionConnectorService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TransactionConnectorService_Factory() { return new TransactionConnectorService(i0.ɵɵinject(TransactionConnectorAdapterService), i0.ɵɵinject(TransactionSelectSingleCacheService), i0.ɵɵinject(TransactionSelectMultipleCacheService), i0.ɵɵinject(TransactionSelectMultipleParameterizedCacheService), i0.ɵɵinject(TransactionSelectSingleParameterizedCacheService)); }, token: TransactionConnectorService, providedIn: "root" });
 TransactionConnectorService.decorators = [
@@ -7940,6 +7956,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 {
@@ -12430,6 +12457,8 @@ var CheckoutCfgName;
     CheckoutCfgName["DepositAmount"] = "depositAmount";
     CheckoutCfgName["Branch"] = "branch";
     CheckoutCfgName["AdministrativeManager"] = "administrativeManager";
+    CheckoutCfgName["SalesPerson"] = "salesPerson";
+    CheckoutCfgName["PaymentCondition"] = "paymentCondition";
     CheckoutCfgName["MarketingCode"] = "marketingCode";
     CheckoutCfgName["Definitive"] = "definitive";
     CheckoutCfgName["OnHoldCodes"] = "onHoldCodes";
@@ -13529,6 +13558,15 @@ CheckoutOverviewDeliveryEditComponent.decorators = [
                                       [screenConfigurationObject]="cfgNames.AdministrativeManager"
                                       [transactionInfo]="transaction.transactionInfo"></co-transaction-header-administrative-relation>
                           </div>
+                        <div class="checkout-data-row">
+                          <co-transaction-header-payment-condition
+                            [screenConfigurationObject]="cfgNames.PaymentCondition"
+                            [transactionInfo]="transaction.transactionInfo">
+                          </co-transaction-header-payment-condition>
+                          <co-transaction-header-sales-person
+                            [screenConfigurationObject]="cfgNames.SalesPerson"
+                            [transactionInfo]="transaction.transactionInfo"></co-transaction-header-sales-person>
+                        </div>
                           <div class="checkout-data-row" *ngIf="showOrderParameters">
                             <co-transaction-header-definitive
                               [screenConfigurationObject]="cfgNames.Definitive"
@@ -23609,12 +23647,12 @@ class DeliveryPlanningService {
         this._transaction = _transaction;
         this._dragging = false;
         this._planTransportWeek = [];
+        this._planTransportWeekArr = [];
         this._deliveryMethods = [];
         this._districts = [];
         this._skills = [];
         this._employees = [];
         this._userGroups = [];
-        this._tilesQueryList = new QueryList();
         this.currentCalendarMode = DeliveryPlanningCalendarModes.Week;
         this.currentTileMode = DeliveryPlanningTileModes.Normal;
         this.datePlanningMode = CalendarView.WeekView;
@@ -23622,6 +23660,7 @@ class DeliveryPlanningService {
         this.currentPlanningMode = DeliveryPlanningModes.Transaction;
         this.currentStartDate = new Date();
         this.availabilityCheckEvent = new Subject();
+        this.reRenderHourScheduling = new Subject();
     }
     get dragging() {
         return this._dragging;
@@ -23629,6 +23668,9 @@ class DeliveryPlanningService {
     get planTransportWeek() {
         return this._planTransportWeek;
     }
+    get planTransportWeekArr() {
+        return this._planTransportWeekArr;
+    }
     get deliveryMethods() {
         return this._deliveryMethods;
     }
@@ -23644,9 +23686,6 @@ class DeliveryPlanningService {
     get userGroups() {
         return this._userGroups;
     }
-    get queryList() {
-        return this._tilesQueryList;
-    }
     set dragging(value) {
         if (!this._dragging && value) {
             this.availabilityCheckEvent.next(this.currentTransId);
@@ -23656,6 +23695,9 @@ class DeliveryPlanningService {
     set planTransportWeek(value) {
         this._planTransportWeek = value;
     }
+    set planTransportWeekArr(value) {
+        this._planTransportWeekArr = value;
+    }
     set deliveryMethods(methods) {
         this._deliveryMethods = methods;
     }
@@ -23678,14 +23720,16 @@ class DeliveryPlanningService {
     }
     getTransportOrders(planningTransportWeekDay) {
         return __awaiter(this, void 0, void 0, function* () {
-            let request = new GetTransportOrdersRequest();
-            request.transportId = planningTransportWeekDay.transport.transportId;
-            request.date = planningTransportWeekDay.date;
-            request.planningId = this.currentPlanning.planningId;
-            const orderResponse = yield this._transaction.getTransportOrders(request);
-            if (orderResponse) {
-                planningTransportWeekDay.plannedOrders = orderResponse;
-                planningTransportWeekDay.ordersLoaded = true;
+            if (planningTransportWeekDay.transport) {
+                let request = new GetTransportOrdersRequest();
+                request.transportId = planningTransportWeekDay.transport.transportId;
+                request.date = planningTransportWeekDay.date;
+                request.planningId = this.currentPlanning.planningId;
+                const orderResponse = yield this._transaction.getTransportOrders(request);
+                if (orderResponse && orderResponse.length > 0) {
+                    planningTransportWeekDay.plannedOrders = orderResponse;
+                    planningTransportWeekDay.ordersLoaded = true;
+                }
             }
             return planningTransportWeekDay;
         });
@@ -23705,33 +23749,93 @@ class DeliveryPlanningService {
             return request;
         }
     }
-    addHours(date, hours) {
-        const hoursToAdd = hours * 60 * 60 * 1000;
-        date.setTime(date.getTime() + hoursToAdd);
-        return date;
-    }
-    queryListTile(transportId) {
-        let newTile;
-        this._tilesQueryList.forEach(tile => {
-            if (tile.transportDay.transport.transportId === transportId) {
-                newTile = tile;
-            }
-        });
-        return newTile;
-    }
     getPlanningTransportWeek() {
         return __awaiter(this, void 0, void 0, function* () {
-            let weekArrays = [];
             this._transaction.getPlanTransportWeek(this.currentStartDate, this.currentPlanning.planningId).then((result) => {
                 if (result.length > 0) {
-                    result.forEach((team) => {
-                        weekArrays.push(Object.keys(team).sort().map(key => team[key]));
-                    });
+                    this._planTransportWeek = result;
+                    this._planTransportWeekArr = this.convertPlanningTransportWeekToArray(this._planTransportWeek);
                 }
             });
-            return weekArrays;
         });
     }
+    updatePlanningTransportValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Get new planning transport week data from the backend
+            let newPlanningTransportWeek = yield this._transaction.getPlanTransportWeek(this.currentStartDate, this.currentPlanning.planningId);
+            // Convert the new planning transport week data to a nested array
+            let newPlanningNestedArr = this.convertPlanningTransportWeekToArray(newPlanningTransportWeek);
+            // Update the old nested array (this._planTransportWeekArr) with new values
+            this._planTransportWeekArr.forEach((oldWeekDays, weekIndex) => {
+                const newWeekDays = newPlanningNestedArr[weekIndex];
+                // Compare each day's data in the old and new nested arrays
+                newWeekDays.forEach((newDay, dayIndex) => __awaiter(this, void 0, void 0, function* () {
+                    const oldDay = oldWeekDays[dayIndex];
+                    // Check for changes and update only changed properties
+                    yield this._updateChangedProperties(oldDay, newDay);
+                }));
+            });
+        });
+    }
+    // Function to update only the changed properties
+    _updateChangedProperties(oldDay, newDay) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // List of properties to compare
+            const propertiesToCompare = [
+                'minutes',
+                'maxMinutes',
+                'maxFactor',
+                'orderAmount',
+                'load',
+                'maxOrderAmount',
+                'factor',
+            ];
+            const transportPropertiesToCompare = [
+                'plannedOrders'
+            ];
+            propertiesToCompare.forEach(property => {
+                // Compare and update only if there's a change
+                if (JSON.stringify(oldDay[property]) !== JSON.stringify(newDay[property])) {
+                    oldDay[property] = newDay[property];
+                }
+            });
+            transportPropertiesToCompare.forEach(property => {
+                if (oldDay.transport && newDay.transport) {
+                    if (JSON.stringify(oldDay.transport[property] !== JSON.stringify(newDay.transport[property]))) {
+                        oldDay.transport[property] = newDay === null || newDay === void 0 ? void 0 : newDay.transport[property];
+                    }
+                }
+            });
+            yield this.getTransportOrders(oldDay);
+        });
+    }
+    convertPlanningTransportWeekToArray(planningTransportWeek) {
+        let weekArrays = [];
+        if (planningTransportWeek.length > 0) {
+            planningTransportWeek.forEach((team) => {
+                weekArrays.push(Object.keys(team).sort().map(key => team[key]));
+            });
+        }
+        return weekArrays;
+    }
+    convertToPlanTransportWeek(nestedArray) {
+        let planTransportWeeks = [];
+        nestedArray.forEach((weekDays) => {
+            let planTransportWeek = {}; // Create an empty object to hold the week's days
+            // Start from "day1" and assign the PlanningTransportWeekDay objects (excluding the transportId)
+            weekDays.forEach((day, dayIndex) => {
+                if (dayIndex === 7) {
+                    planTransportWeek['transportId'] = weekDays[dayIndex];
+                }
+                else {
+                    planTransportWeek[`day${dayIndex + 1}`] = day; // "day1", "day2", etc.
+                }
+            });
+            // Push the object into the final array
+            planTransportWeeks.push(planTransportWeek);
+        });
+        return planTransportWeeks;
+    }
     totalAssemblyTime(planOrder) {
         var _a;
         if (planOrder) {
@@ -23808,12 +23912,18 @@ class TransactionPlanningLineComponent extends TransactionBaseComponent {
             this.transactionLine.selected = value && !this.transactionLineToBePickedCompleted;
         }));
     }
+    ngOnDestroy() {
+        super.ngOnDestroy();
+        if (this._deliveryPlanningService.planOrderDate) {
+            this._deliveryPlanningService.planOrderDate = undefined;
+        }
+    }
     handleCheckBoxValueChanged(value, line) {
         this.transactionLine.selected = value;
     }
     handleLineClicked(mouseClick) {
-        if (this.transactionLine && this.transactionLine.commissionCode !== "1") {
-            return;
+        if (this.transactionLines.filter(line => !this.lineNotPlanned(line))) {
+            this._deliveryPlanningService.planOrderDate = new Date(this.transactionLines.filter(line => !this.lineNotPlanned(line))[0].deliveryDate);
         }
         const target = mouseClick.target;
         if (target && target.dataset && target.dataset['action'] && target.dataset['action'] === 'openSidePanel') {
@@ -23851,7 +23961,7 @@ TransactionPlanningLineComponent.decorators = [
       [isFirst]="isFirst"
       [draggable]="lineNotPlanned(transactionLine)"
       (dragstart)="dragStarted($event)"
-      [checkbox]="true"
+      [checkbox]="lineNotPlanned(transactionLine)"
       [checkboxValue]="transactionLine.selected"
       [checkboxReadonly]="false"
       (checkboxValueChanged)="handleCheckBoxValueChanged($event, transactionLine)"
@@ -24019,6 +24129,9 @@ class TransactionQuickAccessPlanningComponent extends TransactionBaseComponent {
             return ((_d = (_c = this._transactionService.currentTransaction) === null || _c === void 0 ? void 0 : _c.transactionInfo) === null || _d === void 0 ? void 0 : _d.allowPartialDelivery) ? (_f = (_e = this._transactionService.currentTransaction) === null || _e === void 0 ? void 0 : _e.transactionInfo) === null || _f === void 0 ? void 0 : _f.allowPartialDelivery : false;
         }
     }
+    isOrderFullyPlanned() {
+        return this._transactionService.currentTransaction.transactionLines.filter(line => line.articleLineStatus.quantityPlanningFinal !== 0).length > 0;
+    }
 }
 TransactionQuickAccessPlanningComponent.decorators = [
     { type: Component, args: [{
@@ -24049,7 +24162,7 @@ TransactionQuickAccessPlanningComponent.decorators = [
                            (click)="togglePopup()"></co-button>
               </div>
           </ng-template>
-      <div class="select-all-wrapper" *ngIf="!allowPartialDelivery()">
+      <div class="select-all-wrapper" *ngIf="!allowPartialDelivery() && !isOrderFullyPlanned()">
         <co-input-checkbox
           [label]="'SELECT_ALL_LINES' | localize"
           (modelChange)="handleSelectAllLines($event)"
@@ -24087,104 +24200,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
             },] }
 ];
@@ -24203,6 +24321,7 @@ class TransactionLinesSidePanelServiceOrderComponent extends TransactionBaseComp
         this.transactionService = transactionService;
         this.changeDetector = changeDetector;
         this.Icon = Icon;
+        this.cfgNames = TransactionCfgName;
         this.showDetails = false;
     }
     showClass() {
@@ -24226,7 +24345,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>
@@ -24257,7 +24376,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>
@@ -24284,7 +24403,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>
@@ -24428,19 +24547,34 @@ class TransactionCardPlanningComponent extends TransactionBaseComponent {
         this._deliveryPlanningService.currentTransId = this.transaction.transactionInfo.id;
         ev.dataTransfer.setData("text", "lines");
     }
+    lineNotPlanned(line) {
+        if (!this._deliveryPlanningService.linesPlanOrder) {
+            return true;
+        }
+        if (this._deliveryPlanningService.linesPlanOrder.lines.find(line => line.lineNr === line.originalLineNr)) {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    allowPartialDelivery() {
+        var _a;
+        return (_a = this.transactionInfo) === null || _a === void 0 ? void 0 : _a.allowPartialDelivery;
+    }
 }
 TransactionCardPlanningComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-transaction-card-planning",
                 template: `
     <div class="transaction-card-wrapper" observeVisibility #observer=visibilityObserve
-         [draggable]="true"
+         [draggable]="lineNotPlanned(transactionLine)"
          (dragstart)="dragStarted($event)"
          (visibilityChange)="handleVisibilityChange(transactionLine, $event)">
       <co-transaction-card-header
         [transactionLine]="transactionLine"
         [showActionButtons]="true"
-        [showCheckbox]="true"
+        [showCheckbox]="lineNotPlanned(transactionLine)"
         [expanded]="expanded" [selected]="selected"
       (checkboxValueChanged)="selected = $event"
       >
@@ -30613,6 +30747,11 @@ AvatarComponent.decorators = [
       </svg>
     </ng-template>
   `,
+                providers: [{
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
+                        useExisting: forwardRef(() => AvatarComponent)
+                    }
+                ],
                 changeDetection: ChangeDetectionStrategy.OnPush,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -30731,8 +30870,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) {
@@ -32396,12 +32535,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"
@@ -34044,6 +34182,10 @@ TransactionHeaderPopupOrderComponent.decorators = [
       </co-project-code-modal>
     </div>
   `,
+                providers: [{
+                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
+                        useExisting: forwardRef(() => TransactionHeaderPopupOrderComponent)
+                    }],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -38527,7 +38669,9 @@ CheckoutModule.decorators = [
                     ScreenConfigurationModule,
                     SuggestionsSidebarModule,
                     ListOfValuesModule,
-                    StepperStepModule
+                    StepperStepModule,
+                    TransactionHeaderSalesPersonModule,
+                    TransactionHeaderPaymentConditionModule
                 ],
                 declarations: [
                     CheckoutOverviewRelationEditComponent,
@@ -39303,11 +39447,6 @@ TransactionInternalComponent.decorators = [
       </div>
     </ng-container>
   `,
-                providers: [{
-                        provide: SCREEN_CONFIG_ADAPTER_COMPONENT_INTERFACE_NAME,
-                        useExisting: forwardRef(() => TransactionInternalComponent)
-                    }
-                ],
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -39379,18 +39518,20 @@ TransactionHeaderComponent.decorators = [
                                         [(relation)]="relation"
                                         [transaction]="transaction"
                                         [transactionInfo]="transaction.transactionInfo"></co-transaction-header-relation>
-        <co-transaction-header-order #carouselItem
-                                     [screenConfigurationObject]="cfgNames.OrderInfoHeader"
-                                     [(relation)]="relation"
-                                     [transaction]="transaction"
-                                     [transactionInfo]="transaction.transactionInfo"
-                                     [transactionTotal]="transaction.transactionTotal"
-                                     [class.purchase-order-header]="isPurchaseOrder"></co-transaction-header-order>
-        <co-transaction-header-payment *ngIf="!isPurchaseOrder" #carouselItem
-                                       [screenConfigurationObject]="cfgNames.PaymentInfoHeader"
+        <div class="header-order-payment-wrapper">
+          <co-transaction-header-order #carouselItem
+                                       [screenConfigurationObject]="cfgNames.OrderInfoHeader"
                                        [(relation)]="relation"
                                        [transaction]="transaction"
-                                       [transactionInfo]="transaction.transactionInfo"></co-transaction-header-payment>
+                                       [transactionInfo]="transaction.transactionInfo"
+                                       [transactionTotal]="transaction.transactionTotal"
+                                       [class.purchase-order-header]="isPurchaseOrder"></co-transaction-header-order>
+          <co-transaction-header-payment *ngIf="!isPurchaseOrder" #carouselItem
+                                         [screenConfigurationObject]="cfgNames.PaymentInfoHeader"
+                                         [(relation)]="relation"
+                                         [transaction]="transaction"
+                                         [transactionInfo]="transaction.transactionInfo"></co-transaction-header-payment>
+        </div>
         <co-transaction-header-delivery #carouselItem
                                         [screenConfigurationObject]="cfgNames.DeliveryInfoHeader"
                                         [(relation)]="relation"
@@ -42790,13 +42931,21 @@ DeliveryPlanningComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning",] }]
 };
 
+var DeliveryPlanningUpdateActions;
+(function (DeliveryPlanningUpdateActions) {
+    DeliveryPlanningUpdateActions["PlanOrder"] = "planOrder";
+    DeliveryPlanningUpdateActions["PlanLines"] = "planLines";
+    DeliveryPlanningUpdateActions["DeletePlannedOrder"] = "deletePlannedOrder";
+    DeliveryPlanningUpdateActions["DeletePlannedLines"] = "deletePlannedLines";
+})(DeliveryPlanningUpdateActions || (DeliveryPlanningUpdateActions = {}));
+
 class DeliveryPlanningMainComponent {
-    constructor(_deliveryPlanningService, _viewModeService, _transaction, _changeDetector) {
+    constructor(_deliveryPlanningService, _viewModeService, _transaction, _changeDetector, _transactionEventService) {
         this._deliveryPlanningService = _deliveryPlanningService;
         this._viewModeService = _viewModeService;
         this._transaction = _transaction;
         this._changeDetector = _changeDetector;
-        this.fullPlanningTransportWeek = [];
+        this._transactionEventService = _transactionEventService;
     }
     get currentMode() {
         return this._deliveryPlanningService.currentCalendarMode;
@@ -42807,6 +42956,9 @@ class DeliveryPlanningMainComponent {
     get currentStartDate() {
         return this._deliveryPlanningService.currentStartDate;
     }
+    set currentStartDate(date) {
+        this._deliveryPlanningService.currentStartDate = date;
+    }
     showClass() {
         return true;
     }
@@ -42817,63 +42969,69 @@ class DeliveryPlanningMainComponent {
     ngAfterViewInit() {
         var _a;
         if ((_a = this._deliveryPlanningService.currentPlanning) === null || _a === void 0 ? void 0 : _a.planningId) {
-            this.resetTransportWeek();
+            this.getPlanningTransportWeek();
         }
     }
     planningChanged(planning) {
         this.planning = planning;
         this._deliveryPlanningService.currentPlanning = planning;
-        this.resetTransportWeek();
-    }
-    weekFilter(planTransportWeek) {
-        planTransportWeek.forEach((ploeg) => {
-            if (ploeg) {
-                for (const property in ploeg) {
-                    if (property) {
-                        if (property !== "day1" && property !== "day2" && property !== "day3") {
-                            delete ploeg[property];
-                        }
+        this.getPlanningTransportWeek();
+    }
+    // public async updatePlanTransportWeek(updateData:{week: PlanningTransportWeek, action: DeliveryPlanningUpdateActions}) {
+    //   if (updateData.week && updateData.week?.day1 && this.fullPlanningTransportWeek.length > 0) {
+    //     this.fullPlanningTransportWeek[0].day1 = updateData.week?.day1;
+    //     this.fullPlanningTransportWeek[0].day2 = updateData.week?.day2;
+    //     this.fullPlanningTransportWeek[0].day3 = updateData.week?.day3;
+    //     let updateResult = await this._transaction.updatePlanTransportWeek(this.fullPlanningTransportWeek[0]);
+    //     if (updateResult) {
+    //       if(updateData.action && updateData.action === DeliveryPlanningUpdateActions.DeletePlannedOrder && this._deliveryPlanningService.deletingOrder) {
+    //         this._deliveryPlanningService.deletingOrder.dateResetNeeded = true;
+    //         await this._transaction.restoreDeliverySettings([this._deliveryPlanningService.deletingOrder]);
+    //       }
+    //       await this._transaction.commit();
+    //     }
+    //   }
+    //     this.resetTransportWeek();
+    // }
+    updatePlanTransportWeek(updateData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let result = this._deliveryPlanningService.convertToPlanTransportWeek(this._deliveryPlanningService.planTransportWeekArr);
+            let week = result.find((week) => week['transportId'] === updateData.week[updateData.week.length - 1]);
+            if (week) {
+                let updateResult = yield this._transaction.updatePlanTransportWeek(week);
+                if (updateResult) {
+                    if (updateData.action && updateData.action === DeliveryPlanningUpdateActions.DeletePlannedOrder && this._deliveryPlanningService.deletingOrder) {
+                        this._deliveryPlanningService.deletingOrder.dateResetNeeded = true;
+                        yield this._transaction.restoreDeliverySettings([this._deliveryPlanningService.deletingOrder]);
+                    }
+                    yield this._transaction.commit();
+                    yield this.updateNewValues();
+                    if (this._deliveryPlanningService.currentTileMode === DeliveryPlanningTileModes.Calendar) {
+                        this._deliveryPlanningService.reRenderHourScheduling.next();
                     }
                 }
+                else {
+                    yield this.resetPlanningTransportWeek();
+                }
             }
         });
     }
-    weekFilterWithReturn(planTransportWeek) {
-        const copy = JSON.parse(JSON.stringify(this.fullPlanningTransportWeek[0])); // Deep copy of the original state
-        for (const property in copy) {
-            if (property) {
-                if (property !== "day1" && property !== "day2" && property !== "day3") {
-                    delete copy[property];
-                }
-            }
-        }
-        return copy;
+    updateNewValues() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._deliveryPlanningService.updatePlanningTransportValues();
+        });
     }
-    updatePlanTransportWeek(planningTransportWeek) {
+    resetPlanningTransportWeek() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (planningTransportWeek && (planningTransportWeek === null || planningTransportWeek === void 0 ? void 0 : planningTransportWeek.day1) && this.fullPlanningTransportWeek.length > 0) {
-                this.fullPlanningTransportWeek[0].day1 = planningTransportWeek === null || planningTransportWeek === void 0 ? void 0 : planningTransportWeek.day1;
-                this.fullPlanningTransportWeek[0].day2 = planningTransportWeek === null || planningTransportWeek === void 0 ? void 0 : planningTransportWeek.day2;
-                this.fullPlanningTransportWeek[0].day3 = planningTransportWeek === null || planningTransportWeek === void 0 ? void 0 : planningTransportWeek.day3;
-                let updateResult = yield this._transaction.updatePlanTransportWeek(this.fullPlanningTransportWeek[0]);
-                if (updateResult) {
-                    yield this._transaction.commit();
-                }
-            }
-            this.resetTransportWeek();
         });
     }
-    resetTransportWeek() {
+    getPlanningTransportWeek() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._transaction.getPlanTransportWeek(this.currentStartDate, this._deliveryPlanningService.currentPlanning.planningId).then((result) => {
-                if (result.length > 0) {
-                    const myClonedArray = [];
-                    result.forEach(val => myClonedArray.push(Object.assign({}, val)));
-                    this.fullPlanningTransportWeek = myClonedArray;
-                    this.weekFilter(result);
-                    this._deliveryPlanningService.planTransportWeek = result;
-                }
-            });
+            if (this._deliveryPlanningService.planOrderDate) {
+                this.currentStartDate = this._deliveryPlanningService.planOrderDate;
+                this._deliveryPlanningService.planOrderDate = undefined;
+            }
+            yield this._deliveryPlanningService.getPlanningTransportWeek();
         });
     }
     getListData() {
@@ -42912,7 +43070,7 @@ DeliveryPlanningMainComponent.decorators = [
         <co-delivery-planning-overview [currentMode]="currentMode"
                                        [currentViewMode]="currentViewMode"
                                        (updatePlanningTransportEvent)="updatePlanTransportWeek($event)"
-                                       (resetPlanningTransportEvent)="resetTransportWeek()"
+                                       (resetPlanningTransportEvent)="getPlanningTransportWeek()"
         ></co-delivery-planning-overview>
       </div>
     </div>
@@ -42926,7 +43084,8 @@ DeliveryPlanningMainComponent.ctorParameters = () => [
     { type: DeliveryPlanningService },
     { type: SearchViewModeService },
     { type: TransactionConnectorService },
-    { type: ChangeDetectorRef }
+    { type: ChangeDetectorRef },
+    { type: TransactionEventService }
 ];
 DeliveryPlanningMainComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-main",] }]
@@ -43082,11 +43241,14 @@ class DeliveryPlanningOverviewTileComponent {
         this.icons = Icon;
         this.tileModes = DeliveryPlanningTileModes;
         this.ordersLoaded = false;
+        this._subs = [];
         this.disabled = false;
         this.expandedEvent = new EventEmitter();
-        this.deleteLineEvent = new EventEmitter();
+        this.deleteOrderEvent = new EventEmitter();
+        this.deleteOrderLineEvent = new EventEmitter();
+        this.editOrderEvent = new EventEmitter();
         this.getTransportOrdersEvent = new EventEmitter();
-        this.updatePlanningTransportWeek = new EventEmitter();
+        this.timeChangeEvent = new EventEmitter();
         this.openSettingsDialogEvent = new EventEmitter();
         this.calendarPlanEvent = new EventEmitter();
     }
@@ -43103,6 +43265,16 @@ class DeliveryPlanningOverviewTileComponent {
                 this.ordersLoaded = true;
                 this.getTransportOrdersEvent.emit(this.transportDay);
             }
+            this._subs.push(this._deliveryPlanningService.reRenderHourScheduling.subscribe(event => {
+                this.hourSchedulingComp.generateScheduledObjects();
+            }));
+        });
+    }
+    ngOnDestroy() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._subs.forEach((sub) => {
+                sub.unsubscribe();
+            });
         });
     }
     drop(event) {
@@ -43123,8 +43295,11 @@ class DeliveryPlanningOverviewTileComponent {
             });
         }
     }
-    handleDeleteLineClick(order) {
-        this.deleteLineEvent.emit([order, this.transportDay]);
+    handleDeleteOrderClick(order) {
+        this.deleteOrderEvent.emit([order, this.transportDay]);
+    }
+    handleDeleteOrderLineClick(data) {
+        this.deleteOrderLineEvent.emit(data);
     }
     handleSettingsSave() {
     }
@@ -43136,15 +43311,14 @@ class DeliveryPlanningOverviewTileComponent {
         this.openSettingsDialogEvent.emit(this.transportDay);
     }
     handleTimeChangeEvent(obj) {
-        let transNr = obj['transactionNr'];
-        let order = this.transportDay.plannedOrders.find(planOrder => planOrder.transactionNr === transNr);
-        order.startTime = new Date(obj['startTime']);
-        order.endTime = new Date(obj['endTime']);
-        this.updatePlanningTransportWeek.emit();
+        this.timeChangeEvent.emit(obj);
     }
     handleCalendarPlanEvent(data) {
         this.calendarPlanEvent.emit(data);
     }
+    handleEditOrderEvent(planOrder) {
+        this.editOrderEvent.emit(planOrder);
+    }
 }
 DeliveryPlanningOverviewTileComponent.decorators = [
     { type: Component, args: [{
@@ -43177,7 +43351,7 @@ DeliveryPlanningOverviewTileComponent.decorators = [
           <div class="planning-short-line-wrapper" *ngIf="!expanded">
             <co-delivery-planning-overview-short-line
               *ngFor="let order of transportDay?.plannedOrders"
-              (deleteLineEvent)="handleDeleteLineClick($event)"
+              (deleteOrderEvent)="handleDeleteOrderClick($event)"
               [order]="order">
             </co-delivery-planning-overview-short-line>
           </div>
@@ -43189,7 +43363,9 @@ DeliveryPlanningOverviewTileComponent.decorators = [
                  *ngIf="tileMode === tileModes.Normal">
               <co-delivery-planning-overview-tile-line cdkDrag
                                                        *ngFor="let order of transportDay?.plannedOrders"
-                                                       (deleteLineEvent)="handleDeleteLineClick($event)"
+                                                       (deleteOrderEvent)="handleDeleteOrderClick($event)"
+                                                       (deleteOrderLineEvent)="handleDeleteOrderLineClick($event)"
+                                                       (editOrderEvent)="handleEditOrderEvent($event)"
                                                        [order]="order">
               </co-delivery-planning-overview-tile-line>
             </div>
@@ -43204,14 +43380,16 @@ DeliveryPlanningOverviewTileComponent.decorators = [
                 >
                   <co-delivery-planning-overview-tile-line cdkDrag
                                                            *ngFor="let obj of objects"
-                                                           (deleteLineEvent)="handleDeleteLineClick($event)"
+                                                           (deleteOrderEvent)="handleDeleteOrderClick($event)"
+                                                           (deleteOrderLineEvent)="handleDeleteOrderLineClick($event)"
+                                                           (editOrderEvent)="handleEditOrderEvent($event)"
                                                            [order]="obj">
                   </co-delivery-planning-overview-tile-line>
                 </div>
               </div>
             </ng-template>
 
-            <co-hour-scheduling *ngIf="ordersLoaded && tileMode === tileModes.Calendar"
+            <co-hour-scheduling #hourSchedulingComponent *ngIf="ordersLoaded && tileMode === tileModes.Calendar"
                                 [schedule]="transportDay"
                                 [startTimeProp]="'startTime'"
                                 [endTimeProp]="'endTime'"
@@ -43242,11 +43420,14 @@ DeliveryPlanningOverviewTileComponent.propDecorators = {
     disabled: [{ type: Input }],
     transportDay: [{ type: Input }],
     expandedEvent: [{ type: Output }],
-    deleteLineEvent: [{ type: Output }],
+    deleteOrderEvent: [{ type: Output }],
+    deleteOrderLineEvent: [{ type: Output }],
+    editOrderEvent: [{ type: Output }],
     getTransportOrdersEvent: [{ type: Output }],
-    updatePlanningTransportWeek: [{ type: Output }],
+    timeChangeEvent: [{ type: Output }],
     openSettingsDialogEvent: [{ type: Output }],
     calendarPlanEvent: [{ type: Output }],
+    hourSchedulingComp: [{ type: ViewChild, args: ['hourSchedulingComponent',] }],
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview-tile",] }]
 };
 
@@ -43259,6 +43440,7 @@ class DeliveryPlanningOverviewComponent {
         this._changeDetector = _changeDetector;
         this.iconCacheService = iconCacheService;
         this.icons = Icon;
+        this.planningActions = DeliveryPlanningUpdateActions;
         this.tileModes = DeliveryPlanningTileModes;
         this.deliveryPlanningViewModes = DeliveryPlanningViewModes;
         this.availability = [];
@@ -43270,7 +43452,6 @@ class DeliveryPlanningOverviewComponent {
         this.updatePlanningTransportEvent = new EventEmitter();
         this.resetPlanningTransportEvent = new EventEmitter();
         this.tileSize = 300; //one tile should have this width
-        this.date = new Date();
         this.available = false;
         this.showNoteDialog = false;
         this.showSettingsDialog = false;
@@ -43283,13 +43464,8 @@ class DeliveryPlanningOverviewComponent {
         this.planningPopupRef = value;
     }
     ;
-    get planTransportWeek() {
-        if (this._deliveryPlanningService.planTransportWeek.length) {
-            return this._deliveryPlanningService.planTransportWeek;
-        }
-        else {
-            return [];
-        }
+    get planTransportWeekArr() {
+        return this._deliveryPlanningService.planTransportWeekArr;
     }
     get currentTileMode() {
         return this._deliveryPlanningService.currentTileMode;
@@ -43297,6 +43473,9 @@ class DeliveryPlanningOverviewComponent {
     set currentTileMode(tileMode) {
         this._deliveryPlanningService.currentTileMode = tileMode;
     }
+    currentDate() {
+        return this._deliveryPlanningService.currentStartDate;
+    }
     //calculating upon loading
     ngAfterViewChecked() {
         this.setColNum();
@@ -43340,15 +43519,11 @@ class DeliveryPlanningOverviewComponent {
         }
     }
     setColNum() {
-        var _a, _b;
         if (this._deliveryPlanningService.viewMode === DeliveryPlanningViewModes.Sidebar) {
             this.columnNum = 1;
         }
         else {
-            let width = (_b = (_a = this.rowContainer) === null || _a === void 0 ? void 0 : _a.nativeElement) === null || _b === void 0 ? void 0 : _b.offsetWidth;
-            if (width) {
-                this.columnNum = Math.trunc(width / this.tileSize);
-            }
+            this.columnNum = 3;
         }
     }
     dragEnd(ev) {
@@ -43372,18 +43547,15 @@ class DeliveryPlanningOverviewComponent {
     }
     handleDeleteOrder(deleteResult, planningTransportWeek) {
         return __awaiter(this, void 0, void 0, function* () {
+            let oldWeek = planningTransportWeek;
             let order = deleteResult[0];
             if (order) {
                 yield this.getTransportOrders(deleteResult[0], deleteResult[1]);
                 yield this.getOrderLinesPlanned(order);
                 if (deleteResult[0].lines.length > 0) {
-                    order === null || order === void 0 ? void 0 : order.lines.forEach(line => {
-                        line.planned = false;
-                        line.selected = false;
-                    });
-                    order.lines = [];
+                    this._deliveryPlanningService.deletingOrder = order;
                     deleteResult[1].plannedOrders.splice(deleteResult[1].plannedOrders.indexOf(order), 1);
-                    this.updatePlanningTransportEvent.emit(planningTransportWeek);
+                    this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: planningTransportWeek, action: DeliveryPlanningUpdateActions.DeletePlannedOrder });
                 }
                 else {
                     this._dialog.showError("NO_LINES_TO_DELETE", true);
@@ -43391,6 +43563,12 @@ class DeliveryPlanningOverviewComponent {
             }
         });
     }
+    handleDeleteLine(deleteResult, weekDay, transportWeekRow) {
+        let oldWeek = transportWeekRow;
+        let order = weekDay.plannedOrders.find(order => order.transId === deleteResult.order.transId);
+        order.lines = order.lines.filter(line => line.originalLineNr !== deleteResult.line.originalLineNr);
+        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: transportWeekRow, action: DeliveryPlanningUpdateActions.DeletePlannedLines });
+    }
     getOrderLinesPlanned(order) {
         return __awaiter(this, void 0, void 0, function* () {
             let request = new OrderLinesPlannedRequest();
@@ -43403,6 +43581,9 @@ class DeliveryPlanningOverviewComponent {
             filterObj.beginCurrentWeek = new Date();
             filterObj.checkOrderLines = 1;
             request.filterObject = filterObj;
+            if (!order.lines) {
+                order.lines = [];
+            }
             order.lines.push(...yield this._transactionCon.getOrderLinesPlanned(request));
         });
     }
@@ -43418,6 +43599,7 @@ class DeliveryPlanningOverviewComponent {
     }
     planOrderLines(order, transportDay, week) {
         return __awaiter(this, void 0, void 0, function* () {
+            let oldWeek = week;
             if (order.lines.length) {
                 order.linesLoaded = true;
                 order.tasks = [];
@@ -43431,7 +43613,7 @@ class DeliveryPlanningOverviewComponent {
                 else {
                     transportDay.plannedOrders.push(order);
                 }
-                this.updatePlanningTransportEvent.emit(week);
+                this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: week, action: DeliveryPlanningUpdateActions.PlanLines });
             }
             else {
                 this._dialog.showError("NO_LINES_TO_PLAN", true);
@@ -43484,6 +43666,11 @@ class DeliveryPlanningOverviewComponent {
             yield this.getSequenceOrderValue(event[0]);
             yield this.getOrderLinesPlanned(event[0]);
             yield this.planOrderLines(event[0], event[1], event[2]);
+            if (this._deliveryPlanningService.currentTransId) {
+                yield this._transaction.getTransactionById(this._deliveryPlanningService.currentTransId);
+                yield this._transaction.saveTransaction();
+                yield this._transaction.checkRefTransaction();
+            }
         });
     }
     handleSettingsSave(changed) {
@@ -43514,7 +43701,11 @@ class DeliveryPlanningOverviewComponent {
                 yield this.getSequenceOrderValue(planOrder);
                 yield this.getOrderLinesPlanned(planOrder);
                 yield this.planOrderLines(planOrder, transportWeekDay, week);
-                this._deliveryPlanningService.currentTransId = undefined;
+                if (data.data === "false" && this._deliveryPlanningService.currentTransId) {
+                    yield this._transaction.getTransactionById(this._deliveryPlanningService.currentTransId);
+                    yield this._transaction.saveTransaction();
+                    yield this._transaction.checkRefTransaction();
+                }
             }
         });
     }
@@ -43560,6 +43751,17 @@ class DeliveryPlanningOverviewComponent {
             return false;
         }
     }
+    handleTimeChangeEvent(transportDay, week, obj) {
+        let oldWeek = week;
+        let transNr = obj['transactionNr'];
+        let order = transportDay.plannedOrders.find(planOrder => planOrder.transactionNr === transNr);
+        order.startTime = new Date(obj['startTime']);
+        order.endTime = new Date(obj['endTime']);
+        this.updatePlanningTransportEvent.emit({ oldWeek: oldWeek, week: week, action: DeliveryPlanningUpdateActions.PlanOrder });
+    }
+    handleEditPlannedOrder(planOrder, transportDay, week) {
+        this.openPlanningPopup(planOrder, transportDay, week);
+    }
 }
 DeliveryPlanningOverviewComponent.decorators = [
     { type: Component, args: [{
@@ -43574,28 +43776,32 @@ DeliveryPlanningOverviewComponent.decorators = [
         <co-icon (click)="currentTileMode = tileModes.Calendar" [class.active]="currentTileMode === tileModes.Calendar" [iconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"></co-icon>
       </div>
       <div class="planning-component-wrapper">
-        <co-date-planning [view]="currentViewMode" [selectedDate]="date"
+        <co-date-planning [view]="currentViewMode" [selectedDate]="currentDate()"
                           (rangeChange)="handleDateRangeChange($event)"></co-date-planning>
       </div>
-      <div class="row date-planning" #rowContainer *ngFor="let transportWeekRow of planTransportWeek">
+
+      <div class="row date-planning" #rowContainer *ngFor="let transportWeekRow of planTransportWeekArr">
         <div class="column" #columnElem
-             *ngFor="let transPortDay of filterWeekArray(weekArray(transportWeekRow)); index as i">
+             *ngFor="let transPortDay of filterWeekArray(transportWeekRow); index as i">
           <co-delivery-planning-overview-tile
             [class.disabled]="!transPortDay.availableOnDate || transPortDay.maxMinutes === 0 || checkAvailable(transPortDay)"
             [disabled]="!transPortDay.availableOnDate || transPortDay.maxMinutes === 0"
             (dragover)="allowDrop($event, transPortDay)"
-            (drop)="dropped($event, transportWeekRow, transPortDay, filterWeekArray(weekArray(transportWeekRow)))"
+            (drop)="dropped($event, transportWeekRow, transPortDay, filterWeekArray(transportWeekRow))"
             (dragend)="dragEnd($event)"
-
             [transportDay]="transPortDay"
-            (deleteLineEvent)="handleDeleteOrder($event, transportWeekRow)"
-            (updatePlanningTransportWeek)="updatePlanningTransportEvent.emit(transportWeekRow)"
+            (deleteOrderEvent)="handleDeleteOrder($event, transportWeekRow)"
+            (timeChangeEvent)="handleTimeChangeEvent(transPortDay, transportWeekRow,$event)"
             (openSettingsDialogEvent)="openSettingsDialog($event)"
             (calendarPlanEvent)="handleCalendarPlanEvent($event, transPortDay, transportWeekRow)"
-          ></co-delivery-planning-overview-tile>
+            (deleteOrderLineEvent)="handleDeleteLine($event, transPortDay, transportWeekRow)"
+            (editOrderEvent)="handleEditPlannedOrder($event, transPortDay, transportWeekRow)"
 
+          ></co-delivery-planning-overview-tile>
         </div>
       </div>
+
+
     </div>
 
 
@@ -43635,13 +43841,18 @@ class DeliveryPlanningOverviewTileLineComponent {
         this.orderLines = false;
         this.order = new PlanOrder();
         this.isActive = false;
-        this.deleteLineEvent = new EventEmitter();
+        this.deleteOrderEvent = new EventEmitter();
+        this.deleteOrderLineEvent = new EventEmitter();
+        this.editOrderEvent = new EventEmitter();
     }
     showClass() {
         return true;
     }
-    handleDeleteLineClick(order) {
-        this.deleteLineEvent.emit(order);
+    handleDeleteOrderClick(order) {
+        this.deleteOrderEvent.emit(order);
+    }
+    handleDeleteOrderLineClick(order, line) {
+        this.deleteOrderLineEvent.emit({ order: order, line: line });
     }
     setLinesActive() {
         this.linesActive = !this.linesActive;
@@ -43654,6 +43865,9 @@ class DeliveryPlanningOverviewTileLineComponent {
     getPlannedLines(lines) {
         return lines.filter(line => line.planned === true);
     }
+    handleEditOrderEvent(planOrder) {
+        this.editOrderEvent.emit(planOrder);
+    }
 }
 DeliveryPlanningOverviewTileLineComponent.decorators = [
     { type: Component, args: [{
@@ -43663,8 +43877,10 @@ DeliveryPlanningOverviewTileLineComponent.decorators = [
         <div class="planning-line-content">
           <div class="planning-line-left">
             <div class="planning-line-extend" *ngIf="linesActive || orderLines">
-              <co-icon *ngIf="!orderLines" (click)="showOrderLines($event)" [iconData]="iconCacheService.getIcon(icons.ChevronDownRegular)"></co-icon>
-              <co-icon *ngIf="orderLines" (click)="showOrderLines($event)" [iconData]="iconCacheService.getIcon(icons.ChevronUpRegular)"></co-icon>
+              <co-icon *ngIf="!orderLines" (click)="showOrderLines($event)"
+                       [iconData]="iconCacheService.getIcon(icons.ChevronDownRegular)"></co-icon>
+              <co-icon *ngIf="orderLines" (click)="showOrderLines($event)"
+                       [iconData]="iconCacheService.getIcon(icons.ChevronUpRegular)"></co-icon>
             </div>
             <div class="line-content-left">
               <div class="planning-relation">
@@ -43678,15 +43894,19 @@ DeliveryPlanningOverviewTileLineComponent.decorators = [
           <div class="planning-line-right">
             <div class="line-content-right">
               <div class="planning-order">
-                <co-icon (click)="setLinesActive()" [iconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"></co-icon>
-                <span [textContent]="order.transactionNr"></span>
+                <co-icon (click)="setLinesActive()"
+                         [iconData]="iconCacheService.getIcon(icons.CartShoppingRegular)"></co-icon>
+                <a href="javascript:void(0)" [textContent]="order.transactionNr" (click)="handleEditOrderEvent(order)"></a>
+
               </div>
               <div class="planning-time" *ngIf="linesActive">
-                <span [textContent]="(order.startTime | date: 'HH:mm') + ' - ' + (order.endTime | date: 'HH:mm')"></span>
+                <span
+                  [textContent]="(order.startTime | date: 'HH:mm') + ' - ' + (order.endTime | date: 'HH:mm')"></span>
               </div>
             </div>
             <div class="planning-line-actions">
-              <co-icon *ngIf="linesActive" (click)="handleDeleteLineClick(order)" [iconData]="iconCacheService.getIcon(icons.TrashCanRegular)"></co-icon>
+              <co-icon *ngIf="linesActive" (click)="handleDeleteOrderClick(order)"
+                       [iconData]="iconCacheService.getIcon(icons.TrashCanRegular)"></co-icon>
               <co-icon *ngIf="!linesActive" [iconData]="iconCacheService.getIcon(icons.ChevronRightRegular)"></co-icon>
             </div>
           </div>
@@ -43695,6 +43915,8 @@ DeliveryPlanningOverviewTileLineComponent.decorators = [
           <div class="order-lines" *ngFor="let line of getPlannedLines(order?.lines)">
             <span [textContent]="line.articleNumber"></span>
             <span [textContent]="line.description"></span>
+            <co-icon *ngIf="linesActive" (click)="handleDeleteOrderLineClick(order, line)"
+                     [iconData]="iconCacheService.getIcon(icons.TrashCanRegular)"></co-icon>
           </div>
         </div>
       </div>
@@ -43708,7 +43930,9 @@ DeliveryPlanningOverviewTileLineComponent.ctorParameters = () => [
 DeliveryPlanningOverviewTileLineComponent.propDecorators = {
     order: [{ type: Input }],
     isActive: [{ type: Input }],
-    deleteLineEvent: [{ type: Output }],
+    deleteOrderEvent: [{ type: Output }],
+    deleteOrderLineEvent: [{ type: Output }],
+    editOrderEvent: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview-tile-line",] }]
 };
 
@@ -43734,27 +43958,76 @@ DeliveryPlanningOverviewTileLineModule.decorators = [
 ];
 
 class DeliveryPlanningTileStatusComponent {
-    constructor() {
-        this.maxVolume = 15;
-        this.timeTotal = 480;
-        this.currentVolume = 0;
-        this.currentTimeTotal = 0;
+    constructor(_changeDetector) {
+        this._changeDetector = _changeDetector;
         this.volumePercent = 0;
         this.timePercent = 0;
+        this._maxVolume = 0;
+        this._timeTotal = 0;
+        this._currentVolume = 0;
+        this._currentTimeTotal = 0;
+    }
+    get maxVolume() {
+        return this._maxVolume;
+    }
+    set maxVolume(value) {
+        if (value != this._maxVolume) {
+            this._maxVolume = value;
+            this.calculateVolumePercent();
+        }
+    }
+    get timeTotal() {
+        return this._timeTotal;
+    }
+    set timeTotal(value) {
+        if (value != this._timeTotal) {
+            this._timeTotal = value;
+            this.calculateTimePercent();
+        }
+    }
+    get currentVolume() {
+        return this._currentVolume;
+    }
+    set currentVolume(value) {
+        if (value != this._currentVolume) {
+            this._currentVolume = value;
+            this.calculateVolumePercent();
+        }
+    }
+    get currentTimeTotal() {
+        return this._currentTimeTotal;
+    }
+    set currentTimeTotal(value) {
+        if (value != this._currentTimeTotal) {
+            this._currentTimeTotal = value;
+            this.calculateTimePercent();
+        }
     }
     showClass() {
         return true;
     }
     ngOnInit() {
-        if (this.currentVolume > 0 && this.maxVolume > 0) {
+        this.calculatePercentages();
+    }
+    calculateVolumePercent() {
+        if (this.currentVolume === 0) {
+            this.volumePercent = 0;
+        }
+        else {
             this.volumePercent = Math.round((this.currentVolume / this.maxVolume) * 100 * 100) / 100;
         }
-        if (this.currentTimeTotal > 0 && this.timeTotal > 0) {
+    }
+    calculateTimePercent() {
+        if (this.currentTimeTotal === 0) {
+            this.timePercent = 0;
+        }
+        else {
             this.timePercent = Math.round((this.currentTimeTotal / this.timeTotal) * 100 * 100) / 100;
         }
     }
-    percent(first, second) {
-        return (first / second) * 100;
+    calculatePercentages() {
+        this.calculateTimePercent();
+        this.calculateVolumePercent();
     }
 }
 DeliveryPlanningTileStatusComponent.decorators = [
@@ -43764,17 +44037,17 @@ DeliveryPlanningTileStatusComponent.decorators = [
       <div class="tile-status-wrapper row">
         <div class="tile-wrapper-around">
           <span class="tile-label" [textContent]="('TIME' | localize) + ': '  + currentTimeTotal + ' ' + ('AVAILABLE' | localize)"></span>
-          <div class="time-wrapper" [style.--percent]="timePercent">
+          <div class="time-wrapper" [style.--percent]="timePercent"  [class.overload]="timePercent > 100">
             <div class="row">
-              <span [textContent]="'%'  + timePercent"></span>
+              <span [textContent]="timePercent + '%'"></span>
             </div>
           </div>
         </div>
         <div class="tile-wrapper-around">
           <span class="tile-label" [textContent]="('VOLUME' | localize) + ': '  + currentVolume + ' ' + ('AVAILABLE' | localize)"></span>
-          <div class="volume-wrapper"[style.--percent]="volumePercent">
+          <div class="volume-wrapper"[style.--percent]="volumePercent"  [class.overload]="volumePercent > 100">
             <div class="row">
-              <span [textContent]="'%'  + volumePercent"></span>
+              <span [textContent]="volumePercent + '%'"></span>
             </div>
           </div>
         </div>
@@ -43783,7 +44056,9 @@ DeliveryPlanningTileStatusComponent.decorators = [
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
-DeliveryPlanningTileStatusComponent.ctorParameters = () => [];
+DeliveryPlanningTileStatusComponent.ctorParameters = () => [
+    { type: ChangeDetectorRef }
+];
 DeliveryPlanningTileStatusComponent.propDecorators = {
     maxVolume: [{ type: Input }],
     timeTotal: [{ type: Input }],
@@ -43816,13 +44091,13 @@ class DeliveryPlanningOverviewShortLineComponent {
         this.showNoteDialog = false;
         this.expanded = false;
         this.order = new PlanOrder();
-        this.deleteLineEvent = new EventEmitter();
+        this.deleteOrderEvent = new EventEmitter();
     }
     showClass() {
         return true;
     }
     handleDeleteLineClick(order) {
-        this.deleteLineEvent.emit(order);
+        this.deleteOrderEvent.emit(order);
     }
 }
 DeliveryPlanningOverviewShortLineComponent.decorators = [
@@ -43843,7 +44118,7 @@ DeliveryPlanningOverviewShortLineComponent.ctorParameters = () => [
 ];
 DeliveryPlanningOverviewShortLineComponent.propDecorators = {
     order: [{ type: Input }],
-    deleteLineEvent: [{ type: Output }],
+    deleteOrderEvent: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview-short-line",] }]
 };
 
@@ -43937,50 +44212,62 @@ class DeliveryPlanningOverviewPopupComponent {
         this.onSucceededPlanAction.emit([this.planOrder, this.transportDay, this.week]);
     }
     startTimeForOrder() {
-        return this.planOrder.startTime;
+        var _a, _b;
+        return (_b = (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.startTime) === null || _b === void 0 ? void 0 : _b.toLocaleString();
     }
     endTimeForOrder() {
-        return this.planOrder.endTime;
+        var _a, _b;
+        return (_b = (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.endTime) === null || _b === void 0 ? void 0 : _b.toLocaleString();
     }
-    handleStartTimeChange(timeString) {
-        let originalPlanOrderDate = new Date(this.planOrder.startTime);
-        let date = new Date(originalPlanOrderDate.getFullYear(), originalPlanOrderDate.getMonth(), originalPlanOrderDate.getDay(), parseInt(timeString[0]), 0);
-        if (!isNaN(date.getTime())) {
-            this.planOrder.startTime = date;
+    handleStartTimeChange() {
+        if (this.startTimeCompRef.model) {
+            this.planOrder.startTime = this.handleDateChange(this.startTimeCompRef.model);
         }
     }
-    handleEndTimeChange(timeString) {
-        let originalPlanOrderDate = new Date(this.planOrder.startTime);
-        let date = new Date(originalPlanOrderDate.getFullYear(), originalPlanOrderDate.getMonth(), originalPlanOrderDate.getDay(), parseInt(timeString[0]), 0);
-        if (!isNaN(date.getTime())) {
-            this.planOrder.endTime = date;
+    handleEndTimeChange() {
+        if (this.endTimeCompRef.model) {
+            this.planOrder.endTime = this.handleDateChange(this.endTimeCompRef.model);
         }
     }
     handleInitialTimePlanning(transportWeekDay) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
         if (!((_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.startTime) && ((_b = transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders) === null || _b === void 0 ? void 0 : _b.length) === 0) {
             this.planOrder.startTime = new Date(transportWeekDay.date);
             (_d = (_c = this.planOrder) === null || _c === void 0 ? void 0 : _c.startTime) === null || _d === void 0 ? void 0 : _d.setHours(8);
             (_f = (_e = this.planOrder) === null || _e === void 0 ? void 0 : _e.startTime) === null || _f === void 0 ? void 0 : _f.setMinutes(0);
             (_h = (_g = this.planOrder) === null || _g === void 0 ? void 0 : _g.startTime) === null || _h === void 0 ? void 0 : _h.setSeconds(0);
         }
-        if (!((_j = this.planOrder) === null || _j === void 0 ? void 0 : _j.endTime) && (transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders.length) === 0) {
-            this.planOrder.endTime = new Date((_k = this.planOrder) === null || _k === void 0 ? void 0 : _k.startTime);
-            this.planOrder.endTime.setHours(((_m = (_l = this.planOrder) === null || _l === void 0 ? void 0 : _l.endTime) === null || _m === void 0 ? void 0 : _m.getHours()) + (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) > 0 ? (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) / 60) : 1));
+        if (!((_j = this.planOrder) === null || _j === void 0 ? void 0 : _j.endTime) && ((_k = transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders) === null || _k === void 0 ? void 0 : _k.length) === 0) {
+            this.planOrder.endTime = new Date((_l = this.planOrder) === null || _l === void 0 ? void 0 : _l.startTime);
+            this.planOrder.endTime.setHours(((_o = (_m = this.planOrder) === null || _m === void 0 ? void 0 : _m.endTime) === null || _o === void 0 ? void 0 : _o.getHours()) + (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) > 0 ? (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) / 60) : 1));
             this.planOrder.startTime.setMinutes(0);
             this.planOrder.startTime.setSeconds(0);
         }
-        if ((transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders.length) > 0) {
+        if (((_p = transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders) === null || _p === void 0 ? void 0 : _p.length) > 0) {
             this.planOrder.startTime = new Date(transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.date);
-            this.planOrder.startTime.setHours((_p = (_o = transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders[transportWeekDay.plannedOrders.length - 1]) === null || _o === void 0 ? void 0 : _o.endTime) === null || _p === void 0 ? void 0 : _p.getHours());
+            this.planOrder.startTime.setHours((_r = (_q = transportWeekDay === null || transportWeekDay === void 0 ? void 0 : transportWeekDay.plannedOrders[transportWeekDay.plannedOrders.length - 1]) === null || _q === void 0 ? void 0 : _q.endTime) === null || _r === void 0 ? void 0 : _r.getHours());
             this.planOrder.startTime.setMinutes(0);
             this.planOrder.startTime.setSeconds(0);
             this.planOrder.endTime = new Date(this.planOrder.startTime);
-            this.planOrder.endTime.setHours(((_r = (_q = this.planOrder) === null || _q === void 0 ? void 0 : _q.endTime) === null || _r === void 0 ? void 0 : _r.getHours()) + (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) > 0 ? (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) / 60) : 1));
+            this.planOrder.endTime.setHours(((_t = (_s = this.planOrder) === null || _s === void 0 ? void 0 : _s.endTime) === null || _t === void 0 ? void 0 : _t.getHours()) + (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) > 0 ? (this.deliveryPlanningService.totalAssemblyTime(this.planOrder) / 60) : 1));
             this.planOrder.startTime.setMinutes(0);
             this.planOrder.startTime.setSeconds(0);
         }
     }
+    handleDateChange(text) {
+        let splitText;
+        splitText = text.split(":");
+        if (splitText) {
+            let date = new Date(this.transportDay.date);
+            date.setHours(parseInt(splitText[0]));
+            date.setMinutes(parseInt(splitText[1]));
+            date.setSeconds(0);
+            return date;
+        }
+        else {
+            return undefined;
+        }
+    }
 }
 DeliveryPlanningOverviewPopupComponent.decorators = [
     { type: Component, args: [{
@@ -44016,10 +44303,10 @@ DeliveryPlanningOverviewPopupComponent.decorators = [
         </div>
 
         <div class="popup-row">
-          <co-input-text [model]="startTimeForOrder() | date: 'HH:mm'"
-                         [placeholder]="'STARTTIME' | localize" (modelChange)="handleStartTimeChange($event)"></co-input-text>
-          <co-input-text [model]="endTimeForOrder() | date: 'HH:mm'"
-                         [placeholder]="'STOPTIME' | localize" (modelChange)="handleEndTimeChange($event)"></co-input-text>
+          <co-input-text #startTime [model]="startTimeForOrder() | date: 'hh:mm'"
+                         [placeholder]="'STARTTIME' | localize" (blur)="handleStartTimeChange()"></co-input-text>
+          <co-input-text #endTime [model]="endTimeForOrder() | date: 'hh:mm'"
+                         [placeholder]="'STOPTIME' | localize" (blur)="handleEndTimeChange()"></co-input-text>
         </div>
 
 
@@ -44055,6 +44342,8 @@ DeliveryPlanningOverviewPopupComponent.ctorParameters = () => [
 DeliveryPlanningOverviewPopupComponent.propDecorators = {
     closeEvent: [{ type: Output }],
     onSucceededPlanAction: [{ type: Output }],
+    startTimeCompRef: [{ type: ViewChild, args: ['startTime',] }],
+    endTimeCompRef: [{ type: ViewChild, args: ['endTime',] }],
     showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview-popup",] }]
 };
 
@@ -52416,29 +52705,32 @@ TransactionServiceOverviewComponent.decorators = [
       <div class="message-and-task-wrapper">
         <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> <!--[screenConfigurationObject]="" screenConfigNativeElement-->
-            <co-transaction-service-message  class="transaction-service-message" [transaction]="transaction">
-            </co-transaction-service-message>
-          </div>
-          <co-files-upload (documentChangeEvent)="upsertDocument($event)"
+            <div class="service-message">
+              <label class="label service-label" [textContent]="'SERVICE_REPORT'| localize"></label>
+              <span  *ngIf="transactionServiceInfo && transactionServiceInfo.wizardQuestionsAndAnswers"
+                                 [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)" [screenConfigurationObject]="cfgNames.ServiceOverviewImage"
                            (documentDeleted)="deleteDocument($event)"
                            [label]="'ADD_IMAGES' | localize"
                            [documents]="documents"
-                           [isEditable]="false">
+                           [isEditable]="false" > <!---->
           </co-files-upload>
+          </div>
           <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"
@@ -52450,22 +52742,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
             },] }
 ];
@@ -52519,7 +52816,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
             },] }
@@ -53648,7 +53946,8 @@ TransactionLinesSidePanelServiceOrderModule.decorators = [
                     CommonModule,
                     InputTextareaModule,
                     InputTextModule,
-                    IconModule
+                    IconModule,
+                    ScreenConfigurationModule
                 ],
                 declarations: [
                     TransactionLinesSidePanelServiceOrderComponent
@@ -53695,7 +53994,8 @@ TransactionServiceOverviewModule.decorators = [
                     ComponentActivityListModule,
                     TaskCreatorModule,
                     TransactionLinesSidePanelModule,
-                    TransactionServiceMessageModule
+                    TransactionServiceMessageModule,
+                    ScreenConfigurationModule,
                 ],
                 declarations: [
                     TransactionServiceOverviewComponent
@@ -55304,9 +55604,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.cashRegisters.length === 1) {
+            this.saveButtonClick();
+        }
     }
     _prepareDialogData() {
         return __awaiter(this, void 0, void 0, function* () {