@colijnit/transaction 12.1.113 → 12.1.115

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

@@ -52,26 +52,6 @@
       row-gap: 10px;
       column-gap: 10px;
     }
-    .payment-to-pay {
-      display: flex;
-      flex-direction: column;
-      align-items: flex-start;
-      row-gap: $tp-payment-row-gap;
-      grid-column: 1 / 1;
-      grid-row: 1 / 1;
-    }
-    .payment-amount {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: $tp-payment-amount-height;
-      border: $tp-payment-amount-border;
-      font-family: $tp-payment-amount-font-family;
-      font-size: $tp-payment-amount-font-size;
-      font-weight: $tp-payment-amount-font-weight;
-      border-radius: 5px;
-      width: 100%;
-    }
 
     .payment-deposit {
       grid-column: 1 / 1;

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

@@ -10,14 +10,7 @@ $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-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-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

@@ -39,6 +39,13 @@
       .icon-send {
         width: $tp-co-quick-send-button-icon-send-width;
         height: $tp-co-quick-send-button-icon-send-height;
+
+        svg { // for fontawesome icons
+          fill: $tp-co-quick-send-button-icon-send-color;
+        }
+        & [fill] { // for own icons
+          fill: $tp-co-quick-send-button-icon-send-color;
+        }
       }
       .icon-method {
         width: $tp-co-quick-send-button-icon-send-method-width;

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

@@ -10,6 +10,7 @@ $tp-co-quick-send-button-disabled-opacity: 0.5 !default;
 $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-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);
     }
@@ -15,8 +17,8 @@
       border: $tp-tile-border;
       border-radius: $tp-tile-border-radius;
       padding: $tp-tile-padding;
-      min-width: $tp-tile-min-width;
       min-height: $tp-tile-min-height;
