@colijnit/transaction 12.1.164 → 12.1.166

package/lib/component/add-product/add-product.component.d.ts

@@ -5,7 +5,7 @@ import { TransactionService } from '../../service/transaction.service';
 import { SafeHtml } from '@angular/platform-browser';
 export declare class AddProductComponent {
     iconService: IconCacheService;
-    private _transactionService;
+    transactionService: TransactionService;
     readonly icons: typeof Icon;
     showClass(): boolean;
     return: boolean;
@@ -15,7 +15,7 @@ export declare class AddProductComponent {
     searchText: string;
     cartPlusIcon: SafeHtml;
     cartMinIcon: SafeHtml;
-    constructor(iconService: IconCacheService, _transactionService: TransactionService);
+    constructor(iconService: IconCacheService, transactionService: TransactionService);
     handleSearch(text: string): Promise<void>;
     handleAddArticle(sku: string): Promise<boolean>;
     handleAddArticleClick(jsonArticleTree: string): Promise<void>;
@@ -23,5 +23,14 @@ export declare class AddProductComponent {
     showCatalogDialog(): void;
     handleCartIconClick(event: MouseEvent): void;
     handleSearchIconClick(event: MouseEvent): void;
+    handleIFrameFeedback(iFrameFeedbackObject: {
+        jsonString: string;
+        catalog: number;
+        sourceType: string;
+    }): Promise<void>;
+    handleAddCatFarmArticleClick(data: {
+        jsonString: string;
+        catalog: number;
+    }): Promise<void>;
     private _prepareCatalogRequest;
 }

package/lib/component/dialog/catalog/dialog-catalog/dialog-catalog.component.d.ts

@@ -6,39 +6,70 @@ import { ExternalSource } from '@colijnit/articleapi/build/model/external-source
 import { ExternalSourceViewmodel } from '@colijnit/catalog/lib/model/external-source-viewmodel';
 import { IconCacheService } from '../../../../service/icon-cache.service';
 import { Icon } from '../../../../enum/icon.enum';
+import { CatalogDefinition } from "@colijnit/articleapi/build/model/catalog-definition.bo";
+import { ExternalCatalogStartupInfo } from "@colijnit/articleapi/build/model/external-catalog-startup-info";
+import { ArticleService } from "../../../../service/article.service";
+import { TransactionInfoResponse } from "@colijnit/transactionapi/build/model/transaction-info-response.bo";
+import { ArticleListObjectExtended } from "@colijnit/articleapi/build/model/article-list-object-extended.bo";
 export declare class DialogCatalogComponent implements OnInit, OnDestroy {
     private _transactionService;
     private _catalogService;
     private _catalogEventService;
+    private _articleService;
     iconCacheService: IconCacheService;
     readonly icons: typeof Icon;
     options: any;
     parameters: any;
     showNavigation: boolean;
+    transaction: TransactionInfoResponse;
     closeClick: EventEmitter<MouseEvent>;
     articleClicked: EventEmitter<ArticleExtended>;
+    iFrameFeedback: EventEmitter<{
+        jsonString: string;
+        catalog: number;
+        sourceType: string;
+    }>;
     addArticleClicked: EventEmitter<string>;
+    addCatFarmArticleClicked: EventEmitter<{
+        jsonString: string;
+        catalog: number;
+    }>;
     addExternalArticleClicked: EventEmitter<string>;
     showClass(): boolean;
     catalogSettings: any;
     externalCatalogName: string;
     showExternalCatalog: boolean;
     externalSource: ExternalSource;
+    catalogDefinition: CatalogDefinition;
     articleForStock: ArticleExtended;
     showStock: boolean;
     showProduct: boolean;
     showExternalProduct: boolean;
     sku: string;
+    catSku: string;
+    catArtName: string;
     destroyed: boolean;
+    externalCatalogOptions: {
+        searchOnStart: boolean;
+    };
+    catalogInfo: ExternalCatalogStartupInfo;
     private _subs;
-    constructor(_transactionService: TransactionService, _catalogService: CatalogService, _catalogEventService: CatalogEventService, iconCacheService: IconCacheService);
+    constructor(_transactionService: TransactionService, _catalogService: CatalogService, _catalogEventService: CatalogEventService, _articleService: ArticleService, iconCacheService: IconCacheService);
     ngOnInit(): Promise<void>;
     ngOnDestroy(): void;
     handleStockButtonClick(article: ArticleExtended): void;
     cancelStockButtonClick(): void;
-    handleExternalSourceClick(source?: ExternalSourceViewmodel): void;
+    handleExternalSourceClick(source?: ExternalSourceViewmodel): Promise<void>;
     handleArticleClick(article: ArticleExtended): void;
     handleAddArticleClick(json: string): void;
     handleAddExternalArticleClick(json: string): void;
     handleBackClick(event: MouseEvent): void;
+    handleIFrameFeedback(json: string): void;
+    handleCatFarmArticleClicked(data: {
+        article: ArticleListObjectExtended;
+        settings: any;
+    }): void;
+    handleAddCatFarmArticleClicked(jsonString: string): void;
+    private buildExternalCatalogRequest;
+    private expandExternalCatalogRequestIfNeeded;
 }

package/lib/component/dialog/catalog/dialog-catalog/style/_layout.scss

@@ -5,6 +5,7 @@
       width: $tp-dialog-catalog-min-width;
       max-width: 100vw;
       .dialog-content {
+        height: 100%;
         overflow-x: hidden;
       }
     }
@@ -15,6 +16,7 @@
       > * {
         width: $tp-dialog-catalog-min-width;
       }
+      height: 100%;
       .back-button-product {
         cursor: pointer;
       }

package/lib/component/shared/transaction-article-text/transaction-article-text.component.d.ts

@@ -8,11 +8,13 @@ import { StandardText } from '../../../model/standard-text';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
 import { OrderLineSetCategory } from "@colijnit/mainapi/build/model/order-line-set-category.bo";
 import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
+import { FormComponent } from "@colijnit/corecomponents_v12";
 import { FilterItemViewmodel } from "@colijnit/corecomponents_v12/lib/components/filter-item/filter-item-viewmodel";
 export declare class TransactionArticleTextComponent implements OnInit {
     transactionService: TransactionService;
     iconCacheService: IconCacheService;
     private _dictionaryService;
+    form: FormComponent;
     header: string;
     transactionUuid: string;
     set transactionLine(value: TransactionLineInfo);
@@ -42,11 +44,14 @@ export declare class TransactionArticleTextComponent implements OnInit {
     documents: FilterItemViewmodel[];
     orderLineSetCategories: OrderLineSetCategory[];
     showOnDocuments: number[];
+    amount: number;
+    color: string;
+    title: string;
     selectAll: boolean;
     fields: Object;
     fieldsDocuments: Object;
     textAreaPlaceholder: string;
-    isNewOrderlineSet: boolean;
+    new: boolean;
     showOrderLineFields: boolean;
     chosenOrderLineSetCategory: OrderLineSetCategory;
     transactionAddTextLineRequest: TransactionAddTextLineRequest;
@@ -55,7 +60,7 @@ export declare class TransactionArticleTextComponent implements OnInit {
     constructor(transactionService: TransactionService, iconCacheService: IconCacheService, _dictionaryService: DictionaryService);
     ngOnInit(): Promise<void>;
     onOkClick(event: MouseEvent): void;
-    onCancelClick(event: MouseEvent): void;
+    onValidFormSubmit(): void;
     onSelectStandardText(value: StandardText): void;
     handleDocumentsChange(checked: boolean, document: FilterItemViewmodel): void;
     handleSelectAll(select: boolean): void;

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

@@ -15,7 +15,7 @@
       border: 1px solid $tp-color-border;
       padding: 12px;
 
-      co-transaction-line-amount co-input-number-picker, .transaction-card-price {
+      co-input-number-picker, .transaction-card-price {
         display: flex;
         align-items: center;
         justify-content: center;
@@ -71,12 +71,6 @@
         }
       }
     }
-
-    .transaction-line-totals-amount {
-      .amount-number-picker {
-        height: 100%;
-      }
-    }
     .transaction-line-totals-price, .transaction-line-totals-discount, .transaction-line-totals-total {
       display: flex;
       align-items: center;

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

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-goods-allocation-layout') {
+  .co-transaction-card-goods-allocation {
+  }
+}

package/lib/component/transaction-card/transaction-card-goods-allocation/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-goods-allocation-theme') {
+  .co-transaction-card-goods-allocation {
+  }
+}

package/lib/component/transaction-card/transaction-card-goods-allocation/style/material.scss

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

package/lib/component/transaction-card/transaction-card-goods-allocation/transaction-card-goods-allocation.component.d.ts

@@ -0,0 +1,9 @@
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
+import { TransactionGoodsAllocationLineComponent } from "../../transaction-line/transaction-goods-allocation-line/transaction-goods-allocation-line.component";
+export declare class TransactionCardGoodsAllocationComponent extends TransactionGoodsAllocationLineComponent {
+    showClass(): boolean;
+    expanded: boolean;
+    statusBarConfigNames: StatusBarCfgNames;
+    handleShowSidePanel(line: TransactionLineInfo): void;
+}

package/lib/component/transaction-card/transaction-card-goods-allocation/transaction-card-goods-allocation.module.d.ts

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

package/lib/component/transaction-card/transaction-card-header/transaction-card-header.component.d.ts

@@ -1,6 +1,7 @@
 import { AfterViewInit } from '@angular/core';
 import { Icon } from '../../../enum/icon.enum';
 import { TransactionBaseComponent } from '../../core/base/transaction-base.component';
+import { ActionButtonsCfgNames } from "../../../interface/action-buttons-cfg-names.interface";
 export declare class TransactionCardHeaderComponent extends TransactionBaseComponent implements AfterViewInit {
     readonly icons: typeof Icon;
     showCheckbox: boolean;
@@ -8,6 +9,7 @@ export declare class TransactionCardHeaderComponent extends TransactionBaseCompo
     showThumbnail: boolean;
     expanded: boolean;
     image: string;
+    actionButtonsConfigNames: ActionButtonsCfgNames;
     showClass(): boolean;
     ngAfterViewInit(): void;
     private _loadLineImage;

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

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-picked-layout') {
+  .co-transaction-card-picked {
+  }
+}

package/lib/component/transaction-card/transaction-card-picked/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-picked-theme') {
+  .co-transaction-card-picked {
+  }
+}

package/lib/component/transaction-card/transaction-card-picked/style/material.scss

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

package/lib/component/transaction-card/transaction-card-picked/transaction-card-picked.component.d.ts

@@ -0,0 +1,9 @@
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
+import { TransactionPickedLineComponent } from "../../transaction-line/transaction-picked-line/transaction-picked-line.component";
+export declare class TransactionCardPickedComponent extends TransactionPickedLineComponent {
+    showClass(): boolean;
+    expanded: boolean;
+    statusBarConfigNames: StatusBarCfgNames;
+    handleShowSidePanel(line: TransactionLineInfo): void;
+}

package/lib/component/transaction-card/transaction-card-picked/transaction-card-picked.module.d.ts

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

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

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-purchase-layout') {
+  .co-transaction-card-purchase {
+  }
+}

