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

package/package.json

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

package/src/controllers/brandsBilling.controller.js

@@ -173,6 +173,21 @@ export async function brandsBillingList( req, res ) {
             dueInr: { $ifNull: [ '$invoiceData.dueInr', 0 ] },
             dueUsd: { $ifNull: [ '$invoiceData.dueUsd', 0 ] },
             nextBillingDate: { $ifNull: [ '$billingData.nextBillingDate', null ] },
+            // Whether billing is SET UP — true when a billing group exists (or
+            // live products are configured). Drives the Setup-Billing vs View
+            // button; must NOT depend on the volatile current-month run count.
+            billingConfigured: {
+              $or: [
+                { $ne: [ '$billingData', null ] },
+                { $gt: [ {
+                  $size: { $filter: {
+                    input: { $ifNull: [ '$planDetails.product', [] ] },
+                    as: 'prod',
+                    cond: { $eq: [ '$$prod.status', 'live' ] },
+                  } },
+                }, 0 ] },
+              ],
+            },
           },
         },
         {
@@ -184,6 +199,7 @@ export async function brandsBillingList( req, res ) {
             totalStores: 1,
             billingStores: 1,
             productsAdded: 1,
+            billingConfigured: 1,
             dueInr: 1,
             dueUsd: 1,
             status: 1,
@@ -1561,14 +1577,22 @@ export async function billingSummary( req, res ) {
     // email's local part since the collection carries no display name.
     const usdRate = await getUsdInrRate();
 
-    // Current month's store count comes from dailyPricing (latest reading
-    // this month) — invoices for the running month usually don't exist yet.
+    // Current month's store count comes from dailyPricing — counted the same
+    // way as Brands & Billing's "Billing Stores": distinct ACTIVE stores that
+    // RAN on more than one day in the month (a single-day appearance is
+    // transient and isn't billed). Invoices for the running month usually don't
+    // exist yet, so this is the current-month source.
     const curMonthStart = new Date( now.startOf( 'month' ).toISOString() );
     const latestDp = await dailyPriceService.aggregate( [
       { $match: { dateISO: { $gte: curMonthStart } } },
-      { $project: { clientId: 1, activeStores: 1, dateISO: 1 } },
-      { $sort: { dateISO: 1 } },
-      { $group: { _id: '$clientId', stores: { $last: '$activeStores' } } },
+      { $unwind: { path: '$stores', preserveNullAndEmptyArrays: false } },
+      { $match: { 'stores.status': 'active' } },
+      { $group: {
+        _id: { clientId: '$clientId', storeId: '$stores.storeId' },
+        days: { $addToSet: { $dateToString: { format: '%Y-%m-%d', date: '$dateISO' } } },
+      } },
+      { $match: { $expr: { $gt: [ { $size: '$days' }, 1 ] } } },
+      { $group: { _id: '$_id.clientId', stores: { $sum: 1 } } },
     ] );
     const curStoresByClient = new Map( latestDp.map( ( d ) => [ String( d._id ), d.stores || 0 ] ) );
 

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 || '',
@@ -240,7 +305,7 @@ export async function updateEstimate( req, res ) {
       update.period = b.period;
     }
     // Allow a status nudge (e.g. draft → sent) on save, but never to accepted.
-    if ( b.status && [ 'draft', 'sent' ].includes( b.status ) ) {
+    if ( b.status && [ 'pending', 'sent' ].includes( b.status ) ) {
       update.status = b.status;
     }
 
@@ -270,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 );
     }
@@ -293,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 );
@@ -362,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 } );
@@ -371,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).
@@ -273,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,
@@ -842,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 } );

package/src/hbs/estimateEmail.hbs

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Estimate</title>
+</head>
+<body style="margin:0;padding:0;background-color:#dbe5ea;font-family:'Inter',Arial,sans-serif;">
+  <table border="0" cellpadding="0" cellspacing="0" width="100%" style="padding:0 10px;">
+    <tr>
+      <td style="padding:32px 10px 0 10px;">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width:680px;margin:0 auto;" align="center">
+          <tr>
+            <td style="background-color:#ffffff;padding:24px 24px 0 18px;">
+              <img src="{{logo}}" width="200" height="100" alt="Tango Eye" style="vertical-align:middle;border:0;height:auto;">
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:0 24px;">
+              <p style="border-top:1px solid #CBD5E1;margin:0;"></p>
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:18px 24px 6px 30px;">
+              <span style="font-weight:700;color:#121A26;font-size:22px;line-height:32px;">Your estimate {{estimate}}</span>
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:14px 24px 4px 30px;font-size:16px;line-height:150%;color:#384860;">
+              <p style="margin:0;">Hi {{clientName}},</p>
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:10px 24px 6px 30px;font-size:16px;line-height:150%;color:#384860;">
+              <p style="margin:0;">Please find attached the estimate <strong>{{estimate}}</strong>{{#if period}} for <strong>{{period}}</strong>{{/if}}. A summary is shown below; the attached PDF has the full breakdown.</p>
+            </td>
+          </tr>
+
+          <tr>
+            <td style="background-color:#ffffff;padding:14px 24px 6px 30px;">
+              <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border:1px solid #E2E8F0;border-radius:8px;border-collapse:separate;overflow:hidden;">
+                <tr style="background-color:#F1F5F9;">
+                  <td style="padding:10px 14px;font-size:13px;color:#64748B;font-weight:600;">Estimate Number</td>
+                  <td style="padding:10px 14px;font-size:13px;color:#121A26;font-weight:700;text-align:right;">{{estimate}}</td>
+                </tr>
+                <tr>
+                  <td style="padding:10px 14px;font-size:13px;color:#64748B;font-weight:600;border-top:1px solid #E2E8F0;">Total Amount</td>
+                  <td style="padding:10px 14px;font-size:13px;color:#121A26;font-weight:700;text-align:right;border-top:1px solid #E2E8F0;">{{currencyType}} {{totalAmount}}</td>
+                </tr>
+                <tr>
+                  <td style="padding:10px 14px;font-size:13px;color:#64748B;font-weight:600;border-top:1px solid #E2E8F0;">Valid Till</td>
+                  <td style="padding:10px 14px;font-size:13px;color:#121A26;font-weight:700;text-align:right;border-top:1px solid #E2E8F0;">{{validTill}}</td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+
+          <tr>
+            <td style="background-color:#ffffff;padding:14px 24px 6px 30px;font-size:16px;line-height:150%;color:#384860;">
+              <p style="margin:0;">This is an estimate, not a tax invoice. Prices are subject to the terms agreed in the final subscription. If you'd like to proceed or have any questions, please reply to this email.</p>
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:14px 24px 24px 30px;font-size:16px;line-height:150%;color:#384860;">
+              <p style="margin:0;">Best regards,<br>{{companyName}}</p>
+            </td>
+          </tr>
+          <tr>
+            <td style="background-color:#ffffff;padding:10px 24px 18px 30px;font-size:12px;color:#202B3C;line-height:150%;">
+              <p style="margin:0;">© Tango Eye. All rights reserved.</p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>