@colijnit/transaction 12.1.60 → 12.1.62

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

@@ -10,6 +10,9 @@
       width: $tp-payment-tile-width;
       height: $tp-payment-tile-height;
     }
+    .payment-wrapper {
+      padding: $tp-payment-padding;
+    }
     .payment-wrapper, .payment-cash-register-wrapper {
       display: flex;
       flex-direction: column;

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

@@ -2,6 +2,7 @@ $tp-payment-font-family: $tp-font-family !default;
 $tp-payment-font-size: $tp-font-size !default;
 $tp-payment-tile-width: $tp-tile-min-width !default;
 $tp-payment-tile-height: $tp-tile-min-height !default;
+$tp-payment-padding: 10px !default;
 $tp-payment-header-font-family: $tp-font-family !default;
 $tp-payment-header-font-size: $tp-font-size !default;
 $tp-payment-header-font-weight: bold !default;

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

@@ -3,21 +3,47 @@
 @include export-module('co-transaction-header-order-layout') {
   .co-transaction-header-order {
     display: flex;
-    .transaction-header-block-content-third {
+
+    .transaction-header-block-header {
+      co-icon {
+        position: relative;
+        height: $tp-transaction-header-order-discount-button-width;
+        width: $tp-transaction-header-order-discount-button-width;
+      }
+    }
+
+    .header-discount {
+      cursor: pointer;
       display: flex;
-      flex-direction: column;
+      column-gap: 10px;
       align-items: center;
+      width: 100%;
+      height: $tp-transaction-header-order-discount-height;
+      font-size: $tp-transaction-header-order-discount-font-size;
+      border: $tp-transaction-header-order-discount-border;
+      border-radius: $tp-transaction-header-order-discount-border-radius;
+      padding: $tp-transaction-header-order-discount-padding;
     }
-    .header-order-definitive {
+
+    .transaction-header-block-content-third {
       display: flex;
+      flex-direction: column;
       align-items: center;
-      column-gap: 10px;
     }
+
+    .co-transaction-header-definitive {
+      .co-input-checkbox {
+        font-size: $tp-font-size-small;
+        flex-direction: column-reverse;
+      }
+    }
+
     .transaction-line-button {
       flex-direction: column;
       height: 100%;
       padding: $tp-transaction-header-block-order-discount-padding;
     }
+
     .co-transaction-header-definitive {
       font-weight: normal;
     }

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

@@ -1 +1,11 @@
 $tp-transaction-header-block-order-discount-padding: 0 30px !default;
+$tp-transaction-header-order-discount-button-width: 17px !default;
+$tp-transaction-header-order-discount-font-size: $tp-font-size !default;
+$tp-transaction-header-order-discount-font-color: $tp-color-active-light !default;
+$tp-transaction-header-order-discount-background-color: $tp-default-background-accent !default;
+$tp-transaction-header-order-discount-height: $tp-default-button-height !default;
+$tp-transaction-header-order-discount-border: 1px solid !default;
+$tp-transaction-header-order-discount-border-color: $tp-color-border !default;
+$tp-transaction-header-order-discount-border-radius: 10px !default;
+$tp-transaction-header-order-discount-padding: 5px 10px !default;
+$tp-transaction-header-order-discount-icon-color: $tp-color-font !default;

package/lib/component/transaction-header/transaction-header-order/style/_theme.scss

@@ -2,5 +2,18 @@
 
 @include export-module('co-transaction-header-order-theme') {
   .co-transaction-header-order {
+    .header-discount {
+      color: $tp-transaction-header-order-discount-font-color;
+      background-color: $tp-transaction-header-order-discount-background-color;
+      border-color: $tp-transaction-header-order-discount-border-color;
+      .header-order-discount-icon {
+        svg { // for fontawesome icons
+          fill: $tp-transaction-header-order-discount-icon-color;
+        }
+        & [fill] { // for own icons
+          fill: $tp-transaction-header-order-discount-icon-color;
+        }
+      }
+    }
   }
 }

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

@@ -1,6 +1,13 @@
 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";
 export declare class TransactionHeaderOrderComponent extends TransactionBaseComponent {
+    iconService: IconCacheService;
+    protected readonly service: TransactionService;
+    readonly icons: typeof Icon;
     showClass(): boolean;
     showDiscountDialog: boolean;
+    constructor(iconService: IconCacheService, service: TransactionService);
     handleShowDiscountDialog(event: MouseEvent): void;
 }

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

@@ -79,7 +79,7 @@
         color: $tp-transaction-delivery-line-delivered-bold-color;
       }
       co-icon [fill] {
-        fill: $tp-transaction-delivery-line-delivered-bold-color !important;
+        fill: $tp-transaction-delivery-line-delivered-bold-color;
       }
     }
     .partially-delivered {
@@ -93,7 +93,7 @@
         color: $tp-transaction-delivery-line-partially-delivered-bold-color;
       }
       co-icon [fill] {
-        fill: $tp-transaction-delivery-line-partially-delivered-bold-color !important;
+        fill: $tp-transaction-delivery-line-partially-delivered-bold-color;
       }
     }
     &.preview {

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

@@ -61,7 +61,7 @@
       }
     }
     & > co-icon-collapse-handle {
-      position: absolute !important;
+      position: absolute;
       flex-shrink: 0;
       top: 50vh;
       &.fullscreen {

package/lib/component/transaction-search/style/_material-definition.scss

@@ -64,8 +64,6 @@ $tp-co-transaction-search-input-text-sidebar-width: 250px !default;
 $tp-co-transaction-search-input-text-sidebar-height: 40px !default;
 $tp-co-transaction-search-input-text-sidebar-margin-top: 5px !default;
 $tp-co-transaction-search-input-text-label-margin-left: 5% !default;
-$tp-co-transaction-search-input-text-sidebar-label-relative-top: 20px !default;
-$tp-co-transaction-search-input-text-sidebar-input-margin-top: 13px !default;
 $tp-co-transaction-search-view-modes-wrapper-padding: 0 35px !default;
 
 $tp-transaction-tile-background-color: $tp-color-light  !default;

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

@@ -63,10 +63,6 @@
     }
 
     .transaction-search-general {
-
-      input {
-        margin-left: $tp-co-transaction-search-input-text-label-margin-left !important;
-      }
       co-input-text label {
         left: 0;
       }
@@ -84,12 +80,6 @@
           height: $tp-co-transaction-search-input-text-sidebar-height;
           transition: width 0.2s ease-in-out;
           margin-top: $tp-co-transaction-search-input-text-sidebar-margin-top;
-          label {
-            top: $tp-co-transaction-search-input-text-sidebar-label-relative-top;
-          }
-          input {
-            margin: $tp-co-transaction-search-input-text-sidebar-input-margin-top;
-          }
         }
       }
     }

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

