@colijnit/transaction 12.1.59 → 12.1.61

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

@@ -1,16 +1,20 @@
 import { ElementRef } from "@angular/core";
 import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
-import { AddressType } from "@colijnit/transactionapi/build/enum/address-type.enum";
-import { RelationAnyType } from "@colijnit/transactionapi/build/model/relation-any-type";
 import { DictionaryService } from "../../../service/dictionary.service";
 import { TransactionService } from "../../../service/transaction.service";
-import { RelationKind } from "@colijnit/transactionapi/build/enum/relation-kind.enum";
-import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
 import { DialogService } from "../../../service/dialog.service";
+import { AddressType } from "@colijnit/relationapi/build/enum/address-type.enum";
+import { RelationAnyType } from "../../../model/relation-any-type";
+import { RelationKind } from "@colijnit/relationapi/build/enum/relation-kind.enum";
+import { RelationService } from "../../../service/relation.service";
+import { FormMasterService } from "@colijnit/corecomponents_v12";
+import { Address } from "@colijnit/relationapi/build/model/address.bo";
 export declare class TransactionHeaderRelationComponent extends TransactionBaseComponent {
     protected readonly service: TransactionService;
     private _dictionary;
     private _dialogService;
+    private _relationService;
+    private _formMasterService;
     readonly addressType: typeof AddressType;
     navigationItems: ElementRef;
     mainItems: ElementRef;
@@ -18,8 +22,8 @@ export declare class TransactionHeaderRelationComponent extends TransactionBaseC
     set relation(value: RelationAnyType);
     get relation(): RelationAnyType;
     showClass(): boolean;
-    deliveryAddressIdx: number;
-    invoiceAddressIdx: number;
+    deliveryAddressNawNr: number;
+    invoiceAddressNawNr: number;
     invoiceAddressSameAsDeliveryAddress: boolean;
     showDialog: boolean;
     categories: string[];
@@ -27,13 +31,14 @@ export declare class TransactionHeaderRelationComponent extends TransactionBaseC
     relationType: RelationKind;
     readonly: boolean;
     private _relation;
-    constructor(service: TransactionService, _dictionary: DictionaryService, _dialogService: DialogService);
-    updateRelation(rel: RelationAnyType): void;
-    setIndexDeliveryAddress(idx: number): void;
-    setIndexInvoiceAddress(idx: number): void;
+    private _boFactory;
+    constructor(service: TransactionService, _dictionary: DictionaryService, _dialogService: DialogService, _relationService: RelationService, _formMasterService: FormMasterService);
+    setIndexDeliveryAddress(nawNr: number): void;
+    setIndexInvoiceAddress(nawNr: number): void;
     checkSameAddress(checked: boolean): void;
     handleNavigationClick(nav: string): void;
-    handleChangeCustomGroup(group: CustomerGroup): void;
+    handleChangeCustomGroup(group: string): void;
     handleShowDialog(): Promise<void>;
-    relationSet(): void;
+    handleOkClick(): void;
+    saveAddress(type: AddressType, address: Address): void;
 }

package/lib/component/transaction-header-fields/transaction-header-administrative-relation.component.d.ts

@@ -1,11 +1,13 @@
 import { OnInit } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
