@colijnit/transaction 254.1.4 → 254.1.6

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

@@ -0,0 +1,29 @@
+@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;
+      }
+    }
+    .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;
+      }
+      transition: transform .2s ease-in-out;
+      &.show-product {
+        transform: translateX(-50%);
+      }
+    }*/
+  }
+}

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

@@ -0,0 +1,2 @@
+$tp-dialog-catalog-min-height: 90vh !default;
+$tp-dialog-catalog-min-width: 100% !default;

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

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

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

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

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

@@ -0,0 +1,15 @@
+import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
+import { Icon } from "../../../../../enum/icon.enum";
+import { TransactionSearchService } from "../../../../transaction-search/service/transaction-search.service";
+import { IconCacheService } from "../../../../../service/icon-cache.service";
+export declare class TransactionSearchHeaderComponent implements OnInit, OnDestroy {
+    transactionSearchService: TransactionSearchService;
+    iconCacheService: IconCacheService;
+    readonly icons: typeof Icon;
+    placeholder: string;
+    filterIconClick: EventEmitter<void>;
+    showClass(): boolean;
+    constructor(transactionSearchService: TransactionSearchService, iconCacheService: IconCacheService);
+    ngOnInit(): Promise<void>;
+    ngOnDestroy(): void;
+}

package/lib/component/dialog/transaction-search/components/transaction-search-header/transaction-search-header.module.d.ts

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

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

@@ -0,0 +1,19 @@
+import { EventEmitter, OnDestroy, OnInit } from "@angular/core";
+import { TransactionSearchService } from "../../transaction-search/service/transaction-search.service";
+import { IconCacheService } from "../../../service/icon-cache.service";
+import { Icon } from "../../../enum/icon.enum";
+import { SearchViewModeService } from "../../search/search-view-mode.service";
+export declare class DialogTransactionSearchComponent implements OnInit, OnDestroy {
+    transactionSearchService: TransactionSearchService;
+    searchViewModeService: SearchViewModeService;
+    iconCacheService: IconCacheService;
+    readonly icons: typeof Icon;
+    placeholder: string;
+    filterIconClick: EventEmitter<void>;
+    closeClick: EventEmitter<void>;
+    showClass(): boolean;
+    constructor(transactionSearchService: TransactionSearchService, searchViewModeService: SearchViewModeService, iconCacheService: IconCacheService);
+    ngOnInit(): Promise<void>;
+    ngOnDestroy(): void;
+    onFilterButtonClick(): void;
+}

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

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

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

@@ -1,29 +1,5 @@
 @include export-module('co-dialog-transaction-search-layout') {
   .co-dialog-transaction-search {
-    /*.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;
-      }
-    }
-    .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;
-      }
-      transition: transform .2s ease-in-out;
-      &.show-product {
-        transform: translateX(-50%);
-      }
-    }*/
+
   }
 }

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

@@ -2,3 +2,5 @@
 @import "./_material-definition";
 @import "./_layout";
 @import "./_theme";
+
+@import "../../../transaction-search/transaction-search-tile/transaction-search-tile/style/material";

package/lib/component/service-wizard-qa/question-answer-item/question-answer-item.component.d.ts

