@colijnit/transaction 12.1.145 → 12.1.147

package/lib/component/checkout/checkout.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter, OnInit } from '@angular/core';
+import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
 import { TransactionService } from '../../service/transaction.service';
 import { DictionaryService } from '../../service/dictionary.service';
 import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
@@ -10,8 +10,10 @@ import { PaymentComponent } from '../payment/payment.component';
 import { StepperComponent } from '../stepper/stepper.component';
 import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
 import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
-export declare class CheckoutComponent implements OnInit {
+import { RelationService } from '../../service/relation.service';
+export declare class CheckoutComponent implements OnInit, OnDestroy {
     service: TransactionService;
+    private _relationService;
     private _dictionary;
     private _dialogService;
     readonly transKind: typeof TransactionKind;
@@ -37,8 +39,9 @@ export declare class CheckoutComponent implements OnInit {
     deliveryAddressNawNr: number;
     invoiceAddressNawNr: number;
     relationType: RelationKind;
-    constructor(service: TransactionService, _dictionary: DictionaryService, _dialogService: DialogService);
+    constructor(service: TransactionService, _relationService: RelationService, _dictionary: DictionaryService, _dialogService: DialogService);
     ngOnInit(): void;
+    ngOnDestroy(): void;
     handleCreateTransaction(event: MouseEvent): Promise<void>;
     handleRelationValidation(): Promise<boolean>;
     handleDeliveryValidation(): Promise<boolean>;

package/lib/component/core/base/transaction-base.component.d.ts

@@ -63,6 +63,8 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     fullyInvoiced: boolean;
     fullyDelivered: boolean;
     hasMultipleLines: boolean;
+    canAllLinesBeDelivered: boolean;
+    canAllLinesBeInvoiced: boolean;
     hasLinesToDeliver: boolean;
     hasLinesToInvoice: boolean;
     lineHasLogisticalState: boolean;

package/lib/component/dialog/dialog-header-search/style/_layout.scss

@@ -12,6 +12,7 @@
     }
     .co-input-search {
       height: $tp-dialog-header-search-input-height;
+      margin: $tp-dialog-header-search-input-margin;
       .co-input-text:not(.custom-height) {
         label {
           top: math.div($tp-dialog-header-search-input-height, 2);

package/lib/component/dialog/dialog-header-search/style/_material-definition.scss

@@ -3,4 +3,5 @@ $tp-dialog-header-search-title-font-size: $tp-font-size-big !default;
 $tp-dialog-header-search-title-font-weight: bold !default;
 $tp-dialog-header-search-title-margin: 0 0 20px 0 !default;
 $tp-dialog-header-search-input-height: $cc-co-input-search-height !default;
-$tp-dialog-header-search-margin: 0 0 20px 0 !default;
+$tp-dialog-header-search-margin: 0 0 10px 0 !default;
+$tp-dialog-header-search-input-margin: 10px 0 0 0 !default;

package/lib/component/dialog/transaction-line/dialog-transaction-line-commission-code/style/_material-definition.scss

@@ -1,2 +1,2 @@
 $tp-dialog-transaction-line-commission-code-min-width: 410px !default;
-$tp-dialog-transaction-line-commission-code-height: 100px !default;
+$tp-dialog-transaction-line-commission-code-height: 200px !default;

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

@@ -6,16 +6,13 @@ import { PaymentService } from '../../service/payment.service';
 import { SharedService } from '../../service/shared.service';
 import { PaymentMethod } from '@colijnit/transactionapi/build/model/payment-method.bo';
 import { PaymentViewmodel } from '../../model/payment.viewmodel';
-import { DepositPaymentViewModel } from '../../model/deposit-payment-view-model';
-import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
 import { TransactionEventService } from '../../service/transaction-event.service';
 export declare class PaymentComponent implements OnInit, OnDestroy {
-    paymentService: PaymentService;
     private _transactionService;
     private _sharedService;
+    private _paymentService;
     private _transactionEventService;
     readonly icons: typeof Icon;
-    readonly transKind: typeof TransactionKind;
     transId: number;
     transactionUuid: string;
     branch: string;
@@ -23,34 +20,45 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     set amount(value: number);
     get amount(): number;
     currencyId: number;
-    transactionKind: TransactionKind;
     payed: EventEmitter<void>;
     showClass(): boolean;
-    selectedPaymentMethod: PaymentMethod;
-    selectedCashRegister: CashRegister;
+    paymentMethodIdx: number;
+    cashRegisterIdx: number;
     paymentMethods: PaymentViewmodel[];
-    depositPayments: DepositPaymentViewModel[];
     cashRegisters: any[];
     showCashRegisters: boolean;
+    showKeyPad: boolean;
     showPspQrCode: boolean;
+    currentPaymentMethod: PaymentMethod;
     qrCodeImage: string;
     showLoader: boolean;
     amountToPay: number;
+    statusMessage: string;
     private _amount;
     private _paymentStatusInterval;
+    private _paymentStatusPollIntervalMs;
+    private _paymentStatusMaxPollInterval;
+    private _paymentStatusPollIntervalCount;
+    private _paymentResult;
     private _subs;
-    constructor(paymentService: PaymentService, _transactionService: TransactionService, _sharedService: SharedService, _transactionEventService: TransactionEventService);
+    constructor(_transactionService: TransactionService, _sharedService: SharedService, _paymentService: PaymentService, _transactionEventService: TransactionEventService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
-    paymentMethodSelected(method: PaymentMethod): void;
-    cashRegisterSelected(cashRegister: CashRegister): void;
+    paymentMethodSelected(method: PaymentMethod, index: number): void;
+    cashRegisterSelected(cashRegister: CashRegister, index: number): void;
+    handlePayment(): void;
     handleKeyPadModelChange(model: number): void;
     private _getDepositPaymentInfo;
-    private _calculateAmountToPay;
+    private _dataUriToBase64;
+    private _waitForPaymentStatus;
+    private _waitForPinPaymentStatus;
     private _clearInterval;
+    /**
+     *
+     * @private
+     */
     private _prepareCashRegisters;
     private _getCashRegisters;
     private _getPaymentMethods;
-    private _getToPayDetails;
-    handlePayment(): void;
+    private _handlePayment;
 }

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

@@ -101,6 +101,7 @@
     .payment-to-pay-keypad {
       grid-column: 2 / 2;
       grid-row: 1 / 3;
+      max-width: $tp-payment-keypad-max-width;
     }
   }
 }

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

@@ -20,3 +20,4 @@ $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;
+$tp-payment-keypad-max-width: 300px !default;

package/lib/component/transaction-cash-register-order/transaction-cash-register-order.component.d.ts

@@ -31,6 +31,7 @@ export declare class TransactionCashRegisterOrderComponent extends TransactionBa
     showLinkRelationDialog: boolean;
     showCashRegisterPaymentDialog: boolean;
     transId: number;
+    transactionUuid: string;
     currencyId: number;
     cashRegisterPaymentDetails: PaymentTransactionViewModel;
     private _subs;

package/lib/component/transaction-cash-register-order/transaction-cash-register-payment-dialog/transaction-cash-register-payment-dialog.component.d.ts

@@ -10,6 +10,7 @@ export declare class TransactionCashRegisterPaymentDialogComponent implements On
     private _transactionEventService;
     readonly paymentStates: typeof TransactionCashRegisterPaymentState;
     transId: number;
+    transactionUuid: string;
     currencyId: number;
     set paymentViewModel(paymentViewModel: PaymentViewmodel);
     closeDialog: EventEmitter<void>;

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

@@ -133,6 +133,10 @@
     }
     .save-button, .close-button {
       height: $tp-transaction-header-popup-save-button-size;
+      border-color: $tp-transaction-header-popup-button-border-color;
+      border-style: $tp-transaction-header-popup-button-border-style;
+      border-width: $tp-transaction-header-popup-button-border-width;
+      cursor: pointer;
       .co-icon {
         height: $tp-transaction-header-popup-save-button-icon-size;
         width: $tp-transaction-header-popup-save-button-icon-size;
@@ -171,5 +175,12 @@
         margin: 5px 0 0 0;
       }
     }
+    .co-carousel {
+      .carousel-wrapper {
+        .co-relation-address-tile {
+          height: 100%;
+        }
+      }
+    }
   }
 }

package/lib/component/transaction-header/transaction-header-popup/style/_material-definition.scss

@@ -45,6 +45,9 @@ $tp-transaction-header-popup-section-grid-column-gap: 20px !default;
 $tp-transaction-header-popup-save-button-size: 40px !default;
 $tp-transaction-header-popup-save-button-icon-size: 20px !default;
 $tp-transaction-header-popup-save-button-icon-color: $tp-color-action !default;
+$tp-transaction-header-popup-button-border-color: #DCE4EA !default;
+$tp-transaction-header-popup-button-border-width: 0 0 2px 0 !default;
+$tp-transaction-header-popup-button-border-style: solid !default;
 
 $tp-transaction-header-popup-business-rule-applied-icon-size: 20px !default;
 $tp-transaction-header-popup-business-rule-applied-icon-color: red !default;

package/lib/component/transaction-header-fields/transaction-header-remaining-amount.component.d.ts

@@ -9,7 +9,6 @@ export declare class TransactionHeaderRemainingAmountComponent implements OnInit
     transactionUuid: string;
     remainingAmountChange: EventEmitter<number>;
     showClass: boolean;
-    remainingAmount: number;
     private _subs;
     constructor(transactionService: TransactionService, _transactionEventService: TransactionEventService, _paymentService: PaymentService);
     ngOnInit(): void;

package/lib/component/transaction-line/transaction-invoice-line/transaction-invoice-line-base.component.d.ts

@@ -4,7 +4,7 @@ import { TransactionTypeCategory } from '../../../enum/transaction-type-category
 export declare abstract class TransactionInvoiceLineBaseComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
     readonly category: typeof TransactionTypeCategory;
     private _subscriptions;
-    showCheckBox: boolean;
+    showCheckbox: boolean;
     ngOnInit(): void;
     ngOnDestroy(): void;
     protected visibilitySet(visible: boolean): void;
@@ -12,4 +12,5 @@ export declare abstract class TransactionInvoiceLineBaseComponent extends Transa
     handleLineClicked(mouseClick: PointerEvent): void;
     handleSelectCheckboxClick(checked: boolean): Promise<void>;
     updateSelectedQuantity(): Promise<void>;
+    private _checkCheckbox;
 }