package/lib/component/transaction-card/transaction-card-purchase/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-purchase-theme') {
+  .co-transaction-card-purchase {
+  }
+}

package/lib/component/transaction-card/transaction-card-purchase/style/material.scss

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

package/lib/component/transaction-card/transaction-card-purchase/transaction-card-purchase.component.d.ts

@@ -0,0 +1,9 @@
+import { TransactionPurchaseLineBaseComponent } from "../../transaction-line/transaction-purchase-line/transaction-purchase-line-base.component";
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
+export declare class TransactionCardPurchaseComponent extends TransactionPurchaseLineBaseComponent {
+    showClass(): boolean;
+    expanded: boolean;
+    statusBarConfigNames: StatusBarCfgNames;
+    handleShowSidePanel(line: TransactionLineInfo): void;
+}

package/lib/component/transaction-card/transaction-card-purchase/transaction-card-purchase.module.d.ts

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

package/lib/component/transaction-card/transaction-card-to-be-picked/style/_layout.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-to-be-picked-layout') {
+  .co-transaction-card-to-be-picked {
+  }
+}

package/lib/component/transaction-card/transaction-card-to-be-picked/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-card-to-be-picked-theme') {
+  .co-transaction-card-to-be-picked {
+  }
+}

package/lib/component/transaction-card/transaction-card-to-be-picked/style/material.scss

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