@@ -39,6 +39,7 @@ export declare enum Icon {
     Menu = "menu",
     ObjectIntersectSolid = "object_intersect_solid",
     PalletBoxesSolid = "pallet_boxes_solid",
+    PercentSolid = "percent_solid",
     PlusRound = "plus_round",
     PrintSolid = "print_solid",
     Purchase = "purchase",

package/lib/style/_variables.scss

@@ -94,34 +94,34 @@ $tp-transaction-dialog-footer-justify-content: center !default;
 $tp-transaction-dialog-footer-column-gap: 10px !default;
 
 /* core components override */
-$cc-color-action: $tp-color-font;
-$cc-btn-color: $tp-color-action;
-$cc-checkbox-border-radius: 7px;
-$cc-checkbox-check-background-color: white;
-$cc-checkbox-check-border-color: #5FDCB3;
-$cc-checkbox-check-color: #5FDCB3;
-$cc-radio-button-height: 32px;
-$cc-item-size: 50px;
+$cc-color-action: $tp-color-font !default;
+$cc-btn-color: $tp-color-action !default;
+$cc-checkbox-border-radius: 7px !default;
+$cc-checkbox-check-background-color: white !default;
+$cc-checkbox-check-border-color: #5FDCB3 !default;
+$cc-checkbox-check-color: #5FDCB3 !default;
+$cc-radio-button-height: 32px !default;
+$cc-item-size: 50px !default;
 
-$cc-co-dialog-header-text-color: $tp-color-font;
-$cc-co-dialog-header-padding: 0 0 20px 0;
-$cc-co-dialog-header-margin: 0 0 20px 0;
-$cc-co-dialog-padding: 30px 30px 60px 30px;
+$cc-co-dialog-header-text-color: $tp-color-font !default;
+$cc-co-dialog-header-padding: 0 0 20px 0 !default;
+$cc-co-dialog-header-margin: 0 0 20px 0 !default;
+$cc-co-dialog-padding: 30px 30px 60px 30px !default;
 
-$cc-btn-border-radius: 5px;
-$cc-btn-height: 36px;
+$cc-btn-border-radius: 5px !default;
+$cc-btn-height: 36px !default;
 
-$cc-co-dialog-header-close-button-background-color: $tp-color-action;
+$cc-co-dialog-header-close-button-background-color: $tp-color-action !default;
 
-$cc-collapsible-content-padding: 10px 0px 0px 0px;
+$cc-collapsible-content-padding: 10px 0px 0px 0px !default;
 
-$cc-co-commit-buttons-button-background: none;
+$cc-co-commit-buttons-button-background: none !default;
 
-$cc-simple-grid-header-border-color: white;
-$cc-simple-grid-header-font-size: 11px;
-$cc-simple-grid-cell-padding: 0 5px;
-$cc-simple-grid-row-selected-background-color: #f0f5ff;
-$cc-simple-grid-row-height: 60px;
+$cc-simple-grid-header-border-color: white !default;
+$cc-simple-grid-header-font-size: 11px !default;
+$cc-simple-grid-cell-padding: 0 5px !default;
+$cc-simple-grid-row-selected-background-color: #f0f5ff !default;
+$cc-simple-grid-row-height: 60px !default;
 
-$cc-co-carousel-padding: 10px 20px;
+$cc-co-carousel-padding: 10px 20px !default;
 /****************************/

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.60",
+  "version": "12.1.62",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.0",
     "@angular/core": "^12.2.0",
     "@colijnit/articleapi": ">=1.0.15",
-    "@colijnit/corecomponents_v12": ">=12.0.81",
+    "@colijnit/corecomponents_v12": ">=12.0.83",
     "@colijnit/ioneconnector": ">=2.1.8",
     "@colijnit/mainapi": ">=1.0.2",
     "@colijnit/relationapi": ">=1.0.2",