@colijnit/transaction 256.1.26 → 256.1.27

package/lib/component/checkout/checkout.component.d.ts

@@ -13,8 +13,10 @@ import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enu
 import { TransactionRelationService } from '../../service/transaction-relation.service';
 import { CheckoutScreenConfigurationService } from './service/checkout-screen-configuration.service';
 import { CheckoutCfgName } from '../../enum/checkout-cfg-name.enum';
+import { TransactionHeaderService } from '../core/base/service/transaction-header.service';
 export declare class CheckoutComponent implements OnInit, OnDestroy {
     service: TransactionService;
+    private _transactionHeaderService;
     private _relationService;
     private _dictionary;
     private _dialogService;
@@ -61,7 +63,7 @@ export declare class CheckoutComponent implements OnInit, OnDestroy {
     private _transNrForServiceFromSalesTransactionLine;
     private _lineNrForServiceFromSalesTransactionLine;
     private _subs;
-    constructor(service: TransactionService, _relationService: TransactionRelationService, _dictionary: DictionaryService, _dialogService: DialogService, _screenConfigurationService: CheckoutScreenConfigurationService);
+    constructor(service: TransactionService, _transactionHeaderService: TransactionHeaderService, _relationService: TransactionRelationService, _dictionary: DictionaryService, _dialogService: DialogService, _screenConfigurationService: CheckoutScreenConfigurationService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleCreateTransaction(event: MouseEvent): Promise<void>;

package/lib/component/core/base/components/characteristic-answer/characteristic-answer.component.d.ts

@@ -18,5 +18,6 @@ export declare class CharacteristicAnswerComponent extends DialogBaseComponent i
     ngOnInit(): void;
     handleChecked(choice: string): void;
     handleOkClick(): void;
+    onKeyDown(event: KeyboardEvent): void;
     private _prepareViewModels;
 }

package/lib/component/core/base/service/transaction-header.service.d.ts

@@ -45,6 +45,8 @@ export declare class TransactionHeaderService {
     transactionInfoSet: BehaviorSubject<boolean>;
     transactionTotalSet: BehaviorSubject<boolean>;
     transactionInfoMarginInfoSet: BehaviorSubject<boolean>;
+    reservationStateChange: BehaviorSubject<boolean>;
+    reservationPopupToggle: BehaviorSubject<boolean>;
     set transaction(value: TransactionInfoResponse);
     get transaction(): TransactionInfoResponse;
     set transactionInfo(value: TransactionInfo);

package/lib/component/core/base/transaction-base.component.d.ts

@@ -34,8 +34,8 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     isFirst: boolean;
     readonly: boolean;
     hidden: boolean;
-    relationChange: EventEmitter<RelationAnyType>;
     showLoader: boolean;
+    relationChange: EventEmitter<RelationAnyType>;
     tooltipMessage: string;
     canAllLinesBeDelivered: boolean;
     canAllLinesBeInvoiced: boolean;

package/lib/component/dialog/transaction-line/dialog-transaction-line-direct-sell/style/_layout.scss

@@ -1,5 +1,8 @@
 @include export-module('co-dialog-transaction-line-direct-sell-layout') {
   .co-dialog-transaction-line-direct-sell {
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper {
+      width: $tp-dialog-transaction-line-direct-sell-min-width;
+    }
     .co-dialog-wrapper {
       position: relative;
     }

package/lib/component/dialog/transaction-line/dialog-transaction-line-direct-sell/style/_material-definition.scss

@@ -0,0 +1 @@
+$tp-dialog-transaction-line-direct-sell-min-width: 410px !default;

package/lib/component/transaction-card/transaction-card-footer/transaction-card-footer.component.d.ts

@@ -6,6 +6,5 @@ export declare class TransactionCardFooterComponent extends TransactionLineBaseC
     readonly icons: typeof Icon;
     statusBarConfigNames: StatusBarCfgNames;
     transactionTypeCategory: TransactionTypeCategory;
-    expanded: boolean;
     showClass(): boolean;
 }

package/lib/component/transaction-card/transaction-card-goods-allocation/transaction-card-goods-allocation.component.d.ts

@@ -3,7 +3,6 @@ import { TransactionGoodsAllocationLineComponent } from '../../transaction-line/
 import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
 export declare class TransactionCardGoodsAllocationComponent extends TransactionGoodsAllocationLineComponent {
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
 }

package/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.d.ts

@@ -7,7 +7,6 @@ export declare class TransactionCardHeaderComponent extends TransactionLineBaseC
     showCheckbox: boolean;
     showActionButtons: boolean;
     showThumbnail: boolean;
-    expanded: boolean;
     checkboxValueChanged: EventEmitter<boolean>;
     expandClicked: EventEmitter<void>;
     image: string;

package/lib/component/transaction-card/transaction-card-margin/transaction-card-margin.component.d.ts

@@ -25,7 +25,6 @@ export declare class TransactionCardMarginComponent extends TransactionLineBaseC
     protected changeDetector: ChangeDetectorRef;
     transactionLineActionButtons: TransactionLineActionButtonsComponent;
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
     constructor(orderLineSetService: OrderLineSetService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);

package/lib/component/transaction-card/transaction-card-picked/transaction-card-picked.component.d.ts

@@ -3,7 +3,6 @@ import { TransactionPickedLineComponent } from '../../transaction-line/transacti
 import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
 export declare class TransactionCardPickedComponent extends TransactionPickedLineComponent {
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
 }

package/lib/component/transaction-card/transaction-card-planning/transaction-card-planning.component.d.ts

@@ -26,7 +26,6 @@ export declare class TransactionCardPlanningComponent extends TransactionLineBas
     private _deliveryPlanningService;
     transactionLineActionButtons: TransactionLineActionButtonsComponent;
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
     constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, _deliveryPlanningService: DeliveryPlanningService);

package/lib/component/transaction-card/transaction-card-purchase/transaction-card-purchase.component.d.ts

@@ -3,7 +3,6 @@ import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.inter
 import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
 export declare class TransactionCardPurchaseComponent extends TransactionPurchaseLineBaseComponent {
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
 }

package/lib/component/transaction-card/transaction-card-purchase-overview/transaction-card-purchase-overview.component.d.ts

@@ -6,7 +6,6 @@ export declare class TransactionCardPurchaseOverviewComponent extends Transactio
     readonly transactionTypeCategory: typeof TransactionTypeCategory;
     showClass(): boolean;
     statusBarConfigNames: StatusBarCfgNames;
-    expanded: boolean;
     showCheckboxForLine: boolean;
     private _subs;
     ngOnInit(): void;

package/lib/component/transaction-card/transaction-card-sales-overview/transaction-card-sales-overview.component.d.ts

@@ -7,5 +7,4 @@ export declare class TransactionCardSalesOverviewComponent extends TransactionLi
     showClass(): boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
-    expanded: boolean;
 }

package/lib/component/transaction-card/transaction-card-to-be-picked/transaction-card-to-be-picked.component.d.ts

@@ -3,7 +3,6 @@ import { TransactionToBePickedLineComponent } from '../../transaction-line/trans
 import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
 export declare class TransactionCardToBePickedComponent extends TransactionToBePickedLineComponent {
     showClass(): boolean;
-    expanded: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
 }

package/lib/component/transaction-internal/style/_layout.scss

@@ -129,5 +129,11 @@
       height: 32px;
       width: 70px;
     }
+    .select-all-wrapper {
+      margin: 0 5px;
+      .label {
+        display: none;
+      }
+    }
   }
 }

