@colijnit/transaction 12.1.72 → 12.1.73

package/lib/component/checkout/checkout-overview-relation-edit/checkout-overview-relation-edit.component.d.ts

@@ -2,17 +2,19 @@ import { EventEmitter, OnInit } from "@angular/core";
 import { TransactionService } from "../../../service/transaction.service";
 import { FormMasterService } from "@colijnit/corecomponents_v12";
 import { Icon } from "../../../enum/icon.enum";
-import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
+import { RelationKind } from "@colijnit/relationapi/build/enum/relation-kind.enum";
 import { AddressType } from "@colijnit/relationapi/build/enum/address-type.enum";
 import { RelationAnyType } from "../../../model/relation-any-type";
 import { Address } from "@colijnit/relationapi/build/model/address.bo";
 export declare class CheckoutOverviewRelationEditComponent implements OnInit {
     private _formMaster;
     service: TransactionService;
+    readonly relationKind: typeof RelationKind;
     readonly icons: typeof Icon;
     readonly addressType: typeof AddressType;
-    set relation(value: CustomerFullObject);
-    get relation(): CustomerFullObject;
+    set relation(value: RelationAnyType);
+    get relation(): RelationAnyType;
+    relationType: RelationKind;
     deliveryAddressNawNr: number;
     invoiceAddressNawNr: number;
     validSubmit: EventEmitter<void>;
@@ -23,10 +25,12 @@ export declare class CheckoutOverviewRelationEditComponent implements OnInit {
     showClass(): boolean;
     private _relation;
     address: Address;
+    customerGroup: string;
     get applicationUser(): boolean;
     constructor(_formMaster: FormMasterService, service: TransactionService);
     ngOnInit(): Promise<void>;
-    updateRelation(rel: CustomerFullObject): void;
+    handleCustomerGroupChange(group: string): void;
+    updateRelation(rel: RelationAnyType): void;
     submit(): boolean;
     handleNewAddress(type: AddressType, address: Address): void;
     checkSameAddress(checked: boolean): void;

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

@@ -9,6 +9,7 @@ import { DialogService } from "../../service/dialog.service";
 import { PaymentComponent } from "../payment/payment.component";
 import { StepperComponent } from "../stepper/stepper.component";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
+import { RelationKind } from "@colijnit/relationapi/build/enum/relation-kind.enum";
 export declare class CheckoutComponent implements OnInit {
     service: TransactionService;
     private _dictionary;
@@ -33,6 +34,7 @@ export declare class CheckoutComponent implements OnInit {
     transaction: TransactionInfoResponse;
     deliveryAddressNawNr: number;
     invoiceAddressNawNr: number;
+    relationType: RelationKind;
     constructor(service: TransactionService, _dictionary: DictionaryService, _dialogService: DialogService);
     ngOnInit(): void;
     handleCreateTransaction(event: MouseEvent): Promise<void>;

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

@@ -3,12 +3,13 @@ import { TransactionSearchViewRequest } from "@colijnit/transactionapi/build/mod
 import { TransactionService } from "../../../service/transaction.service";
 import { FilterRequestService } from "../../transaction-search/service/filter-request.service";
 import { TransactionSearchService } from "../../transaction-search/service/transaction-search.service";
+import { SearchPlaceholder } from "../../transaction-search/transaction-filter-content/enum/search-placeholder.enum";
 export declare abstract class TransactionFilterContentBaseComponent implements OnInit {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    readonly searchPlaceholder: typeof SearchPlaceholder;
     searchRequest: TransactionSearchViewRequest;
-    searchPlaceholder: string;
     filterButtonLabel: string;
     protected constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
     ngOnInit(): void;

package/lib/component/relation/relation-base.component.d.ts

@@ -1,9 +1,11 @@
 import { EventEmitter } from "@angular/core";
 import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
-import { RelationAnyType } from "../../model/relation-any-type";
+import { RelationAnyType } from "@colijnit/relationapi/build/model/relation-any-type";
+import { RelationKind } from "@colijnit/relationapi/build/enum/relation-kind.enum";
 export declare abstract class RelationBaseComponent {
     set relation(value: RelationAnyType);
     get relation(): RelationAnyType;
+    relationType: RelationKind;
     relationChange: EventEmitter<RelationAnyType>;
     get relationAsCustomer(): CustomerFullObject;
     private _relation;

package/lib/component/relation/relation-general/relation-general.component.d.ts

@@ -6,11 +6,13 @@ import { RelationNameKind } from "@colijnit/relationapi/build/enum/relation-name
 import { GenderType } from "@colijnit/relationapi/build/enum/gender-type.enum";
 import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
 import { RelationService } from "../../../service/relation.service";
+import { RelationKind } from "@colijnit/relationapi/build/enum/relation-kind.enum";
 export declare class RelationGeneralComponent extends RelationBaseComponent {
     private _service;
     private _dictionaryService;
     private _dialogService;
     private _relationService;
+    readonly relationKind: typeof RelationKind;
     readonly relType: typeof RelationNameKind;
     readonly genderType: typeof GenderType;
     readonly: boolean;

package/lib/component/relation/relation-general/style/_layout.scss

@@ -22,6 +22,7 @@
       position: fixed;
       top: 0;
       right: 0;
+      z-index: 999;
       display: flex;
       flex-direction: column;
       width: $tp-relation-general-suggestion-list-sidebar-width;

package/lib/component/transaction-confirmation-details/style/_layout.scss

@@ -11,7 +11,6 @@
     .details-header {
       font-size: $tp-co-transaction-confirmation-details-title-font-size;
       margin: $tp-co-transaction-confirmation-details-title-margin;
-      height: 25px;
     }
 
     .header-left-text {
@@ -71,20 +70,5 @@
         float: left;
       }
     }
-
-    .header-inform-user {
-      height: 20px;
-      text-align: center;
-      visibility: hidden;
-
-      .editting {
-        border: 1px solid red;
-        border-radius: 20px;
-        padding: 2px;
-        text-align: center;
-        margin: auto;
-        visibility: hidden;
-      }
-    }
   }
 }

package/lib/component/transaction-confirmation-details/transaction-confirmation-details.component.d.ts

@@ -13,12 +13,8 @@ export declare class TransactionConfirmationDetailsComponent {
     showClass(): boolean;
     showAddOrder: boolean;
     newDocBatchArray: DocDeliveryBatch;
-    set isEditing(value: boolean);
-    get isEditing(): boolean;
     docBatchSaved: EventEmitter<boolean>;
-    isEditMode: boolean;
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService);
     addButtonClicked(): void;
     handleOkClick(): Promise<void>;
-    handleCancelClick(): void;
 }

package/lib/component/transaction-confirmation-history/style/_layout.scss

@@ -6,9 +6,5 @@
       height: 40%;
       width: 100%;
     }
-
-    .greyed-out {
-      background: grey;
-    }
   }
 }

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

