@colijnit/transaction 12.1.113 → 12.1.115

package/lib/res/dictionary/dictionaries.d.ts

@@ -3140,6 +3140,7 @@ export declare class Dictionaries {
         CREATE_ABSENCE: string;
         CREATE_ACCOUNT: string;
         CREATE_ACCOUNT_IN_2_MIN: string;
+        CREATE_AUDIT_FILE: string;
         CREATE_EXCEPTION: string;
         CREATE_IDENTIFICATION: string;
         CREATE_NEW: string;
@@ -4394,6 +4395,9 @@ export declare class Dictionaries {
         INCLUDE_LINE_DETAILS: string;
         INCLUDE_NO_STOCK_ART: string;
         INCLUDE_REAFFIRMATIONS: string;
+        INCLUDING_OPENING_BALANCE: string;
+        INCLUDING_RELATION_DETAILS: string;
+        INCLUDING_UNPROCESSED_ENTRIES: string;
         INCLUDING_CONTACT_PERSONS: string;
         INCLUDING_PRINTED: string;
         INCLUDING_RETURNS: string;
@@ -11280,6 +11284,7 @@ export declare class Dictionaries {
         CREATE_ABSENCE: string;
         CREATE_ACCOUNT: string;
         CREATE_ACCOUNT_IN_2_MIN: string;
+        CREATE_AUDIT_FILE: string;
         CREATE_EMPLOYEE: string;
         CREATE_EXCEPTION: string;
         CREATE_IDENTIFICATION: string;
@@ -12660,9 +12665,12 @@ export declare class Dictionaries {
         INCLUDE_NO_STOCK_ART: string;
         INCLUDE_REAFFIRMATIONS: string;
         INCLUDING_CONTACT_PERSONS: string;
+        INCLUDING_OPENING_BALANCE: string;
         INCLUDING_PRINTED: string;
+        INCLUDING_RELATION_DETAILS: string;
         INCLUDING_REQUESTED_ONLINE: string;
         INCLUDING_RETURNS: string;
+        INCLUDING_UNPROCESSED_ENTRIES: string;
         INCLUSIVE_DELAYED_DELIVERIES: string;
         INCLUSIVE_RETURNS: string;
         INCL_DELIVERED: string;

package/lib/service/transaction-base.service.d.ts

@@ -57,7 +57,6 @@ export declare class TransactionBaseService {
     purchasePortalLine: PurchasePortalLine[];
     docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
-    protected warehouseLocationPopupShown: boolean;
     private _transactionKind;
     private _relation;
     private _purchaseOrdersCompleted;

package/lib/service/transaction.service.d.ts

@@ -78,7 +78,7 @@ export declare class TransactionService extends PendingReasonService {
     prepareReceiveGoodsWithDataTerminalInternalParam(): void;
     getFocusStatusIndex(category: TransactionTypeCategory): number;
     getRelationKindFromTransactionKind(): RelationKind;
-    showWarehouseLocationPopupOnce(): Promise<void>;
+    showWarehouseLocationPopup(): Promise<string>;
     deleteTransaction(): Promise<void>;
     updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
     updateReferenceTransactionLine(uuid: string, lineUuid: string, reference: string): Promise<boolean>;

package/lib/style/_variables.scss

@@ -63,7 +63,7 @@ $tp-action-size-pico: 14px !default;
 $tp-size-header-height: 60px !default;
 
 $tp-default-background-accent: #f5f5fc !default;
-$tp-default-border-radius: 8px !default;
+$tp-default-border-radius: 5px !default;
 $tp-default-button-height: 26px;
 
 $tp-xs-width: 600px !default;
@@ -77,6 +77,9 @@ $tp-transaction-line-button-big-width: 175px !default;
 $tp-transaction-line-button-font-size: 11px !default;
 $tp-transaction-line-button-font-weight: 600 !default;
 $tp-transaction-line-button-icon-size: 13px !default;
+$tp-transaction-line-button-icon-margin: 5px !default;;
+$tp-transaction-line-button-icon-padding: 4px !default;;
+$tp-transaction-line-button-icon-spacer-width: 1px !default;
 $tp-transaction-line-button-height: 26px !default;
 $tp-transaction-line-button-background-color: $tp-default-background-accent !default;
 $tp-transaction-line-button-border-color: $tp-color-border !default;
@@ -84,13 +87,24 @@ $tp-transaction-line-button-column-gap: 15px !default;
 $tp-transaction-line-button-padding: 0 10px !default;
 $tp-transaction-line-button-radius: $tp-default-border-radius !default;
 $tp-transaction-line-button-border: 1px solid !default;
+$tp-transaction-line-button-label-row-gap: 9px !default;
+$tp-transaction-line-button-label-padding-right: 5px !default;
+$tp-transaction-line-button-label-color: rgba(0, 0, 0, 0.7) !default;
+$tp-transaction-line-input-number-picker-width: 110px !default;
 
 $tp-transaction-header-font-family: $tp-font-family !default;
 $tp-transaction-header-font-size: 14px !default;
 $tp-transaction-header-font-color: $tp-color-dark !default;
 $tp-transaction-lines-drag-handle-size: 30px !default;
-
 $tp-transaction-quick-access-column-gap: 10px;
+
+
+// payment num pad globals
+$tp-payment-amount-color: rgba(0, 0, 0, 0.5) !default;
+$tp-payment-amount-background-color: #dedede5c !default;
+$tp-payment-amount-border-color: $tp-color-border !default;
+
+
 /* core components override */
 $cc-color-action: $tp-color-font !default;
 $cc-btn-color: $tp-color-action !default;
@@ -122,6 +136,13 @@ $cc-collapsible-content-padding: 10px 0px 0px 0px !default;
 $cc-co-input-search-border-radius: $tp-default-border-radius !default;
 
 $cc-co-input-text-icon-margin-number: 5px !default;
+$cc-co-input-text-spacer-color: $tp-color-border !default;
+$cc-co-input-text-icon-padding: 4px !default;
+
+$cc-co-input-number-picker-button-background-color-hover: $tp-color-action !default;
+$cc-co-input-number-picker-button-background-color-select: $tp-color-action !default;
+$cc-co-input-number-picker-spacer-color: $tp-color-border !default;
+$cc-co-input-number-picker-icon-padding: 4px !default;
 
 //$cc-co-commit-buttons-button-background: none !default;
 $cc-co-commit-buttons-commit-color: $tp-color-label !default;

package/lib/style/transaction-globals.scss

@@ -65,12 +65,53 @@
   display: flex;
   align-items: center;
   height: $tp-transaction-line-button-height;
-  column-gap: $tp-transaction-line-button-column-gap;
-  padding: $tp-transaction-line-button-padding;
   .co-icon {
     height: $tp-transaction-line-button-icon-size;
     width: $tp-transaction-line-button-icon-size;
   }
+  .icon-wrapper {
+    display: flex;
+    height: 100%;
+    flex-shrink: 0;
+    align-items: center;
+    margin-right: $tp-transaction-line-button-icon-margin;
+    .co-icon {
+      height: 100%;
+      width: auto;
+      padding: $tp-transaction-line-button-icon-padding;
+    }
+    .spacer {
+      height: 100%;
+      min-width: $tp-transaction-line-button-icon-spacer-width;
+      background-color: $tp-color-border;
+    }
+  }
+  .text-content-wrapper {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: flex-start;
+    flex-direction: column;
+    row-gap: $tp-transaction-line-button-label-row-gap;
+    justify-content: center;
+    overflow: hidden;
+    padding-right: $tp-transaction-line-button-label-padding-right;
+    .label {
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    &.label {
+      color: $tp-transaction-line-button-label-color;
+    }
+    span {
+      width: inherit;
+    }
+  }
+  &:not(.spacer) {
+    padding: $tp-transaction-line-button-padding;
+    column-gap: $tp-transaction-line-button-column-gap;
+  }
   &:not(.no-border) {
     border: $tp-transaction-line-button-border;
     border-color: $tp-transaction-line-button-border-color;
@@ -98,5 +139,23 @@
   color: $tp-color-negative-value;
 }
 
-
+.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.113",
+  "version": "12.1.115",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",