@colijnit/transaction 12.1.159 → 12.1.161

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

@@ -15,15 +15,14 @@ import { TransactionEventService } from '../../../service/transaction-event.serv
 import { IconCacheService } from '../../../service/icon-cache.service';
 import { TransactionImageService } from '../../../service/transaction-image.service';
 import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
-import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
 import { TransactionDeliveryCostLineInfo } from '@colijnit/transactionapi/build/model/transaction-delivery-cost-line-info.bo';
-import { OrderLineSetInfo } from "@colijnit/transactionapi/build/model/order-line-set-info.bo";
-import { ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
+import { OrderLineSetInfo } from '@colijnit/transactionapi/build/model/order-line-set-info.bo';
+import { BaseModuleScreenConfigService, ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
 import { TransactionCfgName } from '../../../enum/transaction-cfg-name.enum';
 export declare abstract class TransactionBaseComponent implements OnInit, OnDestroy, ScreenConfigAdapterComponent {
     transactionEventService: TransactionEventService;
     iconCacheService: IconCacheService;
-    screenConfigService: TransactionScreenConfigurationService;
+    screenConfigService: BaseModuleScreenConfigService;
     protected imageService: TransactionImageService;
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
@@ -117,7 +116,7 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     private _selected;
     private _baseSubs;
     private _cfgName;
-    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: BaseModuleScreenConfigService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
     ngOnDestroy(): void;
     handleCommit(value: any): Promise<boolean>;

package/lib/component/shared/transaction-article-text/style/_layout.scss

@@ -85,6 +85,24 @@
       }
     }
 
+    .order-line-set-fields-wrapper {
+
+      display: flex;
+      flex-direction: column;
+      row-gap: 5px;
+      padding-bottom: 5px;
+      padding-top: 20px;
+      .co-input-checkbox {
+        font-weight: bold;
+      }
+
+      .order-line-set-inputs-wrapper {
+        display: flex;
+        flex-direction: row;
+        column-gap: 5px;
+      }
+    }
+
     .dialog-label,
     .e-ddl.e-lib.e-input-group.e-control-wrapper.e-float-input .e-float-text.e-label-top,
     .co-input-listbox .co-input-listbox-header {

package/lib/component/shared/transaction-article-text/transaction-article-text.component.d.ts

@@ -6,7 +6,9 @@ import { TransactionService } from '../../../service/transaction.service';
 import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
 import { StandardText } from '../../../model/standard-text';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
-import { CoDomainValue } from '@colijnit/mainapi/build/model/co-domain-value.bo';
+import { OrderLineSetCategory } from "@colijnit/mainapi/build/model/order-line-set-category.bo";
+import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
+import { FilterItemViewmodel } from "@colijnit/corecomponents_v12/lib/components/filter-item/filter-item-viewmodel";
 export declare class TransactionArticleTextComponent implements OnInit {
     transactionService: TransactionService;
     iconCacheService: IconCacheService;
@@ -15,6 +17,8 @@ export declare class TransactionArticleTextComponent implements OnInit {
     transactionUuid: string;
     set transactionLine(value: TransactionLineInfo);
     get transactionLine(): TransactionLineInfo;
+    set orderLineSetDTO(value: OrderLineSetDTO);
+    get orderLineSetDTO(): OrderLineSetDTO;
     set articleRef(value: string);
     get articleRef(): string;
     set editText(value: string);
@@ -27,26 +31,35 @@ export declare class TransactionArticleTextComponent implements OnInit {
         request: TransactionAddTextLineRequest;
         new: boolean;
     }>;
+    saveOrderLineSetClick: EventEmitter<{
+        request: OrderLineSetDTO;
+        new: boolean;
+    }>;
     showClass(): boolean;
     readonly icon: typeof Icon;
     private _transactionLine;
     standardTexts: StandardText[];
-    documents: CoDomainValue[];
+    documents: FilterItemViewmodel[];
+    orderLineSetCategories: OrderLineSetCategory[];
     showOnDocuments: number[];
     selectAll: boolean;
     fields: Object;
     fieldsDocuments: Object;
     textAreaPlaceholder: string;
     new: boolean;
+    showOrderLineFields: boolean;
+    chosenOrderLineSetCategory: OrderLineSetCategory;
     transactionAddTextLineRequest: TransactionAddTextLineRequest;
     private _articleRef;
+    private _orderLineSetDTO;
     constructor(transactionService: TransactionService, iconCacheService: IconCacheService, _dictionaryService: DictionaryService);
     ngOnInit(): Promise<void>;
     onOkClick(event: MouseEvent): void;
     onCancelClick(event: MouseEvent): void;
     onSelectStandardText(value: StandardText): void;
-    handleDocumentsChange(checked: boolean, document: CoDomainValue): void;
+    handleDocumentsChange(checked: boolean, document: FilterItemViewmodel): void;
     handleSelectAll(select: boolean): void;
     private _setShowOnDocuments;
     private _getShowOnDocuments;
+    private _setChosenOrderLineSetCat;
 }

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

@@ -17,6 +17,7 @@ import { DialogService } from '../../service/dialog.service';
 import { LineSelectionService } from '../../service/line-selection.service';
 import { TransactionBarButton } from '../../model/transaction-bar-button';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
+import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
 export declare class TransactionInternalComponent implements OnDestroy {
     iconCacheService: IconCacheService;
     service: TransactionService;
@@ -44,6 +45,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
     activeCategory: TransactionTypeCategory;
     sidePanelTransactionLine: TransactionLineInfo;
     transactionLine: TransactionLineInfo;
+    selectedOrderLineSetDTO: OrderLineSetDTO;
     showSidePanel: boolean;
     showArticleTextOverview: boolean;
     showTransactionText: boolean;
@@ -67,6 +69,10 @@ export declare class TransactionInternalComponent implements OnDestroy {
         request: TransactionAddTextLineRequest;
         new: boolean;
     }): Promise<void>;
+    saveOrderLineSet(data: {
+        request: OrderLineSetDTO;
+        new: boolean;
+    }): Promise<void>;
     saveArticleLineText(data: {
         request: TransactionAddTextLineRequest;
         new: boolean;
@@ -80,6 +86,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
     showArticleTextDialog(): void;
     showArticleTextOverviewDialog(): void;
     shouldShowTiles(): boolean;
+    private _getOrderLineSetIfExists;
     private _hideArticleTextDialog;
     private _hideTransactionTextDialog;
     private _hideArticleTextOverviewDialog;

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

@@ -20,5 +20,10 @@
       height: $tp-transaction-base-line-delete-icon-size;
       width: $tp-transaction-base-line-delete-icon-size;
     }
+    .colorBlock {
+      width: 20px;
+      border-radius: 5px;
+      border: 1px solid;
+    }
   }
 }

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

@@ -1,11 +1,26 @@
-import { EventEmitter } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter } from '@angular/core';
 import { StockStatus } from '@colijnit/transactionapi/build/enum/refcode/stock-status.enum';
 import { TransactionLineActionButtonsComponent } from '../../transaction-line-action-buttons/transaction-line-action-buttons.component';
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
 import { TransactionTypeCategory } from '../../../enum/transaction-type-category.enum';
 import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
 import { LineDiscountCfgNames } from '../../../interface/line-discount-cfg-names.interface';
+import { TransactionEventService } from "../../../service/transaction-event.service";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { OrderLineSetService } from "../../../service/order-line-set-service";
+import { TransactionImageService } from "../../../service/transaction-image.service";
+import { DictionaryService } from "../../../service/dictionary.service";
+import { TransactionService } from "../../../service/transaction.service";
 export declare class TransactionOverviewLineComponent extends TransactionBaseComponent {
+    transactionEventService: TransactionEventService;
+    iconCacheService: IconCacheService;
+    screenConfigService: TransactionScreenConfigurationService;
+    orderLineSetService: OrderLineSetService;
+    protected imageService: TransactionImageService;
+    protected dictionaryService: DictionaryService;
+    protected transactionService: TransactionService;
+    protected changeDetector: ChangeDetectorRef;
     readonly category: typeof TransactionTypeCategory;
     transactionLineActionButtons: TransactionLineActionButtonsComponent;
     descriptionDblClick: EventEmitter<void>;
@@ -17,5 +32,7 @@ export declare class TransactionOverviewLineComponent extends TransactionBaseCom
     readonly: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    handleCheckBoxValueChanged(value: boolean): void;
     onDescriptionDblClick(): void;
 }

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

@@ -5,6 +5,8 @@
     column-gap: $tp-transaction-text-line-column-gap;
     .transaction-line-delete {
       display: flex;
+      flex-direction: row;
+      column-gap: 5px;
       flex-basis: 50px;
       .delete-wrapper {
         cursor: pointer;
@@ -17,6 +19,21 @@
       cursor: pointer;
       height: $tp-transaction-text-line-delete-icon-size;
       width: $tp-transaction-text-line-delete-icon-size;
+
+      &.active {
+        svg { // for fontawesome icons
+          fill: $tp-color-action;
+        }
+        & [fill] { // for own icons
+          fill: $tp-color-action;
+        }
+      }
+    }
+    .colorBlock {
+      height: 20px;
+      width: 20px;
+      border-radius: 5px;
+      border: 1px solid;
     }
   }
 }

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

