tango-app-api-payment-subscription 3.5.7 → 3.5.9

package/src/controllers/estimate.controller.js

@@ -1,12 +1,77 @@
 import * as estimateService from '../services/estimate.service.js';
 import * as clientService from '../services/clientPayment.services.js';
+import * as billingService from '../services/billing.service.js';
 import dayjs from 'dayjs';
-import { logger, download } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES } from 'tango-app-api-middleware';
 import Handlebars from '../utils/validations/helper/handlebar.helper.js';
 import fs from 'fs';
 import path from 'path';
 import htmlpdf from 'html-pdf-node';
 import { symbolFor } from '../utils/currency.js';
+import { getInvoiceCcEmails } from './invoice.controller.js';
+
+// Build the estimate PDF buffer + the template data + a safe filename. Shared
+// by the download and send flows so both render the identical document.
+async function buildEstimatePdf( estimate ) {
+  const e = estimate._doc || estimate;
+  const currencyType = symbolFor( e.currency );
+  const fmt = ( n ) => Number( n || 0 ).toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+
+  const products = ( e.products || [] ).map( ( p, i ) => {
+    let name = String( p.productName || '' ).replace( /([a-z])([A-Z])/g, '$1 $2' );
+    name = name.charAt( 0 ).toUpperCase() + name.slice( 1 );
+    return {
+      index: i + 1,
+      productName: name,
+      description: p.description || '',
+      hsn: p.hsn || p.hsnCode || '998314',
+      storeCount: p.storeCount || e.stores || '',
+      price: fmt( p.price ),
+      amount: fmt( p.amount ),
+    };
+  } );
+  const tax = ( e.tax || [] ).map( ( t ) => ( {
+    type: t.type || t.taxName || t.name || 'GST',
+    value: t.value ?? t.taxPercentage ?? t.percentage ?? '',
+    taxAmount: fmt( t.taxAmount ),
+  } ) );
+
+  const statusLabelMap = { pending: 'Pending', sent: 'Sent', accepted: 'Accepted', declined: 'Declined', expired: 'Expired' };
+  const data = {
+    estimate: e.estimate,
+    status: e.status,
+    statusLabel: statusLabelMap[e.status] || e.status,
+    companyName: e.companyName || '',
+    companyAddress: e.companyAddress || '',
+    GSTNumber: e.GSTNumber || '',
+    PlaceOfSupply: e.PlaceOfSupply || '',
+    groupName: e.groupName || '',
+    period: e.period || '',
+    createdDate: e.createdDate ? dayjs( e.createdDate ).format( 'DD/MM/YYYY' ) : '',
+    validTill: e.validTill ? dayjs( e.validTill ).format( 'DD/MM/YYYY' ) : '',
+    currencyType,
+    amount: fmt( e.amount ),
+    totalAmount: fmt( e.totalAmount ),
+    products,
+    tax,
+    notes: e.notes || '',
+    logo: `${JSON.parse( process.env.URL ).apiDomain}/logo.png`,
+  };
+
+  const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/estimatePdf.hbs', 'utf8' );
+  const html = Handlebars.compile( templateHtml )( data );
+  const 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( { content: html }, options );
+  const filename = ( e.estimate + '-' + ( e.companyName || 'estimate' ) + '.pdf' ).split( '/' ).join( '_' ).split( '"' ).join( '' ).trim();
+  return { pdfBuffer, filename, data };
+}
 
 // ---------------------------------------------------------------------------
 // Estimates (quotations). A lightweight pre-invoice document with its own
@@ -43,7 +108,7 @@ async function nextEstimateNumber() {
 // flips to 'expired' so the list reflects reality without a cron.
 async function expireOverdue( clientId ) {
   await estimateService.updateOne(
-      { clientId, status: { $in: [ 'draft', 'sent' ] }, validTill: { $lt: new Date() } },
+      { clientId, status: { $in: [ 'pending', 'sent' ] }, validTill: { $lt: new Date() } },
       { $set: { status: 'expired' } },
   );
 }
@@ -119,7 +184,7 @@ export async function estimateList( req, res ) {
       { $match: { clientId } },
       { $group: { _id: '$status', count: { $sum: 1 } } },
     ] );
