tango-app-api-payment-subscription 3.5.16 → 3.5.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.16",
+    "version": "3.5.17",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -29,7 +29,7 @@
         "nodemon": "^3.1.0",
         "puppeteer": "^24.41.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.6.34",
+        "tango-api-schema": "^2.6.35",
         "tango-app-api-middleware": "^3.6.18",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0",

package/src/controllers/brandsBilling.controller.js

@@ -2270,3 +2270,330 @@ export async function additionalProducts( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+// POST a JSON payload to a Lambda Function URL and return the parsed JSON
+// (or false on failure). Node's fetch forbids a body on GET, so POST is used.
+async function lamdaServiceCall( url, data ) {
+  try {
+    const response = await fetch( url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify( data ),
+      signal: AbortSignal.timeout( 300000 ),
+    } );
+    if ( !response.ok ) {
+      throw new Error( `Response status: ${response.status}` );
+    }
+    return await response.json();
+  } catch ( error ) {
+    logger.error( { error: error, message: data, function: 'lamdaServiceCall' } );
+    return false;
+  }
+}
+
+// Unit price for a product from the latest billing_details OpenSearch record.
+// productName match is case-insensitive. Returns 0 if not found / unavailable.
+async function billingDetailsPrice( clientId, productName ) {
+  try {
+    const osRes = await getOpenSearchData( BILLING_DETAILS_INDEX, {
+      size: 1,
+      query: { term: { 'client_id': clientId } },
+      sort: [ { date_string: { order: 'desc' } } ],
+    } );
+    const hits = osRes?.body?.hits?.hits || osRes?.hits?.hits || [];
+    const match = ( hits[0]?._source?.products || [] )
+        .find( ( p ) => String( p.productName ).toLowerCase() === String( productName ).toLowerCase() );
+    return Number( match?.price ) || 0;
+  } catch ( osErr ) {
+    logger.error( { error: osErr, function: 'billingDetailsPrice', clientId, productName } );
+    return 0;
+  }
+}
+
+// Build the Lambda-backed export rows (VMS / Run AI / etc.). Calls the product's
+// Lambda for store_names (storeIds), maps them to the stores collection for
+// name + country (Zone), with current-month days and the billing_details price.
+async function lambdaStoreExport( clientId, lambdaUrl, billingProductName ) {
+  const toDate = dayjs().format( 'DD-MM-YYYY' );
+  const lambdaResult = await lamdaServiceCall( lambdaUrl, { to_date: toDate, client_id: clientId } );
+  console.log( '🚀 ~ lambdaStoreExport ~ lambdaResult:', lambdaResult );
+  // These Lambdas return the storeIds under either `store_ids` (Run AI) or
+  // `store_names` (VMS) with no status_code. Accept whichever is present; data
+  // availability = a non-empty array.
+  const rawIds = ( lambdaResult && Array.isArray( lambdaResult.store_ids ) ) ? lambdaResult.store_ids :
+    ( ( lambdaResult && Array.isArray( lambdaResult.store_names ) ) ? lambdaResult.store_names : [] );
+  const storeIds = rawIds.map( ( s ) => String( s ) );
+  if ( !storeIds.length ) {
+    return [];
+  }
+  const price = await billingDetailsPrice( clientId, billingProductName );
+  const daysInMonth = dayjs().daysInMonth();
+  const stores = await storeService.find(
+      { clientId: clientId, storeId: { $in: storeIds } },
+      { 'storeId': 1, 'storeName': 1, 'storeProfile.country': 1 },
+  );
+  const byId = new Map( stores.map( ( s ) => [ String( s.storeId ), s ] ) );
+  return storeIds.map( ( id ) => {
+    const s = byId.get( String( id ) );
+    return {
+      'Store Names': s?.storeName || id,
+      'No of Days to be billed': daysInMonth,
+      'Final Amount': price,
+      'Zone': s?.storeProfile?.country || '',
+    };
+  } );
+}
+
+// tangoTraffic working days per store, from the latest daily-pricing doc.
+// Map<storeId, workingdays>; stores with no tangoTraffic record are absent.
+async function tangoTrafficDaysByStore( clientId ) {
+  const rows = await dailyPriceService.aggregate( [
+    { $match: { clientId: clientId } },
+    { $sort: { dateISO: -1 } },
+    { $limit: 1 },
+    { $unwind: '$stores' },
+    { $unwind: '$stores.products' },
+    { $match: { 'stores.products.productName': 'tangoTraffic' } },
+    { $group: { _id: '$stores.storeId', days: { $max: '$stores.products.workingdays' } } },
+  ] );
+  const map = new Map();
+  for ( const r of rows ) {
+    map.set( String( r._id ), r.days || 0 );
+  }
+  return map;
+}
+
+// Per-product detailed Excel export for the Additional Products section.
+// product selected via req.body.product / req.query.product. Eyetest is the
+// first; more products plug into the switch as their queries arrive.
+export async function additionalProductExport( req, res ) {
+  try {
+    const clientId = String( req.body?.clientId ?? req.query?.clientId ?? '' );
+    const product = String( req.body?.product ?? req.query?.product ?? '' ).toLowerCase();
+    // Optional date (YYYY-MM-DD) passed from the UI; defaults to today. Used by
+    // products that report by a specific day (e.g. Remote Optum).
+    const reqDate = String( req.body?.date ?? req.query?.date ?? '' ) || dayjs().format( 'YYYY-MM-DD' );
+    if ( !clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+
+    if ( product === 'eyetest' ) {
+      // Eye-test streams joined to their store, grouped per store to a stream
+      // count; enriched with store name, country (Zone) and the store's
+      // tangoTraffic working days (No of Days to be billed).
+      const streamRows = await cameraService.aggregate( [
+        { $match: { $and: [
+          { clientId: clientId },
+          { isEyeTestStream: true },
+          { qrCode: { $exists: true } },
+        ] } },
+        { $lookup: {
+          from: 'stores',
+          let: { storeId: '$storeId' },
+          pipeline: [ { $match: { $expr: { $and: [ { $eq: [ '$storeId', '$$storeId' ] } ] } } } ],
+          as: 'stores',
+        } },
+        { $unwind: { path: '$stores', preserveNullAndEmptyArrays: true } },
+        { $group: {
+          _id: '$storeId',
+          streamCount: { $sum: 1 },
+          storeName: { $first: '$stores.storeName' },
+          country: { $first: '$stores.storeProfile.country' },
+        } },
+        { $sort: { storeName: 1 } },
+      ] );
+
+      const daysMap = await tangoTrafficDaysByStore( clientId );
+      const price = ADDITIONAL_PRODUCT_PRICES.eyetest;
+      const exportData = streamRows.map( ( r ) => {
+        const streamCount = r.streamCount || 0;
+        const days = daysMap.get( String( r._id ) ) || 0;
+        // Amount = streams x price (no proration).
+        return {
+          'storeId': r._id,
+          'storeName': r.storeName || '',
+          'Stream Count': streamCount,
+          'No of Days to be billed': days,
+          'Amount': streamCount * price,
+          'Zone': r.country || '',
+        };
+      } );
+
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    if ( product === 'planogram' ) {
+      // Unique storeName from the planograms collection, enriched with the
+      // store's country (Zone) and tangoTraffic working days. Amount is the
+      // flat planogram price per store.
+      const planoRows = await planogramService.aggregate( [
+        { $match: { clientId: clientId } },
+        { $group: { _id: '$storeName', storeId: { $first: '$storeId' } } },
+        { $lookup: {
+          from: 'stores',
+          let: { sid: '$storeId' },
+          pipeline: [ { $match: { $expr: { $eq: [ '$storeId', '$$sid' ] } } } ],
+          as: 'store',
+        } },
+        { $unwind: { path: '$store', preserveNullAndEmptyArrays: true } },
+        { $project: { _id: 0, storeName: '$_id', storeId: 1, country: '$store.storeProfile.country' } },
+        { $sort: { storeName: 1 } },
+      ] );
+
+      const price = ADDITIONAL_PRODUCT_PRICES.planogram;
+      // Planogram bills the full current month — every store shows the number of
+      // days in the current calendar month (not per-store working days).
+      const daysInMonth = dayjs().daysInMonth();
+      const exportData = planoRows.map( ( r ) => {
+        // Amount = flat planogram price per store (no proration).
+        return {
+          'storeName': r.storeName || '',
+          'No of Days to be billed': daysInMonth,
+          'Amount': price,
+          'Zone': r.country || '',
+        };
+      } );
+
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    if ( product === 'aimanager' ) {
+      // AI Manager bills the same stores as tangoTraffic running > 1 day. One
+      // row per such store with its tangoTraffic working days (No of Days to be
+      // billed), the flat AI Manager price, and the store's country (Zone).
+      const aiRows = await dailyPriceService.aggregate( [
+        { $match: { clientId: clientId } },
+        { $sort: { dateISO: -1 } },
+        { $limit: 1 },
+        { $unwind: '$stores' },
+        { $unwind: '$stores.products' },
+        { $match: { 'stores.products.productName': 'tangoTraffic', 'stores.products.workingdays': { $gt: 1 } } },
+        { $group: {
+          _id: '$stores.storeId',
+          storeName: { $first: '$stores.storeName' },
+          days: { $max: '$stores.products.workingdays' },
+        } },
+        { $lookup: {
+          from: 'stores',
+          let: { sid: '$_id' },
+          pipeline: [ { $match: { $expr: { $eq: [ '$storeId', '$$sid' ] } } } ],
+          as: 'store',
+        } },
+        { $unwind: { path: '$store', preserveNullAndEmptyArrays: true } },
+        { $project: { _id: 0, storeId: '$_id', storeName: 1, days: 1, country: '$store.storeProfile.country' } },
+        { $sort: { storeName: 1 } },
+      ] );
+
+      const price = ADDITIONAL_PRODUCT_PRICES.aiManager;
+      const exportData = aiRows.map( ( r ) => {
+        // Amount = flat AI Manager price per store (no proration).
+        return {
+          'Store Name': r.storeName || '',
+          'No of Days to be billed': r.days || 0,
+          'Final Amount': price,
+          'Zone': r.country || '',
+        };
+      } );
+
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    if ( product === 'vms' ) {
+      const exportData = await lambdaStoreExport(
+          clientId,
+          'https://ppf3l3mxc2lorh5hkrsj6zwyim0bupxw.lambda-url.ap-south-1.on.aws/',
+          'VMS',
+      );
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    if ( product === 'runai' ) {
+      const exportData = await lambdaStoreExport(
+          clientId,
+          'https://mdm3mf7wuficgv3jjspkws2nu40azlsc.lambda-url.ap-south-1.on.aws/',
+          'Run AI',
+      );
+      console.log( '🚀 ~ additionalProductExport ~ exportData:', exportData );
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    if ( product === 'remoteoptum' ) {
+      // Detailed optom-audit export from the remote_optom_steps_summary index
+      // for the given date (passed from the UI, defaults to today). Each record
+      // is one row; the nested `steps` object is flattened into TRUE/FALSE
+      // columns in a fixed (alphabetical) order.
+      const STEP_COLUMNS = [
+        'Adjust-Phoropter', 'DuoChrome-Test', 'Explanation', 'Final-Prescription',
+        'Handover', 'History-Taking', 'JCC', 'Near-Vision', 'Personal-Intro',
+        'Subjective-Refraction', 'Trial-Frame', 'VA-Check',
+      ];
+      let optomHits = [];
+      try {
+        const osRes = await getOpenSearchData( 'remote_optom_steps_summary', {
+          // A single day is well under the 10k window; pull up to the cap.
+          // NOTE: do NOT sort on StartTime — it's an analyzed text field, and
+          // sorting on it makes OpenSearch return ZERO hits. The day filter is
+          // enough; rows come back in index order.
+          size: 10000,
+          query: { term: { 'Date': reqDate } },
+        } );
+        optomHits = osRes?.body?.hits?.hits || osRes?.hits?.hits || [];
+      } catch ( osErr ) {
+        logger.error( { error: osErr, function: 'additionalProductExport.remoteOptum', clientId } );
+        return res.sendError( 'Failed to fetch Remote Optum data', 502 );
+      }
+
+      const exportData = optomHits.map( ( h ) => {
+        const s = h._source || {};
+        const steps = s.steps || {};
+        const row = {
+          'storeName': s.storeName || '',
+          'engagementId': s.engagementId || '',
+          'queue_id': s.queue_id || '',
+          'optm_name': s.optm_name || '',
+          'optm_id': s.optm_id || '',
+          'optm_Emailid': s.optm_Emailid || '',
+          'Date': s.Date || '',
+          'StartTime': s.StartTime || '',
+          'EndTime': s.EndTime || '',
+          'Duration (min)': s['Duration (min)'] != null ? s['Duration (min)'] : '',
+        };
+        for ( const col of STEP_COLUMNS ) {
+          row[col] = steps[col] === true ? 'TRUE' : 'FALSE';
+        }
+        return row;
+      } );
+
+      if ( !exportData.length ) {
+        return res.sendError( 'No data', 204 );
+      }
+      await download( exportData, res );
+      return;
+    }
+
+    return res.sendError( `Unsupported product: ${product}`, 400 );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'additionalProductExport' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/invoice.controller.js

@@ -292,8 +292,11 @@ export async function createInvoice( req, res ) {
       // multi-month expansion so it's billed ONCE per invoice (not per month).
       // It's a normal line item, so it lands in the taxable subtotal below.
       try {
+        // Use the group's basepricing doc when group-wise pricing applies,
+        // else the brand-level doc.
+        const { query: oneTimeQuery } = await resolveBasePricingScope( group, getClient );
         const oneTimeBp = await basepricingService.findOne(
-            { clientId: group.clientId },
+            oneTimeQuery,
             { oneTimeFeePerStore: 1 },
         );
         const oneTimeFeePerStore = Number( oneTimeBp?.oneTimeFeePerStore ) || 0;
@@ -526,7 +529,7 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
   // converting here would make the annexure unit price disagree with the actual
   // billed amount (e.g. a $45 negotiated price wrongly shown as $0.48).
 
-  const annexClient = await clientService.findOne( { clientId: invoiceInfo.clientId }, { 'planDetails.product': 1, 'priceType': 1 } );
+  const annexClient = await clientService.findOne( { clientId: invoiceInfo.clientId }, { 'planDetails.product': 1, 'priceType': 1, 'billingGroupWisePricing': 1 } );
   const billingTypeMap = {};
   ( annexClient?.planDetails?.product || [] ).forEach( ( p ) => {
     billingTypeMap[p.productName] = p.billingType || 'perStore';
@@ -538,7 +541,18 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
   // appear once per tier (e.g. the same store listed at $45 and again at $40).
   // Instead we pull the tiers here and assign each store a single tier price
   // below, in JS, by its 1-based index within the product.
-  const pricingDoc = await basepricingService.findOne( { clientId: invoiceInfo.clientId }, { standard: 1, step: 1 } );
+  // Group-wise pricing: read the billing group's own doc when enabled and one
+  // exists; otherwise the brand-level doc.
+  let pricingDocQuery = { clientId: invoiceInfo.clientId, groupId: { $exists: false } };
+  if ( annexClient?.billingGroupWisePricing && getgroup?._id ) {
+    const grpDoc = await basepricingService.findOne(
+        { clientId: invoiceInfo.clientId, groupId: String( getgroup._id ) }, { _id: 1 },
+    );
+    if ( grpDoc ) {
+      pricingDocQuery = { clientId: invoiceInfo.clientId, groupId: String( getgroup._id ) };
+    }
+  }
+  const pricingDoc = await basepricingService.findOne( pricingDocQuery, { standard: 1, step: 1 } );
   const isStep = annexClient?.priceType === 'step';
   const tiersByProduct = {};
   ( ( isStep ? pricingDoc?.step : pricingDoc?.standard ) || [] ).forEach( ( p ) => {
@@ -1080,6 +1094,25 @@ function inWords( num ) {
 }
 
 
+// Resolve which basepricing doc applies to a billing group. When the client
+// has billingGroupWisePricing enabled AND a doc exists for this group, returns
+// that group's doc; otherwise falls back to the brand-level doc (groupId unset).
+// Returns { query, groupId } where query is the mongo filter for the chosen doc
+// and groupId is the group id to use in aggregation lookups (or null for brand).
+async function resolveBasePricingScope( group, getClient ) {
+  const brandQuery = { clientId: group.clientId, groupId: { $exists: false } };
+  if ( getClient?.billingGroupWisePricing && group?._id ) {
+    const groupIdStr = String( group._id );
+    const groupDoc = await basepricingService.findOne(
+        { clientId: group.clientId, groupId: groupIdStr }, { _id: 1 },
+    );
+    if ( groupDoc ) {
+      return { query: { clientId: group.clientId, groupId: groupIdStr }, groupId: groupIdStr };
+    }
+  }
+  return { query: brandQuery, groupId: null };
+}
+
 async function standardPrice( group, getClient, baseDate ) {
   console.log( '🚀 ~ standardPrice ~ baseDate:', baseDate.format( 'MMM YYYY' ) );
   const currentMonthDays = dayjs().daysInMonth();
@@ -1088,6 +1121,9 @@ async function standardPrice( group, getClient, baseDate ) {
   // Computed once so the aggregation pipelines can inline a $literal.
   const isFlatPricing = group.proRata === 'flat';
   console.log( '🚀 ~ standardPrice ~ isFlatPricing:', isFlatPricing );
+  // Which basepricing doc applies (group-wise vs brand-level). pricingGroupId is
+  // used in the $lookup pipeline so the join picks the right doc.
+  const { groupId: pricingGroupId } = await resolveBasePricingScope( group, getClient );
   let billingTypeMap = {};
   if ( getClient?.planDetails?.product ) {
     getClient.planDetails.product.forEach( ( p ) => {
@@ -1224,7 +1260,14 @@ async function standardPrice( group, getClient, baseDate ) {
           {
             $match: {
               $expr: {
-                $eq: [ '$clientId', '$$clientId' ],
+                $and: [
+                  { $eq: [ '$clientId', '$$clientId' ] },
+                  // Match the resolved doc: a specific group's doc when group-wise
+                  // pricing applies, else the brand-level doc (no groupId).
+                  pricingGroupId ?
+                    { $eq: [ '$groupId', pricingGroupId ] } :
+                    { $not: [ { $ifNull: [ '$groupId', false ] } ] },
+                ],
               },
             },
           },
@@ -1419,7 +1462,12 @@ async function standardPrice( group, getClient, baseDate ) {
           from: 'basepricings',
           let: { clientId: group.clientId },
           pipeline: [
-            { $match: { $expr: { $eq: [ '$clientId', '$$clientId' ] } } },
+            { $match: { $expr: { $and: [
+              { $eq: [ '$clientId', '$$clientId' ] },
+              pricingGroupId ?
+                { $eq: [ '$groupId', pricingGroupId ] } :
+                { $not: [ { $ifNull: [ '$groupId', false ] } ] },
+            ] } } },
             { $project: { standard: 1 } },
           ],
           as: 'basepricing',
@@ -1527,6 +1575,8 @@ async function stepPrice( group, getClient ) {
   // 'flat' => every store billed for full month.
   // 'prorate' => actual working days. See standardPrice for the same flag.
   const isFlatPricing = group.proRata === 'flat';
+  // Which basepricing doc applies (group-wise vs brand-level).
+  const { query: pricingDocQuery, groupId: pricingGroupId } = await resolveBasePricingScope( group, getClient );
   let billingTypeMap = {};
   if ( getClient?.planDetails?.product ) {
     getClient.planDetails.product.forEach( ( p ) => {
@@ -1628,7 +1678,12 @@ async function stepPrice( group, getClient ) {
           from: 'basepricings',
           let: { clientId: group.clientId },
           pipeline: [
-            { $match: { $expr: { $eq: [ '$clientId', '$$clientId' ] } } },
+            { $match: { $expr: { $and: [
+              { $eq: [ '$clientId', '$$clientId' ] },
+              pricingGroupId ?
+                { $eq: [ '$groupId', pricingGroupId ] } :
+                { $not: [ { $ifNull: [ '$groupId', false ] } ] },
+            ] } } },
             { $project: { step: 1 } },
           ],
           as: 'basepricing',
@@ -1637,7 +1692,7 @@ async function stepPrice( group, getClient ) {
       { $unwind: { path: '$basepricing', preserveNullAndEmptyArrays: true } },
     ] );
 
-    let stepPriceData = await basepricingService.findOne( { clientId: group.clientId } );
+    let stepPriceData = await basepricingService.findOne( pricingDocQuery );
     let pricingRanges = stepPriceData?.step || [];
     let defaultPrice = pricingRanges.length > 0 ? pricingRanges[0].negotiatePrice : 0;
 
@@ -1682,7 +1737,7 @@ async function stepPrice( group, getClient ) {
   // Drop eachStore products — those are handled by the per-store branch above.
   perStoreRows = perStoreRows.filter( ( p ) => !eachStoreProductNames.includes( p.productName ) );
 
-  const stepPriceRecord = await basepricingService.findOne( { clientId: group.clientId } );
+  const stepPriceRecord = await basepricingService.findOne( pricingDocQuery );
   // Tiers ordered by range start so per-store tier assignment walks low-to-high.
   const pricing = ( stepPriceRecord?.step || [] ).slice().sort( ( a, b ) => {
     const aStart = parseInt( String( a.storeRange || '0' ).split( '-' )[0], 10 ) || 0;

package/src/controllers/paymentSubscription.controllers.js

@@ -85,6 +85,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
           billingDetails: 1,
           price: 1,
           priceType: 1,
+          billingGroupWisePricing: 1,
           virtualAccount: 1,
           paymentInvoice: 1,
         },
@@ -259,6 +260,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     currentPlanInfo.dueLimitReached = getPI;
     currentPlanInfo.price = clientInfo[0].price || '--';
     currentPlanInfo.priceType = clientInfo[0].priceType || '--';
+    currentPlanInfo.billingGroupWisePricing = clientInfo[0].billingGroupWisePricing || false;
     currentPlanInfo.subscriptionType = clientInfo[0].planDetails.subscriptionType || '--';
     currentPlanInfo.subscriptionPeriod = clientInfo[0].planDetails.subscriptionPeriod || '--';
     currentPlanInfo.storeCount = storeCount || '--';
@@ -2246,7 +2248,15 @@ export const invoiceList = async ( req, res ) => {
 
 export const priceList = async ( req, res ) => {
   try {
-    let pricingDetails = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1, oneTimeFeePerStore: 1 } );
+    // Group-wise pricing: when a groupId is sent, read that group's own
+    // basepricing doc; otherwise read the brand-level doc (groupId unset).
+    const priceQuery = { clientId: req.body.clientId };
+    if ( req.body.groupId ) {
+      priceQuery.groupId = req.body.groupId;
+    } else {
+      priceQuery.groupId = { $exists: false };
+    }
+    let pricingDetails = await basePricingService.findOne( priceQuery, { standard: 1, step: 1, oneTimeFeePerStore: 1 } );
     if ( !pricingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -2360,7 +2370,15 @@ export const priceList = async ( req, res ) => {
 
 export const pricingListUpdate = async ( req, res ) => {
   try {
-    let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
+    // Group-wise pricing: target the group's own basepricing doc when a groupId
+    // is sent; otherwise the brand-level doc (groupId unset).
+    const priceQuery = { clientId: req.body.clientId };
+    if ( req.body.groupId ) {
+      priceQuery.groupId = req.body.groupId;
+    } else {
+      priceQuery.groupId = { $exists: false };
+    }
+    let getPriceInfo = await basePricingService.findOne( priceQuery, { standard: 1, step: 1 } );
     let findClient = await paymentService.findOneClient( { clientId: req.body.clientId } );
 
     console.log( getPriceInfo );
@@ -2370,8 +2388,10 @@ export const pricingListUpdate = async ( req, res ) => {
       pricingType: findClient.priceType,
     };
 
-    if ( findClient.priceType==='standard' ) {
-      getPriceInfo.standard.map( ( item ) => {
+    // Old-data snapshot for the audit log. Guard on getPriceInfo: a brand-new
+    // billing-group doc has none yet, and the no-doc path is handled below.
+    if ( getPriceInfo && findClient.priceType==='standard' ) {
+      ( getPriceInfo.standard || [] ).map( ( item ) => {
         oldData = {
           ...oldData,
           [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
@@ -2383,8 +2403,8 @@ export const pricingListUpdate = async ( req, res ) => {
           };
         }
       } );
-    } else {
-      getPriceInfo.step.map( ( item ) => {
+    } else if ( getPriceInfo ) {
+      ( getPriceInfo.step || [] ).map( ( item ) => {
         oldData = {
           ...oldData,
           [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
@@ -2496,6 +2516,13 @@ export const pricingListUpdate = async ( req, res ) => {
     if ( req.body.oneTimeFeePerStore != null && req.body.oneTimeFeePerStore !== '' ) {
       getPriceInfo.oneTimeFeePerStore = Number( req.body.oneTimeFeePerStore ) || 0;
     }
+    // Keep the group identity on the doc when saving group-wise pricing.
+    if ( req.body.groupId ) {
+      getPriceInfo.groupId = req.body.groupId;
+      if ( req.body.groupName ) {
+        getPriceInfo.groupName = req.body.groupName;
+      }
+    }
     getPriceInfo.save().then( async () => {
       let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { priceType: 1, paymentInvoice: 1, planDetails: 1 } );
       clientDetails.priceType = req.body.type;
@@ -2566,7 +2593,15 @@ export const pricingListUpdate = async ( req, res ) => {
 
 async function updatePricing( req, res, update ) {
   let baseProduct = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
-  let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
+  // Group-wise pricing: scope the doc to the group when a groupId is sent;
+  // otherwise the brand-level doc (groupId unset).
+  const pricingDocQuery = { clientId: req.body.clientId };
+  if ( req.body.groupId ) {
+    pricingDocQuery.groupId = req.body.groupId;
+  } else {
+    pricingDocQuery.groupId = { $exists: false };
+  }
+  let getPriceInfo = await basePricingService.findOne( pricingDocQuery, { standard: 1, step: 1 } );
   let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
   if ( clientDetails ) {
     let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
@@ -2637,12 +2672,20 @@ async function updatePricing( req, res, update ) {
       step: stepList,
       clientId: req.body.clientId,
     };
+    // Stamp the group identity so group-wise pricing docs are distinguishable
+    // from the brand-level doc.
+    if ( req.body.groupId ) {
+      data.groupId = req.body.groupId;
+      if ( req.body.groupName ) {
+        data.groupName = req.body.groupName;
+      }
+    }
     console.log( '🚀 ~ updatePricing ~ data:', data );
     if ( !getPriceInfo ) {
       await basePricingService.create( data );
     } else {
       delete data.clientId;
-      await basePricingService.updateOne( { clientId: req.body.clientId }, data );
+      await basePricingService.updateOne( pricingDocQuery, data );
     }
     let product = [];
     let clientId = req.body.clientId;
@@ -4235,3 +4278,20 @@ export async function getClientDocuments( req, res ) {
   }
 }
 
+// Toggle billing-group-wise pricing on the client. When enabled, pricing is
+// maintained per billing group (separate basepricing docs keyed by groupId).
+export async function setBillingGroupWisePricing( req, res ) {
+  try {
+    const clientId = String( req.body?.clientId || '' );
+    const enabled = req.body?.enabled === true || req.body?.enabled === 'true';
+    if ( !clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+    await paymentService.updateOne( { clientId }, { billingGroupWisePricing: enabled } );
+    return res.sendSuccess( { clientId, billingGroupWisePricing: enabled } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'setBillingGroupWisePricing' } );
+    return res.sendError( error, 500 );
+  }
+}
+

package/src/dtos/validation.dtos.js

@@ -154,6 +154,10 @@ export const validatePriceSchema = joi.object( {
   clientId: joi.string().required(),
   products: joi.array().optional(),
   oneTimeFeePerStore: joi.number().optional().allow( null, '' ),
+  // Billing-group-wise pricing: when present, the pricing is saved to / read
+  // from the group's own basepricing doc instead of the brand-level one.
+  groupId: joi.string().optional().allow( null, '' ),
+  groupName: joi.string().optional().allow( null, '' ),
   pricing: joi.array().items( joi.object( {
     productName: joi.string().required(),
     negotiatePrice: joi.number().required(),
@@ -178,6 +182,8 @@ export const revisedParams = {
 export const validatePriceListSchema = joi.object( {
   priceType: joi.string().required(),
   clientId: joi.string().required(),
+  // Optional billing group filter for group-wise pricing.
+  groupId: joi.string().optional().allow( null, '' ),
 } );
 
 export const validatePriceListParams = {

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 } from '../controllers/brandsBilling.controller.js';
+import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary, additionalProducts, additionalProductExport } from '../controllers/brandsBilling.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 
 export const brandsBillingRouter = express.Router();
@@ -17,3 +17,4 @@ brandsBillingRouter.post( '/bulk-update-billing-groups', isAllowedSessionHandler
 brandsBillingRouter.post( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/additionalProducts', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), additionalProducts );
+brandsBillingRouter.get( '/additionalProductExport', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), additionalProductExport );

package/src/routes/paymentSubscription.routes.js

@@ -155,4 +155,7 @@ paymentSubscriptionRouter.post( '/createDefaultbillings', paymentController.crea
 paymentSubscriptionRouter.post( '/client-document/upload', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [ 'isEdit' ] } ] } ), documentUpload.single( 'file' ), paymentController.uploadClientDocument );
 paymentSubscriptionRouter.get( '/client-document/list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [] } ] } ), paymentController.getClientDocuments );
 
+// Toggle billing-group-wise pricing for a client (tango only, edit perm).
+paymentSubscriptionRouter.post( '/billingGroupWisePricing', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [ 'isEdit' ] } ] } ), paymentController.setBillingGroupWisePricing );
+