@colijnit/transaction 262.1.8 → 262.1.9

package/index.d.ts

@@ -1492,6 +1492,8 @@ declare class TransactionConnectorAdapterService {
     getWorkOrderDefaultSendMethod(relationId: number, showLoader?: boolean): Promise<number>;
     getDefaultEmailAddressListForWorkOrder(transactionUUID: string, showLoader?: boolean): Promise<string[]>;
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
+    cancelPspTransaction(pspTransactionUuid: string): Promise<boolean>;
+    createQRCode(width: number, height: number, data: string): Promise<string>;
     private _openPdfContent;
     private _handleLocalPrintFile;
     private _handleExceptionFromResponse;
@@ -1964,6 +1966,8 @@ declare class TransactionConnectorService {
     getWorkOrderDefaultSendMethod(relationId: number, showLoader?: boolean): Promise<number>;
     getDefaultEmailAddressListForWorkOrder(transactionUUID: string, showLoader?: boolean): Promise<string[]>;
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
+    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>;
 }
@@ -2815,6 +2819,8 @@ declare class TransactionService extends PendingReasonService {
     getDefaultEmailAddressListForWorkOrder(transactionUUID: string, showLoader?: boolean): Promise<string[]>;
     previewWorkOrder(pdfWorkOrderRequest: PdfWorkOrderRequest, showLoader?: boolean): Promise<PdfWorkOrderResponse>;
     sendPackageInformationToLSP(request: TransactionLspInformationRequest): Promise<TransactionInfoResponse>;
+    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;
@@ -3230,6 +3236,7 @@ declare class TransactionPaymentService implements OnDestroy {
     voucher: Voucher;
     details: DoPaymentBookingDetail[];
     paymentDate: Date;
+    showPaymentMethodMessage: boolean;
     set currentPaymentMethod(value: PaymentMethod);
     get currentPaymentMethod(): PaymentMethod;
     set cashRegisterDrawerNr(value: string);
@@ -3245,8 +3252,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>;
@@ -3265,12 +3275,13 @@ 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>;
     preparePaymentInfo(): Promise<void>;
     private _waitForPinPaymentStatus;
     private _handlePayment;
     private _handlePaymentFailed;
     private _clearInterval;
+    private _clearPspTransactionData;
     private _dataUriToBase64;
     private _setCashDrawerIdIfValidDrawer;
     private _handleCashLimitCheck;
@@ -3374,8 +3385,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>;
 }
@@ -14748,7 +14763,6 @@ declare class TransactionQuickAccessPlanningComponent extends TransactionHeaderB
     protected dictionaryService: DictionaryService;
     protected transactionService: TransactionService;
     protected changeDetector: ChangeDetectorRef;
-    private _purchaseConfirmationService;
     private _connector;
     private _deliveryPlanningService;
     sendDocumentsComponent: TransactionSendDocumentsComponent;
@@ -14759,7 +14773,7 @@ declare class TransactionQuickAccessPlanningComponent extends TransactionHeaderB
     get lspMode(): boolean;
     set lspMode(lspMode: boolean);
     showClass(): boolean;
-    constructor(transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, _purchaseConfirmationService: PurchaseConfirmationService, _connector: TransactionConnectorService, _deliveryPlanningService: DeliveryPlanningService);
+    constructor(transactionHeaderService: TransactionHeaderService, transactionEventService: TransactionEventService, iconCacheService: IconCacheService, screenConfigService: TransactionScreenConfigurationService, imageService: TransactionImageService, dictionaryService: DictionaryService, transactionService: TransactionService, changeDetector: ChangeDetectorRef, _connector: TransactionConnectorService, _deliveryPlanningService: DeliveryPlanningService);
     ngOnInit(): void;
     handleSelectAllLines(value: boolean): void;
     toggleLspMode(): void;
@@ -14823,6 +14837,7 @@ declare class TransactionQuickAccessPlanningPopupComponent implements OnInit, On
     closeEvent(): void;
     handleSendMethodOkClick(request: any): void;
     getPrintLayouts(): Promise<void>;
+    private _clearData;
     private _getPrinters;
     static ɵfac: i0.ɵɵFactoryDeclaration<TransactionQuickAccessPlanningPopupComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<TransactionQuickAccessPlanningPopupComponent, "co-transaction-quick-access-planning-popup", never, { "lspDialogType": { "alias": "lspDialogType"; "required": false; }; "autoPrint": { "alias": "autoPrint"; "required": false; }; "packageLSP": { "alias": "packageLSP"; "required": false; }; "deliveryMethods": { "alias": "deliveryMethods"; "required": false; }; }, { "close": "close"; "autoPrinted": "autoPrinted"; "createdTrackAndTrace": "createdTrackAndTrace"; }, never, never, false, never>;
@@ -15657,6 +15672,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>;
 }
@@ -15683,7 +15701,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

@@ -92,6 +92,12 @@
       align-items: center;
       row-gap: 10px;
       column-gap: 10px;
+      margin-bottom: 10px;
+    }
+    .payment-method-message {
+      margin-bottom: 15px;
+      font-weight: bold;
+      color: $tp-payment-error-font-color;
     }
     .payment-to-pay-total {
       display: flex;
@@ -133,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-line-interbranch-receive-goods/style/_layout.scss

@@ -1,78 +1,78 @@
-@include export-module('co-transaction-line-interbranch-receive-goods-layout') {
-  .co-transaction-line-interbranch-receive-goods {
-    .columns-wrapper {
-      display: flex;
-    }
-
-    .co-input-number-picker {
-      width: 140px;
-    }
-
-    .details-column {
-      width: 45%;
-      display: flex;
-      flex-direction: column;
-
-      .transaction-line-totals-amount {
-        margin: 5px;
-      }
-
-      //.amount-number-picker {
-      //  height: 40px;
-      //  margin: 5px;
-      //}
-    }
-
-    .header-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin: $tp-co-transaction-line-receive-goods-title-margin;
-
-      .details-header {
-        font-size: $tp-co-transaction-line-receive-goods-title-font-size;
-        font-weight: bold;
-      }
-    }
-
-    .divider-wrapper {
-      display: flex;
-      width: 10%;
-      justify-content: center;
-      visibility: hidden;
-
-      .divider {
-        border-left: 1px solid;
-        border-color: $tp-color-border;
-        margin: 5px; // $tp-co-transaction-request-details-input-margin;
-      }
-    }
-
-    .details-input {
-      margin: 5px; // $tp-co-transaction-request-details-input-margin;
-    }
-
-    .location-wrapper {
-      position: relative;
-
-      .co-transaction-button {
-        width: auto;
-        margin: 5px;
-      }
-    }
-    .disabled {
-      cursor: default;
-      opacity: 0.6;
-    }
-    .clickable {
-      cursor: pointer;
-    }
-
-    .warehouse-buttons {
-      width: 100%;
-      .co-transaction-button {
-        width: 100%;
-      }
-    }
-  }
-}
+@include export-module('co-transaction-line-interbranch-receive-goods-layout') {
+  .co-transaction-line-interbranch-receive-goods {
+    .columns-wrapper {
+      display: flex;
+    }
+
+    .co-input-number-picker {
+      width: 140px;
+    }
+
+    .details-column {
+      width: 45%;
+      display: flex;
+      flex-direction: column;
+
+      .transaction-line-totals-amount {
+        margin: 5px;
+      }
+
+      //.amount-number-picker {
+      //  height: 40px;
+      //  margin: 5px;
+      //}
+    }
+
+    .header-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin: $tp-co-transaction-line-receive-goods-title-margin;
+
+      .details-header {
+        font-size: $tp-co-transaction-line-receive-goods-title-font-size;
+        font-weight: bold;
+      }
+    }
+
+    .divider-wrapper {
+      display: flex;
+      width: 10%;
+      justify-content: center;
+      visibility: hidden;
+
+      .divider {
+        border-left: 1px solid;
+        border-color: $tp-color-border;
+        margin: 5px; // $tp-co-transaction-request-details-input-margin;
+      }
+    }
+
+    .details-input {
+      margin: 5px; // $tp-co-transaction-request-details-input-margin;
+    }
+
+    .location-wrapper {
+      position: relative;
+
+      .co-transaction-button {
+        width: auto;
+        margin: 5px;
+      }
+    }
+    .disabled {
+      cursor: default;
+      opacity: 0.6;
+    }
+    .clickable {
+      cursor: pointer;
+    }
+
+    .warehouse-buttons {
+      width: 100%;
+      .co-transaction-button {
+        width: 100%;
+      }
+    }
+  }
+}