@@ -17,4 +17,5 @@ export declare class TransactionHeaderDeliveryComponent extends TransactionBaseC
     constructor(iconService: IconCacheService, service: TransactionService, _dialogService: DialogService);
     showTheDeliveryMethodDialog(event: MouseEvent): void;
     transactionSet(): void;
+    changeDeliveryDateDefinitive(event: MouseEvent, definitive: boolean): void;
 }

package/lib/component/transaction-line-fields/transaction-line-supplier-button.component.d.ts

@@ -7,5 +7,6 @@ export declare class TransactionLineSupplierButtonComponent extends TransactionL
     showClass(): boolean;
     showDialogSupplier: boolean;
     constructor(_service: TransactionService, _relationService: RelationService);
+    handleOpenDialog(event: MouseEvent): void;
     transactionLineSet(): Promise<void>;
 }

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

@@ -19,7 +19,6 @@ export declare class TransactionLineSidePanelPurchaseComponent {
     goodsReceiptStatus: GoodsReceiptStatusWithHistory;
     selectedLineDocBatchArray: DocDeliveryBatch;
     isDocBatchSaved: boolean;
-    editingMode: boolean;
     private _transactionInfo;
     constructor(_service: TransactionService, _transactionEventService: TransactionEventService);
     getGoodsReceiptStatusWithHistory(): Promise<void>;

package/lib/component/transaction-search/transaction-filter-content/enum/search-placeholder.enum.d.ts

@@ -0,0 +1,25 @@
+export declare enum SearchPlaceholder {
+    ArticleNr = "SEARCH_ARTICLE_NR",
+    BatchNumber = "SEARCH_BATCH_NUMBER",
+    Branch = "SEARCH_BRANCH",
+    CommissionCode = "SEARCH_COMMISSION_CODE",
+    Confirmed = "SEARCH_CONFIRMED",
+    CustomerGroup = "SEARCH_CUSTOMER_GROUP",
+    CustomerName = "SEARCH_CUSTOMER_NAME",
+    Delivered = "SEARCH_DELIVERED",
+    DeliveryMethod = "SEARCH_DELIVERY_METHOD",
+    ExceedenceCode = "SEARCH_EXCEEDENCE_CODE",
+    Invoiced = "SEARCH_INVOICED",
+    MainArticle = "SEARCH_MAIN_ARTICLE",
+    OnHold = "SEARCH_ONHOLD",
+    OwnReference = "SEARCH_OWN_REFERENCE",
+    PurchaseNumber = "SEARCH_PURCHASENUMBER",
+    PurchasePerson = "SEARCH_PURCHASEPERSON",
+    SalesPerson = "SEARCH_SALESPERSON",
+    SerialNumber = "SEARCH_SERIAL_NUMBER",
+    SourceWarehouse = "SEARCH_SOURCE_WAREHOUSE",
+    Supplier = "SEARCH_SUPPLIER",
+    Tags = "SEARCH_TAGS",
+    TurnoverGroup = "SEARCH_TURNOVER_GROUP",
+    Warehouse = "SEARCH_WAREHOUSE"
+}

package/lib/component/transaction-search/transaction-filter-item/transaction-filter-item.component.d.ts

@@ -7,10 +7,10 @@ export declare class TransactionFilterItemComponent {
     customContent: boolean;
     singleSelect: boolean;
     minSearchCharsToLoadCollection: number;
+    searchCollectionPlaceholder: string;
     collectionLoadFn: Function;
     collectionChange: EventEmitter<any>;
     constructor(searchService: TransactionSearchService);
-    searchCollectionPlaceholder: string;
     searchPlaceholder: string;
     noResultsLabel: string;
     showMoreLabel: string;

package/lib/service/pending-reason.service.d.ts

@@ -8,12 +8,12 @@ import { ArticleConnectorService } from "./article-connector.service";
 import { ResolveHeaderPendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-header-pending-reason-request.bo";
 import { PurchasePortalLine } from "@colijnit/transactionapi/build/model/purchase-portal-line.bo";
 import { DocDeliveryBatch } from "@colijnit/transactionapi/build/model/doc-delivery-batch.bo";
-import { RelationAnyType } from "../model/relation-any-type";
 import { SharedService } from "@colijnit/sharedcomponents";
 import { DictionaryService } from "./dictionary.service";
 import { TransactionEventService } from "./transaction-event.service";
-import { RelationConnectorService } from "./relation-connector.service";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
+import { RelationService } from "./relation.service";
+import { Relation } from "@colijnit/relationapi/build/model/relation.bo";
 export declare class PendingReasonService {
     options: OptionsService;
     protected dialogService: DialogService;
@@ -22,22 +22,23 @@ export declare class PendingReasonService {
     protected articleConnector: ArticleConnectorService;
     protected dictionaryService: DictionaryService;
     protected transactionEventService: TransactionEventService;
-    protected relationConnector: RelationConnectorService;
+    protected relationService: RelationService;
     logout: Subject<void>;
     transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
-    relationUpdated: BehaviorSubject<RelationAnyType>;
+    relationUpdated: BehaviorSubject<Relation>;
     applicationUser: boolean;
     invoiceAddressSameAsDelivery: boolean;
     transactionKind: TransactionKind;
     currentTransaction: TransactionInfoResponse;
-    set relation(value: RelationAnyType);
-    get relation(): RelationAnyType;
+    set relation(value: Relation);
+    get relation(): Relation;
     purchasePortalLine: PurchasePortalLine[];
     docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
     private _relation;
-    constructor(options: OptionsService, dialogService: DialogService, connector: TransactionConnectorService, sharedService: SharedService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, relationConnector: RelationConnectorService);
+    constructor(options: OptionsService, dialogService: DialogService, connector: TransactionConnectorService, sharedService: SharedService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, relationService: RelationService);
     init(options: any): Promise<void>;
+    resetCurrentTransaction(): void;
     cancelAddTransactionLine(lineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
     handleHeaderOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;
     rememberCurrentTransaction(value: TransactionInfoResponse): Promise<void>;

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

@@ -30,5 +30,7 @@ export declare class RelationConnectorService {
     lockContactPerson(relationNr: number): Promise<ValidationResult>;
     insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
+    insertSupplier(relation: SupplierFullObject): Promise<SupplierFullObject>;
+    updateSupplier(relation: SupplierFullObject): Promise<SupplierFullObject>;
     private _handleExceptionFromResponse;
 }

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

@@ -10,23 +10,30 @@ import { SupplierFullObject } from "@colijnit/relationapi/build/model/supplier-f
 import { SelectSingleCacheService } from "../cache/service/select-single-cache.service";
 import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
 import { Relation } from "@colijnit/relationapi/build/model/relation.bo";
+import { RelationAnyType } from "@colijnit/relationapi/build/model/relation-any-type";
 export declare class RelationService {
     private _adapterService;
     private _selectMultipleCacheService;
     private _selectSingleCacheService;
     private _selectMultipleParameterizedCacheService;
     private readonly _lockMethods;
+    private readonly _getMethods;
     private readonly _updateMethods;
+    private readonly _insertMethods;
     constructor(_adapterService: RelationConnectorService, _selectMultipleCacheService: SelectMultipleCacheService, _selectSingleCacheService: SelectSingleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService);
     getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
     getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
     insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
+    insertSupplier(relation: SupplierFullObject): Promise<SupplierFullObject>;
+    updateSupplier(relation: SupplierFullObject): Promise<SupplierFullObject>;
     getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
     getRelationNumber(relationId: number): Promise<string>;
     getBranches(branchNr?: string): Promise<BranchLov[]>;
+    insertRelation(relationKind: RelationKind, relation: Relation): Promise<Relation>;
     updateRelation(relationKind: RelationKind, relation: Relation): Promise<Relation>;
     lockRelation(relationKind: RelationKind, relationNr: number): Promise<ValidationResult>;
+    getRelation(relationKind: RelationKind, relationNr: number): Promise<RelationAnyType>;
     commit(): Promise<boolean>;
     private _lockCustomerFullObject;
     private _lockSupplierFullObject;

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

@@ -149,6 +149,7 @@ export declare class TransactionConnectorAdapterService {
     changeHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
     changeHeaderInvoiceAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
     changeHeaderTransactionDeliveryDate(uuid: string, date: Date): Promise<TransactionInfoResponse>;
+    changeHeaderTransactionDeliveryDateDefinitive(uuid: string, definitive: boolean): Promise<TransactionInfoResponse>;
     changeHeaderTransactionRemark(uuid: string, remark: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionReference(uuid: string, reference: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionRelationReference(uuid: string, reference: string): Promise<TransactionInfoResponse>;

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

@@ -144,6 +144,7 @@ export declare class TransactionConnectorService {
     changeHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
     changeHeaderInvoiceAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
     changeHeaderTransactionDeliveryDate(uuid: string, date: Date): Promise<TransactionInfoResponse>;
+    changeHeaderTransactionDeliveryDateDefinitive(uuid: string, definitive: boolean): Promise<TransactionInfoResponse>;
     changeHeaderTransactionRemark(uuid: string, remark: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionReference(uuid: string, reference: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionRelationReference(uuid: string, reference: string): Promise<TransactionInfoResponse>;

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

@@ -70,6 +70,7 @@ export declare class TransactionService extends PendingReasonService {
     updateHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<boolean>;
     updateHeaderInvoiceAddress(uuid: string, newNawNr: number): Promise<boolean>;
     updateHeaderTransactionDeliveryDate(uuid: string, date: Date): Promise<boolean>;
+    updateHeaderTransactionDeliveryDateDefinitive(uuid: string, definitive: boolean): Promise<boolean>;
     updateHeaderTransactionRemark(uuid: string, remark: string): Promise<boolean>;
     updateHeaderTransactionReference(uuid: string, reference: string): Promise<boolean>;
     updateHeaderTransactionRelationReference(uuid: string, reference: string): Promise<boolean>;

package/lib/style/transaction-globals.scss

@@ -4,38 +4,6 @@
 
 @import "./variables";
 
-//$thumbColor: #484f60;
-//$trackColor: #e8eceb;
-//$stopPoint: 10%;
-//
-//.co-transaction-small-toolbar {
-//  overflow: auto;
-//  &::-webkit-scrollbar {
-//    -webkit-appearance: none;
-//  }
-//
-//  &::-webkit-scrollbar:vertical {
-//    width: 15px;
-//  }
-//
-//  &::-webkit-scrollbar:horizontal {
-//    height: 15px;
-//  }
-//
-//  &::-webkit-scrollbar-thumb:vertical {
-//    background: linear-gradient(to left, $thumbColor, $thumbColor $stopPoint, transparent $stopPoint, transparent);
-//  }
-//  &::-webkit-scrollbar-track:vertical {
-//    background: linear-gradient(to left, $trackColor, $trackColor $stopPoint, transparent $stopPoint, transparent);
-//  }
-//  &::-webkit-scrollbar-thumb:horizontal {
-//    background: linear-gradient(to top, $thumbColor, $thumbColor $stopPoint, transparent $stopPoint, transparent);
-//  }
-//  &::-webkit-scrollbar-track:horizontal {
-//    background: linear-gradient(to top, $trackColor, $trackColor $stopPoint, transparent $stopPoint, transparent);
-//  }
-//}
-
 .co-transaction-default-popup-row {
   display: flex;
   flex-direction: row;
@@ -88,17 +56,9 @@
   text-overflow: ellipsis;
 }
 
-//.co-transaction-dialog-header-title {
-//  font-size: $tp-transaction-dialog-header-title-font-size;
-//  margin: $tp-transaction-dialog-header-title-margin;
-//  font-weight: $tp-transaction-dialog-header-title-font-weight;
-//}
-//
-//.co-transaction-dialog-footer-button-wrapper {
-//  display: flex;
-//  justify-content: $tp-transaction-dialog-footer-justify-content;
-//  column-gap: $tp-transaction-dialog-footer-column-gap;
-//}
+.read-only {
+  cursor: default;
+}
 
 .transaction-line-button {
   font-size: $tp-transaction-line-button-font-size;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.72",
+  "version": "12.1.73",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -15,10 +15,10 @@
     "@colijnit/corecomponents_v12": ">=12.0.89",
     "@colijnit/ioneconnector": ">=2.1.10",
     "@colijnit/mainapi": ">=1.0.3",
-    "@colijnit/relationapi": ">=1.0.3",
+    "@colijnit/relationapi": ">=1.0.4",
     "@colijnit/sharedapi": ">=1.0.10",
     "@colijnit/sharedcomponents": ">=1.0.31",
-    "@colijnit/transactionapi": ">=1.1.59",
+    "@colijnit/transactionapi": ">=1.1.60",
     "@syncfusion/ej2-angular-buttons": ">=19.3.44",
     "@syncfusion/ej2-angular-calendars": ">=19.3.44",
     "@syncfusion/ej2-angular-dropdowns": ">=19.3.45",