@colijnit/transaction 12.1.115 → 12.1.116

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

@@ -57,6 +57,9 @@
         grid-template-columns: 100%;
       }
     }
+    .transaction-lines-wrapper {
+      padding: $tp-transaction-transaction-lines-wrapper-padding;
+    }
 
     .quick-send-button {
       height: 32px;

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

@@ -6,3 +6,4 @@ $tp-transaction-transaction-lines-header-padding: 20px 0 !default;
 $tp-transaction-padding: 20px !default;
 $tp-transaction-transaction-lines-header-padding: 20px !default;
 $tp-transaction-transaction-lines-header-column-gap: 20px !default;
+$tp-transaction-transaction-lines-wrapper-padding: 0 !default;

package/lib/component/transaction/style/material.scss

@@ -10,5 +10,6 @@
 @import "../../transaction-line-side-panel/style/material";
 @import "../../dialog/transaction-header/dialog-transaction-header-delivery-method/style/material";
 @import "../../dialog/transaction-header/dialog-transaction-header-branch/style/material";
+@import "../../transaction-labeled-warehouse-location-button/style/material";
 @import "../../transaction-line-checkbox-list/style/material";
 @import "../../transaction-card/transaction-card/style/material";

package/lib/component/transaction-date-select/style/_layout.scss

@@ -8,6 +8,7 @@
       display: flex;
       align-items: center;
       justify-content: space-between;
+      padding: 0 5px;
       .co-icon {
         height: $tp-transaction-date-select-icon-size;
         width: $tp-transaction-date-select-icon-size;

package/lib/component/transaction-labeled-warehouse-location-button/style/_layout.scss

@@ -0,0 +1,46 @@
+@include export-module('cc-transaction-labeled-warehouse-location-button-layout') {
+  .co-transaction-labeled-warehouse-location-button {
+
+    .transaction-line-button {
+      height: 45px;
+      width: 100px;
+
+      .icon-wrapper {
+        .co-icon {
+          padding: 13px;
+        }
+      }
+
+      .text-content-wrapper {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: flex-start;
+        flex-direction: column;
+        row-gap: $tp-transaction-line-button-label-row-gap;
+        justify-content: center;
+        overflow: hidden;
+        padding-right: $tp-transaction-line-button-label-padding-right;
+
+        .label {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+
+        &.label {
+          color: $tp-transaction-line-button-label-color;
+        }
+
+        span {
+          width: inherit;
+        }
+      }
+
+      &:not(.spacer) {
+        padding: $tp-transaction-line-button-padding;
+        column-gap: $tp-transaction-line-button-column-gap;
+      }
+    }
+  }
+}

package/lib/component/transaction-labeled-warehouse-location-button/style/_theme.scss

@@ -0,0 +1,4 @@
+@include export-module('cc-transaction-labeled-warehouse-location-button-theme') {
+  .co-transaction-labeled-warehouse-location-button {
+  }
+}

package/lib/component/transaction-labeled-warehouse-location-button/style/material.scss

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

package/lib/component/transaction-labeled-warehouse-location-button/transaction-labeled-warehouse-location-button.component.d.ts

@@ -0,0 +1,25 @@
+import { ChangeDetectorRef, EventEmitter } from "@angular/core";
+import { TransactionBaseComponent } from "../core/base/transaction-base.component";
+import { Icon } from "../../enum/icon.enum";
+import { TransactionEventService } from "../../service/transaction-event.service";
+import { TransactionService } from "../../service/transaction.service";
+import { IconCacheService } from "../../service/icon-cache.service";
+import { DictionaryService } from "../../service/dictionary.service";
+import { TransactionImageService } from "../../service/transaction-image.service";
+import { DialogService } from "../../service/dialog.service";
+export declare class TransactionLabeledWarehouseLocationButtonComponent extends TransactionBaseComponent {
+    transactionEventService: TransactionEventService;
+    service: TransactionService;
+    iconCacheService: IconCacheService;
+    protected dictionaryService: DictionaryService;
+    protected imageService: TransactionImageService;
+    protected changeDetector: ChangeDetectorRef;
+    private _dialogService;
+    readonly icons: typeof Icon;
+    locationNr: string;
+    warehouseNumber: number;
+    locationNrChange: EventEmitter<string>;
+    showClass(): boolean;
+    constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _dialogService: DialogService);
+    openWarehouseLocationDialog(): Promise<void>;
+}

package/lib/component/transaction-labeled-warehouse-location-button/transaction-labeled-warehouse-location-button.module.d.ts

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

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

@@ -1,59 +1,32 @@
 @include export-module('cc-transaction-purchase-order-line-layout') {
   .co-transaction-purchase-order-line {
-    .transaction-line-wrapper {
-      align-items: center;
-      height: 100%;
-    }
 
-    .transaction-line-totals-grid {
+    .transaction-line-content-wrapper {
       display: flex;
-      align-self: center;
+      justify-content: space-evenly;
+      margin-right: 5px;
+      column-gap: 10px;
 
-      .price {
-        width: 100px;
-        height: 25px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #DCE4EA;
-        border-radius: 10px;
-        margin-right: 3px;
+      co-transaction-line-statusbar {
+        width: 75px;
       }
 
-      .discount {
-        width: 100px;
-        height: 25px;
+      .transaction-line-content {
         display: flex;
-        align-items: center;
-        justify-content: center;
-        border: 1px solid #DCE4EA;
-        border-radius: 10px;
-        margin-right: 3px;
-        color: red;
-        background-color: #f5f5fc;
+        flex-wrap: wrap;
+        column-gap: 10px;
+        row-gap: 10px;
+
+        co-input-text, co-editable-label {
+          width: $tp-transaction-line-button-width;
+          height: $tp-transaction-line-button-height;
+        }
+
+        co-input-number-picker {
+          width: $tp-transaction-line-input-number-picker-width;
+          height: $tp-transaction-line-button-height;
+        }
       }
     }
-    .vertical-border {
-      border-left: 1px solid #DCE4EA;
-      height: 100%;
-    }
-    .transaction-line-supplier-id {
-      font-size: 11px;
-      font-weight: 600;
-      display: flex;
-      align-items: center;
-      height: 26px;
-      padding: 0 10px;
-    }
-    .transaction-line-supplier-icon {
-      height: 20px;
-      margin: 2px;
-    }
-    //.amount-number-picker {
-    //  height: 25px;
-    //  border: 1px solid black;
-    //  border-radius: 10px;
-    //  width: 100px;
-    //}
   }
 }

package/lib/component/transaction-line/transaction-purchase-order-line/transaction-purchase-order-line-base.component.d.ts

@@ -5,9 +5,11 @@ export declare abstract class TransactionPurchaseOrderLineBaseComponent extends
     readonly transactionTypeCategory: typeof TransactionTypeCategory;
     showDialogDiscount: boolean;
     showCheckboxForLine: boolean;
+    lineQuantityToConfirm: number;
     private _subs;
     ngOnInit(): void;
     ngOnDestroy(): void;
     protected transactionLineSet(): void;
     handleOpenSidePanel(mouseClick: PointerEvent): void;
+    private _getPurchasePortalLine;
 }

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

@@ -1,4 +1,5 @@
 import { TransactionPurchaseOrderLineBaseComponent } from './transaction-purchase-order-line-base.component';
 export declare class TransactionPurchaseOrderLineComponent extends TransactionPurchaseOrderLineBaseComponent {
     showClass(): boolean;
+    confirmDeliveryDate(data: any): void;
 }

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

@@ -5,7 +5,7 @@
     .line-content-wrapper {
       display: grid;
       grid-template-columns:
-        60px
+        75px
         $tp-transaction-line-button-width
         $tp-transaction-line-button-width
         $tp-transaction-line-button-width

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

@@ -11,4 +11,7 @@
       }
     }
   }
+  .input-text {
+    height: 20px;
+  }
 }

package/lib/component/transaction-line-fields/transaction-line-warehouse-location-button.component.d.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, EventEmitter } from '@angular/core';
+import { ChangeDetectorRef } from '@angular/core';
 import { Icon } from "../../enum/icon.enum";
 import { IconCacheService } from "../../service/icon-cache.service";
 import { DialogService } from "../../service/dialog.service";
