@colijnit/transaction 262.1.16 → 262.1.17

package/fesm2022/colijnit-transaction.mjs

@@ -225,6 +225,7 @@ import { IonePaymentStatusCode } from '@colijnit/transactionapi/build/enum/ione-
 import { HttpClient } from '@angular/common/http';
 import { CashDrawersRequest } from '@colijnit/transactionapi/build/model/cash-drawers-request';
 import { PspType } from '@colijnit/transactionapi/build/enum/psp-type.enum';
+import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { DateUtils } from '@colijnit/ioneconnector/build/utils/date-utils';
 import { ImageUtils } from '@colijnit/ioneconnector/build/utils/image-utils';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -274,7 +275,6 @@ import { TrueFalseDbType } from '@colijnit/mainapi/build/enum/true-false-db-type
 import { OrderLineSetDTO } from '@colijnit/transactionapi/build/model/order-line-set-dto';
 import { TransactionAddOrderLineSetTextLineRequest } from '@colijnit/transactionapi/build/model/transaction-add-order-line-set-text-line-request';
 import { TransactionLineCopyRequest } from '@colijnit/transactionapi/build/model/transaction-line-copy-request.bo';
-import { CalculateAmountToPayRequest } from '@colijnit/transactionapi/build/model/calculate-amount-to-pay-request';
 import { ExternalCatalogAddArticleRequest } from '@colijnit/transactionapi/build/model/external-catalog-add-article-request';
 import { CopyTransactionRequest } from '@colijnit/transactionapi/build/model/copy-transaction-request';
 import { ArrayUtils } from '@colijnit/ioneconnector/build/utils/array-utils';
