@colijnit/transaction 256.1.2 → 256.1.3

package/lib/component/avatar/avatar.component.d.ts

@@ -28,6 +28,7 @@ export declare class AvatarComponent implements OnInit {
     private _image;
     constructor(_transactionService: TransactionService, _transactionConnectorService: TransactionConnectorService, _colorSequenceService: ColorSequenceService, _relationService: TransactionRelationService, _changeDetector: ChangeDetectorRef);
     ngOnInit(): void;
+    private _setAvatar;
     private _setImageForAvatar;
     private _setImageFromRelation;
     private _setRelationInitials;

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

@@ -21,7 +21,6 @@ import { ScreenConfigAdapterComponent } from '@colijnit/corecomponents_v12';
 import { TransactionCfgName } from '../../../enum/transaction-cfg-name.enum';
 import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
 import { TransactionServiceInfo } from "@colijnit/transactionapi/build/model/transaction-service-info.bo";
-import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
 export declare abstract class TransactionBaseComponent implements OnInit, OnDestroy, ScreenConfigAdapterComponent {
     transactionEventService: TransactionEventService;
     iconCacheService: IconCacheService;
@@ -43,8 +42,6 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     get transaction(): TransactionInfoResponse;
     set transactionLine(value: TransactionLineInfo);
     get transactionLine(): TransactionLineInfo;
-    set transactionMarginInfo(marginInfo: TransactionMarginInfo);
-    get transactionMarginInfo(): TransactionMarginInfo;
     set transactionInfo(value: TransactionInfo);
     get transactionInfo(): TransactionInfo;
     set orderLineSets(value: OrderLineSetInfo[]);

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

@@ -43,6 +43,7 @@ export declare class TransactionComponent implements OnChanges {
     private _confirmationAnalysisId;
     private _transactionKind;
     private _transactionNr;
+    private _fetching;
     constructor(service: TransactionService, _transactionConnectorService: TransactionConnectorService, _screenConfigurationService: TransactionScreenConfigurationService, _changeDetector: ChangeDetectorRef, _purchaseConfirmationService: PurchaseConfirmationService, _dictionaryService: DictionaryService, _dialogService: DialogService);
     ngOnChanges(changes: SimpleChanges): void;
     private _checkTransactionDirty;

package/lib/component/transaction-button-bar/transaction-button-bar-button/transaction-sales-overview-button-bar-button.component.d.ts

@@ -18,13 +18,14 @@ export declare class TransactionSalesOverviewButtonBarButtonComponent extends Tr
     private _transactionService;
     private _elementRef;
     private _renderer;
+    private _transactionBaseService;
     readonly icons: typeof Icon;
     readonly category: typeof TransactionTypeCategory;
     readonly cfgNames: typeof TransactionCfgName;
     showClass: boolean;
     private _subs;
     showCategories: boolean;
-    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2);
+    constructor(iconCacheService: IconCacheService, _transactionEventService: TransactionEventService, _mappingService: TransactionMappingService, _dictionaryService: DictionaryService, _screenConfigService: TransactionScreenConfigurationService, _transactionService: TransactionService, _elementRef: ElementRef, _renderer: Renderer2, _transactionBaseService: TransactionService);
     currentIcon(): Icon.CartShoppingRegular | Icon.ChartPieSimpleRegular;
     currentTitle(): "OVERVIEW" | "MARGINS";
     ngOnDestroy(): void;

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

@@ -12,11 +12,13 @@ import { TransactionImageService } from "../../../service/transaction-image.serv
 import { DictionaryService } from "../../../service/dictionary.service";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionLineMarginInfo } from "@colijnit/transactionapi/build/model/transaction-line-margin-info.bo";
+import { TransactionBaseService } from "../../../service/transaction-base.service";
 export declare class TransactionCardMarginComponent extends TransactionBaseComponent implements AfterViewInit {
     transactionEventService: TransactionEventService;
     iconCacheService: IconCacheService;
     screenConfigService: TransactionScreenConfigurationService;
     orderLineSetService: OrderLineSetService;
+    private _transactionBaseService;
     protected imageService: TransactionImageService;
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
@@ -28,6 +30,6 @@ export declare class TransactionCardMarginComponent extends TransactionBaseCompo
     handleShowSidePanel(line: TransactionLineInfo): void;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
-    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, _transactionBaseService: TransactionBaseService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
     ngAfterViewInit(): void;
 }

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

@@ -25,6 +25,7 @@ import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction
 import { TransactionMarginInfo } from '@colijnit/transactionapi/build/model/transaction-margin-info.bo';
 import { DeliveryPlanningService } from '../delivery-planning/service/delivery-planning.service';
 import { DeliveryPlanningModes } from '../../enum/delivery-planning-modes.enum';
+import { TransactionBaseService } from "../../service/transaction-base.service";
 export declare class TransactionInternalComponent implements OnDestroy {
     iconCacheService: IconCacheService;
     service: TransactionService;
@@ -38,6 +39,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
     private _lineSelectionService;
     private _purchaseConfirmationService;
     private _deliveryPlanningService;
+    private _transactionBaseService;
     readonly categories: typeof TransactionTypeCategory;
     readonly deliveryPlanningModes: typeof DeliveryPlanningModes;
     readonly viewModes: typeof ContentViewMode;
@@ -81,7 +83,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
     private _subs;
     private _transaction;
     private _confirmationAnalysisId;
-    constructor(iconCacheService: IconCacheService, service: TransactionService, transactionEventService: TransactionEventService, _appRef: ApplicationRef, _dynamicComponentService: DynamicComponentService, _transactionConnectorService: TransactionConnectorService, _transactionEventService: TransactionEventService, _screenConfigurationService: TransactionScreenConfigurationService, _dialogService: DialogService, _lineSelectionService: LineSelectionService, _purchaseConfirmationService: PurchaseConfirmationService, _deliveryPlanningService: DeliveryPlanningService);
+    constructor(iconCacheService: IconCacheService, service: TransactionService, transactionEventService: TransactionEventService, _appRef: ApplicationRef, _dynamicComponentService: DynamicComponentService, _transactionConnectorService: TransactionConnectorService, _transactionEventService: TransactionEventService, _screenConfigurationService: TransactionScreenConfigurationService, _dialogService: DialogService, _lineSelectionService: LineSelectionService, _purchaseConfirmationService: PurchaseConfirmationService, _deliveryPlanningService: DeliveryPlanningService, _transactionBaseService: TransactionBaseService);
     ngOnDestroy(): void;
     handleRelationChange(relation: RelationAnyType): void;
     handleButtonBarButtonClicked(button: TransactionBarButton): void;
@@ -118,7 +120,7 @@ export declare class TransactionInternalComponent implements OnDestroy {
     private _hideTransactionTextDialog;
     private _hideArticleTextOverviewDialog;
     private updateTransactionLine;
-    getTransactionMarginInfo(transactionUUID: string): void;
+    getTransactionMarginInfo(transactionUUID: string): Promise<void>;
     handleViewModeChange(mode: ContentViewMode): void;
     getPlanOrderForTransaction(transaction: TransactionInfoResponse): Promise<void>;
 }

package/lib/component/transaction-line/transaction-margin-info-line/transaction-margin-info-line.component.d.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, ChangeDetectorRef, 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';
@@ -13,17 +13,18 @@ import { TransactionImageService } from '../../../service/transaction-image.serv
 import { DictionaryService } from '../../../service/dictionary.service';
 import { TransactionService } from '../../../service/transaction.service';
 import { TransactionLineMarginInfo } from "@colijnit/transactionapi/build/model/transaction-line-margin-info.bo";
-export declare class TransactionMarginInfoLineComponent extends TransactionBaseComponent implements AfterViewInit {
+import { TransactionBaseService } from "../../../service/transaction-base.service";
+export declare class TransactionMarginInfoLineComponent extends TransactionBaseComponent {
     transactionEventService: TransactionEventService;
     iconCacheService: IconCacheService;
     screenConfigService: TransactionScreenConfigurationService;
     orderLineSetService: OrderLineSetService;
+    private _transactionBaseService;
     protected imageService: TransactionImageService;
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
     protected changeDetector: ChangeDetectorRef;
     readonly category: typeof TransactionTypeCategory;
-    lineMarginInfo: TransactionLineMarginInfo;
     transactionLineActionButtons: TransactionLineActionButtonsComponent;
     descriptionDblClick: EventEmitter<void>;
     showClass(): boolean;
@@ -34,8 +35,8 @@ export declare class TransactionMarginInfoLineComponent extends TransactionBaseC
     readonly: boolean;
     statusBarConfigNames: StatusBarCfgNames;
     discountConfigNames: LineDiscountCfgNames;
-    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
-    ngAfterViewInit(): void;
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, orderLineSetService: OrderLineSetService, _transactionBaseService: TransactionBaseService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    get lineMarginInfo(): TransactionLineMarginInfo;
     handleCheckBoxValueChanged(value: boolean): void;
     onDescriptionDblClick(): void;
 }

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

@@ -1,5 +1,24 @@
-import { OnInit } from "@angular/core";
+import { ChangeDetectorRef, OnInit } from "@angular/core";
 import { TransactionBaseComponent } from "../core/base/transaction-base.component";
+import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.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 { TransactionBaseService } from "../../service/transaction-base.service";
 export declare class TransactionMarginComponent extends TransactionBaseComponent implements OnInit {
+    transactionEventService: TransactionEventService;
+    iconCacheService: IconCacheService;
+    screenConfigService: TransactionScreenConfigurationService;
+    private _transactionBaseService;
+    protected imageService: TransactionImageService;
+    protected dictionaryService: DictionaryService;
+    protected transactionService: TransactionService;
+    protected changeDetector: ChangeDetectorRef;
     showClass(): boolean;
+    get transactionMarginInfo(): TransactionMarginInfo;
+    constructor(transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, _transactionBaseService: TransactionBaseService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef);
+    ngOnInit(): void;
 }

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

@@ -23,6 +23,7 @@ import { BaseModuleService } from '@colijnit/corecomponents_v12';
 import { TransactionScreenConfigurationService } from './transaction-screen-configuration.service';
 import { RelationService } from '@colijnit/relation';
 import { SharedService } from "@colijnit/sharedcomponents";
+import { TransactionMarginInfo } from "@colijnit/transactionapi/build/model/transaction-margin-info.bo";
 export declare class TransactionBaseService extends BaseModuleService {
     optionsService: TransactionSettingsService;
     protected dialogService: DialogService;
@@ -43,6 +44,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
     relationUpdated: BehaviorSubject<Relation>;
     transactionKindSet: BehaviorSubject<boolean>;
+    transactionMargeViewClicked: Subject<boolean>;
     currentBranch: string;
     autoSave: boolean;
     manualSaveParam: boolean;
@@ -56,6 +58,8 @@ export declare class TransactionBaseService extends BaseModuleService {
     get paymentStepTitleForCheckout(): string;
     set transactionKind(value: TransactionKind);
     get transactionKind(): TransactionKind;
+    set transactionLocalMarginInfo(marginInfo: TransactionMarginInfo);
+    get transactionLocalMarginInfo(): TransactionMarginInfo;
     currentTransaction: TransactionInfoResponse;
     hasTransactionLines: boolean;
     set purchaseOrdersCompleted(value: boolean);
@@ -107,6 +111,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     private _transactionDirty;
     private _salesOrderConfirmationSent;
     private _subs;
+    private _transactionMarginInfo;
     constructor(optionsService: TransactionSettingsService, dialogService: DialogService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, transactionRelationService: TransactionRelationService, screenConfigService: TransactionScreenConfigurationService, relationService: RelationService, sharedService: SharedService);
     init(options: any, resetCurrentTransaction?: boolean): Promise<void>;
     createNewRelation(): void;
@@ -131,6 +136,7 @@ export declare class TransactionBaseService extends BaseModuleService {
     updateHeaderTransactionDepositAmount(uuid: string, amount: number, saveTransaction: boolean): Promise<boolean>;
     updateHeaderTransactionDepositPercentage(uuid: string, amount: number, saveTransaction: boolean): Promise<boolean>;
     resetLockTransaction(): void;
+    loadTransactionMargeInfoList(uuid: string): Promise<TransactionMarginInfo>;
     protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
     protected _handleAfterRememberCurrentTransaction(): Promise<void>;
     protected initializeTransaction(): void;

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

@@ -460,6 +460,7 @@ export declare class TransactionConnectorAdapterService {
     getInternalParameterValue(param: InternalParam): Promise<InternalParam>;
     getObjectConfiguration(screenCfgModule: string, params?: string | string[], insertMode?: boolean): Promise<ObjectConfiguration[]>;
     getHistoricDocuments(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
+    getReportHeadersByTransIdAndLayoutCode(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
     getPackageStickerPrintLayouts(): Promise<ReportLayoutSelectionPrint[]>;
     getYesNoCollection(languageCode: string): Promise<CoDomainValue[]>;
     getPriceKindCollection(languageCode: string): Promise<CoDomainValue[]>;

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

@@ -433,6 +433,7 @@ export declare class TransactionConnectorService {
     getInternalParameterValue(param: InternalParam): Promise<InternalParam>;
     getObjectConfiguration(screenCfgModule: string, params?: string | string[], insertMode?: boolean): Promise<ObjectConfiguration[]>;
     getHistoricDocuments(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
+    getReportHeadersByTransIdAndLayoutCode(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
     getPackageStickerPrintLayouts(): Promise<ReportLayoutSelectionPrint[]>;
     copySalesOrder(copyTransactionRequest: CopyTransactionRequest): Promise<TransactionInfoResponse>;
     copyPurchaseOrder(copyTransactionRequest: CopyTransactionRequest): Promise<TransactionInfoResponse>;

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

@@ -10,6 +10,7 @@ import { TransactionEventService } from './transaction-event.service';
 import { Address } from '@colijnit/relationapi/build/model/address.bo';
 import { DialogService } from './dialog.service';
 import { RelationSmallObject } from "@colijnit/mainapi/build/model/relation-small-object.bo";
+import { SupplierLightObject } from "@colijnit/relationapi/build/model/supplier-light-object.bo";
 export declare class TransactionRelationConnectorService {
     private _errorService;
     private _transactionEventService;
@@ -20,6 +21,7 @@ export declare class TransactionRelationConnectorService {
     connect(settings: any): void;
     getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
     getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
+    getSupplierLightById(supplierId: number): Promise<SupplierLightObject>;
     getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
     getDirectSellSuppliers(): Promise<RelationListObject[]>;
     getRelationNumber(relationId: number): Promise<string>;

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

@@ -14,6 +14,7 @@ import { RelationAnyType } from '@colijnit/relationapi/build/model/relation-any-
 import { Address } from '@colijnit/relationapi/build/model/address.bo';
 import { Subject } from 'rxjs';
 import { RelationSmallObject } from "@colijnit/relationapi/build/model/relation-small-object.bo";
+import { SupplierLightObject } from "@colijnit/relationapi/build/model/supplier-light-object.bo";
 export declare class TransactionRelationService {
     private _adapterService;
     private _selectMultipleCacheService;
@@ -30,6 +31,7 @@ export declare class TransactionRelationService {
     constructor(_adapterService: TransactionRelationConnectorService, _selectMultipleCacheService: TransactionSelectMultipleCacheService, _selectSingleCacheService: TransactionSelectSingleCacheService, _selectMultipleParameterizedCacheService: TransactionSelectMultipleParameterizedCacheService);
     getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
     getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
+    getSupplierLightById(supplierId: number): Promise<SupplierLightObject>;
     insertAddress(address: Address): Promise<Address>;
     updateAddress(address: Address): Promise<Address>;
     insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;

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

@@ -382,6 +382,7 @@ export declare class TransactionService extends PendingReasonService {
     getInternalParameter(param: InternalParam): Promise<boolean>;
     getObjectConfiguration(screenCfgModule: string, params?: string | string[], insertMode?: boolean): Promise<ObjectConfiguration[]>;
     getHistoricDocuments(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
+    getReportHeadersByTransIdAndLayoutCode(transId: number, documentCode: LayoutCode): Promise<HistoricReport[]>;
     undoDeliveryByReportId(reportId: number): Promise<DataServiceResponseData>;
     getDefaultEmailAddressListForPurchaseOrder(uuid: string): Promise<string[]>;
     handleReceiveSelectedPurchaseOrders(date: Date, packingSlipNr: string): Promise<boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "256.1.2",
+  "version": "256.1.3",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",