@@ -16,12 +16,7 @@ export declare class TransactionLineWarehouseLocationButtonComponent extends Tra
     protected changeDetector: ChangeDetectorRef;
     private _dialogService;
     readonly icons: typeof Icon;
-    locationNr: string;
-    warehouseNumber: number;
     readonly: boolean;
-    label: string;
-    globalLocation: boolean;
-    locationNrChange: EventEmitter<string>;
     showClass(): boolean;
     constructor(transactionEventService: TransactionEventService, service: TransactionService, iconCacheService: IconCacheService, dictionaryService: DictionaryService, imageService: TransactionImageService, changeDetector: ChangeDetectorRef, _dialogService: DialogService);
     openWarehouseLocationDialog(): Promise<void>;

package/lib/component/transaction-line-fields/transaction-purchase-portal-line-confirmed-delivery-date.component.d.ts

@@ -1,10 +1,10 @@
+import { EventEmitter } from "@angular/core";
 import { Icon } from "../../enum/icon.enum";
-import { IconCacheService } from "../../service/icon-cache.service";
 import { PurchasePortalLine } from "@colijnit/transactionapi/build/model/purchase-portal-line.bo";
 export declare class TransactionPurchasePortalLineConfirmedDeliveryDateComponent {
-    iconCacheService: IconCacheService;
     readonly icons: typeof Icon;
     purchasePortalLine: PurchasePortalLine;
+    selectedConfirmedDeliveryDate: EventEmitter<any>;
+    confirmedDeliveryDate: Date;
     showClass(): boolean;
-    constructor(iconCacheService: IconCacheService);
 }

