@colijnit/transaction 12.1.66 → 12.1.68

package/lib/component/transaction-confirmation-details/style/_layout.scss

@@ -70,5 +70,9 @@
         float: left;
       }
     }
+
+    .header-inform-user {
+
+    }
   }
 }

package/lib/component/transaction-confirmation-details/transaction-confirmation-details.component.d.ts

@@ -10,12 +10,13 @@ export declare class TransactionConfirmationDetailsComponent {
     readonly icons: typeof Icon;
     transactionLines: TransactionLineInfo;
     transactionInfoNr: number;
-    testLines: any;
     showClass(): boolean;
     showAddOrder: boolean;
     newDocBatchArray: DocDeliveryBatch;
+    isEditing: boolean;
     docBatchSaved: EventEmitter<boolean>;
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService);
     addButtonClicked(): void;
     handleOkClick(): Promise<void>;
+    handleCancelClick(): void;
 }

package/lib/component/transaction-confirmation-history/style/_layout.scss

@@ -6,5 +6,9 @@
       height: 40%;
       width: 100%;
     }
+
+    .greyed-out {
+      background: grey;
+    }
   }
 }

package/lib/component/transaction-confirmation-history/transaction-confirmation-history.component.d.ts

@@ -5,6 +5,7 @@ import { IconCacheService } from "../../service/icon-cache.service";
 import { TransactionService } from "../../service/transaction.service";
 import { GetPurchasePortalLine } from "@colijnit/transactionapi/build/model/get-purchase-portal-line";
 import { PurchasePortalFilters } from "@colijnit/transactionapi/build/model/purchase-portal-filters.bo";
+import { DocDeliveryBatch } from "@colijnit/transactionapi/build/model/doc-delivery-batch.bo";
 export declare class TransactionConfirmationHistoryComponent implements OnInit {
     iconCacheService: IconCacheService;
     transactionService: TransactionService;
@@ -18,6 +19,7 @@ export declare class TransactionConfirmationHistoryComponent implements OnInit {
     docBatchApplied: EventEmitter<boolean>;
     getPurchasePortalLine: GetPurchasePortalLine;
     purchasePortalFilter: PurchasePortalFilters;
+    filteredDocBatchArray: DocDeliveryBatch[];
     showClass(): boolean;
     constructor(iconCacheService: IconCacheService, transactionService: TransactionService);
     ngOnInit(): void;

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

@@ -7,5 +7,6 @@ export declare class TransactionHeaderComponent {
     set transaction(value: TransactionInfoResponse);
     get transaction(): TransactionInfoResponse;
     showClass(): boolean;
+    isPurchaseOrder: boolean;
     private _transaction;
 }

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

@@ -1,14 +1,18 @@
+import { EventEmitter } from "@angular/core";
 import { Icon } from "../../enum/icon.enum";
 import { IconCacheService } from "../../service/icon-cache.service";
 import { DialogService } from "../../service/dialog.service";
 import { ExtendedTransactionLineViewModel } from "../../model/extended-transaction-line-view-model";
+import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 export declare class TransactionLineWarehouseLocationButtonComponent {
     iconCacheService: IconCacheService;
     private _dialogService;
     readonly icons: typeof Icon;
-    line: ExtendedTransactionLineViewModel;
+    line: TransactionLineInfo | ExtendedTransactionLineViewModel;
+    locationNr: string;
     readonly: boolean;
+    locationSelected: EventEmitter<string>;
     showClass(): boolean;
     constructor(iconCacheService: IconCacheService, _dialogService: DialogService);
-    openWarehouseLocationDialog(line: ExtendedTransactionLineViewModel): void;
+    openWarehouseLocationDialog(): Promise<void>;
 }

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

@@ -22,6 +22,7 @@
     .transaction-line-side-panel-header {
       display: flex;
       justify-content: space-between;
+      margin-top: $tp-transaction-line-side-panel-header-top-margin;
       .transaction-line-side-panel-header-item {
         display: flex;
         flex-direction: column;
@@ -40,6 +41,7 @@
       }
     }
     .close-button {
+      position: absolute;
       display: flex;
       align-self: flex-end;
       width: 25px;
@@ -66,5 +68,8 @@
         margin: 5px;
       }
     }
+    .hidden {
+      visibility: hidden;
+    }
   }
 }

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

