@colijnit/transaction 12.1.59 → 12.1.61

package/lib/service/shared.service.d.ts

@@ -2,11 +2,13 @@ import { OnDestroy } from "@angular/core";
 import { OptionsService } from "./options.service";
 import { SharedConnectorService } from "./shared-connector.service";
 import { CoDocument } from "@colijnit/sharedapi/build/model/co-document.bo";
+import { TransactionEventService } from "./transaction-event.service";
 export declare class SharedService implements OnDestroy {
     private _optionsService;
     private _connector;
+    private _transactionEventService;
     private _subs;
-    constructor(_optionsService: OptionsService, _connector: SharedConnectorService);
+    constructor(_optionsService: OptionsService, _connector: SharedConnectorService, _transactionEventService: TransactionEventService);
     ngOnDestroy(): void;
     selectDocsByTableKey(table: string, key: string): Promise<CoDocument[]>;
     getDocumentContent(docId: number, thumbnail?: boolean): Promise<string>;

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

@@ -1,24 +1,17 @@
 import { Marketing } from "@colijnit/transactionapi/build/model/marketing.bo";
-import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
 import { Country } from "@colijnit/transactionapi/build/model/country.bo";
-import { PrivacySetting } from "@colijnit/transactionapi/build/model/privacy-setting.bo";
-import { RelationPrivacySetting } from "@colijnit/transactionapi/build/model/relation-privacy-setting.bo";
 import { SequenceName } from "@colijnit/transactionapi/build/enum/sequence-name.enum";
 import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
 import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
 import { SetTransactionDeliveryOptionsRequest } from "@colijnit/transactionapi/build/model/set-transaction-delivery-options-request.bo";
 import { GetPostalCodeRetrievalOutputParams } from "@colijnit/transactionapi/build/model/get-postal-code-retrieval-output-params";
-import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
-import { RelationRequest } from "@colijnit/transactionapi/build/model/relation-request";
 import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
-import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-value.bo";
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
 import { TransactionResponseBase } from "@colijnit/transactionapi/build/model/transaction-response-base.bo";
 import { Transaction } from "@colijnit/transactionapi/build/transaction";
-import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { StandardText } from "../model/standard-text";
 import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
@@ -29,9 +22,6 @@ import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
 import { Vat } from "@colijnit/transactionapi/build/model/vat";
 import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
 import { TransactionSearchViewRequest } from "@colijnit/transactionapi/build/model/transaction-search-view-request";
-import { BranchLov } from "@colijnit/transactionapi/build/model/branch-lov.bo";
-import { SalesPerson } from "@colijnit/transactionapi/build/model/sales-person.bo";
-import { Tag } from "@colijnit/transactionapi/build/model/tag";
 import { OnHoldCode } from "@colijnit/transactionapi/build/model/on-hold-code.bo";
 import { Warehouse } from "@colijnit/transactionapi/build/model/warehouse.bo";
 import { CodeDescription } from "@colijnit/transactionapi/build/model/code-description";
@@ -48,17 +38,27 @@ import { PaymentLinkStatus } from "@colijnit/transactionapi/build/model/payment-
 import { SelectMultipleCacheService } from "../cache/service/select-multiple-cache.service";
 import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
 import { ErrorService } from "./error.service";
-import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
 import { GetPurchaseOrderConfirmation } from "@colijnit/transactionapi/build/model/get-purchase-order-confirmation";
 import { TransactionDownPaymentInfo } from "@colijnit/transactionapi/build/model/transaction-down-payment-info.bo";
 import { TransactionLockResult } from "@colijnit/transactionapi/build/model/transaction-lock-result.bo";
-import { ValidationResult } from "@colijnit/transactionapi/build/model/validation-result";
+import { PrivacySetting } from "@colijnit/mainapi/build/model/privacy-setting.bo";
+import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/data-service-response-data";
+import { RelationPrivacySetting } from "@colijnit/relationapi/build/model/relation-privacy-setting.bo";
+import { CoDomainValue } from "@colijnit/mainapi/build/model/co-domain-value.bo";
+import { Tag } from "@colijnit/mainapi/build/model/tag";
+import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
+import { SalesPerson } from "@colijnit/relationapi/build/model/sales-person.bo";
+import { StockStickersEmailLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-email-layouts.bo";
+import { StockStickersPrintLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-print-layouts.bo";
+import { Sharedapi } from "@colijnit/sharedapi/build/sharedapi";
+import { EmailOrderConfirmation } from "@colijnit/transactionapi/build/model/report/email-order-confirmation";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
     private _selectMultipleParameterizedCacheService;
     private _errorService;
     connector: Transaction;
+    sharedConnector: Sharedapi;
     private _boFactory;
     constructor(_optionsService: OptionsService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _errorService: ErrorService);
     connect(): Promise<void>;
@@ -75,10 +75,7 @@ export declare class TransactionConnectorAdapterService {
     getTransactionByNrAndKind(kind: TransactionKind, transactionNo: number): Promise<TransactionInfoResponse>;
     getTransactionById(transactionId: number): Promise<TransactionInfoResponse>;
     lockTransactionById(transactionId: number, version: number): Promise<TransactionLockResult>;
-    getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
-    getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
-    getRelationNumber(relationId: number): Promise<string>;
     getPriceLists(code?: string): Promise<PriceList[]>;
     getVatList(onlyValid?: boolean): Promise<Vat[]>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
@@ -86,21 +83,17 @@ export declare class TransactionConnectorAdapterService {
     getDeliveryMethods(): Promise<DeliveryMethod[]>;
     getDeliveryOptions(): Promise<DeliveryOption[]>;
     getPostalCodeRetrieval(postcalCode: string, houseNo: string): Promise<GetPostalCodeRetrievalOutputParams>;
-    getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
     getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;
     getInOutCollection(languageCode: string): Promise<CoDomainValue[]>;
     getTransactionArticleWarehouses(goodId: number): Promise<TransactionArticleWarehouse[]>;
     getTextTypes(languageCode: string): Promise<CoDomainValue[]>;
     getStandardTexts(languageCode: string): Promise<StandardText[]>;
-    getBranches(branchNr?: string): Promise<BranchLov[]>;
     getSalesPersons(date?: Date): Promise<SalesPerson[]>;
     getTags(category: number): Promise<Tag[]>;
     getOnHoldCodes(): Promise<OnHoldCode[]>;
     getWarehouses(branchNr?: string): Promise<Warehouse[]>;
     getHistoricStateValues(): Promise<CodeDescription[]>;
     getPaymentMethods(): Promise<PaymentMethod[]>;
-    insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
-    updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     commit(): Promise<DataServiceResponseData>;
     createTransaction(kind: TransactionKind, branchNr: string): Promise<TransactionInfoResponse>;
     saveTransaction(uuid: string): Promise<TransactionInfoResponse>;
@@ -161,12 +154,10 @@ export declare class TransactionConnectorAdapterService {
     updatePurchasePortalLines(purchasePortalLine: PurchasePortalLine): Promise<DataServiceResponseData>;
     purchaseOrderConfirmation(purchaseOrderConfirmation: GetPurchaseOrderConfirmation): Promise<DataServiceResponseData>;
     lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
+    getPurchaseOrderEmailLayouts(transactionUUID: string): Promise<StockStickersEmailLayouts[]>;
+    emailOrderConfirmation(emailOrderConfirmation: EmailOrderConfirmation): Promise<boolean>;
+    getStockStickerTemplates(data: StockStickersPrintLayouts): Promise<StockStickersPrintLayouts[]>;
     generateCommissionOrders(transId: number, onlyGenerateForDirectSellSuppliers: boolean): 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>;
+    getDeliveryOrderStatus(transId: number, lineNr: number): Promise<DeliveryOrderStatus>;
     private _handleExceptionFromResponse;
 }

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

@@ -1,23 +1,16 @@
 import { Marketing } from "@colijnit/transactionapi/build/model/marketing.bo";
-import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
 import { Country } from "@colijnit/transactionapi/build/model/country.bo";
-import { PrivacySetting } from "@colijnit/transactionapi/build/model/privacy-setting.bo";
-import { RelationPrivacySetting } from "@colijnit/transactionapi/build/model/relation-privacy-setting.bo";
 import { SequenceName } from "@colijnit/transactionapi/build/enum/sequence-name.enum";
 import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
 import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
 import { SetTransactionDeliveryOptionsRequest } from "@colijnit/transactionapi/build/model/set-transaction-delivery-options-request.bo";
 import { GetPostalCodeRetrievalOutputParams } from "@colijnit/transactionapi/build/model/get-postal-code-retrieval-output-params";
-import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
-import { RelationRequest } from "@colijnit/transactionapi/build/model/relation-request";
 import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
-import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-value.bo";
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
 import { TransactionResponseBase } from "@colijnit/transactionapi/build/model/transaction-response-base.bo";
-import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { StandardText } from "../model/standard-text";
 import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
@@ -27,9 +20,6 @@ import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
 import { Vat } from "@colijnit/transactionapi/build/model/vat";
 import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
 import { TransactionSearchViewRequest } from "@colijnit/transactionapi/build/model/transaction-search-view-request";
-import { BranchLov } from "@colijnit/transactionapi/build/model/branch-lov.bo";
-import { SalesPerson } from "@colijnit/transactionapi/build/model/sales-person.bo";
-import { Tag } from "@colijnit/transactionapi/build/model/tag";
 import { OnHoldCode } from "@colijnit/transactionapi/build/model/on-hold-code.bo";
 import { Warehouse } from "@colijnit/transactionapi/build/model/warehouse.bo";
 import { CodeDescription } from "@colijnit/transactionapi/build/model/code-description";
@@ -47,10 +37,18 @@ import { SelectMultipleCacheService } from "../cache/service/select-multiple-cac
 import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
 import { TransactionConnectorAdapterService } from "./transaction-connector-adapter.service";
 import { SelectSingleCacheService } from "../cache/service/select-single-cache.service";
-import { SupplierFullObject } from "@colijnit/transactionapi/build/model/supplier-full-object.bo";
 import { GetPurchaseOrderConfirmation } from "@colijnit/transactionapi/build/model/get-purchase-order-confirmation";
 import { TransactionLockResult } from "@colijnit/transactionapi/build/model/transaction-lock-result.bo";
-import { ValidationResult } from "@colijnit/transactionapi/build/model/validation-result";
+import { PrivacySetting } from "@colijnit/mainapi/build/model/privacy-setting.bo";
+import { RelationPrivacySetting } from "@colijnit/relationapi/build/model/relation-privacy-setting.bo";
+import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/data-service-response-data";
+import { CoDomainValue } from "@colijnit/mainapi/build/model/co-domain-value.bo";
+import { SalesPerson } from "@colijnit/relationapi/build/model/sales-person.bo";
+import { Tag } from "@colijnit/mainapi/build/model/tag";
+import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
+import { StockStickersEmailLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-email-layouts.bo";
+import { StockStickersPrintLayouts } from "@colijnit/sharedapi/build/model/report/stock-stickers-print-layouts.bo";
+import { EmailOrderConfirmation } from "@colijnit/transactionapi/build/model/report/email-order-confirmation";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -74,22 +72,16 @@ export declare class TransactionConnectorService {
     lockTransactionById(transId: number, version: number): Promise<TransactionLockResult>;
     commit(): Promise<DataServiceResponseData>;
     saveTransaction(uuid: string): Promise<TransactionInfoResponse>;
-    getCustomerFullObject(relationNo: number): Promise<CustomerFullObject>;
-    getSupplierFullObject(relationNo: number): Promise<SupplierFullObject>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
-    getRelationNumber(relationId: number): Promise<string>;
     getPriceLists(code?: string): Promise<PriceList[]>;
     getVatList(onlyValid?: boolean): Promise<Vat[]>;
     searchTransactions(request: TransactionSearchViewRequest): Promise<TransactionSearchResult>;
     getSequenceValue(sequenceName: SequenceName): Promise<number>;
-    insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
-    updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     getDeliveryMethods(): Promise<DeliveryMethod[]>;
     getDeliveryOptions(): Promise<DeliveryOption[]>;
     addRelationToTransaction(uuid: string, relationId: number): Promise<TransactionInfoResponse>;
     setTransactionDeliveryOptions(transactionDeliveryOptionsRequest: SetTransactionDeliveryOptionsRequest): Promise<TransactionResponseBase>;
     getPostalCodeRetrieval(postcalCode: string, houseNo: string): Promise<GetPostalCodeRetrievalOutputParams>;
-    getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
     addTransactionLine(uuid: string, articleLine: TransactionLineType, articleNo: string, amount: number, warehouseNo: number, commissionCode: string, isReturn: boolean, aboveLineNr: number, belowLineNr: number): Promise<TransactionInfoResponse>;
     addTextLineToTransaction(uuid: string, showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
     changeLineSequence(uuid: string, lineUuid: string, aboveLineNr?: number, belowLineNr?: number): Promise<TransactionInfoResponse>;
@@ -104,7 +96,6 @@ export declare class TransactionConnectorService {
     setRelationByUser(uuid: string, username: string, password: string): Promise<boolean>;
     getTextTypes(languageCode: string): Promise<CoDomainValue[]>;
     getStandardTexts(languageCode: string): Promise<StandardText[]>;
-    getBranches(branchNr?: string): Promise<BranchLov[]>;
     getSalesPersons(date?: Date): Promise<SalesPerson[]>;
     getTags(category: number): Promise<Tag[]>;
     getOnHoldCodes(): Promise<OnHoldCode[]>;
@@ -156,10 +147,8 @@ export declare class TransactionConnectorService {
     purchaseOrderConfirmation(purchaseOrderConfirmation: GetPurchaseOrderConfirmation): Promise<DataServiceResponseData>;
     lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
     generateCommissionOrders(transId: number, onlyGenerateForDirectSellSuppliers: boolean): 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>;
+    getDeliveryOrderStatus(transId: number, lineId: number): Promise<DeliveryOrderStatus>;
+    getPurchaseOrderEmailLayouts(transactionUUID: string): Promise<StockStickersEmailLayouts[]>;
+    emailOrderConfirmation(emailOrderConfirmation: EmailOrderConfirmation): Promise<boolean>;
+    getStockStickerTemplates(data: StockStickersPrintLayouts): Promise<StockStickersPrintLayouts[]>;
 }

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

@@ -1,9 +1,9 @@
-import { Subject } from "rxjs";
-import { BusinessObject } from "@colijnit/transactionapi/build/model/business-object";
+import { BehaviorSubject, Subject } from "rxjs";
 import { PositionGridRow } from "../enum/position-grid-row.enum";
 import { Scroll } from "@angular/router";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
+import { BusinessObject } from "@colijnit/ioneconnector/build/model/business-object";
 export declare class TransactionEventService {
     readonly addToCartBySku: Subject<{
         sku: string;
@@ -64,4 +64,6 @@ export declare class TransactionEventService {
     readonly openSidePanel: Subject<TransactionLineInfo>;
     readonly selectAllSalesOrderLinesForPurchase: Subject<boolean>;
     readonly generateCommissionOrders: Subject<boolean>;
+    readonly allowPartialDeliveryChanged: Subject<boolean>;
+    readonly connectionInitialized: BehaviorSubject<boolean>;
 }

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

@@ -1,30 +1,20 @@
 import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
 import { TransactionLineType } from "@colijnit/transactionapi/build/enum/transaction-line-type.enum";
 import { ArticleFullObject } from "@colijnit/transactionapi/build/model/article-full-object";
-import { BranchLov } from "@colijnit/transactionapi/build/model/branch-lov.bo";
 import { CashRegister } from "@colijnit/transactionapi/build/model/cash-register";
-import { CoDomainValue } from "@colijnit/transactionapi/build/model/co-domain-value.bo";
 import { CodeDescription } from "@colijnit/transactionapi/build/model/code-description";
 import { Country } from "@colijnit/transactionapi/build/model/country.bo";
-import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { CustomerGroup } from "@colijnit/transactionapi/build/model/customer-group.bo";
-import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
 import { DeliveryMethod } from "@colijnit/transactionapi/build/model/delivery-method.bo";
 import { DeliveryOption } from "@colijnit/transactionapi/build/model/delivery-option.bo";
 import { LineOperationStatus } from "@colijnit/transactionapi/build/model/line-operation-status.bo";
 import { Marketing } from "@colijnit/transactionapi/build/model/marketing.bo";
 import { OnHoldCode } from "@colijnit/transactionapi/build/model/on-hold-code.bo";
 import { PriceList } from "@colijnit/transactionapi/build/model/price-list";
-import { RelationListObject } from "@colijnit/transactionapi/build/model/relation-list-object.bo";
-import { RelationPrivacySetting } from "@colijnit/transactionapi/build/model/relation-privacy-setting.bo";
-import { RelationRequest } from "@colijnit/transactionapi/build/model/relation-request";
-import { SalesPerson } from "@colijnit/transactionapi/build/model/sales-person.bo";
-import { Tag } from "@colijnit/transactionapi/build/model/tag";
 import { TransactionArticleWarehouse } from "@colijnit/transactionapi/build/model/transaction-article-warehouse.bo";
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionSearchViewRequest } from "@colijnit/transactionapi/build/model/transaction-search-view-request";
-import { ValidationResult } from "@colijnit/transactionapi/build/model/validation-result";
 import { Vat } from "@colijnit/transactionapi/build/model/vat";
 import { Warehouse } from "@colijnit/transactionapi/build/model/warehouse.bo";
 import { StandardText } from "../model/standard-text";
@@ -41,9 +31,13 @@ import { PurchasePortalLine } from "@colijnit/transactionapi/build/model/purchas
 import { TransactionSearchResult } from "../model/transaction-search-result";
 import { GetPurchaseOrderConfirmation } from "@colijnit/transactionapi/build/model/get-purchase-order-confirmation";
 import { TransactionLockResult } from "@colijnit/transactionapi/build/model/transaction-lock-result.bo";
-import { RelationKind } from "@colijnit/transactionapi/build/enum/relation-kind.enum";
+import { DataServiceResponseData } from "@colijnit/ioneconnector/build/model/data-service-response-data";
+import { Tag } from "@colijnit/mainapi/build/model/tag";
+import { CoDomainValue } from "@colijnit/mainapi/build/model/co-domain-value.bo";
+import { RelationPrivacySetting } from "@colijnit/relationapi/build/model/relation-privacy-setting.bo";
+import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
+import { SalesPerson } from "@colijnit/relationapi/build/model/sales-person.bo";
 export declare class TransactionService extends PendingReasonService {
-    private readonly _lockMethods;
     pendingLineOperationStatus(lineOperationStatuses: LineOperationStatus[]): LineOperationStatus | undefined;
     updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
     updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;
@@ -82,7 +76,7 @@ export declare class TransactionService extends PendingReasonService {
     getArticleBoundTextLinesOfArticleLine(articleLineUuid: string): Promise<TransactionLineInfo[]>;
     createTransaction(): Promise<boolean>;
     getTransactionById(transactionId: number): Promise<boolean>;
-    lockRelation(relationKind: RelationKind, relationNr: number): Promise<ValidationResult>;
+    tryToLockTransaction(id: number, version: number): Promise<boolean>;
     lockTransaction(transId: number, version: number): Promise<TransactionLockResult>;
     commit(): Promise<DataServiceResponseData>;
     saveTransaction(close?: boolean): Promise<TransactionInfoResponse>;
@@ -94,11 +88,9 @@ export declare class TransactionService extends PendingReasonService {
     getMarketingCodes(): Promise<Marketing[]>;
     getArticles(request: ArticleExtendedRequest): Promise<ArticleLight[]>;
     getMainArticles(): Promise<MainArticle[]>;
-    insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
-    updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     getDeliveryMethods(): Promise<DeliveryMethod[]>;
     getDeliveryOptions(): Promise<DeliveryOption[]>;
-    getRelationListObjects(relationRequest: RelationRequest): Promise<RelationListObject[]>;
+    getSalesPersons(date?: Date): Promise<SalesPerson[]>;
     addArticle(articleNo: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number): Promise<boolean>;
     addTransactionLine(lineType: TransactionLineType, articleNo: string, amount: number, warehouseNo?: number, commissionCode?: string, isReturn?: boolean, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
     addTextLine(showOnDocuments: number, text: string, amount: number, articleBound: boolean, refArticleLineNr: number, aboveLineNr?: number, belowLineNr?: number, remember?: boolean): Promise<TransactionInfoResponse>;
@@ -117,11 +109,8 @@ export declare class TransactionService extends PendingReasonService {
     getGoodIdFromArticleNr(sku: string): Promise<number>;
     getCountry(countryCode: string): Promise<Country>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
-    getRelationNumber(relationId: number): Promise<string>;
     getPriceLists(): Promise<PriceList[]>;
     getVatLists(): Promise<Vat[]>;
-    getBranches(branchNr?: string): Promise<BranchLov[]>;
-    getSalesPersons(date?: Date): Promise<SalesPerson[]>;
     getTags(category: number): Promise<Tag[]>;
     getOnHoldCodes(): Promise<OnHoldCode[]>;
     getWarehouses(branchNr?: string): Promise<Warehouse[]>;
@@ -131,11 +120,6 @@ export declare class TransactionService extends PendingReasonService {
     purchaseOrderConfirmation(purchaseOrderConfirmation: GetPurchaseOrderConfirmation): Promise<DataServiceResponseData>;
     updatePurchasePortalLines(purchasePortalLine: PurchasePortalLine): Promise<DataServiceResponseData>;
     lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
+    getDeliveryOrderStatus(transId: number, lineId: number): Promise<DeliveryOrderStatus>;
     private _checkAndCreateTransaction;
-    private _lockCustomerFullObject;
-    private _lockSupplierFullObject;
-    private _lockEmployeeFullObject;
-    private _lockBranchFullObject;
-    private _lockCompanyFullObject;
-    private _lockContactPerson;
 }

package/lib/style/_variables.scss

@@ -94,34 +94,34 @@ $tp-transaction-dialog-footer-justify-content: center !default;
 $tp-transaction-dialog-footer-column-gap: 10px !default;
 
 /* core components override */
-$cc-color-action: $tp-color-font;
-$cc-btn-color: $tp-color-action;
-$cc-checkbox-border-radius: 7px;
-$cc-checkbox-check-background-color: white;
-$cc-checkbox-check-border-color: #5FDCB3;
-$cc-checkbox-check-color: #5FDCB3;
-$cc-radio-button-height: 32px;
-$cc-item-size: 40px;
+$cc-color-action: $tp-color-font !default;
+$cc-btn-color: $tp-color-action !default;
+$cc-checkbox-border-radius: 7px !default;
+$cc-checkbox-check-background-color: white !default;
+$cc-checkbox-check-border-color: #5FDCB3 !default;
+$cc-checkbox-check-color: #5FDCB3 !default;
+$cc-radio-button-height: 32px !default;
+$cc-item-size: 50px !default;
 
-$cc-co-dialog-header-text-color: $tp-color-font;
-$cc-co-dialog-header-padding: 0 0 20px 0;
-$cc-co-dialog-header-margin: 0 0 20px 0;
-$cc-co-dialog-padding: 30px 30px 60px 30px;
+$cc-co-dialog-header-text-color: $tp-color-font !default;
+$cc-co-dialog-header-padding: 0 0 20px 0 !default;
+$cc-co-dialog-header-margin: 0 0 20px 0 !default;
+$cc-co-dialog-padding: 30px 30px 60px 30px !default;
 
-$cc-btn-border-radius: 5px;
-$cc-btn-height: 36px;
+$cc-btn-border-radius: 5px !default;
+$cc-btn-height: 36px !default;
 
-$cc-co-dialog-header-close-button-background-color: $tp-color-action;
+$cc-co-dialog-header-close-button-background-color: $tp-color-action !default;
 
-$cc-collapsible-content-padding: 10px 0px 0px 0px;
+$cc-collapsible-content-padding: 10px 0px 0px 0px !default;
 
-$cc-co-commit-buttons-button-background: none;
+$cc-co-commit-buttons-button-background: none !default;
 
-$cc-simple-grid-header-border-color: white;
-$cc-simple-grid-header-font-size: 11px;
-$cc-simple-grid-cell-padding: 0 5px;
-$cc-simple-grid-row-selected-background-color: #f0f5ff;
-$cc-simple-grid-row-height: 60px;
+$cc-simple-grid-header-border-color: white !default;
+$cc-simple-grid-header-font-size: 11px !default;
+$cc-simple-grid-cell-padding: 0 5px !default;
+$cc-simple-grid-row-selected-background-color: #f0f5ff !default;
+$cc-simple-grid-row-height: 60px !default;
 
-$cc-co-carousel-padding: 10px 20px;
+$cc-co-carousel-padding: 10px 20px !default;
 /****************************/

package/package.json

@@ -1,13 +1,19 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.59",
+  "version": "12.1.61",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.0",
     "@angular/core": "^12.2.0",
-    "@colijnit/corecomponents_v12": ">=12.0.77",
-    "@colijnit/transactionapi": ">=1.1.48",
+    "@colijnit/articleapi": ">=1.0.15",
+    "@colijnit/corecomponents_v12": ">=12.0.81",
+    "@colijnit/ioneconnector": ">=2.1.8",
+    "@colijnit/mainapi": ">=1.0.2",
+    "@colijnit/relationapi": ">=1.0.2",
+    "@colijnit/sharedapi": ">=1.0.10",
+    "@colijnit/sharedcomponents": ">=1.0.28",
+    "@colijnit/transactionapi": ">=1.1.54",
     "@syncfusion/ej2-angular-buttons": ">=19.3.44",
     "@syncfusion/ej2-angular-calendars": ">=19.3.44",
     "@syncfusion/ej2-angular-dropdowns": ">=19.3.45",

package/esm2015/lib/factory/business-object-factory.js

@@ -1,120 +0,0 @@
-import { ComplexFieldDecorator } from "./decorators/complex-field.decorator";
-import { ComplexArrayDecorator } from "./decorators/complex-array.decorator";
-import { BooleanTextDecorator } from "./decorators/boolean.decorator";
-import { DateFieldFieldDecorator } from "./decorators/date-field.decorator";
-import { StringNumberDecorator } from "./decorators/string-number.decorator";
-import { isNill } from "../utils/is-nill.function";
-import { ArrayUtils } from "../utils/array-utils";
-import { BusinessObject } from "../model/business-object";
-// Factory service creates businessobjects, using their decorators in the process.
-export class BusinessObjectFactory {
-    constructor() {
-    }
-    /**
-     * Creates and returns a new business data object instance of given class, with all given data properties applied to it in a
-     * complex-aware style. That is, all properties on given class that are decorated with @ComplexField(..) or @ComplexArray(..) decorators
-     * become strongly typed business objects, with methods that are usable and such.
-     *
-     * @param modelClass
-     * @param {Object} rawData The object with all (possibly raw/flat/not alive) data to be applied to the created model object
-     */
-    makeWithRawBackendData(modelClass, rawData) {
-        if (!modelClass) {
-            return undefined;
-        }
-        if (typeof modelClass !== typeof BusinessObject) {
-            return undefined;
-        }
-        const model = new modelClass();
-        this._copyAllPropertiesDecoratorProcessedFrom(rawData, model);
-        return model;
-    }
-    // see makeWithRawBackendData, this is a loop-wrapper around that method
-    makeBOArrayFromRawBackendDataArray(modelClass, arrayOfRawDatas) {
-        if (!modelClass) {
-            return undefined;
-        }
-        const trueClientBos = [];
-        if (arrayOfRawDatas) {
-            for (let i = 0, len = arrayOfRawDatas.length; i < len; i++) {
-                trueClientBos.push(this.makeWithRawBackendData(modelClass, arrayOfRawDatas[i]));
-            }
-        }
-        return trueClientBos;
-    }
-    instantiateNewBo(modelClass) {
-        return this.makeWithRawBackendData(modelClass, {});
-    }
-    /**
-     * Applies all properties of given 'source' object to the given 'destination' businessobject, if destination has that property.
-     * Works with the @ComplexField(), @ComplexArray, @BooleanText, @CoInject and @DateField annotations of given destination model.
-     *
-     * @param sourceData Raw data to copy to destination model
-     * @param {BusinessObject} destinationModel InOut: The annotated businessobject to apply source properties to
-     */
-    _copyAllPropertiesDecoratorProcessedFrom(sourceData, destinationModel) {
-        if (!sourceData || !destinationModel) {
-            return;
-        }
-        // process all source data into destinationModel
-        for (const srcPropKey in sourceData) {
-            if (!sourceData.hasOwnProperty(srcPropKey)) {
-                continue;
-            }
-            const srcPropVal = sourceData[srcPropKey];
-            if (ComplexFieldDecorator.IsComplexField(destinationModel, srcPropKey)) {
-                const classOfField = ComplexFieldDecorator.GetComplexFieldType(destinationModel, srcPropKey);
-                destinationModel[srcPropKey] = this.makeWithRawBackendData(classOfField, srcPropVal);
-            }
-            else if (ComplexArrayDecorator.IsComplexArray(destinationModel, srcPropKey)) {
-                const sourceArray = srcPropVal;
-                if (!sourceArray) {
-                    continue;
-                }
-                const classOfArrayItems = ComplexArrayDecorator.GetComplexArrayType(destinationModel, srcPropKey);
-                const tempArray = [];
-                for (let i = 0, len = sourceArray.length; i < len; i++) {
-                    tempArray.push(this.makeWithRawBackendData(classOfArrayItems, sourceArray[i]));
-                }
-                destinationModel[srcPropKey] = tempArray;
-            }
-            else if (BooleanTextDecorator.IsBooleanTextField(destinationModel, srcPropKey)) {
-                // logical 'true' and 'false' also allowed as incoming values for @BooleanText() properties: then just copy their value
-                if (typeof srcPropVal === "boolean") {
-                    destinationModel[srcPropKey] = srcPropVal;
-                    // here, it should be a 'J' or 'N' (or 'T' or 'F'): assign the associated boolean value
-                }
-                else {
-                    destinationModel[srcPropKey] = BooleanTextDecorator.GetLogicalBooleanValue(srcPropVal);
-                }
-            }
-            else if (DateFieldFieldDecorator.IsDateField(destinationModel, srcPropKey)) {
-                destinationModel[srcPropKey] = DateFieldFieldDecorator.StringAsDate(srcPropVal);
-            }
-            else if (StringNumberDecorator.IsStringNumber(destinationModel, srcPropKey)) {
-                destinationModel[srcPropKey] = StringNumberDecorator.StringAsNumber(srcPropVal);
-            }
-            // non-decorated prop
-            else {
-                if (isNill(srcPropVal)) {
-                    destinationModel[srcPropKey] = undefined;
-                }
-                else if (Array.isArray(srcPropVal)) {
-                    destinationModel[srcPropKey] = ArrayUtils.CloneArray(srcPropVal);
-                }
-                else if (typeof srcPropVal === "object") {
-                    if (srcPropVal instanceof Map) { //just copy the value in case of maps
-                        destinationModel[srcPropKey] = srcPropVal;
-                    }
-                    else {
-                        destinationModel[srcPropKey] = Object.assign({}, srcPropVal);
-                    }
-                }
-                else {
-                    destinationModel[srcPropKey] = srcPropVal;
-                }
-            }
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"business-object-factory.js","sourceRoot":"","sources":["../../../../../projects/transaction/src/lib/factory/business-object-factory.ts"],"names":[],"mappings":"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","sourcesContent":["import {ComplexFieldDecorator} from \"./decorators/complex-field.decorator\";\r\nimport {ComplexArrayDecorator} from \"./decorators/complex-array.decorator\";\r\nimport {BooleanTextDecorator} from \"./decorators/boolean.decorator\";\r\nimport {DateFieldFieldDecorator} from \"./decorators/date-field.decorator\";\r\nimport {StringNumberDecorator} from \"./decorators/string-number.decorator\";\r\nimport {isNill} from \"../utils/is-nill.function\";\r\nimport {ArrayUtils} from \"../utils/array-utils\";\r\nimport {BusinessObject} from \"../model/business-object\";\r\n\r\n// Factory service creates businessobjects, using their decorators in the process.\r\nexport class BusinessObjectFactory {\r\n    constructor() {\r\n    }\r\n\r\n    /**\r\n     * Creates and returns a new business data object instance of given class, with all given data properties applied to it in a\r\n     * complex-aware style. That is, all properties on given class that are decorated with @ComplexField(..) or @ComplexArray(..) decorators\r\n     * become strongly typed business objects, with methods that are usable and such.\r\n     *\r\n     * @param modelClass\r\n     * @param {Object} rawData The object with all (possibly raw/flat/not alive) data to be applied to the created model object\r\n     */\r\n    public makeWithRawBackendData(modelClass: any, rawData: Object): BusinessObject {\r\n        if (!modelClass) {\r\n            return undefined;\r\n        }\r\n        if (typeof modelClass !== typeof BusinessObject) {\r\n            return undefined;\r\n        }\r\n\r\n        const model: BusinessObject = new modelClass();\r\n        this._copyAllPropertiesDecoratorProcessedFrom(rawData, model);\r\n        return model;\r\n    }\r\n\r\n    // see makeWithRawBackendData, this is a loop-wrapper around that method\r\n    public makeBOArrayFromRawBackendDataArray(modelClass: any, arrayOfRawDatas: Object[]): BusinessObject[] {\r\n        if (!modelClass) {\r\n            return undefined;\r\n        }\r\n\r\n        const trueClientBos: BusinessObject[] = [];\r\n        if (arrayOfRawDatas) {\r\n            for (let i: number = 0, len: number = arrayOfRawDatas.length; i < len; i++) {\r\n                trueClientBos.push(this.makeWithRawBackendData(modelClass, arrayOfRawDatas[i]));\r\n            }\r\n        }\r\n        return trueClientBos;\r\n    }\r\n\r\n    public instantiateNewBo(modelClass: any): BusinessObject {\r\n        return this.makeWithRawBackendData(modelClass, {});\r\n    }\r\n\r\n    /**\r\n     * Applies all properties of given 'source' object to the given 'destination' businessobject, if destination has that property.\r\n     * Works with the @ComplexField(), @ComplexArray, @BooleanText, @CoInject and @DateField annotations of given destination model.\r\n     *\r\n     * @param sourceData Raw data to copy to destination model\r\n     * @param {BusinessObject} destinationModel InOut: The annotated businessobject to apply source properties to\r\n     */\r\n    private _copyAllPropertiesDecoratorProcessedFrom(sourceData: any, destinationModel: BusinessObject): void {\r\n        if (!sourceData || !destinationModel) {\r\n            return;\r\n        }\r\n\r\n        // process all source data into destinationModel\r\n        for (const srcPropKey in sourceData) {\r\n            if (!sourceData.hasOwnProperty(srcPropKey)) {\r\n                continue;\r\n            }\r\n\r\n            const srcPropVal: any = sourceData[srcPropKey];\r\n\r\n            if (ComplexFieldDecorator.IsComplexField(destinationModel, srcPropKey)) {\r\n                const classOfField: any = ComplexFieldDecorator.GetComplexFieldType(destinationModel, srcPropKey);\r\n                destinationModel[srcPropKey] = this.makeWithRawBackendData(classOfField, srcPropVal);\r\n            } else if (ComplexArrayDecorator.IsComplexArray(destinationModel, srcPropKey)) {\r\n                const sourceArray: any[] = srcPropVal;\r\n                if (!sourceArray) {\r\n                    continue;\r\n                }\r\n                const classOfArrayItems: any = ComplexArrayDecorator.GetComplexArrayType(destinationModel, srcPropKey);\r\n                const tempArray: any[] = [];\r\n                for (let i: number = 0, len: number = sourceArray.length; i < len; i++) {\r\n                    tempArray.push(this.makeWithRawBackendData(classOfArrayItems, sourceArray[i]));\r\n                }\r\n                destinationModel[srcPropKey] = tempArray;\r\n            } else if (BooleanTextDecorator.IsBooleanTextField(destinationModel, srcPropKey)) {\r\n                // logical 'true' and 'false' also allowed as incoming values for @BooleanText() properties: then just copy their value\r\n                if (typeof srcPropVal === \"boolean\") {\r\n                    destinationModel[srcPropKey] = srcPropVal;\r\n                    // here, it should be a 'J' or 'N' (or 'T' or 'F'): assign the associated boolean value\r\n                } else {\r\n                    destinationModel[srcPropKey] = BooleanTextDecorator.GetLogicalBooleanValue(srcPropVal);\r\n                }\r\n            } else if (DateFieldFieldDecorator.IsDateField(destinationModel, srcPropKey)) {\r\n                destinationModel[srcPropKey] = DateFieldFieldDecorator.StringAsDate(srcPropVal);\r\n            } else if (StringNumberDecorator.IsStringNumber(destinationModel, srcPropKey)) {\r\n                destinationModel[srcPropKey] = StringNumberDecorator.StringAsNumber(srcPropVal);\r\n            }\r\n            // non-decorated prop\r\n            else {\r\n                if (isNill(srcPropVal)) {\r\n                    destinationModel[srcPropKey] = undefined;\r\n                } else if (Array.isArray(srcPropVal)) {\r\n                    destinationModel[srcPropKey] = ArrayUtils.CloneArray(srcPropVal);\r\n                } else if (typeof srcPropVal === \"object\") {\r\n                    if (srcPropVal instanceof Map) { //just copy the value in case of maps\r\n                        destinationModel[srcPropKey] = srcPropVal;\r\n                    } else {\r\n                        destinationModel[srcPropKey] = Object.assign({}, srcPropVal);\r\n                    }\r\n                } else {\r\n                    destinationModel[srcPropKey] = srcPropVal;\r\n                }\r\n            }\r\n        }\r\n    }\r\n}\r\n"]}