@colijnit/transaction 12.1.70 → 12.1.71

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

@@ -1,8 +1,8 @@
 import { EventEmitter, OnInit } from "@angular/core";
 import { ArticleExtended } from "@colijnit/articleapi/build/model/article-extended.bo";
-import { OptionsService } from "../../../../service/options.service";
+import { TransactionService } from "../../../../service/transaction.service";
 export declare class DialogCatalogComponent implements OnInit {
-    private _optionsService;
+    private _transactionService;
     options: any;
     parameters: any;
     showNavigation: boolean;
@@ -10,6 +10,6 @@ export declare class DialogCatalogComponent implements OnInit {
     articleClicked: EventEmitter<ArticleExtended>;
     showClass(): boolean;
     catalogSettings: any;
-    constructor(_optionsService: OptionsService);
+    constructor(_transactionService: TransactionService);
     ngOnInit(): void;
 }

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

@@ -5,7 +5,7 @@
     .add-text-button {
       height: 25px;
       width: 25px;
-      margin: 2px;
+      margin-left: 20px;
       cursor: pointer;
       border-radius: 20px;
       display: flex;

package/lib/component/transaction-quick-access/transaction-quick-access-purchase-order-overview/transaction-quick-access-purchase-order-overview.component.d.ts

@@ -1,18 +1,17 @@
 import { TransactionQuickAccessSendMethodBaseComponent } from "../transaction-quick-access-send-method-base.component";
-import { EmailOrderConfirmationRequest } from "@colijnit/mainapi/build/model/email-order-confirmation-request";
-import { PrintOrderConfirmationRequest } from "@colijnit/mainapi/build/model/print-order-confirmation-request";
 import { PdfOrderConfirmationRequest } from "@colijnit/mainapi/build/model/pdf-order-confirmation-request";
 import { TransactionService } from "../../../service/transaction.service";
 import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
 import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
 import { EmailPurchaseOrderRequest } from "@colijnit/mainapi/build/model/email-purchase-order-request";
 import { PrintPurchaseOrderRequest } from "@colijnit/mainapi/build/model/print-purchase-order-request";
+import { PdfPurchaseOrderRequest } from "@colijnit/mainapi/build/model/pdf-purchase-order-request";
 export declare class TransactionQuickAccessPurchaseOrderOverviewComponent extends TransactionQuickAccessSendMethodBaseComponent {
     protected readonly service: TransactionService;
     showClass(): boolean;
-    reportDocumentEmailRequest: EmailOrderConfirmationRequest;
-    reportDocumentPrintRequest: PrintOrderConfirmationRequest;
-    reportDocumentPdfRequest: PdfOrderConfirmationRequest;
+    reportDocumentEmailRequest: EmailPurchaseOrderRequest;
+    reportDocumentPrintRequest: PrintPurchaseOrderRequest;
+    reportDocumentPdfRequest: PdfPurchaseOrderRequest;
     constructor(service: TransactionService);
     protected emailDocument(request: EmailPurchaseOrderRequest): Promise<void>;
     protected getDefaultEmailAddressList(): Promise<string[]>;

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

@@ -51,27 +51,33 @@ $tp-co-transaction-search-filter-button-size: 32px !default;
 $tp-co-transaction-search-filter-button-border-radius: 5px !default;
 $tp-co-transaction-search-filter-content-wrapper-row-gap: 30px !default;
 
+$tp-co-transaction-search-result-header-search-button-wrapper-column-gap: 10px !default;
+
 $tp-co-transaction-search-result-width: 100% !default;
 $tp-co-transaction-search-result-wrapper-padding: 0 10px !default;
 $tp-co-transaction-search-result-upper-header-padding-left: 27px !default;
 $tp-co-transaction-search-result-upper-header-height: 20px !default;
 $tp-co-transaction-search-result-header-buttons-wrapper-padding: 0 !default;
-$tp-co-transaction-search-result-header-sidebar-button-size: 24px !default;
-$tp-co-transaction-search-result-header-sidebar-icon-size: 20px !default;
+$tp-co-transaction-search-result-header-sidebar-button-size: 15px !default;
+$tp-co-transaction-search-filter-button-icon-size: 20px !default;
+$tp-co-transaction-search-result-header-sidebar-icon-size: 15px !default;
+$tp-co-transaction-search-result-header-sidebar-button-color: $tp-color-label !default;
 
-$tp-co-transaction-search-result-header-sidebar-close-button-size: 46px !default;
+$tp-co-transaction-search-result-header-sidebar-close-button-size: 15px !default;
+$tp-co-transaction-search-result-header-sidebar-close-button-color: $tp-color-label !default;
 
 $tp-co-transaction-search-header-label-color: $tp-color-font !default;
 $tp-co-transaction-search-header-label-font-size: 18px !default;
 $tp-co-transaction-search-header-label-font-weight: bold !default;
 $tp-co-transaction-search-header-column-gap: 20px !default;
-$tp-co-transaction-search-header-button-wrapper-column-gap: 20px !default;
+$tp-co-transaction-search-header-button-wrapper-column-gap: 0 !default;
 $tp-co-transaction-search-header-plus-button-size: 26px !default;
-$tp-co-transaction-search-header-plus-button-color: $tp-color-font !default;
+$tp-co-transaction-search-header-plus-button-icon-size: 20px !default;
+$tp-co-transaction-search-header-plus-button-color: $tp-color-label !default;
 $tp-co-transaction-search-header-plus-button-border-style: solid !default;
-$tp-co-transaction-search-header-plus-button-border-width: 1px !default;
+$tp-co-transaction-search-header-plus-button-border-width: 0 !default;
 $tp-co-transaction-search-header-plus-button-border-color: $tp-color-font !default;
-$tp-co-transaction-search-header-plus-button-border-radius: 10px !default;
+$tp-co-transaction-search-header-plus-button-border-radius: 5px !default;
 $tp-co-transaction-search-header-plus-button-background-color: $tp-default-background-accent !default;
 
 $tp-co-transaction-search-input-text-fullscreen-width: 440px !default;

package/lib/component/transaction-search/style/_theme.scss

@@ -8,5 +8,13 @@
         max-height: $cc-co-transaction-search-max-height;
       }
     }
+    .toggle-sidebar-button {
+      svg { // for fontawesome icons
+        fill: $tp-co-transaction-search-result-header-sidebar-button-color;
+      }
+      & [fill] { // for own icons
+        fill: $tp-co-transaction-search-result-header-sidebar-button-color;
+      }
+    }
   }
 }

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

