@colijnit/transaction 262.1.29 → 262.1.31

package/index.d.ts

@@ -2327,6 +2327,7 @@ declare class TransactionBaseService extends BaseModuleService implements OnDest
     internalParameterSellDirectlyFromSupp: boolean;
     internalParameterStockMutBeforeDelivery: boolean;
     printColliStickerDefault: boolean;
+    internalPlanDaysParam: number;
     contactPersonId: number;
     firstDayOfWeek: string;
     articleAmountChange: BehaviorSubject<number>;
@@ -2368,6 +2369,7 @@ declare class TransactionBaseService extends BaseModuleService implements OnDest
     logisticsButtonVisible: () => Promise<boolean>;
     prepareDropShipmentInternalParam(): void;
     prepareReceiveGoodsWithDataTerminalInternalParam(): void;
+    prepareInternalPlanDaysParam(): Promise<void>;
     preparePrintColliStickerDefault(): void;
     getInternalParameter(param: InternalParam): Promise<boolean>;
     getCashLimitValue(param: InternalParam): Promise<number>;
@@ -2378,6 +2380,7 @@ declare class TransactionBaseService extends BaseModuleService implements OnDest
     resetCurrentTransaction(): void;
     saveTransaction(rememberTransaction?: boolean): Promise<TransactionInfoResponse>;
     commit(): Promise<boolean>;
+    commitGeneral(): Promise<boolean>;
     rollback(refresh?: boolean, force?: boolean): Promise<boolean>;
     rollbackBeacon(): Promise<void>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
