@colijnit/transaction 12.1.130 → 12.1.132

package/lib/component/cash-register-order-wrapper.ts/style/_layout.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-cash-register-order-wrapper-layout') {
+  .co-cash-register-order-wrapper {
+  }
+}

package/lib/component/cash-register-order-wrapper.ts/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-cash-register-order-wrapper-theme') {
+  .co-cash-register-order-wrapper {
+  }
+}

package/lib/component/cash-register-order-wrapper.ts/style/material.scss

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

package/lib/component/checkout/checkout-overview-relation-edit/style/_layout.scss

@@ -10,6 +10,15 @@
       border-style: $tp-checkout-relation-empty-button-border-style;
       border-width: $tp-checkout-relation-empty-button-border-width;
       border-radius: $tp-checkout-relation-empty-button-border-radius;
+      span {
+        color: $tp-checkout-simple-relation-empty-text-color;
+      }
+      &:hover {
+        filter: none;
+        span {
+          color: $tp-checkout-simple-relation-empty-hover-text-color;
+        }
+      }
     }
   }
 }

package/lib/component/checkout/checkout-overview-relation-edit/style/_material-definition.scss

@@ -1,7 +1,10 @@
 $tp-checkout-relation-font-family: $tp-font-family !default;
 $tp-checkout-relation-font-size: $tp-font-size !default;
 $tp-checkout-relation-empty-button-background-color: transparent !default;
+$tp-checkout-relation-empty-button-hover-background-color: $tp-color-action !default;
 $tp-checkout-relation-empty-button-border-style: solid !default;
 $tp-checkout-relation-empty-button-border-width: 1px !default;
 $tp-checkout-relation-empty-button-border-radius: $tp-default-border-radius !default;
-$tp-checkout-relation-empty-button-border-color: $tp-color-font !default;
+$tp-checkout-relation-empty-button-border-color: $tp-color-action !default;
+$tp-checkout-simple-relation-empty-text-color: $tp-color-action !default;
+$tp-checkout-simple-relation-empty-hover-text-color: #FFFFFF !default;

package/lib/component/checkout/checkout-overview-relation-edit/style/_theme.scss

@@ -5,6 +5,9 @@
     .empty-relation-button {
       background-color: $tp-checkout-relation-empty-button-background-color;
       border-color: $tp-checkout-relation-empty-button-border-color;
+      &:hover {
+        background-color: $tp-checkout-relation-empty-button-hover-background-color;
+      }
     }
   }
 }

package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_layout.scss

@@ -10,6 +10,15 @@
       border-style: $tp-checkout-simple-relation-empty-button-border-style;
       border-width: $tp-checkout-simple-relation-empty-button-border-width;
       border-radius: $tp-checkout-simple-relation-empty-button-border-radius;
+      span {
+        color: $tp-checkout-simple-relation-empty-text-color;
+      }
+      &:hover {
+        filter: none;
+        span {
+          color: $tp-checkout-simple-relation-empty-hover-text-color;
+        }
+      }
     }
   }
 }

package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_material-definition.scss

@@ -1,7 +1,10 @@
 $tp-checkout-simple-relation-font-family: $tp-font-family !default;
 $tp-checkout-simple-relation-font-size: $tp-font-size !default;
 $tp-checkout-simple-relation-empty-button-background-color: transparent !default;
+$tp-checkout-relation-empty-button-hover-background-color: $tp-color-action !default;
 $tp-checkout-simple-relation-empty-button-border-style: solid !default;
 $tp-checkout-simple-relation-empty-button-border-width: 1px !default;
 $tp-checkout-simple-relation-empty-button-border-radius: $tp-default-border-radius !default;
-$tp-checkout-simple-relation-empty-button-border-color: $tp-color-font !default;
+$tp-checkout-simple-relation-empty-button-border-color: $tp-color-action !default;
+$tp-checkout-simple-relation-empty-text-color: $tp-color-action !default;
+$tp-checkout-simple-relation-empty-hover-text-color: #FFFFFF !default;

package/lib/component/checkout-simple/checkout-simple-overview-relation-edit/style/_theme.scss

