@colijnit/transaction 12.1.181 → 12.1.183

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

@@ -50,6 +50,7 @@ export declare abstract class TransactionBaseComponent implements OnInit, OnDest
     lockAndSave: boolean;
     expanded: boolean;
     preview: boolean;
+    isFirst: boolean;
     set selected(value: boolean);
     get selected(): boolean;
     readonly: boolean;

package/lib/component/transaction-grid/transaction-grid/transaction-grid.component.d.ts

@@ -1,15 +1,15 @@
 import { ApplicationRef, ChangeDetectorRef, ComponentFactoryResolver, EventEmitter, Injector, OnDestroy } from '@angular/core';
-import { TransactionTypeCategory } from "../../../enum/transaction-type-category.enum";
-import { TransactionMappingService } from "../../../service/transaction-mapping.service";
-import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
-import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
-import { TransactionService } from "../../../service/transaction.service";
+import { TransactionTypeCategory } from '../../../enum/transaction-type-category.enum';
+import { TransactionMappingService } from '../../../service/transaction-mapping.service';
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { TransactionService } from '../../../service/transaction.service';
 import { DictionaryService } from '../../../service/dictionary.service';
 import { TransactionEventService } from '../../../service/transaction-event.service';
 import { IconCacheService } from '../../../service/icon-cache.service';
 import { TransactionImageService } from '../../../service/transaction-image.service';
 import { FormMasterService } from '@colijnit/corecomponents_v12';
-import { TransactionScreenConfigurationService } from "../../../service/transaction-screen-configuration.service";
+import { TransactionScreenConfigurationService } from '../../../service/transaction-screen-configuration.service';
 /**
  * @deprecated Not being used anymore, should be removed
  */

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

@@ -11,6 +11,12 @@
     padding: $tp-transaction-line-padding;
     row-gap: $tp-transaction-line-row-gap;
     border-width: $tp-transaction-line-border-width;
+    position: relative;
+    &.first {
+      margin: $tp-transaction-line-margin-first;
+      padding: $tp-transaction-line-padding-first;
+      border-width: $tp-transaction-line-border-width-first;
+    }
     .transaction-base-line-wrapper {
       column-gap: $tp-transaction-line-column-gap;
     }
@@ -21,6 +27,7 @@
       max-width: 66%;
       width: max-content;
       padding-top: 5px;