-import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
+import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
+import { RelationService } from "../../service/relation.service";
 export declare class TransactionHeaderAdministrativeRelationComponent extends TransactionHeaderBaseComponent<RelationListObject> implements OnInit {
     private _transactionService;
+    private _relationService;
     fields: Object;
-    constructor(_transactionService: TransactionService);
+    constructor(_transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commitTransactionAdministrative(relations: number[]): Promise<boolean>;
     protected transactionInfoSet(): void;

package/lib/component/transaction-header-fields/transaction-header-branch.component.d.ts

@@ -1,13 +1,15 @@
 import { OnInit } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
-import { BranchLov } from "@colijnit/transactionapi/build/model/branch-lov.bo";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
-import { RelationSmallObject } from "@colijnit/transactionapi/build/model/relation-small-object.bo";
+import { BranchLov } from "@colijnit/relationapi/build/model/branch-lov.bo";
+import { RelationSmallObject } from "@colijnit/relationapi/build/model/relation-small-object.bo";
+import { RelationService } from "../../service/relation.service";
 export declare class TransactionHeaderBranchComponent extends TransactionHeaderBaseComponent<BranchLov> implements OnInit {
     private _transactionService;
+    private _relationService;
     simple: boolean;
     fields: Object;
-    constructor(_transactionService: TransactionService);
+    constructor(_transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commit(branch: number | RelationSmallObject): Promise<boolean>;
     protected transactionInfoSet(): void;

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

@@ -1,9 +1,11 @@
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionHeaderBaseComponent } from "../core/base/transaction-header-base.component";
+import { TransactionEventService } from "../../service/transaction-event.service";
 export declare class TransactionHeaderPartialDeliveryComponent extends TransactionHeaderBaseComponent<any> {
     private _transactionService;
+    private _eventService;
     showClass: boolean;
-    constructor(_transactionService: TransactionService);
+    constructor(_transactionService: TransactionService, _eventService: TransactionEventService);
     commitPartialDelivery(allow: boolean): Promise<boolean>;
     protected transactionInfoSet(): void;
 }

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

@@ -21,5 +21,8 @@
     .transaction-line-checkbox {
       place-self: center;
     }
+    .hidden {
+      visibility: hidden;
+    }
   }
 }

package/lib/component/transaction-line/transaction-base-line/style/_material-definition.scss

@@ -0,0 +1,6 @@
+$tp-transaction-delivery-line-delivered-primary-color: #e5f9f3 !default;
+$tp-transaction-delivery-line-delivered-secondary-color: #e4f9f3 !default;
+$tp-transaction-delivery-line-delivered-bold-color: #5fdcb3 !default;
+$tp-transaction-delivery-line-partially-delivered-primary-color: #feece3 !default;
+$tp-transaction-delivery-line-partially-delivered-secondary-color: #fde6db !default;
+$tp-transaction-delivery-line-partially-delivered-bold-color: #f8854c !default;

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

@@ -8,8 +8,9 @@ export declare class TransactionBaseLineComponent extends TransactionLinesLineBa
     service: TransactionService;
     iconCacheService: IconCacheService;
     private _transactionEventService;
-    checkbox: boolean;
     checkboxValue: boolean;
+    checkbox: boolean;
+    hideCheckbox: boolean;
     actionButtons: boolean;
     checkboxValueChanged: EventEmitter<boolean>;
     showClass(): boolean;

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

@@ -69,25 +69,31 @@
       }
     }
     .fully-delivered {
-      border-color: #e4f9f3;
-      background-color: #e5f9f3;
+      border-color: $tp-transaction-delivery-line-delivered-secondary-color;
+      background-color: $tp-transaction-delivery-line-delivered-primary-color;
 
       input {
-        color: #5fdcb3;
+        color: $tp-transaction-delivery-line-delivered-bold-color;
+      }
+      span {
+        color: $tp-transaction-delivery-line-delivered-bold-color;
       }
       co-icon [fill] {
-        fill: #5fdcb3 !important;
+        fill: $tp-transaction-delivery-line-delivered-bold-color;
       }
     }
     .partially-delivered {
-      border-color: #fde6db;
-      background-color: #feece3;
+      border-color: $tp-transaction-delivery-line-partially-delivered-secondary-color;
+      background-color: $tp-transaction-delivery-line-partially-delivered-primary-color;
 
       input {
-        color: #f8854c;
+        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
+      }
+      span {
+        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
       }
       co-icon [fill] {
-        fill: #f8854c !important;
+        fill: $tp-transaction-delivery-line-partially-delivered-bold-color;
       }
     }
     &.preview {

package/lib/component/transaction-line/transaction-order-delivery-line/service/transaction-order-delivery.service.d.ts

@@ -0,0 +1,4 @@
+export declare class TransactionOrderDeliveryService {
+    totalQuantityToDeliver: number;
+    totalAmountLeftInOrder: number;
+}

package/lib/component/transaction-line/transaction-order-delivery-line/style/_layout.scss

@@ -37,14 +37,14 @@
       }
     }
 
