@colijnit/transaction 12.1.100 → 12.1.101

package/lib/component/checkout/checkout-overview-payment/checkout-overview-payment.component.d.ts

@@ -1,9 +1,9 @@
-import { EventEmitter, OnInit } from "@angular/core";
-import { Address } from "@colijnit/relationapi/build/model/address.bo";
-import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
-import { Icon } from "../../../enum/icon.enum";
-import { RelationAnyType } from "../../../model/relation-any-type";
-import { TransactionService } from "../../../service/transaction.service";
+import { EventEmitter, OnInit } from '@angular/core';
+import { Address } from '@colijnit/relationapi/build/model/address.bo';
+import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
+import { Icon } from '../../../enum/icon.enum';
+import { RelationAnyType } from '../../../model/relation-any-type';
+import { TransactionService } from '../../../service/transaction.service';
 export declare class CheckoutOverviewPaymentComponent implements OnInit {
     private _transactionService;
     readonly icons: typeof Icon;

package/lib/component/deposit-payment/deposit-payment.component.d.ts

@@ -1,9 +1,10 @@
-import { OnInit } from "@angular/core";
-import { DepositPaymentViewModel } from "../../model/deposit-payment-view-model";
-import { PaymentViewmodel } from "../../model/payment.viewmodel";
-import { PaymentService } from "../../service/payment.service";
+import { OnInit } from '@angular/core';
+import { DepositPaymentViewModel } from '../../model/deposit-payment-view-model';
+import { PaymentViewmodel } from '../../model/payment.viewmodel';
+import { PaymentService } from '../../service/payment.service';
 export declare class DepositPaymentComponent implements OnInit {
     private _paymentService;
+    branch: string;
     transactionUuid: string;
     showClass(): boolean;
     paymentMethods: PaymentViewmodel[];

package/lib/component/payment/payment.component.d.ts

@@ -12,7 +12,9 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _sharedService;
     private _paymentService;
     readonly icons: typeof Icon;
+    transId: number;
     transactionUuid: string;
+    branch: string;
     set amount(value: number);
     get amount(): number;
     currencyId: number;
@@ -30,6 +32,7 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     qrCodeImage: string;
     showLoader: boolean;
     amountToPay: number;
+    statusMessage: string;
     private _amount;
     private _paymentStatusInterval;
     private _paymentStatusPollIntervalMs;
@@ -46,6 +49,7 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _getDepositPaymentInfo;
     private _dataUriToBase64;
     private _waitForPaymentStatus;
+    private _waitForPinPaymentStatus;
     private _clearInterval;
     /**
      *

package/lib/component/payment/style/_layout.scss

@@ -84,6 +84,12 @@
     .payment-to-pay-button {
       grid-column: 1 / 1;
       grid-row: 3 / 3;
+      .payment-error-message {
+        margin: $tp-payment-error-margin;
+        font-family: $tp-payment-error-font-family;
+        font-size: $tp-payment-error-font-size;
+        font-style: $tp-payment-error-font-style;
+      }
       .co-button {
         justify-content: center;
         border-radius: 5px;

package/lib/component/payment/style/_material-definition.scss

@@ -18,3 +18,8 @@ $tp-payment-amount-color: rgba(0, 0, 0, 0.5) !default;
 $tp-payment-amount-border: 1px solid !default;
 $tp-payment-amount-border-color: $tp-color-border !default;
 $tp-payment-amount-background-color: #dedede5c !default;
+$tp-payment-error-margin: 5px 0 !default;
+$tp-payment-error-font-family: $tp-font-family !default;
+$tp-payment-error-font-size: $tp-font-size !default;
+$tp-payment-error-font-style: italic !default;
+$tp-payment-error-font-color: $tp-color-error !default;

package/lib/component/payment/style/_theme.scss

@@ -13,6 +13,9 @@
       background-color: $tp-payment-amount-background-color;
     }
     .payment-to-pay-button {
+      .payment-error-message {
+        color: $tp-payment-error-font-color;
+      }
       .co-button {
         background-color: $tp-color-colijn-orange;
       }

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

@@ -1,10 +1,10 @@
-import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
-import { Icon } from "../../../enum/icon.enum";
-import { IconCacheService } from "../../../service/icon-cache.service";
-import { TransactionService } from "../../../service/transaction.service";
-import { PaymentService } from "../../../service/payment.service";
-import { DepositPaymentViewModel } from "../../../model/deposit-payment-view-model";
-import { PaymentViewmodel } from "../../../model/payment.viewmodel";
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { Icon } from '../../../enum/icon.enum';
+import { IconCacheService } from '../../../service/icon-cache.service';
+import { TransactionService } from '../../../service/transaction.service';
+import { PaymentService } from '../../../service/payment.service';
+import { DepositPaymentViewModel } from '../../../model/deposit-payment-view-model';
+import { PaymentViewmodel } from '../../../model/payment.viewmodel';
 import { DictionaryService } from '../../../service/dictionary.service';
 export declare class TransactionHeaderPaymentComponent extends TransactionBaseComponent {
     protected dictionaryService: DictionaryService;

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

@@ -1,7 +1,7 @@
-import { OnInit } from "@angular/core";
-import { TransactionService } from "../../service/transaction.service";
-import { RelationService } from "../../service/relation.service";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { OnInit } from '@angular/core';
+import { TransactionService } from '../../service/transaction.service';
+import { RelationService } from '../../service/relation.service';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { DictionaryService } from '../../service/dictionary.service';
 import { Currency } from '@colijnit/mainapi/build/model/currency.bo';
 export declare class TransactionHeaderCurrencyComponent extends TransactionFilterPopupBaseComponent<Currency> implements OnInit {
@@ -12,5 +12,5 @@ export declare class TransactionHeaderCurrencyComponent extends TransactionFilte
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commitTransactionCurrency(currency: number): Promise<boolean>;
-    protected transactionInfoSet(): void;
+    protected transactionSet(): void;
 }

package/lib/component/transaction-header-fields/transaction-header-price-kind.component.d.ts

@@ -1,7 +1,7 @@
-import { OnInit } from "@angular/core";
-import { TransactionService } from "../../service/transaction.service";
-import { RelationService } from "../../service/relation.service";
-import { TransactionFilterPopupBaseComponent } from "../core/base/transaction-filter-popup-base.component";
+import { OnInit } from '@angular/core';
+import { TransactionService } from '../../service/transaction.service';
+import { RelationService } from '../../service/relation.service';
+import { TransactionFilterPopupBaseComponent } from '../core/base/transaction-filter-popup-base.component';
 import { DictionaryService } from '../../service/dictionary.service';
 import { SalesPerson } from '@colijnit/relationapi/build/model/sales-person.bo';
 export declare class TransactionHeaderPriceKindComponent extends TransactionFilterPopupBaseComponent<SalesPerson> implements OnInit {
@@ -12,5 +12,5 @@ export declare class TransactionHeaderPriceKindComponent extends TransactionFilt
     constructor(dictionaryService: DictionaryService, transactionService: TransactionService, _relationService: RelationService);
     ngOnInit(): void;
     commitTransactionPriceKind(priceKind: string): Promise<boolean>;
-    protected transactionInfoSet(): void;
+    protected transactionSet(): void;
 }

package/lib/res/dictionary/dictionaries.d.ts

@@ -16337,6 +16337,7 @@ export declare class Dictionaries {
         TRANSACTION_NOT_DEFINITIVE_SPECIFY_ON_HOLD_CODE: string;
         TRANSACTION_NO_DIRECT_SELL_ADD_WHEN_ALREADY_ORDERED_FOR_SUPPLIER: string;
         TRANSACTION_NO_DIRECT_SELL_WHEN_ALREADY_ORDERED_FOR_SUPPLIER: string;
+        TRANSACTION_NO_PARTIAL_DELIVERY: string;
         TRANSACTION_NR_EXISTS: string;
         TRANSACTION_NUMBER2: string;
         TRANSACTION_NUMBER: string;

package/lib/service/payment.service.d.ts

@@ -7,16 +7,21 @@ import { SelectMultipleCacheService } from '../cache/service/select-multiple-cac
 import { PaymentViewmodel } from '../model/payment.viewmodel';
 import { SharedService } from './shared.service';
 import { TransactionDepositPaymentInfo } from '@colijnit/transactionapi/build/model/transaction-deposit-payment-info.bo';
+import { PspTransactionStatus } from '@colijnit/transactionapi/build/model/psp-transaction-status.bo';
+import { SelectMultipleParameterizedCacheService } from '../cache/service/select-multiple-parameterized-cache.service';
 export declare class PaymentService {
     private _adapterService;
     private _selectMultipleCacheService;
+    private _selectMultipleParameterizedCacheService;
     private _transactionService;
     private _sharedService;
-    constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _transactionService: TransactionService, _sharedService: SharedService);
+    constructor(_adapterService: TransactionConnectorAdapterService, _selectMultipleCacheService: SelectMultipleCacheService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService, _transactionService: TransactionService, _sharedService: SharedService);
     registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<boolean>;
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
+    doPinPayment(transId: number, paymentMethodCode: string, cashRegisterNr: number, cashRegisterGroupId: number, amount: number): Promise<string>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
+    getPspTransactionStatus(pspTransactionUuid: string): Promise<PspTransactionStatus>;
     getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
-    getPaymentMethods(): Promise<PaymentMethod[]>;
-    getPaymentMethodsViewModels(): Promise<PaymentViewmodel[]>;
+    getPaymentMethods(branchNr: string): Promise<PaymentMethod[]>;
+    getPaymentMethodsViewModels(branchNr: string): Promise<PaymentViewmodel[]>;
 }

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

@@ -81,6 +81,7 @@ import { HistoricReport } from '@colijnit/transactionapi/build/model/historic-re
 import { Printer } from '@colijnit/mainapi/build/model/printer.bo';
 import { Currency } from '@colijnit/mainapi/build/model/currency.bo';
 import { PaymentCondition } from '@colijnit/mainapi/build/model/payment-condition.bo';
+import { PspTransactionStatus } from '@colijnit/transactionapi/build/model/psp-transaction-status.bo';
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -125,7 +126,7 @@ export declare class TransactionConnectorAdapterService {
     getOnHoldCodes(): Promise<OnHoldCode[]>;
     getWarehouses(branchNr?: string): Promise<Warehouse[]>;
     getHistoricStateValues(): Promise<CodeDescription[]>;
-    getPaymentMethods(): Promise<PaymentMethod[]>;
+    getPaymentMethods(branchNr: string): Promise<PaymentMethod[]>;
     commit(): Promise<boolean>;
     rollback(): Promise<boolean>;
     createTransaction(kind: TransactionKind, branchNr: string): Promise<TransactionInfoResponse>;
@@ -183,7 +184,9 @@ export declare class TransactionConnectorAdapterService {
     changeTransactionLineCollectionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     registerSalesOrderPayment(uuid: string, amount: number, currencyId: number, paymentMethod: string, cashRegisterGroupId: number): Promise<DataServiceResponseData>;
     createIonePaymentLinkAndQRCode(uuid: string, amount: number, paymentMethodCode: string): Promise<CreatePaymentLinkResult>;
+    doPinPayment(transId: number, paymentMethodCode: string, cashRegisterNr: number, cashRegisterGroupId: number, amount: number): Promise<string>;
     getPaymentLinkStatus(paymentLinkUUID: string): Promise<PaymentLinkStatus>;
+    getPspTransactionStatus(pspTransactionUuid: string): Promise<PspTransactionStatus>;
     getDepositPaymentInfo(uuid: string): Promise<TransactionDepositPaymentInfo>;
     getGoodsReceiptHistory(transId: number, lineNr: number): Promise<GoodsReceiptHistory>;
     receiveGoodsForPurchaseOrder(request: ReceiveGoodsForPurchaseOrderRequest): Promise<TransactionInfoResponse>;

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

@@ -22,7 +22,6 @@ import { Warehouse } from '@colijnit/transactionapi/build/model/warehouse.bo';
 import { CodeDescription } from '@colijnit/transactionapi/build/model/code-description';
 import { ReceiveGoodsForPurchaseOrderRequest } from '@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo';
 import { ReceiveGoodsForPurchaseOrderCorrectionRequest } from '@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-correction-request.bo';
-import { PaymentMethod } from '@colijnit/transactionapi/build/model/payment-method.bo';
 import { GetPurchasePortalLine } from '@colijnit/transactionapi/build/model/get-purchase-portal-line';
 import { PurchasePortalLine } from '@colijnit/transactionapi/build/model/purchase-portal-line.bo';
 import { CreatePaymentLinkResult } from '@colijnit/transactionapi/build/model/create-payment-link-result.bo';
@@ -135,7 +134,6 @@ export declare class TransactionConnectorService {
     getOnHoldCodes(): Promise<OnHoldCode[]>;
     getWarehouses(branchNr?: string): Promise<Warehouse[]>;
     getHistoricStateValues(): Promise<CodeDescription[]>;
-    getPaymentMethods(): Promise<PaymentMethod[]>;
     changeTransactionLineCommissionCode(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;
     changeTransactionLineSupplier(uuid: string, lineUuid: string, id: number): Promise<TransactionInfoResponse>;
     changeTransactionLineWarehouse(uuid: string, lineUuid: string, warehouseNumber: number): Promise<TransactionInfoResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.100",
+  "version": "12.1.101",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -18,7 +18,7 @@
     "@colijnit/relationapi": ">=1.0.5",
     "@colijnit/sharedapi": ">=1.0.10",
     "@colijnit/sharedcomponents": ">=1.0.40",
-    "@colijnit/transactionapi": ">=1.1.76",
+    "@colijnit/transactionapi": ">=1.1.78",
     "@syncfusion/ej2-angular-buttons": ">=19.3.44",
     "@syncfusion/ej2-angular-calendars": ">=19.3.44",
     "@syncfusion/ej2-angular-dropdowns": ">=19.3.45",