@colijnit/transaction 12.1.85 → 12.1.86

package/fesm2015/colijnit-transaction.js

@@ -110,6 +110,8 @@ import { SalesOrderLineAllocationDetails } from '@colijnit/transactionapi/build/
 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';
+import { GetPurchasePortalLine } from '@colijnit/transactionapi/build/model/get-purchase-portal-line';
+import { PurchasePortalFilters } from '@colijnit/transactionapi/build/model/purchase-portal-filters.bo';
 import { RelationRequest } from '@colijnit/relationapi/build/model/relation-request';
 import { CoDocument } from '@colijnit/sharedapi/build/model/co-document.bo';
 import { GenderType } from '@colijnit/relationapi/build/enum/gender-type.enum';
@@ -121,8 +123,6 @@ import { RelationSmallObject } from '@colijnit/relationapi/build/model/relation-
 import { IconModule as IconModule$1, CoCurrencyPipeModule } from '@colijnit/corecomponents';
 import { ReceiveGoodsForPurchaseOrderCorrectionRequest } from '@colijnit/transactionapi/build/model/receive-goods-for-purchase-order-correction-request.bo';
 import { PurchaseOrderLineReceiptCorrectionDetails } from '@colijnit/transactionapi/build/model/purchase-order-line-receipt-correction-details.bo';
-import { GetPurchasePortalLine } from '@colijnit/transactionapi/build/model/get-purchase-portal-line';
-import { PurchasePortalFilters } from '@colijnit/transactionapi/build/model/purchase-portal-filters.bo';
 import { AllocateGoodsForSalesOrderCorrectionRequest } from '@colijnit/transactionapi/build/model/allocate-goods-for-sales-order-correction-request';
 import { SalesOrderLineAllocationCorrectionDetails } from '@colijnit/transactionapi/build/model/sales-order-line-allocation-correction-details';
 import { IoneCatalogModule } from '@colijnit/catalog';
