@colijnit/transaction 261.20.61 → 261.20.63

package/index.d.ts

@@ -1501,6 +1501,8 @@ declare class TransactionConnectorAdapterService {
     getDefaultEmailAddressListForWorkOrder(transactionUUID: string, showLoader?: boolean): Promise<string[]>;
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
     roundUp(amount: number, paymentMethodCode: string, showLoader?: boolean): Promise<number>;
+    cancelPspTransaction(pspTransactionUuid: string): Promise<boolean>;
+    createQRCode(width: number, height: number, data: string): Promise<string>;
     private _openPdfContent;
     private _handleLocalPrintFile;
     private _handleExceptionFromResponse;
@@ -1974,6 +1976,8 @@ declare class TransactionConnectorService {
     getDefaultEmailAddressListForWorkOrder(transactionUUID: string, showLoader?: boolean): Promise<ReportLayoutSelectionEmail[]>;
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
     roundUp(amount: number, paymentMethodCode: string, showLoader?: boolean): Promise<number>;
+    cancelPspTransaction(pspTransactionUuid: string): Promise<boolean>;
+    createQRCode(width: number, height: number, data: string): Promise<string>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionConnectorService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<TransactionConnectorService>;
 }
@@ -2828,6 +2832,8 @@ declare class TransactionService extends PendingReasonService {
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
     sendPackageInformationToLSP(request: TransactionLspInformationRequest): Promise<TransactionInfoResponse>;
     roundUp(amount: number, paymentMethodCode: string, showLoader?: boolean): Promise<number>;
+    cancelPspTransaction(pspTransactionUuid: string): Promise<boolean>;
+    createQRCode(width: number, height: number, data: string): Promise<string>;
     protected _handleBeforeRememberCurrentTransaction(transactionInfoResponse: TransactionInfoResponse): Promise<void>;
     protected _handleAfterRememberCurrentTransaction(): Promise<void>;
     private _checkAndSaveLinesForAIConfirmation;
@@ -3013,6 +3019,7 @@ declare class TransactionHeaderService {
     fullyInvoiced: boolean;
     partiallyOrFullyInvoiced: boolean;
     fullyDelivered: boolean;
+    partiallyOrFullyDelivered: boolean;
     partiallyOrFullyOrdered: boolean;
     partiallyOrFullyInvoiceControl: boolean;
     partiallyOrFullyReceived: boolean;
@@ -3044,7 +3051,8 @@ declare class TransactionHeaderService {
     private _relation;
     private _readOnly;
     constructor(_transactionService: TransactionService, _relationService: TransactionRelationService, _transactionPaymentConnectorService: TransactionPaymentConnectorService, _dictionaryService: DictionaryService, _transactionEventService: TransactionEventService);
-    canAlterRelationForTransaction(): boolean;
+    canChangeRelationOnTransaction(): boolean;
+    canAlterRelationDataOnTransaction(): boolean;
     getTransactionMargeInfoList(): Promise<void>;
     createCloneRelation(): void;
     getPlanOrder(): Promise<PlanOrder>;
@@ -3258,8 +3266,11 @@ declare class TransactionPaymentService implements OnDestroy {
     qrCodeImage: string;
     qrCodeUrl: string;
     showPspQrCode: boolean;
+    showPspActions: boolean;
     getDepositAmount: boolean;
     cancelUrl: string;
+    paymentUrl: string;
+    pspTransactionUuid: string;
     shouldContinue: boolean;
     payed: Subject<void>;
     paymentFailed: Subject<void>;
@@ -3278,13 +3289,14 @@ declare class TransactionPaymentService implements OnDestroy {
     constructor(_transactionEventService: TransactionEventService, _paymentConnectorService: TransactionPaymentConnectorService, _dictionaryService: DictionaryService, _dialogService: TransactionDialogService, _transactionService: TransactionService, _datePipe: DatePipe);
     ngOnDestroy(): void;
     handlePayment(): Promise<void>;
-    cancelPayment(): void;
+    cancelPayment(): Promise<void>;
     roundUp(): Promise<void>;
     preparePaymentInfo(): Promise<void>;
     private _waitForPinPaymentStatus;
     private _handlePayment;
     private _handlePaymentFailed;
     private _clearInterval;
+    private _clearPspTransactionData;
     private _dataUriToBase64;
     private _setCashDrawerIdIfValidDrawer;
     private _handleCashLimitCheck;
@@ -3389,8 +3401,12 @@ declare abstract class TransactionPaymentBaseComponent implements OnInit, OnDest
 declare class PaymentComponent extends TransactionPaymentBaseComponent {
     showClass: boolean;
     depositAmount: number;
+    qrCodeImageSrc: string;
     cashRegisterSelected(cashRegister: CashRegister, index: number): Promise<void>;
     onDepositPaymentFetched(depositAmount: number): void;
+    handlePaymentUrlClicked(): void;
+    handleShowQrCode(): Promise<void>;
+    private _dataUriToBase64;
     static ɵfac: i0.ɵɵFactoryDeclaration<PaymentComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<PaymentComponent, "co-payment", never, {}, {}, never, never, false, never>;
 }
@@ -6018,6 +6034,7 @@ declare class TransactionHeaderPopupRelationComponent extends TransactionHeaderP
     showMessageForChangeCustomer: boolean;
     showInvoiceAddress: boolean;
     noLockOnCustomerSet: boolean;
+    showChangeOptionWhenCustomerReadonly: boolean;
     inputChangeForSuggestions: EventEmitter<RelationSuggestionsRequest>;
     changeCustomerRequested: EventEmitter<void>;
     deliveryAddressLocalHashChange: EventEmitter<string>;
@@ -6059,11 +6076,10 @@ declare class TransactionHeaderPopupRelationComponent extends TransactionHeaderP
     handleNavigationClick(nav: string): void;
     handleChangeCustomGroup(group: string): void;
     navigateToRelation(): void;
-    private _isAllowedToChangeRelation;
     private _setFirstAddress;
     private _lockRelation;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionHeaderPopupRelationComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionHeaderPopupRelationComponent, "co-transaction-header-popup-relation", never, { "configNames": { "alias": "configNames"; "required": false; }; "showPrivacy": { "alias": "showPrivacy"; "required": false; }; "showMessageForChangeCustomer": { "alias": "showMessageForChangeCustomer"; "required": false; }; "showInvoiceAddress": { "alias": "showInvoiceAddress"; "required": false; }; "noLockOnCustomerSet": { "alias": "noLockOnCustomerSet"; "required": false; }; }, { "inputChangeForSuggestions": "inputChangeForSuggestions"; "changeCustomerRequested": "changeCustomerRequested"; "deliveryAddressLocalHashChange": "deliveryAddressLocalHashChange"; "invoiceAddressLocalHashChange": "invoiceAddressLocalHashChange"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<TransactionHeaderPopupRelationComponent, "co-transaction-header-popup-relation", never, { "configNames": { "alias": "configNames"; "required": false; }; "showPrivacy": { "alias": "showPrivacy"; "required": false; }; "showMessageForChangeCustomer": { "alias": "showMessageForChangeCustomer"; "required": false; }; "showInvoiceAddress": { "alias": "showInvoiceAddress"; "required": false; }; "noLockOnCustomerSet": { "alias": "noLockOnCustomerSet"; "required": false; }; "showChangeOptionWhenCustomerReadonly": { "alias": "showChangeOptionWhenCustomerReadonly"; "required": false; }; }, { "inputChangeForSuggestions": "inputChangeForSuggestions"; "changeCustomerRequested": "changeCustomerRequested"; "deliveryAddressLocalHashChange": "deliveryAddressLocalHashChange"; "invoiceAddressLocalHashChange": "invoiceAddressLocalHashChange"; }, never, never, false, never>;
 }
 
 declare abstract class TransactionFilterPopupHeaderBaseComponent<T extends BusinessObject | number | string | Object> extends TransactionHeaderBaseComponent {
@@ -14034,7 +14050,7 @@ declare class TransactionHeaderRelationComponent extends TransactionHeaderBaseCo
     typeOfCustomerFullObject(relation: Relation): boolean;
     get relationAsCustomer(): CustomerFullObject;
     contactPersonForId(relationId: number): RelationContactLink;
-    determineDontAllowPopup(): boolean;
+    isPopupBlocked(): boolean;
     handleHeaderClick(): void;
     protected relationSet(): void;
     protected transactionInfoSet(): void;
@@ -15707,6 +15723,9 @@ declare class TransactionCashRegisterPaymentDialogComponent extends TransactionP
     private _changePaymentState;
     handleVoucherValidated(voucher: Voucher): void;
     handleVoucherPopupClose(): void;
+    handlePaymentUrlClicked(): void;
+    handleShowQrCode(): Promise<void>;
+    private _dataUriToBase64;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionCashRegisterPaymentDialogComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionCashRegisterPaymentDialogComponent, "co-transaction-cash-register-payment-dialog", never, { "relation": { "alias": "relation"; "required": false; }; "transactionNr": { "alias": "transactionNr"; "required": false; }; "paymentViewModel": { "alias": "paymentViewModel"; "required": false; }; }, { "closeDialog": "closeDialog"; "posOrderPayed": "posOrderPayed"; }, never, never, false, never>;
 }
@@ -15733,7 +15752,7 @@ declare class TransactionCashRegisterPaymentButtonsComponent {
     toCashRegisterOrderClicked: EventEmitter<void>;
     changePaymentMethodClicked: EventEmitter<void>;
     constructor(paymentService: TransactionPaymentService);
-    handleCancelPayment(): void;
+    handleCancelPayment(): Promise<void>;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionCashRegisterPaymentButtonsComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionCashRegisterPaymentButtonsComponent, "co-transaction-cash-register-payment-buttons", never, {}, { "toCashRegisterOrderClicked": "toCashRegisterOrderClicked"; "changePaymentMethodClicked": "changePaymentMethodClicked"; }, never, never, false, never>;
 }

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

@@ -139,5 +139,23 @@
       grid-row: 1 / 3;
       max-width: $tp-payment-keypad-max-width;
     }
+
+    .action-button-wrapper {
+      display: flex;
+      flex-direction: row;
+      align-content: center;
+      justify-content: start;
+      gap: 0.25em;
+      margin: 1em 0;
+
+      .action-button {
+        display: flex;
+        width: 150px;
+        background: $tp-payment-color-action;
+        color: white;
+        padding: 0.25em 0.5em;
+        border-radius: 0.25em;
+      }
+    }
   }
 }

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

@@ -21,3 +21,5 @@ $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;
 $tp-payment-keypad-max-width: 300px !default;
+$tp-payment-color-action: #1A73E8;
+

package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_layout.scss

@@ -33,6 +33,23 @@
     }
 
 
+    .action-button-wrapper {
+      display: flex;
+      flex-direction: row;
+      align-content: center;
+      justify-content: start;
+      gap: 0.25em;
+      margin: 1em 0;
+
+      .action-button {
+        display: flex;
+        width: 150px;
+        background: $tp-transaction-cash-register-color-action;
+        color: white;
+        padding: 0.25em 0.5em;
+        border-radius: 0.25em;
+      }
+    }
     .co-transaction-cash-register-payment-voucher{
 
       .voucher-input {

package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/style/_material-definition.scss

@@ -37,6 +37,7 @@ $tp-transaction-cash-register-payment-dialog-button-border-width: 2px !default;
 $tp-transaction-cash-register-payment-dialog-button-border-color: #0084de !default;
 $tp-transaction-cash-register-payment-dialog-button-icon-color: #0084de !default;
 $tp-transaction-cash-register-payment-dialog-receipt-button-min-width: 135px !default;
+$tp-transaction-cash-register-color-action: #1A73E8;
 
 $tp-transaction-cash-register-payment-dialog-button-border: 2px solid #0084de !default;
 $tp-transaction-cash-register-payment-dialog-button-border-disabled: 2px solid rgba(#0084de, 0.5) !default;

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

@@ -579,6 +579,12 @@
         flex: 1;
       }
     }
+
+    .co-input-text.disabled {
+      opacity: 0.5;
+      pointer-events: none;
+      cursor: default;
+    }
   }
 
   .drop-shipment-dialog {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "261.20.61",
+  "version": "261.20.63",
   "description": "Colijn IT transaction module for Angular 20",
   "repository": "npm/npm",
   "author": "Colijn IT",