@@ -15,15 +15,13 @@
       .header-buttons-wrapper {
         display: flex;
         padding: $tp-co-transaction-search-result-header-buttons-wrapper-padding;
-
-        .button-wrapper {
-          cursor: pointer;
-          align-self: center;
-        }
       }
     }
+    .button-wrapper {
+      cursor: pointer;
+    }
 
-    .transaction-search-filter-button, .toggle-sidebar-button {
+    .toggle-sidebar-button {
       height: $tp-co-transaction-search-result-header-sidebar-button-size;
       width: $tp-co-transaction-search-result-header-sidebar-button-size;
       padding: 0;
@@ -34,6 +32,14 @@
         width: $tp-co-transaction-search-result-header-sidebar-icon-size;
         height: $tp-co-transaction-search-result-header-sidebar-icon-size;
       }
+      &.fullscreen {
+        height: $tp-co-transaction-search-filter-button-icon-size;
+        width: $tp-co-transaction-search-filter-button-icon-size;
+        .co-icon {
+          width: $tp-co-transaction-search-filter-button-icon-size;
+          height: $tp-co-transaction-search-filter-button-icon-size;
+        }
+      }
     }
     .transaction-search-filter-button {
       height: $tp-co-transaction-search-filter-button-size;
@@ -41,6 +47,10 @@
       border-radius: $tp-co-transaction-search-filter-button-border-radius;
       //padding: $tp-co-transaction-search-filter-button-padding;
       justify-content: center;
+      .co-icon {
+        width: $tp-co-transaction-search-filter-button-icon-size;
+        height: $tp-co-transaction-search-filter-button-icon-size;
+      }
     }
     .toggle-sidebar-button-wrapper {
       &.sidebar {
@@ -59,11 +69,14 @@
       }
     }
     .close-search-button-wrapper {
+      display: flex;
+      column-gap: $tp-co-transaction-search-result-header-search-button-wrapper-column-gap;
       &.sidebar {
         margin-bottom: 5px;
         .toggle-sidebar-button {
           justify-content: center;
           width: $tp-co-transaction-search-result-header-sidebar-button-size;
+          height: $tp-co-transaction-search-result-header-sidebar-button-size;
           co-icon {
             height: $tp-co-transaction-search-result-header-sidebar-close-button-size;
             width: $tp-co-transaction-search-result-header-sidebar-close-button-size;
@@ -111,13 +124,24 @@
       cursor: pointer;
       height: $tp-co-transaction-search-header-plus-button-size;
       width: $tp-co-transaction-search-header-plus-button-size;
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
       border-style: $tp-co-transaction-search-header-plus-button-border-style;
       border-width: $tp-co-transaction-search-header-plus-button-border-width;
       border-radius: $tp-co-transaction-search-header-plus-button-border-radius;
+      .co-icon {
+        width: $tp-co-transaction-search-header-plus-button-icon-size;
+        height: $tp-co-transaction-search-header-plus-button-icon-size;
+      }
       svg {
         width: 90%;
         height: 90%;
       }
+      &:not(.circle).has-icon {
+        padding-left: 0;
+      }
     }
   }
 }

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

@@ -20,8 +20,11 @@ export declare enum Icon {
     EditPencil = "edit_pencil",
     EllipsisLight = "ellipsis_light",
     EllipsisVerticalSolid = "ellipsis_vertical_solid",
-    Email = "email",
+    ExpandSolid = "expand_solid",
     FileCircleInfoSolid = "file_circle_info_solid",
+    FileExportRegular = "file_export_regular",
+    FileExportSolid = "file_export_solid",
+    FilePdfRegular = "file_pdf_regular",
     FilePdfSolid = "file_pdf_solid",
     GearSolid = "gear_solid",
     GripDotsVerticalSolid = "grip_dots_vertical_solid",
@@ -38,6 +41,8 @@ export declare enum Icon {
     MasterDetail = "master_detail",
     MemoCircleCheckSolid = "memo_circle_check_solid",
     Menu = "menu",
+    MessageSmsRegular = "message_sms_regular",
+    MessageSmsSolid = "message_sms_solid",
     ObjectIntersectSolid = "object_intersect_solid",
     PalletBoxesSolid = "pallet_boxes_solid",
     Pdf = "pdf",
@@ -72,5 +77,6 @@ export declare enum Icon {
     TruckMovingSolid = "truck_moving_solid",
     Txt = "txt",
     Unlock = "unlock",
-    Warehouse = "warehouse"
+    Warehouse = "warehouse",
+    XSolid = "x_solid"
 }

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

@@ -15,8 +15,8 @@ import { TransactionEventService } from "./transaction-event.service";
 import { RelationConnectorService } from "./relation-connector.service";
 import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
 export declare class PendingReasonService {
+    options: OptionsService;
     protected dialogService: DialogService;
-    protected options: OptionsService;
     protected connector: TransactionConnectorService;
     protected sharedService: SharedService;
     protected articleConnector: ArticleConnectorService;
@@ -36,7 +36,7 @@ export declare class PendingReasonService {
     docDeliveryBatch: DocDeliveryBatch;
     articleAmount: number;
     private _relation;
-    constructor(dialogService: DialogService, options: OptionsService, connector: TransactionConnectorService, sharedService: SharedService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, relationConnector: RelationConnectorService);
+    constructor(options: OptionsService, dialogService: DialogService, connector: TransactionConnectorService, sharedService: SharedService, articleConnector: ArticleConnectorService, dictionaryService: DictionaryService, transactionEventService: TransactionEventService, relationConnector: RelationConnectorService);
     init(options: any): Promise<void>;
     cancelAddTransactionLine(lineUuid: string, remember?: boolean): Promise<TransactionInfoResponse>;
     handleHeaderOperationStatuses(response: TransactionInfoResponse): Promise<boolean>;

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

@@ -68,6 +68,8 @@ import { CreateCashRegisterOrderRequest } from "@colijnit/transactionapi/build/m
 import { CreatePurchaseOrderRequest } from "@colijnit/transactionapi/build/model/create-purchase-order-request";
 import { CreateServiceOrderRequest } from "@colijnit/transactionapi/build/model/create-service-order-request";
 import { CreateSalesQuotationRequest } from "@colijnit/transactionapi/build/model/create-sales-quotation-request";
+import { PurchaseAdviceLine } from "@colijnit/transactionapi/build/model/purchase-advice-line.bo";
+import { PurchaseAdviceFilters } from "@colijnit/transactionapi/build/model/purchase-advice-filters";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -197,5 +199,7 @@ export declare class TransactionConnectorAdapterService {
     getDefaultEmailAddressListForOrderConfirmation(transactionUUID: any): Promise<string[]>;
     getPurchaseOrderDefaultSendMethod(relationId: number): Promise<number>;
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number): Promise<void>;
+    getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
+    generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
     private _handleExceptionFromResponse;
 }

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

@@ -65,6 +65,8 @@ import { CreateCashRegisterOrderRequest } from "@colijnit/transactionapi/build/m
 import { CreatePurchaseOrderRequest } from "@colijnit/transactionapi/build/model/create-purchase-order-request";
 import { CreateServiceOrderRequest } from "@colijnit/transactionapi/build/model/create-service-order-request";
 import { CreateSalesQuotationRequest } from "@colijnit/transactionapi/build/model/create-sales-quotation-request";
+import { PurchaseAdviceFilters } from "@colijnit/transactionapi/build/model/purchase-advice-filters";
+import { PurchaseAdviceLine } from "@colijnit/transactionapi/build/model/purchase-advice-line.bo";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -189,4 +191,6 @@ export declare class TransactionConnectorService {
     getPurchaseOrderPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getPurchaseOrderDefaultSendMethod(relationId: number): Promise<number>;
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number): Promise<void>;
+    getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
+    generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
 }

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

@@ -56,6 +56,8 @@ import { CreatePurchaseOrderRequest } from "@colijnit/transactionapi/build/model
 import { CreateServiceOrderRequest } from "@colijnit/transactionapi/build/model/create-service-order-request";
 import { CreateSalesQuotationRequest } from "@colijnit/transactionapi/build/model/create-sales-quotation-request";
 import { RelationKind } from "@colijnit/articleapi/build/enum/relation-kind.enum";
+import { PurchaseAdviceLine } from "@colijnit/transactionapi/build/model/purchase-advice-line.bo";
+import { PurchaseAdviceFilters } from "@colijnit/transactionapi/build/model/purchase-advice-filters";
 export declare class TransactionService extends PendingReasonService {
     private readonly _createTransactionMethods;
     private readonly _relationKindFromTransactionKind;
@@ -166,5 +168,7 @@ export declare class TransactionService extends PendingReasonService {
     getPurchaseOrderPrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     getPurchaseOrderDefaultSendMethod(relationId: number): Promise<number>;
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number): Promise<void>;
+    getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
+    generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
     private _checkAndCreateTransaction;
 }

package/package.json

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