+      flex: 1;
     }
     .preview-margin {
       margin-left: $tp-transaction-line-column-gap;
@@ -32,6 +39,8 @@
     .transaction-line-wrapper {
       display: flex;
       flex-direction: row;
+      flex: 1;
+      justify-content: space-between;
     }
     .transaction-line-buttons {
       display: flex;
@@ -43,6 +52,7 @@
       display: flex;
       align-content: flex-start;
       row-gap: $tp-transaction-line-row-gap;
+      width: 100%;
       .column1 {
         //max-width: calc((#{$tp-transaction-default-button-width} * 2) + #{$tp-transaction-line-column-gap});
         margin-right: $tp-transaction-line-column-gap;
@@ -51,6 +61,7 @@
         align-content: flex-start;
         row-gap: $tp-transaction-line-row-gap;
         column-gap: $tp-transaction-line-column-gap;
+        flex: 1;
         co-transaction-line-commission-button {
           margin-right: $tp-transaction-line-column-gap;
         }
@@ -62,13 +73,14 @@
         column-gap: $tp-transaction-line-column-gap;
         margin-right: $tp-transaction-line-column-gap;
         max-width: $tp-transaction-default-button-width-big;
+        flex: 1;
       }
       .column3 {
         display: flex;
         row-gap: $tp-transaction-line-row-gap;
         column-gap: $tp-transaction-line-column-gap;
         margin-right: $tp-transaction-line-column-gap;
-
+        flex: 1;
         co-transaction-line-drop-shipment-button {
           .transaction-line-button {
             &.disabled {
@@ -177,6 +189,12 @@
         //height: $tp-transaction-line-amount-height;
       }
     }
+    .transaction-field-label {
+      position: absolute;
+      top: $tp-transaction-line-field-label-top;
+      font-size: $tp-transaction-line-field-label-font-size;
+      color: $tp-transaction-line-field-label-font-color;
+    }
     .transaction-line-totals {
       display: grid;
       grid-template-columns: 100px 100px 100px;

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

@@ -5,9 +5,12 @@ $tp-transaction-line-added-background-color: $tp-color-transaction-line-added !d
 $tp-transaction-line-min-height: 100px !default;
 $tp-transaction-line-article-text-min-height: 30px !default;
 $tp-transaction-line-padding: 10px !default;
+$tp-transaction-line-padding-first: 20px 10px !default;
+$tp-transaction-line-margin-first: 25px 0 0 0 !default;
 $tp-transaction-line-inner-padding: 10px !default;
 $tp-transaction-line-border: 1px solid !default;
 $tp-transaction-line-border-width: 0 0 1px 0 !default;
+$tp-transaction-line-border-width-first: 1px 0 1px 0 !default;
 $tp-transaction-line-border-color: $tp-color-border !default;
 $tp-transaction-line-column-gap: 15px !default;
 $tp-transaction-line-row-gap: 5px !default;
@@ -26,3 +29,6 @@ $tp-transaction-line-discount-color: $tp-color-active-light !default;
 $tp-transaction-line-totals-justify-content: flex-end !default;
 $tp-transaction-line-totals-padding: 0 10px !default;
 $tp-transaction-line-drag-over-box-shadow: inset 0 0 2px 1px grey !default;
+$tp-transaction-line-field-label-top: -17px !default;
+$tp-transaction-line-field-label-font-color: #8083A3 !default;
+$tp-transaction-line-field-label-font-size: 10px !default;

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

@@ -24,6 +24,7 @@ export declare class TransactionLineComponent extends TransactionBaseComponent i
     set activeCategory(value: TransactionTypeCategory);
     get activeCategory(): TransactionTypeCategory;
     preview: boolean;
+    isFirst: boolean;
     draggedOver: boolean;
     waitingForUserAction: EventEmitter<boolean>;
     descriptionDblClick: EventEmitter<void>;

package/lib/component/transaction-line-action-buttons/transaction-line-action-buttons.component.d.ts

@@ -18,6 +18,7 @@ export declare class TransactionLineActionButtonsComponent implements OnInit {
     readonly icons: typeof Icon;
     configNames: ActionButtonsCfgNames;
     set transactionLine(value: TransactionLineInfo);
+    isFirst: boolean;
     get transactionLine(): TransactionLineInfo;
     set orderLineSets(value: OrderLineSetInfo[]);
     get orderLineSets(): OrderLineSetInfo[];

package/lib/component/transaction-line-image-and-description/transaction-line-image-and-description.component.d.ts

@@ -3,6 +3,7 @@ import { TransactionBaseComponent } from '../core/base/transaction-base.componen
 import { ImageAndDescriptionCfgNames } from '../../interface/image-and-description-cfg-names.interface';
 export declare class TransactionLineImageAndDescriptionComponent extends TransactionBaseComponent {
     popUpView: boolean;
+    isFirst: boolean;
     showClass(): boolean;
     preview: boolean;
     openArticleTextClicked: EventEmitter<string>;

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

@@ -1,9 +1,9 @@
 import { ApplicationRef, ComponentFactoryResolver, ElementRef, Injector, OnDestroy, OnInit } from '@angular/core';
-import { TransactionTypeCategory } from "../../../enum/transaction-type-category.enum";
-import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
-import { TransactionMappingService } from "../../../service/transaction-mapping.service";
-import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
-import { RelationAnyType } from "@colijnit/relationapi/build/model/relation-any-type";
+import { TransactionTypeCategory } from '../../../enum/transaction-type-category.enum';
+import { TransactionKind } from '@colijnit/transactionapi/build/enum/transaction-kind.enum';
+import { TransactionMappingService } from '../../../service/transaction-mapping.service';
+import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
+import { RelationAnyType } from '@colijnit/relationapi/build/model/relation-any-type';
 export declare class TransactionQuickAccessComponent implements OnInit, OnDestroy {
     private _mappingService;
     private _compFactoryResolver;

package/lib/model/transaction-settings-options.d.ts

@@ -1,3 +1,4 @@
 export declare class TransactionSettingsOptions {
     searchOnStart: boolean;
+    searchOnStartOnce: boolean;
 }

package/lib/model/transaction-settings.d.ts

@@ -2,6 +2,7 @@ import { Options } from '@colijnit/ioneconnector/build/model/options';
 import { TransactionSearchViewRequest } from '@colijnit/transactionapi/build/model/transaction-search-view-request';
 import { TransactionSettingsOptions } from './transaction-settings-options';
 export declare class TransactionSettings extends Options {
+    tempTransactionParameters: TransactionSearchViewRequest;
     transactionParameters: TransactionSearchViewRequest;
     options: TransactionSettingsOptions;
 }

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

@@ -2907,6 +2907,7 @@ export declare class Dictionaries {
         COMMISSION2: string;
         COMMISSION: string;
         COMMISSIONCODE: string;
+        COMMISSIONCODE_STOCK: string;
         COMMISSIONCODE_REQUIRED: string;
         COMMISSION_ADVICE: string;
         COMMISSION_CODE: string;
@@ -7710,6 +7711,7 @@ export declare class Dictionaries {
         TOTAL_TURNOVER: string;
         TOTAL_VALUE: string;
         TOTAL_WAGE: string;
+        TOTALS_AND_DISCOUNT: string;
         TO_ABSENCE_STATISTICS: string;
         TO_ACCEPT: string;
         TO_ASSIGN: string;
@@ -8042,6 +8044,7 @@ export declare class Dictionaries {
         WAREHOUSE: string;
         WAREHOUSES: string;
         WAREHOUSE_3D: string;
+        WAREHOUSE_AND_STATUS: string;
         WAREHOUSE_MANAGEMENT: string;
         WAREHOUSE_NO: string;
         WAREHOUSE_RECEIPT: string;
@@ -11087,6 +11090,7 @@ export declare class Dictionaries {
         COMMISSION2: string;
         COMMISSION: string;
         COMMISSIONCODE: string;
+        COMMISSIONCODE_STOCK: string;
         COMMISSIONCODE_REQUIRED: string;
         COMMISSION_ADVICE: string;
         COMMISSION_CODE: string;
@@ -16593,6 +16597,7 @@ export declare class Dictionaries {
         TOTAL_TURNOVER: string;
         TOTAL_VALUE: string;
         TOTAL_WAGE: string;
+        TOTALS_AND_DISCOUNT: string;
         TO_ABSENCE_STATISTICS: string;
         TO_ACCEPT: string;
         TO_BE_ALLOCATED: string;
@@ -16984,6 +16989,7 @@ export declare class Dictionaries {
         WAREHOUSE: string;
         WAREHOUSES: string;
         WAREHOUSE_3D: string;
+        WAREHOUSE_AND_STATUS: string;
         WAREHOUSE_DOES_NOT_ACCEPT_RETURNS: string;
         WAREHOUSE_LOCATION: string;
         WAREHOUSE_MANAGEMENT: string;

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

@@ -1,10 +1,11 @@
 import { BehaviorSubject } from 'rxjs';
 import { DictionaryService } from './dictionary.service';
+import { TransactionSettings } from '../model/transaction-settings';
 export declare class TransactionSettingsService {
     private _dictionary;
     settingsInitialized: BehaviorSubject<boolean>;
     set settings(value: any);
-    get settings(): any;
+    get settings(): TransactionSettings;
     settingsLoaded: BehaviorSubject<boolean>;
     private _settings;
     constructor(_dictionary: DictionaryService);

package/package.json

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

package/public_api.d.ts

@@ -78,3 +78,5 @@ export * from "./lib/enum/search-view-mode.enum";
 export * from "./lib/enum/searchbar-view-mode.enum";
 export * from "./lib/enum/date-period.enum";
 export * from "./lib/enum/transaction-cfg-name.enum";
+export * from "./lib/model/transaction-settings";
+export * from "./lib/model/transaction-settings-options";