@colijnit/transaction 12.1.33 → 12.1.34

package/lib/service/dialog.service.d.ts

@@ -2,16 +2,18 @@ import { ApplicationRef, ComponentFactoryResolver, Injector, Type } from "@angul
 import { DialogBaseComponent } from "../component/core/base/dialog-base.component";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionLineCharacteristicChoice } from "@colijnit/transactionapi/build/model/transactionLineCharacteristicChoice.bo";
+import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
 export declare class DialogService {
     private _compFactoryResolver;
     private appRef;
     private injector;
-    private _componentRef;
+    private _componentRefs;
     constructor(_compFactoryResolver: ComponentFactoryResolver, appRef: ApplicationRef, injector: Injector);
     showYesNo(title: string, text: string): Promise<any>;
-    showError(message: string): Promise<any>;
+    showError(message: string, details?: string): Promise<any>;
     showInformation(message: string): Promise<any>;
     showTransactionLineComponent(comp: Type<DialogBaseComponent>, transLine: TransactionLineInfo): Promise<any>;
+    showTransactionHeaderComponent(comp: Type<DialogBaseComponent>, transactionInfo: TransactionInfo): Promise<any>;
     showCharacteristics(title: string, choices: TransactionLineCharacteristicChoice[], value: string): Promise<string>;
     showWarehouse(): Promise<number>;
     showCommissionCode(): Promise<string>;

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

@@ -1,8 +1,12 @@
 import { DialogService } from "./dialog.service";
-import { ValidationResult } from "@colijnit/transactionapi/build/model/validation-result";
+import { DataServiceResponseData } from "@colijnit/transactionapi/build/model/data-service-response-data";
+import { DictionaryService } from "./dictionary.service";
 export declare class ErrorService {
     private _dialogService;
-    constructor(_dialogService: DialogService);
-    showError(message: string): void;
-    showValidationError(validationResult: ValidationResult): void;
+    private _dictionaryService;
+    constructor(_dialogService: DialogService, _dictionaryService: DictionaryService);
+    showError(message: string, details?: string): Promise<any>;
+    showValidationError(response: DataServiceResponseData | any): Promise<any>;
+    private _messageAsValidationError;
+    private _messageDetails;
 }

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

@@ -7,6 +7,8 @@ import { DialogService } from "./dialog.service";
 import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
 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";
 export declare class PendingReasonService {
     protected dialogService: DialogService;
     protected options: OptionsService;
@@ -18,6 +20,8 @@ export declare class PendingReasonService {
     invoiceAddressSameAsDelivery: boolean;
     currentTransaction: TransactionInfoResponse;
     relation: CustomerFullObject;
+    purchasePortalLine: PurchasePortalLine;
+    docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
     constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService);
     init(options: any): Promise<void>;

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

@@ -120,6 +120,7 @@ export declare class TransactionConnectorAdapterService {
     changeTransactionLineEditTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
     changeTransactionLineSupplierArticleNumber(uuid: string, lineUuid: string, articleNumber: string): Promise<TransactionInfoResponse>;
     changeTransactionLineReference(uuid: string, lineUuid: string, reference: string): Promise<TransactionInfoResponse>;
+    changeTransactionLineGoodDescription(uuid: string, lineUuid: string, goodDescription: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionDefinitive(uuid: string, definitive: boolean): Promise<TransactionInfoResponse>;
     changeHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
     changeHeaderInvoiceAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
@@ -146,7 +147,7 @@ export declare class TransactionConnectorAdapterService {
     getGoodsReceiptStatusWithHistory(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
     receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;
     receiveGoodsForPurchaseOrderCorrection(request: ReceiveGoodsForPurchaseOrderCorrectionRequest): Promise<TransactionInfoResponse>;
-    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine>;
+    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
     updatePurchasePortalLines(purchasePortalLine: PurchasePortalLine): Promise<DataServiceResponseData>;
-    private _handleValidationResult;
+    private _handleExceptionFromResponse;
 }

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

@@ -117,6 +117,7 @@ export declare class TransactionConnectorService {
     changeTransactionLineEditTime(uuid: string, lineUuid: string, time: number): Promise<TransactionInfoResponse>;
     changeTransactionLineSupplierArticleNumber(uuid: string, lineUuid: string, articleNumber: string): Promise<TransactionInfoResponse>;
     changeTransactionLineReference(uuid: string, lineUuid: string, reference: string): Promise<TransactionInfoResponse>;
+    changeTransactionLineGoodDescription(uuid: string, lineUuid: string, goodDescription: string): Promise<TransactionInfoResponse>;
     changeTransactionLineCollectionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     changeHeaderTransactionDefinitive(uuid: string, definitive: boolean): Promise<TransactionInfoResponse>;
     changeHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<TransactionInfoResponse>;
@@ -143,6 +144,7 @@ export declare class TransactionConnectorService {
     getGoodsReceiptStatusWithHistory(transId: number, lineNr: number): Promise<GoodsReceiptStatusWithHistory>;
     receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;
     receiveGoodsForPurchaseOrderCorrection(request: ReceiveGoodsForPurchaseOrderCorrectionRequest): Promise<TransactionInfoResponse>;
-    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine>;
+    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
     updatePurchasePortalLines(purchasePortalLine: PurchasePortalLine): Promise<DataServiceResponseData>;
+    lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
 }

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

@@ -1,5 +1,4 @@
 import { DiscountType } from "@colijnit/transactionapi/build/enum/discount-type.enum";
-import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.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";
@@ -43,6 +42,7 @@ export declare class TransactionService extends PendingReasonService {
     pendingLineOperationStatus(lineOperationStatuses: LineOperationStatus[]): LineOperationStatus | undefined;
     updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
     updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;
+    updateGoodDescriptionTransactionLine(uuid: string, lineUuid: string, goodDescription: string): Promise<boolean>;
     updateHeaderTransactionDefinitive(uuid: string, definitive: boolean): Promise<boolean>;
     updateHeaderDeliveryAddress(uuid: string, newNawNr: number): Promise<boolean>;
     updateHeaderInvoiceAddress(uuid: string, newNawNr: number): Promise<boolean>;
@@ -73,12 +73,9 @@ export declare class TransactionService extends PendingReasonService {
     getRelationPrivacySettings(): Promise<RelationPrivacySetting[]>;
     getArticleBoundTextLinesOfArticleLine(articleLineUuid: string): Promise<TransactionLineInfo[]>;
     createTransaction(): Promise<boolean>;
-    getTransaction(transactionNo: number): Promise<boolean>;
-    openExistingTransaction(kind: TransactionKind, transactionNr: number): Promise<boolean>;
     getTransactionById(transactionId: number): Promise<boolean>;
     commit(): Promise<DataServiceResponseData>;
     saveTransaction(close?: boolean): Promise<TransactionInfoResponse>;
-    saveTransactionByUuid(transactionUuid: string): Promise<boolean>;
     addRelationToTransaction(relationId: number): Promise<boolean>;
     getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;
     getInOutCollection(languageCode: string): Promise<CoDomainValue[]>;
@@ -121,7 +118,8 @@ export declare class TransactionService extends PendingReasonService {
     getWarehouses(branchNr?: string): Promise<Warehouse[]>;
     getHistoricStateValues(): Promise<CodeDescription[]>;
     getCustomerGroups(): Promise<CustomerGroup[]>;
-    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine>;
+    getPurchasePortalLines(request: GetPurchasePortalLine): Promise<PurchasePortalLine[]>;
     updatePurchasePortalLines(purchasePortalLine: PurchasePortalLine): Promise<boolean>;
+    lockPurchasePortalLines(transIdPurchase: number, lineId: number): Promise<boolean>;
     private _checkAndCreateTransaction;
 }

package/lib/style/_variables.scss

@@ -13,6 +13,7 @@ $tp-color-warning: #DF7C2A !default;
 $tp-color-label: #8083A3 !default;
 $tp-color-font: #171721 !default;
 $tp-color-text-grey: #747b87 !default;
+$tp-color-negative-value: #C1002A !default;
 
 $tp-color-border: #DCE4EA !default;
 $tp-color-dark: $tp-color-font !default;
@@ -33,6 +34,8 @@ $tp-distance-medium: 11px !default;
 $tp-distance-big: 20px !default;
 $tp-distance-very-big: 30px !default;
 
+$tp-default-column-gap: 5px;
+
 $tp-font-size: 12px !default;
 $tp-font-size-big: 14px !default;
 $tp-font-size-small: 10px !default;
@@ -65,11 +68,28 @@ $tp-sm-width: 960px !default;
 $tp-md-width: 1280px !default;
 $tp-lg-width: 1920px !default;
 
+// transaction line buttons
+$tp-transaction-line-button-width: 78px !default;
+$tp-transaction-line-button-big-width: 250px !default;
+$tp-transaction-line-button-height: 26px !default;
+$tp-transaction-line-button-background-color: $tp-default-background-accent !default;
+$tp-transaction-line-button-border-color: $tp-color-border !default;
+$tp-transaction-line-button-column-gap: 15px !default;
+$tp-transaction-line-button-padding: 0 5px !default;
+$tp-transaction-line-button-radius: 10px !default;
+$tp-transaction-line-button-border: 1px solid !default;
+
 $tp-transaction-header-font-family: $tp-font-family !default;
 $tp-transaction-header-font-size: 14px !default;
 $tp-transaction-header-font-color: $tp-color-dark !default;
 
+$tp-transaction-dialog-header-title-font-size: $tp-font-size-big !default;
+$tp-transaction-dialog-header-title-margin: 0 0 10px 0 !default;
+$tp-transaction-dialog-header-title-font-weight: bold !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;

package/lib/style/transaction-globals.scss

@@ -4,7 +4,7 @@
 
 @import "./variables";
 
-.co-transaction-default-flex-row {
+.co-transaction-default-popup-row {
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -12,6 +12,15 @@
   padding: 8px 10px;
   overflow: hidden;
   margin: 0 0 5px 0;
+  user-select: none;
+  border-radius: $tp-default-border-radius;
+  background-color: $tp-default-background-accent;
+  .checkbox-list-label-wrapper {
+    cursor: pointer;
+    display: flex;
+    flex-direction: row;
+    column-gap: 10px;
+  }
 }
 
 .co-transaction-check::after {
@@ -29,6 +38,13 @@
   font-size: 23px;
 }
 
+.co-transaction-default-flex-row {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  column-gap: $tp-default-column-gap;
+}
+
 .co-transaction-label {
   font-size: $tp-font-size-small;
   color: $tp-color-label;
@@ -39,3 +55,33 @@
   overflow: hidden;
   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;
+}
+
+.transaction-line-button {
+  font-size: $tp-font-size;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: $tp-transaction-line-button-height;
+  column-gap: $tp-transaction-line-button-column-gap;
+  padding: $tp-transaction-line-button-padding;
+  &:not(.no-border) {
+    border: $tp-transaction-line-button-border;
+    border-color: $tp-transaction-line-button-border-color;
+    border-radius: $tp-transaction-line-button-radius;
+    background-color: $tp-transaction-line-button-background-color;
+  }
+  &:not(.custom-width) {
+    width: $tp-transaction-line-button-width;
+    &.big {
+      width: $tp-transaction-line-button-big-width;
+    }
+  }
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.33",
+  "version": "12.1.34",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {