@colijnit/transaction 12.1.81 → 12.1.82

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

@@ -2,7 +2,7 @@
   .co-transaction-line {
     font-family: $tp-transaction-line-font-family;
     font-size: $tp-transaction-line-font-size;
-    width: 100%;
+    width: calc(100% - 30px);
     display: flex;
     flex-direction: column;
     border: $tp-transaction-line-border;
@@ -13,11 +13,13 @@
     .transaction-base-line-wrapper {
       column-gap: $tp-transaction-line-column-gap;
     }
-    .transaction-base-line-section {
-      column-gap: $tp-transaction-line-column-gap;
-    }
     .line-start {
-      max-width: 33%;
+      overflow: auto;
+      width: 33%;
+    }
+    .line-end {
+      max-width: 66%;
+      width: max-content;
     }
     .preview-margin {
       margin-left: $tp-transaction-line-column-gap;
@@ -150,6 +152,7 @@
     &:not(.is-text) {
       .transaction-base-line-wrapper {
         justify-content: space-between;
+        width: 100%;
       }
     }
     .transaction-line-stock-wrapper {

package/lib/component/transaction-line/transaction-order-delivery-line/service/transaction-order-delivery.service.d.ts

@@ -1,4 +1,17 @@
+import { ExtendedTransactionLineViewModel } from "../../../../model/extended-transaction-line-view-model";
+import { EmailDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/email-delivery-note-request";
+import { TransactionService } from "../../../../service/transaction.service";
+import { TransactionEventService } from "../../../../service/transaction-event.service";
+import { PdfDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
+import { PrintDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/print-delivery-note-request";
 export declare class TransactionOrderDeliveryService {
+    private _transactionService;
+    private _transactionEventService;
+    lines: ExtendedTransactionLineViewModel[];
     totalQuantityToDeliver: number;
     totalAmountLeftInOrder: number;
+    constructor(_transactionService: TransactionService, _transactionEventService: TransactionEventService);
+    handleDeliverSelectedTransactionLines(request: EmailDeliveryNoteRequest | PrintDeliveryNoteRequest | PdfDeliveryNoteRequest): Promise<boolean>;
+    private _handleAfterCommitDeliverOrders;
+    private _createRequestLines;
 }

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

@@ -3,25 +3,11 @@
 
     .transaction-line-buttons-grid {
       display: grid;
-      grid-template-columns: auto auto;
-      grid-template-rows: $tp-transaction-line-button-height $tp-transaction-line-button-height;
-      gap: 5px 0;
-    }
-
-    .row-1 {
-      display: grid;
-      grid-template-columns: $tp-transaction-line-button-width $tp-transaction-line-button-big-width;
-      grid-template-rows: $tp-transaction-line-button-height $tp-transaction-line-button-height;
-      gap: 0 15px;
-      grid-area: 1 / 1 / 2 / 3;
-    }
-
-    .row-2 {
-      display: grid;
-      grid-template-columns: calc((#{$tp-transaction-line-button-width} + #{$tp-transaction-line-button-big-width}) / 2) calc((#{$tp-transaction-line-button-width} + #{$tp-transaction-line-button-big-width}) / 2);
-      grid-template-rows: $tp-transaction-line-button-height $tp-transaction-line-button-height;
-      gap: 0 15px;
-      grid-area: 2 / 1 / 3 / 3;
+      grid-template-columns: $tp-transaction-line-button-width $tp-transaction-line-button-big-width auto;
+      grid-template-rows: $tp-transaction-line-button-height;
+      gap: 5px 15px;
+      grid-template-areas:
+      ". . .";
     }
 
     .transaction-line-extended-wrapper {
@@ -39,12 +25,11 @@
 
     .transaction-line-totals-custom-grid {
       display: grid;
-      grid-template-columns: 100px 100px 100px 100px 100px;
-      grid-template-rows: 26px 26px;
+      grid-template-columns: 100px 100px 100px 100px;
+      grid-template-rows: $tp-transaction-line-button-height;
       gap: 5px 15px;
       grid-template-areas:
-    ". . . .  ."
-    ". . . .  .";
+      ". . . .";
     }
 
     .discount {

package/lib/component/transaction-line/transaction-order-delivery-line/transaction-order-delivery-line.component.d.ts

@@ -1,21 +1,16 @@
 import { OnDestroy, OnInit } from "@angular/core";
-import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionEventService } from "../../../service/transaction-event.service";
-import { DeliveryOrderStatus } from "@colijnit/transactionapi/build/model/delivery-order-status.bo";
 import { TransactionOrderDeliveryService } from "./service/transaction-order-delivery.service";
 import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
 import { TransactionTypeCategory } from "../../../enum/transaction-type-category.enum";
+import { ExtendedTransactionLineViewModel } from "../../../model/extended-transaction-line-view-model";
 export declare class TransactionOrderDeliveryLineComponent extends TransactionBaseComponent implements OnInit, OnDestroy {
     protected transactionService: TransactionService;
     private _transactionEventService;
     private _transactionOrderDeliveryService;
     readonly category: typeof TransactionTypeCategory;
-    localAmount: number;
-    splitDelivery: boolean;
-    deliveryOrderStatus: DeliveryOrderStatus;
-    checkboxSelected: boolean;
-    transactionKind: TransactionKind;
+    viewModel: ExtendedTransactionLineViewModel;
     private _subscriptions;
     showClass(): boolean;
     constructor(transactionService: TransactionService, _transactionEventService: TransactionEventService, _transactionOrderDeliveryService: TransactionOrderDeliveryService);
@@ -23,5 +18,6 @@ export declare class TransactionOrderDeliveryLineComponent extends TransactionBa
     ngOnDestroy(): void;
     getDeliveryOrderStatus(): void;
     showNumberPicker(): boolean;
+    private _initViewModel;
     private _handleOrderStatusUpdated;
 }

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

@@ -2,8 +2,8 @@
   .co-transaction-line-image-and-description {
     font-family: $tp-transaction-line-image-and-description-font-family;
     display: flex;
-    width: max-content;
     align-items: $tp-transaction-line-image-and-description-align-items;
+    width: 100%;
     .transaction-line-image {
       display: flex;
       flex-basis: $tp-transaction-line-image-and-description-image-width;
@@ -23,15 +23,18 @@
       row-gap: $tp-transaction-line-image-and-description-description-row-gap;
       flex-basis: 100%;
       padding: $tp-transaction-line-image-and-description-description-inner-padding;
+      overflow: hidden;
       .description-wrapper {
         display: flex;
         flex-direction: row;
         column-gap: $tp-transaction-line-image-and-description-description-column-gap;
         align-items: center;
+        overflow: hidden;
       }
     }
     .transaction-line-description-description {
       font-weight: bold;
+      overflow: auto;
       //flex-shrink: 0;
       co-input-text {
         height: auto;

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

@@ -1,19 +1,34 @@
 import { OnDestroy } from "@angular/core";
-import { TransactionBaseComponent } from "../../core/base/transaction-base.component";
 import { IconCacheService } from "../../../service/icon-cache.service";
 import { TransactionService } from "../../../service/transaction.service";
 import { TransactionEventService } from "../../../service/transaction-event.service";
 import { TransactionOrderDeliveryService } from "../../transaction-line/transaction-order-delivery-line/service/transaction-order-delivery.service";
-export declare class TransactionQuickAccessOrderDeliveryComponent extends TransactionBaseComponent implements OnDestroy {
+import { TransactionQuickAccessSendMethodBaseComponent } from "../transaction-quick-access-send-method-base.component";
+import { ReportLayoutSelectionPrint } from "@colijnit/mainapi/build/model/report-layout-selection-print.bo";
+import { ReportLayoutSelectionEmail } from "@colijnit/mainapi/build/model/report-layout-selection-email.bo";
+import { EmailDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/email-delivery-note-request";
+import { PrintDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/print-delivery-note-request";
+import { PdfDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
+export declare class TransactionQuickAccessOrderDeliveryComponent extends TransactionQuickAccessSendMethodBaseComponent implements OnDestroy {
     iconService: IconCacheService;
     service: TransactionService;
     private _transactionEventService;
     private _orderDeliveryService;
     showClass(): boolean;
+    reportDocumentEmailRequest: EmailDeliveryNoteRequest;
+    reportDocumentPrintRequest: PrintDeliveryNoteRequest;
+    reportDocumentPdfRequest: PdfDeliveryNoteRequest;
     allowDelivery: boolean;
     private _subscriptions;
     constructor(iconService: IconCacheService, service: TransactionService, _transactionEventService: TransactionEventService, _orderDeliveryService: TransactionOrderDeliveryService);
     ngOnDestroy(): void;
     ngAfterViewInit(): void;
     handleSelectAllLines(value: boolean): void;
+    protected getDefaultEmailAddressList(): Promise<string[]>;
+    protected getDefaultSendMethod(): Promise<number>;
+    protected getEmailLayouts(): Promise<ReportLayoutSelectionEmail[]>;
+    protected getPrintLayouts(): Promise<ReportLayoutSelectionPrint[]>;
+    protected pdfDocument(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): void;
+    protected printDocument(printDeliveryNoteRequest: PrintDeliveryNoteRequest): void;
+    protected emailDocument(request: EmailDeliveryNoteRequest): void;
 }

package/lib/model/extended-transaction-line-view-model.d.ts

@@ -5,6 +5,7 @@ export declare class ExtendedTransactionLineViewModel extends TransactionLineInf
     quantityReceived: number;
     quantityToAllocate: number;
     quantityAllocated: number;
+    quantityToDeliver: number;
     lineNr: number;
     transId: number;
 }

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

@@ -70,6 +70,9 @@ import { CreateServiceOrderRequest } from "@colijnit/transactionapi/build/model/
 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";
+import { EmailDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/email-delivery-note-request";
+import { PdfDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
+import { PrintDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/print-delivery-note-request";
 export declare class TransactionConnectorAdapterService {
     private _optionsService;
     private _selectMultipleCacheService;
@@ -203,5 +206,11 @@ export declare class TransactionConnectorAdapterService {
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number): Promise<void>;
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<boolean>;
+    pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<boolean>;
+    getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
+    getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
+    getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     private _handleExceptionFromResponse;
 }

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

@@ -67,6 +67,9 @@ import { CreateServiceOrderRequest } from "@colijnit/transactionapi/build/model/
 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";
+import { EmailDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/email-delivery-note-request";
+import { PdfDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
+import { PrintDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/print-delivery-note-request";
 export declare class TransactionConnectorService {
     private _adapterService;
     private _selectSingleCacheService;
@@ -195,4 +198,10 @@ export declare class TransactionConnectorService {
     generateAndSendPurchaseOrdersForSalesOrder(transactionId: number): Promise<void>;
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<boolean>;
+    pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<boolean>;
+    getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
+    getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
+    getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
 }

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

@@ -57,6 +57,9 @@ import { CreateSalesQuotationRequest } from "@colijnit/transactionapi/build/mode
 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";
+import { EmailDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/email-delivery-note-request";
+import { PdfDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/pdf-delivery-note-request";
+import { PrintDeliveryNoteRequest } from "@colijnit/transactionapi/build/model/print-delivery-note-request";
 import { TransactionTypeCategory } from "../enum/transaction-type-category.enum";
 export declare class TransactionService extends PendingReasonService {
     private readonly _createTransactionMethods;
@@ -170,5 +173,11 @@ export declare class TransactionService extends PendingReasonService {
     getPurchaseAdviceLines(filters: PurchaseAdviceFilters, goodId?: number): Promise<PurchaseAdviceLine[]>;
     generateAndSendPurchaseOrders(purchaseAdviceLines: PurchaseAdviceLine[]): Promise<boolean>;
     private _lockTransaction;
+    emailDeliveryNote(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): Promise<boolean>;
+    pdfDeliveryNote(pdfDeliveryNoteRequest: PdfDeliveryNoteRequest): Promise<boolean>;
+    printDeliveryNote(printDeliveryNoteRequest: PrintDeliveryNoteRequest): Promise<boolean>;
+    getDeliveryNoteDefaultSendMethod(relationId: number): Promise<number>;
+    getDeliveryNoteEmailLayouts(transactionUUID: string): Promise<ReportLayoutSelectionEmail[]>;
+    getDeliveryNotePrintLayouts(transactionUUID: string): Promise<ReportLayoutSelectionPrint[]>;
     private _checkAndCreateTransaction;
 }

package/lib/style/_variables.scss

@@ -71,7 +71,7 @@ $tp-lg-width: 1920px !default;
 
 // transaction line buttons
 $tp-transaction-line-button-width: 78px !default;
-$tp-transaction-line-button-big-width: 250px !default;
+$tp-transaction-line-button-big-width: 175px !default;
 $tp-transaction-line-button-font-size: 11px !default;
 $tp-transaction-line-button-font-weight: 600 !default;
 $tp-transaction-line-button-icon-size: 13px !default;
@@ -86,7 +86,7 @@ $tp-transaction-line-button-border: 1px solid !default;
 $tp-transaction-header-font-family: $tp-font-family !default;
 $tp-transaction-header-font-size: 14px !default;
 $tp-transaction-header-font-color: $tp-color-dark !default;
-
+$tp-transaction-lines-drag-handle-size: 30px !default;
 /* core components override */
 $cc-color-action: $tp-color-font !default;
 $cc-btn-color: $tp-color-action !default;

package/package.json

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