@@ -4,13 +4,16 @@ export declare class QuestionAnswerComponent {
     question: string;
     answers: ServiceWizardAnswer[];
     qaResultChange: EventEmitter<QaResult>;
+    wizardFinished: EventEmitter<boolean>;
     showClass(): boolean;
     selectedAnswer: string;
     questionAnswered: boolean;
+    allQuestionsAnswered: boolean;
     qaResult: QaResult[];
     onSelectAnswer(selectedAnswer: ServiceWizardAnswer): void;
     onChangeAnswer(changedAnswer: ServiceWizardAnswer): void;
     onQaResultChange(newVResult: QaResult): void;
+    onWizardFinished(wizardFinished: boolean): void;
 }
 export interface QaResult {
     answerId: number;

package/lib/component/service-wizard-qa/service-wizard-qa.component.d.ts

@@ -9,4 +9,5 @@ export declare class ServiceWizardQaComponent implements OnInit {
     constructor(transactionService: TransactionService);
     ngOnInit(): Promise<void>;
     onQaResultChange(newVResult: QaResult): void;
+    onWizardFinished(wizardFinished: boolean): void;
 }

package/lib/component/simple-vertical-stepper/co-simple-vertical-stepper.component.d.ts

@@ -1,4 +1,5 @@
 import { StepperBaseComponent } from "../core/base/stepper-base.component";
+import { Icon } from "../../enum/icon.enum";
 export interface steps {
     index: number;
     description: string;
@@ -7,6 +8,8 @@ export interface steps {
 export declare class SimpleVerticalStepperComponent extends StepperBaseComponent {
     showClass(): boolean;
     continueRequested(): void;
+    openToIndex(idx: number): void;
     protected validateCurrentStep(nextStep?: number): void;
     protected setActive(idx: number): void;
+    protected readonly Icon: typeof Icon;
 }

package/lib/component/simple-vertical-stepper/style/_layout.scss

@@ -28,10 +28,36 @@
       }
     }
     .simple-vertical-stepper-content-wrapper {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+
+    }
+    .stepper-button-wrapper {
       display: flex;
       flex-direction: column;
       align-items: center;
+      padding: 10px 30px;
+      .save-button {
+        height: $tp-co-stepper-step-save-button-size;
+        width: $tp-co-stepper-step-save-button-size;
+        border-color: $tp-co-stepper-step-save-button-border-color;
+        border-style: $tp-co-stepper-step-save-button-border-style;
+        border-width: $tp-co-stepper-step-save-button-border-width;
+        background-color: #1A73E8; //$tp-transaction-header-popup-button-background-color;
+        padding: 8px; //$tp-transaction-header-popup-button-padding;
+        box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.3); //$tp-transaction-header-popup-button-box-shadow;
+        cursor: pointer;
+
+        .co-icon {
+          height: 20px; //$tp-transaction-header-popup-save-button-icon-size;
+          width: 20px; //$tp-transaction-header-popup-save-button-icon-size;
 
+          svg {
+            fill: #FFFFFF; //$tp-transaction-header-popup-save-button-icon-color;
+          }
+        }
+      }
     }
   }
 }

package/lib/component/simple-vertical-stepper/style/_material-definition.scss

@@ -28,3 +28,8 @@ $tp-co-stepper-step-button-color: $tp-color-action !default;
 $tp-co-stepper-step-button-background-color: $tp-default-background-accent !default;
 $tp-co-stepper-step-button-icon-size: 15px !default;
 $tp-co-stepper-step-button-icon-color: $tp-color-action !default;
+
+$tp-co-stepper-step-save-button-size: 36px !default;
+$tp-co-stepper-step-save-button-border-color: #DCE4EA !default;
+$tp-co-stepper-step-save-button-border-width: 0 0 0 0 !default;
+$tp-co-stepper-step-save-button-border-style: solid !default;

package/lib/component/transaction-create-wizard/style/_layout.scss

@@ -1,4 +1,64 @@
 @include export-module('co-transaction-create-wizard-layout') {
   .co-transaction-create-wizard {
+    max-width: 1340px;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    co-simple-vertical-stepper {
+      flex-basis: 55%;
+      flex-grow: 1;
+      flex-shrink: 1;
+      max-width: calc(100% - 450px);
+      co-stepper-step {
+        width: 100%;
+        .co-transaction-header-popup-relation {
+          width: 100%;
+        }
+      }
+    }
+    .simple-vertical-stepper-content-wrapper {
+      display: flex;
+      flex-direction: row;
+      flex-wrap: nowrap;
+      gap: 30px;
+      padding: 30px;
+    }
+    .transaction-header-popup-section {
+      display: flex;
+      flex-direction: column;
+      gap: 15px;
+    }
+    .transaction-header-popup-section-label {
+      font-size: 12px;
+      display: flex;
+      flex-direction: row;
+      grid-gap: 10px;
+      gap: 10px;
+      align-items: center;
+      .label-description {
+        font-size: 16px;
+        font-weight: 700;
+      }
+    }
+    .service-data-column {
+      width: 100%;
+      overflow: hidden;
+      background: #f8f8fa;
+      padding: 30px;
+      display: flex;
+      flex-direction: column;
+      gap: 15px;
+    }
+    co-form {
+      .co-input-text {
+        label {
+          padding-right: 20px;
+        }
+        &:before {
+          box-shadow: none;
+        }
+      }
+    }
   }
 }

package/lib/component/transaction-create-wizard/transaction-create-wizard.component.d.ts