package/lib/component/transaction-line-interbranch-receive-goods/style/_material-definition.scss

@@ -1,2 +1,2 @@
-$tp-co-transaction-line-receive-goods-title-font-size: 12px !default;
-$tp-co-transaction-line-receive-goods-title-margin: 0 0 10px 5px !default;
+$tp-co-transaction-line-receive-goods-title-font-size: 12px !default;
+$tp-co-transaction-line-receive-goods-title-margin: 0 0 10px 5px !default;

package/lib/component/transaction-line-interbranch-receive-goods/style/_theme.scss

@@ -1,4 +1,4 @@
-@include export-module('co-transaction-line-interbranch-receive-goods-theme') {
-  .co-transaction-line-interbranch-receive-goods {
-  }
-}
+@include export-module('co-transaction-line-interbranch-receive-goods-theme') {
+  .co-transaction-line-interbranch-receive-goods {
+  }
+}

package/lib/component/transaction-line-interbranch-receive-goods/style/material.scss

@@ -1,4 +1,4 @@
-@import "../../../style/mixin";
-@import "./_material-definition";
-@import "./_layout";
-@import "./_theme";
+@import "../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";

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

@@ -1,27 +1,27 @@
-@use "sass:math";
-@import "../../../../style/mixin";
-
-@include export-module('co-transaction-quick-access-interbranch-order-purchase-layout') {
-  .co-transaction-quick-access-interbranch-order-purchase {
-    .select-all-wrapper {
-      display: flex;
-      align-items: center;
-    }
-    .button {
-      padding: 0.25em;
-      background-color: white;
-      border: 1px solid $tp-transaction-quick-access-planning-lsp-mode-button;
-      cursor: pointer;
-      co-icon {
-        fill: $tp-transaction-quick-access-planning-lsp-mode-button;
-      }
-      &.selected {
-        background-color: $tp-transaction-quick-access-planning-lsp-mode-button;
-        co-icon {
-          fill: white;
-        }
-      }
-    }
-
-  }
-}
+@use "sass:math";
+@import "../../../../style/mixin";
+
+@include export-module('co-transaction-quick-access-interbranch-order-purchase-layout') {
+  .co-transaction-quick-access-interbranch-order-purchase {
+    .select-all-wrapper {
+      display: flex;
+      align-items: center;
+    }
+    .button {
+      padding: 0.25em;
+      background-color: white;
+      border: 1px solid $tp-transaction-quick-access-planning-lsp-mode-button;
+      cursor: pointer;
+      co-icon {
+        fill: $tp-transaction-quick-access-planning-lsp-mode-button;
+      }
+      &.selected {
+        background-color: $tp-transaction-quick-access-planning-lsp-mode-button;
+        co-icon {
+          fill: white;
+        }
+      }
+    }
+
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/_material-definition.scss

@@ -1 +1 @@
-$tp-transaction-quick-access-planning-lsp-mode-button: #1A73E8;
+$tp-transaction-quick-access-planning-lsp-mode-button: #1A73E8;

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/_theme.scss

@@ -1,4 +1,4 @@
-@include export-module('co-transaction-quick-access-interbranch-order-purchase-theme') {
-  .co-transaction-quick-access-interbranch-order-purchase {
-  }
-}
+@include export-module('co-transaction-quick-access-interbranch-order-purchase-theme') {
+  .co-transaction-quick-access-interbranch-order-purchase {
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interbranch-order-purchase/style/material.scss

@@ -1,4 +1,4 @@
-@import "../../../../style/mixin";
-@import "./_material-definition";
-@import "./_layout";
-@import "./_theme";
+@import "../../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";

package/lib/component/transaction-quick-access/transaction-quick-access-interrbranch-received-goods/style/_layout.scss

@@ -1,73 +1,73 @@
-@import "../../../../style/mixin";
-
-@include export-module('cc-transaction-quick-access-received-goods-layout') {
-  .co-transaction-quick-access-received-goods {
-
-    .quick-access-wrapper {
-      display: flex;
-      flex-direction: row;
-      column-gap: 10px;
-      align-items: start;
-
-      .sub-section-input {
-        display: flex;
-        flex-direction: column;
-        gap: 10px;
-      }
-
-      .sub-section {
-        display: flex;
-        flex-direction: row;
-        column-gap: 10px;
-        .checkbox-wrapper {
-          display: flex;
-          flex-direction: row;
-        }
-
-        .dots-wrapper {
-          display: flex;
-          transform: scale(0.7);
-
-          .dot {
-            width: 8px;
-            height: 8px;
-            background-color: black;
-            border-radius: 16px;
-            transform: scale(0.3);
-          }
-        }
-
-        .co-input-date {
-          min-width: 170px;
-        }
-
-        .co-input-text {
-          min-width: 100px;
-        }
-
-        .button-wrapper {
-          background: $tp-default-background-accent;
-          border-radius: $tp-default-border-radius;
-          padding: 5px;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          justify-content: center;
-          cursor: pointer;
-          width: 68px;
-          height: 46px;
-
-          .button-icon {
-            height: 20px;
-            width: 20px;
-          }
-
-          span {
-            font-size: 10px;
-            margin-top: 3px;
-          }
-        }
-      }
-    }
-  }
-}
+@import "../../../../style/mixin";
+
+@include export-module('cc-transaction-quick-access-received-goods-layout') {
+  .co-transaction-quick-access-received-goods {
+
+    .quick-access-wrapper {
+      display: flex;
+      flex-direction: row;
+      column-gap: 10px;
+      align-items: start;
+
+      .sub-section-input {
+        display: flex;
+        flex-direction: column;
+        gap: 10px;
+      }
+
+      .sub-section {
+        display: flex;
+        flex-direction: row;
+        column-gap: 10px;
+        .checkbox-wrapper {
+          display: flex;
+          flex-direction: row;
+        }
+
+        .dots-wrapper {
+          display: flex;
+          transform: scale(0.7);
+
+          .dot {
+            width: 8px;
+            height: 8px;
+            background-color: black;
+            border-radius: 16px;
+            transform: scale(0.3);
+          }
+        }
+
+        .co-input-date {
+          min-width: 170px;
+        }
+
+        .co-input-text {
+          min-width: 100px;
+        }
+
+        .button-wrapper {
+          background: $tp-default-background-accent;
+          border-radius: $tp-default-border-radius;
+          padding: 5px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          cursor: pointer;
+          width: 68px;
+          height: 46px;
+
+          .button-icon {
+            height: 20px;
+            width: 20px;
+          }
+
+          span {
+            font-size: 10px;
+            margin-top: 3px;
+          }
+        }
+      }
+    }
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interrbranch-received-goods/style/_theme.scss

@@ -1,6 +1,6 @@
-@import "../../../../style/mixin";
-
-@include export-module('cc-transaction-quick-access-received-goods-theme') {
-  .co-transaction-quick-access-received-goods {
-  }
-}
+@import "../../../../style/mixin";
+
+@include export-module('cc-transaction-quick-access-received-goods-theme') {
+  .co-transaction-quick-access-received-goods {
+  }
+}

package/lib/component/transaction-quick-access/transaction-quick-access-interrbranch-received-goods/style/material.scss

@@ -1,4 +1,4 @@
-@import "../../../../style/mixin";
-@import "./_material-definition";
-@import "./_layout";
-@import "./_theme";
+@import "../../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";

package/package.json

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