-    const counts = { draft: 0, sent: 0, accepted: 0, declined: 0, expired: 0, total: 0 };
+    const counts = { pending: 0, sent: 0, accepted: 0, declined: 0, expired: 0, total: 0 };
     statusAgg.forEach( ( s ) => {
       if ( counts[s._id] != null ) {
         counts[s._id] = s.count;
@@ -175,7 +240,7 @@ export async function createEstimate( req, res ) {
       amount,
       totalAmount,
       currency: b.currency || ( client?.paymentInvoice?.currencyType === 'dollar' ? 'dollar' : 'inr' ),
-      status: b.status === 'sent' ? 'sent' : 'draft',
+      status: b.status === 'sent' ? 'sent' : 'pending',
       createdDate,
       validTill,
       createdBy: req.user?.email || req.user?.userName || '',
@@ -191,6 +256,69 @@ export async function createEstimate( req, res ) {
   }
 }
 
+export async function updateEstimate( req, res ) {
+  try {
+    const b = req.body || {};
+    const estimateId = b._id || b.estimateId || req.params.estimateId;
+    if ( !estimateId ) {
+      return res.sendError( 'estimateId is required', 400 );
+    }
+
+    const existing = await estimateService.findOne( { _id: estimateId } );
+    if ( !existing ) {
+      return res.sendError( 'Estimate not found', 404 );
+    }
+    // Accepted estimates are locked — mirrors the delete guard.
+    if ( ( existing._doc || existing ).status === 'accepted' ) {
+      return res.sendError( 'An accepted estimate cannot be edited.', 409 );
+    }
+
+    const amount = Math.round( Number( b.amount ) || 0 );
+    let totalAmount = Math.round( Number( b.totalAmount ) || 0 );
+    if ( !totalAmount && amount ) {
+      totalAmount = Math.round( amount * 1.18 );
+    }
+
+    // Only the editable fields are updated. The estimate number, index,
+    // clientId and createdDate are immutable so the document keeps its
+    // identity and financial-year sequence.
+    const update = {
+      companyName: b.companyName ?? existing.companyName,
+      companyAddress: b.companyAddress ?? existing.companyAddress,
+      PlaceOfSupply: b.PlaceOfSupply ?? existing.PlaceOfSupply,
+      GSTNumber: b.GSTNumber ?? existing.GSTNumber,
+      groupId: b.groupId || existing.groupId,
+      groupName: b.groupName || existing.groupName,
+      stores: Number( b.stores ) || 0,
+      products: Array.isArray( b.products ) ? b.products : existing.products,
+      tax: Array.isArray( b.tax ) ? b.tax : existing.tax,
+      amount,
+      totalAmount,
+      currency: b.currency || existing.currency,
+      notes: b.notes ?? existing.notes,
+      updatedBy: req.user?.email || req.user?.userName || '',
+    };
+    if ( b.validTill ) {
+      update.validTill = new Date( b.validTill );
+    }
+    if ( b.period ) {
+      update.period = b.period;
+    }
+    // Allow a status nudge (e.g. draft → sent) on save, but never to accepted.
+    if ( b.status && [ 'pending', 'sent' ].includes( b.status ) ) {
+      update.status = b.status;
+    }
+
+    await estimateService.updateOne( { _id: estimateId }, { $set: update } );
+    const saved = await estimateService.findOne( { _id: estimateId } );
+    logger.info?.( { function: 'updateEstimate', estimateId } );
+    return res.sendSuccess( saved );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'updateEstimate' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function getEstimate( req, res ) {
   try {
     const estimate = await estimateService.findOne( { _id: req.params.estimateId } );
@@ -207,7 +335,7 @@ export async function getEstimate( req, res ) {
 export async function estimateStatusUpdate( req, res ) {
   try {
     const { estimateId, status } = req.body || {};
-    const allowed = [ 'draft', 'sent', 'accepted', 'declined', 'expired' ];
+    const allowed = [ 'pending', 'sent', 'accepted', 'declined', 'expired' ];
     if ( !estimateId || !allowed.includes( status ) ) {
       return res.sendError( 'estimateId and a valid status are required', 400 );
     }
@@ -230,66 +358,7 @@ export async function downloadEstimate( req, res ) {
     if ( !estimate ) {
       return res.sendError( 'Estimate not found', 404 );
     }
-    const e = estimate._doc || estimate;
-    const currencyType = symbolFor( e.currency );
-    const fmt = ( n ) => Number( n || 0 ).toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
-
-    const products = ( e.products || [] ).map( ( p, i ) => {
-      let name = String( p.productName || '' ).replace( /([a-z])([A-Z])/g, '$1 $2' );
-      name = name.charAt( 0 ).toUpperCase() + name.slice( 1 );
-      return {
-        index: i + 1,
-        productName: name,
-        description: p.description || '',
-        hsn: p.hsn || p.hsnCode || '998314',
-        storeCount: p.storeCount || e.stores || '',
-        price: fmt( p.price ),
-        amount: fmt( p.amount ),
-      };
-    } );
-    const tax = ( e.tax || [] ).map( ( t ) => ( {
-      type: t.type || t.taxName || t.name || 'GST',
-      value: t.value ?? t.taxPercentage ?? t.percentage ?? '',
-      taxAmount: fmt( t.taxAmount ),
-    } ) );
-
-    const statusLabelMap = { draft: 'Draft', sent: 'Sent', accepted: 'Accepted', declined: 'Declined', expired: 'Expired' };
-    const data = {
-      estimate: e.estimate,
-      status: e.status,
-      statusLabel: statusLabelMap[e.status] || e.status,
-      companyName: e.companyName || '',
-      companyAddress: e.companyAddress || '',
-      GSTNumber: e.GSTNumber || '',
-      PlaceOfSupply: e.PlaceOfSupply || '',
-      groupName: e.groupName || '',
-      period: e.period || '',
-      createdDate: e.createdDate ? dayjs( e.createdDate ).format( 'DD/MM/YYYY' ) : '',
-      validTill: e.validTill ? dayjs( e.validTill ).format( 'DD/MM/YYYY' ) : '',
-      currencyType,
-      amount: fmt( e.amount ),
-      totalAmount: fmt( e.totalAmount ),
-      products,
-      tax,
-      notes: e.notes || '',
-      logo: `${JSON.parse( process.env.URL ).apiDomain}/logo.png`,
-    };
-
-    const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/estimatePdf.hbs', 'utf8' );
-    const template = Handlebars.compile( templateHtml );
-    const html = template( data );
-    const file = { content: html };
-    const 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 filename = ( e.estimate + '-' + ( e.companyName || 'estimate' ) + '.pdf' ).split( '/' ).join( '_' ).split( '"' ).join( '' ).trim();
+    const { pdfBuffer, filename } = await buildEstimatePdf( estimate );
     res.set( 'Content-Type', 'application/pdf' );
     res.set( 'Content-Disposition', `attachment; filename="${filename}"` );
     return res.send( pdfBuffer );
@@ -299,6 +368,71 @@ export async function downloadEstimate( req, res ) {
   }
 }
 
+// Approve & send an estimate: render the PDF, email it (with the PDF attached)
+// to the billing group's recipients — same recipient logic as invoice send —
+// then flip the status to 'sent'. Triggered by the Approve action's confirm.
+export async function sendEstimate( req, res ) {
+  try {
+    const estimateId = req.body?.estimateId || req.params?.estimateId;
+    if ( !estimateId ) {
+      return res.sendError( 'estimateId is required', 400 );
+    }
+    const estimate = await estimateService.findOne( { _id: estimateId } );
+    if ( !estimate ) {
+      return res.sendError( 'Estimate not found', 404 );
+    }
+    const e = estimate._doc || estimate;
+    if ( e.status === 'accepted' ) {
+      return res.sendError( 'An accepted estimate cannot be re-sent.', 409 );
+    }
+
+    // Recipients: billing group's generateInvoiceTo (TO) + invoice heads /
+    // assigned CSMs (CC) — identical to the invoice send flow.
+    let toEmails = [];
+    if ( e.groupId ) {
+      const group = await billingService.findOne( { _id: e.groupId } );
+      toEmails = ( group?.generateInvoiceTo || [] ).map( ( x ) => String( x || '' ).trim() ).filter( Boolean );
+    }
+    toEmails = [ ...new Set( toEmails ) ];
+    if ( !toEmails.length ) {
+      return res.sendError( 'To Email not Found — configure recipients on the billing group.', 400 );
+    }
+    const ccRaw = await getInvoiceCcEmails( e.clientId );
+    const toSet = new Set( toEmails.map( ( x ) => x.toLowerCase() ) );
+    const ccEmails = [ ...new Set( ( ccRaw || [] ).map( ( x ) => String( x || '' ).trim() ).filter( Boolean ) ) ]
+        .filter( ( x ) => !toSet.has( x.toLowerCase() ) );
+
+    const { pdfBuffer, filename, data } = await buildEstimatePdf( estimate );
+
+    const client = await clientService.findOne( { clientId: e.clientId }, { clientName: 1 } );
+    const emailData = {
+      ...data,
+      clientName: client?.clientName || e.companyName || 'Customer',
+      // The email is sent FROM Tango, so the sign-off is the sender — not the
+      // client's registered company name carried on the estimate.
+      companyName: 'Team Tango',
+    };
+    const emailHtml = Handlebars.compile(
+        fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/estimateEmail.hbs', 'utf8' ),
+    )( emailData );
+
+    const SES = JSON.parse( process.env.SES );
+    const fromEmail = SES.accountsEmail || SES.adminEmail;
+    const subject = `Estimate ${e.estimate} - Tango/${client?.clientName || e.companyName || ''}`;
+    const attachment = { filename, content: pdfBuffer, contentType: 'application/pdf' };
+
+    await sendEmailWithSES( toEmails, subject, emailHtml, attachment, fromEmail, ccEmails.length ? ccEmails : undefined );
+
+    // Mark sent only after a successful send.
+    await estimateService.updateOne( { _id: estimateId }, { $set: { status: 'sent' } } );
+    logger.info?.( { function: 'sendEstimate', estimateId, to: toEmails, cc: ccEmails } );
+    return res.sendSuccess( { estimateId, status: 'sent', sentTo: toEmails } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'sendEstimate' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function deleteEstimate( req, res ) {
   try {
     const estimate = await estimateService.findOne( { _id: req.params.estimateId } );
@@ -308,8 +442,10 @@ export async function deleteEstimate( req, res ) {
     if ( estimate.status === 'accepted' ) {
       return res.sendError( 'An accepted estimate cannot be deleted.', 409 );
     }
-    await estimateService.updateOne( { _id: req.params.estimateId }, { $set: { status: 'declined' } } );
-    return res.sendSuccess( 'Estimate removed' );
+    // Hard delete — remove the document from the collection (not a soft
+    // status change).
+    await estimateService.deleteOne( { _id: req.params.estimateId } );
+    return res.sendSuccess( 'Estimate deleted' );
   } catch ( error ) {
     logger.error( { error: error, function: 'deleteEstimate' } );
     return res.sendError( error, 500 );

package/src/controllers/invoice.controller.js

@@ -24,7 +24,7 @@ import { getUsdInrRate } from './brandsBilling.controller.js';
 // 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 ) {
+export async function getInvoiceCcEmails( clientId ) {
   const collected = [];
 
   // 1. Configured heads (global, applies to every invoice).
@@ -142,7 +142,8 @@ export async function createInvoice( req, res ) {
         clientId: req.body.clientId,
         groupId: req.body.groupId || undefined,
         groupName: req.body.groupName || '',
-        companyName: req.body.companyName || '',
+        // Company (registered) name is always stored uppercase on invoices.
+        companyName: ( req.body.companyName || '' ).toUpperCase(),
         companyAddress: req.body.companyAddress || '',
         GSTNumber: req.body.GSTNumber || '',
         PlaceOfSupply: req.body.PlaceOfSupply || '',
@@ -272,9 +273,15 @@ export async function createInvoice( req, res ) {
 
       ] );
 
-      let invoicedate = req.body.invoiceId ? dayjs( findInvoice.billingDate ).format( 'YYYY-MM-DD' ) : baseDate.format( 'YYYY-MM-DD' );
+      // billingDate is the actual invoice (creation) date — even for advance
+      // invoices. The advance MONTH is reflected only in the product lines /
+      // monthOfbilling (driven by baseDate), not in the billing date itself.
+      // (Regenerate keeps the original invoice's billingDate.)
+      const creationDate = dayjs();
+      let invoicedate = req.body.invoiceId ? dayjs( findInvoice.billingDate ).format( 'YYYY-MM-DD' ) : creationDate.format( 'YYYY-MM-DD' );
       let daysExtend = group?.paymentTerm ? group?.paymentTerm : 30;
-      let dueDate = baseDate.add( daysExtend, 'days' );
+      // Due date is relative to the billing (creation) date.
+      let dueDate = creationDate.add( daysExtend, 'days' );
       console.log( 'group.currencygroup.currency', group.currency );
       let data = {
         groupName: group.groupName,
@@ -285,7 +292,7 @@ export async function createInvoice( req, res ) {
         amount: Math.round( amount ),
         invoiceIndex: req.body.invoiceId ? findInvoice.invoiceIndex : invoiceNo,
         tax: taxList,
-        companyName: group.registeredCompanyName,
+        companyName: ( group.registeredCompanyName || '' ).toUpperCase(),
         companyAddress: address,
         PlaceOfSupply: group.placeOfSupply,
         GSTNumber: group.gst,
@@ -372,6 +379,10 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
   const billingMonthEnd = new Date( billingMonth.endOf( 'month' ).toISOString() );
   const monthDays = billingMonth.daysInMonth();
   const invoiceCurrency = symbolFor( invoiceInfo.currency );
+  // basepricing negotiatePrice is stored in INR. For non-INR invoices the
+  // annexure must convert it to the invoice currency, otherwise the INR number
+  // is shown verbatim under a $ symbol (e.g. ₹1650 rendered as "$1,650").
+  const annexFx = invoiceInfo.currency === 'dollar' ? ( await getUsdInrRate() ) : 1;
 
   const annexClient = await clientService.findOne( { clientId: invoiceInfo.clientId }, { 'planDetails.product': 1 } );
   const billingTypeMap = {};
@@ -432,7 +443,9 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
         units = s.trafficCameraCount;
       }
     }
-    const price = Number( s.standard?.negotiatePrice ) || 0;
+    // Convert the INR negotiatePrice into the invoice currency (annexFx = 1 for
+    // INR invoices, = USD→INR rate for dollar invoices, so divide).
+    const price = ( Number( s.standard?.negotiatePrice ) || 0 ) / annexFx;
     const runningCost = s.workingdays >= monthDays ?
       Math.round( price * units * 100 ) / 100 :
       Math.round( ( price / monthDays ) * s.workingdays * units * 100 ) / 100;
@@ -526,6 +539,10 @@ export async function invoiceDownload( req, res ) {
         billingCurrency: virtualAccount?.currency,
         virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
         virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
+        // GST applies only to domestic (INR) invoices. Gate the tax block on the
+        // invoice's OWN currency — not the payment-account currency, which is
+        // null/non-inr for many INR invoices and was dropping the GST rows.
+        gstApplicable: invoiceInfo.currency === 'inr',
       };
 
       if ( invoiceData?.tax?.length ) {
@@ -590,9 +607,20 @@ export async function invoiceDownload( req, res ) {
           // 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, ccEmails.length ? ccEmails : undefined );
+          // De-duplicate recipients so nobody gets the invoice 2-3 times:
+          // unique TO list, and drop from CC anyone already in TO (overlap
+          // between generateInvoiceTo, invoice heads and assigned CSMs was the
+          // cause of duplicate mails).
+          const toEmails = [ ...new Set(
+              ( getgroup.generateInvoiceTo || [] ).map( ( e ) => String( e || '' ).trim() ).filter( Boolean ),
+          ) ];
+          const toSet = new Set( toEmails.map( ( e ) => e.toLowerCase() ) );
+          const dedupedCc = [ ...new Set(
+              ( ccEmails || [] ).map( ( e ) => String( e || '' ).trim() ).filter( Boolean ),
+          ) ].filter( ( e ) => !toSet.has( e.toLowerCase() ) );
+          console.log( fromEmail, toEmails, dedupedCc, attachments );
+
+          const result = await sendEmailWithSES( toEmails, mailSubject, mailbody, attachments, fromEmail, dedupedCc.length ? dedupedCc : undefined );
           console.log( result );
           let logObj = {
             userName: req.user?.userName,
@@ -707,6 +735,8 @@ async function buildInvoicePdfBuffer( invoiceId ) {
     billingCurrency: virtualAccount?.currency,
     virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
     virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
+    // GST applies only to domestic (INR) invoices; gate on the invoice currency.
+    gstApplicable: invoiceInfo.currency === 'inr',
   };
 
   if ( invoiceData?.tax?.length ) {
@@ -818,6 +848,24 @@ export async function invoiceDownloadBulk( req, res ) {
   }
 }
 
+// Bank/beneficiary details for the invoice preview. Fixed beneficiary account
+// — hardcoded to match the PDF exactly (NOT read from the DB).
+export async function invoiceBankDetails( req, res ) {
+  try {
+    return res.sendSuccess( {
+      beneficiaryName: 'Tango IT Solutions India Private Limited',
+      accountNumber: '50200027441433',
+      ifsc: 'HDFC0000386',
+      swift: 'HDFCINBBCHE',
+      branch: 'Santhome, Chennai',
+      paymentType: 'Online',
+    } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'invoiceBankDetails', invoiceId: req.params.invoiceId } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function invoiceAnnexure( req, res ) {
   try {
     const invoiceInfo = await invoiceService.findOne( { _id: req.params.invoiceId } );
@@ -1290,8 +1338,12 @@ async function standardPrice( group, getClient, baseDate ) {
     return product;
   } );
 
-  // Combine overallStore and eachStore products
-  return [ ...products, ...eachStoreProducts ];
+  // Combine overallStore and eachStore products. Sort by product name so the
+  // persisted order is deterministic — MongoDB $group output order isn't
+  // guaranteed, which made products "interchange" between the Plans view, the
+  // stored invoice and regenerated invoices / PDF.
+  return [ ...products, ...eachStoreProducts ]
+      .sort( ( a, b ) => String( a.productName || '' ).localeCompare( String( b.productName || '' ) ) );
 }
 
 
@@ -1425,7 +1477,10 @@ async function stepPrice( group, getClient ) {
       },
     },
     {
+      // productName first so order is deterministic across views/PDF, then
+      // workingdays so step rows stay grouped consistently.
       $sort: {
+        productName: 1,
         workingdays: -1,
       },
     },
@@ -1854,6 +1909,24 @@ export async function clientInvoiceList( req, res ) {
     }
 
     if ( req.body.export ) {
+      // Due Status — mirrors the UI cell (getDueStatus) exactly so the column
+      // matches what reviewers see on screen. Paid / no-due-date show a dash;
+      // otherwise it's overdue / due today / due in N days from TODAY at
+      // day-granularity (time-of-day ignored on both ends).
+      const today = dayjs().startOf( 'day' );
+      const dueStatusOf = ( inv ) => {
+        if ( inv.paymentStatus === 'paid' || !inv.dueDate ) {
+          return '—';
+        }
+        const days = dayjs( inv.dueDate ).startOf( 'day' ).diff( today, 'day' );
+        if ( days < 0 ) {
+          return `Overdue by ${-days} day${days === -1 ? '' : 's'}`;
+        }
+        if ( days === 0 ) {
+          return 'Due today';
+        }
+        return `Due in ${days} day${days === 1 ? '' : 's'}`;
+      };
       const exportdata = [];
       count.forEach( ( element ) => {
         exportdata.push( {
@@ -1862,9 +1935,13 @@ export async function clientInvoiceList( req, res ) {
           'Invoice #': element.invoice,
           'Billing date': dayjs( element.billingDate ).format( 'DD MMM, YYYY' ),
           'Due Date': element.dueDate ? dayjs( element.dueDate ).format( 'DD MMM, YYYY' ) : '',
+          'Due Status': dueStatusOf( element ),
           'Group Name': element.groupName,
           'Amount Excl. GST': element.amount,
-          'GST Amount': element.gstAmount,
+          // GST only applies to domestic (INR) invoices. International invoices
+          // (dollar / euro / etc.) are billed without GST — show a dash to
+          // match the on-screen column rather than a misleading 0.
+          'GST Amount': element.currency === 'inr' ? element.gstAmount : '—',
           'Amount Incl. GST': element.totalAmount,
           'Stores': element.stores,
           'Payment Status': element.paymentStatus,
@@ -2468,7 +2545,10 @@ async function transitionInvoiceStatus( req, res, fromStatus, toStatus ) {
       return res.sendError( 'Invoice not found', 404 );
     }
 
-    if ( invoice.status !== fromStatus ) {
+    // Legacy 'pending' invoices are equivalent to the first CSM stage, so the
+    // CSM transition accepts either 'pendingCsm' or 'pending' as the source.
+    const acceptedFrom = fromStatus === 'pendingCsm' ? [ 'pendingCsm', 'pending' ] : [ fromStatus ];
+    if ( !acceptedFrom.includes( invoice.status ) ) {
       return res.sendError(
           `Invoice is currently at status '${invoice.status}', not '${fromStatus}'. Another user may have advanced it.`,
           409,