package/lib/component/transaction-line-fields/transaction-purchase-portal-line-confirmed-price.component.d.ts

@@ -11,4 +11,5 @@ export declare class TransactionPurchasePortalLineConfirmedPriceComponent {
     input: InputTextComponent;
     private _editMode;
     constructor();
+    portalLinePriceChanged(event: number): void;
 }

package/lib/component/transaction-line-purchase-confirmation/transaction-line-purchase-confirmation.component.d.ts

@@ -19,4 +19,5 @@ export declare class TransactionLinePurchaseConfirmationComponent extends Transa
     handleCancelClick(): void;
     protected transactionLineSet(): void;
     private _updateBatchArray;
+    private _getPurchasePortalLine;
 }

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

@@ -54,14 +54,50 @@
       overflow-x: hidden;
     }
     .save-cancel-wrapper {
-      display: flex;
-      justify-content: center;
-      padding: 30px;
+        width: 100%;
+        display: flex;
+        margin-top: 25px;
+        margin-bottom: 40px;
+        justify-content: center;
+        column-gap: 4px;
+
+        co-button {
+          height: auto;
+          width: auto;
+          background-color: $tp-default-background-accent;
+          border-bottom: 2px solid $tp-color-border;
+          cursor: pointer;
 
-      .button-wrapper {
-        margin: 5px;
+          &:not(.circle) {
+            padding: 8px;
+          }
+
+          &.cancel-button {
+            padding: 5px;
+            co-icon {
+              width: 22px;
+              height: 22px;
+              svg { // for fontawesome icons
+                fill: $tp-color-dark-accent;
+              }
+              & [fill] { // for own icons
+                fill: $tp-color-dark-accent;
+              }
+            }
+          }
+        }
+
+        co-icon {
+          width: 16px;
+          height: 16px;
+          svg { // for fontawesome icons
+            fill: $tp-color-action;
+          }
+          & [fill] { // for own icons
+            fill: $tp-color-action;
+          }
+        }
       }
-    }
     .hidden {
       visibility: hidden;
     }