package/lib/component/transaction-line/transaction-line/style/_layout.scss

@@ -100,7 +100,7 @@
         height: 100%;
       }
     }
-    .transaction-line-totals-price, .transaction-line-totals-discount, .transaction-line-totals-total {
+    .transaction-line-totals-price, .transaction-line-totals-discount, .transaction-line-totals-total, .transaction-line-confirmed-price {
       display: flex;
       align-items: center;
       justify-content: $tp-transaction-line-totals-justify-content;

package/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line-base.component.d.ts

@@ -2,11 +2,13 @@ import { OnDestroy, OnInit } from '@angular/core';
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
 export declare abstract class TransactionOrderDeliveryLineBaseComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
     private _subscriptions;
+    showCheckbox: boolean;
     ngOnInit(): void;
-    protected transactionLineSet(): void;
     ngOnDestroy(): void;
     showNumberPicker(): boolean;
     handleLineClicked(mouseClick: PointerEvent): void;
     handleSelectCheckboxClick(checked: boolean): Promise<void>;
     updateSelectedQuantity(): Promise<void>;
+    protected transactionLineSet(): void;
+    private _checkCheckbox;
 }

package/lib/component/transaction-line/transaction-purchase-order-line/style/_layout.scss

@@ -7,7 +7,7 @@
       margin-right: 10px;
       column-gap: 10px;
 
-      co-transaction-line-statusbar {
+      .co-transaction-line-statusbar {
         width: 75px;
       }
 
@@ -17,16 +17,22 @@
         column-gap: 10px;
         row-gap: 10px;
 
-        co-input-text, co-editable-label {
+        .co-input-text, .co-editable-label, .co-transaction-line-confirmed-price {
           width: $tp-transaction-default-button-width;
           height: $tp-transaction-default-button-height;
         }
 
-        co-input-number-picker {
+        .co-input-number-picker {
           width: $tp-transaction-line-input-number-picker-width;
           height: $tp-transaction-default-button-height;
         }
       }
     }
+    .transaction-input-right-align {
+      input {
+        width: 100%;
+        text-align: $tp-transaction-input-right-align;
+      }
+    }
   }
 }

