@colijnit/transaction 256.1.38 → 256.1.40

package/fesm2015/colijnit-transaction.js

@@ -173,6 +173,7 @@ import { DiscountType } from '@colijnit/transactionapi/build/enum/discount-type.
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
 import { PagingParameters } from '@colijnit/ioneconnector/build/model/paging-parameters';
+import { SearchType } from '@colijnit/transactionapi/build/enum/search-type.enum';
 import { GetPurchaseOrderConfirmation } from '@colijnit/transactionapi/build/model/get-purchase-order-confirmation';
 import { PurchaseOrderConfirmationLineDetails } from '@colijnit/transactionapi/build/model/purchase-order-confirmation-line-details';
 import { PdfInvoiceRequest } from '@colijnit/transactionapi/build/model/pdf-invoice-request';
@@ -281,8 +282,8 @@ class Version {
     constructor() {
         this.name = "@colijnit/transaction";
         this.description = "Colijn IT transaction package";
-        this.symVer = "256.1.38";
-        this.publishDate = "6-1-2025 19:17:18";
+        this.symVer = "256.1.40";
+        this.publishDate = "7-1-2025 17:28:47";
     }
 }
 
@@ -6583,6 +6584,18 @@ class TransactionConnectorAdapterService {
             }
         }, 500);
     }
+    getTermsAndConditionsForm(transId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.connector.getTermsAndConditionsForm(transId, true);
+            if (response && response.validationResult && response.validationResult.success) {
+                return response.resultObject;
+            }
+            else {
+                this._handleExceptionFromResponse(response);
+                return null;
+            }
+        });
+    }
     _openPdfContent(content) {
         if (content) {
             try {
@@ -8275,6 +8288,11 @@ class TransactionConnectorService {
             return this._adapterService.functionCall(this._adapterService.getPlannedLinesForEmployee, [planningId, relationId, date]);
         });
     }
+    getTermsAndConditionsForm(transId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._adapterService.getTermsAndConditionsForm(transId);
+        });
+    }
 }
 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 = [
@@ -8527,6 +8545,8 @@ var TransactionCfgName;
     TransactionCfgName["HeaderProductDetails"] = "headerProductDetails";
     TransactionCfgName["HeaderOrderDetails"] = "headerOrderDetails";
     TransactionCfgName["HeaderPurchaseDetails"] = "headerPurchaseDetails";
+    TransactionCfgName["IsDocSignEnabled"] = "isDocSignEnabled";
+    TransactionCfgName["IsAdditionalDocEnabled"] = "isAdditionalDocEnabled";
 })(TransactionCfgName || (TransactionCfgName = {}));
 
 class TransactionScreenConfigurationService extends BaseModuleScreenConfigService {
@@ -13416,6 +13436,11 @@ class TransactionService extends PendingReasonService {
             return yield this.connector.getSLAProducts();
         });
     }
