@colijnit/transaction 255.1.2 → 255.1.3

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

@@ -1,29 +1,22 @@
 @include export-module('co-transaction-search-header-layout') {
   .co-transaction-search-header {
-    /*.co-dialog:not(.is-mobile) .co-dialog-wrapper {
-      height: $tp-dialog-catalog-min-height;
-      width: $tp-dialog-catalog-min-width;
-      max-width: 90vw;
-      .dialog-content {
-        height: 100%;
-        overflow-x: hidden;
+    .transaction-search-header-wrapper {
+      .icon {
+        height: 20px;
+        width: 20px;
       }
-    }
-    .dialog-catalog-product-wrapper {
-      display: flex;
-      transform: translateX(0);
-      width: calc(#{$tp-dialog-catalog-min-width} * 2);
-      > * {
-        width: $tp-dialog-catalog-min-width;
-      }
-      height: 100%;
-      .back-button-product {
-        cursor: pointer;
+
+      .title {
+        font-size: 20px;
+        font-weight: 600;
+        font-family: sans-serif;
       }
-      transition: transform .2s ease-in-out;
-      &.show-product {
-        transform: translateX(-50%);
-      }
-    }*/
+
+      display: flex;
+      flex-direction: row;
+      column-gap: 5px;
+      align-items: center;
+      justify-content: center;
+    }
   }
 }

package/lib/component/dialog/transaction-search/dialog-transaction-search.component.d.ts

@@ -3,17 +3,23 @@ import { TransactionSearchService } from "../../transaction-search/service/trans
 import { IconCacheService } from "../../../service/icon-cache.service";
 import { Icon } from "../../../enum/icon.enum";
 import { SearchViewModeService } from "../../search/search-view-mode.service";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
