softseti-sale-calculator-library 3.7.0 → 3.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "softseti-sale-calculator-library",
-  "version": "3.7.0",
+  "version": "3.7.2",
   "description": "Sales calculation engine by Softseti",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/SaleCalculator.js

@@ -8,7 +8,7 @@ let currencyConverterRates = {};
 let currencies = {};
 let decimalPlaces = 2;
 let roundingFactor = 100;
-let useRounding = false; 
+let useRounding = false;
 
 /**
  * Sales Calculation Engine (V1)
@@ -48,7 +48,7 @@ function init(params) {
   decimalPlaces = params.decimal_places !== undefined ? params.decimal_places : 2;
   roundingFactor = Math.pow(10, decimalPlaces);
 
-   useRounding = params.use_rounding !== undefined ? params.use_rounding : false;
+  useRounding = params.use_rounding !== undefined ? params.use_rounding : false;
 }
 
 // ==============================================
@@ -127,17 +127,30 @@ function preprocessSale(sale) {
   if (sale.payments) {
     sale.payments = sale.payments.map(payment => {
       const originalCurrency = currencies[payment.currency_id];
+
+      // If payment already has calculated fields, use them
+      if (payment.amount && payment.original_amount) {
+        return {
+          ...payment,
+          original_currency_id: payment.currency_id,
+          original_currency_iso: originalCurrency?.iso,
+          currency_id: sale.currency_id,
+          currency_iso: sale.currency_iso,
+          change_amount: Math.max(0, payment.gived_amount - payment.amount)
+        };
+      }
+
+      // Otherwise calculate from basic payment data
       return {
         ...payment,
         original_currency_id: payment.currency_id,
         original_currency_iso: originalCurrency?.iso,
         currency_id: sale.currency_id,
-        currency_iso: currencies[sale.currency_id]?.iso,
-        original_gived_amount: payment.gived_amount,
-        gived_amount: calcGivedPaymentAmount({
+        currency_iso: sale.currency_iso,
+        original_gived_amount: payment.gived_amount || payment.amount,
+        ...calculatePaymentDetails({
           ...payment,
-          original_gived_amount: payment.gived_amount,
-          currency_iso: currencies[sale.currency_id]?.iso,
+          original_gived_amount: payment.gived_amount || payment.amount,
           original_currency_iso: originalCurrency?.iso
         }, sale)
       };
@@ -148,7 +161,7 @@ function preprocessSale(sale) {
     sale.dwSaleProducts = sale.dwSaleProducts.map(product => {
       const productData = products[product.product_id];
       const productCurrency = currencies[productData?.currency_id];
-      
+
       // Calculate the actual price that will be used (including wholesale)
       const actualPrice = roundCurrency(calcDwSaleProductPrice(product, sale));
 
@@ -204,7 +217,7 @@ function calcDwSaleProductSum(saleProduct, sale) {
   //return roundCurrency((saleProduct.quantity * price) / 2); original logic to calc based on legacy
   // Calc sum for products in relation with price product
   //return roundCurrency(saleProduct.quantity * price);
-    return roundCurrency((saleProduct.quantity * price) / baseQuantity);
+  return roundCurrency((saleProduct.quantity * price) / baseQuantity);
 }
 
 function calcDwSaleProductPrice(saleProduct, sale) {
@@ -262,14 +275,14 @@ function getApplicableProductTaxes(saleProduct, productSum, sale) {
   const specificTaxes = getProductSpecificTaxes(saleProduct, sale);
   // GET General Taxes
   const generalTaxes = getGeneralTaxes(sale);
-  
+
   const totalTax = [...specificTaxes, ...generalTaxes].reduce(
     (total, tax) => {
       const taxAmount = productSum * (tax.rate / 100);
-      return total + roundCurrency(taxAmount); 
+      return total + roundCurrency(taxAmount);
     }, 0
   );
-  
+
   return roundCurrency(totalTax);
 }
 
@@ -345,7 +358,7 @@ function exchange(amount, fromCurrency, toCurrency) {
   const exchangeRateModel = findExchangeRate(fromCurrency, toCurrency);
 
   if (exchangeRateModel) {
-    return roundCurrency(applyExchangeStrategy(amount, exchangeRateModel)); 
+    return roundCurrency(applyExchangeStrategy(amount, exchangeRateModel));
   }
 
   // GET CURRENCY CONVERTER RATE WHEN NOT EXIST THE EXANGE RATE
@@ -356,7 +369,7 @@ function exchange(amount, fromCurrency, toCurrency) {
   }
 
   // Exchange With CURRENCY CONVERTER RATE
-  return roundCurrency(amount * currencyConverterRateModel.rate); 
+  return roundCurrency(amount * currencyConverterRateModel.rate);
 }
 
 // Get exchange rate
@@ -440,6 +453,7 @@ function calcPaymentAmount(payment, sale) {
   const total = calcTotal(sale);
   const payments = sale.payments || [];
 
+  // Find current payment index
   const index = payments.findIndex(p =>
     p.original_gived_amount === payment.original_gived_amount &&
     p.currency_id === payment.currency_id &&
@@ -450,6 +464,7 @@ function calcPaymentAmount(payment, sale) {
 
   let accumulated = 0;
 
+  // Calculate how much previous payments have covered
   for (let i = 0; i < index; i++) {
     const prevPayment = payments[i];
     const amount = exchange(
@@ -458,9 +473,10 @@ function calcPaymentAmount(payment, sale) {
       sale.currency_iso
     );
     const remaining = total - accumulated;
-    accumulated += roundCurrency(Math.min(amount, remaining));
+    accumulated += Math.min(amount, remaining);
   }
 
+  // Calculate current payment amount that can be applied
   const currentAmount = exchange(
     payment.original_gived_amount,
     payment.original_currency_iso,
@@ -468,21 +484,25 @@ function calcPaymentAmount(payment, sale) {
   );
 
   const remaining = total - accumulated;
-  return roundCurrency(Math.min(currentAmount, Math.max(remaining, 0)));
+  const appliedAmount = Math.min(currentAmount, Math.max(remaining, 0));
+
+  return roundCurrency(appliedAmount);
 }
 
 /**
- * : calcOriginalPaymentAmount()
+ * Calculates the original amount applied to sale (in payment's original currency)
  * @param {Object} payment
  * @param {Object} sale
  * @returns {number} Amount in payment's original currency
  */
 function calcOriginalPaymentAmount(payment, sale) {
   const effectiveAmount = calcPaymentAmount(payment, sale);
+
+  // Convert FROM sale currency TO payment's original currency
   return exchange(
     effectiveAmount,
-    payment.original_currency_iso,
-    sale.currency_iso
+    sale.currency_iso,           // From sale currency
+    payment.original_currency_iso // To payment's original currency
   );
 }
 
