tango-app-api-payment-subscription 3.5.3 → 3.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.3",
+    "version": "3.5.5",
     "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.5.77",
+        "tango-api-schema": "^2.6.9",
         "tango-app-api-middleware": "^3.6.18",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0",

package/scripts/migrate-billing-prorata-pricing.js

@@ -0,0 +1,66 @@
+// One-shot migration: replaces the legacy billing-group proRata values
+// 'before15' → 'flat' and 'after15' → 'prorate'. Idempotent — safe to
+// re-run; rows already on the new values are skipped.
+//
+// Usage:
+//   MONGO_URI="mongodb://..." node scripts/migrate-billing-prorata-pricing.js
+//
+// Sequencing: MUST run BEFORE deploying the tightened schema enum
+// ['prorate','flat'] in tango-api-schema, otherwise updateBillingGroup
+// calls on unmigrated rows will fail Mongoose ValidationError.
+
+import mongoose from 'mongoose';
+import 'dotenv/config';
+
+const NEW_VALUES = [ 'prorate', 'flat' ];
+
+async function run() {
+  const uri = process.env.MONGO_URI;
+  if ( !uri ) {
+    console.error( 'MONGO_URI env var is required' );
+    process.exit( 1 );
+  }
+
+  await mongoose.connect( uri );
+  // strict:false so we don't pin to a specific tango-api-schema version.
+  const Billing = mongoose.model(
+      '_migrateBilling',
+      new mongoose.Schema( {}, { strict: false } ),
+      'billings',
+  );
+
+  // before15 (legacy "full-month for stores active most of the month") → flat
+  const flatResult = await Billing.updateMany(
+      { proRata: 'before15' },
+      { $set: { proRata: 'flat' } },
+  );
+  console.log( `Migrated ${flatResult.modifiedCount} billing group(s) from 'before15' → 'flat'` );
+
+  // after15 (legacy "always actual working days") → prorate
+  const prorateResult = await Billing.updateMany(
+      { proRata: 'after15' },
+      { $set: { proRata: 'prorate' } },
+  );
+  console.log( `Migrated ${prorateResult.modifiedCount} billing group(s) from 'after15' → 'prorate'` );
+
+  // Surface any rows whose proRata is something unexpected (manual review).
+  const stray = await Billing.find(
+      { proRata: { $exists: true, $nin: [ ...NEW_VALUES, null, '' ] } },
+      { _id: 1, clientId: 1, groupName: 1, proRata: 1 },
+  ).limit( 50 ).lean();
+
+  if ( stray.length ) {
+    console.warn( `Found ${stray.length} row(s) with unexpected proRata values:` );
+    stray.forEach( ( s ) => console.warn( '  -', s._id.toString(), s.clientId, s.groupName, '=>', s.proRata ) );
+    console.warn( 'Review these manually before tightening the schema enum.' );
+  } else {
+    console.log( 'No stray proRata values found. Safe to tighten the schema.' );
+  }
+
+  await mongoose.disconnect();
+}
+
+run().catch( ( err ) => {
+  console.error( err );
+  process.exit( 1 );
+} );

package/src/controllers/billing.controllers.js

@@ -4,6 +4,7 @@ import * as invoice from '../services/invoice.service.js';
 import { aggregatebilling, countDocuments, create, deleteOne, find, findOne, updateMany, updateOne } from '../services/billing.service.js';
 import * as invoiceService from '../services/invoice.service.js';
 import mongoose from 'mongoose';
+import axios from 'axios';
 import dayjs from 'dayjs';
 import { leadGet } from '../services/lead.service.js';
 import { findOneClient } from '../services/clientPayment.services.js';
