@colijnit/transaction 300.1.15 → 300.1.17

package/index.d.ts

@@ -512,7 +512,7 @@ declare class TransactionDialogService extends DialogService {
     protected dynamicComponentService: DynamicComponentService;
     protected dictionaryService: DictionaryService;
     constructor(_config: TransactionDialogMappingConfig, dynamicComponentService: DynamicComponentService, dictionaryService: DictionaryService);
-    showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<DialogResponseInterface>;
+    showCharacteristics(transaction: TransactionInfo, title: string, transactionLine: TransactionLineInfo, choices: TransactionLineCharacteristicChoice[], value: string): Promise<DialogResponseInterface>;
     showVoucherCode(pendingReason: string): Promise<DialogResponseInterface>;
     showWarehouseCC(transaction: TransactionInfo, transactionLine: TransactionLineInfo, decimals: number, quantity: number, commissionCode: string, warehouse: number, showDirectSell: boolean, reason: string): Promise<DialogResponseInterface>;
     showBranch(): Promise<DialogResponseInterface>;
@@ -971,6 +971,7 @@ declare class TransactionEventService {
     readonly removeFromContainerSuccess: Subject<void>;
     readonly requestFocusOnArticleField: Subject<void>;
     readonly transportNotificationsSet: Subject<void>;
+    readonly relationIdChanged: Subject<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionEventService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<TransactionEventService>;
 }
@@ -3097,6 +3098,7 @@ declare class TransactionHeaderService {
     private _relation;
     private _readOnly;
     constructor(_transactionService: TransactionService, _relationService: TransactionRelationService, _transactionPaymentConnectorService: TransactionPaymentConnectorService, _dictionaryService: DictionaryService, _transactionEventService: TransactionEventService);
+    checkRelationIdChanged(value: Relation): boolean;
     canChangeRelationOnTransaction(): boolean;
     canAlterRelationDataOnTransaction(): boolean;
     getTransactionMargeInfoList(): Promise<void>;
@@ -3926,32 +3928,88 @@ declare class ConfirmationDialogModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<ConfirmationDialogModule>;
 }
 
+declare class TransactionLineService {
+    transactionLineSet: BehaviorSubject<boolean>;
+    set transactionLine(value: TransactionLineInfo);
+    get transactionLine(): TransactionLineInfo;
+    set selected(value: boolean);
+    get selected(): boolean;
+    lineHasLogisticalState: boolean;
+    lineIsOrdered: boolean;
+    lineIsDelivered: boolean;
+    lineIsInvoiced: boolean;
+    lineIsReceived: boolean;
+    lineQuantityToInvoice: number;
+    lineQuantityInvoiced: number;
+    lineQuantityToReceive: number;
+    lineQuantityReceived: number;
+    lineQuantityToDeliver: number;
+    lineQuantityDelivered: number;
+    lineQuantityToAllocate: number;
+    lineQuantityAllocated: number;
+    lineQuantityOrdered: number;
+    lineQuantityPlanningRequested: number;
+    lineQuantityPlanningPreferredDateEntered: number;
+    lineQuantityToBePicked: number;
+    lineQuantityToBePickedAndPicked: number;
+    lineQuantityPicked: number;
+    lineQuantityPlanningFinal: number;
+    lineQuantityReceivedUnprocessed: number;
+    lineQuantityReceivedUnprocessedAndProcessed: number;
+    lineQuantityPurchaseConfirmed: number;
+    lineQuantityTransportNotification: number;
+    lineQuantityInvoiceControl: number;
+    lineQuantitySignedOff: number;
+    lineQuantityReturnRequested: number;
+    decimals: number;
+    isText: boolean;
+    isArticle: boolean;
+    showingMargins: boolean;
+    lineVisible: boolean;
+    private _transactionLine;
+    constructor();
+    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<TransactionLineService>;
+}
+
 declare class CharacteristicAnswerComponent extends DialogBaseComponent implements OnInit {
     private _changeDetector;
+    transactionHeaderService: TransactionHeaderService;
+    transactionLineService: TransactionLineService;
+    transactionService: TransactionService;
+    iconCacheService: IconCacheService;
     title: string;
+    transactionKind: TransactionKind;
     set choices(value: TransactionLineCharacteristicChoice[]);
     get choices(): TransactionLineCharacteristicChoice[];
     value: string;
     readonly okClick: EventEmitter<string>;
     showClass(): boolean;
+    readonly icons: typeof Icon;
     viewModels: {
         value: string;
         checked: boolean;
     }[];
+    transactionInfo: TransactionInfo;
+    transactionLine: TransactionLineInfo;
+    articleName: string;
+    articleNr: string;
+    protected readonly buttonType: typeof AppPopupButtonType;
     private _choices;
-    constructor(_changeDetector: ChangeDetectorRef);
-    ngOnInit(): void;
+    constructor(_changeDetector: ChangeDetectorRef, transactionHeaderService: TransactionHeaderService, transactionLineService: TransactionLineService, transactionService: TransactionService, iconCacheService: IconCacheService);
+    ngOnInit(): Promise<void>;
     handleChecked(choice: string): void;
     handleOkClick(): void;
     onKeyDown(event: KeyboardEvent): void;
     private _prepareViewModels;
+    private setArticleName;
     static ɵfac: i0.ɵɵFactoryDeclaration<CharacteristicAnswerComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CharacteristicAnswerComponent, "co-characteristic-answer", never, { "title": { "alias": "title"; "required": false; }; "choices": { "alias": "choices"; "required": false; }; "value": { "alias": "value"; "required": false; }; }, { "okClick": "okClick"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<CharacteristicAnswerComponent, "co-characteristic-answer", never, { "title": { "alias": "title"; "required": false; }; "transactionKind": { "alias": "transactionKind"; "required": false; }; "choices": { "alias": "choices"; "required": false; }; "value": { "alias": "value"; "required": false; }; }, { "okClick": "okClick"; }, never, never, false, never>;
 }
 
 declare class CharacteristicAnswerModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<CharacteristicAnswerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CharacteristicAnswerModule, [typeof CharacteristicAnswerComponent], [typeof i2.CommonModule, typeof i3.ButtonModule, typeof i3.CoDialogModule, typeof i3.InputCheckboxModule, typeof i3.InputTextModule, typeof PipeModule], [typeof CharacteristicAnswerComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CharacteristicAnswerModule, [typeof CharacteristicAnswerComponent], [typeof i2.CommonModule, typeof i3.ButtonModule, typeof i3.CoDialogModule, typeof i3.InputCheckboxModule, typeof i3.InputTextModule, typeof PipeModule, typeof i3.IconModule], [typeof CharacteristicAnswerComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<CharacteristicAnswerModule>;
 }
 
@@ -4059,6 +4117,7 @@ declare enum TransactionCfgName {
     HeaderOrderDiscountHeader = "headerOrderDiscountHeader",
     HeaderOrderDefinitiveHeader = "headerOrderDefinitiveHeader",
     HeaderOrderReleaseHeader = "headerOrderReleaseHeader",
+    HeaderDiscountOnOrderLine = "headerDiscountOnOrderLine",
     DiscountPercentage = "discountPercentage",
     DiscountAmount = "discountAmount",
     DiscountTransTotal = "discountTransTotal",
@@ -4721,50 +4780,6 @@ declare class TransactionMappingService {
     static ɵprov: i0.ɵɵInjectableDeclaration<TransactionMappingService>;
 }
 
-declare class TransactionLineService {
-    transactionLineSet: BehaviorSubject<boolean>;
-    set transactionLine(value: TransactionLineInfo);
-    get transactionLine(): TransactionLineInfo;
-    set selected(value: boolean);
-    get selected(): boolean;
-    lineHasLogisticalState: boolean;
-    lineIsOrdered: boolean;
-    lineIsDelivered: boolean;
-    lineIsInvoiced: boolean;
-    lineIsReceived: boolean;
-    lineQuantityToInvoice: number;
-    lineQuantityInvoiced: number;
-    lineQuantityToReceive: number;
-    lineQuantityReceived: number;
-    lineQuantityToDeliver: number;
-    lineQuantityDelivered: number;
-    lineQuantityToAllocate: number;
-    lineQuantityAllocated: number;
-    lineQuantityOrdered: number;
-    lineQuantityPlanningRequested: number;
-    lineQuantityPlanningPreferredDateEntered: number;
-    lineQuantityToBePicked: number;
-    lineQuantityToBePickedAndPicked: number;
-    lineQuantityPicked: number;
-    lineQuantityPlanningFinal: number;
-    lineQuantityReceivedUnprocessed: number;
-    lineQuantityReceivedUnprocessedAndProcessed: number;
-    lineQuantityPurchaseConfirmed: number;
-    lineQuantityTransportNotification: number;
-    lineQuantityInvoiceControl: number;
-    lineQuantitySignedOff: number;
-    lineQuantityReturnRequested: number;
-    decimals: number;
-    isText: boolean;
-    isArticle: boolean;
-    showingMargins: boolean;
-    lineVisible: boolean;
-    private _transactionLine;
-    constructor();
-    static ɵfac: i0.ɵɵFactoryDeclaration<TransactionLineService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<TransactionLineService>;
-}
-
 interface ActionButtonsCfgNames {
     addDocumentBtn?: string;
     addProductTextBtn?: string;
@@ -9133,7 +9148,7 @@ declare class TransactionSendDocumentsComponent extends TransactionHeaderBaseCom
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionSendDocumentsComponent, "co-transaction-send-documents", never, { "transactionTypeCategory": { "alias": "transactionTypeCategory"; "required": false; }; "selected": { "alias": "selected"; "required": false; }; }, { "openSendMethodDialog": "openSendMethodDialog"; }, never, never, false, never>;
 }
 
-declare abstract class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBaseComponent implements OnInit {
+declare abstract class TransactionQuickAccessSendMethodBaseComponent extends TransactionHeaderBaseComponent implements OnInit, OnDestroy {
     searchService: TransactionSearchService;
     transactionHeaderService: TransactionHeaderService;
     transactionEventService: TransactionEventService;
@@ -9154,6 +9169,7 @@ declare abstract class TransactionQuickAccessSendMethodBaseComponent extends Tra
     defaultSendMethod: string;
     defaultSendMethodIcon: string;
     emailAddresses: string[];
+    private _qaBaseSubs;
     set showSendMethodDialog(value: boolean);
     get showSendMethodDialog(): boolean;
     sendMethods: SendMethod[];
@@ -9176,6 +9192,7 @@ declare abstract class TransactionQuickAccessSendMethodBaseComponent extends Tra
     private _showSendMethodDialog;
     constructor(searchService: TransactionSearchService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, dialogService: TransactionDialogService);
     ngOnInit(): void;
+    ngOnDestroy(): void;
     handleSendMethodOkClick(method: string | ProcessPrintRequest): Promise<void>;
     handleSend(method: string | ProcessPrintRequest): Promise<void>;
     commitAndRefreshTransaction(): void;
@@ -10075,7 +10092,7 @@ declare class TransactionSalesOverviewButtonBarButtonComponent extends Transacti
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -10101,7 +10118,7 @@ declare class TransactionPurchaseOverviewButtonBarButtonComponent extends Transa
     constructor(iconCacheService: IconCacheService, transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, changeDetector: ChangeDetectorRef, _mappingService: TransactionMappingService, _transactionService: TransactionService, _elementRef: ElementRef);
     ngOnDestroy(): void;
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): Promise<void>;
     private handleDocumentClick;
@@ -10153,7 +10170,7 @@ declare class TransactionSalesQuotationButtonBarButtonComponent extends Transact
     showCategories: boolean;
     constructor(iconCacheService: IconCacheService, changeDetector: ChangeDetectorRef, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
-    currentTitle(): "OVERVIEW" | "MARGINS";
+    currentTitle(): "MARGINS" | "OVERVIEW";
     ngOnDestroy(): void;
     handleClickWrapper(event: MouseEvent): void;
     handleMarginClicked(event: MouseEvent, category: TransactionTypeCategory): void;
@@ -16357,6 +16374,7 @@ declare class TransactionServiceOverviewComponent extends TransactionHeaderBaseC
     putDocumentInList(doc: CoDocument): void;
     removeDocumentFromList(doc: CoDocument): void;
     sortDocumentList(): void;
+    openTaskActivity(activity: Activity): void;
     openCreatedTask(taskId: number): Promise<void>;
     getWizardQuestionPairs(text?: string): string[][];
     scrollActivitiesToBottom(): void;
@@ -16762,6 +16780,7 @@ declare class TransactionLineActivitiesComponent implements OnInit {
     private _changeDetector;
     activityList: ElementRef<HTMLDivElement>;
     openActivities: ComponentActivityListComponent;
+    activityTimeline: ActivityTimelineComponent;
     transactionId: number;
     readonly tableNames: typeof TableName;
     readonly cfgNames: typeof TransactionCfgName;
@@ -16770,11 +16789,12 @@ declare class TransactionLineActivitiesComponent implements OnInit {
     user: RelationSmallObject$1;
     transactionInfo: TransactionInfo;
     showActivityHeader: boolean;
+    showActivityLists: boolean;
     constructor(transactionService: TransactionService, _changeDetector: ChangeDetectorRef);
     showClass(): boolean;
     ngOnInit(): void;
     finishedActivitiesRefreshRequested(): Promise<void>;
-    fullActivitiesRefreshRequested(): void;
+    fullActivitiesRefreshRequested(): Promise<void>;
     scrollActivitiesToBottom(): void;
     getActivities(): Promise<void>;
     openCreatedTask(taskId: number): Promise<void>;

package/lib/component/core/base/components/characteristic-answer/style/_layout.scss

@@ -3,5 +3,25 @@
     .co-dialog:not(.is-mobile) .co-dialog-wrapper {
       width: 500px;
     }
+    .co-dialog-header-title {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      span {
+        &.sku-title {
+          font-size: 10px;
+          font-weight: normal;
+        }
+      }
+      .co-icon {
+        width: 20px;
+        height: 20px;
+      }
+    }
+    .co-dialog-characteristic-question {
+      font-size: 14px;
+      margin-top: 30px;
+      display: block;
+    }
   }
 }

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

@@ -42,6 +42,9 @@
       .co-task-creator {
         position: sticky;
         bottom: 0;
+        .task-creator-wrapper {
+          background: #ffffff;
+        }
       }
     }
     .activity-task-creator-wrapper {

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

@@ -0,0 +1,10 @@
+@include export-module('cc-transaction-line-planning-tasks-layout') {
+  .co-transaction-line-planning-tasks {
+    display: flex;
+    width: 55%;
+
+    .component-activity-list-wrapper {
+      width: 100%;
+    }
+  }
+}

package/lib/component/transaction-line-planning-tasks/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-line-planning-tasks-theme') {
+  .co-transaction-line-planning-tasks {
+  }
+}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "300.1.15",
+  "version": "300.1.17",
   "description": "Colijn IT transaction module for Angular 20",
   "repository": "npm/npm",
   "author": "Colijn IT",