+    getTermsAndConditionsForm(transId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.connector.getTermsAndConditionsForm(transId);
+        });
+    }
     _handleBeforeRememberCurrentTransaction(transactionInfoResponse) {
         return __awaiter(this, void 0, void 0, function* () {
             this.prepareManualSaveInternalParam();
@@ -17640,6 +17665,7 @@ class TransactionSearchService {
         this.activeSearchViewMode = SearchViewMode.FullScreen;
         this.activeSearchBarViewMode = SearchbarViewMode.Expanded;
         this.showFilterSidebar = false;
+        this.searchFromPlanning = false;
         this.transactions = [];
         this.transactionLines = [];
         this.searchRequestSet = new BehaviorSubject(undefined);
@@ -17707,6 +17733,9 @@ class TransactionSearchService {
     searchTransactions() {
         return __awaiter(this, void 0, void 0, function* () {
             this.searchRequest.transactionKind = this.transactionType;
+            if (this.searchFromPlanning) {
+                this.searchRequest.searchType = SearchType.SalesOrdersToBePlanned;
+            }
             if (this.isNewGeneralSearch()) {
                 this._currentPage = 1;
             }
@@ -18664,6 +18693,8 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
         this.showSendMethodDialog = false;
         this.sendMethods = sendMethodsWithIcon;
         this.historicReports = [];
+        this.additionalFileContents = '';
+        this.additionalFileName = '';
     }
     ngOnInit() {
         super.ngOnInit();
@@ -18671,6 +18702,11 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
         this._getDefaultSendMethod();
         this._getEmailLayouts();
         this._getPrintLayouts();
+        this.isDocSignEnabled = this.screenConfigService.getObjectConfigurationFor(this.cfgNames.IsDocSignEnabled).immediatelyVisible();
+        this.isAdditionalDocEnabled = this.screenConfigService.getObjectConfigurationFor(this.cfgNames.IsAdditionalDocEnabled).immediatelyVisible();
+        if (this.isAdditionalDocEnabled) {
+            this._getTermsAndConditionsForm();
+        }
     }
     transactionSet() {
         this.reportDocumentEmailRequest.transId = this.transactionInfo.id;
@@ -18741,6 +18777,16 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
     commitAndRefreshTransaction() {
         this.transactionService.commitAndRefreshTransaction();
     }
+    upsertDocument(doc) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.transactionService.mergeDocumentOnTransaction(this.transactionInfo.id.toString(), doc);
+            if (response) {
+                this.showSendMethodDialog = false;
+                yield this.dialogService.showToast('DATA_SAVED', true);
+                this.dialogService.hideToastAfterMs(2000);
+            }
+        });
+    }
     _getPrinters() {
         this.transactionService.getPrinters().then((printerList) => {
             this.printerList = printerList;
@@ -18788,6 +18834,12 @@ class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBas
             }
         });
     }
+    _getTermsAndConditionsForm() {
+        this.transactionService.getTermsAndConditionsForm(this.transactionInfo.id).then(result => {
+            this.additionalFileContents = result;
+            this.additionalFileName = this.transactionInfo.transactionKind + '_' + this.transactionInfo.transactionNr.toString();
+        });
+    }
 }
 TransactionQuickAccessSendMethodBaseComponent.decorators = [
     { type: Directive }
@@ -19195,10 +19247,14 @@ TransactionQuickAccessOverviewComponent.decorators = [
                            [emailAddresses]="emailAddresses"
                            [emailLayouts]="emailLayouts"
                            [printLayouts]="printLayouts"
-                           [isDocSignEnabled]="true"
+                           [isDocSignEnabled]="isDocSignEnabled"
+                           [isAdditionalDocEnabled]="isAdditionalDocEnabled"
+                           [additionalFileContents]="additionalFileContents"
+                           [additionalFileName]="additionalFileName"
                            [(reportingDocumentEmailRequest)]="reportDocumentEmailRequest"
                            [(reportingDocumentPrintRequest)]="reportDocumentPrintRequest"
                            [(reportingDocumentPdfRequest)]="reportDocumentPdfRequest"
+                           (additionalFileChangeEvent)="upsertDocument($event)"
                            (closeClick)="showSendMethodDialog = false"
                            (okClick)="handleSendMethodOkClick($event)"
     ></co-send-method-dialog>
@@ -25668,7 +25724,8 @@ class DeliveryPlanningService {
         this.viewMode = DeliveryPlanningViewModes.Fullscreen;
         this.currentPlanningMode = DeliveryPlanningModes.Transaction;
         this.currentStartDate = new Date();
-        this.availabilityCheckEvent = new Subject();
+        this.availabilityCheckEvent = new EventEmitter();
+        this.availabilityResetEvent = new EventEmitter();
         this.reRenderHourScheduling = new Subject();
         this.employeeView = false;
     }
@@ -25697,17 +25754,8 @@ class DeliveryPlanningService {
         return this._userGroups;
     }
     set dragging(value) {
-        if (!this._dragging && value) {
-            this.availabilityCheckEvent.next(this.currentTransId);
-        }
         this._dragging = value;
     }
-    set planTransportWeek(value) {
-        this._planTransportWeek = value;
-    }
-    set planTransportWeekArr(value) {
-        this._planTransportWeekArr = value;
-    }
     set deliveryMethods(methods) {
         this._deliveryMethods = methods;
     }
@@ -25744,23 +25792,6 @@ class DeliveryPlanningService {
             return planningTransportWeekDay;
         });
     }
-    makeOrderLinesPlannedRequest(order) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.currentPlanning) {
-                let request = new OrderLinesPlannedRequest();
-                let filterObj = new PlanningFilterObject();
-                request.planned = true;
-                request.planningId = this.currentPlanning.planningId;
-                request.transId = order.transId;
-                request.plannedLineId = order.plannedLineId;
-                filterObj.onlyCurrentWeek = true;
-                filterObj.beginCurrentWeek = new Date();
-                filterObj.checkOrderLines = 1;
-                request.filterObject = filterObj;
-                return request;
-            }
-        });
-    }
     getOrderLinesPlanned(order) {
         return __awaiter(this, void 0, void 0, function* () {
             let request = new OrderLinesPlannedRequest();
@@ -25898,7 +25929,7 @@ class DeliveryPlanningService {
 DeliveryPlanningService.ɵprov = i0.ɵɵdefineInjectable({ factory: function DeliveryPlanningService_Factory() { return new DeliveryPlanningService(i0.ɵɵinject(TransactionConnectorService)); }, token: DeliveryPlanningService, providedIn: "root" });
 DeliveryPlanningService.decorators = [
     { type: Injectable, args: [{
-                providedIn: "root"
+                providedIn: 'root'
             },] }
 ];
 DeliveryPlanningService.ctorParameters = () => [
@@ -25906,7 +25937,7 @@ DeliveryPlanningService.ctorParameters = () => [
 ];
 
 class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
-    constructor(transactionHeaderService, transactionLineService, transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector, _deliveryPlanningService) {
+    constructor(transactionHeaderService, transactionLineService, transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector, _deliveryPlanningService, _dialog, _dictionary) {
         super(transactionHeaderService, transactionLineService, transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector);
         this.transactionHeaderService = transactionHeaderService;
         this.transactionLineService = transactionLineService;
@@ -25918,6 +25949,8 @@ class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
         this.transactionService = transactionService;
         this.changeDetector = changeDetector;
         this._deliveryPlanningService = _deliveryPlanningService;
+        this._dialog = _dialog;
+        this._dictionary = _dictionary;
         this.category = TransactionTypeCategory;
         this.descriptionDblClick = new EventEmitter();
         this.stock = StockStatus.Low;
@@ -25983,38 +26016,46 @@ class TransactionPlanningLineComponent extends TransactionLineBaseComponent {
     }
     dragStarted(ev) {
         var _a, _b, _c;
-        this._deliveryPlanningService.currentTransId = this.transactionInfo.id;
-        ev.target.classList.add('dragging');
-        const lineElement = ev.target.closest('co-transaction-base-line');
-        if (!lineElement)
-            return;
-        const dragBox = (_a = lineElement.querySelector('.co-transaction-line-image-and-description')) === null || _a === void 0 ? void 0 : _a.cloneNode(true);
-        const dragImage = document.createElement('div');
-        dragImage.style.display = 'flex';
-        dragImage.style.flexDirection = 'row';
-        dragImage.style.alignItems = 'center';
-        dragImage.style.justifyContent = 'space-around';
-        dragImage.style.width = '250px';
-        dragImage.style.minHeight = '50px';
-        dragImage.style.padding = '10px';
-        dragImage.style.backgroundColor = '#ffffff';
-        dragImage.style.border = '1px solid #ccc';
-        dragImage.style.boxShadow = '0 4px 6px rgba(0, 0, 0, 0.1)';
-        dragImage.style.borderRadius = '5px';
-        dragImage.style.fontSize = '12px';
-        if (dragBox) {
-            dragBox.style.flex = '1';
-            dragImage.appendChild(dragBox);
-        }
-        document.body.appendChild(dragImage);
-        dragImage.style.position = 'absolute';
-        dragImage.style.top = '-1000px';
-        dragImage.style.left = '-1000px';
-        // Set the custom drag image
-        (_b = ev.dataTransfer) === null || _b === void 0 ? void 0 : _b.setDragImage(dragImage, 50, 25);
-        // Cleanup: Remove the drag image after it's set
-        setTimeout(() => document.body.removeChild(dragImage), 0);
-        (_c = ev.dataTransfer) === null || _c === void 0 ? void 0 : _c.setData('text', 'lines');
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.transactionLine.articleLineStatus.quantityAllocated <= 0) {
+                yield this._dialog.showError(this._dictionary.get('ORDER_CAN_NOT_BE_PLANNED'), true);
+                return;
+            }
+            else {
+                this._deliveryPlanningService.currentTransId = this.transactionInfo.id;
+                (_a = ev.dataTransfer) === null || _a === void 0 ? void 0 : _a.setData('text', 'lines');
+            }
+            ev.target.classList.add('dragging');
+            const lineElement = ev.target.closest('co-transaction-base-line');
+            if (!lineElement)
+                return;
+            const dragBox = (_b = lineElement.querySelector('.co-transaction-line-image-and-description')) === null || _b === void 0 ? void 0 : _b.cloneNode(true);
+            const dragImage = document.createElement('div');
+            dragImage.style.display = 'flex';
+            dragImage.style.flexDirection = 'row';
+            dragImage.style.alignItems = 'center';
+            dragImage.style.justifyContent = 'space-around';
+            dragImage.style.width = '250px';
+            dragImage.style.minHeight = '50px';
+            dragImage.style.padding = '10px';
+            dragImage.style.backgroundColor = '#ffffff';
+            dragImage.style.border = '1px solid #ccc';
+            dragImage.style.boxShadow = '0 4px 6px rgba(0, 0, 0, 0.1)';
+            dragImage.style.borderRadius = '5px';
+            dragImage.style.fontSize = '12px';
+            if (dragBox) {
+                dragBox.style.flex = '1';
+                dragImage.appendChild(dragBox);
+            }
+            document.body.appendChild(dragImage);
+            dragImage.style.position = 'absolute';
+            dragImage.style.top = '-1000px';
+            dragImage.style.left = '-1000px';
+            // Set the custom drag image
+            (_c = ev.dataTransfer) === null || _c === void 0 ? void 0 : _c.setDragImage(dragImage, 50, 25);
+            // Cleanup: Remove the drag image after it's set
+            setTimeout(() => document.body.removeChild(dragImage), 0);
+        });
     }
     dragEnded(ev) {
         ev.target.classList.remove('dragging');
@@ -26154,7 +26195,9 @@ TransactionPlanningLineComponent.ctorParameters = () => [
     { type: DictionaryService },
     { type: TransactionService },
     { type: ChangeDetectorRef },
-    { type: DeliveryPlanningService }
+    { type: DeliveryPlanningService },
+    { type: TransactionDialogService },
+    { type: DictionaryService }
 ];
 TransactionPlanningLineComponent.propDecorators = {
     descriptionDblClick: [{ type: Output }],
@@ -36235,6 +36278,7 @@ class DeliveryPlanningComponent {
     constructor(_deliveryPlanningService) {
         this._deliveryPlanningService = _deliveryPlanningService;
         this.viewModes = DeliveryPlanningViewModes;
+        this.fullscreenEvent = new EventEmitter();
     }
     set employeeView(value) {
         this._deliveryPlanningService.employeeView = value;
@@ -36260,17 +36304,19 @@ class DeliveryPlanningComponent {
     showClass() {
         return true;
     }
+    fullscreenToggle() {
+        this.fullscreenEvent.emit();
+    }
 }
 DeliveryPlanningComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-delivery-planning',
                 template: `
       <div class="row">
-          <co-delivery-planning-main>
+          <co-delivery-planning-main (fullscreenEvent)="fullscreenToggle()">
           </co-delivery-planning-main>
       </div>
 
-
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -36284,6 +36330,7 @@ DeliveryPlanningComponent.propDecorators = {
     currentPlanningViewMode: [{ type: Input }],
     currentPlanningMode: [{ type: Input }],
     calendarViewMode: [{ type: Input }],
+    fullscreenEvent: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ['class.co-delivery-planning',] }]
 };
 
@@ -36366,6 +36413,7 @@ class DeliveryPlanningMainComponent {
         this._transactionConn = _transactionConn;
         this._transaction = _transaction;
         this._transactionSearch = _transactionSearch;
+        this.fullscreenEvent = new EventEmitter();
     }
     get currentMode() {
         return this._deliveryPlanningService.currentCalendarMode;
@@ -36467,6 +36515,9 @@ class DeliveryPlanningMainComponent {
             // All necessary data has been loaded
         });
     }
+    fullscreenToggle() {
+        this.fullscreenEvent.emit();
+    }
 }
 DeliveryPlanningMainComponent.decorators = [
     { type: Component, args: [{
@@ -36477,6 +36528,7 @@ DeliveryPlanningMainComponent.decorators = [
           <div class="delivery-main-wrapper">
               <div class="planning-selection-wrapper">
                   <co-delivery-planning-selection
+                          (fullscreenEvent)="fullscreenToggle()"
                           (planningChangeEvent)="planningChanged($event)"></co-delivery-planning-selection>
               </div>
               <co-delivery-planning-overview [currentMode]="currentMode"
@@ -36502,6 +36554,7 @@ DeliveryPlanningMainComponent.ctorParameters = () => [
     { type: TransactionSearchService }
 ];
 DeliveryPlanningMainComponent.propDecorators = {
+    fullscreenEvent: [{ type: Output }],
     showClass: [{ type: HostBinding, args: ['class.co-delivery-planning-main',] }]
 };
 
@@ -36567,13 +36620,18 @@ class DeliveryPlanningSelectionComponent {
         this._transaction = _transaction;
         this.deliveryPlanningService = deliveryPlanningService;
         this.icons = Icon;
+        this.deliveryPlanningViewModes = DeliveryPlanningViewModes;
         this.plannings = [];
         this.planningChangeEvent = new EventEmitter();
+        this.fullscreenEvent = new EventEmitter();
         this.expanded = false;
     }
     get currentPlanning() {
         return this.deliveryPlanningService.currentPlanning;
     }
+    get currentViewMode() {
+        return this.deliveryPlanningService.viewMode;
+    }
     set currentPlanning(planning) {
         this.deliveryPlanningService.currentPlanning = planning;
     }
@@ -36595,27 +36653,35 @@ class DeliveryPlanningSelectionComponent {
         }
         this.planningChangeEvent.emit(planning);
     }
+    fullscreenToggled() {
+        this.fullscreenEvent.emit();
+    }
 }
 DeliveryPlanningSelectionComponent.decorators = [
     { type: Component, args: [{
-                selector: "co-delivery-planning-selection",
+                selector: 'co-delivery-planning-selection',
                 template: `
-        <div class="wrapper column">
-            <div class="lov-wrapper">
-              <div class="row" [class.drop-active]="expanded" (click)="expanded = !expanded">
-                <span class="planning-title" [textContent]="currentPlanning?.description"></span>
-                <co-icon [iconData]="iconCacheService.getIcon(icons.ArrowPointDown)"></co-icon>
+      <div class="wrapper column">
+          <div class="lov-wrapper">
+              <div class="row">
+                  <div class="row" [class.drop-active]="expanded" (click)="expanded = !expanded">
+                      <span class="planning-title" [textContent]="currentPlanning?.description"></span>
+                      <co-icon [iconData]="iconCacheService.getIcon(icons.ArrowPointDown)"></co-icon>
+
+                  </div>
+                  <co-icon *ngIf="currentViewMode === deliveryPlanningViewModes.Sidebar" [iconData]="iconCacheService.getIcon(icons.ExpandSolid)" (click)="fullscreenToggled()"></co-icon>
+
               </div>
-                <div class="options-wrapper" *ngIf="expanded">
-                    <div class="option" *ngFor="let planning of plannings">
-                        <span (click)="planningChange(planning)" [textContent]="planning?.description"></span>
-                    </div>
-                </div>
-            </div>
+              <div class="options-wrapper" *ngIf="expanded">
+                  <div class="option" *ngFor="let planning of plannings">
+                      <span (click)="planningChange(planning)" [textContent]="planning?.description"></span>
+                  </div>
+              </div>
+          </div>
 
-        </div>
+      </div>
 
-    `,
+  `,
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
@@ -36626,7 +36692,8 @@ DeliveryPlanningSelectionComponent.ctorParameters = () => [
 ];
 DeliveryPlanningSelectionComponent.propDecorators = {
     planningChangeEvent: [{ type: Output }],
-    showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-selection",] }]
+    fullscreenEvent: [{ type: Output }],
+    showClass: [{ type: HostBinding, args: ['class.co-delivery-planning-selection',] }]
 };
 
 class DeliveryPlanningSelectionModule {
@@ -36648,8 +36715,9 @@ DeliveryPlanningSelectionModule.decorators = [
 ];
 
 class DeliveryPlanningOverviewTileComponent {
-    constructor(_deliveryPlanningService, _changeDetector, iconCacheService) {
+    constructor(_deliveryPlanningService, _transaction, _changeDetector, iconCacheService) {
         this._deliveryPlanningService = _deliveryPlanningService;
+        this._transaction = _transaction;
         this._changeDetector = _changeDetector;
         this.iconCacheService = iconCacheService;
         this.icons = Icon;
@@ -36664,6 +36732,7 @@ class DeliveryPlanningOverviewTileComponent {
         this.getTransportOrdersEvent = new EventEmitter();
         this.timeChangeEvent = new EventEmitter();
         this.openSettingsDialogEvent = new EventEmitter();
+        this.availabilityChecked = new EventEmitter();
         this.calendarPlanEvent = new EventEmitter();
         this.moveEvent = new EventEmitter();
     }
@@ -36692,6 +36761,9 @@ class DeliveryPlanningOverviewTileComponent {
                 this._changeDetector.markForCheck();
                 this._changeDetector.detectChanges();
             }));
+            this._subs.push(this._deliveryPlanningService.availabilityCheckEvent.subscribe((transId) => __awaiter(this, void 0, void 0, function* () {
+                yield this.handleAvailabilityChecked(transId);
+            })));
         });
     }
     ngOnDestroy() {
@@ -36723,16 +36795,6 @@ class DeliveryPlanningOverviewTileComponent {
     handleDeleteOrderLineClick(data) {
         this.deleteOrderLineEvent.emit(data);
     }
-    handleSettingsSave() {
-    }
-    onCustomDragStart(event, obj) {
-        const currentHour = obj['startTime'] + ':00'; // Assuming start hour is used
-        event.dataTransfer.setData('text', JSON.stringify({ obj, currentHour }));
-    }
-    onExpandableDragStart(event, obj, onDragStartCustom) {
-        onDragStartCustom === null || onDragStartCustom === void 0 ? void 0 : onDragStartCustom.call(obj);
-        event.dataTransfer.setData('text', JSON.stringify({ obj }));
-    }
     orderForObject(transId) {
         return this.transportDay.plannedOrders.find(order => order.transId === transId);
     }
@@ -36758,6 +36820,42 @@ class DeliveryPlanningOverviewTileComponent {
             }
         });
     }
+    handleAvailabilityChecked(transId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let planOrder = yield this._transaction.getPlanOrder(transId);
+            if (!planOrder.partDelivery) {
+                this._deliveryPlanningService.deliveryMethods.find(method => parseInt(method.code) === planOrder.deliveryMethod) ? this.availabilityChecked.emit({
+                    transportDay: this.transportDay,
+                    available: true
+                }) : this.availabilityChecked.emit({ transportDay: this.transportDay, available: false });
+            }
+            else {
+                let available = true;
+                yield this.getOrderLinesPlanned(planOrder);
+                planOrder.lines.forEach((line) => {
+                    if (!this.transportDay.deliveryMethods.find(method => method === line.deliveryMethod)) {
+                        available = false;
+                    }
+                });
+                this.availabilityChecked.emit({ transportDay: this.transportDay, available: available });
+            }
+        });
+    }
+    getOrderLinesPlanned(planOrder) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let request = new OrderLinesPlannedRequest();
+            let filterObj = new PlanningFilterObject();
+            request.planned = true;
+            request.planningId = this._deliveryPlanningService.currentPlanning.planningId;
+            request.transId = planOrder.transId;
+            request.plannedLineId = planOrder.plannedLineId;
+            filterObj.onlyCurrentWeek = true;
+            filterObj.beginCurrentWeek = new Date();
+            filterObj.checkOrderLines = 1;
+            request.filterObject = filterObj;
+            planOrder.lines.push(...yield this._transaction.getOrderLinesPlanned(request));
+        });
+    }
 }
 DeliveryPlanningOverviewTileComponent.decorators = [
     { type: Component, args: [{
@@ -36854,6 +36952,7 @@ DeliveryPlanningOverviewTileComponent.decorators = [
 ];
 DeliveryPlanningOverviewTileComponent.ctorParameters = () => [
     { type: DeliveryPlanningService },
+    { type: TransactionService },
     { type: ChangeDetectorRef },
     { type: IconCacheService }
 ];
@@ -36867,6 +36966,7 @@ DeliveryPlanningOverviewTileComponent.propDecorators = {
     getTransportOrdersEvent: [{ type: Output }],
     timeChangeEvent: [{ type: Output }],
     openSettingsDialogEvent: [{ type: Output }],
+    availabilityChecked: [{ type: Output }],
     calendarPlanEvent: [{ type: Output }],
     moveEvent: [{ type: Output }],
     hourSchedulingComp: [{ type: ViewChild, args: ['hourSchedulingComponent',] }],
@@ -36887,16 +36987,16 @@ class DeliveryPlanningOverviewComponent {
         this.tileModes = DeliveryPlanningTileModes;
         this.deliveryPlanningViewModes = DeliveryPlanningViewModes;
         this.availability = [];
+        this.available = false;
+        this.showNoteDialog = false;
+        this.showSettingsDialog = false;
+        this._subs = [];
         this.columnNum = 3; //initial count
         this.currentMode = DeliveryPlanningCalendarModes.Week;
         this.currentViewMode = CalendarView.WeekView;
         this.currentPlanningViewMode = this.deliveryPlanningViewModes.Fullscreen;
         this.updatePlanningTransportEvent = new EventEmitter();
         this.resetPlanningTransportEvent = new EventEmitter();
-        this.tileSize = 300; //one tile should have this width
-        this.available = false;
-        this.showNoteDialog = false;
-        this.showSettingsDialog = false;
     }
     set tiles(tiles) {
         this.tilesQueryList = tiles;
@@ -36925,6 +37025,18 @@ class DeliveryPlanningOverviewComponent {
     ngAfterViewChecked() {
         this.setColNum();
     }
+    ngOnInit() {
+        this._subs.push(this._deliveryPlanningService.availabilityResetEvent.subscribe(event => {
+            this.availability = [];
+            this._changeDetector.markForCheck();
+            this._changeDetector.detectChanges();
+        }));
+    }
+    ngOnDestroy() {
+        this._subs.forEach((sub) => {
+            sub.unsubscribe();
+        });
+    }
     showClass() {
         return true;
     }
@@ -36938,39 +37050,44 @@ class DeliveryPlanningOverviewComponent {
             ev.preventDefault();
             ev.stopPropagation();
             this._deliveryPlanningService.dragging = false;
-            const data = ev.dataTransfer.getData("text");
-            let index = transportDays.indexOf(transportDay);
-            let tile = this.tilesQueryList.get(index);
-            if (!tile.expanded) {
-                tile.expanded = true;
-            }
-            if (data != "lines" && !this._deliveryPlanningService.movingTransId) {
-                if (data && parseInt(data)) {
-                    yield this._transaction.getTransactionById(parseInt(data));
-                    const order = this._transaction.currentTransaction;
-                    if (((_b = (_a = order.transactionInfo) === null || _a === void 0 ? void 0 : _a.headerInfoStatus) === null || _b === void 0 ? void 0 : _b.quantityPlanningFinal) === 0) {
-                        const planOrder = yield this._transactionCon.getPlanOrder(parseInt(data));
-                        if (planOrder) {
-                            this.openPlanningPopup(planOrder, transportDay, week);
+            if (this.checkAvailable(transportDay)) {
+                yield this._dialog.showError(this._dictionary.get('ORDER_CAN_NOT_BE_PLANNED_ON_RESOURCE'), true);
+            }
+            else {
+                const data = ev.dataTransfer.getData('text');
+                let index = transportDays.indexOf(transportDay);
+                let tile = this.tilesQueryList.get(index);
+                if (!tile.expanded) {
+                    tile.expanded = true;
+                }
+                if (data != 'lines' && !this._deliveryPlanningService.movingTransId) {
+                    if (data && parseInt(data)) {
+                        yield this._transaction.getTransactionById(parseInt(data));
+                        const order = this._transaction.currentTransaction;
+                        if (((_b = (_a = order.transactionInfo) === null || _a === void 0 ? void 0 : _a.headerInfoStatus) === null || _b === void 0 ? void 0 : _b.quantityPlanningFinal) === 0) {
+                            const planOrder = yield this._transactionCon.getPlanOrder(parseInt(data));
+                            if (planOrder) {
+                                this.openPlanningPopup(planOrder, transportDay, week);
+                            }
+                        }
+                        else {
+                            yield this._dialog.showError(this._dictionary.get('ORDER_HAS_ALREADY_BEEN_PLANNED'), true);
                         }
-                    }
-                    else {
-                        yield this._dialog.showError(this._dictionary.get("ORDER_HAS_ALREADY_BEEN_PLANNED"), true);
                     }
                 }
-            }
-            else if (data != "lines" && this._deliveryPlanningService.movingTransId) {
-                // await this.handleMoveNormalEvent(data, transportDay, week, this.planTransportWeekArr);
-            }
-            else {
-                yield this.planSelectedLines(transportDay, week);
+                else if (data != 'lines' && this._deliveryPlanningService.movingTransId) {
+                    // await this.handleMoveNormalEvent(data, transportDay, week, this.planTransportWeekArr);
+                }
+                else {
+                    yield this.planSelectedLines(transportDay, week);
+                }
             }
         });
     }
     allowDrop(ev, transportDay) {
         ev.preventDefault();
         if (this._deliveryPlanningService.dragging && transportDay.maxMinutes > 0 && transportDay.availableOnDate) {
-            return transportDay.minutes + transportDay.minutes < transportDay.maxMinutes && transportDay.maxOrderAmount < transportDay.orderAmount && transportDay.availableOnDate;
+            return transportDay.minutes + transportDay.minutes < transportDay.maxMinutes && transportDay.maxOrderAmount < transportDay.orderAmount && transportDay.availableOnDate && this.checkAvailable(transportDay);
         }
     }
     setColNum() {
@@ -37009,7 +37126,7 @@ class DeliveryPlanningOverviewComponent {
                     });
                 }
                 else {
-                    yield this._dialog.showError("NO_LINES_TO_DELETE", true);
+                    yield this._dialog.showError('NO_LINES_TO_DELETE', true);
                 }
             }
         });
@@ -37100,7 +37217,7 @@ class DeliveryPlanningOverviewComponent {
                 });
             }
             else {
-                yield this._dialog.showError("NO_LINES_TO_PLAN", true);
+                yield this._dialog.showError('NO_LINES_TO_PLAN', true);
             }
         });
     }