@@ -5,6 +5,9 @@
     .empty-relation-button {
       background-color: $tp-checkout-simple-relation-empty-button-background-color;
       border-color: $tp-checkout-simple-relation-empty-button-border-color;
+      &:hover {
+        background-color: $tp-checkout-relation-empty-button-hover-background-color;
+      }
     }
   }
 }

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

@@ -15,7 +15,7 @@ import { TransactionEventService } from '../../../service/transaction-event.serv
 import { IconCacheService } from '../../../service/icon-cache.service';
 import { TransactionImageService } from '../../../service/transaction-image.service';
 import { RelationKind } from '@colijnit/relationapi/build/enum/relation-kind.enum';
-import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
 import { TransactionDeliveryCostLineInfo } from '@colijnit/transactionapi/build/model/transaction-delivery-cost-line-info.bo';
 export declare abstract class TransactionBaseComponent implements OnInit, OnDestroy {
     transactionEventService: TransactionEventService;

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

@@ -1,9 +1,13 @@
-import { OnInit } from '@angular/core';
+import { OnDestroy, 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 {
+import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
+import { TransactionEventService } from '../../service/transaction-event.service';
+export declare class DepositPaymentComponent implements OnInit, OnDestroy {
     private _paymentService;
+    private _transactionEventService;
+    readonly transKind: typeof TransactionKind;
     branch: string;
     showTitle: boolean;
     transactionUuid: string;
@@ -11,8 +15,10 @@ export declare class DepositPaymentComponent implements OnInit {
     paymentMethods: PaymentViewmodel[];
     depositPayments: DepositPaymentViewModel[];
     showLoader: boolean;
-    constructor(_paymentService: PaymentService);
+    private _subs;
+    constructor(_paymentService: PaymentService, _transactionEventService: TransactionEventService);
     ngOnInit(): void;
+    ngOnDestroy(): void;
     private _getDepositPaymentInfo;
     private _prepareData;
 }

package/lib/component/discount/discount.component.d.ts

@@ -0,0 +1,19 @@
+import { DictionaryService } from "../../service/dictionary.service";
+import { OrderDiscountType } from "../../enum/order-discount-type.enum";
+export declare class DiscountComponent {
+    private _dictionary;
+    readonly orderDiscountType: typeof OrderDiscountType;
+    showClass(): boolean;
+    discountHeader: string;
+    inputDiscounts: boolean;
+    transactionDiscountAmount: number;
+    transactionDiscountPercentage: number;
+    transactionTotal: number;
+    discountType: OrderDiscountType;
+    showDiscountsSidebar: boolean;
+    constructor(_dictionary: DictionaryService);
+    addDiscount(): void;
+    onStartDiscountInput(discountType: OrderDiscountType, header: string): void;
+    setDiscountHeader(discountType: OrderDiscountType): void;
+    onInputDiscountsOkClick(): void;
+}

package/lib/component/discount/discount.module.d.ts

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

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

@@ -7,11 +7,16 @@ 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 { PaymentTransactionViewModel } from "../../model/payment-transaction-view-model";
+import { TransactionEventService } from '../../service/transaction-event.service';
 export declare class PaymentComponent implements OnInit, OnDestroy {
     private _transactionService;
     private _sharedService;
     private _paymentService;
+    private _transactionEventService;
     readonly icons: typeof Icon;
+    readonly transKind: typeof TransactionKind;
     transId: number;
     transactionUuid: string;
     branch: string;
@@ -19,17 +24,18 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     set amount(value: number);
     get amount(): number;
     currencyId: number;
+    transactionKind: TransactionKind;
+    paymentDetails: PaymentTransactionViewModel;
     payed: EventEmitter<void>;
     showClass(): boolean;
-    paymentMethodIdx: number;
-    cashRegisterIdx: number;
+    selectedPaymentMethod: PaymentMethod;
+    selectedCashRegister: CashRegister;
     paymentMethods: PaymentViewmodel[];
     depositPayments: DepositPaymentViewModel[];
     cashRegisters: any[];
     showCashRegisters: boolean;
     showKeyPad: boolean;
     showPspQrCode: boolean;
-    currentPaymentMethod: PaymentMethod;
     qrCodeImage: string;
     showLoader: boolean;
     amountToPay: number;
@@ -40,14 +46,16 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _paymentStatusMaxPollInterval;
     private _paymentStatusPollIntervalCount;
     private _paymentResult;
-    constructor(_transactionService: TransactionService, _sharedService: SharedService, _paymentService: PaymentService);
+    private _subs;
+    constructor(_transactionService: TransactionService, _sharedService: SharedService, _paymentService: PaymentService, _transactionEventService: TransactionEventService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
-    paymentMethodSelected(method: PaymentMethod, index: number): void;
-    cashRegisterSelected(cashRegister: CashRegister, index: number): void;
+    paymentMethodSelected(method: PaymentMethod): void;
+    cashRegisterSelected(cashRegister: CashRegister): void;
     handlePayment(): void;
     handleKeyPadModelChange(model: number): void;
     private _getDepositPaymentInfo;
+    private _calculateAmountToPay;
     private _dataUriToBase64;
     private _waitForPaymentStatus;
     private _waitForPinPaymentStatus;
@@ -59,4 +67,6 @@ export declare class PaymentComponent implements OnInit, OnDestroy {
     private _prepareCashRegisters;
     private _getCashRegisters;
     private _getPaymentMethods;
+    private _handlePayment;
+    private _doPayment;
 }

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

@@ -51,6 +51,11 @@
       grid-template-rows: auto auto auto;
       row-gap: 10px;
       column-gap: 10px;
+
+      &.cash-register-order {
+        display: flex;
+        flex-direction: column;
+      }
     }
     .payment-to-pay {
       display: flex;

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

@@ -10,14 +10,11 @@ $tp-payment-header-extra-font-color: $tp-color-colijn-orange !default;
 $tp-payment-row-gap: 20px !default;
 $tp-payment-methods-column-gap: 5px !default;
 $tp-payment-methods-row-gap: 5px !default;
+$tp-payment-amount-border: 1px solid !default;
 $tp-payment-amount-height: 60px !default;
 $tp-payment-amount-font-family: $tp-font-family !default;
-$tp-payment-amount-font-size: 32px !default;
-$tp-payment-amount-font-weight: bold !default;
-$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-amount-font-size: $tp-font-size !default;
+$tp-payment-amount-font-weight: normal !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;

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

@@ -7,11 +7,6 @@
         color: $tp-color-colijn-orange;
       }
     }
-    .payment-amount {
-      color: $tp-payment-amount-color;
-      border-color: $tp-payment-amount-border-color;
-      background-color: $tp-payment-amount-background-color;
-    }
     .payment-to-pay-button {
       .payment-error-message {
         color: $tp-payment-error-font-color;
@@ -20,24 +15,5 @@
         background-color: $tp-color-colijn-orange;
       }
     }
-    .payment-to-pay-keypad {
-      .key-pad-wrapper {
-        background: transparent;
-        border-color: $tp-payment-amount-border-color;
-      }
-      .key-pad-button {
-        background-color: $tp-payment-amount-background-color;
-        color: $tp-payment-amount-color;
-        font-weight: bold;
-        .co-icon {
-          svg { // for fontawesome icons
-            fill: $tp-payment-amount-color;
-          }
-          & [fill] { // for own icons
-            fill: $tp-payment-amount-color;
-          }
-        }
-      }
-    }
   }
 }

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

@@ -4,3 +4,4 @@
 @import "../../payment-tile/style/material";
 @import "../../payment-qr-code/style/material";
 @import "../../deposit-payment/style/material";
+@import "../../payment-to-pay/style/material";

package/lib/component/payment-to-pay/payment-to-pay.component.d.ts

@@ -0,0 +1,4 @@
+export declare class PaymentToPayComponent {
+    amountToPay: number;
+    showClass(): boolean;
+}

package/lib/component/payment-to-pay/payment-to-pay.module.d.ts

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

package/lib/component/payment-to-pay/style/_layout.scss

@@ -0,0 +1,26 @@
+@include export-module('cc-payment-to-pay-layout') {
+  .co-payment-to-pay {
+
+    .payment-to-pay {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      row-gap: $tp-payment-to-pay-row-gap;
+      grid-column: 1 / 1;
+      grid-row: 1 / 1;
+    }
+
+    .payment-amount {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: $tp-payment-to-pay-amount-height;
+      border: $tp-payment-to-pay-amount-border;
+      font-family: $tp-payment-to-pay-amount-font-family;
+      font-size: $tp-payment-to-pay-amount-font-size;
+      font-weight: $tp-payment-to-pay-amount-font-weight;
+      border-radius: 5px;
+      width: 100%;
+    }
+  }
+}

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

@@ -0,0 +1,6 @@
+$tp-payment-to-pay-row-gap: 20px !default;
+$tp-payment-to-pay-amount-height: 60px !default;
+$tp-payment-to-pay-amount-border: 1px solid !default;
+$tp-payment-to-pay-amount-font-family: $tp-font-family !default;
+$tp-payment-to-pay-amount-font-size: 32px !default;
+$tp-payment-to-pay-amount-font-weight: bold !default;

package/lib/component/payment-to-pay/style/_theme.scss

@@ -0,0 +1,9 @@
+@include export-module('cc-payment-to-pay-theme') {
+  .co-payment-to-pay {
+    .payment-amount {
+      color: $tp-payment-amount-color;
+      border-color: $tp-payment-amount-border-color;
+      background-color: $tp-payment-amount-background-color;
+    }
+  }
+}

package/lib/component/payment-to-pay/style/material.scss

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

package/lib/component/quick-send-button/style/_layout.scss

@@ -16,6 +16,30 @@
         border-bottom-right-radius: $tp-co-quick-send-button-border-radius;
         border-top-right-radius: $tp-co-quick-send-button-border-radius;
       }
+      &:hover {
+        .icon-wrapper-flat-right {
+          background: $tp-co-quick-send-hover-button-icon-send-color;
+          co-icon {
+            svg {
+              fill: $tp-co-quick-send-hover-button-svg-text-color;
+            }
+          }
+        }
+        .icon-wrapper-flat-left {
+          background: $tp-co-quick-send-hover-button-icon-send-color;
+
+          .icons-wrapper {
+            .icon-send, .icon-method {
+              svg {
+                fill: $tp-co-quick-send-hover-button-svg-text-color;
+              }
+            }
+          }
+          .send-button-title {
+            color: $tp-co-quick-send-hover-button-svg-text-color;
+          }
+        }
+      }
     }
     .icons-spacer {
       width: 5px;

package/lib/component/quick-send-button/style/_material-definition.scss

@@ -11,6 +11,8 @@ $tp-co-quick-send-button-send-method-dialog-icon-size: 20px !default;
 $tp-co-quick-send-button-icon-send-width: 16px !default;
 $tp-co-quick-send-button-icon-send-height: 22px !default;
 $tp-co-quick-send-button-icon-send-color: $tp-color-action !default;
+$tp-co-quick-send-hover-button-icon-send-color: $tp-color-action !default;
+$tp-co-quick-send-hover-button-svg-text-color: #fff !default;
 $tp-co-quick-send-button-icon-send-method-width: 11px !default;
 $tp-co-quick-send-button-icon-send-method-height: 11px !default;
 $tp-co-quick-send-button-title-font-size: $tp-font-size-small !default;

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

@@ -4,6 +4,8 @@
   .co-tile {
     display: flex;
     position: relative;
+    width: 100%;
+    height: 100%;
     &.selected {
       transform: scale($tp-tile-selected-zoom);
     }
@@ -17,6 +19,8 @@
       padding: $tp-tile-padding;
       width: $tp-tile-min-width;
       height: $tp-tile-min-height;
+      min-height: $tp-tile-min-height;
+      width: 100%;
     }
     .co-tile-select-wrapper {
       //position: absolute;

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

@@ -0,0 +1,134 @@
+@include export-module('cc-transaction-cash-register-order-layout') {
+  .co-transaction-cash-register-order {
+    font-family: "Public sans";
+    font-size: 12px;
+    display: block;
+    padding: 25px;
+
+    .cash-register-wrapper {
+      display: flex;
+      width: 100%;
+      height: 100%;
+      column-gap: 40px;
+
+      .cash-register-main-content {
+        display: flex;
+        width: 75%;
+        row-gap: 30px;
+        height: inherit;
+        flex-direction: column;
+
+        .cash-register-header-wrapper {
+          display: flex;
+          margin-left: 20px;
+          justify-content: space-between;
+          align-items: center;
+
+          .cash-register-header-buttons-wrapper {
+            display: flex;
+            column-gap: 10px;
+
+            .cash-register-header-button {
+              width: 136px;
+              height: 30px;
+              background-color: #f5f5fc;
+              padding: 7px;
+              font-size: 11px;
+              border-radius: 8px;
+              display: flex;
+              align-items: center;
+              text-align: center;
+              font-weight: bold;
+              cursor: pointer;
+
+              .co-icon {
+                width: 20px;
+                height: 20px;
+              }
+            }
+          }
+
+          .cash-register-avatar-wrapper {
+            display: flex;
+
+            .transaction-sales-avatar {
+              height: 30px;
+              width: 30px;
+            }
+          }
+        }
+
+        .cash-register-lines-wrapper {
+          display: flex;
+          width: 100%;
+
+          .co-transaction-lines {
+            width: inherit;
+          }
+        }
+      }
+
+      .cash-register-side-content {
+        display: flex;
+        width: 25%;
+        height: inherit;
+        flex-direction: column;
+        row-gap: 50px;
+
+        .cash-register-totals-wrapper {
+          display: flex;
+          flex-direction: column;
+          font-size: 11px;
+          padding: 8px;
+          width: 100%;
+          background-color: white;
+          border: 1px solid #f3f3f6;
+          border-radius: 8px;
+          row-gap: 5px;
+
+          .cash-register-totals-row {
+            display: flex;
+            font-weight: bold;
+            justify-content: space-between;
+            padding: 5px;
+            &.total {
+              font-size: 12px;
+            }
+            &.discount {
+              background: #5fdcb3;
+              border-radius: 8px;
+              cursor: pointer;
+              color: white;
+            }
+          }
+
+        }
+
+        .cash-register-payment-wrapper {
+          display: flex;
+          flex-direction: column;
+          row-gap: 10px;
+
+          .cash-register-payment-methods-wrapper {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(125px, 1fr));
+            grid-gap: 5px;
+            padding: 8px;
+            border-radius: 8px;
+            background: $tp-payment-amount-background-color;
+
+            .co-tile-wrapper {
+              min-height: 70px;
+            }
+          }
+
+          .cash-register-num-pad-wrapper {
+            display: flex;
+            flex-direction: column;
+            row-gap: 10px;
+          }
+        }
+      }
+    }
+  }
+}

package/lib/component/transaction-cash-register-order/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-cash-register-order-theme') {
+  .co-transaction-cash-register-order {
+  }
+}

package/lib/component/transaction-cash-register-order/style/material.scss

@@ -0,0 +1,7 @@
+@import "../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";
+@import "../../payment-to-pay/style/material";
+@import "../transaction-cash-register-dialog/style/material";
+@import "../transaction-cash-register-order-receipt-dialog/style/material";

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

@@ -0,0 +1,37 @@
+@include export-module('cc-transaction-cash-register-dialog-layout') {
+  .co-transaction-cash-register-dialog {
+
+    .dialog-content-wrapper {
+      padding: 20px;
+      display: flex;
+      flex-direction: column;
+      row-gap: 20px;
+      min-width: 400px;
+    }
+
+    .title-wrapper {
+      display: flex;
+      column-gap: 10px;
+      align-items: center;
+      span {
+        margin: 0;
+      }
+    }
+
+    .cash-registers {
+      position: relative;
+      min-height: 50px;
+      display: flex;
+      flex-direction: row;
+      column-gap: 5px;
+      row-gap: 5px;
+      flex-wrap: wrap;
+      .loader {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-cash-register-dialog-theme') {
+  .co-transaction-cash-register-dialog {
+  }
+}

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

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