tango-app-api-payment-subscription 3.5.24 → 3.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.24",
+    "version": "3.5.26",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",

package/src/controllers/brandsBilling.controller.js

@@ -430,11 +430,17 @@ export async function brandInvoiceList( req, res ) {
 
     // Invoice type sub-toggle: 'advance' shows only advance invoices (invoice #
     // starts with 'TINV-'); 'all' shows only regular invoices (NOT TINV-*).
-    // Applied to the whole pipeline so list, count, summary and cards match.
+    // Applied for BOTH tango and client views. Uses $expr + $regexMatch (not the
+    // fragile { $not: <regex> } query operator, which was matching nothing and
+    // hiding every row) and treats a missing invoice # as a regular invoice.
     if ( req.body.invoiceType === 'advance' ) {
-      query.push( { $match: { invoice: { $regex: '^TINV-' } } } );
+      query.push( { $match: { $expr: {
+        $regexMatch: { input: { $ifNull: [ '$invoice', '' ] }, regex: '^TINV-' },
+      } } } );
     } else if ( req.body.invoiceType === 'all' ) {
-      query.push( { $match: { invoice: { $not: { $regex: '^TINV-' } } } } );
+      query.push( { $match: { $expr: {
+        $not: { $regexMatch: { input: { $ifNull: [ '$invoice', '' ] }, regex: '^TINV-' } },
+      } } } );
     }
 
     // Client users only ever see APPROVED invoices — the approval pipeline
@@ -460,7 +466,20 @@ export async function brandInvoiceList( req, res ) {
         dateFrom = now.subtract( 12, 'month' ).startOf( 'month' ).toDate();
       }
       if ( dateFrom ) {
-        query.push( { $match: { billingDate: { $gte: dateFrom } } } );
+        // billingDate is stored as a STRING on many invoices (e.g.
+        // "2024-06-10T00:00:00.000Z"), so a plain { $gte: <Date> } compares
+        // string-vs-Date and matches nothing (this is why the client list came
+        // back empty on the default 'prev' filter). Coerce to a date first.
+        query.push( { $match: { $expr: {
+          $gte: [
+            { $cond: [
+              { $eq: [ { $type: '$billingDate' }, 'date' ] },
+              '$billingDate',
+              { $toDate: '$billingDate' },
+            ] },
+            dateFrom,
+          ],
+        } } } );
       }
     }
 
@@ -784,9 +803,22 @@ export async function latestDailyPricing( req, res ) {
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
       const sortKey = req.body.sortColumName;
       const sortDir = req.body.sortBy;
+      // Working days ('daysDifference' — the WORKING DAYS column) is not a
+      // top-level store field; it's per-product (products[].workingdays). So for
+      // that column sort by the store's MAX product working-days. Other columns
+      // (storeName, *CameraCount, zoneCount) sort by their top-level field.
+      const sortVal = ( s ) => {
+        if ( sortKey === 'daysDifference' ) {
+          return ( s.products || [] ).reduce(
+              ( mx, p ) => Math.max( mx, Number( p.workingdays ) || 0 ), 0 );
+        }
+        return s[sortKey];
+      };
       stores.sort( ( a, b ) => {
-        if ( a[sortKey] < b[sortKey] ) return -1 * sortDir;
-        if ( a[sortKey] > b[sortKey] ) return 1 * sortDir;
+        const av = sortVal( a );
+        const bv = sortVal( b );
+        if ( av < bv ) return -1 * sortDir;
+        if ( av > bv ) return 1 * sortDir;
         return 0;
       } );
     }