@@ -11,11 +11,13 @@ import { StepperStepComponent } from "../stepper-step/stepper-step.component";
 import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
 import { TransactionRelationService } from "../../service/transaction-relation.service";
 import { SimpleVerticalStepperComponent } from "../simple-vertical-stepper/co-simple-vertical-stepper.component";
+import { Icon } from "../../enum/icon.enum";
 export declare class TransactionCreateWizardComponent implements OnInit {
     createService: TransactionCreateService;
     relationService: TransactionRelationService;
     transactionScreenConfigurationService: TransactionScreenConfigurationService;
     readonly transKind: typeof TransactionKind;
+    readonly Icon: typeof Icon;
     stepper: SimpleVerticalStepperComponent;
     stepRelationSection: StepperStepComponent;
     relationSection: TransactionHeaderPopupRelationComponent;

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

@@ -559,5 +559,19 @@
         width: 100%;
       }
     }
+
+    .create-via-transaction {
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+      width: 100%;
+
+      .create-via-transaction-result-display {
+        display: flex;
+        flex-direction: row;
+        gap: 5px;
+        width: 100%;
+      }
+    }
   }
 }

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

@@ -1,6 +1,7 @@
 import { OnInit } from '@angular/core';
 import { FormMasterService } from '@colijnit/corecomponents_v12';
 import { ArticleExtended } from "@colijnit/articleapi/build/model/article-extended.bo";
+import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 export declare class TransactionHeaderPopupCreateServiceComponent implements OnInit {
     protected formMasterService: FormMasterService;
     showClass(): boolean;
@@ -10,8 +11,8 @@ export declare class TransactionHeaderPopupCreateServiceComponent implements OnI
     createViaOldTrans: boolean;
     showCatalogPopup: boolean;
     showTransLinePopup: boolean;
-    salesOrderId: string;
-    salesOrderLineNr: string;
+    existingTransactionId: number;
+    existingTransactionline: TransactionLineInfo;
     chosenArticle: ArticleExtended;
     goodId: number;
     articleSearchText: string;
@@ -22,11 +23,11 @@ export declare class TransactionHeaderPopupCreateServiceComponent implements OnI
     constructor(formMasterService: FormMasterService);
     ngOnInit(): Promise<void>;
     submit(): boolean;
-    createOrderWithTransactionLineClicked(): void;
+    createOrderWithTransactionLineClicked(openSearch?: boolean): void;
     createOrderWithArticleClicked(): void;
     createOrderFromSLAClicked(): void;
-    searchArticleClicked_handler(): void;
-    searchTransactionClicked_handler(): void;
+    openCatalogPopUp(): void;
+    openTransactionPopUp(): void;
     handleCatalogArticleClick(article: ArticleExtended): void;
     private _prepareCatalogRequest;
 }

package/lib/component/transaction-header/transaction-header-popup/transaction-header-popup-relation.component.d.ts

@@ -31,6 +31,7 @@ export declare class TransactionHeaderPopupRelationComponent extends Transaction
     configNames: RelationGeneralCfgNames;
     forceReadonly: boolean;
     showPrivacy: boolean;
+    showInvoiceAddress: boolean;
     inputChangeForSuggestions: EventEmitter<RelationSuggestionsRequest>;
     navigationItems: ElementRef;
     mainItems: ElementRef;

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