@@ -1,6 +1,28 @@
-import { EventEmitter } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter } from '@angular/core';
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { DictionaryService } from '../../../service/dictionary.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { IconCacheService } from '../../../service/icon-cache.service';
+import { TransactionEventService } from "../../../service/transaction-event.service";
+import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { TransactionImageService } from "../../../service/transaction-image.service";
+import { OrderLineSetService } from "../../../service/order-line-set-service";
+import { TransactionTypeCategory } from "../../../enum/transaction-type-category.enum";
 export declare class TransactionTextLineComponent extends TransactionBaseComponent {
+    transactionEventService: TransactionEventService;
+    iconCacheService: IconCacheService;
+    screenConfigService: TransactionScreenConfigurationService;
+    orderLineSetService: OrderLineSetService;
+    protected imageService: TransactionImageService;
+    protected dictionaryService: DictionaryService;
+    protected transactionService: TransactionService;
+    protected changeDetector: ChangeDetectorRef;
+    activeCategory: TransactionTypeCategory;
     descriptionDblClick: EventEmitter<void>;
     showClass(): boolean;
+    showButtons: boolean;
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    orderLineSetButtonClicked(): void;
+    protected readonly TransactionTypeCategory: typeof TransactionTypeCategory;
+    transactionLineSet(): void;
 }

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