@@ -37124,12 +37241,12 @@ class DeliveryPlanningOverviewComponent {
                             }
                         });
                         if (cantPlanSelectedLines.length === planOrder.lines.length) {
-                            yield this._dialog.showError("NO_LINES_TO_PLAN", true);
+                            yield this._dialog.showError('NO_LINES_TO_PLAN', true);
                             return;
                         }
                     }
                     else {
-                        yield this._dialog.showError("NO_LINES_SELECTED", true);
+                        yield this._dialog.showError('NO_LINES_SELECTED', true);
                         return;
                     }
                     let plannedOrder = transportDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId);
@@ -37165,7 +37282,7 @@ class DeliveryPlanningOverviewComponent {
     }
     handleSettingsSave(changed) {
         if (changed) {
-            // this.updatePlanningTransportEvent.emit();
+            this.updatePlanningTransportEvent.emit();
         }
     }
     openSettingsDialog(transportDay) {
@@ -37178,12 +37295,16 @@ class DeliveryPlanningOverviewComponent {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let planOrder;
-            if (data.data === "false" && this._deliveryPlanningService.currentTransId) {
+            if (data.data === 'false' && this._deliveryPlanningService.currentTransId) {
                 planOrder = yield this._transactionCon.getPlanOrder((_a = this._deliveryPlanningService) === null || _a === void 0 ? void 0 : _a.currentTransId);
             }
             else {
                 planOrder = yield this._transactionCon.getPlanOrder(parseInt(data.data));
             }
+            if (transportWeekDay.plannedOrders.find((plannedOrder) => plannedOrder.transId === planOrder.transId)) {
+                yield this._dialog.showError(this._dictionary.get('ORDER_HAS_ALREADY_BEEN_PLANNED'), true);
+                return;
+            }
             if (planOrder && data.currentHour) {
                 planOrder.startTime = this.calculateStartTime(transportWeekDay, data.currentHour);
                 planOrder.endTime = this.calculateEndTime(planOrder.startTime, data.currentHour, planOrder);
@@ -37191,7 +37312,7 @@ class DeliveryPlanningOverviewComponent {
                 yield this.getSequenceOrderValue(planOrder);
                 yield this.getOrderLinesPlanned(planOrder);
                 yield this.planOrderLines(planOrder, transportWeekDay, week);
-                if (data.data === "false" && this._transaction.currentTransaction.transactionInfo.uuid) {
+                if (data.data === 'false' && this._transaction.currentTransaction.transactionInfo.uuid) {
                     yield this._transaction.getTransactionById(this._deliveryPlanningService.currentTransId);
                     yield this._transaction.saveTransaction();
                     yield this._transaction.checkRefTransaction();
@@ -37201,17 +37322,17 @@ class DeliveryPlanningOverviewComponent {
     }
     calculateStartTime(transportWeekDay, currentHour) {
         let startDate = new Date(transportWeekDay.date);
-        let startTime = parseInt(currentHour.split(":")[0]);
+        let startTime = parseInt(currentHour.split(':')[0]);
         startDate.setHours(startTime);
-        startDate.setMinutes(parseInt(currentHour.split(":")[1]) > 0 ? parseInt(currentHour.split(":")[1]) : 0);
+        startDate.setMinutes(parseInt(currentHour.split(':')[1]) > 0 ? parseInt(currentHour.split(':')[1]) : 0);
         startDate.setSeconds(0);
         return startDate;
     }
     calculateEndTime(startDate, currentHour, planOrder) {
         let endTime = new Date(startDate);
-        let splitHour = currentHour.split(":");
-        const newEndMinutes = splitHour[1] === "00" ? 30 : 0;
-        const newEndHour = splitHour[1] === "30" ? (parseInt(splitHour[0]) + 1) : parseInt(splitHour[0]);
+        let splitHour = currentHour.split(':');
+        const newEndMinutes = splitHour[1] === '00' ? 30 : 0;
+        const newEndHour = splitHour[1] === '30' ? (parseInt(splitHour[0]) + 1) : parseInt(splitHour[0]);
         endTime.setHours(newEndHour);
         endTime.setMinutes(newEndMinutes);
         let assemblyTime = this._deliveryPlanningService.totalAssemblyTime(planOrder) * 60 * 1000;
@@ -37260,7 +37381,7 @@ class DeliveryPlanningOverviewComponent {
                 yield this._transactionCon.restoreDeliverySettings([planOrder]);
                 //set new date for order and plan it on new transport
                 let newDate = new Date(transport.date);
-                let splitTime = moveData.hour.split(":");
+                let splitTime = moveData.hour.split(':');
                 newDate.setHours(parseInt(splitTime[0]));
                 newDate.setMinutes(parseInt(splitTime[1]));
                 newDate.setSeconds(0);
@@ -37302,13 +37423,13 @@ class DeliveryPlanningOverviewComponent {
 }
 DeliveryPlanningOverviewComponent.decorators = [
     { type: Component, args: [{
-                selector: "co-delivery-planning-overview",
+                selector: 'co-delivery-planning-overview',
                 template: `
       <div class="delivery-planning-wrapper">
           <co-delivery-planning-overview-popup #planningPopup *ngIf="showNoteDialog" (closeEvent)="showNoteDialog = false"
                                                (onSucceededPlanAction)="handlePopupPlanEvent($event)"></co-delivery-planning-overview-popup>
           <co-delivery-planning-overview-tile-settings-popup *ngIf="showSettingsDialog" [transportDay]="selectedTransportDay"
-                                                             (availabilityChecked)="handleAvailabilityChecked($event)"
+
                                                              (onSaveAction)="handleSettingsSave($event)"
                                                              (closeEvent)="showSettingsDialog = false"></co-delivery-planning-overview-tile-settings-popup>
           <div class="delivery-overview-wrapper" [class.sidebar]="currentViewMode === 'DAYS_AROUND'">
@@ -37340,6 +37461,7 @@ DeliveryPlanningOverviewComponent.decorators = [
                               (deleteOrderLineEvent)="handleDeleteLine($event, transPortDay, transportWeekRow)"
                               (editOrderEvent)="handleEditPlannedOrder($event, transPortDay, transportWeekRow)"
                               (moveEvent)="handleMoveEvent($event,transPortDay, transportWeekRow, planTransportWeekArr)"
+                              (availabilityChecked)="handleAvailabilityChecked($event)"
 
 
                       ></co-delivery-planning-overview-tile>
@@ -37376,7 +37498,7 @@ DeliveryPlanningOverviewComponent.propDecorators = {
     currentPlanningViewMode: [{ type: Input }],
     updatePlanningTransportEvent: [{ type: Output }],
     resetPlanningTransportEvent: [{ type: Output }],
-    showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview",] }],
+    showClass: [{ type: HostBinding, args: ['class.co-delivery-planning-overview',] }],
     onResize: [{ type: HostListener, args: ['window:resize', ['$event'],] }]
 };
 
@@ -37764,12 +37886,12 @@ class DeliveryPlanningOverviewPopupComponent {
         this.onSucceededPlanAction.emit([this.planOrder, this.transportDay, this.week]);
     }
     startTimeForOrder() {
-        var _a, _b;
-        return (_b = (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.startTime) === null || _b === void 0 ? void 0 : _b.toUTCString();
+        var _a;
+        return (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.startTime;
     }
     endTimeForOrder() {
-        var _a, _b;
-        return (_b = (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.endTime) === null || _b === void 0 ? void 0 : _b.toUTCString();
+        var _a;
+        return (_a = this.planOrder) === null || _a === void 0 ? void 0 : _a.endTime;
     }
     handleStartTimeChange() {
         if (this.startTimeCompRef.model) {
@@ -37844,63 +37966,63 @@ DeliveryPlanningOverviewPopupComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-delivery-planning-overview-popup",
                 template: `
-    <co-dialog [showCloseIcon]="true" (closeClick)="closePopup()" [headerTemplate]="header"
-               [footerTemplate]="footer">
-      <ng-template #header>
-        <div class="dialog-header-wrapper">
-          <span class="footer-header-title" [textContent]="transportDay?.transport?.registrationNumber"></span>
-          <div class="icon">
-            <co-icon class=""
-                     [iconData]="iconCacheService.getIcon(icons.TruckContainerDuo)"></co-icon>
-          </div>
-        </div>
-      </ng-template>
+      <co-dialog [showCloseIcon]="true" (closeClick)="closePopup()" [headerTemplate]="header"
+                 [footerTemplate]="footer">
+          <ng-template #header>
+              <div class="dialog-header-wrapper">
+                  <span class="footer-header-title" [textContent]="transportDay?.transport?.registrationNumber"></span>
+                  <div class="icon">
+                      <co-icon class=""
+                               [iconData]="iconCacheService.getIcon(icons.TruckContainerDuo)"></co-icon>
+                  </div>
+              </div>
+          </ng-template>
 
-      <div class="body-wrapper">
-        <co-delivery-planning-tile-status
-          [currentVolume]="transportDay?.orderAmount"
-          [maxVolume]="transportDay?.maxOrderAmount"
-          [currentTimeTotal]="transportDay?.minutes"
-          [timeTotal]="transportDay?.maxMinutes">
-        </co-delivery-planning-tile-status>
+          <div class="body-wrapper">
+              <co-delivery-planning-tile-status
+                      [currentVolume]="transportDay?.orderAmount"
+                      [maxVolume]="transportDay?.maxOrderAmount"
+                      [currentTimeTotal]="transportDay?.minutes"
+                      [timeTotal]="transportDay?.maxMinutes">
+              </co-delivery-planning-tile-status>
 
-        <div class="form-details">
-          <span class="h1" [textContent]="'TIME_SETTINGS' | localize"></span>
-        </div>
-        <div class="popup-row">
-          <co-input-text [model]="impactTime()" [placeholder]="'IMPACT_TIME' | localize"></co-input-text>
-          <co-input-text [model]="deliveryPlanningService.totalAssemblyTime(planOrder)"
-                         [placeholder]="'ASSEMBLY_TIME' | localize"></co-input-text>
-        </div>
+              <div class="form-details">
+                  <span class="h1" [textContent]="'TIME_SETTINGS' | localize"></span>
+              </div>
+              <div class="popup-row">
+                  <co-input-text [model]="impactTime()" [placeholder]="'IMPACT_TIME' | localize"></co-input-text>
+                  <co-input-text [model]="deliveryPlanningService.totalAssemblyTime(planOrder)"
+                                 [placeholder]="'ASSEMBLY_TIME' | localize"></co-input-text>
+              </div>
 
-        <div class="popup-row">
-          <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>
+              <div class="popup-row">
+                  <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>
 
 
-        <div class="remark-wrapper">
-          <span [textContent]="'PLAN_REMARKS' | localize"></span>
-          <co-input-textarea [(model)]="planOrder.remarks"></co-input-textarea>
-        </div>
+              <div class="remark-wrapper">
+                  <span [textContent]="'PLAN_REMARKS' | localize"></span>
+                  <co-input-textarea [(model)]="planOrder.remarks"></co-input-textarea>
+              </div>
 
 
-      </div>
+          </div>
 
 
-      <ng-template #footer>
-        <div class="buttons-wrapper">
-          <co-button class="save-button"
-                     [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
-                     (click)="handleCommitClick()"></co-button>
-          <co-button class="close-button"
-                     [iconData]="iconCacheService.getIcon(icons.Crossskinny)"
-                     (click)="closePopup()"></co-button>
-        </div>
-      </ng-template>
-    </co-dialog>
+          <ng-template #footer>
+              <div class="buttons-wrapper">
+                  <co-button class="save-button"
+                             [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"
+                             (click)="handleCommitClick()"></co-button>
+                  <co-button class="close-button"
+                             [iconData]="iconCacheService.getIcon(icons.Crossskinny)"
+                             (click)="closePopup()"></co-button>
+              </div>
+          </ng-template>
+      </co-dialog>
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
@@ -37949,11 +38071,6 @@ class DeliveryPlanningOverviewTileSettingsPopupComponent {
     showClass() {
         return true;
     }
-    ngOnInit() {
-        this._subs.push(this._deliveryPlanningService.availabilityCheckEvent.subscribe((transId) => __awaiter(this, void 0, void 0, function* () {
-            yield this.handleAvailabilityChecked(transId);
-        })));
-    }
     ngOnDestroy() {
         this._subs.forEach(sub => {
             sub.unsubscribe();
@@ -38004,7 +38121,7 @@ class DeliveryPlanningOverviewTileSettingsPopupComponent {
     handleDistrictsChange(event) {
         event.forEach((district) => {
             if (!this.transportDay.districts.find(dayDistrict => dayDistrict === district.districtId)) {
-                this.transportDay.deliveryMethods.push(district.districtId.toString());
+                this.transportDay.districts.push(district.districtId);
             }
         });
         if (!this.settingsChanged) {
@@ -38016,143 +38133,111 @@ class DeliveryPlanningOverviewTileSettingsPopupComponent {
     }
     handleCommitClick() {
         this.onSaveAction.emit(this.settingsChanged);
-    }
-    handleAvailabilityChecked(transId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let planOrder = yield this._transaction.getPlanOrder(transId);
-            if (!planOrder.partDelivery) {
-                this.deliveryMethods.find(method => parseInt(method.code) === planOrder.deliveryMethod) ? this.availabilityChecked.emit({ transportDay: this.transportDay, available: true }) : this.availabilityChecked.emit({ transportDay: this.transportDay, available: false });
-            }
-            else {
-                let available = true;
-                yield this.getOrderLinesPlanned(planOrder);
-                planOrder.lines.forEach((line) => {
-                    if (!this.deliveryMethods.find(method => method.code === line.deliveryMethod)) {
-                        available = false;
-                    }
-                });
-                this.availabilityChecked.emit({ transportDay: this.transportDay, available: available });
-            }
-        });
-    }
-    getOrderLinesPlanned(planOrder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let request = new OrderLinesPlannedRequest();
-            let filterObj = new PlanningFilterObject();
-            request.planned = true;
-            request.planningId = this._deliveryPlanningService.currentPlanning.planningId;
-            request.transId = planOrder.transId;
-            request.plannedLineId = planOrder.plannedLineId;
-            filterObj.onlyCurrentWeek = true;
-            filterObj.beginCurrentWeek = new Date();
-            filterObj.checkOrderLines = 1;
-            request.filterObject = filterObj;
-            planOrder.lines.push(...yield this._transaction.getOrderLinesPlanned(request));
-        });
+        this.closeEvent.emit();
     }
 }
 DeliveryPlanningOverviewTileSettingsPopupComponent.decorators = [
     { type: Component, args: [{
-                selector: "co-delivery-planning-overview-tile-settings-popup",
+                selector: 'co-delivery-planning-overview-tile-settings-popup',
                 template: `
-    <co-dialog [showCloseIcon]="true" (closeClick)="closePopup()" [headerTemplate]="headerTemplate"
-               [footerTemplate]="footerTemplate">
-
-      <div class="body-wrapper">
-        <div class="rules-wrapper">
-          <div class="row available">
-            <co-input-checkbox [(model)]="transportDay.availableOnDate"></co-input-checkbox>
-            <span [textContent]="'AVAILABLE' | localize"></span></div>
+      <co-dialog [showCloseIcon]="true" (closeClick)="closePopup()" [headerTemplate]="headerTemplate"
+                 [footerTemplate]="footerTemplate">
 
-          <div class="row available">
+          <div class="body-wrapper">
+              <div class="rules-wrapper">
+                  <div class="row available">
+                      <co-input-checkbox [(model)]="transportDay.availableOnDate"></co-input-checkbox>
+                      <span [textContent]="'AVAILABLE' | localize"></span></div>
 
-          </div>
+                  <div class="row available">
 
-          <div class="row">
-            <div class="column">
-              <co-list-of-values class="list" [collection]="districts"
-                                 [model]="districtsForTransportDay(transportDay)"
-                                 (modelChange)="handleDistrictsChange($event)"
-                                 [displayField]="'description'"
-                                 [label]="'DISTRICTS' | localize"
-                                 [multiselect]="true"
-                                 [searchDisabled]="false"
-                                 [searchPlaceholder]="'Zoeken...'"
+                  </div>
 
-              ></co-list-of-values>
-              <co-list-of-values class="list" [collection]="deliveryMethods"
-                                 [model]="deliveryMethodsForTransportDay(transportDay)"
-                                 (modelChange)="handleDeliveryMethodChange($event)"
-                                 [displayField]="'description'"
-                                 [label]="'DELIVERY_METHODS' | localize"
-                                 [multiselect]="true"
-                                 [searchDisabled]="false"
-                                 [searchPlaceholder]="'Zoeken...'"
-              ></co-list-of-values>
-            </div>
+                  <div class="row">
+                      <div class="column">
+                          <co-list-of-values class="list" [collection]="districts"
+                                             [model]="districtsForTransportDay(transportDay)"
+                                             (modelChange)="handleDistrictsChange($event)"
+                                             [displayField]="'description'"
+                                             [label]="'DISTRICTS' | localize"
+                                             [multiselect]="true"
+                                             [searchDisabled]="false"
+                                             [searchPlaceholder]="'Zoeken...'"
+
+                          ></co-list-of-values>
+                          <co-list-of-values class="list" [collection]="deliveryMethods"
+                                             [model]="deliveryMethodsForTransportDay(transportDay)"
+                                             (modelChange)="handleDeliveryMethodChange($event)"
+                                             [displayField]="'description'"
+                                             [label]="'DELIVERY_METHODS' | localize"
+                                             [multiselect]="true"
+                                             [searchDisabled]="false"
+                                             [searchPlaceholder]="'Zoeken...'"
+                          ></co-list-of-values>
+                      </div>
 
-            <div class="column">
-              <co-list-of-values class="list" [collection]="skills"
-                                 [model]="skillsForTransportDay(transportDay)"
-                                 (modelChange)="handleSkillsChange($event)"
-                                 [displayField]="'description'"
-                                 [label]="'SKILLS' | localize"
-                                 [multiselect]="true"
-                                 [searchDisabled]="false"
-                                 [searchPlaceholder]="'Zoeken...'"
-              ></co-list-of-values>
-              <co-list-of-values class="list" [collection]="employees"
-                                 [model]="transportDay.employees"
-                                 (modelChange)="handleEmployeeChange($event)"
-                                 [displayField]="'familyName'"
-                                 [label]="'EMPLOYEES' | localize"
-                                 [multiselect]="true"
-                                 [searchDisabled]="false"
-                                 [searchPlaceholder]="'Zoeken...'"
-              ></co-list-of-values>
-            </div>
-          </div>
+                      <div class="column">
+                          <co-list-of-values class="list" [collection]="skills"
+                                             [model]="skillsForTransportDay(transportDay)"
+                                             (modelChange)="handleSkillsChange($event)"
+                                             [displayField]="'description'"
+                                             [label]="'SKILLS' | localize"
+                                             [multiselect]="true"
+                                             [searchDisabled]="false"
+                                             [searchPlaceholder]="'Zoeken...'"
+                          ></co-list-of-values>
+                          <co-list-of-values class="list" [collection]="employees"
+                                             [model]="transportDay.employees"
+                                             (modelChange)="handleEmployeeChange($event)"
+                                             [displayField]="'familyName'"
+                                             [label]="'EMPLOYEES' | localize"
+                                             [multiselect]="true"
+                                             [searchDisabled]="false"
+                                             [searchPlaceholder]="'Zoeken...'"
+                          ></co-list-of-values>
+                      </div>
+                  </div>
 
-        </div>
+              </div>
 
-        <div class="rules-wrapper">
-          <co-list-of-values class="list" [collection]="userGroups"
-                             [displayField]="'description'"
-                             [label]="'USER_GROUPS' | localize"
-                             [multiselect]="true"
-                             [searchDisabled]="false"
-                             [searchPlaceholder]="'Zoeken...'"
-          ></co-list-of-values>
-        </div>
-      </div>
-    </co-dialog>
+              <div class="rules-wrapper">
+                  <co-list-of-values class="list" [collection]="userGroups"
+                                     [displayField]="'description'"
+                                     [label]="'USER_GROUPS' | localize"
+                                     [multiselect]="true"
+                                     [searchDisabled]="false"
+                                     [searchPlaceholder]="'Zoeken...'"
+                  ></co-list-of-values>
+              </div>
+          </div>
+      </co-dialog>
 
-    <ng-template #headerTemplate>
-      <div class="dialog-header-wrapper">
-        <div class="row">
-          <co-icon class="small" [iconData]="iconCacheService.getIcon(icons.SlidersUpRegular)"></co-icon>
-          <span class="bold" [textContent]="'PLANNING_RULES' | localize"></span>
-        </div>
+      <ng-template #headerTemplate>
+          <div class="dialog-header-wrapper">
+              <div class="row">
+                  <co-icon class="small" [iconData]="iconCacheService.getIcon(icons.SlidersUpRegular)"></co-icon>
+                  <span class="bold" [textContent]="'PLANNING_RULES' | localize"></span>
+              </div>
 
-        <div class="row">
-          <span class="footer-header-title bold" [textContent]="transportDay?.transport?.registrationNumber"></span>
-          <div class="icon">
-            <co-icon class=""
-                     [iconData]="iconCacheService.getIcon(icons.TruckContainerDuo)"></co-icon>
+              <div class="row">
+                  <span class="footer-header-title bold" [textContent]="transportDay?.transport?.registrationNumber"></span>
+                  <div class="icon">
+                      <co-icon class=""
+                               [iconData]="iconCacheService.getIcon(icons.TruckContainerDuo)"></co-icon>
+                  </div>
+              </div>
           </div>
-        </div>
-      </div>
-    </ng-template>
+      </ng-template>
 
-    <ng-template #footerTemplate>
-      <div class="co-dialog-footer-button-wrapper">
-        <co-button class="save-button"
-                   (click)="handleCommitClick()"
-                   [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"></co-button>
-        <co-button class="close-button"
-                   (click)="closePopup()" [iconData]="iconCacheService.getIcon(icons.Crossskinny)"></co-button>
-      </div>
-    </ng-template>
+      <ng-template #footerTemplate>
+          <div class="co-dialog-footer-button-wrapper">
+              <co-button class="save-button"
+                         (click)="handleCommitClick()"
+                         [iconData]="iconCacheService.getIcon(icons.CheckDuotone)"></co-button>
+              <co-button class="close-button"
+                         (click)="closePopup()" [iconData]="iconCacheService.getIcon(icons.Crossskinny)"></co-button>
+          </div>
+      </ng-template>
 
   `,
                 encapsulation: ViewEncapsulation.None
@@ -38168,7 +38253,7 @@ DeliveryPlanningOverviewTileSettingsPopupComponent.propDecorators = {
     closeEvent: [{ type: Output }],
     onSaveAction: [{ type: Output }],
     availabilityChecked: [{ type: Output }],
-    showClass: [{ type: HostBinding, args: ["class.co-delivery-planning-overview-tile-settings-popup",] }]
+    showClass: [{ type: HostBinding, args: ['class.co-delivery-planning-overview-tile-settings-popup',] }]
 };
 
 class DeliveryPlanningOverviewModule {
@@ -41170,9 +41255,10 @@ TransactionSearchTileModule.decorators = [
 ];
 
 class TransactionSearchResultComponent {
-    constructor(searchService, screenConfigService, _deliveryPlanningService, transactionService) {
+    constructor(searchService, screenConfigService, _changeDetectorRef, _deliveryPlanningService, transactionService) {
         this.searchService = searchService;
         this.screenConfigService = screenConfigService;
+        this._changeDetectorRef = _changeDetectorRef;
         this._deliveryPlanningService = _deliveryPlanningService;
         this.transactionService = transactionService;
         this.extendedTransactionSearch = false;
@@ -41185,6 +41271,7 @@ class TransactionSearchResultComponent {
         this.showBatchOptions = false;
         this.showShippingMethodDialog = false;
         this.showBatchProcessDialog = false;
+        this.checkedAvailibility = false;
         this.selectedTransactions = [];
         this.batchTransactionSendingRequest = new BatchTransactionSendingRequest();
         this.batchJobProgress = [];
@@ -41271,11 +41358,21 @@ class TransactionSearchResultComponent {
     dragStarted(ev, transaction) {
         this._deliveryPlanningService.dragging = true;
         this._deliveryPlanningService.currentTransId = transaction.transId;
-        ev.dataTransfer.setData("text", transaction.transId);
+        if (!this.checkedAvailibility) {
+            this._deliveryPlanningService.availabilityCheckEvent.emit(transaction.transId);
+            this.checkedAvailibility = true;
+        }
+        ev.dataTransfer.setData('text', transaction.transId);
     }
     dragEnd(ev) {
-        ev.preventDefault();
         this._deliveryPlanningService.dragging = false;
+        this._deliveryPlanningService.currentTransId = undefined;
+        if (this.checkedAvailibility) {
+            this.checkedAvailibility = false;
+            this._deliveryPlanningService.availabilityResetEvent.emit();
+            this._changeDetectorRef.markForCheck();
+            this._changeDetectorRef.detectChanges();
+        }
     }
     checkIfSelected() {
         return this.searchService.transactions.some(item => item.selected);
@@ -41328,91 +41425,92 @@ TransactionSearchResultComponent.decorators = [
     { type: Component, args: [{
                 selector: 'co-transaction-search-result',
                 template: `
-    <ng-container *ngIf="screenConfigLoaded">
-      <div class="actions-wrapper"
-           *ngIf="searchService.transactions?.length > 0 && salesOrdersPageActive && showBatchOptions">
-        <co-input-checkbox
-          [model]="checkIfAllSelected()"
-          [label]="'SELECT_ALL_ORDERS' | localize"
-          (modelChange)="onSelectAllOrders(checkIfAllSelected())">
-        </co-input-checkbox>
-        <co-quick-send-button
-          *ngIf="checkIfSelected()"
-          [showSendMethodDialogIcon]="false"
-          [showLoader]="showProcessOrdersLoader"
-          (sendIconClicked)="showShippingModal()">
-        </co-quick-send-button>
-      </div>
-
-      <div class="transaction-search-result-content-tiles-wrapper" [ngClass]="fullscreen ? 'fullscreen' : 'sidebar'"
-           *ngIf="activeContentViewMode === contentViewModes.Tiles && !extendedTransactionSearch">
-        <div class="transaction-tile" *ngFor="let transaction of searchService.transactions">
-          <co-transaction-search-tile
-            [draggable]="draggableTransactions"
-            (dragstart)="dragStarted($event, transaction)"
-            (dragend)="dragEnd($event)"
-            [transaction]="transaction"
-            [showCheckbox]="salesOrdersPageActive && showBatchOptions"
-            [class]="transaction === selectedTransaction ? 'selected' : ''"
-            (transactionClick)="onTransactionClick($event)"
-            (selectedClick)="onSelectedClick($event)">
-          </co-transaction-search-tile>
-        </div>
-      </div>
+      <ng-container *ngIf="screenConfigLoaded">
+          <div class="actions-wrapper"
+               *ngIf="searchService.transactions?.length > 0 && salesOrdersPageActive && showBatchOptions">
+              <co-input-checkbox
+                      [model]="checkIfAllSelected()"
+                      [label]="'SELECT_ALL_ORDERS' | localize"
+                      (modelChange)="onSelectAllOrders(checkIfAllSelected())">
+              </co-input-checkbox>
+              <co-quick-send-button
+                      *ngIf="checkIfSelected()"
+                      [showSendMethodDialogIcon]="false"
+                      [showLoader]="showProcessOrdersLoader"
+                      (sendIconClicked)="showShippingModal()">
+              </co-quick-send-button>
+          </div>
 
-      <div class="transaction-search-result-content-grid-wrapper"
-           *ngIf="activeContentViewMode === contentViewModes.Grid && !extendedTransactionSearch">
-        <co-transaction-search-grid
-          [showCheckbox]="salesOrdersPageActive && showBatchOptions"
-          (transactionClick)="onTransactionClick($event)">
-        </co-transaction-search-grid>
-      </div>
+          <div class="transaction-search-result-content-tiles-wrapper" [ngClass]="fullscreen ? 'fullscreen' : 'sidebar'"
+               *ngIf="activeContentViewMode === contentViewModes.Tiles && !extendedTransactionSearch">
+              <div class="transaction-tile" *ngFor="let transaction of searchService.transactions">
+                  <co-transaction-search-tile
+                          [draggable]="draggableTransactions"
+                          (dragstart)="dragStarted($event, transaction)"
+                          (dragend)="dragEnd($event)"
+
+                          [transaction]="transaction"
+                          [showCheckbox]="salesOrdersPageActive && showBatchOptions"
+                          [class]="transaction === selectedTransaction ? 'selected' : ''"
+                          (transactionClick)="onTransactionClick($event)"
+                          (selectedClick)="onSelectedClick($event)">
+                  </co-transaction-search-tile>
+              </div>
+          </div>
 
-      <div class="transaction-extended-search-result-tile-wrapper" *ngIf="extendedTransactionSearch">
-        <div class="transaction-tile" *ngFor="let transaction of searchService.transactions">
-          <co-transaction-search-sales-line-select-tile
-            [transaction]="transaction"
-            (transactionClick)="onTransactionClick($event)"
-            (selectedClick)="onSelectedClick($event)"
-            [extendedTransactionSearch]="extendedTransactionSearch">
-          </co-transaction-search-sales-line-select-tile>
-        </div>
-      </div>
+          <div class="transaction-search-result-content-grid-wrapper"
+               *ngIf="activeContentViewMode === contentViewModes.Grid && !extendedTransactionSearch">
+              <co-transaction-search-grid
+                      [showCheckbox]="salesOrdersPageActive && showBatchOptions"
+                      (transactionClick)="onTransactionClick($event)">
+              </co-transaction-search-grid>
+          </div>
 
-      <co-pagination-bar
-        *ngIf="searchService.transactions?.length > 0"
-        [currentPage]="searchService.currentPage"
-        [itemsPerPage]="searchService.transactionsPerPage"
-        [totalItems]="searchService.resultCount"
-        [previousLabel]="'PREVIOUS' | localize"
-        [nextLabel]="'NEXT' | localize"
-        [autoHide]="true"
-        [directionLinks]="fullscreen"
-        [paginationRange]="!fullscreen ? 6 : 8"
-        (previousClick)="onPreviousClick()"
-        (nextClick)="onNextClick()"
-        (pageClick)="onPageClick($event)">
-      </co-pagination-bar>
-
-      <div class="empty-state-wrapper" *ngIf="searchService.transactions && searchService.resultCount === 0">
-        <span [textContent]="'0_RESULTS_FOUND' | localize"></span>
-      </div>
-    </ng-container>
+          <div class="transaction-extended-search-result-tile-wrapper" *ngIf="extendedTransactionSearch">
+              <div class="transaction-tile" *ngFor="let transaction of searchService.transactions">
+                  <co-transaction-search-sales-line-select-tile
+                          [transaction]="transaction"
+                          (transactionClick)="onTransactionClick($event)"
+                          (selectedClick)="onSelectedClick($event)"
+                          [extendedTransactionSearch]="extendedTransactionSearch">
+                  </co-transaction-search-sales-line-select-tile>
+              </div>
+          </div>
+
+          <co-pagination-bar
+                  *ngIf="searchService.transactions?.length > 0"
+                  [currentPage]="searchService.currentPage"
+                  [itemsPerPage]="searchService.transactionsPerPage"
+                  [totalItems]="searchService.resultCount"
+                  [previousLabel]="'PREVIOUS' | localize"
+                  [nextLabel]="'NEXT' | localize"
+                  [autoHide]="true"
+                  [directionLinks]="fullscreen"
+                  [paginationRange]="!fullscreen ? 6 : 8"
+                  (previousClick)="onPreviousClick()"
+                  (nextClick)="onNextClick()"
+                  (pageClick)="onPageClick($event)">
+          </co-pagination-bar>
+
+          <div class="empty-state-wrapper" *ngIf="searchService.transactions && searchService.resultCount === 0">
+              <span [textContent]="'0_RESULTS_FOUND' | localize"></span>
+          </div>
+      </ng-container>
 
-    <co-shipping-method-dialog
-      *ngIf="showShippingMethodDialog"
-      [category]="batchCategory"
-      [selectedTransactions]="selectedTransactions"
-      (cancelClicked)="showShippingMethodDialog = false"
-      (saveClicked)="shippingDialogSaveClicked($event)">
-    </co-shipping-method-dialog>
-
-    <co-batch-process-dialog
-      *ngIf="showBatchProcessDialog"
-      @fadeInOut
-      [batchJobProgress]="batchJobProgress"
-      (close)="showBatchProcessDialog = false">
-    </co-batch-process-dialog>
+      <co-shipping-method-dialog
+              *ngIf="showShippingMethodDialog"
+              [category]="batchCategory"
+              [selectedTransactions]="selectedTransactions"
+              (cancelClicked)="showShippingMethodDialog = false"
+              (saveClicked)="shippingDialogSaveClicked($event)">
+      </co-shipping-method-dialog>
+
+      <co-batch-process-dialog
+              *ngIf="showBatchProcessDialog"
+              @fadeInOut
+              [batchJobProgress]="batchJobProgress"
+              (close)="showBatchProcessDialog = false">
+      </co-batch-process-dialog>
   `,
                 animations: [
                     trigger('fadeInOut', [
@@ -41434,6 +41532,7 @@ TransactionSearchResultComponent.decorators = [
 TransactionSearchResultComponent.ctorParameters = () => [
     { type: TransactionSearchService },
     { type: TransactionScreenConfigurationService },
+    { type: ChangeDetectorRef },
     { type: DeliveryPlanningService },
     { type: TransactionService }
 ];
@@ -41445,7 +41544,7 @@ TransactionSearchResultComponent.propDecorators = {
     activeContentViewMode: [{ type: Input }],
     fullscreen: [{ type: Input }],
     transactionClick: [{ type: Output }],
-    showClass: [{ type: HostBinding, args: ["class.co-transaction-search-result",] }]
+    showClass: [{ type: HostBinding, args: ['class.co-transaction-search-result',] }]
 };
 
 class TransactionSearchSalesQuotationGridModule {
@@ -59758,11 +59857,16 @@ TransactionCreateDateLabelModule.decorators = [
 class PosOrderData {
 }
 
-class TransactionCashRegisterDialogComponent extends TransactionHeaderBaseComponent {
-    constructor() {
-        // @Output()
-        // public paymentDetailsSelected: EventEmitter<PaymentTransactionViewModel> = new EventEmitter<PaymentTransactionViewModel>();
-        super(...arguments);
+class TransactionCashRegisterDialogComponent {
+    constructor(transactionEventService, iconCacheService, screenConfigService, imageService, dictionaryService, transactionService, changeDetector) {
+        this.transactionEventService = transactionEventService;
+        this.iconCacheService = iconCacheService;
+        this.screenConfigService = screenConfigService;
+        this.imageService = imageService;
+        this.dictionaryService = dictionaryService;
+        this.transactionService = transactionService;
+        this.changeDetector = changeDetector;
+        this.icons = Icon;
         this.saveButtonClicked = new EventEmitter();
         this.closeClicked = new EventEmitter();
         this.cashRegisters = [];
@@ -59776,7 +59880,6 @@ class TransactionCashRegisterDialogComponent extends TransactionHeaderBaseCompon
         return true;
     }
     ngOnInit() {
-        super.ngOnInit();
         this._prepareCashRegister();
     }
     cashRegisterSelected(cashRegister) {
@@ -59838,12 +59941,12 @@ class TransactionCashRegisterDialogComponent extends TransactionHeaderBaseCompon
     }
     _getPrinterLayouts() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.printerLayouts = yield this.transactionService.getPosReceiptPrintLayouts(this.transactionInfo.uuid);
+            this.printerLayouts = yield this.transactionService.getPosReceiptPrintLayouts(undefined);
         });
     }
     _getEmailLayouts() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.emailLayouts = yield this.transactionService.getPosReceiptEmailLayouts(this.transactionInfo.uuid);
+            this.emailLayouts = yield this.transactionService.getPosReceiptEmailLayouts(undefined);
         });
     }
     _checkDefaultParameters(cashRegister) {
@@ -59885,7 +59988,7 @@ TransactionCashRegisterDialogComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-transaction-cash-register-dialog",
                 template: `
-      <co-dialog [showCloseIcon]="true" [footerTemplate]="footerTemplate" [headerTemplate]="headerTemplate" *ngIf="dialogVisible" (closeClick)="closeClicked.emit($event)">
+      <co-dialog [showCloseIcon]="true" [footerTemplate]="footerTemplate" [headerTemplate]="headerTemplate" *ngIf="dialogVisible" (closeClick)="closeClicked.emit()">
           <div class="dialog-content-wrapper">
               <div class="cash-registers">
                   <co-payment-tile *ngFor="let cashRegister of cashRegisters"
@@ -59902,7 +60005,6 @@ TransactionCashRegisterDialogComponent.decorators = [
                                  [collection]="cashDrawers"
                                  [multiselect]="false"
                                  [required]="false"
-                                 [readonly]="transactionHeaderService.readonly"
                                  [searchDisabled]="true"
                                  (modelChange)="handleDrawerChanged($event)"
               ></co-list-of-values>
@@ -59913,7 +60015,6 @@ TransactionCashRegisterDialogComponent.decorators = [
                                  [collection]="printerList"
                                  [multiselect]="false"
                                  [required]="false"
-                                 [readonly]="transactionHeaderService.readonly"
                                  [searchDisabled]="true"
                                  (modelChange)="handlePrinterChanged($event)"
               ></co-list-of-values>
@@ -59924,7 +60025,6 @@ TransactionCashRegisterDialogComponent.decorators = [
                                  [collection]="printerLayouts"
                                  [multiselect]="false"
                                  [required]="false"
-                                 [readonly]="transactionHeaderService.readonly"
                                  [searchDisabled]="true"
               ></co-list-of-values>
 
@@ -59934,7 +60034,6 @@ TransactionCashRegisterDialogComponent.decorators = [
                                  [collection]="emailLayouts"
                                  [multiselect]="false"
                                  [required]="false"
-                                 [readonly]="transactionHeaderService.readonly"
                                  [searchDisabled]="true"
               ></co-list-of-values>
           </div>
@@ -59962,6 +60061,15 @@ TransactionCashRegisterDialogComponent.decorators = [
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
+TransactionCashRegisterDialogComponent.ctorParameters = () => [
+    { type: TransactionEventService },
+    { type: IconCacheService },
+    { type: TransactionScreenConfigurationService },
+    { type: TransactionImageService },
+    { type: DictionaryService },
+    { type: TransactionService },
+    { type: ChangeDetectorRef }
+];
 TransactionCashRegisterDialogComponent.propDecorators = {
     saveButtonClicked: [{ type: Output }],
     closeClicked: [{ type: Output }],