@@ -796,10 +828,16 @@ export async function latestDailyPricing( req, res ) {
     // BOTH the export and the on-screen table use the same numbers.
     const priceByProduct = {};
     let bpCurrency = 'inr';
+    // Step-pricing support: for STEP clients the per-store price depends on the
+    // store's 1-based POSITION within the product (tier ranges), so we can't use
+    // a single price per product. We pull the tiers here and resolve per-store
+    // prices by position below (mirrors invoice.controller's stepPrice).
+    let isStepClient = false;
+    const stepTiersByProduct = {};
     try {
       const bp = await basePriceService.findOne(
           { clientId: req.body.clientId },
-          { standard: 1, currency: 1 },
+          { standard: 1, step: 1, currency: 1 },
       );
       bpCurrency = bp?.currency || 'inr';
       for ( const p of ( bp?.standard || [] ) ) {
@@ -808,9 +846,48 @@ export async function latestDailyPricing( req, res ) {
           priceByProduct[p.productName] = price;
         }
       }
+      // Client priceType drives whether we use step tiers.
+      const priceClient = await clientService.findOne(
+          { clientId: req.body.clientId }, { priceType: 1 } );
+      isStepClient = priceClient?.priceType === 'step';
+      if ( isStepClient ) {
+        for ( const p of ( bp?.step || [] ) ) {
+          if ( !p.productName ) {
+            continue;
+          }
+          if ( !stepTiersByProduct[p.productName] ) {
+            stepTiersByProduct[p.productName] = [];
+          }
+          stepTiersByProduct[p.productName].push( p );
+        }
+        // Tiers ordered by range start so the position lookup is correct.
+        for ( const name of Object.keys( stepTiersByProduct ) ) {
+          stepTiersByProduct[name].sort( ( a, b ) => {
+            const aStart = parseInt( String( a.storeRange || '0' ).split( '-' )[0], 10 ) || 0;
+            const bStart = parseInt( String( b.storeRange || '0' ).split( '-' )[0], 10 ) || 0;
+            return aStart - bStart;
+          } );
+        }
+      }
     } catch ( bpErr ) {
       logger.error( { error: bpErr, function: 'latestDailyPricing.basePrice', clientId: req.body.clientId } );
     }
+    // Per-store step price by 1-based position within the product. Falls back to
+    // the last tier's price beyond the defined ranges (mirrors invoice stepPrice).
+    const stepPriceForPosition = ( productName, positionInProduct ) => {
+      const tiers = stepTiersByProduct[productName] || [];
+      if ( !tiers.length ) {
+        return 0;
+      }
+      for ( const tier of tiers ) {
+        const [ min, max ] = String( tier.storeRange || '' ).split( '-' ).map( Number );
+        if ( positionInProduct >= min && positionInProduct <= max ) {
+          return Number( tier.negotiatePrice ) || Number( tier.basePrice ) || 0;
+        }
+      }
+      const last = tiers[tiers.length - 1];
+      return Number( last.negotiatePrice ) || Number( last.basePrice ) || 0;
+    };
     // Billing type per product (perStore / perZone / perCamera) from the client
     // plan — drives whether the amount multiplies by camera/zone count. The
     // same client doc supplies the invoice-amount currency below.
@@ -859,8 +936,31 @@ export async function latestDailyPricing( req, res ) {
       }
       return 1;
     };