+import { Relation } from "@colijnit/relationapi/build/model/relation.bo";
 export declare class DialogTransactionSearchComponent implements OnInit, OnDestroy {
     transactionSearchService: TransactionSearchService;
     searchViewModeService: SearchViewModeService;
     iconCacheService: IconCacheService;
     readonly icons: typeof Icon;
     placeholder: string;
+    set relation(value: Relation);
     filterIconClick: EventEmitter<void>;
     closeClick: EventEmitter<void>;
+    lineClicked: EventEmitter<TransactionLineSearchIndex>;
     showClass(): boolean;
+    showFilters: Boolean;
     constructor(transactionSearchService: TransactionSearchService, searchViewModeService: SearchViewModeService, iconCacheService: IconCacheService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     onFilterButtonClick(): void;
+    transLineClicked(line: TransactionLineSearchIndex): void;
 }

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

@@ -1,5 +1,49 @@
 @include export-module('co-dialog-transaction-search-layout') {
   .co-dialog-transaction-search {
+    display: flex;
+    .co-dialog:not(.is-mobile) .co-dialog-wrapper {
+      width:75vw;
+    }
+    .search-wrapper {
+      display: flex;
+      flex-direction: column;
+      row-gap: 5px;
+      width:100%;
+      min-width: 900px;
+      min-height: 650px;
 
+      .search-content {
+        display: flex;
+        flex-direction: row;
+        column-gap: 10px;
+        .search-result-content {
+          display: flex;
+          flex-direction: column;
+          row-gap: 10px;
+        }
+      }
+    }
+
+    .search-filter-panel {
+      display: flex;
+      min-width: $co-search-filter-wrapper-min-width;
+      min-height: $co-search-filter-wrapper-min-height;
+
+      &.sidebar {
+        position: absolute;
+        left: 0;
+        transition: left 0.2s ease-in-out;
+        z-index: 2;
+        background: #FFF;
+        min-width: $co-search-filter-wrapper-sidebar-min-width;
+      }
+      &.fullscreen {
+        position: relative;
+        left: 0;
+        transition: left 0.2s ease-in-out;
+      }
+    }
   }
+
+
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-create-service.component.d.ts

@@ -5,18 +5,25 @@ import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transa
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
 import { DictionaryService } from "../../../service/dictionary.service";
 import { TransactionImageService } from "../../../service/transaction-image.service";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
+import { TransactionService } from "../../../service/transaction.service";
+import { Relation } from "@colijnit/relationapi/build/model/relation.bo";
 export declare class TransactionHeaderPopupCreateServiceComponent implements OnInit {
     protected formMasterService: FormMasterService;
     protected dictionaryService: DictionaryService;
+    protected transactionService: TransactionService;
     protected imageService: TransactionImageService;
     showClass(): boolean;
     forceReadonly: boolean;
+    relation: Relation;
     buttonsVisible: boolean;
     createViaTransLine: boolean;
     createViaProduct: boolean;
     createViaOldTrans: boolean;
     showCatalogPopup: boolean;
     showTransLinePopup: boolean;
+    set chosenTransactionLine(response: TransactionLineSearchIndex);
+    get chosenTransactionLine(): TransactionLineSearchIndex;
     set existingTransaction(response: TransactionInfoResponse);
     get existingTransaction(): TransactionInfoResponse;
     set existingTransactionLine(line: TransactionLineInfo);
@@ -29,9 +36,10 @@ export declare class TransactionHeaderPopupCreateServiceComponent implements OnI
     oldGoodId: string;
     catalogOptions: any;
     catalogParameters: any;
+    private _chosenTransactionLine;
     private _existingTransaction;
     private _existingTransactionLine;
-    constructor(formMasterService: FormMasterService, dictionaryService: DictionaryService, imageService: TransactionImageService);
+    constructor(formMasterService: FormMasterService, dictionaryService: DictionaryService, transactionService: TransactionService, imageService: TransactionImageService);
     ngOnInit(): Promise<void>;
     submit(): boolean;
     createOrderWithTransactionLineClicked(openSearch?: boolean): void;
@@ -40,6 +48,7 @@ export declare class TransactionHeaderPopupCreateServiceComponent implements OnI
     openCatalogPopUp(): void;
     openTransactionPopUp(): void;
     handleCatalogArticleClick(article: ArticleExtended): void;
+    handleTransactinLineClick(line: TransactionLineSearchIndex): void;
     private _prepareCatalogRequest;
     private setTransactionLabel;
     private setTransactionLineImage;

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/style/_layout.scss

@@ -1,5 +1,213 @@
 @include export-module('co-transaction-search-sales-line-select-tile-layout') {
   .co-transaction-search-sales-line-select-tile {
+    display: flex;
+    background: white;
+    border: 1px solid $tp-transaction-tile-border-color;
+    border-left: 5px solid #1A73E8;
+    border-radius: $tp-tile-border-radius;
+    width: 70vw;
+    min-height: 180px;
+    .co-transaction-search-sales-line-select-tile-wrapper {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      padding-left: 5px;
+      column-gap: 5px;
+
+      .vertical-line {
+        margin-left: 10px;
+        margin-right: 10px;
+        height: 130px;
+        border: 1px solid $tp-transaction-tile-border-color;
+      }
+
+      .order-lines-container {
+        display: flex;
+        flex-direction: row;
+        column-gap: 5px;
+        align-items: center;
+        justify-content: left;
+        max-width: 500px;
+        margin-bottom: -5px;
+      }
+    }
+
+    .co-transaction-search-tile-content {
+      display: flex;
+      font-family: $tp-transaction-tile-font-family;
+      font-size: $tp-transaction-tile-font-size;
+      line-height: $tp-transaction-tile-line-height;
+      height: $tp-transaction-tile-height;
+
+      @media(max-width: 600px) {
+        width: 85vw;
+      }
+
+      @media(min-width: 601px) {
+        width: 300px;
+      }
+
+      border-radius: $tp-tile-border-radius;
+      padding: $tp-transaction-tile-padding;
+
+      .transaction-tile-wrapper {
+        cursor: pointer;
+        width: $tp-transaction-tiles-wrapper-width;
+        height: $tp-transaction-tiles-wrapper-height;
+      }
+
+      .header {
+        font-weight: $tp-transaction-tile-header-font-weight;
+        font-size: $tp-transaction-tile-header-font-size;
+        display: flex;
+        align-items: center;
+        column-gap: 10px;
+
+        .type-indicator {
+          width: 20px;
+          height: 20px;
+          font-size: 10px;
+          color: white;
+          background-color: #569eee;
+          border-radius: 9px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+
+      .text {
+        text-overflow: ellipsis;
+        white-space: normal;
+        overflow: hidden;
+        -webkit-hyphens: auto;
+        hyphens: auto;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+      }
+
+      co-avatar {
+        width: $tp-transaction-tile-avatar-width;
+        height: $tp-transaction-tile-avatar-height;
+      }
+
+      .status-bar-wrapper {
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+
+      .total-price-vat {
+        position: absolute;
+        top: 17px;
+        right: 0;
+      }
+
+      .label {
+        font-size: $tp-transaction-tile-font-size-small;
+      }
+
+      .value {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-end;
+        min-width: max-content;
+        font-size: $tp-transaction-tile-font-size-small;
+        height: $tp-transaction-tile-value-height;
+
+        co-icon {
+          height: $tp-transaction-tile-icon-height;
+          width: $tp-transaction-tile-icon-width;
+        }
+      }
+
+      //grid
+      .tile {
+        display: grid;
+        grid-template-columns: 1fr;
+        grid-template-rows: 1fr 1.5fr 1fr;
+        gap: 10px 10px;
+        height: $tp-transaction-tile-content-height;
+      }
+
+      .tile-header {
+        display: grid;
+        grid-template-columns: 0.4fr 2.4fr 1.2fr;
+        grid-template-rows: 1.5fr;
+        gap: 0 10px;
+        grid-area: 1 / 1 / 2 / 2;
+      }
+
+      .tile-upper-left {
+        grid-area: 1 / 1 / 2 / 2;
+      }
+
+      .tile-upper-middle {
+        grid-area: 1 / 2 / 2 / 3;
+        display: flex;
+        flex-direction: column;
+        row-gap: 3px;
+      }
+
+      .tile-upper-right {
+        grid-area: 1 / 3 / 2 / 4;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        row-gap: 3px;
+        position: relative;
+      }
+
+
+      .tile-body {
+        display: grid;
+        grid-template-columns: 0.4fr 2.6fr 0fr;
+        grid-template-rows: 1.5fr;
+        gap: 0 10px;
+        grid-area: 2 / 1 / 3 / 2;
+        align-items: center;
+      }
+
+      .tile-middle-left {
+        grid-area: 1 / 1 / 2 / 2;
+      }
+
+      .tile-middle-middle {
+        grid-area: 1 / 2 / 2 / 3;
+        overflow: hidden;
+      }
+
+      .tile-middle-right {
+        grid-area: 1 / 3 / 2 / 4;
+      }
+
+      .tile-footer {
+        display: grid;
+        grid-template-columns: 1fr 1fr 1fr;
+        grid-template-rows: 1fr;
+        gap: 0 15px;
+        grid-area: 3 / 1 / 4 / 2;
+      }
+
+      .tile-bottom-left {
+        grid-area: 1 / 1 / 2 / 2;
+      }
+
+      .tile-bottom-middle {
+        grid-area: 1 / 2 / 2 / 3;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+      }
+
+      .tile-bottom-right {
+        grid-area: 1 / 3 / 2 / 4;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+      }
+    }
   }
 }
 

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-line-tile/style/_layout.scss

@@ -0,0 +1,37 @@
+@include export-module('co-transaction-line-tile-layout') {
+  .co-transaction-line-tile {
+    display: flex;
+    background: white;
+    width: 130px;
+    height: 130px;
+    font-family: $tp-transaction-tile-font-family;
+    font-size: 10px;
+    line-height: $tp-transaction-tile-line-height;
+    background-color: $tp-transaction-tile-background-color;
+    border: 1px solid $tp-transaction-tile-border-color;
+    border-radius: $tp-tile-border-radius;
+    padding: 5px;
+
+    .tile-wrapper {
+      display: flex;
+      flex-direction: column;
+      row-gap: 5px;
+
+      .co-image-display {
+        width: 30px;
+        height: 30px;
+      }
+      .good-description {
+        width: 100px;
+        font-size: 12px;
+        font-weight: bold;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+    }
+  }
+}
+

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-line-tile/style/_theme.scss

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

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-line-tile/style/material.scss

@@ -0,0 +1,5 @@
+@import "./material-definition";
+@import "./layout";
+@import "./theme";
+
+

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-line-tile/transaction-line-tile.component.d.ts

@@ -0,0 +1,11 @@
+import { TransactionService } from "../../../../../service/transaction.service";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
+import { TransactionImageService } from "../../../../../service/transaction-image.service";
+export declare class TransactionLineTileComponent {
+    transactionService: TransactionService;
+    private imageService;
+    line: TransactionLineSearchIndex;
+    showClass(): boolean;
+    constructor(transactionService: TransactionService, imageService: TransactionImageService);
+    handleVisibilityChange(visible: boolean): void;
+}

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-line-tile/transaction-line-tile.module.d.ts

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

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-tile/transaction-search-sales-line-select-tile.component.d.ts

@@ -1,6 +1,15 @@
+import { EventEmitter } from '@angular/core';
 import { IconCacheService } from '../../../../service/icon-cache.service';
 import { TransactionSearchTileBaseComponent } from '../../../core/base/transaction-search-tile-base.component';
+import { TransactionService } from "../../../../service/transaction.service";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
 export declare class TransactionSearchSalesLineSelectTileComponent extends TransactionSearchTileBaseComponent {
     iconCacheService: IconCacheService;
-    constructor(iconCacheService: IconCacheService);
+    transactionService: TransactionService;
+    showClass(): boolean;
+    lineClicked: EventEmitter<TransactionLineSearchIndex>;
+    lines: TransactionLineSearchIndex[];
+    constructor(iconCacheService: IconCacheService, transactionService: TransactionService);
+    handleVisibilityChange(visible: boolean): Promise<void>;
+    tileClicked(line: TransactionLineSearchIndex): void;
 }

package/lib/service/transaction-connector-adapter.service.d.ts

@@ -176,6 +176,7 @@ import { DeleteHeaderImageRequest } from "@colijnit/transactionapi/build/model/d
 import { ChangeServiceHeaderCauseCodeRequest } from "@colijnit/transactionapi/build/model/change-service-headercause-code-request";
 import { ChangeServiceHeaderPriorityRequest } from "@colijnit/transactionapi/build/model/change-service-header-priority-request";
 import { ChangeServiceHeaderEntryTypeRequest } from "@colijnit/transactionapi/build/model/change-service-header-entry-type-request";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -213,6 +214,7 @@ export declare class TransactionConnectorAdapterService {
     deleteTransactionByUuId(uuid: string): Promise<TransactionInfoResponse>;
     cancelTransactionByUuId(uuid: string): Promise<TransactionInfoResponse>;
     convertCashRegisterOrderToSalesOrder(uuid: string): Promise<TransactionInfoResponse>;
+    getLineIndicesByTransId(transId: number): Promise<TransactionLineSearchIndex[]>;
     lockTransactionById(transactionId: number, version: number): Promise<TransactionLockResult>;
     getCashRegisters(branch?: string, group?: number): Promise<CashRegister[]>;
     getCashDrawers(cashDrawersRequest: CashDrawersRequest): Promise<CashDrawer[]>;

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

@@ -163,6 +163,7 @@ import { DeleteHeaderImageRequest } from "@colijnit/transactionapi/build/model/d
 import { ChangeServiceHeaderCauseCodeRequest } from "@colijnit/transactionapi/build/model/change-service-headercause-code-request";
 import { ChangeServiceHeaderPriorityRequest } from "@colijnit/transactionapi/build/model/change-service-header-priority-request";
 import { ChangeServiceHeaderEntryTypeRequest } from "@colijnit/transactionapi/build/model/change-service-header-entry-type-request";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -443,4 +444,5 @@ export declare class TransactionConnectorService {
     getDefaultEmailAddressListForPurchaseOrder(uuid: string): Promise<string[]>;
     getPlanOrder(transId: number): Promise<PlanOrder>;
     convertCashRegisterOrderToSalesOrder(uuid: string): Promise<TransactionInfoResponse>;
+    getLineIndicesByTransId(transId: number): Promise<TransactionLineSearchIndex[]>;
 }

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

@@ -130,6 +130,7 @@ import { ChangeLineDirectSellRequest } from "@colijnit/transactionapi/build/mode
 import { ServiceWizard } from "@colijnit/transactionapi/build/model/service-wizard";
 import { ServiceType } from "@colijnit/transactionapi/build/model/service-type";
 import { RelationSmallObject } from "@colijnit/mainapi/build/model/relation-small-object.bo";
+import { TransactionLineSearchIndex } from "@colijnit/transactionapi/build/model/transaction-line-search-index.bo";
 export declare class TransactionService extends PendingReasonService {
     remainingAmount: number;
     private readonly _createTransactionMethods;
@@ -395,6 +396,7 @@ export declare class TransactionService extends PendingReasonService {
     fireTrigger(workFlowProcessId: number, sequence: number, triggerId: number): Promise<ValidationResult>;
     fireGenericTrigger(workFlowProcessId: number, genericTransitionId: number, relationId: number): Promise<ValidationResult>;
     lockTask(id: number): Promise<boolean>;
+    getLineIndicesByTransId(transId: number): Promise<TransactionLineSearchIndex[]>;
     convertCashRegisterOrderToSalesOrder(): Promise<void>;
     reprintCashRegisterReceipt(): Promise<void>;
     resetDataForServiceFromSalesTransactionLine(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "255.1.2",
+  "version": "255.1.3",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -20,7 +20,7 @@
     "@colijnit/relationapi": ">=255.1.1",
     "@colijnit/sharedapi": ">=1.0.20",
     "@colijnit/sharedcomponents": ">=255.1.1",
-    "@colijnit/transactionapi": ">=255.1.1",
+    "@colijnit/transactionapi": ">=255.1.2",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0",