@@ -355,8 +355,8 @@ import { DateField } from '@colijnit/ioneconnector/build/factory/decorators/date
 class Version {
     name = "@colijnit/transaction";
     description = "Colijn IT transaction package";
-    symVer = "262.1.16";
-    publishDate = "10-6-2026, 22:59:19";
+    symVer = "262.1.17";
+    publishDate = "11-6-2026, 18:19:48";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -25957,8 +25957,8 @@ class DeliveryPlanningOverviewComponent {
         this.deliveryPlanningService.currentStartDate = newDate;
         this.resetPlanningTransportEvent.emit();
     }
-    onChangeView(view) {
-        this.currentViewMode = view;
+    onChangeView(event) {
+        this.currentViewMode = event.view;
         this.resetPlanningTransportEvent.emit();
     }
     async handleDeleteOrder(deleteResult, planningTransportWeek) {
@@ -26415,7 +26415,7 @@ class DeliveryPlanningOverviewComponent {
                   <co-date-planning [view]="currentViewMode" [selectedDate]="currentDate()"
                                     (rangeChange)="handleDateRangeChange($event)"
                                     (selectedDateChange)="handleDateRangeChange($event)"
-                                    (viewChange)="onChangeView"></co-date-planning>
+                                    (viewChange)="onChangeView($event)"></co-date-planning>
               </div>
 
               @for (transportWeekRow of planTransportWeekArr; track transportWeekRow) {
@@ -26484,7 +26484,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                   <co-date-planning [view]="currentViewMode" [selectedDate]="currentDate()"
                                     (rangeChange)="handleDateRangeChange($event)"
                                     (selectedDateChange)="handleDateRangeChange($event)"
-                                    (viewChange)="onChangeView"></co-date-planning>
+                                    (viewChange)="onChangeView($event)"></co-date-planning>
               </div>
 
               @for (transportWeekRow of planTransportWeekArr; track transportWeekRow) {
@@ -34790,6 +34790,7 @@ class TransactionPaymentService {
             }
             else {
                 this.pspTransactionUuid = await this._paymentConnectorService.doPayment(request);
+                await this._triggerCalculateAmountToPay();
             }
             if (this.pspTransactionUuid) {
                 this._paymentStatusPollIntervalCount = 0;
@@ -34802,6 +34803,9 @@ class TransactionPaymentService {
                 if (this.currentPaymentMethod.voucher) {
                     this._transactionEventService.posOrderVoucherPayment.next();
                 }
+                else {
+                    await this._triggerCalculateAmountToPay();
+                }
                 this._handlePayment(false);
                 if (this.amountToPay === 0) {
                     this._handlePayment();
@@ -34939,14 +34943,14 @@ class TransactionPaymentService {
             }
         });
     }
-    // private async _triggerCalculateAmountToPay(): Promise<void> {
-    //   const amountToPayRequest: CalculateAmountToPayRequest = new CalculateAmountToPayRequest();
-    //   amountToPayRequest.transactionUuid = this.transactionUuid;
-    //   amountToPayRequest.paymentMethodCode = this.currentPaymentMethod.code;
-    //   this._paymentConnectorService.calculateAmountToPay(amountToPayRequest).then((result: AmountToPay) => {
-    //     this.amountToPay = result.amountToPay;
-    //   });
-    // }
+    async _triggerCalculateAmountToPay() {
+        const amountToPayRequest = new CalculateAmountToPayRequest();
+        amountToPayRequest.transactionUuid = this.transactionUuid;
+        amountToPayRequest.paymentMethodCode = this.currentPaymentMethod.code;
+        this._paymentConnectorService.calculateAmountToPay(amountToPayRequest).then((result) => {
+            this.amountToPay = result.amountToPay;
+        });
+    }
     async _handleCashLimitCheck() {
         let payedAmount = await this._transactionService.getCashPaymentValueByTransId(this.transId);
         const limit = await this._transactionService.getCashLimitValue(InternalParam.ThresholdCashPaymentMessage);
@@ -42098,8 +42102,9 @@ class CashOnDeliveryModalComponent extends TransactionInputLineFieldBaseComponen
     changeAmountRequest = new ChangeHeaderCashOnDeliveryAmountRequest();
     icons = Icon;
     cashOnDeliveryAmount = 0;
-    ngOnInit() {
+    async ngOnInit() {
         this._getCashOnDeliveryData();
+        await this.lockTransaction();
     }
     updateCashOnDeliveryAmount() {
         this.cashOnDeliveryAmount = this.input.model;
@@ -42179,7 +42184,7 @@ class CashOnDeliveryModalComponent extends TransactionInputLineFieldBaseComponen
             #input
             [type]="'number'"
             [placeholder]="'CASH_ON_DELIVERY_AMOUNT' | localize"
-            [model]="cashOnDeliveryAmount" 
+            [model]="cashOnDeliveryAmount"
             [formatPipe]="currencyPipe"
             (keydown)="onEnterKey($event)">
           </co-input-text>
@@ -42261,7 +42266,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             #input
             [type]="'number'"
             [placeholder]="'CASH_ON_DELIVERY_AMOUNT' | localize"
-            [model]="cashOnDeliveryAmount" 
+            [model]="cashOnDeliveryAmount"
             [formatPipe]="currencyPipe"
             (keydown)="onEnterKey($event)">
           </co-input-text>
@@ -42386,6 +42391,9 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
     }
     showCashOnDeliveryModal(value) {
         this.cashOnDeliveryModalVisible = value;
+        if (value === false) {
+            this.transactionEventService.headerPopupSaveButtonEnableChange.next(true);
+        }
     }
     getCashAmount(value) {
         this.cashOnDelivery = value;
@@ -42454,6 +42462,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
         super.transactionSet();
         this._getDepositInfo();
         this._getOutstandingAmounts();
+        this._getCashOnDeliveryData();
     }
     _getDepositInfo() {
         this._paymentConnectorService.getDepositPaymentInfo(this.transactionInfo.uuid).then((info) => {
@@ -42523,6 +42532,15 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             this.chosenAmountToPay = 0;
         }
     }
+    _getCashOnDeliveryData() {
+        this.transactionService.getCashOnDeliveryData(this.transactionInfo.uuid)
+            .then((response) => {
+            if (response) {
+                this.cashOnDelivery = response.proposedCashOnDeliveryAmount;
+                this.changeDetector.detectChanges();
+            }
+        });
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionHeaderPopupPaymentComponent, deps: [{ token: TransactionHeaderService }, { token: TransactionEventService }, { token: TransactionService }, { token: IconCacheService }, { token: TransactionScreenConfigurationService }, { token: DictionaryService }, { token: TransactionImageService }, { token: i0.ChangeDetectorRef }, { token: TransactionDialogService }, { token: i1$1.FormMasterService }, { token: TransactionRelationService }, { token: TransactionPaymentConnectorService }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: TransactionHeaderPopupPaymentComponent, isStandalone: false, selector: "co-transaction-header-popup-payment", host: { properties: { "class.co-transaction-header-popup-payment": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
       <div class="transaction-header-popup-category-wrapper co-small-scrollbar">
@@ -42534,7 +42552,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 [textContent]="'TO_PAY_DOWN' | localize">
               </div>
             }
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-deposit-percentage
                 [screenConfigurationObject]="cfgNames.DepositPercentage"
@@ -42549,7 +42567,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 (depositUpdated)="showOutstandingAmounts()">
               </co-transaction-header-deposit-amount>
             </div>
-      
+
             <div class="transaction-header-popup-three-column-grid">
               @if (transactionInfo.transactionKind !== transKind.PurchaseOrder) {
                 <co-transaction-header-use-deposit-rule
@@ -42576,7 +42594,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 </div>
               }
             </div>
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-amount-to-settle
                 [screenConfigurationObject]="cfgNames.AmountToSettle"
@@ -42595,7 +42613,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 </co-input-text>
               </div>
             </div>
-      
+
             @if (showCashOnDelivery) {
               <div class="transaction-header-popup-two-column-grid">
                 <div class="cash-on-delivery-row">
@@ -42615,7 +42633,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
                 <div></div>
               </div>
             }
-      
+
             <div
               class="transaction-header-popup-two-column-grid"
               [screenConfigurationObject]="cfgNames.PaymentBtn"
@@ -42628,7 +42646,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
               }
             </div>
           </div>
-      
+
           @if (paymentAnalysis) {
             <div class="transaction-header-popup-section">
               <div class="transaction-header-popup-section-label" [textContent]="'TO_INVOICE' | localize"></div>
@@ -42650,7 +42668,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
               </div>
             </div>
           }
-      
+
           @if (orderPaymentAnalysis.length > 0) {
             <div class="payment-information">
               @if (showPaymentButton()) {
@@ -42781,7 +42799,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
             </div>
           }
         </co-form>
-      
+
         @if (cashOnDeliveryModalVisible) {
           <co-cash-on-delivery-modal
             [transactionInfoUuid]="transactionInfo.uuid"
@@ -42790,7 +42808,7 @@ class TransactionHeaderPopupPaymentComponent extends TransactionHeaderPopupBaseC
           </co-cash-on-delivery-modal>
         }
       </div>
-      
+
       @if (showPaymentDialog) {
         <co-dialog
           class="payment-dialog"
@@ -42832,7 +42850,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 [textContent]="'TO_PAY_DOWN' | localize">
               </div>
             }
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-deposit-percentage
                 [screenConfigurationObject]="cfgNames.DepositPercentage"
@@ -42847,7 +42865,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 (depositUpdated)="showOutstandingAmounts()">
               </co-transaction-header-deposit-amount>
             </div>
-      
+
             <div class="transaction-header-popup-three-column-grid">
               @if (transactionInfo.transactionKind !== transKind.PurchaseOrder) {
                 <co-transaction-header-use-deposit-rule
@@ -42874,7 +42892,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 </div>
               }
             </div>
-      
+
             <div class="transaction-header-popup-two-column-grid">
               <co-transaction-header-amount-to-settle
                 [screenConfigurationObject]="cfgNames.AmountToSettle"
@@ -42893,7 +42911,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 </co-input-text>
               </div>
             </div>
-      
+
             @if (showCashOnDelivery) {
               <div class="transaction-header-popup-two-column-grid">
                 <div class="cash-on-delivery-row">
@@ -42913,7 +42931,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 <div></div>
               </div>
             }
-      
+
             <div
               class="transaction-header-popup-two-column-grid"
               [screenConfigurationObject]="cfgNames.PaymentBtn"
@@ -42926,7 +42944,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               }
             </div>
           </div>
-      
+
           @if (paymentAnalysis) {
             <div class="transaction-header-popup-section">
               <div class="transaction-header-popup-section-label" [textContent]="'TO_INVOICE' | localize"></div>
@@ -42948,7 +42966,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               </div>
             </div>
           }
-      
+
           @if (orderPaymentAnalysis.length > 0) {
             <div class="payment-information">
               @if (showPaymentButton()) {
@@ -43079,7 +43097,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             </div>
           }
         </co-form>
-      
+
         @if (cashOnDeliveryModalVisible) {
           <co-cash-on-delivery-modal
             [transactionInfoUuid]="transactionInfo.uuid"
@@ -43088,7 +43106,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           </co-cash-on-delivery-modal>
         }
       </div>
-      
+
       @if (showPaymentDialog) {
         <co-dialog
           class="payment-dialog"
@@ -67028,6 +67046,8 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
     workflowStatusFields = { text: "name", value: "name" };
     projectCodes;
     projectCodeFields = { text: "description", value: "description" };
+    withOrWithoutLines;
+    withOrWithoutLinesFields = { text: "description", value: "code" };
     transStartDate;
     transEndDate;
     deliveryStartDate;
@@ -67045,6 +67065,7 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
         this._setOrderDepositFullyPaid();
         this._setWorkFlowStatusNames();
         this._setAllProjectCodes();
+        this._setWithOrWithoutLines();
     }
     //Inkoper
     _setPurchasePersons() {
@@ -67115,6 +67136,11 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
             this.suppliers = new FilterViewmodel(relationListObjects, this.supplierFields).filterItems;
         });
     }
+    _setWithOrWithoutLines() {
+        this.transactionService.getYesNo("NL").then((withOrWithoutLines) => {
+            this.withOrWithoutLines = new FilterViewmodel(withOrWithoutLines, this.withOrWithoutLinesFields).filterItems;
+        });
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionPurchaseOrderFilterContentOrderComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.16", type: TransactionPurchaseOrderFilterContentOrderComponent, isStandalone: false, selector: "co-transaction-purchase-order-filter-content-order", host: { properties: { "class.co-transaction-search-filter-content": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
     <div class="transaction-filter-content-order-wrapper transaction-filter-content-wrapper">
@@ -67127,6 +67153,15 @@ class TransactionPurchaseOrderFilterContentOrderComponent extends TransactionFil
         </co-transaction-filter-item>
       </div>
 
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'HAS_LINES'"
+                                    [(model)]="searchService.searchRequest.ordersWithOrWithoutLines"
+                                    [mode]="modes.Filterlist"
+                                    [collection]="withOrWithoutLines"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Orderdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'ORDER_DATE'"
@@ -67301,6 +67336,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         </co-transaction-filter-item>
       </div>
 
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'HAS_LINES'"
+                                    [(model)]="searchService.searchRequest.ordersWithOrWithoutLines"
+                                    [mode]="modes.Filterlist"
+                                    [collection]="withOrWithoutLines"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Orderdatum-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'ORDER_DATE'"
@@ -103154,6 +103198,13 @@ class TransactionLinesSidePanelServiceOrderComponent extends TransactionHeaderBa
     handleTransactionNavigation() {
         this.transactionEventService.transactionNavigation.next({ transactionNo: this.transactionServiceInfo.sourceTransactionNr, transactionKind: this.transactionServiceInfo.sourceTransactionKind });
     }
+    async handleRelationNavigation() {
+        const selectedSupplier = await this.transactionService.getSupplierLightById(this.transactionServiceInfo.sourceSupplierId);
+        this.transactionEventService.relationNavigation.next({
+            relationNr: selectedSupplier.supplierNr,
+            relationKind: RelationKind.Supplier
+        });
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionLinesSidePanelServiceOrderComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: TransactionLinesSidePanelServiceOrderComponent, isStandalone: false, selector: "co-transaction-lines-side-panel-service-order", host: { properties: { "class.co-transaction-lines-side-panel-service-order": "this.showClass" } }, usesInheritance: true, ngImport: i0, template: `
     <div class="full-details-wrapper">
@@ -103171,7 +103222,7 @@ class TransactionLinesSidePanelServiceOrderComponent extends TransactionHeaderBa
           </div>
           <div class="art-amount-batch">
             <div class="detail">
-              <label class="label" [textContent]="'AMOUNT'| localize"></label>
+              <label class="label" [textContent]="'SKU'| localize"></label>
               <span class="value" [textContent]="transactionServiceInfo.sourceQuantity"></span>
             </div>
           </div>
@@ -103223,7 +103274,7 @@ class TransactionLinesSidePanelServiceOrderComponent extends TransactionHeaderBa
               @if (transactionServiceInfo.sourceSupplierName) {
                 <div class="detail">
                   <label class="label" [textContent]="'SUPPLIER'| localize"></label>
-                  <span class="value" [textContent]="transactionServiceInfo.sourceSupplierName"></span>
+                  <span class="value underline" (click)="handleRelationNavigation()" [textContent]="transactionServiceInfo.sourceSupplierName"></span>
                 </div>
               }
             </div>
@@ -103258,7 +103309,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           </div>
           <div class="art-amount-batch">
             <div class="detail">
-              <label class="label" [textContent]="'AMOUNT'| localize"></label>
+              <label class="label" [textContent]="'SKU'| localize"></label>
               <span class="value" [textContent]="transactionServiceInfo.sourceQuantity"></span>
             </div>
           </div>
@@ -103310,7 +103361,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
               @if (transactionServiceInfo.sourceSupplierName) {
                 <div class="detail">
                   <label class="label" [textContent]="'SUPPLIER'| localize"></label>
-                  <span class="value" [textContent]="transactionServiceInfo.sourceSupplierName"></span>
+                  <span class="value underline" (click)="handleRelationNavigation()" [textContent]="transactionServiceInfo.sourceSupplierName"></span>
                 </div>
               }
             </div>