@@ -5,6 +5,7 @@ import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transa
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
 import { TransactionTypeCategory } from '../../enum/transaction-type-category.enum';
 import { TransactionBaseComponent } from '../core/base/transaction-base.component';
+import { OrderLineSetInfo } from "@colijnit/transactionapi/build/model/order-line-set-info.bo";
 export declare class TransactionLinesComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
     transactionArticleText: TransactionArticleTextComponent;
     set activeCategory(value: TransactionTypeCategory);
@@ -15,6 +16,7 @@ export declare class TransactionLinesComponent extends TransactionBaseComponent
     selectedTransactionLine: TransactionLineInfo;
     hasComponent: boolean;
     historicTransactionLines: TransactionLineInfo[] | null;
+    selectedOrderLineSet: OrderLineSetInfo;
     private _activeCategory;
     private _subscriptions;
     ngOnInit(): void;
@@ -24,4 +26,5 @@ export declare class TransactionLinesComponent extends TransactionBaseComponent
     handleDrop(event: CdkDragDrop<TransactionLineInfo[]>): Promise<void>;
     onDescriptionDblClick(line: TransactionLineInfo): void;
     handleTransactionText(): void;
+    orderLikeSetConnectionClicked(set: OrderLineSetInfo): void;
 }

package/lib/enum/icon.enum.d.ts