package/lib/component/transaction-line/transaction-purchase-order-line/transaction-purchase-order-line.component.d.ts

@@ -1,5 +1,4 @@
 import { TransactionPurchaseOrderLineBaseComponent } from './transaction-purchase-order-line-base.component';
 export declare class TransactionPurchaseOrderLineComponent extends TransactionPurchaseOrderLineBaseComponent {
     showClass(): boolean;
-    confirmDeliveryDate(data: any): void;
 }

package/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.component.d.ts

@@ -0,0 +1,34 @@
+import { ChangeDetectorRef, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { Icon } from '../../enum/icon.enum';
+import { TransactionBaseComponent } from '../core/base/transaction-base.component';
+import { OverlayService } from '@colijnit/corecomponents_v12';
+import { TransactionEventService } from '../../service/transaction-event.service';
+import { TransactionService } from '../../service/transaction.service';
+import { IconCacheService } from '../../service/icon-cache.service';
+import { TransactionScreenConfigurationService } from '../../service/transaction-screen-configuration.service';
+import { DictionaryService } from '../../service/dictionary.service';
+import { TransactionImageService } from '../../service/transaction-image.service';
+export declare class TransactionLineConfirmedDeliveryDateButtonComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    transactionScreenConfigurationService: TransactionScreenConfigurationService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    private _overlayService;
+    readonly icons: typeof Icon;
+    parentComponent: ElementRef;
+    showClass(): boolean;
+    confirmedDeliveryDate: Date;
+    showConfirmedDeliveryDate: boolean;
+    isConfirmedDateLater: boolean;
+    private _subs;
+    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, transactionScreenConfigurationService: TransactionScreenConfigurationService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _overlayService: OverlayService);
+    ngOnInit(): void;
+    ngOnDestroy(): void;
+    protected transactionInfoSet(): void;
+    protected transactionLineSet(): void;
+    private _checkConfirmedDeliveryDate;
+    private _checkDates;
+}