-    .transaction-line-totals {
+    .transaction-line-totals-custom-grid {
       display: grid;
-      grid-template-columns: 100px 100px 100px 100px 100px 100px;
+      grid-template-columns: 100px 100px 100px 100px 100px;
       grid-template-rows: 26px 26px;
       gap: 5px 15px;
       grid-template-areas:
-    ". . . . . ."
-    ". . . . . .";
+    ". . . .  ."
+    ". . . .  .";
     }
 
     .discount {

package/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.d.ts

@@ -3,18 +3,23 @@ import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction
 import { TransactionLinesLineBaseComponent } from "../../core/base/transaction-lines-line-base.component";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionEventService } from "../../../service/transaction-event.service";
+import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
+import { TransactionOrderDeliveryService } from "./service/transaction-order-delivery.service";
 export declare class TransactionOrderDeliveryLineComponent extends TransactionLinesLineBaseComponent implements OnInit, OnDestroy {
     service: TransactionService;
     private _transactionEventService;
+    private _transactionOrderDeliveryService;
     localAmount: number;
     splitDelivery: boolean;
-    allowPartialDelivery: boolean;
-    selected: boolean;
+    deliveryOrderStatus: DeliveryOrderStatus;
+    checkboxSelected: boolean;
     transactionKind: TransactionKind;
     private _subscriptions;
     showClass(): boolean;
-    constructor(service: TransactionService, _transactionEventService: TransactionEventService);
+    constructor(service: TransactionService, _transactionEventService: TransactionEventService, _transactionOrderDeliveryService: TransactionOrderDeliveryService);
     ngOnInit(): void;
     ngOnDestroy(): void;
-    changeLineAmount(amount: number): void;
+    getDeliveryOrderStatus(): void;
+    showNumberPicker(): boolean;
+    private _handleOrderStatusUpdated;
 }

package/lib/component/transaction-line-fields/transaction-line-commission-code.component.d.ts

@@ -1,6 +1,6 @@
 import { OnInit } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
-import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-value.bo";
+import { CoDomainValue } from "@colijnit/mainapi/build/model/co-domain-value.bo";
 import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
 export declare class TransactionLineCommissionCodeComponent extends TransactionFilterPopupBaseComponent<CoDomainValue> implements OnInit {
     private _transactionService;

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

@@ -1,9 +1,11 @@
 import { TransactionService } from "../../service/transaction.service";
 import { TransactionLineBaseComponent } from "../core/base/transaction-line-base.component";
+import { RelationService } from "../../service/relation.service";
 export declare class TransactionLineSupplierButtonComponent extends TransactionLineBaseComponent<number> {
     private _service;
+    private _relationService;
     showClass(): boolean;
     showDialogSupplier: boolean;
-    constructor(_service: TransactionService);
+    constructor(_service: TransactionService, _relationService: RelationService);
     transactionLineSet(): Promise<void>;
 }

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

@@ -1,13 +1,15 @@
 import { OnInit } from "@angular/core";
 import { TransactionService } from "../../service/transaction.service";
-import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
 import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
+import { RelationService } from "../../service/relation.service";
 export declare class TransactionLineSupplierComponent extends TransactionFilterPopupBaseComponent<RelationListObject> implements OnInit {
     private _transactionService;
+    private _relationService;
     protected codeField: string;
     protected checkField: string;
     protected propsForLabel: string[];
-    constructor(_transactionService: TransactionService);
+    constructor(_transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commit(id: number): Promise<boolean>;
     protected transactionLineSet(): void;

package/lib/component/transaction-lines/style/material.scss

@@ -4,6 +4,7 @@
 @import "../../../component/transaction-line/transaction-overview-line/style/material";
 @import "../../../component/transaction-line/transaction-base-line/style/material";
 @import "../../../component/transaction-line-image-and-description/style/material";
+@import "../../../component/editable-label/style/material";
 @import "../../../component/transaction-line/transaction-line/style/material";
 @import "../../../component/transaction-line/transaction-order-delivery-line/style/material";
 @import "../../../component/transaction-line/transaction-receive-goods-line/style/material";

package/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/style/_layout.scss

@@ -4,5 +4,9 @@
       display: flex;
       align-items: center;
     }
+
+    .hidden {
+      visibility: hidden;
+    }
   }
 }

package/lib/component/transaction-quick-access/transaction-quick-access-order-delivery/transaction-quick-access-order-delivery.component.d.ts

@@ -1,12 +1,19 @@
+import { OnDestroy } from "@angular/core";
 import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
 import { IconCacheService } from "../../../service/icon-cache.service";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionEventService } from "../../../service/transaction-event.service";