package/lib/component/transaction-internal/transaction-internal.component.d.ts

@@ -70,6 +70,7 @@ export declare class TransactionInternalComponent implements OnInit, OnDestroy {
     showSidePanel: boolean;
     shouldShowSidePanel: boolean;
     showArticleTextOverview: boolean;
+    showReservationPopup: boolean;
     showTransactionText: boolean;
     showArticleText: boolean;
     showCopyOrderDialog: boolean;

package/lib/component/transaction-labeled-warehouse-location-button/transaction-labeled-warehouse-location-button.component.d.ts

@@ -1,31 +1,28 @@
 import { ChangeDetectorRef, EventEmitter } from '@angular/core';
 import { Icon } from '../../enum/icon.enum';
-import { TransactionEventService } from '../../service/transaction-event.service';
 import { TransactionService } from '../../service/transaction.service';
 import { IconCacheService } from '../../service/icon-cache.service';
-import { DictionaryService } from '../../service/dictionary.service';
-import { TransactionImageService } from '../../service/transaction-image.service';
 import { DialogService } from '../../service/dialog.service';
-import { TransactionScreenConfigurationService } from '../../service/transaction-screen-configuration.service';
-import { TransactionLineBaseComponent } from '../core/base/transaction-line-base.component';
-import { TransactionHeaderService } from '../core/base/service/transaction-header.service';
-import { TransactionLineService } from '../core/base/service/transaction-line.service';
-export declare class TransactionLabeledWarehouseLocationButtonComponent extends TransactionLineBaseComponent {
-    transactionHeaderService: TransactionHeaderService;
-    transactionLineService: TransactionLineService;
-    transactionEventService: TransactionEventService;
-    service: TransactionService;
+import { ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
+export declare class TransactionLabeledWarehouseLocationButtonComponent implements ScreenConfigAdapterComponent {
     iconCacheService: IconCacheService;
-    transactionScreenConfigurationService: TransactionScreenConfigurationService;
-    protected dictionaryService: DictionaryService;
-    protected imageService: TransactionImageService;
-    protected changeDetector: ChangeDetectorRef;
+    private _transactionService;
+    private _changeDetector;
     private _dialogService;
     readonly icons: typeof Icon;
     locationNr: string;
     warehouseNumber: number;
+    readonly: boolean;
+    hidden: boolean;
     locationNrChange: EventEmitter<string>;
     showClass(): boolean;
-    constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _dialogService: DialogService);
-    openWarehouseLocationDialog(event: MouseEvent): Promise<void>;
+    showDialogWarehouseLocation: boolean;
+    objectConfigName: string;
+    required: boolean;
+    forceReadonly: boolean;
+    maxLength: number;
+    decimals: number;
+    redErrorBackground: boolean;
+    constructor(iconCacheService: IconCacheService, _transactionService: TransactionService, _changeDetector: ChangeDetectorRef, _dialogService: DialogService);
+    handleShowDialog(event: MouseEvent): Promise<void>;
 }

package/lib/component/transaction-line/transaction-line/style/_layout.scss

@@ -145,6 +145,9 @@
         &.small-statusbar {
           max-width: $tp-transaction-line-small-statusbar-max-width;
         }
+        &.big-column {
+          flex: 2;
+        }
       }
       .column2 {
         display: flex;
@@ -155,7 +158,7 @@
         flex: 1;
         position: relative;
         flex-wrap: wrap;
-        justify-content: space-around;
+        justify-content: flex-start;
         &.small-column {
           max-width: $tp-transaction-line-column2-small-max-width;
           .transaction-field-wrapper {
@@ -198,6 +201,9 @@
         &.big-column {
           flex: 2;
         }
+        &.min {
+          min-width: 260px;
+        }
       }
       .column4 {
         display: flex;
@@ -243,6 +249,16 @@
           }
         }
       }
+      .co-dialog {
+        .co-input-text {
+          height: 40px;
+
+          input {
+            padding: 10px 0 0 10px;
+            align-self: center;
+          }
+        }
+      }
     }
     .transaction-line-totals-amount {
       .amount-number-picker, .co-input-text {

package/lib/component/transaction-line/transaction-line/style/_material-definition.scss

@@ -9,8 +9,8 @@ $tp-transaction-line-padding-first: 15px 0 5px 0 !default;
 $tp-transaction-line-margin-first: 0 !default;
 $tp-transaction-line-inner-padding: 10px !default;
 $tp-transaction-line-border: 1px solid !default;
-$tp-transaction-line-border-width: 0 0 2px 0 !default;
-$tp-transaction-line-border-width-first: 2px 0 2px 0 !default;
+$tp-transaction-line-border-width: 0 0 3px 0 !default;
+$tp-transaction-line-border-width-first: 3px 0 3px 0 !default;
 $tp-transaction-line-border-color: #F4F4F9 !default;
 $tp-transaction-line-column-gap: 20px !default;
 $tp-transaction-line-row-gap: 5px !default;

package/lib/component/transaction-line/transaction-line/style/material.scss

@@ -15,3 +15,4 @@
 @import "../../../dialog/transaction-line/dialog-transaction-line-price-list/style/material";
 @import "../../../dialog/transaction-line/dialog-transaction-line-warehouse-location/style/material";
 @import "../../../dialog/transaction-line/dialog-transaction-line-supplier/style/material";
+@import "../../../dialog/transaction-line/dialog-transaction-line-direct-sell/style/material";

package/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line-base.component.d.ts

@@ -1,9 +1,22 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { TransactionLineBaseComponent } from '../../core/base/transaction-line-base.component';
+import { TransactionLineService } from "../../core/base/service/transaction-line.service";
+import { TransactionEventService } from "../../../service/transaction-event.service";
+import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { TransactionImageService } from "../../../service/transaction-image.service";
+import { TransactionService } from "../../../service/transaction.service";
+import { DictionaryService } from "../../../service/dictionary.service";
+import { TransactionSalesReservationService } from "../../transaction-reservation/service/transaction-sales-reservation.service";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { TransactionHeaderService } from "../../core/base/service/transaction-header.service";
 export declare abstract class TransactionPurchaseLineBaseComponent extends TransactionLineBaseComponent implements OnInit, OnDestroy {
+    salesReservationService: TransactionSalesReservationService;
     showCheckboxForLine: boolean;
     hasPurchaseOrder: boolean;
+    hasReservations: boolean;
+    currentlyReserving: boolean;
     private _subs;
+    constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, salesReservationService: TransactionSalesReservationService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handlePurchaseOrderNavigation(transNr: string): void;

package/lib/component/transaction-line/transaction-purchase-line/transaction-purchase-line.component.d.ts

@@ -1,39 +1,11 @@
-import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
+import { OnDestroy, OnInit } from '@angular/core';
 import { TransactionPurchaseLineBaseComponent } from './transaction-purchase-line-base.component';
 import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
 import { LineDiscountCfgNames } from '../../../interface/line-discount-cfg-names.interface';
-import { Subscription } from "rxjs";
-import { PurchaseReservation } from "@colijnit/transactionapi/build/model/purchase-reservation.bo";
-import { TransactionEventService } from "../../../service/transaction-event.service";
-import { IconCacheService } from "../../../service/icon-cache.service";
-import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
-import { TransactionImageService } from "../../../service/transaction-image.service";
-import { DictionaryService } from "../../../service/dictionary.service";
-import { TransactionService } from "../../../service/transaction.service";
-import { PurchaseReservationService } from "../../../service/purchase-reservation.service";
-import { TransactionHeaderService } from '../../core/base/service/transaction-header.service';
-import { TransactionLineService } from '../../core/base/service/transaction-line.service';
 export declare class TransactionPurchaseLineComponent extends TransactionPurchaseLineBaseComponent implements OnInit, OnDestroy {
-    transactionHeaderService: TransactionHeaderService;
-    transactionLineService: TransactionLineService;
-    transactionEventService: TransactionEventService;
-    iconCacheService: IconCacheService;
-    screenConfigService: TransactionScreenConfigurationService;
-    protected imageService: TransactionImageService;
-    protected dictionaryService: DictionaryService;
-    protected transactionService: TransactionService;
-    protected changeDetector: ChangeDetectorRef;
-    private _purchaseReservationService;
     showClass(): boolean;
-    reservation: boolean;
-    subscriptions: Subscription[];
-    purchaseReservations: PurchaseReservation[];
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
-    constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, _purchaseReservationService: PurchaseReservationService);
-    ngOnInit(): void;
-    ngOnDestroy(): void;
     transactionLineSelectedChanged(selected: boolean): void;
-    handleReservationModeClick(mouseClick: MouseEvent): void;
-    purchaseReservationLines(): import("@colijnit/transactionapi/build/model/purchase-reservation-purchase-line.bo").PurchaseReservationPurchaseLine[];
+    handleReservationModeClick(lineNr: number): void;
 }

package/lib/component/transaction-line/transaction-sales-order-quotation-line/transaction-sales-order-quotation-line.component.d.ts

@@ -10,6 +10,7 @@ import { TransactionTypeCategory } from '../../../enum/transaction-type-category
 import { TransactionLineBaseComponent } from '../../core/base/transaction-line-base.component';
 import { TransactionHeaderService } from '../../core/base/service/transaction-header.service';
 import { TransactionLineService } from '../../core/base/service/transaction-line.service';
+import { LineDiscountCfgNames } from "../../../interface/line-discount-cfg-names.interface";
 export declare class TransactionSalesOrderQuotationLineComponent extends TransactionLineBaseComponent {
     orderLineSetService: OrderLineSetService;
     transactionHeaderService: TransactionHeaderService;
@@ -24,5 +25,6 @@ export declare class TransactionSalesOrderQuotationLineComponent extends Transac
     showClass(): boolean;
     constructor(orderLineSetService: OrderLineSetService, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
     handleCheckBoxValueChanged(value: boolean): void;
+    discountConfigNames: LineDiscountCfgNames;
     protected readonly TransactionTypeCategory: typeof TransactionTypeCategory;
 }

package/lib/component/transaction-line/transaction-text-line/transaction-text-line.component.d.ts

@@ -22,7 +22,6 @@ export declare class TransactionTextLineComponent extends TransactionLineBaseCom
     protected transactionService: TransactionService;
     protected changeDetector: ChangeDetectorRef;
     activeCategory: TransactionTypeCategory;
-    preview: boolean;
     descriptionDblClick: EventEmitter<void>;
     showClass(): boolean;
     showButtons: boolean;

package/lib/component/transaction-line-fields/transaction-line-direct-sell/transaction-line-direct-sell.component.d.ts

@@ -26,7 +26,6 @@ export declare class TransactionLineDirectSellComponent extends TransactionLineB
     protected changeDetector: ChangeDetectorRef;
     private _relationService;
     set children(checkboxComponents: QueryList<InputCheckboxComponent>);
-    showLoader: boolean;
     set selectedSupplier(value: SupplierLightObject);
     get selectedSupplier(): SupplierLightObject;
     directSellPurchaseOrderNumber: number;

package/lib/component/transaction-line-image-and-description/transaction-line-image-and-description.component.d.ts

@@ -3,13 +3,10 @@ import { ImageAndDescriptionCfgNames } from '../../interface/image-and-descripti
 import { TransactionLineBaseComponent } from '../core/base/transaction-line-base.component';
 export declare class TransactionLineImageAndDescriptionComponent extends TransactionLineBaseComponent implements OnInit, OnDestroy {
     popUpView: boolean;
-    isFirst: boolean;
     showPurchaseDesc: boolean;
     showClass(): boolean;
-    preview: boolean;
     openArticleTextClicked: EventEmitter<string>;
     handleDeleteLine: EventEmitter<MouseEvent>;
-    expanded: boolean;
     showDivider: boolean;
     expandClicked(): void;
     image: string;

package/lib/component/transaction-line-side-panel-default/transaction-line-side-panel-default.component.d.ts

@@ -6,7 +6,6 @@ export declare class TransactionLineSidePanelDefaultComponent extends Transactio
     cancelClick: EventEmitter<MouseEvent>;
     showClass(): boolean;
     data: any[];
-    readonly: boolean;
     handleCancelClick(event: MouseEvent): void;
     protected transactionLineSet(): void;
 }

package/lib/component/transaction-line-side-panel-sales/transaction-line-side-panel-sales.component.d.ts

@@ -1,14 +1,7 @@
-import { OnDestroy, OnInit } from '@angular/core';
 import { TransactionTypeCategory } from '../../enum/transaction-type-category.enum';
-import { PurchaseReservation } from '@colijnit/transactionapi/build/model/purchase-reservation.bo';
 import { TransactionLineBaseComponent } from '../core/base/transaction-line-base.component';
-export declare class TransactionLineSidePanelSalesComponent extends TransactionLineBaseComponent implements OnInit, OnDestroy {
+export declare class TransactionLineSidePanelSalesComponent extends TransactionLineBaseComponent {
     readonly categories: typeof TransactionTypeCategory;
-    reservation: boolean;
-    purchaseReservations: PurchaseReservation[];
-    private _subs;
     categoryType: TransactionTypeCategory;
     showClass(): boolean;
-    ngOnInit(): void;
-    ngOnDestroy(): void;
 }

package/lib/component/transaction-print-package-sticker/transaction-print-package-sticker.component.d.ts

@@ -7,11 +7,11 @@ import { ReportingDocumentEmailSignDocBaseRequest } from '@colijnit/mainapi/buil
 import { ReportingDocumentPrintSignDocBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-print-sign-doc-base-request';
 export declare class TransactionPrintPackageStickerComponent extends TransactionQuickAccessSendMethodBaseComponent {
     readonly icons: typeof Icon;
+    showClass(): boolean;
     tempModel: number;
     reportDocumentEmailRequest: ReportingDocumentEmailSignDocBaseRequest;
     reportDocumentPrintRequest: ReportingDocumentPrintSignDocBaseRequest;
     reportDocumentPdfRequest: ReportingDocumentPdfBaseRequest;
-    showClass(): boolean;
     handleShowDialog(): void;
     protected emailDocument(request: ReportingDocumentEmailSignDocBaseRequest): void;
     protected getDefaultEmailAddressList(): Promise<string[]>;

package/lib/component/transaction-quick-access/transaction-quick-access-order-purchase/transaction-quick-access-order-purchase.component.d.ts

@@ -1,17 +1,29 @@
+import { ChangeDetectorRef } from '@angular/core';
 import { TransactionQuickAccessSendMethodBaseComponent } from "../transaction-quick-access-send-method-base.component";
 import { ReportingDocumentPrintSignDocBaseRequest } from "@colijnit/mainapi/build/model/reporting-document-print-sign-doc-base-request";
 import { ReportingDocumentEmailSignDocBaseRequest } from "@colijnit/mainapi/build/model/reporting-document-email-sign-doc-base-request";
 import { ReportingDocumentPdfBaseRequest } from "@colijnit/mainapi/build/model/reporting-document-pdf-base-request";
 import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
 import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
+import { TransactionEventService } from "../../../service/transaction-event.service";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { TransactionSearchService } from "../../transaction-search/service/transaction-search.service";
+import { TransactionImageService } from "../../../service/transaction-image.service";
+import { DictionaryService } from "../../../service/dictionary.service";
+import { TransactionService } from "../../../service/transaction.service";
+import { DialogService } from "../../../service/dialog.service";
+import { TransactionSalesReservationService } from "../../transaction-reservation/service/transaction-sales-reservation.service";
+import { TransactionHeaderService } from "../../core/base/service/transaction-header.service";
 export declare class TransactionQuickAccessOrderPurchaseComponent extends TransactionQuickAccessSendMethodBaseComponent {
+    salesReservationService: TransactionSalesReservationService;
     showClass(): boolean;
-    showLoader: boolean;
     canGenerate: boolean;
     reportDocumentEmailRequest: ReportingDocumentEmailSignDocBaseRequest;
     reportDocumentPrintRequest: ReportingDocumentPrintSignDocBaseRequest;
     reportDocumentPdfRequest: ReportingDocumentPdfBaseRequest;
     private _subs;
+    constructor(searchService: TransactionSearchService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, dialogService: DialogService, salesReservationService: TransactionSalesReservationService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleSelectAllLines(value: boolean): void;

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts

@@ -8,6 +8,7 @@ import { ReportingDocumentEmailSignDocBaseRequest } from '@colijnit/mainapi/buil
 import { ReportingDocumentPrintSignDocBaseRequest } from '@colijnit/mainapi/build/model/reporting-document-print-sign-doc-base-request';
 export declare class TransactionQuickAccessReceivedGoodsComponent extends TransactionQuickAccessSendMethodBaseComponent implements OnInit, OnDestroy {
     readonly icons: typeof Icon;
+    showClass(): boolean;
     reportDocumentEmailRequest: ReportingDocumentEmailSignDocBaseRequest;
     reportDocumentPrintRequest: ReportingDocumentPrintSignDocBaseRequest;
     reportDocumentPdfRequest: PdfInvoiceRequest;
@@ -20,7 +21,6 @@ export declare class TransactionQuickAccessReceivedGoodsComponent extends Transa
     showProcessingLoader: boolean;
     showWarehouseLocationButton: boolean;
     warehouseNumber: number;
-    showClass(): boolean;
     private _subs;
     ngOnInit(): void;
     ngOnDestroy(): void;

package/lib/component/transaction-quick-access/transaction-quick-access-send-method-base.component.d.ts

@@ -41,7 +41,6 @@ export declare abstract class TransactionQuickAccessSendMethodBaseComponent exte
     emailAddresses: string[];
     showSendMethodDialog: boolean;
     sendMethods: import("@colijnit/sharedcomponents").ɵbs[];
-    showLoader: boolean;
     signatureDocumentId: number;
     historicReports: HistoricReport[];
     protected abstract reportDocumentEmailRequest: ReportingDocumentEmailSignDocBaseRequest;

package/lib/component/transaction-reservation/service/transaction-sales-reservation.service.d.ts

@@ -0,0 +1,17 @@
+import { PurchaseReservationPurchaseLine } from "@colijnit/transactionapi/build/model/purchase-reservation-purchase-line.bo";
+import { OrderReservationSalesOrderLinesRequest } from "@colijnit/transactionapi/build/model/order-reservation-sales-order-lines-request.bo";
+import { PurchaseReservation } from "@colijnit/transactionapi/build/model/purchase-reservation.bo";
+import { TransactionService } from "../../../service/transaction.service";
+import { PurchaseReservationSalesLine } from "@colijnit/transactionapi/build/model/purchase-reservation-sales-line.bo";
+export declare class TransactionSalesReservationService {
+    private _transaction;
+    lineNr: number;
+    salesReservationLines: PurchaseReservationSalesLine[];
+    purchaseReservations: PurchaseReservation[];
+    constructor(_transaction: TransactionService);
+    getSalesOrderLines(salesOrderId: number): Promise<void>;
+    makeGetSalesOrderLinesRequest(salesOrderId: number, purchaseTransactionOrder?: number, correctionAllowed?: boolean, correctionMode?: boolean, supplierNo?: number): OrderReservationSalesOrderLinesRequest;
+    reservationAvailable(salesOrderId: number, lineNr: number): boolean;
+    processReservation(reservationLines: PurchaseReservationPurchaseLine[]): Promise<boolean>;
+    resetLineData(): void;
+}

package/lib/component/{transaction-line-side-panel-sales/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation → transaction-reservation/transaction-sales-reservation-popup}/style/_layout.scss

@@ -1,5 +1,5 @@
-@include export-module('cc-transaction-line-side-panel-sales-reservation-layout') {
-  .co-transaction-line-side-panel-sales-reservation {
+@include export-module('cc-transaction-sales-reservation-popup-layout') {
+  .co-transaction-sales-reservation-popup {
     .wrapper{
       display: flex;
       width: 100%;
@@ -9,10 +9,20 @@
       padding: 15px 16px 15px 30px;
     }
     .save-cancel-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: row;
+      gap: 2em;
       position: sticky;
       bottom: 0;
       padding: 30px 0;
       background: #f8f8fa;
+
+      .co-button {
+        height: 40px;
+        width: 40px;
+      }
     }
     .reservation-title {
       display: flex;

package/lib/component/transaction-reservation/transaction-sales-reservation-popup/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-sales-reservation-popup-theme') {
+  .co-transaction-sales-reservation-popup {
+  }
+}

package/lib/component/{transaction-line-side-panel-sales/transaction-line-side-panel-sales-reservation/transaction-line-side-panel-sales-reservation → transaction-reservation/transaction-sales-reservation-popup}/style/material.scss

@@ -1,4 +1,4 @@
-@import "../../../../../style/mixin";
+@import "../../../../style/mixin";
 @import "./_material-definition";
 @import "./_layout";
 @import "./_theme";

package/lib/component/transaction-reservation/transaction-sales-reservation-popup/transaction-sales-reservation-popup.component.d.ts

@@ -0,0 +1,20 @@
+import { OnInit } from "@angular/core";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { Icon } from "../../../enum/icon.enum";
+import { TransactionSalesReservationService } from "../service/transaction-sales-reservation.service";
+import { PurchaseReservationPurchaseLine } from "@colijnit/transactionapi/build/model/purchase-reservation-purchase-line.bo";
+import { TransactionHeaderService } from "../../core/base/service/transaction-header.service";
+import { TransactionService } from "../../../service/transaction.service";
+export declare class TransactionSalesReservationPopupComponent implements OnInit {
+    iconCacheService: IconCacheService;
+    salesReservationService: TransactionSalesReservationService;
+    private _transactionService;
+    private _transactionHeaderService;
+    readonly icons: typeof Icon;
+    reservationOrderLines: PurchaseReservationPurchaseLine[];
+    showClass(): boolean;
+    constructor(iconCacheService: IconCacheService, salesReservationService: TransactionSalesReservationService, _transactionService: TransactionService, _transactionHeaderService: TransactionHeaderService);
+    ngOnInit(): void;
+    handleClosePopup(): void;
+    processReservation(): Promise<void>;
+}

package/lib/service/transaction-base.service.d.ts

@@ -17,6 +17,7 @@ import { RefTransaction } from '@colijnit/transactionapi/build/model/ref-transac
 import { TransactionSearchViewRequest } from '@colijnit/transactionapi/build/model/transaction-search-view-request';
 import { TransactionSearchResult } from '../model/transaction-search-result';
 import { RelationKind } from '@colijnit/articleapi/build/enum/relation-kind.enum';
+import { OnDestroy } from '@angular/core';
 import { TransactionTypeCategory } from '../enum/transaction-type-category.enum';
 import { Icon } from '../enum/icon.enum';
 import { BaseModuleService } from '@colijnit/corecomponents_v12';
@@ -27,7 +28,7 @@ import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/tran
 import { InternalParam } from '@colijnit/mainapi/build/enum/internal-param.enum';
 import { SupplierLightObject } from '@colijnit/relationapi/build/model/supplier-light-object.bo';
 import { RelationListObject } from '@colijnit/relationapi/build/model/relation-list-object.bo';
-export declare class TransactionBaseService extends BaseModuleService {
+export declare class TransactionBaseService extends BaseModuleService implements OnDestroy {
     optionsService: TransactionSettingsService;
     protected dialogService: DialogService;
     protected connector: TransactionConnectorService;
@@ -141,7 +142,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     getTransactionById(transactionId: number): Promise<void>;
     getTransactionByNrAndKind(transactionNr: number, transactionKind: TransactionKind): Promise<TransactionInfoResponse>;
     getWebSessionSalesOrder(transactionUuid: string): Promise<boolean>;
-    tryToLockTransaction(id: number, version: number, secondAttempt?: boolean): Promise<boolean>;
+    tryToLockTransaction(id?: number, version?: number, secondAttempt?: boolean): Promise<boolean>;
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;
     getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;