package/lib/component/transaction-line-fields/transaction-line-confirmed-delivery-date-button.module.d.ts

@@ -0,0 +1,2 @@
+export declare class TransactionLineConfirmedDeliveryDateButtonModule {
+}

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/style/_layout.scss

@@ -0,0 +1,17 @@
+@include export-module('co-transaction-line-confirmed-price-layout') {
+  .co-transaction-line-confirmed-price {
+    span {
+      width: 100%;
+      text-align: $co-transaction-line-confirmed-price-text-align;
+    }
+    .co-input-text {
+      input {
+        width: 100%;
+        text-align: $co-transaction-line-confirmed-price-text-align;
+      }
+    }
+  }
+  .input-text {
+    height: 20px;
+  }
+}

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/style/_material-definition.scss

@@ -0,0 +1 @@
+$co-transaction-line-confirmed-price-text-align: end !default;

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('co-transaction-line-confirmed-price-theme') {
+  .co-transaction-line-confirmed-price {
+  }
+}

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/style/material.scss

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

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/transaction-line-confirmed-price.component.d.ts

@@ -0,0 +1,17 @@
+import { EventEmitter } from '@angular/core';
+import { InputTextComponent } from '@colijnit/corecomponents_v12';
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+export declare class TransactionLineConfirmedPriceComponent extends TransactionBaseComponent {
+    set child(content: any);
+    showLabel: boolean;
+    defaultEditMode: boolean;
+    readonly: boolean;
+    set editMode(value: boolean);
+    price: string;
+    priceChange: EventEmitter<string>;
+    get editMode(): boolean;
+    showClass: boolean;
+    handleClick(event: MouseEvent): void;
+    input: InputTextComponent;
+    private _editMode;
+}