@@ -1023,6 +1023,7 @@ class TransactionBaseComponent {
         this._transactionLine = new TransactionLineInfo();
         this._transactionInfo = new TransactionInfo();
         this._transactionTotal = new TransactionTotal();
+        this._purchasePortalLine = new PurchasePortalLine();
     }
     set transaction(value) {
         this._transaction = value;
@@ -1080,6 +1081,14 @@ class TransactionBaseComponent {
     get transactionTotal() {
         return this._transactionTotal;
     }
+    set purchasePortalLine(value) {
+        if (value) {
+            this._purchasePortalLine = value;
+        }
+    }
+    get purchasePortalLine() {
+        return this._purchasePortalLine;
+    }
     set relation(value) {
         if (value) {
             this._relation = value;
@@ -1148,6 +1157,7 @@ TransactionBaseComponent.propDecorators = {
     transactionLine: [{ type: Input }],
     transactionInfo: [{ type: Input }],
     transactionTotal: [{ type: Input }],
+    purchasePortalLine: [{ type: Input }],
     relation: [{ type: Input }],
     expanded: [{ type: Input }],
     preview: [{ type: HostBinding, args: ["class.preview",] }, { type: Input }],
@@ -3417,7 +3427,7 @@ class TransactionConnectorAdapterService {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.connector.getPurchaseAdviceLines(filters, goodId);
             if (response && response.validationResult && response.validationResult.success) {
-                return this._boFactory.makeBOArrayFromRawBackendDataArray(PurchaseAdviceLine, response.resultObject);
+                return this._boFactory.makeBOArrayFromRawBackendDataArray(PurchaseAdviceLine, response.resultObjects);
             }
             else {
                 this._handleExceptionFromResponse(response);
@@ -9362,9 +9372,16 @@ TransactionSearchSalesOrderTileComponent.ctorParameters = () => [
 ];
 
 class TransactionQuickAccessOrderConfirmationComponent extends TransactionBaseComponent {
-    constructor() {
-        super(...arguments);
+    constructor(iconService, service, _transactionEventService) {
+        super(service);
+        this.iconService = iconService;
+        this.service = service;
+        this._transactionEventService = _transactionEventService;
+        this.icons = Icon;
         this.purchaseOrderConfirmation = new GetPurchaseOrderConfirmation();
+        this.awaitingResult = false;
+        this.resultSuccessful = false;
+        this.iconVisible = true;
     }
     showClass() {
         return true;
@@ -9375,6 +9392,24 @@ class TransactionQuickAccessOrderConfirmationComponent extends TransactionBaseCo
             this.transactionService.purchaseOrderConfirmation(this.purchaseOrderConfirmation);
         }
     }
+    handleSelectAllLines(value) {
+        this._transactionEventService.selectAllSalesOrderLinesForPurchase.next(value);
+    }
+    handleCommitEvent() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.iconVisible = false;
+            this.resultSuccessful = false;
+            this.awaitingResult = true;
+            if (this.purchaseOrderConfirmation.confirmationDate && this.purchaseOrderConfirmation.reference) {
+                this.purchaseOrderConfirmation.transId = this.transactionService.currentTransaction.transactionInfo.transactionNr;
+                this.transactionService.purchaseOrderConfirmation(this.purchaseOrderConfirmation);
+            }
+            this.awaitingResult = false;
+            setTimeout(() => {
+                this.iconVisible = true;
+            }, 600);
+        });
+    }
 }
 TransactionQuickAccessOrderConfirmationComponent.decorators = [
     { type: Component, args: [{
@@ -9392,12 +9427,21 @@ TransactionQuickAccessOrderConfirmationComponent.decorators = [
       [(model)]="purchaseOrderConfirmation.leverbatch"
       [placeholder]="'BATCH' | localize"
     ></co-input-text>
-    <co-input-checkbox (modelChange)="confirmFullOrder()"
+    <co-input-checkbox (modelChange)="handleSelectAllLines($event)"
     ></co-input-checkbox>
+    <div class="button-wrapper" (click)="handleCommitEvent()">
+      <co-checkmark-overlay [successful]="resultSuccessful" [visible]="awaitingResult"></co-checkmark-overlay>
+      <co-icon class="button-icon" [iconData]="iconService.getIcon(icons.GearSolid)" [class.hidden]="!iconVisible"></co-icon>
+    </div>
   `,
                 encapsulation: ViewEncapsulation.None
             },] }
 ];
+TransactionQuickAccessOrderConfirmationComponent.ctorParameters = () => [
+    { type: IconCacheService },
+    { type: TransactionService },
+    { type: TransactionEventService }
+];
 TransactionQuickAccessOrderConfirmationComponent.propDecorators = {
     showClass: [{ type: HostBinding, args: ["class.co-transaction-quick-access-order-confirmation",] }]
 };
@@ -10610,7 +10654,7 @@ TransactionReceiveGoodsLineComponent.decorators = [
         <co-transaction-line-warehouse-button [transactionLine]="viewModel" [readonly]="viewModel.quantityReceived === viewModel.amount" [transactionInfo]="transactionInfo"></co-transaction-line-warehouse-button>
         <co-transaction-line-warehouse-location-button [readonly]="warehouseButtonReadonly()" [line]="viewModel"></co-transaction-line-warehouse-location-button>
         <co-editable-label class="transaction-line-totals-total price"
-                           [model]="viewModel.amount.toString() + 'x'"
+                           [model]="viewModel.amount?.toString() + 'x'"
                            [readonly]="true"
         ></co-editable-label>
         <div class="transaction-line-totals-amount"
@@ -10988,7 +11032,7 @@ TransactionGoodsAllocationLineComponent.decorators = [
         <co-transaction-line-warehouse-button [transactionLine]="viewModel" [readonly]="viewModel.quantityAllocated === viewModel.amount" [transactionInfo]="transactionInfo"></co-transaction-line-warehouse-button>
         <co-transaction-line-warehouse-location-button [readonly]="viewModel.quantityAllocated === viewModel.amount || !viewModel.isLocationRequired" [line]="viewModel"></co-transaction-line-warehouse-location-button>
         <co-editable-label class="transaction-line-totals-total price"
-                           [model]="viewModel.amount.toString() + 'x'"
+                           [model]="viewModel.amount?.toString() + 'x'"
                            [readonly]="true"
         ></co-editable-label>
         <co-transaction-line-statusbar class="status-bar-wrapper" [transactionLine]="transactionLine" [transactionInfo]="transactionInfo" [activeCategory]="category.SalesOrderAllocation"></co-transaction-line-statusbar>
@@ -11364,6 +11408,9 @@ class TransactionPurchaseOrderLineComponent extends TransactionBaseComponent {
         this.showDialogDiscount = false;
         this.showCheckboxForLine = false;
         this.viewModel = new ExtendedTransactionLineViewModel();
+        this.getPurchasePortalLine = new GetPurchasePortalLine();
+        this.purchasePortalFilter = new PurchasePortalFilters();
+        this.purchasePortalLines = [];
         this.transactionTypeCategory = TransactionTypeCategory;
         this._subs = [];
     }
@@ -11372,7 +11419,7 @@ class TransactionPurchaseOrderLineComponent extends TransactionBaseComponent {
     }
     ngOnInit() {
         this.transactionKind = this.transactionService.currentTransaction.transactionInfo.transactionKind;
-        console.log(this.transactionLine);
+        this.getPurchasePortalLines();
         this._subs.push(this._transactionEventService.selectAllSalesOrderLinesForPurchase.subscribe((value) => {
             this.selected = value;
         }));
@@ -11383,50 +11430,67 @@ class TransactionPurchaseOrderLineComponent extends TransactionBaseComponent {
     transactionLineSet() {
         this.showCheckboxForLine = this.transactionLine.commissionCode === "0";
     }
+    getPurchasePortalLines() {
+        this.purchasePortalFilter.purchaseOrderNo = this.transactionInfo.transactionNr.toString();
+        this.purchasePortalFilter.lineId = this.transactionLine.lineNr.toString();
+        this.getPurchasePortalLine.transIdPurchase = this.transactionInfo.id;
+        this.getPurchasePortalLine.filterObject = this.purchasePortalFilter;
+        this.transactionService.getPurchasePortalLines(this.getPurchasePortalLine).then((result) => {
+            this.purchasePortalLines = result;
+        });
+    }
+    handleOpenSidePanel(mouseClick) {
+        const target = mouseClick.target;
+        if (target && target.dataset && target.dataset['action'] && target.dataset['action'] === 'openSidePanel') {
+            this._transactionEventService.openSidePanel.next(this.transactionLine);
+        }
+    }
 }
 TransactionPurchaseOrderLineComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-transaction-purchase-order-line",
                 template: `
-        <co-transaction-base-line [transactionInfo]="transactionInfo" [transactionLine]="transactionLine" [preview]="preview" [checkbox]="showCheckboxForLine" [checkboxValue]="selected" (checkboxValueChanged)="selected = $event">
-          <div class="transaction-line-wrapper" data-action="openSidePanel">
-            <co-transaction-line-statusbar [transactionLine]="transactionLine" [transactionInfo]="transactionInfo" [activeCategory]="transactionTypeCategory.PurchaseOrderReceivedGoods"></co-transaction-line-statusbar>
-            <co-transaction-line-delivery-date-button [transactionLine]="transactionLine" class="two-column"></co-transaction-line-delivery-date-button>
-            <div class="transaction-line-totals-grid">
-              <co-transaction-line-price class="transaction-line-totals-grid price"
-                                         [transactionLine]="transactionLine"
-                                         [showLabel]="false"
-                                         [defaultEditMode]="false"
-              ></co-transaction-line-price>
-              <div class="transaction-line-totals-grid discount" (click)="showDialogDiscount = true">
-              <span class="co-transaction-overflow-ellipsis" [class.transaction-negative-value]="transactionLine.lineTotalDiscountAmount < 0"
-                    [textContent]="(transactionLine.lineTotalDiscountAmount | coCurrency) || ('DISCOUNT' | localize)"></span>
+        <co-transaction-base-line *ngFor="let lines of purchasePortalLines" [transactionInfo]="transactionInfo" (click)="handleOpenSidePanel($event)" [transactionLine]="transactionLine"  [preview]="preview" [checkbox]="showCheckboxForLine" [checkboxValue]="selected" (checkboxValueChanged)="selected = $event">
+         <div class="transaction-line-wrapper" data-action="openSidePanel">
+            <div class="transaction-line-wrapper">
+              <co-transaction-line-statusbar [transactionLine]="transactionLine" [transactionInfo]="transactionInfo" [activeCategory]="transactionTypeCategory.PurchaseOrderReceivedGoods"></co-transaction-line-statusbar>
+              <co-transaction-line-delivery-date-button [transactionLine]="transactionLine" class="two-column"></co-transaction-line-delivery-date-button>
+              <div class="transaction-line-totals-grid">
+                <co-transaction-line-price class="transaction-line-totals-grid price"
+                                           [purchasePortalLine]="lines"
+                                           [showLabel]="false"
+                                           [defaultEditMode]="false"
+                ></co-transaction-line-price>
+                <div class="transaction-line-totals-grid discount" (click)="showDialogDiscount = true">
+                <span class="co-transaction-overflow-ellipsis" [class.transaction-negative-value]="transactionLine.lineTotalDiscountAmount < 0"
+                      [textContent]="(lines.discountOrderPrice | coCurrency) || ('DISCOUNT' | localize)"></span>
+                </div>
+                <co-transaction-line-price class="transaction-line-totals-grid price"
+                                           [purchasePortalLine]="lines"
+                                           [showLabel]="false"
+                                           [defaultEditMode]="false"
+                ></co-transaction-line-price>
               </div>
-              <co-transaction-line-price class="transaction-line-totals-grid price"
-                                         [transactionLine]="transactionLine"
-                                         [showLabel]="false"
-                                         [defaultEditMode]="false"
-              ></co-transaction-line-price>
             </div>
-          </div>
-          <div class="vertical-border"></div>
-          <div class="transaction-line-totals-grid">
-            <co-icon class="transaction-line-supplier-icon" [iconData]="iconCacheService.getIcon(icons.IndustrySolid)"></co-icon>
-            <span class="transaction-line-supplier-id" [textContent]="transactionLine.supplierId"></span>
-            <div class="transaction-line-totals-grid">
-              <co-transaction-line-price class="transaction-line-totals-grid price"
-                                         [transactionLine]="transactionLine"
-                                         [showLabel]="false"
-                                         [defaultEditMode]="false"
-              ></co-transaction-line-price>
+            <div class="vertical-border"></div>
+            <div class="transaction-line-totals-grid" data-action="openSidePanel">
+              <co-icon class="transaction-line-supplier-icon" [iconData]="iconCacheService.getIcon(icons.IndustrySolid)"></co-icon>
+              <span class="transaction-line-supplier-id" [textContent]="lines.articleNoSupplier"></span>
+              <div class="transaction-line-totals-grid">
+                <co-transaction-line-price class="transaction-line-totals-grid price"
+                                           [purchasePortalLine]="lines"
+                                           [showLabel]="false"
+                                           [defaultEditMode]="false"
+                ></co-transaction-line-price>
+              </div>
+              <co-input-number-picker class="amount-number-picker"
+                                      [(model)]="lines.amountAccepted"
+              ></co-input-number-picker>
+              <co-transaction-line-delivery-date-button [purchasePortalLine]="lines"
+                                                        class="two-column"
+              ></co-transaction-line-delivery-date-button>
             </div>
-            <co-input-number-picker class="amount-number-picker"
-                                    [(model)]="transactionLine.amount"
-            ></co-input-number-picker>
-            <co-transaction-line-delivery-date-button [transactionLine]="transactionLine"
-                                                      class="two-column"
-            ></co-transaction-line-delivery-date-button>
-          </div>
+         </div>
         </co-transaction-base-line>
   `,
                 encapsulation: ViewEncapsulation.None
@@ -15550,12 +15614,14 @@ class TransactionComponent {
         if (sidePanelComponent) {
             sidePanelComponent.handleCancelClick();
         }
-        this.sidePanelTransactionLine = line;
-        this._dynamicComponentService.createComponent(TransactionLineSidePanelComponent, {
-            transactionInfo: this.transaction.transactionInfo,
-            transactionLine: this.sidePanelTransactionLine,
-            activeCategory: this.activeCategory
-        });
+        if (line) {
+            this.sidePanelTransactionLine = line;
+            this._dynamicComponentService.createComponent(TransactionLineSidePanelComponent, {
+                transactionInfo: this.transaction.transactionInfo,
+                transactionLine: this.sidePanelTransactionLine,
+                activeCategory: this.activeCategory
+            });
+        }
     }
 }
 TransactionComponent.decorators = [
@@ -17510,7 +17576,7 @@ TransactionLinePriceComponent.decorators = [
     { type: Component, args: [{
                 selector: "co-transaction-line-price",
                 template: `
-    <span *ngIf="(!editMode  || readonly) && !defaultEditMode" [textContent]="transactionLine.price | coCurrency"></span>
+    <span *ngIf="(!editMode  || readonly) && !defaultEditMode" [textContent]="transactionLine.price || purchasePortalLine.confirmedPrice | coCurrency"></span>
     <co-input-text #input *ngIf="editMode || defaultEditMode"
                    [noStyle]="true"
                    [hideArrowButtons]="true"
@@ -17518,7 +17584,7 @@ TransactionLinePriceComponent.decorators = [
                    [type]="'number'"
                    [showSaveCancel]="!readonly"
                    [readonly]="readonly"
-                   [model]="transactionLine.price"
+                   [model]="transactionLine.price || purchasePortalLine.confirmedPrice"
                    (blur)="editMode = false"
     ></co-input-text>
   `,
@@ -20211,7 +20277,9 @@ TransactionQuickAccessOrderConfirmationModule.decorators = [
                     InputCheckboxModule,
                     PipeModule,
                     SendMethodDialogModule,
-                    QuickSendButtonModule
+                    QuickSendButtonModule,
+                    CheckmarkOverlayModule,
+                    IconModule
                 ],
                 declarations: [
                     TransactionQuickAccessOrderConfirmationComponent
@@ -20361,7 +20429,8 @@ TransactionQuickAccessOrderPurchaseModule.decorators = [
                     IconModule,
                     PipeModule,
                     SendMethodDialogModule,
-                    QuickSendButtonModule
+                    QuickSendButtonModule,
+                    CheckmarkOverlayModule
                 ],
                 declarations: [
                     TransactionQuickAccessOrderPurchaseComponent
@@ -21120,6 +21189,9 @@ class TransactionBaseLineComponent extends TransactionBaseComponent {
     showClass() {
         return true;
     }
+    ngOnDestroy() {
+        this._transactionEventService.openSidePanel.next(null);
+    }
     deleteTransactionLineClick(event) {
         return __awaiter(this, void 0, void 0, function* () {
             event.preventDefault();
@@ -21448,7 +21520,8 @@ TransactionLineDeliveryDateButtonComponent.decorators = [
                 template: `
     <div class="transaction-line-button custom-width no-border">
       <span [textContent]="'DELIVERY_DATE' | localize | append:':'"></span>
-      <span class="co-transaction-overflow-ellipsis" [textContent]="transactionLine.deliveryDate | date:'dd MMM YYYY'"></span>
+      <span *ngIf="transactionLine" class="co-transaction-overflow-ellipsis" [textContent]="transactionLine.deliveryDate | date:'dd MMM YYYY'"></span>
+      <span *ngIf="purchasePortalLine" class="co-transaction-overflow-ellipsis" [textContent]="purchasePortalLine.deliveryDateConfirmed | date:'dd MMM YYYY'"></span>
       <co-icon class="header-delivery-date-icon" [iconData]="iconCacheService.getIcon(icons.CalendarDayRegular)"></co-icon>
     </div>
   `,
@@ -21460,6 +21533,7 @@ TransactionLineDeliveryDateButtonComponent.ctorParameters = () => [
 ];
 TransactionLineDeliveryDateButtonComponent.propDecorators = {
     transactionLine: [{ type: Input }],
+    purchasePortalLine: [{ type: Input }],
     showClass: [{ type: HostBinding, args: ["class.co-transaction-line-delivery-date-button",] }]
 };