@@ -101,9 +101,10 @@
       }
       .header-relation-content {
         line-height: $tp-co-transaction-header-relation-content-line-height;
-        margin-top: $tp-co-transaction-header-relation-content-margin;
+        margin: $tp-co-transaction-header-relation-content-margin;
         max-width: $tp-co-transaction-header-relation-content-max-width;
         overflow: hidden;
+        gap: 0;
         .header-relation-name {
           margin: $tp-co-transaction-header-relation-content-name-margin;
         }

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

@@ -0,0 +1,5 @@
+@include export-module('co-transaction-search-sales-line-select-tile-layout') {
+  .co-transaction-search-sales-line-select-tile {
+  }
+}
+

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

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

package/lib/component/transaction-search/transaction-search-tile/transaction-search-sales-line-select-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-search-sales-line-select-tile.component.d.ts

@@ -0,0 +1,6 @@
+import { IconCacheService } from '../../../../service/icon-cache.service';
+import { TransactionSearchTileBaseComponent } from '../../../core/base/transaction-search-tile-base.component';
+export declare class TransactionSearchSalesLineSelectTileComponent extends TransactionSearchTileBaseComponent {
+    iconCacheService: IconCacheService;
+    constructor(iconCacheService: IconCacheService);
+}

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

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

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

@@ -4,5 +4,6 @@ import { StatusBarCfgNames } from '../../../../interface/status-bar-cfg-names.in
 export declare class TransactionSearchSalesOrderTileComponent extends TransactionSearchTileBaseComponent {
     iconCacheService: IconCacheService;
     statusBarConfigNames: StatusBarCfgNames;
+    showAvatar: boolean;
     constructor(iconCacheService: IconCacheService);
 }

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

@@ -100,6 +100,7 @@ export declare enum Icon {
     RegularTruckMovingCircleUser = "regular_truck_moving_circle_user",
     Remark = "remark",
     Resize = "resize",
+    ServiceCartRegular = "service_cart_regular",
     ShareSolid = "share_solid",
     SharpLightTruckMovingClock = "sharp_light_truck_moving_clock",
     SharpRegularBarcodeReadTag = "sharp_regular_barcode_read_tag",

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

@@ -170,6 +170,7 @@ import { ChangeServiceHeaderReportMessageRequest } from "@colijnit/transactionap
 import { SupplierArticleStockForecast } from "@colijnit/transactionapi/build/model/supplier-article-stock-forecast";
 import { ChangeLineDirectSellRequest } from "@colijnit/transactionapi/build/model/change-line-direct-sell-request";
 import { ServiceWizard } from "@colijnit/transactionapi/build/model/service-wizard";
+import { ServiceType } from "@colijnit/transactionapi/build/model/service-type";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -413,6 +414,7 @@ export declare class TransactionConnectorAdapterService {
     getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
     getServiceWizard(): Promise<ServiceWizard>;
     upsertServiceWizard(request: ServiceWizard): Promise<void>;
+    getServiceTypes(): Promise<ServiceType[]>;
     addOrderLineSet(request: TransactionAddOrderLineSetTextLineRequest): Promise<TransactionInfoResponse>;
     updateOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
     changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;

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

@@ -157,6 +157,7 @@ import { ChangeServiceHeaderReportMessageRequest } from "@colijnit/transactionap
 import { SupplierArticleStockForecast } from "@colijnit/transactionapi/build/model/supplier-article-stock-forecast";
 import { ChangeLineDirectSellRequest } from "@colijnit/transactionapi/build/model/change-line-direct-sell-request";
 import { ServiceWizard } from "@colijnit/transactionapi/build/model/service-wizard";
+import { ServiceType } from "@colijnit/transactionapi/build/model/service-type";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -386,6 +387,7 @@ export declare class TransactionConnectorService {
     getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
     getServiceWizard(): Promise<ServiceWizard>;
     upsertServiceWizard(request: ServiceWizard): Promise<void>;
+    getServiceTypes(): Promise<ServiceType[]>;
     addOrderLineSet(request: TransactionAddOrderLineSetTextLineRequest): Promise<TransactionInfoResponse>;
     updateOrderLineSet(request: OrderLineSetDTO): Promise<TransactionInfoResponse>;
     changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<TransactionInfoResponse>;

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

@@ -128,6 +128,7 @@ import { PlanOrder } from "@colijnit/transactionapi/build/model/plan-order.bo";
 import { SupplierArticleStockForecast } from "@colijnit/transactionapi/build/model/supplier-article-stock-forecast";
 import { ChangeLineDirectSellRequest } from "@colijnit/transactionapi/build/model/change-line-direct-sell-request";
 import { ServiceWizard } from "@colijnit/transactionapi/build/model/service-wizard";
+import { ServiceType } from "@colijnit/transactionapi/build/model/service-type";
 export declare class TransactionService extends PendingReasonService {
     remainingAmount: number;
     private readonly _createTransactionMethods;
@@ -349,6 +350,7 @@ export declare class TransactionService extends PendingReasonService {
     getOrderLineSetCategories(): Promise<OrderLineSetCategory[]>;
     getServiceWizard(): Promise<ServiceWizard>;
     upsertServiceWizard(request: ServiceWizard): Promise<void>;
+    getServiceTypes(): Promise<ServiceType[]>;
     addOrderLineSet(request: TransactionAddOrderLineSetTextLineRequest): Promise<boolean>;
     updateOrderLineSet(request: OrderLineSetDTO): Promise<boolean>;
     changeTransactionLineOrderLineSet(uuid: string, lineUuid: string, code: string): Promise<boolean>;

package/package.json

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