@@ -577,7 +578,6 @@ export const getInvoices = async ( req, res ) => {
       filterStartDate = new Date( dayjs().subtract( 3, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
       filterEndDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
     }
-
     if ( req.body?.filter && !req.body?.searchValue ) {
       matchStage.$match['$and'] = [
         { billingDate: { $gte: filterStartDate } },
@@ -868,4 +868,145 @@ export async function getClientProducts( req, res ) {
   }
 }
 
+// GSTIN address lookup via Sheet GST Check
+// (https://sheet.gstincheck.co.in). Returns the registered company name
+// + principal place of business address so the UI can auto-fill the
+// billing-group form.
+//
+// Requires GST_LOOKUP_API_KEY in the API environment. The key is embedded
+// in the provider's URL path (their auth scheme); we never log it.
+//
+// Caller validates GSTIN format (15 chars, alphanumeric). Server-side we
+// re-check before forwarding to the provider.
+export async function gstinLookup( req, res ) {
+  try {
+    const gstin = String( req.params.gstin || '' ).trim().toUpperCase();
+    if ( !/^[0-9A-Z]{15}$/.test( gstin ) ) {
+      return res.sendError( 'Invalid GSTIN format', 400 );
+    }
+
+    // GSTIN state-code prefix → State + Place of Supply (matches the
+    // table the frontend already maintains).
+    const stateMap = {
+      '01': 'Jammu and Kashmir', '02': 'Himachal Pradesh', '03': 'Punjab',
+      '04': 'Chandigarh', '05': 'Uttarakhand', '06': 'Haryana', '07': 'Delhi',
+      '08': 'Rajasthan', '09': 'Uttar Pradesh', '10': 'Bihar', '11': 'Sikkim',
+      '12': 'Arunachal Pradesh', '13': 'Nagaland', '14': 'Manipur',
+      '15': 'Mizoram', '16': 'Tripura', '17': 'Meghalaya', '18': 'Assam',
+      '19': 'West Bengal', '20': 'Jharkhand', '21': 'Odisha',
+      '22': 'Chhattisgarh', '23': 'Madhya Pradesh', '24': 'Gujarat',
+      '25': 'Daman and Diu', '27': 'Maharashtra', '29': 'Karnataka',
+      '30': 'Goa', '32': 'Kerala', '33': 'Tamil Nadu', '34': 'Puducherry',
+      '36': 'Telangana', '37': 'Andhra Pradesh',
+    };
+    const code = gstin.substring( 0, 2 );
+    const stateName = stateMap[code];
+    if ( !stateName ) {
+      return res.sendError( 'Unknown state code in GSTIN', 404 );
+    }
+
+    // Real lookup via Sheet GST Check (https://gstincheck.co.in/).
+    // Endpoint: GET https://sheet.gstincheck.co.in/check/{API_KEY}/{GSTIN}
+    // Auth: API key embedded in the URL path (no header). Set
+    // GST_LOOKUP_API_KEY in the API's environment.
+    const apiKey = process.env.GST_LOOKUP_API_KEY;
+    console.log( '🚀 ~ gstinLookup ~ apiKey:', apiKey );
+    if ( !apiKey ) {
+      // Fail explicitly rather than silently fall back — that way a missing
+      // key shows up immediately instead of mock data leaking into prod.
+      logger.error( { function: 'gstinLookup', message: 'GST_LOOKUP_API_KEY not set' } );
+      return res.sendError( 'GST lookup is not configured on the server', 500 );
+    }
+
+    let providerResponse;
+    try {
+      providerResponse = await axios.get(
+          `https://sheet.gstincheck.co.in/check/${encodeURIComponent( apiKey )}/${encodeURIComponent( gstin )}`,
+          { timeout: 8000 },
+      );
+    } catch ( axiosErr ) {
+      // Distinguish provider-down vs other errors so the client can show a
+      // useful message. 4xx from the provider is treated as a real error;
+      // network errors fall through to a generic 502.
+      const status = axiosErr?.response?.status;
+      logger.error( { error: axiosErr?.message, status, function: 'gstinLookup.provider', gstin } );
+      if ( status === 404 ) {
+        return res.sendError( 'GSTIN not found', 404 );
+      }
+      return res.sendError( 'GST lookup service unavailable', 502 );
+    }
+
+    const body = providerResponse?.data || {};
+    if ( !body.flag || !body.data ) {
+      // Provider reached but couldn't resolve this GSTIN.
+      return res.sendError( 'GSTIN not found', 404 );
+    }
+
+    // Map provider's response shape into the contract the frontend expects.
+    // Provider uses Indian-government short names (lgnm, tradeNam, pradr,
+    // sts, etc.); we normalize to our flat structure.
+    const src = body.data;
+    // TEMP: full raw response logged so we can confirm field names per
+    // GSTIN — remove once the mapping is verified across a few real cases.
+    logger.error( { function: 'gstinLookup.raw', gstin, providerData: src } );
+
+    const principal = src.pradr || src.pradr1 || {};
+    // The provider has used both `addr` (newer) and a flatter form
+    // (older). Coalesce — `addr` if present, otherwise the principal
+    // itself contains the address fields.
+    const addr = principal.addr || principal || {};
+
+    // If the provider returned a fully-formed display address string, use
+    // it directly for addressLineOne — that's the canonical comma-joined
+    // address GSTN itself displays. Otherwise build it from the
+    // individual fields. This avoids re-joining in a different order than
+    // the registry intended.
+    const fullAddr = ( principal.adr || principal.address || src.adr || '' ).trim();
+
+    let addressLineOne;
+    let addressLineTwo;
+    if ( fullAddr ) {
+      // The registry format is `bno, bnm, flno, st, loc, lndmrk, city,
+      // dst, stcd, pncd`. Split on commas, take the first half for line 1
+      // and the rest (minus city/state/pincode tail which goes to the
+      // separate fields) for line 2. Heuristic: split into two halves.
+      const parts = fullAddr.split( ',' ).map( ( s ) => s.trim() ).filter( Boolean );
+      const half = Math.ceil( parts.length / 2 );
+      addressLineOne = parts.slice( 0, half ).join( ', ' );
+      addressLineTwo = parts.slice( half ).join( ', ' );
+    } else {
+      const line1Parts = [ addr.bno, addr.bnm, addr.flno, addr.st ].filter( ( p ) => p && String( p ).trim() );
+      const line2Parts = [ addr.loc, addr.lndmrk, addr.dst ].filter( ( p ) => p && String( p ).trim() );
+      addressLineOne = line1Parts.join( ', ' );
+      addressLineTwo = line2Parts.join( ', ' );
+    }
+
+    // City: prefer explicit `city` / `dst`. Some records put the city
+    // name in `loc` and the colony / sub-area in `dst` — prefer city, but
+    // fall back to dst then loc when missing.
+    const cityValue = addr.city || addr.dst || addr.loc || '';
+
+    const data = {
+      gstin: src.gstin || gstin,
+      legalName: src.lgnm || src.legalName || '',
+      tradeName: src.tradeNam || src.tradeName || '',
+      addressLineOne,
+      addressLineTwo,
+      city: cityValue,
+      // Prefer provider's state name; fall back to our state-code map so a
+      // missing field doesn't blank out the Place of Supply.
+      state: addr.stcd || addr.state || stateName,
+      country: 'India',
+      pinCode: addr.pncd ? String( addr.pncd ) : ( addr.pincode ? String( addr.pincode ) : '' ),
+      placeOfSupply: `${addr.stcd || addr.state || stateName} (${code})`,
+      status: src.sts || '',
+    };
+
+    return res.sendSuccess( data );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'gstinLookup' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 

package/src/controllers/brandsBilling.controller.js

@@ -339,6 +339,7 @@ export async function brandInvoiceList( req, res ) {
             totalAmount: 1,
             status: 1,
             paymentStatus: 1,
+            paidAmount: { $ifNull: [ '$paidAmount', 0 ] },
             clientId: 1,
             currency: 1,
             dueDate: 1,

package/src/controllers/invoice.controller.js

@@ -113,6 +113,72 @@ export async function createInvoice( req, res ) {
       invoiceGroupList.push( invoiceGroup );
     }
 
+    // Custom-create path: the Create Invoice modal posts a fully-composed
+    // invoice (companyName, products, tax, totals — all entered by the user).
+    // The legacy aggregation paths above don't handle this shape and would
+    // silently no-op (empty invoiceGroupList → loop skipped → 2xx with nothing
+    // written). When the caller sets customInvoice=true we insert exactly
+    // what they sent, with a server-generated invoice number.
+    if ( req.body.customInvoice === true ) {
+      if ( !req.body.clientId ) {
+        return res.sendError( 'clientId is required for customInvoice', 400 );
+      }
+      const Finacialyear = getCurrentFinancialYear();
+      const previousinvoice = await invoiceService.findandsort(
+          { invoice: { $regex: `^INV-${Finacialyear}-` } },
+          {},
+          { invoiceIndex: -1 },
+      );
+      let invoiceNo = '00001';
+      if ( previousinvoice && previousinvoice.length > 0 ) {
+        invoiceNo = Number( previousinvoice[0].invoiceIndex ) + 1;
+        invoiceNo = invoiceNo.toString().padStart( 5, '0' );
+      }
+      const baseDate = req.body.billingDate ? dayjs( req.body.billingDate ) : dayjs();
+      const data = {
+        invoice: `INV-${Finacialyear}-${invoiceNo}`,
+        invoiceIndex: invoiceNo,
+        clientId: req.body.clientId,
+        groupId: req.body.groupId || undefined,
+        groupName: req.body.groupName || '',
+        companyName: req.body.companyName || '',
+        companyAddress: req.body.companyAddress || '',
+        GSTNumber: req.body.GSTNumber || '',
+        PlaceOfSupply: req.body.PlaceOfSupply || '',
+        products: Array.isArray( req.body.products ) ? req.body.products : [],
+        tax: Array.isArray( req.body.tax ) ? req.body.tax : [],
+        amount: Math.round( Number( req.body.amount ) || 0 ),
+        totalAmount: Math.round( Number( req.body.totalAmount ) || 0 ),
+        stores: Number( req.body.stores ) || 0,
+        currency: req.body.currency || 'inr',
+        billingDate: baseDate.toDate(),
+        dueDate: req.body.dueDate ? new Date( req.body.dueDate ) : baseDate.add( 30, 'days' ).toDate(),
+        monthOfbilling: baseDate.format( 'MM' ),
+        paymentMethod: 'Online',
+        status: 'pendingCsm',
+        paymentStatus: 'unpaid',
+      };
+      const created = await invoiceService.create( data );
+      const logObj = {
+        userName: req.user?.userName,
+        email: req.user?.email,
+        clientId: data.clientId,
+        logSubType: 'invoiceCreated',
+        logType: 'invoice',
+        date: new Date(),
+        changes: [ `${data.invoice} invoice created manually by ${req.user?.email}` ],
+        eventType: 'create',
+        timestamp: new Date(),
+        showTo: [ 'tango' ],
+      };
+      try {
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
+      } catch ( logErr ) {
+        logger.error( { error: logErr, function: 'createInvoice.customLog' } );
+      }
+      return res.sendSuccess( { data: created } );
+    }
+
     for ( let group of invoiceGroupList ) {
       let Finacialyear = getCurrentFinancialYear();
       // Scope the highest-index lookup to invoices created in the current FY
@@ -142,7 +208,14 @@ export async function createInvoice( req, res ) {
       let amount = products.reduce( ( sum, product ) => sum + product.amount, 0 );
       let taxList = [];
       let totalAmount = 0;
-      if ( group.gst && group.gst.slice( 0, 2 ) == '33' ) {
+      // International billing groups: skip tax calculation entirely. The
+      // tax array stays empty so the PDF won't render a tax line and
+      // totalAmount equals subtotal. Default 'domestic' preserves the
+      // existing GST/IGST/CGST/SGST behavior for legacy records that have
+      // no taxCalculationType set yet.
+      if ( group.taxCalculationType === 'international' ) {
+        totalAmount = Math.round( amount );
+      } else if ( group.gst && group.gst.slice( 0, 2 ) == '33' ) {
         let taxAmount = ( amount * 18 ) / 100;
         totalAmount = Math.round( amount + taxAmount );
         taxList.push(
@@ -303,7 +376,7 @@ export async function invoiceDownload( req, res ) {
         let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
         item.productName = firstWord + ' ' + secondWord;
-        item.price = Math.round( item.price ).toLocaleString( 'en-IN' );
+        item.price = item.price .toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
         item.amount = item.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
         item.currency = invoiceCurrency;
       } );
@@ -939,6 +1012,11 @@ function inWords( num ) {
 async function standardPrice( group, getClient, baseDate ) {
   console.log( '🚀 ~ standardPrice ~ baseDate:', baseDate.format( 'MMM YYYY' ) );
   const currentMonthDays = dayjs().daysInMonth();
+  // Pricing method: 'flat' => bill every store for the full month
+  // regardless of working days. 'prorate' => bill for actual working days.
+  // Computed once so the aggregation pipelines can inline a $literal.
+  const isFlatPricing = group.proRata === 'flat';
+  console.log( '🚀 ~ standardPrice ~ isFlatPricing:', isFlatPricing );
   let billingTypeMap = {};
   if ( getClient?.planDetails?.product ) {
     getClient.planDetails.product.forEach( ( p ) => {
@@ -986,6 +1064,13 @@ async function standardPrice( group, getClient, baseDate ) {
         storeStatus: '$stores.status',
         zoneCount: { $ifNull: [ '$stores.zoneCount', 0 ] },
         cameraCount: { $ifNull: [ '$stores.cameraCount', 0 ] },
+        // Pull per-store camera splits off the daily-pricing store doc so the
+        // downstream perCamera branch (see below) can multiply price by the
+        // actual camera count. Without these the second $group would $sum
+        // missing fields and totalTraffic/ZoneCameraCount would always be 0
+        // — silently degrading perCamera billing to perStore.
+        trafficCameraCount: { $ifNull: [ '$stores.trafficCameraCount', 0 ] },
+        zoneCameraCount: { $ifNull: [ '$stores.zoneCameraCount', 0 ] },
       },
     },
     {
@@ -997,23 +1082,31 @@ async function standardPrice( group, getClient, baseDate ) {
       $project: {
         productName: 1,
         storeId: 1,
-        prorate: { $literal: group.proRata },
+        // isFlatPricing is the group-level pricing flag, baked into every
+        // doc so the next $project's $cond can read it.
+        isFlatPricing: { $literal: isFlatPricing },
         workingDays: 1,
         storeStatus: 1,
         zoneCount: 1,
         cameraCount: 1,
+        trafficCameraCount: 1,
+        zoneCameraCount: 1,
       },
     },
     {
       $project: {
         productName: 1,
         storeId: 1,
+        // Flat pricing => every store billed for the full month.
+        // Prorate => keep the actual workingDays.
         workingDays: {
-          $cond: { if: { $and: [ { $gte: [ '$workingDays', 15 ] }, { $eq: [ '$storeStatus', 'active' ] }, { $eq: [ '$prorate', 'before15' ] } ] }, then: currentMonthDays, else: '$workingDays' },
+          $cond: { if: '$isFlatPricing', then: currentMonthDays, else: '$workingDays' },
         },
         storeStatus: 1,
         zoneCount: 1,
         cameraCount: 1,
+        trafficCameraCount: 1,
+        zoneCameraCount: 1,
       },
     },
     {
@@ -1025,6 +1118,8 @@ async function standardPrice( group, getClient, baseDate ) {
         workingdays: { $first: '$workingDays' },
         zoneCount: { $first: '$zoneCount' },
         cameraCount: { $first: '$cameraCount' },
+        trafficCameraCount: { $first: '$trafficCameraCount' },
+        zoneCameraCount: { $first: '$zoneCameraCount' },
       },
     },
     {
@@ -1228,16 +1323,24 @@ async function standardPrice( group, getClient, baseDate ) {
           storeStatus: '$stores.status',
           zoneCount: { $ifNull: [ '$stores.zoneCount', 0 ] },
           cameraCount: { $ifNull: [ '$stores.cameraCount', 0 ] },
+          // perCamera (eachStore branch) reads these on the per-store record
+          // below; projecting them through is required for the camera-count
+          // multiplier to fire.
+          trafficCameraCount: { $ifNull: [ '$stores.trafficCameraCount', 0 ] },
+          zoneCameraCount: { $ifNull: [ '$stores.zoneCameraCount', 0 ] },
         },
       },
       { $match: { workingDays: { $gt: 0 }, productName: { $in: eachStoreProductNames } } },
       {
         $project: {
           productName: 1, storeId: 1, storeName: 1,
+          // Flat pricing => full month per store. Prorate => actual working
+          // days. Same rule as the overall-store branch above.
           workingDays: {
-            $cond: { if: { $and: [ { $gte: [ '$workingDays', 15 ] }, { $eq: [ '$storeStatus', 'active' ] }, { $eq: [ { $literal: group.proRata }, 'before15' ] } ] }, then: currentMonthDays, else: '$workingDays' },
+            $cond: { if: { $literal: isFlatPricing }, then: currentMonthDays, else: '$workingDays' },
           },
           zoneCount: 1, cameraCount: 1,
+          trafficCameraCount: 1, zoneCameraCount: 1,
         },
       },
       {
@@ -1265,6 +1368,11 @@ async function standardPrice( group, getClient, baseDate ) {
       {
         $project: {
           productName: 1, storeId: 1, storeName: 1, workingDays: 1, zoneCount: 1, cameraCount: 1,
+          // Final whitelist project — must carry trafficCameraCount and
+          // zoneCameraCount through to the JS consumer. Without these the
+          // perCamera branch in the for-loop below sees undefined and falls
+          // back to storeCount=1.
+          trafficCameraCount: 1, zoneCameraCount: 1,
           price: '$matchedStandard.negotiatePrice',
           period: { $cond: { if: { $lt: [ '$workingDays', currentMonthDays ] }, then: 'prorate', else: 'fullmonth' } },
         },
@@ -1273,6 +1381,7 @@ async function standardPrice( group, getClient, baseDate ) {
 
     for ( let store of perStoreData ) {
       let productBillingType = billingTypeMap[store.productName] || 'perStore';
+
       let storeCount = 1;
       if ( store.productName === 'tangoZone' ) {
         if ( productBillingType === 'perZone' && store.zoneCount > 0 ) {
@@ -1340,6 +1449,9 @@ async function standardPrice( group, getClient, baseDate ) {
 
 async function stepPrice( group, getClient ) {
   const currentMonthDays = dayjs().daysInMonth();
+  // 'flat' => every store billed for full month.
+  // 'prorate' => actual working days. See standardPrice for the same flag.
+  const isFlatPricing = group.proRata === 'flat';
   let billingTypeMap = {};
   if ( getClient?.planDetails?.product ) {
     getClient.planDetails.product.forEach( ( p ) => {
@@ -1387,6 +1499,11 @@ async function stepPrice( group, getClient ) {
         storeStatus: '$stores.status',
         zoneCount: { $ifNull: [ '$stores.zoneCount', 0 ] },
         cameraCount: { $ifNull: [ '$stores.cameraCount', 0 ] },
+        // Pull per-store camera splits; same fix as standardPrice — without
+        // these the second $group sums missing fields and the perCamera
+        // branch in the downstream map silently falls back to perStore.
+        trafficCameraCount: { $ifNull: [ '$stores.trafficCameraCount', 0 ] },
+        zoneCameraCount: { $ifNull: [ '$stores.zoneCameraCount', 0 ] },
       },
     },
     {
@@ -1398,23 +1515,30 @@ async function stepPrice( group, getClient ) {
       $project: {
         productName: 1,
         storeId: 1,
-        prorate: { $literal: group.proRata },
+        // Group-level flag baked into every doc; consumed by the next
+        // $project's $cond.
+        isFlatPricing: { $literal: isFlatPricing },
         workingDays: 1,
         storeStatus: 1,
         zoneCount: 1,
         cameraCount: 1,
+        trafficCameraCount: 1,
+        zoneCameraCount: 1,
       },
     },
     {
       $project: {
         productName: 1,
         storeId: 1,
+        // Flat => full month per store. Prorate => actual working days.
         workingDays: {
-          $cond: { if: { $and: [ { $gte: [ '$workingDays', 15 ] }, { $eq: [ '$storeStatus', 'active' ] }, { $eq: [ '$prorate', 'before15' ] } ] }, then: currentMonthDays, else: '$workingDays' },
+          $cond: { if: '$isFlatPricing', then: currentMonthDays, else: '$workingDays' },
         },
         storeStatus: 1,
         zoneCount: 1,
         cameraCount: 1,
+        trafficCameraCount: 1,
+        zoneCameraCount: 1,
       },
     }, {
       $group: {
@@ -1425,6 +1549,8 @@ async function stepPrice( group, getClient ) {
         workingdays: { $first: '$workingDays' },
         zoneCount: { $first: '$zoneCount' },
         cameraCount: { $first: '$cameraCount' },
+        trafficCameraCount: { $first: '$trafficCameraCount' },
+        zoneCameraCount: { $first: '$zoneCameraCount' },
       },
     },
     {
@@ -1493,16 +1619,24 @@ async function stepPrice( group, getClient ) {
           storeStatus: '$stores.status',
           zoneCount: { $ifNull: [ '$stores.zoneCount', 0 ] },
           cameraCount: { $ifNull: [ '$stores.cameraCount', 0 ] },
+          // perCamera (eachStore branch) reads these on the per-store record
+          // below; projecting them through is required for the camera-count
+          // multiplier to fire.
+          trafficCameraCount: { $ifNull: [ '$stores.trafficCameraCount', 0 ] },
+          zoneCameraCount: { $ifNull: [ '$stores.zoneCameraCount', 0 ] },
         },
       },
       { $match: { workingDays: { $gt: 0 }, productName: { $in: eachStoreProductNames } } },
       {
         $project: {
           productName: 1, storeId: 1, storeName: 1,
+          // Flat pricing => full month per store. Prorate => actual working
+          // days. Same rule as the overall-store branch above.
           workingDays: {
-            $cond: { if: { $and: [ { $gte: [ '$workingDays', 15 ] }, { $eq: [ '$storeStatus', 'active' ] }, { $eq: [ { $literal: group.proRata }, 'before15' ] } ] }, then: currentMonthDays, else: '$workingDays' },
+            $cond: { if: { $literal: isFlatPricing }, then: currentMonthDays, else: '$workingDays' },
           },
           zoneCount: 1, cameraCount: 1,
+          trafficCameraCount: 1, zoneCameraCount: 1,
         },
       },
       {
@@ -1704,35 +1838,64 @@ export async function clientInvoiceList( req, res ) {
         clientId: { $in: findClients },
       },
     } ];
+
+    // If the user picked an explicit Month or Year, ignore the Duration
+    // filter — otherwise the two ranges conflict (e.g. "current month" +
+    // April would always return zero results). Mirrors brand-invoices.
+    const hasMonthYear = ( req.body.monthFilter && String( req.body.monthFilter ) !== '' ) ||
+      ( req.body.yearFilter && String( req.body.yearFilter ) !== '' );
+
     let filterStartDate = '';
     let filterEndDate = '';
 
-    if ( req.body?.filter && req.body.filter == 'current' ) {
-      filterStartDate = new Date( dayjs().startOf( 'month' ).format( 'YYYY-MM-DD' ) );
-      filterEndDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
-    }
-    if ( req.body?.filter && req.body.filter == 'prev' ) {
-      filterStartDate = new Date( dayjs().subtract( 1, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
-      filterEndDate = new Date( dayjs().subtract( 1, 'month' ).endOf( 'month' ).format( 'YYYY-MM-DD' ) );
-    }
-    if ( req.body?.filter && req.body.filter == 'last' ) {
-      filterStartDate = new Date( dayjs().subtract( 12, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
-      filterEndDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
-    }
-    console.log( filterStartDate, filterEndDate );
+    if ( !hasMonthYear ) {
+      if ( req.body?.filter && req.body.filter == 'current' ) {
+        filterStartDate = new Date( dayjs().startOf( 'month' ).format( 'YYYY-MM-DD' ) );
+        filterEndDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
+      }
+      if ( req.body?.filter && req.body.filter == 'prev' ) {
+        filterStartDate = new Date( dayjs().subtract( 1, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
+        filterEndDate = new Date( dayjs().subtract( 1, 'month' ).endOf( 'month' ).format( 'YYYY-MM-DD' ) );
+      }
+      if ( req.body?.filter && req.body.filter == 'last' ) {
+        filterStartDate = new Date( dayjs().subtract( 12, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
+        filterEndDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
+      }
 
-    if ( req.body?.filter ) {
-      query.push(
-          {
-            $match: {
-              $and: [
-                { billingDate: { $gte: filterStartDate } },
-                { billingDate: { $lte: filterEndDate } },
-              ],
-            },
+      if ( req.body?.filter ) {
+        query.push( {
+          $match: {
+            $and: [
+              { billingDate: { $gte: filterStartDate } },
+              { billingDate: { $lte: filterEndDate } },
+            ],
           },
+        } );
+      }
+    }
 
-      );
+    // Month / Year filters (independent of durationFilter). Both 1-based:
+    // monthFilter '1'..'12', yearFilter four-digit string like '2026'.
+    // billingDate may be stored as Date OR string in some legacy rows, so
+    // coerce inside the pipeline before $year/$month.
+    const monthNum = req.body.monthFilter ? parseInt( req.body.monthFilter, 10 ) : null;
+    const yearNum = req.body.yearFilter ? parseInt( req.body.yearFilter, 10 ) : null;
+    if ( ( monthNum && monthNum >= 1 && monthNum <= 12 ) || yearNum ) {
+      const billingDateExpr = {
+        $cond: [
+          { $eq: [ { $type: '$billingDate' }, 'date' ] },
+          '$billingDate',
+          { $toDate: '$billingDate' },
+        ],
+      };
+      const expr = { $and: [] };
+      if ( yearNum ) {
+        expr.$and.push( { $eq: [ { $year: billingDateExpr }, yearNum ] } );
+      }
+      if ( monthNum && monthNum >= 1 && monthNum <= 12 ) {
+        expr.$and.push( { $eq: [ { $month: billingDateExpr }, monthNum ] } );
+      }
+      query.push( { $match: { $expr: expr } } );
     }
 
 
@@ -1769,6 +1932,7 @@ export async function clientInvoiceList( req, res ) {
         clientName: '$clientDetails.clientName',
         logo: '$clientDetails.logo',
         currencyType: '$currency',
+        currency: 1,
         invoice: 1,
         stores: 1,
         amount: 1,
@@ -1776,6 +1940,7 @@ export async function clientInvoiceList( req, res ) {
         groupName: 1,
         status: 1,
         paymentStatus: 1,
+        paidAmount: { $ifNull: [ '$paidAmount', 0 ] },
         clientId: 1,
         billingDate: 1,
       },
@@ -2081,6 +2246,105 @@ export async function PaymentStatusChange( req, res ) {
   }
 }
 
+// Record a (full or partial) payment against an invoice. Appends to
+// paymentHistory, increments paidAmount, and recomputes paymentStatus
+// (unpaid → partial → paid). Body: { invoiceId, amount, date, method?,
+// reference?, notes? }. invoiceId is the human-readable invoice number
+// (e.g. INV-26-27-00077), matching the legacy PaymentStatusChange contract.
+export async function recordPayment( req, res ) {
+  try {
+    const { invoiceId, amount, date, method, reference, notes } = req.body;
+    if ( !invoiceId ) {
+      return res.sendError( 'invoiceId is required', 400 );
+    }
+    const amountNum = Number( amount );
+    if ( !Number.isFinite( amountNum ) || amountNum <= 0 ) {
+      return res.sendError( 'amount must be a positive number', 400 );
+    }
+
+    const invoice = await invoiceService.findOne( { invoice: invoiceId } );
+    if ( !invoice ) {
+      return res.sendError( 'Invoice not found', 404 );
+    }
+
+    const previousPaid = Number( invoice.paidAmount ) || 0;
+    const newPaid = Math.round( ( previousPaid + amountNum ) * 100 ) / 100;
+    const totalAmount = Number( invoice.totalAmount ) || 0;
+
+    // Reject overpayment — finance teams want this caught early. They can
+    // record an exact final payment that brings the running total to the
+    // invoice total; anything beyond that is a data-entry error.
+    if ( totalAmount > 0 && newPaid > totalAmount + 0.01 ) {
+      return res.sendError(
+          `Payment exceeds outstanding balance. Outstanding: ${( totalAmount - previousPaid ).toFixed( 2 )}`,
+          400,
+      );
+    }
+
+    let derivedStatus = 'unpaid';
+    if ( newPaid >= totalAmount - 0.01 && totalAmount > 0 ) {
+      derivedStatus = 'paid';
+    } else if ( newPaid > 0 ) {
+      derivedStatus = 'partial';
+    }
+
+    const historyEntry = {
+      amount: amountNum,
+      date: date ? new Date( date ) : new Date(),
+      method: method || undefined,
+      reference: reference || undefined,
+      notes: notes || undefined,
+      recordedBy: req.user?.email || req.user?.userName || undefined,
+      recordedAt: new Date(),
+    };
+
+    const update = {
+      $set: {
+        paidAmount: newPaid,
+        paymentStatus: derivedStatus,
+        ...( derivedStatus === 'paid' ? { paidDate: new Date() } : {} ),
+      },
+      $push: { paymentHistory: historyEntry },
+    };
+
+    // Use invoiceUpdateOne — it passes the raw update object straight to
+    // Mongoose. invoiceService.updateOne (without "invoice" prefix) wraps
+    // its second arg in $set, which would turn our { $set, $push } into
+    // { $set: { $set, $push } } and Mongoose silently drops both as
+    // unknown fields under strict mode. (That's why an earlier version
+    // of this controller responded 200 but didn't actually persist.)
+    const result = await invoiceService.invoiceUpdateOne( { invoice: invoiceId }, update );
+    logger.info?.( { function: 'recordPayment', invoiceId, matched: result?.matchedCount, modified: result?.modifiedCount } );
+
+    try {
+      const logObj = {
+        userName: req.user?.userName,
+        email: req.user?.email,
+        clientId: invoice.clientId,
+        logSubType: 'paymentRecorded',
+        logType: 'invoice',
+        date: new Date(),
+        changes: [ `Payment of ${amountNum} recorded for ${invoiceId}. Status: ${derivedStatus} (${newPaid}/${totalAmount}).` ],
+        eventType: 'update',
+        timestamp: new Date(),
+        showTo: [ 'tango' ],
+      };
+      insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
+    } catch ( logErr ) {
+      logger.error( { error: logErr, function: 'recordPayment.log' } );
+    }
+
+    return res.sendSuccess( {
+      paidAmount: newPaid,
+      pendingAmount: Math.max( 0, totalAmount - newPaid ),
+      paymentStatus: derivedStatus,
+    } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'recordPayment' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function checkPaymentStatus( req, res ) {
   try {
     let findInvoice = await invoiceService.find( { status: 'approved', paymentStatus: { $ne: 'paid' } } );

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById, sendTeamsNotification } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
 import * as basePriceService from '../services/basePrice.service.js';
 import * as storeService from '../services/store.service.js';
@@ -3332,7 +3332,7 @@ export const dailyPricingInsert = async ( req, res ) => {
                 ];
                 let dailyData = await dailyPriceService.aggregate( query );
                 let cameraDetails = await cameraService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], isActivated: true, isUp: true }, { streamName: 1, productModule: 1 } );
-                console.log( '🚀 ~ dailyPricingInsert ~ cameraDetails:', cameraDetails );
+                // console.log( '🚀 ~ dailyPricingInsert ~ cameraDetails:', cameraDetails );
 
                 let trafficCameraCount = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
@@ -3351,14 +3351,16 @@ export const dailyPricingInsert = async ( req, res ) => {
                     mod.productName === 'tangoZone' && mod.checked === true,
                   ),
                 ).map( ( cam ) => cam.streamName );
-                let taggingDetails = await taggingService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], productName: 'tangoZone', coordinates: { $ne: [] }, streamName: { $in: zoneCameraStreamNames } }, { tagName: 1 } );
+                let allcameraname = cameraDetails?.map( ( cam ) => cam?.streamName );
+                console.log( '🚀 ~ dailyPricingInsert ~ zoneCameraStreamNames:', zoneCameraStreamNames );
+                let taggingDetails = await taggingService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], productName: 'tangoZone', coordinates: { $ne: [] }, streamName: { $in: allcameraname } }, { tagName: 1 } );
                 let zoneCount = taggingDetails.length;
                 let zoneName = taggingDetails.map( ( item ) => item.tagName );
                 let firstDate = dayjs( getStore[storeIndex]?.edge?.firstFileDate ).format( 'YYYY-MM-DD' );
                 let workingdays;
                 let workingdaystrax;
                 const givenDate = dayjs( requestData.date );
-                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', trafficCameraCount, zoneCameraCount, zoneCount );
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', getStore[storeIndex].storeId, trafficCameraCount, zoneCameraCount, zoneCount );
                 const isFirstDayOfMonth = givenDate.isSame( dayjs().startOf( 'month' ), 'day' );
                 if ( getStore[storeIndex]?.edge.firstFile ) {
                   if ( firstDate < requestData.date && getStore[storeIndex]?.status == 'active' &&
@@ -3471,13 +3473,24 @@ export const dailyPricingInsert = async ( req, res ) => {
         }
         // console.log( clientIndex, requestClient.length-1 );
         if ( clientIndex == requestClient.length - 1 ) {
-          let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
+          // let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
           let totalcount = await dailyPriceService.find( { dateString: dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) } );
           let teamsMsg = `${totalcount.length} clients data is inserted on ${dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' )}`;
           console.log( teamsMsg );
-          if ( teamsAlertUrls.invoiceAlert ) {
-            sendTeamsNotification( teamsAlertUrls.invoiceAlert, teamsMsg );
+          // if ( teamsAlertUrls.invoiceAlert ) {
+          //   sendTeamsNotification( teamsAlertUrls.invoiceAlert, teamsMsg );
+          // }
+
+          const SES = JSON.parse( process.env.SES );
+          let fromEmail = SES.accountsEmail;
+          console.log( process.env.invoiceAlert );
+          let invoiceEmails = JSON.parse( process.env.invoiceAlert );
+          let mailSubject = `Daily Invoice Alert ${dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' )}`;
+          if ( invoiceEmails ) {
+            const result = await sendEmailWithSES( invoiceEmails?.email, mailSubject, teamsMsg, '', fromEmail, [] );
+            console.log( '🚀 ~ dailyPricingInsert ~ result:', result );
           }
+
           return res.sendSuccess( 'Price Details Inserted Successfully' );
         }
       }

package/src/dtos/validation.dtos.js

@@ -314,6 +314,7 @@ export const createBillingGroupBody = joi.object(
       proRata: joi.string().optional().allow( '' ),
       paymentCategory: joi.string().optional().allow( '' ),
       currency: joi.string().optional().allow( '' ),
+      taxCalculationType: joi.string().valid( 'domestic', 'international' ).optional(),
       isInstallationOneTime: joi.boolean().optional(),
       installationFee: joi.number().optional(),
       paymentCycle: joi.string().optional().allow( '' ),
@@ -352,6 +353,7 @@ export const updateBillingGroupBody = joi.object(
       proRata: joi.string().optional().allow( '' ),
       paymentCategory: joi.string().optional().allow( '' ),
       currency: joi.string().optional().allow( '' ),
+      taxCalculationType: joi.string().valid( 'domestic', 'international' ).optional(),
       isInstallationOneTime: joi.boolean().optional(),
       installationFee: joi.number().optional(),
       paymentCycle: joi.string().optional().allow( '' ),

package/src/routes/billing.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 export const billingRouter = express.Router();
 import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { createBillingGroup, deleteBillingGroup, getAllBillingGroups, getBillingGroups, getClientProducts, getInvoices, getLeadProducts, onetimePayment, subscribedStoreList, updateBillingGroup } from '../controllers/billing.controllers.js';
+import { createBillingGroup, deleteBillingGroup, getAllBillingGroups, getBillingGroups, getClientProducts, getInvoices, getLeadProducts, onetimePayment, subscribedStoreList, updateBillingGroup, gstinLookup } from '../controllers/billing.controllers.js';
 import { billingGroupSchema, clientProductsValid, createBillingGroupsSchema, deleteBillingGroupsSchema, getBillingGroupsSchema, getInvoiceSchema, leadProductsValid, onetimeFeeValid, subscribedStoreListSchema, updateBillingGroupsSchema } from '../dtos/validation.dtos.js';
 
 
@@ -27,3 +27,4 @@ billingRouter.get( '/getLeadProducts/:email', isAllowedSessionHandler, validate(
 billingRouter.get( '/getClientProducts/:id', isAllowedSessionHandler, validate( clientProductsValid ), getClientProducts );
 
 
+billingRouter.get( '/gst-lookup/:gstin', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Billing', permissions: [ 'isAdd' ] } ] } ), gstinLookup );

package/src/routes/invoice.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { createInvoice, invoiceDownload, invoiceDownloadBulk, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, invoiceAnnexure, updateInvoice, getClientBasePricing, deleteInvoice, approveInvoiceCsm, approveInvoiceFinance, approveInvoiceApproval } from '../controllers/invoice.controller.js';
+import { createInvoice, invoiceDownload, invoiceDownloadBulk, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, invoiceAnnexure, updateInvoice, getClientBasePricing, deleteInvoice, approveInvoiceCsm, approveInvoiceFinance, approveInvoiceApproval, recordPayment } from '../controllers/invoice.controller.js';
 import { isAllowedSessionHandler, accessVerification, validate } from 'tango-app-api-middleware';
 import { getInvoiceHeads, updateInvoiceHeads } from '../controllers/applicationDefault.controllers.js';
 import { updateInvoiceHeadsSchema } from '../dtos/validation.dtos.js';
@@ -29,6 +29,7 @@ invoiceRouter.post( '/pendingInvoices', isAllowedSessionHandler, pendingInvoices
 invoiceRouter.post( '/applyDiscount', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), applyDiscount );
 invoiceRouter.post( '/migrateInvoice', migrateInvoice );
 invoiceRouter.post( '/PaymentStatusChange', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), PaymentStatusChange );
+invoiceRouter.post( '/recordPayment', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), recordPayment );
 invoiceRouter.post( '/checkPaymentStatus', checkPaymentStatus );
 invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getInvoice );
 invoiceRouter.get( '/invoiceAnnexure/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceAnnexure );

package/src/services/paymentAccount.service.js

@@ -9,6 +9,11 @@ export const findOneAccount = ( query = {}, record = {} ) => {
 export const updateOneAccount = async ( query ={}, record={} ) => {
   return await model.paymentAccountModel.updateOne( query, { $set: record } );
 };
+
+export const createAccount = async ( record ) => {
+  return await model.paymentAccountModel.create( record );
+};
+
 export const aggregate = ( query = [] ) => {
   return model.paymentAccountModel.aggregate( query );
 };