package/lib/component/transaction-card/transaction-card-to-be-picked/transaction-card-to-be-picked.component.d.ts

@@ -0,0 +1,9 @@
+import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transaction-line-info.bo';
+import { StatusBarCfgNames } from '../../../interface/status-bar-cfg-names.interface';
+import { TransactionToBePickedLineComponent } from "../../transaction-line/transaction-to-be-picked-line/transaction-to-be-picked-line.component";
+export declare class TransactionCardToBePickedComponent extends TransactionToBePickedLineComponent {
+    showClass(): boolean;
+    expanded: boolean;
+    statusBarConfigNames: StatusBarCfgNames;
+    handleShowSidePanel(line: TransactionLineInfo): void;
+}

package/lib/component/transaction-card/transaction-card-to-be-picked/transaction-card-to-be-picked.module.d.ts

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

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

@@ -17,7 +17,7 @@ import { DialogService } from '../../service/dialog.service';
 import { LineSelectionService } from '../../service/line-selection.service';
 import { TransactionBarButton } from '../../model/transaction-bar-button';
 import { TransactionAddTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-text-line-request.bo';
-import { OrderLineSetDTO } from "@colijnit/transactionapi/build/model/order-line-set-dto";
+import { OrderLineSetDTO } from '@colijnit/transactionapi/build/model/order-line-set-dto';
 import { TransactionConnectorService } from '../../service/transaction-connector.service';
 export declare class TransactionInternalComponent implements OnDestroy {
     iconCacheService: IconCacheService;

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

@@ -20,10 +20,5 @@
       height: $tp-transaction-base-line-delete-icon-size;
       width: $tp-transaction-base-line-delete-icon-size;
     }
-    .colorBlock {
-      width: 20px;
-      border-radius: 5px;
-      border: 1px solid;
-    }
   }
 }

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