@@ -52,6 +52,7 @@ export declare enum Icon {
     IndustryRegular = "industry_regular",
     IndustrySolid = "industry_solid",
     Invoice = "invoice",
+    LinkRegular = "link_regular",
     ListRegular = "list_regular",
     ListTimelineRegular = "list_timeline_regular",
     ListView = "list_view",

package/lib/service/order-line-set-service.d.ts

@@ -0,0 +1,3 @@
+export declare class OrderLineSetService {
+    currentOrderLineSetCode: string;
+}

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

@@ -110,7 +110,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getTransactionById(transactionId: number): Promise<void>;
     getTransactionByNrAndKind(transactionNr: number, transactionKind: TransactionKind): Promise<void>;
-    getWebSessionSalesOrder(transactionUuid: string): Promise<void>;
+    getWebSessionSalesOrder(transactionUuid: string): Promise<boolean>;
     tryToLockTransaction(id: number, version: number, secondAttempt?: boolean): Promise<boolean>;
     getTransactionInfo(transId: number, lineId: number): Promise<TransactionInfoHistory[]>;
     getRefTransactions(transId: number): Promise<RefTransaction[]>;

package/lib/service/transaction-connector-adapter.service.d.ts

@@ -125,6 +125,8 @@ import { BehaviorSubject } from 'rxjs';
 import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
 import { RelationConnectorService } from './relation-connector.service';
 import { ArticleConnectorService } from './article-connector.service';
+import { OrderLineSetCategory } from "@colijnit/mainapi/build/model/order-line-set-category.bo";
+import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -331,6 +333,10 @@ export declare class TransactionConnectorAdapterService {
     getPrinters(): Promise<Printer[]>;
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
+    getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
+    addOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
+    updateOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
+    changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
     mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
     getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;

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

@@ -113,6 +113,8 @@ import { ChangeHeaderRetailStadiumRequest } from '@colijnit/transactionapi/build
 import { RetailStadium } from '@colijnit/transactionapi/build/model/retail-stadium.bo';
 import { WorkFlowStatus } from '@colijnit/transactionapi/build/model/workflow-status.bo';
 import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
+import { OrderLineSetCategory } from "@colijnit/mainapi/build/model/order-line-set-category.bo";
+import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -304,6 +306,10 @@ export declare class TransactionConnectorService {
     getPrinters(): Promise<Printer[]>;
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
+    getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
+    addOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
+    updateOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
+    changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
     mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
     getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;

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

@@ -101,6 +101,8 @@ import { RetailStadium } from '@colijnit/transactionapi/build/model/retail-stadi
 import { WorkFlowStatus } from '@colijnit/transactionapi/build/model/workflow-status.bo';
 import { ChangeLineQuantitySelectedLineRequest } from '@colijnit/transactionapi/build/model/change-line-quantity-selected-line-request';
 import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
+import { OrderLineSetCategory } from "@colijnit/mainapi/build/model/order-line-set-category.bo";
+import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
 export declare class TransactionService extends PendingReasonService {
     remainingAmount: number;
     private readonly _createTransactionMethods;
@@ -286,6 +288,10 @@ export declare class TransactionService extends PendingReasonService {
     getPrinters(): Promise<Printer[]>;
     getCurrencies(active?: boolean): Promise<Currency[]>;
     getPaymentConditions(name?: string): Promise<PaymentCondition[]>;
+    getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
+    addOrderLineSet(request: OrderLineSetDTO): Promise<boolean>;
+    updateOrderLineSet(request: OrderLineSetDTO): Promise<boolean>;
+    changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<boolean>;
     getJoinedTags(table: string, key: string): Promise<TagTreeItem[]>;
     mergeJoinedTags(table: string, key: string, tags: TagTreeItem[]): Promise<boolean>;
     getTagsFullTree(category: TagCategory, includeTags: boolean): Promise<TagTreeItem[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.159",
+  "version": "12.1.161",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -12,14 +12,14 @@
     "@colijnit/articleapi": ">=1.0.30",
     "@colijnit/catalog": ">=12.1.51",
     "@colijnit/corecomponents": ">=1.12.0",
-    "@colijnit/corecomponents_v12": ">=12.2.6",
+    "@colijnit/corecomponents_v12": ">=12.2.8",
     "@colijnit/ioneconnector": ">=3.1.9",
-    "@colijnit/mainapi": ">=1.0.24",
+    "@colijnit/mainapi": ">=1.0.25",
     "@colijnit/product": ">=12.0.3",
     "@colijnit/relationapi": ">=1.0.8",
     "@colijnit/sharedapi": ">=1.0.16",
     "@colijnit/sharedcomponents": ">=1.0.46",
-    "@colijnit/transactionapi": ">=1.1.111",
+    "@colijnit/transactionapi": ">=1.1.114",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0"