package/lib/component/transaction-quick-access/transaction-quick-access-invoice/transaction-quick-access-invoice.component.d.ts

@@ -6,12 +6,13 @@ import { EmailInvoiceRequest } from "@colijnit/transactionapi/build/model/email-
 import { PrintInvoiceRequest } from "@colijnit/transactionapi/build/model/print-invoice-request";
 import { PdfInvoiceRequest } from "@colijnit/transactionapi/build/model/pdf-invoice-request";
 export declare class TransactionQuickAccessInvoiceComponent extends TransactionQuickAccessSendMethodBaseComponent implements OnInit {
-    internalParameterAllowsPartialInvoicing: boolean;
+    sendDocumentsComponent: any;
     showClass(): boolean;
     reportDocumentEmailRequest: EmailInvoiceRequest;
     reportDocumentPrintRequest: PrintInvoiceRequest;
     reportDocumentPdfRequest: PdfInvoiceRequest;
     canInvoice: boolean;
+    internalParameterAllowsPartialInvoicing: boolean;
     ngOnInit(): void;
     handleSelectAllLines(value: boolean): void;
     protected getDefaultEmailAddressList(): Promise<string[]>;
@@ -23,6 +24,8 @@ export declare class TransactionQuickAccessInvoiceComponent extends TransactionQ
     protected emailDocument(emailInvoiceRequest: EmailInvoiceRequest): void;
     transactionSet(): void;
     _prepareRequest(request: EmailInvoiceRequest | PrintInvoiceRequest | PdfInvoiceRequest): void;
+    historicDocuments(): boolean;
+    handleSendDocument(defaultSendMethod: string): void;
     private _createRequestLines;
     private _createLinesInfoArray;
     private _getInternalParameterAllowPartialInvoicing;

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

@@ -5,6 +5,5 @@ export declare class TransactionQuickAccessOrderConfirmationComponent extends Tr
     showClass(): boolean;
     awaitingResult: boolean;
     iconVisible: boolean;
-    handleSelectAllLines(value: boolean): void;
     handleCommitEvent(event: MouseEvent): Promise<void>;
 }

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

@@ -24,5 +24,7 @@ export declare class TransactionQuickAccessOrderDeliveryComponent extends Transa
     protected emailDocument(emailDeliveryNoteRequest: EmailDeliveryNoteRequest): void;
     transactionSet(): void;
     _prepareRequest(request: EmailDeliveryNoteRequest | PrintDeliveryNoteRequest | PdfDeliveryNoteRequest): void;
+    historicDocuments(): boolean;
+    handleSendDocument(defaultSendMethod: string): void;
     private _createRequestLines;
 }

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/transaction-quick-access-received-goods.component.d.ts

@@ -28,5 +28,5 @@ export declare class TransactionQuickAccessReceivedGoodsComponent extends Transa
     protected pdfDocument(): void;
     protected printDocument(printRequest: ReportingDocumentPrintBaseRequest): void;
     protected emailDocument(emailInvoiceRequest: EmailInvoiceRequest): void;
-    showWarehouseLocationPopup(): void;
+    handleGlobalLocationChange(location: string): void;
 }

package/lib/component/transaction-send-documents/transaction-send-documents.component.d.ts

@@ -12,6 +12,7 @@ export declare class TransactionSendDocumentsComponent extends TransactionBaseCo
     showClass(): boolean;
     ngOnInit(): void;
     ngOnDestroy(): void;
+    getHistoricDocuments(): void;
     toggleSendDocumentsDialog(): void;
     handleShowHistoricDocumentLines(historicReport: HistoricReport): void;
     getSendMethodIcon(report: HistoricReport): Icon;

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

