@colijnit/transaction 262.1.20 → 262.1.21

package/fesm2022/colijnit-transaction.mjs

@@ -225,7 +225,6 @@ 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';
@@ -275,6 +274,7 @@ 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.20";
-    publishDate = "16-6-2026, 17:44:35";
+    symVer = "262.1.21";
+    publishDate = "17/06/2026, 14:12:01";
 }
 
 class CheckoutModuleService extends BaseModuleService {
@@ -7799,6 +7799,16 @@ class TransactionConnectorAdapterService {
             return "";
         }
     }
+    async roundUp(amount, paymentMethodCode, showLoader) {
+        const response = await this.connector.roundUp(amount, paymentMethodCode, showLoader);
+        if (response && response.validationResult && response.validationResult.success) {
+            return response.resultObject;
+        }
+        else {
+            this._handleExceptionFromResponse(response);
+            return 0;
+        }
+    }
     _openPdfContent(content) {
         if (content) {
             try {
@@ -9475,6 +9485,9 @@ class TransactionConnectorService {
     async createQRCode(width, height, data) {
         return await this._adapterService.createQRCode(width, height, data);
     }
+    async roundUp(amount, paymentMethodCode, showLoader) {
+        return await this._adapterService.roundUp(amount, paymentMethodCode, showLoader);
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionConnectorService, deps: [{ token: TransactionConnectorAdapterService }, { token: TransactionSelectSingleCacheService }, { token: TransactionSelectMultipleCacheService }, { token: TransactionSelectMultipleParameterizedCacheService }, { token: TransactionSelectSingleParameterizedCacheService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionConnectorService, providedIn: "root" });
 }
@@ -13211,6 +13224,9 @@ class TransactionService extends PendingReasonService {
     async createQRCode(width, height, data) {
         return await this.connector.createQRCode(width, height, data);
     }
+    async roundUp(amount, paymentMethodCode, showLoader) {
+        return await this.connector.roundUp(amount, paymentMethodCode, showLoader);
+    }
     async _handleBeforeRememberCurrentTransaction(transactionInfoResponse) {
         this.prepareManualSaveInternalParam();
         this.prepareMLocatInternalParam();
@@ -34670,6 +34686,9 @@ class TransactionPaymentService {
     showPaymentMethodMessage = false;
     set currentPaymentMethod(value) {
         this._currentPaymentMethod = value;
+        if (value.roundUp && this.amountToPay > 0) {
+            this._roundUp();
+        }
         this.statusMessage = '';
     }
     get currentPaymentMethod() {
@@ -34792,7 +34811,6 @@ class TransactionPaymentService {
             }
             else {
                 this.pspTransactionUuid = await this._paymentConnectorService.doPayment(request);
-                await this._triggerCalculateAmountToPay();
             }
             if (this.pspTransactionUuid) {
                 this._paymentStatusPollIntervalCount = 0;
@@ -34800,13 +34818,15 @@ class TransactionPaymentService {
             }
         }
         else {
+            if (this._currentPaymentMethod.roundUp && this.amountToPay > 0) {
+                this._roundUp();
+            }
             this._paymentConnectorService.doPayment(request).then(async () => {
                 await this.preparePaymentInfo();
                 if (this.currentPaymentMethod.voucher) {
                     this._transactionEventService.posOrderVoucherPayment.next();
                 }
                 else {
-                    await this._triggerCalculateAmountToPay();
                 }
                 this._handlePayment(false);
                 if (this.amountToPay === 0) {
@@ -34819,6 +34839,9 @@ class TransactionPaymentService {
     async cancelPayment() {
         await this._transactionService.cancelPspTransaction(this.pspTransactionUuid);
     }
+    async roundUp() {
+        await this._roundUp();
+    }
     async preparePaymentInfo() {
         if (!this.transactionUuid) {
             return;
@@ -34945,14 +34968,14 @@ class TransactionPaymentService {
             }
         });
     }
-    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;
-        });
-    }
+    // 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 _handleCashLimitCheck() {
         let payedAmount = await this._transactionService.getCashPaymentValueByTransId(this.transId);
         const limit = await this._transactionService.getCashLimitValue(InternalParam.ThresholdCashPaymentMessage);
@@ -34965,6 +34988,13 @@ class TransactionPaymentService {
         }
         return true;
     }
+    async _roundUp() {
+        if (this._currentPaymentMethod.roundUp && this.amountToPay > 0) {
+            this._transactionService.roundUp(this.amountToPay, this._currentPaymentMethod.code).then((amount) => {
+                this.amountToPay = amount;
+            });
+        }
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionPaymentService, deps: [{ token: TransactionEventService }, { token: TransactionPaymentConnectorService }, { token: DictionaryService }, { token: TransactionDialogService }, { token: TransactionService }, { token: i2$1.DatePipe }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: TransactionPaymentService });
 }
@@ -35161,6 +35191,9 @@ class TransactionPaymentBaseComponent {
     paymentMethodSelected(method, index) {
         this.paymentMethodIdx = index;
         this.currentPaymentMethod = this.paymentMethods[this.paymentMethodIdx].payment;
+        if (method.roundUp && this.paymentService.amountToPay > 0) {
+            this.paymentService.roundUp();
+        }
     }
     cashRegisterSelected(cashRegister, index) {
         this.cashRegisterIdx = index;
@@ -67935,6 +67968,8 @@ class TransactionSalesOrderFilterContentLogisticsComponent extends TransactionFi
     }
     deliveryMethods = [];
     deliveryMethodFields = { text: "description", value: "code" };
+    districts = [];
+    districtFields = { text: "description", value: "districtId" };
     hasPreferredDeliveryDate;
     hasPreferredDeliveryDateFields = { text: "description", value: "code" };
     deliveryDateFinal;
@@ -67953,6 +67988,7 @@ class TransactionSalesOrderFilterContentLogisticsComponent extends TransactionFi
     toBeOrderedFields = { text: "description", value: "code" };
     loadCollections() {
         this._setDeliveryMethods();
+        this._setDistricts();
         this._setDeliveryDateFinal();
         this._sethasPreferredDeliveryDate();
         this._setTobeDelivered();
@@ -67968,6 +68004,12 @@ class TransactionSalesOrderFilterContentLogisticsComponent extends TransactionFi
             this.deliveryMethods = new FilterViewmodel(deliveryMethods, this.deliveryMethodFields).filterItems;
         });
     }
+    //Districts (Rayons)
+    _setDistricts() {
+        this.transactionService.getDistricts().then((districts) => {
+            this.districts = new FilterViewmodel(districts, this.districtFields).filterItems;
+        });
+    }
     //hasPreferredDeliveryDate
     _sethasPreferredDeliveryDate() {
         this.transactionService.getYesNo("NL").then((deliveryDateFinal) => {
@@ -68027,6 +68069,25 @@ class TransactionSalesOrderFilterContentLogisticsComponent extends TransactionFi
         </co-transaction-filter-item>
       </div>
 
+      <!--Rayon-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                    [collection]="districts"
+                                    [(model)]="searchService.searchRequest.rangeDistrict"
+                                    [mode]="modes.Filterlist"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
+      <!--Postcode-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                    [(model)]="searchService.searchRequest.postalCodeTr"
+                                    [mode]="modes.TextField"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Voorkeurs Datum-->
         <div class="filter-item-wrapper">
             <co-transaction-filter-item [placeholder]="'PREFERRED_DELIVERY_DATE'"
@@ -68210,6 +68271,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         </co-transaction-filter-item>
       </div>
 
+      <!--Rayon-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                    [collection]="districts"
+                                    [(model)]="searchService.searchRequest.rangeDistrict"
+                                    [mode]="modes.Filterlist"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
+      <!--Postcode-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                    [(model)]="searchService.searchRequest.postalCodeTr"
+                                    [mode]="modes.TextField"
+                                    (activeFilterCountChange)="onActiveFilterCountChanged($event)">
+        </co-transaction-filter-item>
+      </div>
+
       <!--Voorkeurs Datum-->
         <div class="filter-item-wrapper">
             <co-transaction-filter-item [placeholder]="'PREFERRED_DELIVERY_DATE'"
@@ -74234,10 +74314,13 @@ class TransactionSalesQuotationFilterContentLogisticsComponent extends Transacti
     }
     deliveryMethods = [];
     deliveryMethodFields = { text: "description", value: "code" };
+    districts = [];
+    districtFields = { text: "description", value: "districtId" };
     warehouses;
     warehouseFields = { text: "description", value: "warehouseNo" };
     loadCollections() {
         this._setDeliveryMethods();
+        this._setDistricts();
         this._setWarehouses();
     }
     //Delivery Methods
@@ -74246,6 +74329,12 @@ class TransactionSalesQuotationFilterContentLogisticsComponent extends Transacti
             this.deliveryMethods = new FilterViewmodel(deliveryMethods, this.deliveryMethodFields).filterItems;
         });
     }
+    //Districts (Rayons)
+    _setDistricts() {
+        this.transactionService.getDistricts().then((districts) => {
+            this.districts = new FilterViewmodel(districts, this.districtFields).filterItems;
+        });
+    }
     //Warehouses
     _setWarehouses() {
         this.transactionService.getWarehouses().then((warehouses) => {
@@ -74266,6 +74355,24 @@ class TransactionSalesQuotationFilterContentLogisticsComponent extends Transacti
           </co-transaction-filter-item>
         </div>
 
+        <!--Rayon-->
+        <div class="filter-item-wrapper">
+          <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                      [collection]="districts"
+                                      [(model)]="searchRequest.rangeDistrict"
+                                      [mode]="modes.Filterlist"
+          >
+          </co-transaction-filter-item>
+        </div>
+
+        <!--Postcode-->
+        <div class="filter-item-wrapper">
+          <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                      [(model)]="searchRequest.postalCodeTr"
+                                      [mode]="modes.TextField">
+          </co-transaction-filter-item>
+        </div>
+
         <!--Leverdatum definitief-->
         <div class="filter-item-wrapper">
           <co-transaction-filter-item [placeholder]="'DELIVERY_DATE_FINAL'"
@@ -74320,6 +74427,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           </co-transaction-filter-item>
         </div>
 
+        <!--Rayon-->
+        <div class="filter-item-wrapper">
+          <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                      [collection]="districts"
+                                      [(model)]="searchRequest.rangeDistrict"
+                                      [mode]="modes.Filterlist"
+          >
+          </co-transaction-filter-item>
+        </div>
+
+        <!--Postcode-->
+        <div class="filter-item-wrapper">
+          <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                      [(model)]="searchRequest.postalCodeTr"
+                                      [mode]="modes.TextField">
+          </co-transaction-filter-item>
+        </div>
+
         <!--Leverdatum definitief-->
         <div class="filter-item-wrapper">
           <co-transaction-filter-item [placeholder]="'DELIVERY_DATE_FINAL'"
@@ -76420,6 +76545,8 @@ class TransactionServiceOrderFilterContentLogisticsComponent extends Transaction
     }
     deliveryMethods = [];
     deliveryMethodFields = { text: "description", value: "code" };
+    districts = [];
+    districtFields = { text: "description", value: "districtId" };
     deliveryDateFinal;
     deliveryDateFinalFields = { text: "description", value: "code" };
     toBeDelivered;
@@ -76436,6 +76563,7 @@ class TransactionServiceOrderFilterContentLogisticsComponent extends Transaction
     toBeOrderedFields = { text: "description", value: "code" };
     loadCollections() {
         this._setDeliveryMethods();
+        this._setDistricts();
         this._setDeliveryDateFinal();
         this._setTobeDelivered();
         this._setWarehouses();
@@ -76450,6 +76578,12 @@ class TransactionServiceOrderFilterContentLogisticsComponent extends Transaction
             this.deliveryMethods = new FilterViewmodel(deliveryMethods, this.deliveryMethodFields).filterItems;
         });
     }
+    //Districts (Rayons)
+    _setDistricts() {
+        this.transactionService.getDistricts().then((districts) => {
+            this.districts = new FilterViewmodel(districts, this.districtFields).filterItems;
+        });
+    }
     //Delivery date final
     _setDeliveryDateFinal() {
         this.transactionService.getYesNo("NL").then((deliveryDateFinal) => {
@@ -76503,6 +76637,25 @@ class TransactionServiceOrderFilterContentLogisticsComponent extends Transaction
         </co-transaction-filter-item>
       </div>
 
+      <!--Rayon-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                    [collection]="districts"
+                                    [(model)]="searchService.searchRequest.rangeDistrict"
+                                    [mode]="modes.Filterlist"
+        >
+        </co-transaction-filter-item>
+      </div>
+
+      <!--Postcode-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                    [(model)]="searchService.searchRequest.postalCodeTr"
+                                    [mode]="modes.TextField"
+        >
+        </co-transaction-filter-item>
+      </div>
+
       <!--Leverdatum definitief-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_DATE_FINAL'"
@@ -76652,6 +76805,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         </co-transaction-filter-item>
       </div>
 
+      <!--Rayon-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'DISTRICT'"
+                                    [collection]="districts"
+                                    [(model)]="searchService.searchRequest.rangeDistrict"
+                                    [mode]="modes.Filterlist"
+        >
+        </co-transaction-filter-item>
+      </div>
+
+      <!--Postcode-->
+      <div class="filter-item-wrapper">
+        <co-transaction-filter-item [placeholder]="'POSTAL_CODE'"
+                                    [(model)]="searchService.searchRequest.postalCodeTr"
+                                    [mode]="modes.TextField"
+        >
+        </co-transaction-filter-item>
+      </div>
+
       <!--Leverdatum definitief-->
       <div class="filter-item-wrapper">
         <co-transaction-filter-item [placeholder]="'DELIVERY_DATE_FINAL'"