@@ -3037,6 +3040,7 @@ declare class TransactionHeaderService {
     fullyInvoiced: boolean;
     partiallyOrFullyInvoiced: boolean;
     fullyDelivered: boolean;
+    partiallyOrFullyDelivered: boolean;
     partiallyOrFullyOrdered: boolean;
     partiallyOrFullyInvoiceControl: boolean;
     partiallyOrFullyReceived: boolean;
@@ -3068,7 +3072,8 @@ declare class TransactionHeaderService {
     private _relation;
     private _readOnly;
     constructor(_transactionService: TransactionService, _relationService: TransactionRelationService, _transactionPaymentConnectorService: TransactionPaymentConnectorService, _dictionaryService: DictionaryService, _transactionEventService: TransactionEventService);
-    canAlterRelationForTransaction(): boolean;
+    canChangeRelationOnTransaction(): boolean;
+    canAlterRelationDataOnTransaction(): boolean;
     getTransactionMargeInfoList(): Promise<void>;
     createCloneRelation(): void;
     getPlanOrder(): Promise<PlanOrder>;
@@ -4131,6 +4136,7 @@ declare enum TransactionCfgName {
     LineNetLineTotal = "lineNetLineTotal",
     LinePurchasePrice = "linePurchasePrice",
     LinePurchaseDescription = "linePurchaseDescription",
+    LineExpectedDeliveryDateCP = "lineExpectedDeliveryDateCP",
     LineSupplier = "lineSupplier",
     LineRefTransactions = "lineRefTransactions",
     LineConfirmedDeliveryDate = "lineConfirmedDeliveryDate",
@@ -4985,6 +4991,7 @@ declare class TransactionOverviewLineComponent extends TransactionLineBaseCompon
     showClass(): boolean;
     stock: StockStatus;
     noLabel: boolean;
+    showEstimatedDeliveryDate: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
     private _subs;
@@ -6051,6 +6058,7 @@ declare class TransactionHeaderPopupRelationComponent extends TransactionHeaderP
     showMessageForChangeCustomer: boolean;
     showInvoiceAddress: boolean;
     noLockOnCustomerSet: boolean;
+    showChangeOptionWhenCustomerReadonly: boolean;
     inputChangeForSuggestions: EventEmitter<RelationSuggestionsRequest>;
     changeCustomerRequested: EventEmitter<void>;
     deliveryAddressLocalHashChange: EventEmitter<string>;
@@ -6092,11 +6100,10 @@ declare class TransactionHeaderPopupRelationComponent extends TransactionHeaderP
     handleNavigationClick(nav: string): void;
     handleChangeCustomGroup(group: string): void;
     navigateToRelation(): void;
-    private _isAllowedToChangeRelation;
     private _setFirstAddress;
     private _lockRelation;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionHeaderPopupRelationComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionHeaderPopupRelationComponent, "co-transaction-header-popup-relation", never, { "configNames": { "alias": "configNames"; "required": false; }; "showPrivacy": { "alias": "showPrivacy"; "required": false; }; "showMessageForChangeCustomer": { "alias": "showMessageForChangeCustomer"; "required": false; }; "showInvoiceAddress": { "alias": "showInvoiceAddress"; "required": false; }; "noLockOnCustomerSet": { "alias": "noLockOnCustomerSet"; "required": false; }; }, { "inputChangeForSuggestions": "inputChangeForSuggestions"; "changeCustomerRequested": "changeCustomerRequested"; "deliveryAddressLocalHashChange": "deliveryAddressLocalHashChange"; "invoiceAddressLocalHashChange": "invoiceAddressLocalHashChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionHeaderPopupRelationComponent, "co-transaction-header-popup-relation", never, { "configNames": { "alias": "configNames"; "required": false; }; "showPrivacy": { "alias": "showPrivacy"; "required": false; }; "showMessageForChangeCustomer": { "alias": "showMessageForChangeCustomer"; "required": false; }; "showInvoiceAddress": { "alias": "showInvoiceAddress"; "required": false; }; "noLockOnCustomerSet": { "alias": "noLockOnCustomerSet"; "required": false; }; "showChangeOptionWhenCustomerReadonly": { "alias": "showChangeOptionWhenCustomerReadonly"; "required": false; }; }, { "inputChangeForSuggestions": "inputChangeForSuggestions"; "changeCustomerRequested": "changeCustomerRequested"; "deliveryAddressLocalHashChange": "deliveryAddressLocalHashChange"; "invoiceAddressLocalHashChange": "invoiceAddressLocalHashChange"; }, never, never, false, never>;
 }
 
 declare abstract class TransactionFilterPopupHeaderBaseComponent<T extends BusinessObject | number | string | Object> extends TransactionHeaderBaseComponent {
@@ -8165,9 +8172,42 @@ declare class TransactionNavigationButtonListModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionNavigationButtonListModule>;
 }
 
+declare class TransactionLineExpectedDeliveryDateButtonComponent extends TransactionLineBaseComponent implements OnInit, OnDestroy {
+    transactionHeaderService: TransactionHeaderService;
+    transactionLineService: TransactionLineService;
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    transactionScreenConfigurationService: TransactionScreenConfigurationService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    readonly icons: typeof Icon;
+    parentComponent: ElementRef;
+    showClass(): boolean;
+    inputLabel: boolean;
+    showConfirmedDeliveryDateChange: EventEmitter<boolean>;
+    expectedDeliveryDate: Date;
+    private _handled;
+    constructor(transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef);
+    ngOnInit(): void;
+    ngOnDestroy(): void;
+    protected transactionInfoSet(): void;
+    protected transactionLineSet(): void;
+    private _checkConfirmedDeliveryDate;
+    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineExpectedDeliveryDateButtonComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionLineExpectedDeliveryDateButtonComponent, "co-transaction-line-expected-delivery-date-button", never, { "inputLabel": { "alias": "inputLabel"; "required": false; }; }, { "showConfirmedDeliveryDateChange": "showConfirmedDeliveryDateChange"; }, never, never, false, never>;
+}
+
+declare class TransactionLineExpectedDeliveryDateButtonModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineExpectedDeliveryDateButtonModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionLineExpectedDeliveryDateButtonModule, [typeof TransactionLineExpectedDeliveryDateButtonComponent], [typeof i2.CommonModule, typeof TransactionButtonModule, typeof TransactionLineLabelModule, typeof PipeModule], [typeof TransactionLineExpectedDeliveryDateButtonComponent]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<TransactionLineExpectedDeliveryDateButtonModule>;
+}
+
 declare class TransactionOverviewLineModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionOverviewLineModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionOverviewLineModule, [typeof TransactionOverviewLineComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i3.ButtonModule, typeof i3.InputNumberPickerModule, typeof TransactionArticleTextModule, typeof TransactionArticleTextOverviewModule, typeof PipeModule, typeof TransactionLineActionButtonsModule, typeof i3.IconModule, typeof EditableLabelModule, typeof TransactionLinePriceModule, typeof TransactionLineDescriptionModule, typeof TransactionBaseLineModule, typeof i13.DragDropModule, typeof TransactionLineCommissionButtonModule, typeof TransactionLineWarehouseButtonModule, typeof TransactionLineDeliveryButtonModule, typeof TransactionLineDeliveryDateButtonModule, typeof DialogTransactionLineVatModule, typeof DialogTransactionLineDiscountModule, typeof TransactionLineStatusbarModule, typeof TransactionLineAmountModule, typeof TransactionLineVatButtonModule, typeof TransactionLineDiscountButtonModule, typeof TransactionLineDeliveryDateModule, typeof TransactionMarginInfoLineModule, typeof i3.ObserveVisibilityModule, typeof i3.ScreenConfigurationModule, typeof TransactionLineLabelModule, typeof TransactionLineDirectSellButtonModule, typeof TransactionNavigationButtonListModule], [typeof TransactionOverviewLineComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<TransactionOverviewLineModule, [typeof TransactionOverviewLineComponent], [typeof i2.CommonModule, typeof CoreModule, typeof i3.ButtonModule, typeof i3.InputNumberPickerModule, typeof TransactionArticleTextModule, typeof TransactionArticleTextOverviewModule, typeof PipeModule, typeof TransactionLineActionButtonsModule, typeof i3.IconModule, typeof EditableLabelModule, typeof TransactionLinePriceModule, typeof TransactionLineDescriptionModule, typeof TransactionBaseLineModule, typeof i13.DragDropModule, typeof TransactionLineCommissionButtonModule, typeof TransactionLineWarehouseButtonModule, typeof TransactionLineDeliveryButtonModule, typeof TransactionLineDeliveryDateButtonModule, typeof DialogTransactionLineVatModule, typeof DialogTransactionLineDiscountModule, typeof TransactionLineStatusbarModule, typeof TransactionLineAmountModule, typeof TransactionLineVatButtonModule, typeof TransactionLineDiscountButtonModule, typeof TransactionLineDeliveryDateModule, typeof TransactionMarginInfoLineModule, typeof i3.ObserveVisibilityModule, typeof i3.ScreenConfigurationModule, typeof TransactionLineLabelModule, typeof TransactionLineDirectSellButtonModule, typeof TransactionNavigationButtonListModule, typeof TransactionLineExpectedDeliveryDateButtonModule], [typeof TransactionOverviewLineComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<TransactionOverviewLineModule>;
 }
 
@@ -10634,6 +10674,7 @@ declare class DeliveryPlanningMainComponent implements OnInit, OnDestroy {
     private _viewModeService;
     private _transactionConn;
     private _transaction;
+    private _transactionBaseService;
     private _transactionEventService;
     private _changeDetector;
     private _promptService;
@@ -10646,7 +10687,7 @@ declare class DeliveryPlanningMainComponent implements OnInit, OnDestroy {
     set currentStartDate(date: Date);
     fullscreenEvent: EventEmitter<void>;
     showClass(): boolean;
-    constructor(_deliveryPlanningService: DeliveryPlanningService, _viewModeService: SearchViewModeService, _transactionConn: TransactionConnectorService, _transaction: TransactionService, _transactionEventService: TransactionEventService, _changeDetector: ChangeDetectorRef, _promptService: PromptService);
+    constructor(_deliveryPlanningService: DeliveryPlanningService, _viewModeService: SearchViewModeService, _transactionConn: TransactionConnectorService, _transaction: TransactionService, _transactionBaseService: TransactionBaseService, _transactionEventService: TransactionEventService, _changeDetector: ChangeDetectorRef, _promptService: PromptService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     planningChanged(planning: Planning): Promise<void>;
@@ -14094,7 +14135,7 @@ declare class TransactionHeaderRelationComponent extends TransactionHeaderBaseCo
     typeOfCustomerFullObject(relation: Relation): boolean;
     get relationAsCustomer(): CustomerFullObject;
     contactPersonForId(relationId: number): RelationContactLink;
-    determineDontAllowPopup(): boolean;
+    isPopupBlocked(): boolean;
     handleHeaderClick(): void;
     protected relationSet(): void;
     protected transactionInfoSet(): void;

package/lib/component/core/base/components/voucher-code-pending-reason-dialog/style/_material-definition.scss

@@ -1,3 +1,3 @@
-$cc-voucher-code-pending-dialog-width: 600px !default;
+$cc-voucher-code-pending-dialog-width: 460px !default;
 $cc-voucher-code-pending-dialog-title-gap: 10px !default;
 $cc-voucher-code-pending-dialog-co-input-margin: 5px 0 15px 0 !default;

package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_layout.scss

@@ -85,12 +85,31 @@
     }
 
     .co-transaction-cash-register-payment-voucher-popup {
-      .co-dialog:not(.is-mobile) {
+      .co-dialog {
         .co-dialog-wrapper {
-          width: 256px;
-          height: 232px;
-          min-width: 256px;
-          min-height: 232px;
+          width: $tp-transaction-cash-register-payment-voucher-dialog-width;
+          max-width: 100%;
+          height: auto;
+          min-width: $tp-transaction-cash-register-payment-voucher-dialog-min-width;
+          min-height: $tp-transaction-cash-register-payment-voucher-dialog-min-height;
+        }
+        .co-dialog-header-title-icon {
+          display: flex;
+          align-items: center;
+          gap: $tp-transaction-cash-register-payment-voucher-dialog-title-gap;
+        }
+        .dialog-content {
+          .row {
+            display: flex;
+            align-items: center;
+            gap: $tp-transaction-cash-register-payment-voucher-dialog-row-gap;
+            .bold {
+              min-width: $tp-transaction-cash-register-payment-voucher-dialog-row-bold-width;
+            }
+          }
+          .voucher-popup-body-wrapper {
+            margin: $tp-transaction-cash-register-payment-voucher-dialog-row-body-margin;
+          }
         }
       }
     }

package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_material-definition.scss

@@ -38,9 +38,15 @@ $tp-transaction-cash-register-payment-dialog-button-border-color: #0084de !defau
 $tp-transaction-cash-register-payment-dialog-button-icon-color: #0084de !default;
 $tp-transaction-cash-register-payment-dialog-receipt-button-min-width: 135px !default;
 $tp-transaction-cash-register-color-action: #1A73E8;
-
 $tp-transaction-cash-register-payment-dialog-button-border: 2px solid #0084de !default;
 $tp-transaction-cash-register-payment-dialog-button-border-disabled: 2px solid rgba(#0084de, 0.5) !default;
+$tp-transaction-cash-register-payment-dialog-payment-wrapper-width: 600px !default;
 
+$tp-transaction-cash-register-payment-voucher-dialog-width: 460px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-min-width: 256px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-min-height: 232px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-title-gap: 10px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-row-gap: 5px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-row-bold-width: 120px !default;
+$tp-transaction-cash-register-payment-voucher-dialog-row-body-margin: 2px 0 0 0 !default;
 
-$tp-transaction-cash-register-payment-dialog-payment-wrapper-width: 600px !default;

package/lib/component/transaction-header/transaction-header-popup/style/_layout.scss

@@ -133,6 +133,7 @@
       .title {
         font-size: $tp-transaction-header-popup-category-title-font-size;
         text-align: center;
+        white-space: nowrap;
       }
     }
 
@@ -578,6 +579,12 @@
         flex: 1;
       }
     }
+
+    .co-input-text.disabled {
+      opacity: 0.5;
+      pointer-events: none;
+      cursor: default;
+    }
   }
 
   .drop-shipment-dialog {

package/lib/component/transaction-search/transaction-search-tile/transaction-invoice-check-order-tile/style/_layout.scss

@@ -24,12 +24,15 @@
       overflow: auto;
     }
     .transaction-tile-wrapper {
-      width: 40%;
-      height: 160px;
-      padding: 7.5px 10px;
-      box-shadow: 0 2px 4px 0 #0000005c;
-      border-left: 4px solid #45b8bf;
-      border-radius: 5px;
+      width: $tp-co-transaction-invoice-check-tile-width;
+      max-width: $tp-co-transaction-invoice-check-tile-max-width;
+      height: $tp-co-transaction-invoice-check-tile-height;
+      padding: $tp-co-transaction-invoice-check-tile-padding;
+      box-shadow: $tp-co-transaction-invoice-check-tile-box-shadow;
+      border-width: $tp-co-transaction-invoice-check-tile-border-width;
+      border-style: solid;
+      border-color: $tp-co-transaction-invoice-check-tile-border-color;
+      border-radius: $tp-co-transaction-invoice-check-tile-border-radius;
       display: flex;
       flex-direction: column;
       .tile {
@@ -48,6 +51,10 @@
           display: flex;
           flex-direction: column;
           gap: 5px;
+          .co-icon {
+            width: $tp-co-transaction-invoice-check-tile-icon-width;
+            height: $tp-co-transaction-invoice-check-tile-icon-height;
+          }
         }
         .tile-footer {
           align-items: center;
@@ -60,8 +67,13 @@
             align-items: center;
             gap: 10px;
             .co-icon {
-              width: 22px;
-              height: 22px;
+              width: $tp-co-transaction-invoice-check-tile-icon-width;
+              height: $tp-co-transaction-invoice-check-tile-icon-height;
+            }
+          }
+          .value {
+            span {
+              font-size: $tp-co-transaction-invoice-check-tile-footer-font-size;
             }
           }
         }

package/lib/component/transaction-search/transaction-search-tile/transaction-invoice-check-order-tile/style/_material-definition.scss

@@ -0,0 +1,11 @@
+$tp-co-transaction-invoice-check-tile-width: 40% !default;
+$tp-co-transaction-invoice-check-tile-max-width: 300px !default;
+$tp-co-transaction-invoice-check-tile-height: 110px !default;
+$tp-co-transaction-invoice-check-tile-padding: 7.5px 10px !default;
+$tp-co-transaction-invoice-check-tile-box-shadow: 0 2px 4px 0 #0000005c !default;
+$tp-co-transaction-invoice-check-tile-border-width: 0 0 0 4px !default;
+$tp-co-transaction-invoice-check-tile-border-color: #45b8bf !default;
+$tp-co-transaction-invoice-check-tile-border-radius: 5px !default;
+$tp-co-transaction-invoice-check-tile-icon-width: 16px !default;
+$tp-co-transaction-invoice-check-tile-icon-height: 16px !default;
+$tp-co-transaction-invoice-check-tile-footer-font-size: 10px !default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "262.1.29",
+  "version": "262.1.31",
   "description": "Colijn IT transaction module for Angular 20",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -13,7 +13,7 @@
     "@colijnit/catalog": ">=262.1.0",
     "@colijnit/corecomponents_v12": ">=262.1.10",
     "@colijnit/ioneconnector": ">=262.1.0",
-    "@colijnit/mainapi": ">=262.1.8",
+    "@colijnit/mainapi": ">=262.1.11",
     "@colijnit/product": ">=262.1.0",
     "@colijnit/relation": ">=262.1.0",
     "@colijnit/relationapi": ">=262.1.0",