-export declare class TransactionQuickAccessOrderDeliveryComponent extends TransactionBaseComponent {
+import { TransactionOrderDeliveryService } from "../../transaction-line/transaction-order-delivery-line/service/transaction-order-delivery.service";
+export declare class TransactionQuickAccessOrderDeliveryComponent extends TransactionBaseComponent implements OnDestroy {
     iconService: IconCacheService;
-    protected service: TransactionService;
+    service: TransactionService;
     private _transactionEventService;
+    private _orderDeliveryService;
     showClass(): boolean;
-    constructor(iconService: IconCacheService, service: TransactionService, _transactionEventService: TransactionEventService);
+    allowDelivery: boolean;
+    private _subscriptions;
+    constructor(iconService: IconCacheService, service: TransactionService, _transactionEventService: TransactionEventService, _orderDeliveryService: TransactionOrderDeliveryService);
+    ngOnDestroy(): void;
+    ngAfterViewInit(): void;
     handleSelectAllLines(value: boolean): void;
 }

package/lib/component/transaction-search/style/_layout.scss

@@ -61,7 +61,7 @@
       }
     }
     & > co-icon-collapse-handle {
-      position: absolute !important;
+      position: absolute;
       flex-shrink: 0;
       top: 50vh;
       &.fullscreen {

package/lib/component/transaction-search/style/_material-definition.scss

@@ -64,8 +64,6 @@ $tp-co-transaction-search-input-text-sidebar-width: 250px !default;
 $tp-co-transaction-search-input-text-sidebar-height: 40px !default;
 $tp-co-transaction-search-input-text-sidebar-margin-top: 5px !default;
 $tp-co-transaction-search-input-text-label-margin-left: 5% !default;
-$tp-co-transaction-search-input-text-sidebar-label-relative-top: 20px !default;
-$tp-co-transaction-search-input-text-sidebar-input-margin-top: 13px !default;
 $tp-co-transaction-search-view-modes-wrapper-padding: 0 35px !default;
 
 $tp-transaction-tile-background-color: $tp-color-light  !default;

package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-article/transaction-purchase-order-filter-content-article.component.d.ts

@@ -3,10 +3,12 @@ import { TransactionService } from "../../../../../service/transaction.service";
 import { TransactionFilterContentBaseComponent } from "../../../../core/base/transaction-filter-content-base.component";
 import { FilterRequestService } from "../../../service/filter-request.service";
 import { TransactionSearchService } from "../../../service/transaction-search.service";
+import { RelationService } from "../../../../../service/relation.service";
 export declare class TransactionPurchaseOrderFilterContentArticleComponent extends TransactionFilterContentBaseComponent {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    private _relationService;
     showClass(): boolean;
     exceedanceCodes: FilterItemViewmodel[];
     exceedanceCodeFields: {
@@ -28,7 +30,7 @@ export declare class TransactionPurchaseOrderFilterContentArticleComponent exten
         text: any;
         value: any;
     };
-    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
+    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     getArticles: (text: string) => Promise<FilterItemViewmodel[]>;
     private _setExceedanceCodes;

package/lib/component/transaction-search/transaction-filter-content/purchase-order-filter-content/transaction-purchase-order-filter-content-order/transaction-purchase-order-filter-content-order.component.d.ts

@@ -3,10 +3,12 @@ import { TransactionService } from "../../../../../service/transaction.service";
 import { TransactionFilterContentBaseComponent } from "../../../../core/base/transaction-filter-content-base.component";
 import { FilterRequestService } from "../../../service/filter-request.service";
 import { TransactionSearchService } from "../../../service/transaction-search.service";
+import { RelationService } from "../../../../../service/relation.service";
 export declare class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFilterContentBaseComponent {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    relationService: RelationService;
     showClass(): boolean;
     purchasePersons: FilterItemViewmodel[];
     purchasePersonsFields: {
@@ -37,7 +39,7 @@ export declare class TransactionPurchaseOrderFilterContentOrderComponent extends
     transEndDate: Date;
     deliveryStartDate: Date;
     deliveryEndDate: Date;
-    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
+    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService, relationService: RelationService);
     ngOnInit(): void;
     private _setRangeDates;
     private _setPurchasePersons;

package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-article/transaction-sales-order-filter-content-article.component.d.ts

@@ -3,10 +3,12 @@ import { TransactionService } from "../../../../../service/transaction.service";
 import { TransactionFilterContentBaseComponent } from "../../../../core/base/transaction-filter-content-base.component";
 import { FilterRequestService } from "../../../service/filter-request.service";
 import { TransactionSearchService } from "../../../service/transaction-search.service";
+import { RelationService } from "../../../../../service/relation.service";
 export declare class TransactionSalesOrderFilterContentArticleComponent extends TransactionFilterContentBaseComponent {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    private _relationService;
     showClass(): boolean;
     exceedanceCodes: FilterItemViewmodel[];
     exceedanceCodeFields: {
@@ -28,7 +30,7 @@ export declare class TransactionSalesOrderFilterContentArticleComponent extends
         text: any;
         value: any;
     };
-    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
+    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     getArticles: (text: string) => Promise<FilterItemViewmodel[]>;
     private _setExceedanceCodes;

package/lib/component/transaction-search/transaction-filter-content/sales-order-filter-content/transaction-sales-order-filter-content-order/transaction-sales-order-filter-content-order.component.d.ts

@@ -3,10 +3,12 @@ import { TransactionService } from "../../../../../service/transaction.service";
 import { TransactionFilterContentBaseComponent } from "../../../../core/base/transaction-filter-content-base.component";
 import { FilterRequestService } from "../../../service/filter-request.service";
 import { TransactionSearchService } from "../../../service/transaction-search.service";
+import { RelationService } from "../../../../../service/relation.service";
 export declare class TransactionSalesOrderFilterContentOrderComponent extends TransactionFilterContentBaseComponent {
     searchService: TransactionSearchService;
     filterRequestService: FilterRequestService;
     transactionService: TransactionService;
+    relationService: RelationService;
     showClass(): boolean;
     salesPersons: FilterItemViewmodel[];
     salesPersonsFields: {
@@ -42,7 +44,7 @@ export declare class TransactionSalesOrderFilterContentOrderComponent extends Tr
     transEndDate: Date;
     deliveryStartDate: Date;
     deliveryEndDate: Date;
-    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService);
+    constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, transactionService: TransactionService, relationService: RelationService);
     ngOnInit(): void;
     loadCustomers: (nameFilter: string) => Promise<FilterItemViewmodel[]>;
     private _setRangeDates;

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

@@ -63,10 +63,6 @@
     }
 
     .transaction-search-general {
-
-      input {
-        margin-left: $tp-co-transaction-search-input-text-label-margin-left !important;
-      }
       co-input-text label {
         left: 0;
       }
@@ -84,12 +80,6 @@
           height: $tp-co-transaction-search-input-text-sidebar-height;
           transition: width 0.2s ease-in-out;
           margin-top: $tp-co-transaction-search-input-text-sidebar-margin-top;
-          label {
-            top: $tp-co-transaction-search-input-text-sidebar-label-relative-top;
-          }
-          input {
-            margin: $tp-co-transaction-search-input-text-sidebar-input-margin-top;
-          }
         }
       }
     }

package/lib/model/relation-any-type.d.ts

@@ -1,3 +1,3 @@
-import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
-import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
+import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
+import { SupplierFullObject } from "@colijnit/relationapi/build/model/supplier-full-object.bo";
 export declare type RelationAnyType = CustomerFullObject | SupplierFullObject;

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

@@ -5,11 +5,13 @@ import { ArticleExtendedRequest } from "@colijnit/articleapi/build/model/article
 import { ArticleLight } from "@colijnit/articleapi/build/model/article-light.bo";
 import { TurnoverGroupImage } from "@colijnit/articleapi/build/model/turnover-group-image.bo";
 import { MainArticle } from "@colijnit/articleapi/build/model/main-article.bo";
+import { TransactionEventService } from "./transaction-event.service";
 export declare class ArticleConnectorService {
     private _optionsService;
+    private _transactionEventService;
     connector: Articles;
     private _boFactory;
-    constructor(_optionsService: OptionsService);
+    constructor(_optionsService: OptionsService, _transactionEventService: TransactionEventService);
     connect(): Promise<void>;
     getWarehouseLocations(warehouseNr: number): Promise<StockLocation[]>;
     searchArticles(request: ArticleExtendedRequest): Promise<ArticleLight[]>;

package/lib/service/error.service.d.ts

@@ -1,6 +1,6 @@
 import { DialogService } from "./dialog.service";
-import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { DictionaryService } from "./dictionary.service";
+import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/data-service-response-data";
 export declare class ErrorService {
     private _dialogService;
     private _dictionaryService;

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

@@ -2,7 +2,6 @@ import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/tr
 import { OptionsService } from "./options.service";
 import { TransactionConnectorService } from "./transaction-connector.service";
 import { BehaviorSubject, Subject } from "rxjs";
-import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { DialogService } from "./dialog.service";
 import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
 import { ArticleConnectorService } from "./article-connector.service";
@@ -10,16 +9,19 @@ import { ResolveHeaderPendingReasonRequest } from "@colijnit/transactionapi/buil
 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 { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
+import { SharedService } from "@colijnit/sharedcomponents";
 import { DictionaryService } from "./dictionary.service";
 import { TransactionEventService } from "./transaction-event.service";
+import { RelationConnectorService } from "./relation-connector.service";
 export declare class PendingReasonService {
     protected dialogService: DialogService;
     protected options: OptionsService;
     protected connector: TransactionConnectorService;
+    protected sharedService: SharedService;
     protected articleConnector: ArticleConnectorService;
     protected dictionaryService: DictionaryService;
     protected transactionEventService: TransactionEventService;
+    protected relationConnector: RelationConnectorService;
     logout: Subject<void>;
     transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
     relationUpdated: BehaviorSubject<RelationAnyType>;
@@ -32,7 +34,7 @@ export declare class PendingReasonService {
     docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
     private _relation;
-    constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService);
+    constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, sharedService: SharedService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, relationConnector: RelationConnectorService);
     init(options: any): Promise<void>;
     cancelAddTransactionLine(lineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
     handleHeaderOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;
@@ -43,8 +45,6 @@ export declare class PendingReasonService {
     private _handleHeaderOperationStatus;
     resolvePendingLineReason(pendingLineValues: ResolveLinePendingReasonRequest): Promise<void>;
     resolvePendingHeaderReason(pendingHeaderValues: ResolveHeaderPendingReasonRequest): Promise<boolean>;
-    getCustomerFullObjectByRelationId(relationId: number): Promise<CustomerFullObject>;
-    getSupplierFullObjectByRelationId(relationId: number): Promise<SupplierFullObject>;
     private _confirmAction;
     private _showCharacteristicDialog;
     private _showWarehouseCcDialog;

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

@@ -0,0 +1,34 @@
+import { OptionsService } from "./options.service";
+import { RelationApi } from "@colijnit/relationapi";
+import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
+import { SupplierFullObject } from "@colijnit/relationapi/build/model/supplier-full-object.bo";
+import { ErrorService } from "./error.service";
+import { RelationRequest } from "@colijnit/relationapi/build/model/relation-request";
+import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
+import { BranchLov } from "@colijnit/relationapi/build/model/branch-lov.bo";
+import { ValidationResult } from "@colijnit/ioneconnector/build/model/validation-result";
+import { TransactionEventService } from "./transaction-event.service";
+export declare class RelationConnectorService {
+    private _optionsService;
+    private _errorService;
+    private _transactionEventService;
+    connector: RelationApi;
+    private _boFactory;
+    constructor(_optionsService: OptionsService, _errorService: ErrorService, _transactionEventService: TransactionEventService);
+    connect(): Promise<void>;
+    getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
+    getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
+    getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
+    getRelationNumber(relationId: number): Promise<string>;
+    getBranches(branchNr?: string): Promise<BranchLov[]>;
+    commit(): Promise<boolean>;
+    lockCustomerFullObject(relationNr: number): Promise<ValidationResult>;
+    lockSupplierFullObject(relationNr: number): Promise<ValidationResult>;
+    lockEmployeeFullObject(relationNr: number): Promise<ValidationResult>;
+    lockBranchFullObject(relationNr: number): Promise<ValidationResult>;
+    lockCompanyFullObject(relationNr: number): Promise<ValidationResult>;
+    lockContactPerson(relationNr: number): Promise<ValidationResult>;
+    insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
+    updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
+    private _handleExceptionFromResponse;
+}

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

@@ -0,0 +1,37 @@
+import { SelectMultipleCacheService } from "../cache/service/select-multiple-cache.service";
+import { RelationConnectorService } from "./relation-connector.service";
+import { RelationKind } from "@colijnit/articleapi/build/enum/relation-kind.enum";
+import { ValidationResult } from "@colijnit/ioneconnector/build/model/validation-result";
+import { CustomerFullObject } from "@colijnit/relationapi/build/model/customer-full-object.bo";
+import { RelationRequest } from "@colijnit/relationapi/build/model/relation-request";
+import { RelationListObject } from "@colijnit/relationapi/build/model/relation-list-object.bo";
+import { BranchLov } from "@colijnit/relationapi/build/model/branch-lov.bo";
+import { SupplierFullObject } from "@colijnit/relationapi/build/model/supplier-full-object.bo";
+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";
+export declare class RelationService {
+    private _adapterService;
+    private _selectMultipleCacheService;
+    private _selectSingleCacheService;
+    private _selectMultipleParameterizedCacheService;
+    private readonly _lockMethods;
+    private readonly _updateMethods;
+    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>;
+    getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
+    getRelationNumber(relationId: number): Promise<string>;
+    getBranches(branchNr?: string): Promise<BranchLov[]>;
+    updateRelation(relationKind: RelationKind, relation: Relation): Promise<Relation>;
+    lockRelation(relationKind: RelationKind, relationNr: number): Promise<ValidationResult>;
+    commit(): Promise<boolean>;
+    private _lockCustomerFullObject;
+    private _lockSupplierFullObject;
+    private _lockEmployeeFullObject;
+    private _lockBranchFullObject;
+    private _lockCompanyFullObject;
+    private _lockContactPerson;
+}