tango-app-api-payment-subscription 3.4.3 → 3.5.0

package/src/controllers/invoice.controller.js

@@ -9,8 +9,58 @@ import Handlebars from '../utils/validations/helper/handlebar.helper.js';
 import fs from 'fs';
 import path from 'path';
 import htmlpdf from 'html-pdf-node';
+import archiver from 'archiver';
 import * as basepricingService from '../services/basePrice.service.js';
 import * as paymentAccountService from '../services/paymentAccount.service.js';
+import { symbolFor } from '../utils/currency.js';
+import { invoiceStatusEnum } from '../dtos/validation.dtos.js';
+import { findOneApplicationDefault } from '../services/applicationDefault.service.js';
+import * as assignedStoreService from '../services/assignedStore.service.js';
+
+// Pulls CSM + Finance head emails (stored under applicationDefault
+// type=invoice, subType=heads) AND the per-client CSMs assigned via
+// userAssignedStore (clientId + tangoUserType:'csm'). Returns a flat de-duped
+// array suitable for the SES CC field. Returns [] on any failure — invoice
+// email send should never fail because of missing settings or DB hiccups.
+async function getInvoiceCcEmails( clientId ) {
+  const collected = [];
+
+  // 1. Configured heads (global, applies to every invoice).
+  try {
+    const doc = await findOneApplicationDefault( { type: 'invoice', subType: 'heads' } );
+    const rows = ( doc && Array.isArray( doc.data ) ) ? doc.data : [];
+    for ( const row of rows ) {
+      const value = row?.email;
+      if ( Array.isArray( value ) ) {
+        for ( const e of value ) {
+          if ( typeof e === 'string' && e.trim() !== '' ) collected.push( e.trim() );
+        }
+      } else if ( typeof value === 'string' && value.trim() !== '' ) {
+        collected.push( value.trim() );
+      }
+    }
+  } catch ( err ) {
+    logger.error( { error: err, function: 'getInvoiceCcEmails.heads' } );
+  }
+
+  // 2. Per-client CSMs from userAssignedStore.
+  if ( clientId ) {
+    try {
+      const assigned = await assignedStoreService.find(
+          { clientId, tangoUserType: 'csm' },
+          { userEmail: 1 },
+      );
+      for ( const a of ( assigned || [] ) ) {
+        const e = a?.userEmail;
+        if ( typeof e === 'string' && e.trim() !== '' ) collected.push( e.trim() );
+      }
+    } catch ( err ) {
+      logger.error( { error: err, function: 'getInvoiceCcEmails.csm', clientId } );
+    }
+  }
+
+  return Array.from( new Set( collected ) );
+}
 
 export async function createInvoice( req, res ) {
   try {
@@ -129,7 +179,7 @@ export async function createInvoice( req, res ) {
         groupId: group._id,
         invoice: req.body.invoiceId ? req.body.invoiceId : `INV-${Finacialyear}-${invoiceNo}`,
         products: products,
-        status: 'pending',
+        status: 'pendingCsm',
         amount: Math.round( amount ),
         invoiceIndex: req.body.invoiceId ? findInvoice.invoiceIndex : invoiceNo,
         tax: taxList,
@@ -220,9 +270,9 @@ 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 = item.price.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+        item.price = Math.round( item.price ).toLocaleString( 'en-IN' );
         item.amount = item.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
-        item.currency = clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹';
+        item.currency = symbolFor( clientDetails?.paymentInvoice?.currencyType );
       } );
 
 
@@ -254,7 +304,7 @@ export async function invoiceDownload( req, res ) {
         PoNum: getgroup?.po,
         amountwords: AmountinWords,
         Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
-        currencyType: virtualAccount?.currency == 'dollar' ? '$' : '₹',
+        currencyType: symbolFor( virtualAccount?.currency ),
         totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
         invoiceDate,
         dueDate,
@@ -325,7 +375,7 @@ export async function invoiceDownload( req, res ) {
               storeName: '$stores.storeName',
               edgefirstFileDate: '$stores.edgefirstFileDate',
               workingdays: '$stores.products.workingdays',
-              currencyType: { $literal: clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹' },
+              currencyType: { $literal: symbolFor( clientDetails?.paymentInvoice?.currencyType ) },
             },
           },
           {
@@ -430,7 +480,16 @@ export async function invoiceDownload( req, res ) {
         content: html,
       };
       let options = {
-        format: 'A4', margin: {
+        executablePath: '/usr/bin/chromium',
+        args: [
+          '--no-sandbox',
+          '--disable-setuid-sandbox',
+          '--disable-dev-shm-usage',
+          '--no-zygote',
+          '--single-process',
+        ],
+        format: 'A4',
+        margin: {
           top: '0.5in',
           right: '0.5in',
           bottom: '0.5in',
@@ -459,9 +518,12 @@ export async function invoiceDownload( req, res ) {
           }
           const SES = JSON.parse( process.env.SES );
           let fromEmail = SES.accountsEmail;
-          console.log( fromEmail, getgroup.generateInvoiceTo, attachments );
+          // Load configured CSM + Finance heads PLUS the per-client CSMs from
+          // userAssignedStore as CC recipients on the invoice mail.
+          const ccEmails = await getInvoiceCcEmails( invoiceInfo.clientId );
+          console.log( fromEmail, getgroup.generateInvoiceTo, ccEmails, attachments );
 
-          const result = await sendEmailWithSES( getgroup.generateInvoiceTo, mailSubject, mailbody, attachments, fromEmail );
+          const result = await sendEmailWithSES( getgroup.generateInvoiceTo, mailSubject, mailbody, attachments, fromEmail, ccEmails.length ? ccEmails : undefined );
           console.log( result );
           let logObj = {
             userName: req.user?.userName,
@@ -478,11 +540,28 @@ export async function invoiceDownload( req, res ) {
           console.log( logObj );
           insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
           if ( result ) {
+            // Pipeline guard: this approve-via-download flow can only complete
+            // the final stage. Earlier stages must use /approveInvoiceCsm
+            // and /approveInvoiceFinance.
+            const current = await invoiceService.findOne( { _id: req.params.invoiceId } );
+            if ( current?.status !== 'pendingApproval' ) {
+              return res.sendError(
+                  `Cannot approve via download — invoice is at status '${current?.status}'. Advance it through the approval stages first.`,
+                  409,
+              );
+            }
             await invoiceService.updateOne( { _id: req.params.invoiceId }, { status: req.body.status } );
             return res.sendSuccess( result );
           }
         }
-        res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
+        const invoiceMonth = invoiceInfo.billingDate ?
+          dayjs( invoiceInfo.billingDate ).format( 'MMMM' ) :
+          ( invoiceInfo.monthOfbilling ? dayjs( invoiceInfo.monthOfbilling, 'MM' ).format( 'MMMM' ) : '' );
+        const brandName = getgroup?.registeredCompanyName || invoiceInfo.companyName || '';
+        const safeFilename = `${invoiceInfo.invoice}-${invoiceMonth}-${brandName}.pdf`
+            .replace( /[\r\n"\\]/g, '' )
+            .trim();
+        res.set( 'Content-Disposition', `attachment; filename="${safeFilename}"` );
         res.set( 'Content-Type', 'application/pdf' );
         res.send( pdfBuffer );
       } );
@@ -493,6 +572,316 @@ export async function invoiceDownload( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+async function buildInvoicePdfBuffer( invoiceId ) {
+  let invoiceInfo = await invoiceService.findOne( { _id: invoiceId } );
+  if ( !invoiceInfo ) {
+    throw new Error( `Invoice ${invoiceId} not found` );
+  }
+
+  let clientDetails = await clientService.findOne( { clientId: invoiceInfo.clientId } );
+  invoiceInfo.products.forEach( ( item, index ) => {
+    item.index = index + 1;
+    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.amount = item.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+    item.currency = symbolFor( clientDetails?.paymentInvoice?.currencyType );
+  } );
+
+  let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
+  invoiceInfo.totalAmount = Math.round( invoiceInfo.totalAmount );
+  let AmountinWords = inWords( invoiceInfo.totalAmount );
+  let getgroup;
+  if ( invoiceInfo.groupId ) {
+    getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
+  }
+  let days = getgroup?.paymentTerm ? getgroup?.paymentTerm : '30';
+  let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD/MM/YYYY' ) : dayjs().add( days, 'days' ).format( 'DD/MM/YYYY' );
+
+  let virtualAccount = await paymentAccountService.findOneAccount( { clientId: invoiceInfo.clientId } );
+
+  let invoiceData = {
+    ...invoiceInfo._doc,
+    clientName: clientDetails.clientName,
+    amount: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    extendDays: getgroup?.paymentTerm ? getgroup?.paymentTerm : '30',
+    address: clientDetails.billingDetails.billingAddress,
+    subtotal: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    companyName: invoiceInfo.companyName,
+    companyAddress: invoiceInfo.companyAddress,
+    PlaceOfSupply: invoiceInfo.PlaceOfSupply,
+    GSTNumber: invoiceInfo.GSTNumber,
+    PoNum: getgroup?.po,
+    amountwords: AmountinWords,
+    Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
+    currencyType: symbolFor( virtualAccount?.currency ),
+    totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    invoiceDate,
+    dueDate,
+    discountPercentage: invoiceInfo.discountPercentage ? invoiceInfo.discountPercentage : 0,
+    discountAmount: invoiceInfo.discountAmount ? invoiceInfo.discountAmount : 0,
+    logo: `${JSON.parse( process.env.URL ).apiDomain}/logo.png`,
+    uidomain: `${JSON.parse( process.env.URL ).domain}`,
+    attachAnnexure: getgroup?.attachAnnexure,
+    billingAddressLineOne: getgroup?.addressLineOne ? getgroup?.addressLineOne : invoiceInfo?.companyAddress,
+    billingAddressLineTwo: getgroup?.addressLineTwo,
+    billingCountry: getgroup?.country,
+    billingState: getgroup?.state,
+    billingCity: getgroup?.city,
+    billingPinCode: getgroup?.pinCode,
+    billingCurrency: virtualAccount?.currency,
+    virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
+    virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
+  };
+
+  if ( invoiceData?.tax?.length ) {
+    invoiceData.tax.forEach( ( item ) => {
+      if ( item.taxAmount ) {
+        item.taxAmount = Number( item.taxAmount );
+        item.taxAmount = item.taxAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+      }
+    } );
+  }
+
+  const currentMonthDays = dayjs().daysInMonth();
+
+  if ( getgroup?.attachAnnexure ) {
+    let annuxureData = await dailyPricingService.aggregate( [
+      { $match: { clientId: invoiceInfo.clientId } },
+      { $sort: { dateISO: -1 } },
+      { $limit: 1 },
+      { $project: { stores: { $filter: { input: '$stores', as: 'item', cond: { $in: [ '$$item.storeId', getgroup?.stores ] } } } } },
+      { $unwind: { path: '$stores', preserveNullAndEmptyArrays: false } },
+      { $unwind: { path: '$stores.products', preserveNullAndEmptyArrays: false } },
+      { $project: {
+        productName: '$stores.products.productName',
+        storeId: '$stores.storeId',
+        storeName: '$stores.storeName',
+        edgefirstFileDate: '$stores.edgefirstFileDate',
+        workingdays: '$stores.products.workingdays',
+        currencyType: { $literal: symbolFor( clientDetails?.paymentInvoice?.currencyType ) },
+      } },
+      { $sort: { productName: 1, workingdays: -1 } },
+      { $match: { workingdays: { $gt: 0 } } },
+      { $lookup: {
+        from: 'basepricings',
+        let: { clientId: invoiceInfo.clientId },
+        pipeline: [
+          { $match: { $expr: { $eq: [ '$clientId', '$$clientId' ] } } },
+          { $project: { standard: 1, step: 1 } },
+        ],
+        as: 'basepricing',
+      } },
+      { $unwind: { path: '$basepricing', preserveNullAndEmptyArrays: true } },
+      { $project: {
+        productName: 1,
+        workingdays: 1,
+        storeName: 1,
+        currencyType: 1,
+        edgefirstFileDate: { $ifNull: [ '$edgefirstFileDate', '$processfirstFileDate' ] },
+        storeId: 1,
+        standard: { $filter: { input: '$basepricing.standard', as: 'standard', cond: { $eq: [ '$$standard.productName', '$productName' ] } } },
+        step: '$basepricing.step',
+      } },
+      { $unwind: { path: '$standard', preserveNullAndEmptyArrays: true } },
+      { $project: {
+        productName: {
+          $concat: [
+            { $toUpper: { $substr: [ '$productName', 0, 1 ] } },
+            { $substr: [ '$productName', 1, { $strLenCP: '$productName' } ] },
+          ],
+        },
+        currencyType: 1,
+        workingdays: 1,
+        storeName: 1,
+        edgefirstFileDate: { $dateToString: { format: '%Y-%m-%d', date: '$edgefirstFileDate' } },
+        storeId: 1,
+        period: { $cond: { if: { $lt: [ '$workingdays', currentMonthDays ] }, then: 'prorate', else: 'fullmonth' } },
+        standardPrice: '$standard.negotiatePrice',
+        runningCost: { $round: [ { $multiply: [ { $divide: [ '$standard.negotiatePrice', currentMonthDays ] }, '$workingdays' ] }, 2 ] },
+      } },
+    ] );
+    invoiceData.annuxureData = annuxureData;
+  }
+
+  const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
+  const template = Handlebars.compile( templateHtml );
+  const html = template( { ...invoiceData } );
+  let file = { content: html };
+  let options = {
+    executablePath: '/usr/bin/chromium',
+    args: [ '--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage', '--no-zygote', '--single-process' ],
+    format: 'A4',
+    margin: { top: '0.5in', right: '0.5in', bottom: '0.5in', left: '0.5in' },
+    printBackground: true,
+    preferCSSPageSize: true,
+  };
+
+  const pdfBuffer = await htmlpdf.generatePdf( file, options );
+
+  const invoiceMonth = invoiceInfo.billingDate ?
+    dayjs( invoiceInfo.billingDate ).format( 'MMMM' ) :
+    ( invoiceInfo.monthOfbilling ? dayjs( invoiceInfo.monthOfbilling, 'MM' ).format( 'MMMM' ) : '' );
+  const brandName = getgroup?.registeredCompanyName || invoiceInfo.companyName || '';
+  const filename = `${invoiceInfo.invoice}-${invoiceMonth}-${brandName}.pdf`
+      .replace( /[\r\n"\\]/g, '' )
+      .trim();
+
+  return { pdfBuffer, filename };
+}
+
+export async function invoiceDownloadBulk( req, res ) {
+  try {
+    const invoiceIds = req.body?.invoiceIds;
+    if ( !Array.isArray( invoiceIds ) || invoiceIds.length === 0 ) {
+      return res.sendError( 'invoiceIds must be a non-empty array', 400 );
+    }
+
+    let brandSlug = 'invoices';
+    try {
+      const firstInvoice = await invoiceService.findOne( { _id: invoiceIds[0] } );
+      if ( firstInvoice ) {
+        const firstClient = await clientService.findOne( { clientId: firstInvoice.clientId } );
+        if ( firstClient?.clientName ) {
+          brandSlug = firstClient.clientName
+              .toLowerCase()
+              .replace( /[^a-z0-9]+/g, '-' )
+              .replace( /^-|-$/g, '' ) || 'invoices';
+        }
+      }
+    } catch ( e ) {
+      logger.error( { error: e, function: 'invoiceDownloadBulk.brandSlug' } );
+    }
+
+    const zipFilename = `invoices-${brandSlug}-${dayjs().format( 'YYYY-MM-DD' )}.zip`;
+    res.set( 'Content-Type', 'application/zip' );
+    res.set( 'Content-Disposition', `attachment; filename="${zipFilename}"` );
+
+    const archive = archiver( 'zip', { zlib: { level: 6 } } );
+    archive.on( 'error', ( err ) => {
+      logger.error( { error: err, function: 'invoiceDownloadBulk.archiver' } );
+      archive.abort();
+      if ( !res.headersSent ) {
+        return res.sendError( err, 500 );
+      }
+      res.destroy( err );
+    } );
+    archive.pipe( res );
+
+    const errors = [];
+    for ( const id of invoiceIds ) {
+      try {
+        const { pdfBuffer, filename } = await buildInvoicePdfBuffer( id );
+        archive.append( pdfBuffer, { name: filename } );
+      } catch ( err ) {
+        logger.error( { error: err, function: 'invoiceDownloadBulk', invoiceId: id } );
+        errors.push( { id, reason: err?.message || String( err ) } );
+      }
+    }
+
+    if ( errors.length > 0 ) {
+      const errorsText = errors
+          .map( ( e ) => `${e.id}\t${e.reason}` )
+          .join( '\n' );
+      archive.append(
+          `The following invoices could not be included in this archive:\n\nID\tReason\n${errorsText}\n`,
+          { name: 'errors.txt' },
+      );
+    }
+
+    await archive.finalize();
+  } catch ( error ) {
+    logger.error( { error: error, function: 'invoiceDownloadBulk' } );
+    if ( !res.headersSent ) {
+      return res.sendError( error, 500 );
+    }
+  }
+}
+
+export async function invoiceAnnexure( req, res ) {
+  try {
+    const invoiceInfo = await invoiceService.findOne( { _id: req.params.invoiceId } );
+    if ( !invoiceInfo ) {
+      return res.sendError( 'Invoice not found', 404 );
+    }
+
+    let getgroup;
+    if ( invoiceInfo.groupId ) {
+      getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
+    }
+
+    if ( !getgroup?.attachAnnexure ) {
+      return res.sendSuccess( { data: [] } );
+    }
+
+    const clientDetails = await clientService.findOne( { clientId: invoiceInfo.clientId } );
+    const currentMonthDays = dayjs().daysInMonth();
+
+    const annexureData = await dailyPricingService.aggregate( [
+      { $match: { clientId: invoiceInfo.clientId } },
+      { $sort: { dateISO: -1 } },
+      { $limit: 1 },
+      { $project: { stores: { $filter: { input: '$stores', as: 'item', cond: { $in: [ '$$item.storeId', getgroup?.stores ?? [] ] } } } } },
+      { $unwind: { path: '$stores', preserveNullAndEmptyArrays: false } },
+      { $unwind: { path: '$stores.products', preserveNullAndEmptyArrays: false } },
+      { $project: {
+        productName: '$stores.products.productName',
+        storeId: '$stores.storeId',
+        storeName: '$stores.storeName',
+        edgefirstFileDate: '$stores.edgefirstFileDate',
+        workingdays: '$stores.products.workingdays',
+        currencyType: { $literal: symbolFor( clientDetails?.paymentInvoice?.currencyType ) },
+      } },
+      { $sort: { productName: 1, workingdays: -1 } },
+      { $match: { workingdays: { $gt: 0 } } },
+      { $lookup: {
+        from: 'basepricings',
+        let: { clientId: invoiceInfo.clientId },
+        pipeline: [
+          { $match: { $expr: { $eq: [ '$clientId', '$$clientId' ] } } },
+          { $project: { standard: 1, step: 1 } },
+        ],
+        as: 'basepricing',
+      } },
+      { $unwind: { path: '$basepricing', preserveNullAndEmptyArrays: true } },
+      { $project: {
+        productName: 1,
+        workingdays: 1,
+        storeName: 1,
+        currencyType: 1,
+        edgefirstFileDate: { $ifNull: [ '$edgefirstFileDate', '$processfirstFileDate' ] },
+        storeId: 1,
+        standard: { $filter: { input: '$basepricing.standard', as: 'standard', cond: { $eq: [ '$$standard.productName', '$productName' ] } } },
+        step: '$basepricing.step',
+      } },
+      { $unwind: { path: '$standard', preserveNullAndEmptyArrays: true } },
+      { $project: {
+        productName: {
+          $concat: [
+            { $toUpper: { $substr: [ '$productName', 0, 1 ] } },
+            { $substr: [ '$productName', 1, { $strLenCP: '$productName' } ] },
+          ],
+        },
+        currencyType: 1,
+        workingdays: 1,
+        storeName: 1,
+        edgefirstFileDate: { $dateToString: { format: '%Y-%m-%d', date: '$edgefirstFileDate' } },
+        storeId: 1,
+        period: { $cond: { if: { $lt: [ '$workingdays', currentMonthDays ] }, then: 'prorate', else: 'fullmonth' } },
+        standardPrice: '$standard.negotiatePrice',
+        runningCost: { $round: [ { $multiply: [ { $divide: [ '$standard.negotiatePrice', currentMonthDays ] }, '$workingdays' ] }, 2 ] },
+      } },
+    ] );
+
+    return res.sendSuccess( { data: annexureData } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'invoiceAnnexure', invoiceId: req.params.invoiceId } );
+    return res.sendError( error, 500 );
+  }
+}
+
 function inWords( num ) {
   let a = [ '', 'one ', 'two ', 'three ', 'four ', 'five ', 'six ', 'seven ', 'eight ', 'nine ', 'ten ', 'eleven ', 'twelve ', 'thirteen ', 'fourteen ', 'fifteen ', 'sixteen ', 'seventeen ', 'eighteen ', 'nineteen ' ]; let b = [ '', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety' ];
   if ( ( num = num.toString() ).length > 9 ) return 'overflow';
@@ -607,7 +996,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: { $sum: 1 },
         totalZoneCount: { $sum: '$zoneCount' },
-        totalCameraCount: { $sum: '$cameraCount' },
+        totalTrafficCameraCount: { $sum: '$trafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$zoneCameraCount' },
       },
     },
     {
@@ -617,7 +1007,8 @@ async function standardPrice( group, getClient, baseDate ) {
         workingdays: '$_id.workingdays',
         storeCount: '$storeCount',
         totalZoneCount: '$totalZoneCount',
-        totalCameraCount: '$totalCameraCount',
+        totalTrafficCameraCount: '$totalTrafficCameraCount',
+        totalZoneCameraCount: '$totalZoneCameraCount',
       },
     },
     {
@@ -651,7 +1042,8 @@ async function standardPrice( group, getClient, baseDate ) {
         workingdays: 1,
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         standard: {
           $filter: {
             input: '$basepricing.standard',
@@ -678,7 +1070,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         standardPrice: '$standard.negotiatePrice',
         runningCost: {
           $round: [
@@ -725,7 +1118,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: { $sum: '$storeCount' },
         totalZoneCount: { $sum: '$totalZoneCount' },
-        totalCameraCount: { $sum: '$totalCameraCount' },
+        totalTrafficCameraCount: { $sum: '$totalTrafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$totalZoneCameraCount' },
         amount: { $sum: '$perstorecost' },
       },
     },
@@ -739,7 +1133,8 @@ async function standardPrice( group, getClient, baseDate ) {
         },
         storeCount: 1,
         totalZoneCount: 1,
-        totalCameraCount: 1,
+        totalTrafficCameraCount: 1,
+        totalZoneCameraCount: 1,
         amount: 1,
         description: {
           $cond: {
@@ -843,8 +1238,12 @@ async function standardPrice( group, getClient, baseDate ) {
       if ( store.productName === 'tangoZone' ) {
         if ( productBillingType === 'perZone' && store.zoneCount > 0 ) {
           storeCount = store.zoneCount;
-        } else if ( productBillingType === 'perCamera' && store.cameraCount > 0 ) {
-          storeCount = store.cameraCount;
+        } else if ( productBillingType === 'perCamera' && store.zoneCameraCount > 0 ) {
+          storeCount = store.zoneCameraCount;
+        }
+      } else if ( store.productName === 'tangoTraffic' ) {
+        if ( productBillingType === 'perCamera' && store.trafficCameraCount > 0 ) {
+          storeCount = store.trafficCameraCount;
         }
       }
 
@@ -872,20 +1271,26 @@ async function standardPrice( group, getClient, baseDate ) {
   // Filter out eachStore products from aggregated results
   products = products.filter( ( p ) => !eachStoreProductNames.includes( p.productName ) );
 
-  // Adjust storeCount based on billingType for tangoZone (overallStore products only)
+  // Adjust storeCount based on billingType for tangoZone and tangoTraffic (overallStore products only)
   products = products.map( ( product ) => {
     let productBillingType = billingTypeMap[product.productName] || 'perStore';
     if ( product.productName === 'tangoZone' ) {
       if ( productBillingType === 'perZone' && product.totalZoneCount > 0 ) {
         product.amount = product.price * product.totalZoneCount;
         product.storeCount = product.totalZoneCount;
-      } else if ( productBillingType === 'perCamera' && product.totalCameraCount > 0 ) {
-        product.amount = product.price * product.totalCameraCount;
-        product.storeCount = product.totalCameraCount;
+      } else if ( productBillingType === 'perCamera' && product.totalZoneCameraCount > 0 ) {
+        product.amount = product.price * product.totalZoneCameraCount;
+        product.storeCount = product.totalZoneCameraCount;
+      }
+    } else if ( product.productName === 'tangoTraffic' ) {
+      if ( productBillingType === 'perCamera' && product.totalTrafficCameraCount > 0 ) {
+        product.amount = product.price * product.totalTrafficCameraCount;
+        product.storeCount = product.totalTrafficCameraCount;
       }
     }
     delete product.totalZoneCount;
-    delete product.totalCameraCount;
+    delete product.totalTrafficCameraCount;
+    delete product.totalZoneCameraCount;
     return product;
   } );
 
@@ -991,7 +1396,8 @@ async function stepPrice( group, getClient ) {
         },
         storeCount: { $sum: 1 },
         totalZoneCount: { $sum: '$zoneCount' },
-        totalCameraCount: { $sum: '$cameraCount' },
+        totalTrafficCameraCount: { $sum: '$trafficCameraCount' },
+        totalZoneCameraCount: { $sum: '$zoneCameraCount' },
       },
     },
     {
@@ -1001,7 +1407,8 @@ async function stepPrice( group, getClient ) {
         workingdays: '$_id.workingdays',
         storeCount: '$storeCount',
         totalZoneCount: '$totalZoneCount',
-        totalCameraCount: '$totalCameraCount',
+        totalTrafficCameraCount: '$totalTrafficCameraCount',
+        totalZoneCameraCount: '$totalZoneCameraCount',
       },
     },
     {
@@ -1083,8 +1490,12 @@ async function stepPrice( group, getClient ) {
       if ( store.productName === 'tangoZone' ) {
         if ( productBillingType === 'perZone' && store.zoneCount > 0 ) {
           storeCount = store.zoneCount;
-        } else if ( productBillingType === 'perCamera' && store.cameraCount > 0 ) {
-          storeCount = store.cameraCount;
+        } else if ( productBillingType === 'perCamera' && store.zoneCameraCount > 0 ) {
+          storeCount = store.zoneCameraCount;
+        }
+      } else if ( store.productName === 'tangoTraffic' ) {
+        if ( productBillingType === 'perCamera' && store.trafficCameraCount > 0 ) {
+          storeCount = store.trafficCameraCount;
         }
       }
 
@@ -1114,18 +1525,23 @@ async function stepPrice( group, getClient ) {
   // Filter out eachStore products from aggregated results
   products = products.filter( ( p ) => !eachStoreProductNames.includes( p.productName ) );
 
-  // Adjust storeCount based on billingType for tangoZone (overallStore only)
+  // Adjust storeCount based on billingType for tangoZone and tangoTraffic (overallStore only)
   products = products.map( ( product ) => {
     let productBillingType = billingTypeMap[product.productName] || 'perStore';
     if ( product.productName === 'tangoZone' ) {
       if ( productBillingType === 'perZone' && product.totalZoneCount > 0 ) {
         product.storeCount = product.totalZoneCount;
-      } else if ( productBillingType === 'perCamera' && product.totalCameraCount > 0 ) {
-        product.storeCount = product.totalCameraCount;
+      } else if ( productBillingType === 'perCamera' && product.totalZoneCameraCount > 0 ) {
+        product.storeCount = product.totalZoneCameraCount;
+      }
+    } else if ( product.productName === 'tangoTraffic' ) {
+      if ( productBillingType === 'perCamera' && product.totalTrafficCameraCount > 0 ) {
+        product.storeCount = product.totalTrafficCameraCount;
       }
     }
     delete product.totalZoneCount;
-    delete product.totalCameraCount;
+    delete product.totalTrafficCameraCount;
+    delete product.totalZoneCameraCount;
     return product;
   } );
 
@@ -1700,6 +2116,13 @@ export async function updateInvoice( req, res ) {
       }
     } );
 
+    // Guard: updateInvoice is an admin override that can set arbitrary status
+    // values (including skipping pipeline stages or moving backward). Reject
+    // values outside the enum to keep the DB consistent.
+    if ( updateData.status && !invoiceStatusEnum.includes( updateData.status ) ) {
+      return res.sendError( `Invalid status value: ${updateData.status}. Must be one of: ${invoiceStatusEnum.join( ', ' )}`, 400 );
+    }
+
     if ( req.body.billingDate ) {
       updateData.createdAt = new Date( req.body.billingDate );
     }
@@ -1773,3 +2196,74 @@ export async function getClientBasePricing( req, res ) {
   }
 }
 
+export async function deleteInvoice( req, res ) {
+  try {
+    const { invoiceId } = req.params;
+    if ( !invoiceId ) {
+      return res.sendError( 'Invoice ID is required', 400 );
+    }
+
+    const invoice = await invoiceService.findOne( { _id: invoiceId } );
+    if ( !invoice ) {
+      return res.sendError( 'Invoice not found', 404 );
+    }
+
+    await invoiceService.deleteRecord( { _id: invoiceId } );
+
+    res.sendSuccess( { message: 'Invoice deleted successfully' } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'deleteInvoice' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+async function transitionInvoiceStatus( req, res, fromStatus, toStatus ) {
+  try {
+    const { invoiceId } = req.body;
+
+    const invoice = await invoiceService.findOne( { _id: invoiceId } );
+    if ( !invoice ) {
+      return res.sendError( 'Invoice not found', 404 );
+    }
+
+    if ( invoice.status !== fromStatus ) {
+      return res.sendError(
+          `Invoice is currently at status '${invoice.status}', not '${fromStatus}'. Another user may have advanced it.`,
+          409,
+      );
+    }
+
+    await invoiceService.updateOne( { _id: invoiceId }, { status: toStatus } );
+
+    insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, {
+      userName: req.user?.userName,
+      email: req.user?.email,
+      clientId: invoice.clientId,
+      logSubType: 'invoiceStatusTransition',
+      logType: 'invoice',
+      date: new Date(),
+      changes: [ `Invoice ${invoice.invoice} advanced from ${fromStatus} to ${toStatus} by ${req.user?.email}` ],
+      eventType: '',
+      timestamp: new Date(),
+      showTo: [ 'tango' ],
+    } );
+
+    return res.sendSuccess( { invoiceId, fromStatus, status: toStatus } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'transitionInvoiceStatus', fromStatus, toStatus, invoiceId: req.body?.invoiceId } );
+    return res.sendError( error, 500 );
+  }
+}
+
+export async function approveInvoiceCsm( req, res ) {
+  return transitionInvoiceStatus( req, res, 'pendingCsm', 'pendingFinance' );
+}
+
+export async function approveInvoiceFinance( req, res ) {
+  return transitionInvoiceStatus( req, res, 'pendingFinance', 'pendingApproval' );
+}
+
+export async function approveInvoiceApproval( req, res ) {
+  return transitionInvoiceStatus( req, res, 'pendingApproval', 'approved' );
+}
+