package/lib/component/transaction-line-fields/transaction-line-confirmed-price/transaction-line-confirmed-price.module.d.ts

@@ -0,0 +1,2 @@
+export declare class TransactionLineConfirmedPriceModule {
+}

package/lib/component/transaction-line-purchase-confirmation/style/_layout.scss

@@ -28,7 +28,7 @@
     }
 
     .details-column {
-      width: 45%;
+      width: 50%;
       display: flex;
       row-gap: 10px;
       flex-direction: column;
@@ -46,7 +46,7 @@
 
     .divider-wrapper {
       display: flex;
-      width: 10%;
+      width: 5%;
       justify-content: center;
 
       .divider {

package/lib/component/transaction-line-sales-allocation/style/_layout.scss

@@ -1,28 +1,17 @@
 @include export-module('co-transaction-line-sales-allocation-layout') {
   .co-transaction-line-sales-allocation {
     .columns-wrapper {
-      display: flex;
     }
 
     .details-column {
-      width: 45%;
-    }
-
-    .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;
+      gap: 10px;
+      > * {
+        flex: 1;
       }
     }
-
     .details-input {
-      margin: 5px; // $tp-co-transaction-request-details-input-margin;
+      margin: 10px 0;
     }
 
     .location-wrapper {

package/lib/component/transaction-line-side-panel/style/_layout.scss

@@ -101,5 +101,23 @@
     .hidden {
       visibility: hidden;
     }
+    .details-header {
+      font-size: 14px;
+      font-weight: bold;
+      color: #171721;
+    }
+    .collapsible-header {
+      padding: 0;
+    }
+    .co-transaction-button {
+      height: 45px;
+    }
+    .co-transaction-line-price {
+      .co-input-text {
+        input {
+          text-align: start;
+        }
+      }
+    }
   }
 }

package/lib/component/transaction-lines/style/material.scss

@@ -19,5 +19,6 @@
 @import "../../../component/transaction-line/transaction-cash-register-order-line/style/material";
 @import "../../../component/transaction-line/transaction-sales-order-quotation-line/style/material";
 @import "../../../component/transaction-line-fields/transaction-line-price/style/material";
+@import "../../../component/transaction-line-fields/transaction-line-confirmed-price/style/material";
 @import "../../shared/transaction-article-text/style/material";
 @import "../../shared/transaction-article-text-overview/style/material";

package/lib/component/transaction-quick-access/transaction-quick-access-order-confirmation/transaction-quick-access-order-confirmation.component.d.ts

@@ -1,6 +1,6 @@
-import { OnInit } from "@angular/core";
-import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
-import { GetPurchaseOrderConfirmation } from "@colijnit/transactionapi/build/model/get-purchase-order-confirmation";
+import { OnInit } from '@angular/core';
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { GetPurchaseOrderConfirmation } from '@colijnit/transactionapi/build/model/get-purchase-order-confirmation';
 export declare class TransactionQuickAccessOrderConfirmationComponent extends TransactionBaseComponent implements OnInit {
     purchaseOrderConfirmation: GetPurchaseOrderConfirmation;
     showClass(): boolean;

package/lib/enum/icon.enum.d.ts

@@ -49,6 +49,7 @@ export declare enum Icon {
     GripDotsVerticalSolid = "grip_dots_vertical_solid",
     IdealLogo = "ideal_logo",
     InboxInSolid = "inbox_in_solid",
+    IndustryRegular = "industry_regular",
     IndustrySolid = "industry_solid",
     Invoice = "invoice",
     ListRegular = "list_regular",