@@ -108,10 +108,15 @@
       border-radius: $tp-default-border-radius;
       padding: $tp-transaction-line-totals-padding;
       .co-input-text {
-        width: 80%;
-        height: 95%;
+        width: 100%;
+        height: 100%;
+        border: none;
         input {
-          margin: 4px 0 0;
+          margin: 0;
+          border: none;
+        }
+        &:before {
+          display: none;
         }
       }
     }

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

@@ -31,9 +31,7 @@
     }
     .colorBlock {
       height: 20px;
-      width: 20px;
-      border-radius: 5px;
-      border: 1px solid;
+      width: 5px;
     }
   }
 }

package/lib/component/transaction-line-image-and-description/style/_layout.scss

@@ -17,6 +17,12 @@
         height: $tp-transaction-line-image-and-description-preview-image-height;
       }
     }
+
+    .colorBlock {
+      height: 100%;
+      min-width: 5px;
+    }
+
     .transaction-line-description {
       display: flex;
       flex-direction: column;

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

@@ -53,6 +53,7 @@ export declare enum Icon {
     IndustrySolid = "industry_solid",
     Invoice = "invoice",
     LinkRegular = "link_regular",
+    LinkSimpleSolid = "link_simple_solid",
     ListRegular = "list_regular",
     ListTimelineRegular = "list_timeline_regular",
     ListView = "list_view",

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

@@ -14602,18 +14602,6 @@ export declare class Dictionaries {
         PIN_NOT_SUPPORTED: string;
         PIN_PAYMENT_FAILED: string;
         PIN_PAYMENT_MADE_WARNING: string;
-        PIN_PAYMENT_SAVE_TRANSACTION: string;
-        PIN_PAYMENT_REQUESTED: string;
-        PIN_PAYMENT_STARTED: string;
-        PIN_PAYMENT_PAID: string;
-        PIN_PAYMENT_CANCELLED: string;
-        PIN_PAYMENT_INIT: string;
-        PIN_PAYMENT_PENDING: string;
-        PIN_PAYMENT_EXPIRED: string;
-        PIN_PAYMENT_DENIED: string;
-        PIN_PAYMENT_FAILURE: string;
-        PIN_PAYMENT_PARTIAL_PAYMENT: string;
-        PIN_PAYMENT_VERIFY: string;
         PIN_RESULT_FILE_FORMAT_ERROR: string;
         PIN_TERMINAL: string;
         PIN_TERMINAL_NR: string;

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

@@ -7,6 +7,8 @@ import { MainArticle } from '@colijnit/articleapi/build/model/main-article.bo';
 import { TransactionEventService } from './transaction-event.service';
 import { ArticleFlatTreeDTO } from '@colijnit/articleapi/build/model/article-flat-tree.bo';
 import { DialogService } from './dialog.service';
+import { ExternalCatalogStartupInfoRequest } from "@colijnit/articleapi/build/model/external-catalog-startup-info-request";
+import { ExternalCatalogStartupInfo } from "@colijnit/articleapi/build/model/external-catalog-startup-info";
 export declare class ArticleConnectorService {
     private _transactionEventService;
     private _dialogService;
@@ -19,4 +21,5 @@ export declare class ArticleConnectorService {
     getMainArticles(): Promise<MainArticle[]>;
     getTurnoverGroups(category?: string): Promise<TurnoverGroupImage[]>;
     storeCatFarmCompositionArticle(catalogId: number, articleFlatTree: ArticleFlatTreeDTO): Promise<string>;
+    getWebViewStartupInfo(request: ExternalCatalogStartupInfoRequest): Promise<ExternalCatalogStartupInfo>;
 }

package/lib/service/article.service.d.ts

@@ -1,8 +1,11 @@
 import { ArticleConnectorService } from "./article-connector.service";
 import { SelectMultipleParameterizedCacheService } from "../cache/service/select-multiple-parameterized-cache.service";
+import { ExternalCatalogStartupInfoRequest } from "@colijnit/articleapi/build/model/external-catalog-startup-info-request";
+import { ExternalCatalogStartupInfo } from "@colijnit/articleapi/build/model/external-catalog-startup-info";
 export declare class ArticleService {
     private _articleConnectorService;
     private _selectMultipleParameterizedCacheService;
     constructor(_articleConnectorService: ArticleConnectorService, _selectMultipleParameterizedCacheService: SelectMultipleParameterizedCacheService);
     getWarehouseLocations(warehouseNr: number): Promise<any>;
+    getWebViewStartupInfo(request: ExternalCatalogStartupInfoRequest): Promise<ExternalCatalogStartupInfo>;
 }

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

@@ -5,7 +5,7 @@ import { TransactionLineInfo } from '@colijnit/transactionapi/build/model/transa
 import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
 import { TransactionInfoResponse } from '@colijnit/transactionapi/build/model/transaction-info-response.bo';
 import { TransactionTypeCategory } from '../enum/transaction-type-category.enum';
-import { OrderLineSetInfo } from "@colijnit/transactionapi/build/model/order-line-set-info.bo";
+import { OrderLineSetInfo } from '@colijnit/transactionapi/build/model/order-line-set-info.bo';
 export declare class TransactionEventService {
     readonly addToCartBySku: Subject<{
         sku: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.164",
+  "version": "12.1.166",
   "description": "Colijn IT transaction module for Angular 12",
   "repository": "npm/npm",
   "author": "Colijn IT",
@@ -9,7 +9,7 @@
   "peerDependencies": {
     "@angular/common": ">=12.2.0",
     "@angular/core": ">=12.2.0",
-    "@colijnit/articleapi": ">=1.0.30",
+    "@colijnit/articleapi": ">=1.0.33",
     "@colijnit/catalog": ">=12.1.51",
     "@colijnit/corecomponents": ">=1.12.0",
     "@colijnit/corecomponents_v12": ">=12.2.9",
@@ -19,7 +19,7 @@
     "@colijnit/relationapi": ">=1.0.8",
     "@colijnit/sharedapi": ">=1.0.16",
     "@colijnit/sharedcomponents": ">=1.0.46",
-    "@colijnit/transactionapi": ">=1.1.116",
+    "@colijnit/transactionapi": ">=1.1.117",
     "@types/three": ">=0.125.0",
     "@tweenjs/tween.js": ">=17.2.0",
     "three": ">=0.125.0"