+      width: 100%;
     }
     .co-tile-select-wrapper {
       //position: absolute;

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

@@ -106,35 +106,6 @@
     //    width: 20px;
     //  }
     //}
-    .fully-delivered {
-      border-color: $tp-transaction-delivery-line-delivered-secondary-color;
-      background-color: $tp-transaction-delivery-line-delivered-primary-color;
-
-      input {
-        color: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-      span {
-        color: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-      co-icon [fill] {
-        fill: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-    }
-    .partially-delivered {
-      border-color: $tp-transaction-delivery-line-partially-delivered-secondary-color;
-      background-color: $tp-transaction-delivery-line-partially-delivered-primary-color;
-
-      input {
-        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-      span {
-        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-      co-icon [fill] {
-        fill: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-    }
-
     .card-side-panel-button {
       background: #f5f5fc;
       border-radius: 5px;

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

@@ -0,0 +1,126 @@
+@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;
+          width: 100%;
+          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: 5px;
+              font-size: 11px;
+              border-radius: 8px;
+              display: flex;
+              align-items: center;
+              text-align: center;
+              font-weight: bold;
+              cursor: pointer;
+            }
+          }
+
+          .cash-register-avatar-wrapper {
+            display: flex;
+
+            .transaction-sales-avatar {
+              height: 30px;
+              width: 30px;
+            }
+          }
+        }
+
+        .cash-register-lines-wrapper {
+          display: flex;
+
+
+        }
+      }
+
+      .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,5 @@
+@import "../../../style/mixin";
+@import "./_material-definition";
+@import "./_layout";
+@import "./_theme";
+@import "../../payment-to-pay/style/material";

package/lib/component/transaction-line/transaction-base-line/style/_material-definition.scss

@@ -1,8 +1,2 @@
-$tp-transaction-delivery-line-delivered-primary-color: #e5f9f3 !default;
-$tp-transaction-delivery-line-delivered-secondary-color: #e4f9f3 !default;
-$tp-transaction-delivery-line-delivered-bold-color: #5fdcb3 !default;
-$tp-transaction-delivery-line-partially-delivered-primary-color: #feece3 !default;
-$tp-transaction-delivery-line-partially-delivered-secondary-color: #fde6db !default;
-$tp-transaction-delivery-line-partially-delivered-bold-color: #f8854c !default;
 $tp-transaction-base-line-delete-icon-size: 15px !default;
 $tp-transaction-base-line-min-height: 75px !default;

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

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

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

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

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

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

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

@@ -0,0 +1,4 @@
+import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
+export declare class TransactionCashRegisterOrderLineComponent extends TransactionBaseComponent {
+    showClass(): boolean;
+}

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

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

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

@@ -119,34 +119,6 @@
     //    width: 20px;
     //  }
     //}
-    .fully-delivered {
-      border-color: $tp-transaction-delivery-line-delivered-secondary-color;
-      background-color: $tp-transaction-delivery-line-delivered-primary-color;
-
-      input {
-        color: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-      span {
-        color: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-      co-icon [fill] {
-        fill: $tp-transaction-delivery-line-delivered-bold-color;
-      }
-    }
-    .partially-delivered {
-      border-color: $tp-transaction-delivery-line-partially-delivered-secondary-color;
-      background-color: $tp-transaction-delivery-line-partially-delivered-primary-color;
-
-      input {
-        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-      span {
-        color: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-      co-icon [fill] {
-        fill: $tp-transaction-delivery-line-partially-delivered-bold-color;
-      }
-    }
     &.preview {
       .transaction-line-wrapper {
         align-items: center;

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

@@ -9,9 +9,9 @@
         $tp-transaction-line-button-width
         $tp-transaction-line-button-width
         $tp-transaction-line-button-width
-        90px
-        30px
-        $tp-transaction-line-button-width;
+        $tp-transaction-line-button-width
+        $tp-transaction-line-input-number-picker-width
+        $tp-transaction-line-input-number-picker-width;
       grid-template-rows: $tp-transaction-line-button-height;
       gap: 0 10px;
       grid-template-areas:

package/lib/component/transaction-line/transaction-receive-goods-line/transaction-receive-goods-line-base.component.d.ts

@@ -12,7 +12,6 @@ export declare abstract class TransactionReceiveGoodsLineBaseComponent extends T
     ngOnDestroy(): void;
     changeLineAmount(amount: number): void;
     handleLineClicked(mouseClick: PointerEvent): void;
-    protected transactionSet(): void;
     protected transactionLineSet(): void;
     private _handleTransactionLineSet;
 }

package/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.d.ts

@@ -19,6 +19,8 @@ export declare class TransactionLineWarehouseLocationButtonComponent extends Tra
     locationNr: string;
     warehouseNumber: number;
     readonly: boolean;
+    label: string;
+    globalLocation: boolean;
     locationNrChange: EventEmitter<string>;
     showClass(): boolean;
     constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _dialogService: DialogService);

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

@@ -9,6 +9,14 @@
       display: flex;
       flex-direction: column;
 
+      .transaction-line-totals-amount {
+        margin: 5px;
+      }
+
+      .icon-wrapper .co-icon {
+        padding: 13px;
+      }
+
       //.amount-number-picker {
       //  height: 40px;
       //  margin: 5px;
@@ -48,7 +56,7 @@
       position: relative;
 
       .transaction-line-button {
-        height: 40px;
+        height: 45px;
         width: auto;
         margin: 5px;
       }
@@ -67,20 +75,42 @@
       margin-top: 25px;
       margin-bottom: 40px;
       justify-content: center;
+      column-gap: 4px;
+
+      co-button {
+        height: auto;
+        width: auto;
+        background-color: $tp-default-background-accent;
+        border-bottom: 2px solid $tp-color-border;
+        cursor: pointer;
 
-      .commit-button {
-        display: flex;
-        width: 125px;
-        height: 35px;
-        background: $tp-color-action;
-        align-items: center;
-        justify-content: center;
-        border-radius: 11px;
-
-        .commit-text {
-          font-size: 12px;
-          font-weight: bold;
-          color: $tp-color-text-light;
+        &:not(.circle) {
+          padding: 8px;
+        }
+
+        &.cancel-button {
+          padding: 5px;
+          co-icon {
+            width: 22px;
+            height: 22px;
+            svg { // for fontawesome icons
+              fill: $tp-color-dark-accent;
+            }
+            & [fill] { // for own icons
+              fill: $tp-color-dark-accent;
+            }
+          }
+        }
+      }
+
+      co-icon {
+        width: 16px;
+        height: 16px;
+        svg { // for fontawesome icons
+          fill: $tp-color-action;
+        }
+        & [fill] { // for own icons
+          fill: $tp-color-action;
         }
       }
     }

package/lib/component/transaction-print-package-sticker/style/_layout.scss

@@ -1,28 +1,11 @@
 @include export-module('cc-transaction-print-package-sticker-layout') {
   .co-transaction-print-package-sticker {
-    .print-button {
-      display: flex;
-      align-items: center;
-      padding: 3px 6px;
-      border: 1px solid #8a8f8f;
-      border-radius: 9px;
-      width: 55px;
-      justify-content: space-between;
 
+    co-input-number-picker {
+      height: 100%;
       co-icon {
         width: 17px;
         height: 17px;
-        &.pointer {
-          cursor: pointer;
-        }
-      }
-
-      co-input-text {
-        width: 15px;
-        text-align-last: center;
-        input, .input-text-wrapper, .input-wrapper {
-          width: inherit;
-        }
       }
     }
   }

package/lib/component/transaction-quick-access/transaction-quick-access-overview/transaction-quick-access-overview.component.d.ts

@@ -6,6 +6,7 @@ import { PrintOrderConfirmationRequest } from '@colijnit/mainapi/build/model/pri
 import { PdfOrderConfirmationRequest } from '@colijnit/mainapi/build/model/pdf-order-confirmation-request';
 import { TransactionQuickAccessSendMethodBaseComponent } from '../transaction-quick-access-send-method-base.component';
 export declare class TransactionQuickAccessOverviewComponent extends TransactionQuickAccessSendMethodBaseComponent implements OnInit {
+    sendDocumentsComponent: any;
     showClass(): boolean;
     reportDocumentEmailRequest: EmailOrderConfirmationRequest;
     reportDocumentPrintRequest: PrintOrderConfirmationRequest;
@@ -18,4 +19,5 @@ export declare class TransactionQuickAccessOverviewComponent extends Transaction
     protected pdfDocument(request: PdfOrderConfirmationRequest): void;
     protected printDocument(request: PrintOrderConfirmationRequest): Promise<void>;
     protected getDefaultSendMethod(): Promise<number>;
+    _prepareRequest(request: EmailOrderConfirmationRequest | PrintOrderConfirmationRequest | PdfOrderConfirmationRequest): void;
 }

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

@@ -25,6 +25,16 @@
         }
       }
 
+      .co-transaction-line-warehouse-location-button {
+        .transaction-line-button {
+          height: 45px;
+          width: 100px;
+          .co-icon {
+            padding: 13px;
+          }
+        }
+      }
+
       .button-wrapper {
         background: $tp-default-background-accent;
         border-radius: $tp-default-border-radius;

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts

@@ -16,6 +16,7 @@ export declare class TransactionQuickAccessReceivedGoodsComponent extends Transa
     commitDate: Date;
     packingSlipNr: string;
     hideQuickAccessContent: boolean;
+    globalWarehouseLocation: string;
     showClass(): boolean;
     ngOnInit(): void;
     handleCommitEvent(): Promise<void>;
@@ -27,4 +28,5 @@ export declare class TransactionQuickAccessReceivedGoodsComponent extends Transa
     protected pdfDocument(): void;
     protected printDocument(printRequest: ReportingDocumentPrintBaseRequest): void;
     protected emailDocument(emailInvoiceRequest: EmailInvoiceRequest): void;
+    showWarehouseLocationPopup(): void;
 }

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

@@ -12,6 +12,7 @@ export declare enum Icon {
     CalendarDayRegular = "calendar_day_regular",
     Cancel = "cancel",
     CartCheck = "cart_check",
+    CartFlatbedBoxesRegular = "cart_flatbed_boxes_regular",
     CartFlatbedBoxesSolid = "cart_flatbed_boxes_solid",
     CartMinusRegular = "cart_minus_regular",
     CartPlusRegular = "cart_plus_regular",
@@ -63,9 +64,11 @@ export declare enum Icon {
     PrintRegular = "print_regular",
     PrintSolid = "print_solid",
     Purchase = "purchase",
+    RegularCartFlatbedBoxesCircleCheck = "regular_cart_flatbed_boxes_circle_check",
     Resize = "resize",
     ShareSolid = "share_solid",
     SharpLightTruckMovingClock = "sharp_light_truck_moving_clock",
+    SharpRegularBarcodeReadTag = "sharp_regular_barcode_read_tag",
     ShelvesLight = "shelves_light",
     ShelvesRegular = "shelves_regular",
     ShelvesSolid = "shelves_solid",

package/lib/enum/transaction-type-category.enum.d.ts

@@ -11,5 +11,6 @@ export declare enum TransactionTypeCategory {
     SalesOrderLogistics = "salesOrderLogistics",
     SalesOrderPlanning = "salesOrderPlanning",
     SalesOrderDeliveryNote = "salesOrderDeliveryNote",
-    SalesOrderInvoice = "salesOrderInvoice"
+    SalesOrderInvoice = "salesOrderInvoice",
+    SalesOrderCashRegister = "salesOrderCashRegister"
 }