@@ -520,20 +540,35 @@ function calcGivedPaymentAmount(payment, sale) {
  *   - original_currency_iso: Payment currency ISO code
  *   - exchange_rate: Calculated exchange rate between currencies
  */
-function calculatePaymentDetails(payment, enhancedSale) {
-  // Calculate amounts
-  const gived_amount = calcGivedPaymentAmount(payment, enhancedSale);
-  const amount = calcPaymentAmount(payment, enhancedSale);
+function calculatePaymentDetails(payment, sale) {
+  // Calculate the actual amount that can be applied to the sale (in sale currency)
+  const amount = calcPaymentAmount(payment, sale);
+
+  // Calculate the given amount in sale currency (full conversion without debt cap)
+  const gived_amount = exchange(
+    payment.original_gived_amount,
+    payment.original_currency_iso,
+    sale.currency_iso
+  );
+
+  // Calculate the original amount applied (in payment's original currency)
+  const original_amount = exchange(
+    amount, // This is in sale currency
+    sale.currency_iso,
+    payment.original_currency_iso
+  );
+
+  // Calculate exchange rate (sale currency per 1 unit of payment currency)
   const exchange_rate = gived_amount / payment.original_gived_amount;
-  const original_amount = calcOriginalPaymentAmount(payment, enhancedSale);
 
   return {
     ...payment,
-    amount,
-    gived_amount,
-    original_amount,
-    original_gived_amount: payment.original_gived_amount,
+    amount,                    // Applied amount in sale currency
+    gived_amount,              // Full given amount in sale currency  
+    original_amount,           // Applied amount in payment's original currency
+    original_gived_amount: payment.original_gived_amount, // Original given amount unchanged
     exchange_rate,
+    change_amount: Math.max(0, gived_amount - amount) // Change in sale currency
   };
 }
 
@@ -587,7 +622,7 @@ function appliedWholesaleLevels(sale) {
 
 function getSeparatedTaxes(sale) {
   const result = getApplicableDwTaxes(sale);
-  
+
   return {
     sale_taxes: result.taxes.map(tax => ({
       tax_id: tax.id,
@@ -616,7 +651,7 @@ function getApplicableDwTaxes(sale) {
   validateSaleStructure(sale);
 
   const taxMap = {};
-  const taxBatches = []; 
+  const taxBatches = [];
 
   sale.dwSaleProducts.forEach((product, productIndex) => {
     const productSum = calcDwSaleProductSum(product, sale);
@@ -631,7 +666,7 @@ function getApplicableDwTaxes(sale) {
     allTaxes.forEach(tax => {
       const taxAmount = roundCurrency(netAmount * (tax.rate / 100));
       const taxKey = getTaxProductIndex(tax, tax.product_id);
-      
+
       const taxBatch = {
         product_id: product.product_id,
         product_index: productIndex,
@@ -660,9 +695,9 @@ function getApplicableDwTaxes(sale) {
   });
 
   return Object.values(taxMap).map(tax => ({
-      ...tax,
-      amount: roundCurrency(tax.amount)
-    })).filter(tax => tax.amount > 0);
+    ...tax,
+    amount: roundCurrency(tax.amount)
+  })).filter(tax => tax.amount > 0);
 
   /*
   return {
@@ -754,23 +789,23 @@ function calcTaxesByAbbreviation(sale, abbreviation) {
  */
 function getConsolidatedTaxes(sale) {
   validateSaleStructure(sale);
-  
+
   const taxMap = {};
-  
+
   sale.dwSaleProducts.forEach((product, productIndex) => {
     const productSum = calcDwSaleProductSum(product, sale);
     const discount = calcDwSaleProductDiscount(product, sale);
     const netAmount = roundCurrency(productSum - discount);
-    
+
     // Get applicable taxes for this product
     const specificTaxes = getProductSpecificTaxes(product, sale);
     const generalTaxes = getGeneralTaxes(sale);
     const allTaxes = [...specificTaxes, ...generalTaxes];
-    
+
     allTaxes.forEach(tax => {
       const taxAmount = roundCurrency(netAmount * (tax.rate / 100));
       const taxKey = `${tax.id}-${tax.abbreviation}-${tax.rate}`;
-      
+
       if (taxMap[taxKey]) {
         // Merge with existing tax
         taxMap[taxKey].amount += taxAmount;
@@ -789,7 +824,7 @@ function getConsolidatedTaxes(sale) {
       }
     });
   });
-  
+
   // Return unified taxes sorted by amount (descending)
   return Object.values(taxMap)
     .map(tax => ({
@@ -835,15 +870,15 @@ function roundCurrency(value, overrideRounding) {
     console.warn('roundCurrency: Invalid input', value);
     return 0;
   }
-  
+
   // Handle zero and very small values
   if (Math.abs(value) < Number.EPSILON) {
     return 0;
   }
-  
+
   const shouldRound = overrideRounding !== undefined ? overrideRounding : useRounding;
   let result;
-  
+
   if (shouldRound) {
     // Rounding behavior
     result = Math.round(value * roundingFactor) / roundingFactor;
@@ -851,7 +886,7 @@ function roundCurrency(value, overrideRounding) {
     // Truncation behavior (default)
     result = Math.trunc(value * roundingFactor) / roundingFactor;
   }
-  
+
   // Additional precision handling
   return parseFloat(result.toFixed(decimalPlaces));
 }
@@ -871,6 +906,7 @@ module.exports = {
   appliedWholesaleLevels,
   getApplicableDwTaxes,
   getConsolidatedTaxes,
+  calcDwSaleProductPrice,
   _internals: {
     calcDwSaleProductSum,
     calcDwSaleProductDiscount,

package/src/index.d.ts

@@ -79,6 +79,8 @@ declare module 'softseti-sale-calculator-library' {
    */
   export function calculatePaymentDetails(payment: any, sale: Sale): PaymentCalculation;
 
+
+  export function calcDwSaleProductPrice(saleProduct: any, sale: any): number;
   /**
    * Gets applied wholesale levels
    * @param {Sale} sale - Sale object