@@ -8,3 +8,4 @@ $tp-transaction-line-side-panel-padding: 10px !default;
 $tp-transaction-line-side-panel-header-label-font-family: $tp-font-family !default;
 $tp-transaction-line-side-panel-header-label-font-size: $tp-font-size-small !default;
 $tp-transaction-line-side-panel-header-divider-color: $tp-color-border !default;
+$tp-transaction-line-side-panel-header-top-margin: 5px !default;

package/lib/component/transaction-line-side-panel-purchase/transaction-line-side-panel-purchase.component.d.ts

@@ -19,6 +19,7 @@ export declare class TransactionLineSidePanelPurchaseComponent {
     goodsReceiptStatus: GoodsReceiptStatusWithHistory;
     selectedLineDocBatchArray: DocDeliveryBatch;
     isDocBatchSaved: boolean;
+    editingMode: boolean;
     private _transactionInfo;
     constructor(_service: TransactionService, _transactionEventService: TransactionEventService);
     getGoodsReceiptStatusWithHistory(): Promise<void>;

package/lib/component/transaction-quick-access/transaction-quick-access-received-goods/style/_layout.scss

@@ -8,6 +8,8 @@
 
     .buttons {
       display: flex;
+      align-self: start;
+      margin-top: 2px;
 
       .receive {
         display: flex;
@@ -19,11 +21,6 @@
       .print {
         display: flex;
         flex-direction: row;
-        justify-content: space-between;
-
-        .button-icon {
-          margin-left: 3px;
-        }
       }
 
       .hidden {
@@ -33,7 +30,7 @@
 
     .dots-wrapper {
       display: flex;
-      margin-right: 3px;
+      transform: scale(0.7);
 
       .dot {
         width: 8px;
@@ -53,8 +50,8 @@
       align-items: center;
       justify-content: center;
       cursor: pointer;
-      width: 65px;
-      height: 40px;
+      width: 45px;
+      height: 32px;
 
       .button-icon {
         height: 20px;

package/lib/component/transaction-receiving-goods-history/transaction-receiving-goods-history.component.d.ts

@@ -1,9 +1,9 @@
-import { AfterViewInit, EventEmitter } from "@angular/core";
+import { EventEmitter } from "@angular/core";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { TransactionService } from "../../service/transaction.service";
 import { LogisticalStateDetail } from "@colijnit/transactionapi/build/model/logistical-state-detail.bo";
 import { TransactionInfo } from "@colijnit/transactionapi/build/model/transaction-info.bo";
-export declare class TransactionReceivingGoodsHistoryComponent implements AfterViewInit {
+export declare class TransactionReceivingGoodsHistoryComponent {
     private _service;
     set goodsReceiptHistory(value: LogisticalStateDetail[]);
     transactionInfo: TransactionInfo;
@@ -13,6 +13,5 @@ export declare class TransactionReceivingGoodsHistoryComponent implements AfterV
     showClass(): boolean;
     private _goodsReceiptHistory;
     constructor(_service: TransactionService);
-    ngAfterViewInit(): void;
     handleDeleteSelectedRow(row: LogisticalStateDetail): void;
 }

package/lib/component/transaction-side-panel-edit-request-details/components/receive-goods-request.component.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from "@angular/core";
+import { AfterViewInit, EventEmitter } from "@angular/core";
 import { Icon } from "../../../enum/icon.enum";
 import { TransactionLineInfo } from "@colijnit/transactionapi/build/model/transaction-line-info.bo";
 import { PurchaseOrderLineReceiptDetails } from "@colijnit/transactionapi/build/model/purchase-order-line-receipt-details.bo";
@@ -9,7 +9,9 @@ import { TransactionService } from "../../../service/transaction.service";
 import { ArticleService } from "../../../service/article.service";
 import { DialogService } from "../../../service/dialog.service";
 import { TransactionReceiveGoodsService } from "../../transaction-line/transaction-receive-goods-line/service/transaction-receive-goods.service";
-export declare class ReceiveGoodsRequestComponent {
+import { TransactionKind } from "@colijnit/transactionapi/build/enum/transaction-kind.enum";
+import { TransactionTypeCategory } from "../../../enum/transaction-type-category.enum";
+export declare class ReceiveGoodsRequestComponent implements AfterViewInit {
     iconCacheService: IconCacheService;
     private _formMaster;
     private _service;
@@ -17,8 +19,10 @@ export declare class ReceiveGoodsRequestComponent {
     private _dialogService;
     private _receiveGoodsService;
     readonly icons: typeof Icon;
-    set amountLeftToReceive(value: number);
+    readonly transactionKind: typeof TransactionKind;
+    readonly transactionTypeCategory: typeof TransactionTypeCategory;
     set transactionLine(value: TransactionLineInfo);
+    set amountLeftToReceive(value: number);
     reloadReceivingGoodsHistory: EventEmitter<void>;
     showClass(): boolean;
     get amountLeftToReceive(): number;
@@ -26,20 +30,19 @@ export declare class ReceiveGoodsRequestComponent {
     receiptDetails: PurchaseOrderLineReceiptDetails;
     request: ReceiveGoodsForPurchaseOrderRequest;
     saveButtonDisabled: boolean;
-    locations: string[];
-    locationDropdownFields: {};
     readonly: boolean;
     returnMaxToReceive: number;
+    selectedLocation: string;
     private _transactionLine;
     private _amountLeftToReceive;
     private _subscriptions;
     constructor(iconCacheService: IconCacheService, _formMaster: FormMasterService, _service: TransactionService, _articleService: ArticleService, _dialogService: DialogService, _receiveGoodsService: TransactionReceiveGoodsService);
     ngOnInit(): void;
     ngOnDestroy(): void;
+    ngAfterViewInit(): void;
     submit(): boolean;
     locationRequired(): boolean;
     handleSaveDetailsEdit(): void;
-    openWarehouseLocationDialog(): void;
     returnStockMode(): boolean;
     private _handleReturnStock;
 }

package/lib/component/transaction-side-panel-edit-request-details/style/_layout.scss

@@ -5,12 +5,6 @@
       flex-direction: column;
     }
 
-    .details-header {
-      font-size: $tp-co-transaction-request-details-title-font-size;
-      margin: $tp-co-transaction-request-details-title-margin;
-      color: $tp-color-label;
-    }
-
     .columns-wrapper {
       display: flex;
     }
@@ -38,18 +32,8 @@
 
     .location-wrapper {
       position: relative;
-      display: flex;
-      align-items: center;
-      border-radius: 10px;
-      height: 28px;
-      background-color: $tp-transaction-line-discount-background-color;
-      padding-left: 6px;
       margin-bottom: 13px;
 
-      co-icon {
-        margin-right: 15px;
-      }
-
       .required {
         position: absolute;
         right: 7px;
@@ -82,6 +66,61 @@
       }
     }
 
+    .transaction-line-totals-amount {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid $tp-transaction-line-border-color;
+      border-radius: 10px;
+      margin-bottom: 21px;
+      margin-top: 21px;
+      width: 90px;
+      height: $tp-transaction-line-button-height;
+
+      .co-input-text {
+        width: 80%;
+        height: 95%;
+
+        input {
+          margin: 4px 0 0;
+        }
+      }
+
+      .amount-number-picker {
+        border: none;
+
+        .co-button {
+          height: 18px;
+          width: 20px;
+        }
+      }
+    }
+
+
+    .header-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 50px;
+
+      co-transaction-line-statusbar {
+        margin-right: 55px;
+      }
+
+      .details-header {
+        font-size: $tp-co-transaction-request-details-title-font-size;
+        color: $tp-color-label;
+      }
+
+      .status-bar-wrapper {
+        co-statusbar {
+          display: flex;
+          justify-content: center;
+        }
+      }
+    }
+
+
     .disabled {
       cursor: default;
       opacity: 0.6;

package/lib/component/transaction-side-panel-edit-request-details/style/_material-definition.scss

@@ -1,3 +1,2 @@
 $tp-co-transaction-request-details-title-font-size: 15px !default;
-$tp-co-transaction-request-details-title-margin: 10px 0 20px 0 !default;
 $tp-co-transaction-request-details-input-margin: 0 0 18px 0 !default;

package/package.json

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