@@ -65,6 +65,8 @@ export declare enum Icon {
     PrintSolid = "print_solid",
     Purchase = "purchase",
     RegularCartFlatbedBoxesCircleCheck = "regular_cart_flatbed_boxes_circle_check",
+    RegularIndustryClock = "regular_industry_clock",
+    RegularIndustryTag = "regular_industry_tag",
     Resize = "resize",
     ShareSolid = "share_solid",
     SharpLightTruckMovingClock = "sharp_light_truck_moving_clock",

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

@@ -5791,6 +5791,7 @@ export declare class Dictionaries {
         OUTGOING: string;
         OUTSTANDING: string;
         OUTSTANDING_AMOUNT: string;
+        OUTSTANDING_AMOUNT_CURRENCY: string;
         OUTSTANDING_AMOUNTS_BOOKINGS: string;
         OUTSTANDING_AMOUNTS_CUSTOMERS: string;
         OUTSTANDING_AMOUNTS_SUPPLIERS: string;
@@ -5908,6 +5909,7 @@ export declare class Dictionaries {
         PAYMENT_CONDITION_30_60: string;
         PAYMENT_CONDITION_60: string;
         PAYMENT_CONDITION_LEDGER_ACCOUNT: string;
+        PAYMENT_DISCOUNT: string;
         PAYMENT_EXECUTED: string;
         PAYMENT_INFO: string;
         PAYMENT_INFORMATION: string;
@@ -14229,6 +14231,7 @@ export declare class Dictionaries {
         OUTGOING: string;
         OUTSTANDING: string;
         OUTSTANDING_AMOUNT: string;
+        OUTSTANDING_AMOUNT_CURRENCY: string;
         OUTSTANDING_AMOUNTS_BOOKINGS: string;
         OUTSTANDING_AMOUNTS_CUSTOMERS: string;
         OUTSTANDING_AMOUNTS_SUPPLIERS: string;
@@ -14351,6 +14354,7 @@ export declare class Dictionaries {
         PAYMENT_CONDITION_60: string;
         PAYMENT_CONDITION_LEDGER_ACCOUNT: string;
         PAYMENT_DESCRIPTION: string;
+        PAYMENT_DISCOUNT: string;
         PAYMENT_EXECUTED: string;
         PAYMENT_ID: string;
         PAYMENT_INFO: string;

package/lib/style/transaction-globals.scss

@@ -65,53 +65,26 @@
   display: flex;
   align-items: center;
   height: $tp-transaction-line-button-height;
-  .co-icon {
-    height: $tp-transaction-line-button-icon-size;
-    width: $tp-transaction-line-button-icon-size;
-  }
+
   .icon-wrapper {
     display: flex;
     height: 100%;
     flex-shrink: 0;
     align-items: center;
     margin-right: $tp-transaction-line-button-icon-margin;
+
     .co-icon {
       height: 100%;
       width: auto;
       padding: $tp-transaction-line-button-icon-padding;
     }
+
     .spacer {
       height: 100%;
       min-width: $tp-transaction-line-button-icon-spacer-width;
       background-color: $tp-color-border;
     }
   }
-  .text-content-wrapper {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: flex-start;
-    flex-direction: column;
-    row-gap: $tp-transaction-line-button-label-row-gap;
-    justify-content: center;
-    overflow: hidden;
-    padding-right: $tp-transaction-line-button-label-padding-right;
-    .label {
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    &.label {
-      color: $tp-transaction-line-button-label-color;
-    }
-    span {
-      width: inherit;
-    }
-  }
-  &:not(.spacer) {
-    padding: $tp-transaction-line-button-padding;
-    column-gap: $tp-transaction-line-button-column-gap;
-  }
   &:not(.no-border) {
     border: $tp-transaction-line-button-border;
     border-color: $tp-transaction-line-button-border-color;

package/package.json

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