@colijnit/transaction 12.1.17 → 12.1.18

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

@@ -35,10 +35,12 @@
         width: 1px;
         margin: 5px;
       }
-      .close-button {
-        width: 30px;
-        height: 30px;
-      }
+    }
+    .close-button {
+      display: flex;
+      align-self: flex-end;
+      width: 25px;
+      height: 25px;
     }
     .transaction-line-side-panel-nav-bar {
       display: flex;

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

@@ -2,7 +2,7 @@ $tp-transaction-line-side-panel-font-family: $tp-font-family !default;
 $tp-transaction-line-side-panel-font-size: $tp-font-size !default;
 $tp-transaction-line-side-panel-top: 0 !default;
 $tp-transaction-line-side-panel-height: 100% !default;
-$tp-transaction-line-side-panel-width: 700px !default;
+$tp-transaction-line-side-panel-width: 450px !default;
 $tp-transaction-line-side-panel-box-shadow: -3px 0px 16px 1px rgb(0, 0, 0, 0.2) !default;
 $tp-transaction-line-side-panel-padding: 10px !default;
 $tp-transaction-line-side-panel-header-label-font-family: $tp-font-family !default;

package/lib/component/transaction-line-side-panel-default/style/_layout.scss

@@ -2,6 +2,9 @@
 
 @include export-module('co-transaction-line-side-panel-default') {
   .co-transaction-line-side-panel-default {
+    display: flex;
+    flex-direction: column;
+    row-gap: 20px;
     //.side-panel-header-description {
     //  font-weight: $tp-transaction-line-side-panel-header-description-font-weight;
     //}

package/lib/component/transaction-search/service/filter-request.service.d.ts

@@ -7,8 +7,8 @@ export declare class FilterRequestService {
     constructor(searchService: TransactionSearchService, _transactionService: TransactionService);
     handleCollectionChangeForRange(collection: FilterItemViewmodel[], modelName: string): void;
     handleCollectionChangeForArray(collection: FilterItemViewmodel[], modelName: string): void;
-    handleCollectionChangeForSingleValue(collection: FilterItemViewmodel[], modelName: string): void;
-    handleCollectionChangeForSingleNumber(collection: FilterItemViewmodel[], modelName: string): void;
+    handleCollectionChangeForSingleValue(value: string, modelName: string): void;
+    handleCollectionChangeForSingleNumber(value: number, modelName: string): void;
     handleCheckboxValueChangeForString(value: boolean, modelName: string): void;
     handleCheckboxValueChangeForNumber(value: boolean, modelName: string): void;
     handleDateRangeChange(dates: Date[], modelName: string): void;
@@ -16,8 +16,6 @@ export declare class FilterRequestService {
     private _getFilterRequestForCollectionRange;
     private _getFilterRequestForBooleanToString;
     private _getFilterRequestForCollectionArray;
-    private _getFilterRequestForSingleCollectionValue;
-    private _getFilterRequestForSingleCollectionNumber;
     private _getFilterRequestForDateRange;
     private _formatDateToString;
 }

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

@@ -10,7 +10,7 @@ $tp-co-transaction-filter-font-size: $tp-font-size !default;
 $cc-co-transaction-filter-background-color: $cc-color-light !default;
 $cc-co-transaction-filter-width: 350px !default;
 $cc-co-transaction-filter-padding: 10px !default;
-$cc-co-transaction-filter-border: solid 1px !default;
+$cc-co-transaction-filter-border: none !default;
 $cc-co-transaction-filter-top: 0 !default;
 
 $cc-co-transaction-filter-icon-margin-left: 10px !default;

package/lib/component/transaction-search/transaction-filter-content-article/transaction-filter-content-article.component.d.ts

@@ -23,6 +23,16 @@ export declare class TransactionFilterContentArticleComponent implements OnInit
         text: any;
         value: any;
     };
+    turnoverGroups: FilterItemViewmodel[];
+    turnoverGroupFields: {
+        text: any;
+        value: any;
+    };
+    mainArticles: FilterItemViewmodel[];
+    mainArticleFields: {
+        text: any;
+        value: any;
+    };
     suppliers: FilterItemViewmodel[];
     supplierFields: {
         text: any;
@@ -31,7 +41,10 @@ export declare class TransactionFilterContentArticleComponent implements OnInit
     constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, _transactionService: TransactionService);
     ngOnInit(): void;
     onFilterButtonClick(): void;
-    private _setArticleNumbers;
+    getArticles: (text: string) => Promise<FilterItemViewmodel[]>;
+    handleCollectionChangeArticleNumber(collection: FilterItemViewmodel[]): void;
     private _setExceedanceCodes;
+    private _setTurnoverGroups;
+    private _setMainArticles;
     private _setSuppliers;
 }

package/lib/component/transaction-search/transaction-filter-content-logistics/style/material.scss

@@ -2,3 +2,4 @@
 @import "./material-definition";
 @import "./layout";
 @import "./theme";
+@import "../../transaction-filter-historic-state/style/material";

package/lib/component/transaction-search/transaction-filter-content-logistics/transaction-filter-content-logistics.component.d.ts

@@ -30,6 +30,7 @@ export declare class TransactionFilterContentLogisticsComponent implements OnIni
     constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, _transactionService: TransactionService);
     ngOnInit(): void;
     onFilterButtonClick(): void;
+    handleAllocatedChange(value: any): void;
     private _setRangeDates;
     private _setDeliveryMethods;
     private _setWarehouses;

package/lib/component/transaction-search/transaction-filter-content-order/transaction-filter-content-order.component.d.ts

@@ -50,6 +50,8 @@ export declare class TransactionFilterContentOrderComponent implements OnInit {
     constructor(searchService: TransactionSearchService, filterRequestService: FilterRequestService, _transactionService: TransactionService);
     ngOnInit(): void;
     onFilterButtonClick(): void;
+    loadCustomers: (nameFilter: string) => Promise<FilterItemViewmodel[]>;
+    handleCollectionChangeCustomerName(collection: FilterItemViewmodel[]): void;
     private _setRangeDates;
     private _setSalesPersons;
     private _setTags;

package/lib/component/transaction-search/transaction-filter-historic-state/style/_layout.scss

@@ -0,0 +1,9 @@
+@include export-module('cc-transaction-filter-historic-state-layout') {
+  .co-transaction-filter-historic-state {
+    .co-radio-button {
+      height: auto;
+      padding: 0;
+      border: none;
+    }
+  }
+}

package/lib/component/transaction-search/transaction-filter-historic-state/style/_theme.scss

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

package/lib/component/transaction-search/transaction-filter-historic-state/style/material.scss

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

package/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.component.d.ts

@@ -0,0 +1,22 @@
+import { EventEmitter } from "@angular/core";
+import { QuantityInHistoricState } from "@colijnit/transactionapi/build/enum/quantity-in-historic-state.enum";
+export interface HistoricStates {
+    label: string;
+    value: QuantityInHistoricState;
+    checked: boolean;
+}
+export declare class TransactionFilterHistoricStateComponent {
+    set label(value: string);
+    get label(): string;
+    expanded: boolean;
+    filterClicked: EventEmitter<number>;
+    showClass(): boolean;
+    private _label;
+    groupName: string;
+    labelNothing: string;
+    labelPartly: string;
+    labelFully: string;
+    states: HistoricStates[];
+    handleStateChange(value: any): void;
+    private _setStates;
+}

package/lib/component/transaction-search/transaction-filter-historic-state/transaction-filter-historic-state.module.d.ts

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

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

@@ -7,8 +7,8 @@
     }
 
     .transaction-filter-wrapper {
-      overflow-y: auto;
-      overflow-x: hidden;
+      //overflow-y: auto;
+      //overflow-x: hidden;
       min-width: $tp-co-transaction-search-filter-wrapper-min-width;
       height: $tp-co-transaction-search-filter-wrapper-height;
     }

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

@@ -9,6 +9,7 @@ export declare enum Icon {
     BarsFilter = "bars_filter",
     CalendarDay = "calendar_day",
     Cancel = "cancel",
+    CartCheck = "cart_check",
     CartFlatbedBoxesSolid = "cart_flatbed_boxes_solid",
     CartShoppingSolid = "cart_shopping_solid",
     CashRegister = "cash_register",

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

@@ -2,6 +2,10 @@ import { OptionsService } from "./options.service";
 import { CollectionCacheService } from "./collection-cache.service";
 import { Articles } from "@colijnit/articleapi/build/articles";
 import { StockLocation } from "@colijnit/articleapi/build/model/stock-location.bo";
+import { ArticleExtendedRequest } from "@colijnit/articleapi/build/model/article-extended-request";
+import { ArticleLight } from "@colijnit/articleapi/build/model/article-light.bo";
+import { TurnoverGroupImage } from "@colijnit/articleapi/build/model/turnover-group-image.bo";
+import { MainArticle } from "@colijnit/articleapi/build/model/main-article.bo";
 export declare class ArticleConnectorService {
     private _optionsService;
     private _collectionService;
@@ -10,4 +14,7 @@ export declare class ArticleConnectorService {
     constructor(_optionsService: OptionsService, _collectionService: CollectionCacheService);
     connect(): Promise<void>;
     getWarehouseLocations(warehouseNr: number): Promise<StockLocation[]>;
+    searchArticles(request: ArticleExtendedRequest): Promise<ArticleLight[]>;
+    getMainArticles(): Promise<MainArticle[]>;
+    getTurnoverGroups(category?: string): Promise<TurnoverGroupImage[]>;
 }

package/lib/service/pending-reason.service.d.ts

@@ -5,16 +5,18 @@ import { BehaviorSubject } from "rxjs";
 import { CustomerFullObject } from "@colijnit/transactionapi/build/model/customer-full-object.bo";
 import { DialogService } from "./dialog.service";
 import { ResolveLinePendingReasonRequest } from "@colijnit/transactionapi/build/model/resolve-pending-reason-request.bo";
+import { ArticleConnectorService } from "./article-connector.service";
 export declare class PendingReasonService {
     protected dialogService: DialogService;
     protected options: OptionsService;
     protected connector: TransactionConnectorService;
+    protected articleConnector: ArticleConnectorService;
     transactionUpdated: BehaviorSubject<TransactionInfoResponse>;
     applicationUser: boolean;
     currentTransaction: TransactionInfoResponse;
     relation: CustomerFullObject;
     articleAmount: number;
-    constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService);
+    constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, articleConnector: ArticleConnectorService);
     init(options: any): Promise<void>;
     cancelAddTransactionLine(lineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
     protected handleLineOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;

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

@@ -35,6 +35,10 @@ import { PendingReasonService } from "./pending-reason.service";
 import { ReceiveGoodsForPurchaseOrderRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-request.bo";
 import { GoodsReceiptStatusWithHistory } from "@colijnit/transactionapi/build/model/goods-receipt-status-with-history.bo";
 import { ReceiveGoodsForPurchaseOrderCorrectionRequest } from "@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-correction-request.bo";
+import { ArticleExtendedRequest } from "@colijnit/articleapi/build/model/article-extended-request";
+import { ArticleLight } from "@colijnit/articleapi/build/model/article-light.bo";
+import { TurnoverGroupImage } from "@colijnit/articleapi/build/model/turnover-group-image.bo";
+import { MainArticle } from "@colijnit/articleapi/build/model/main-article.bo";
 export declare class TransactionService extends PendingReasonService {
     pendingLineOperationStatus(lineOperationStatuses: LineOperationStatus[]): LineOperationStatus | undefined;
     updatePriceTransactionLine(uuid: string, lineUuid: string, price: number): Promise<boolean>;
@@ -63,8 +67,11 @@ export declare class TransactionService extends PendingReasonService {
     addRelationToTransaction(relationId: number): Promise<boolean>;
     getCommissionCodes(languageCode: string): Promise<CoDomainValue[]>;
     getInOutCollection(languageCode: string): Promise<CoDomainValue[]>;
+    getTurnoverGroups(): Promise<TurnoverGroupImage[]>;
     getTransactionArticleWarehouses(goodId: number): Promise<TransactionArticleWarehouse[]>;
     getMarketingCodes(): Promise<Marketing[]>;
+    getArticles(request: ArticleExtendedRequest): Promise<ArticleLight[]>;
+    getMainArticles(): Promise<MainArticle[]>;
     insertCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     updateCustomer(relation: CustomerFullObject): Promise<CustomerFullObject>;
     getDeliveryMethods(): Promise<DeliveryMethod[]>;

package/lib/style/_variables.scss

@@ -103,4 +103,6 @@ $cc-checkbox-border-radius: 7px;
 $cc-checkbox-check-background-color: white;
 $cc-checkbox-check-border-color: #5FDCB3;
 $cc-checkbox-check-color: #5FDCB3;
+
+$cc-collapsible-content-padding: 10px 0px 0px 0px
 /****************************/

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@colijnit/transaction",
-  "version": "12.1.17",
+  "version": "12.1.18",
   "description": "Colijn IT transaction module for Angular 12",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.0",
     "@angular/core": "^12.2.0",
-    "@colijnit/corecomponents_v12": ">=12.0.40",
-    "@colijnit/transactionapi": ">=1.1.24",
+    "@colijnit/corecomponents_v12": ">=12.0.43",
+    "@colijnit/transactionapi": ">=1.1.25",
     "@fortawesome/angular-fontawesome": "0.9.0",
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.1.1",