+    // Step clients: resolve each store's per-product price by its 1-based
+    // POSITION within the product, over the CURRENT SORTED order (so re-sorting
+    // re-tiers the amounts). Built here — after the sort, over the FULL list —
+    // so a store on page 2 still gets the position determined by all preceding
+    // stores. Keyed `storeId||productName`. Standard clients use priceByProduct.
+    const stepPriceByStoreProduct = {};
+    if ( isStepClient ) {
+      const positionByProduct = {};
+      for ( const s of stores ) {
+        for ( const p of ( s.products || [] ) ) {
+          const name = p.productName;
+          positionByProduct[name] = ( positionByProduct[name] || 0 ) + 1;
+          stepPriceByStoreProduct[`${s.storeId}||${name}`] =
+            stepPriceForPosition( name, positionByProduct[name] );
+        }
+      }
+    }
+    const priceForStoreProduct = ( store, product ) => {
+      if ( isStepClient ) {
+        return stepPriceByStoreProduct[`${store.storeId}||${product.productName}`] || 0;
+      }
+      return priceByProduct[product.productName] || 0;
+    };
     const productInvoiceAmount = ( store, product ) => {
-      const price = priceByProduct[product.productName] || 0;
+      const price = priceForStoreProduct( store, product );
       const workingDays = Number( product.workingdays ) || 0;
       if ( price <= 0 || workingDays <= 0 ) {
         return 0;
@@ -935,7 +1035,7 @@ export async function latestDailyPricing( req, res ) {
         invoiceBreakdown.push( {
           productName: product.productName,
           label: prettyProduct( product.productName ),
-          price: priceByProduct[product.productName] || 0,
+          price: priceForStoreProduct( store, product ),
           workingDays: Number( product.workingdays ) || 0,
           amount,
         } );
@@ -1847,6 +1947,23 @@ export async function getInrRate( currency ) {
   return FALLBACK_INR[iso] || 1;
 }
 
+// FX rates for the app's supported currencies, expressed as INR-per-1-unit.
+// The UI converts an amount from currency A to B as: amount * (rates[A] / rates[B]).
+// Reuses the cached live rates (getInrRate); inr is always 1.
+export async function fxRates( req, res ) {
+  try {
+    const codes = [ 'inr', 'dollar', 'singaporedollar', 'euro', 'aed' ];
+    const rates = {};
+    for ( const c of codes ) {
+      rates[c] = await getInrRate( c );
+    }
+    return res.sendSuccess( { rates } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'fxRates' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function billingSummary( req, res ) {
   try {
     const now = dayjs();

package/src/controllers/invoice.controller.js

@@ -1280,7 +1280,11 @@ async function resolveBasePricingScope( group, getClient ) {
 
 async function standardPrice( group, getClient, baseDate ) {
   console.log( '🚀 ~ standardPrice ~ baseDate:', baseDate.format( 'MMM YYYY' ) );
-  const currentMonthDays = 30;
+  // Prorate against the actual number of days in the invoice's billing month
+  // (e.g. 31 for July, 28/29 for Feb) so invoice line amounts match the
+  // annexure, which uses billingMonth.daysInMonth() in buildAnnexureRows().
+  // Previously hardcoded to 30, which inflated 31-day-month invoices.
+  const currentMonthDays = baseDate.daysInMonth();
   console.log( '🚀 ~ standardPrice ~ currentMonthDays:', currentMonthDays );
   // Pricing method: 'flat' => bill every store for the full month
   // regardless of working days. 'prorate' => bill for actual working days.

package/src/routes/brandsBilling.routes.js

@@ -1,6 +1,6 @@
 
 import express from 'express';
-import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary, additionalProducts, additionalProductExport } from '../controllers/brandsBilling.controller.js';
+import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary, additionalProducts, additionalProductExport, fxRates } from '../controllers/brandsBilling.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 
 export const brandsBillingRouter = express.Router();
@@ -11,10 +11,11 @@ brandsBillingRouter.post( '/latestDailyPricing', isAllowedSessionHandler, access
 brandsBillingRouter.post( '/brandBillingGroups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), brandBillingGroups );
 brandsBillingRouter.put( '/updateDailyPricingWorkingDays', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingWorkingDays );
 brandsBillingRouter.put( '/updateDailyPricingStoreField', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingStoreField );
-brandsBillingRouter.post( '/getClientBillingInfo', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), getClientBillingInfo );
+brandsBillingRouter.post( '/getClientBillingInfo', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'Global', name: 'Billing', permissions: [] } ] } ), getClientBillingInfo );
 brandsBillingRouter.get( '/bulk-download-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [ 'isEdit' ] } ] } ), bulkDownloadBillingGroups );
 brandsBillingRouter.post( '/bulk-update-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [ 'isEdit' ] } ] } ), bulkUpdateBillingGroups );
 brandsBillingRouter.post( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/additionalProducts', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), additionalProducts );
 brandsBillingRouter.get( '/additionalProductExport', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), additionalProductExport );
+brandsBillingRouter.get( '/fxRates', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'EditBilling', permissions: [] } ] } ), fxRates );