tango-app-api-payment-subscription 3.5.31 → 3.5.32

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.31",
+    "version": "3.5.32",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",

package/src/controllers/brandsBilling.controller.js

@@ -460,6 +460,8 @@ export async function brandInvoiceList( req, res ) {
         dateFrom = now.startOf( 'month' ).toDate();
       } else if ( req.body.durationFilter === 'prev' ) {
         dateFrom = now.subtract( 1, 'month' ).startOf( 'month' ).toDate();
+      } else if ( req.body.durationFilter === 'last3' ) {
+        dateFrom = now.subtract( 3, 'month' ).startOf( 'month' ).toDate();
       } else if ( req.body.durationFilter === 'last6' ) {
         dateFrom = now.subtract( 6, 'month' ).startOf( 'month' ).toDate();
       } else if ( req.body.durationFilter === 'last12' ) {

package/src/controllers/invoice.controller.js

@@ -183,7 +183,11 @@ export async function createInvoice( req, res ) {
         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(),
+        // Payment term (days) chosen at creation. Persisted on the invoice so
+        // the term + due date are read from the invoice everywhere, not the
+        // billing group's default. Falls back to 30.
+        paymentTerm: Number( req.body.paymentTerm ) > 0 ? Number( req.body.paymentTerm ) : 30,
+        dueDate: req.body.dueDate ? new Date( req.body.dueDate ) : baseDate.add( Number( req.body.paymentTerm ) > 0 ? Number( req.body.paymentTerm ) : 30, 'days' ).toDate(),
         monthOfbilling: baseDate.format( 'MM' ),
         paymentMethod: 'Online',
         status: 'pendingCsm',
@@ -558,8 +562,20 @@ export async function createInvoice( req, res ) {
         products: products,
         status: 'pendingCsm',
         amount: roundAmount( amount, group.currency ),
+        // Regenerate reuses the SAME invoice number, so it must also carry the
+        // SAME numbering fields the old doc had — otherwise the regenerated
+        // invoice loses its identity in the counters. For a real invoice that's
+        // invoiceIndex; for a still-draft invoice it's tempIndex. Dropping the
+        // draft's tempIndex orphaned its sequence, so the next fresh draft
+        // reused that number → duplicate DRAFT-<FY>-NNNNN. Carry both over from
+        // findInvoice on regenerate; fresh creates get the running temp seq.
         invoiceIndex: req.body.invoiceId ? findInvoice.invoiceIndex : null,
-        tempIndex: req.body.invoiceId ? undefined : tempSeqForThis,
+        // Regenerate: keep the old draft's tempIndex. Legacy drafts created
+        // before tempIndex existed have none — give them the running temp seq so
+        // the number is still tracked (never left unindexed, which caused reuse).
+        tempIndex: req.body.invoiceId ?
+          ( findInvoice.tempIndex != null ? findInvoice.tempIndex : tempSeqForThis ) :
+          tempSeqForThis,
         tax: taxList,
         companyName: ( group.registeredCompanyName || '' ).toUpperCase(),
         companyAddress: address,
@@ -864,15 +880,14 @@ export async function invoiceDownload( req, res ) {
       if ( invoiceInfo.groupId ) {
         getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
       }
-      let days = getgroup?.paymentTerm ? getgroup?.paymentTerm : '30';
+      let days = invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( 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 } );
 
       invoiceData = {
         ...invoiceInfo._doc,
         clientName: clientDetails.clientName,
         amount: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
-        extendDays: getgroup?.paymentTerm ? getgroup?.paymentTerm : '30',
+        extendDays: invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( getgroup?.paymentTerm ? getgroup?.paymentTerm : '30' ),
         address: clientDetails.billingDetails.billingAddress,
         subtotal: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
         companyName: invoiceInfo.companyName,
@@ -881,7 +896,7 @@ export async function invoiceDownload( req, res ) {
         GSTNumber: invoiceInfo.GSTNumber,
         PoNum: invoiceInfo.purchaseOrderNumber || getgroup?.po || '',
         amountwords: AmountinWords,
-        Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
+        Terms: `Term ${invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( getgroup?.paymentTerm ? getgroup?.paymentTerm : '30' )}`,
         currencyType: invoiceCurrency,
         currencyWord: wordFor( invoiceInfo.currency ),
         totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', moneyFmt ),
@@ -898,9 +913,12 @@ export async function invoiceDownload( req, res ) {
         billingState: getgroup?.state,
         billingCity: getgroup?.city,
         billingPinCode: getgroup?.pinCode,
-        billingCurrency: virtualAccount?.currency,
-        virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
-        virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
+        billingCurrency: getgroup?.currency,
+        // Bank account shown on invoice emails is the fixed Tango HDFC account
+        // (matches the invoice PDFs and invoiceBankDetails), not the per-client
+        // paymentaccounts record.
+        virtualaccountNumber: '50200027441433',
+        virtualifsc: 'HDFC0000386',
         // 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.
@@ -1063,16 +1081,14 @@ async function buildInvoicePdfBuffer( invoiceId ) {
   if ( invoiceInfo.groupId ) {
     getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
   }
-  let days = getgroup?.paymentTerm ? getgroup?.paymentTerm : '30';
+  let days = invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( 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: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
-    extendDays: getgroup?.paymentTerm ? getgroup?.paymentTerm : '30',
+    extendDays: invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( getgroup?.paymentTerm ? getgroup?.paymentTerm : '30' ),
     address: clientDetails.billingDetails.billingAddress,
     subtotal: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
     companyName: invoiceInfo.companyName,
@@ -1081,7 +1097,7 @@ async function buildInvoicePdfBuffer( invoiceId ) {
     GSTNumber: invoiceInfo.GSTNumber,
     PoNum: invoiceInfo.purchaseOrderNumber || getgroup?.po || '',
     amountwords: AmountinWords,
-    Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
+    Terms: `Term ${invoiceInfo.paymentTerm ? invoiceInfo.paymentTerm : ( getgroup?.paymentTerm ? getgroup?.paymentTerm : '30' )}`,
     currencyType: invoiceCurrency,
     currencyWord: wordFor( invoiceInfo.currency ),
     totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', moneyFmt ),
@@ -1098,9 +1114,11 @@ async function buildInvoicePdfBuffer( invoiceId ) {
     billingState: getgroup?.state,
     billingCity: getgroup?.city,
     billingPinCode: getgroup?.pinCode,
-    billingCurrency: virtualAccount?.currency,
-    virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
-    virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
+    billingCurrency: getgroup?.currency,
+    // Fixed Tango HDFC account (matches the invoice PDFs), not the per-client
+    // paymentaccounts record.
+    virtualaccountNumber: '50200027441433',
+    virtualifsc: 'HDFC0000386',
     // GST applies only to domestic (INR) invoices; gate on the invoice currency.
     gstApplicable: invoiceInfo.currency === 'inr',
   };
@@ -1375,7 +1393,6 @@ export async function invoiceBulkEmailSend( req, res ) {
 
     const clientId = approved[0].clientId;
     const clientDetails = await clientService.findOne( { clientId } );
-    const virtualAccount = await paymentAccountService.findOneAccount( { clientId } );
 
     // Subject month is derived from the first approved invoice's billing month,
     // mirroring the single-invoice email convention (billingDate, else
@@ -1395,11 +1412,14 @@ export async function invoiceBulkEmailSend( req, res ) {
     const template = Handlebars.compile( templateHtml );
     const mailbody = template( {
       clientName: clientDetails?.clientName || '',
+      subjectMonth,
       currencyType,
       totalExcl: totalExclNum.toLocaleString( 'en-IN', moneyFmt ),
       totalIncl: totalInclNum.toLocaleString( 'en-IN', moneyFmt ),
-      virtualaccountNumber: virtualAccount ? virtualAccount.accountNumber : '',
-      virtualifsc: virtualAccount ? virtualAccount.ifsc : '',
+      // Fixed Tango HDFC account (matches the invoice PDFs), not the per-client
+      // paymentaccounts record.
+      virtualaccountNumber: '50200027441433',
+      virtualifsc: 'HDFC0000386',
       uidomain: `${JSON.parse( process.env.URL ).domain}`,
       logo: `${JSON.parse( process.env.URL ).apiDomain}/logo.png`,
       rows,
@@ -2673,12 +2693,15 @@ export async function creditTransactionlist( req, res ) {
     },
     ];
     if ( req.body.searchValue && req.body.searchValue != '' ) {
+      // This list projects only client identity + balance credit; there are no
+      // paymentStatus/status fields on these rows, so search on the fields that
+      // actually exist (clientName / clientId). Searching paymentStatus/status
+      // here previously matched nothing.
       query.push( {
         $match: {
           $or: [
             { clientName: { $regex: req.body.searchValue, $options: 'i' } },
-            { paymentStatus: { $regex: req.body.searchValue, $options: 'i' } },
-            { status: { $regex: req.body.searchValue, $options: 'i' } },
+            { clientId: { $regex: req.body.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -2749,14 +2772,20 @@ export async function applyDiscount( req, res ) {
       invoice.discountAmount = roundAmount( ( invoice.amount * req.body.discount ) / 100, invoice.currency );
       invoice.amount = roundAmount( invoice.amount - invoice.discountAmount, invoice.currency );
       invoice.discountPercentage = req.body.discount;
-      if ( invoice.currency === 'inr' ) {
-        if ( invoice.tax.length ) {
-          for ( let i = 0; i < invoice.tax.length; i++ ) {
-            invoice.tax[i].taxAmount = String( roundAmount( ( invoice.amount * invoice.tax[i].value ) / 100, invoice.currency ) );
-            invoice.totalAmount = roundAmount( Number( invoice.amount ) + Number( invoice.tax[i].taxAmount ), invoice.currency );
-          }
+      // Recompute every tax line off the discounted amount and set totalAmount =
+      // discounted amount + SUM of ALL taxes. Applies to every currency (a
+      // non-INR discount must also re-total), and accumulates across all tax
+      // rows — a domestic INR invoice has CGST + SGST, so summing only the last
+      // row (the previous bug) dropped one of them from the total.
+      let taxTotal = 0;
+      if ( Array.isArray( invoice.tax ) && invoice.tax.length ) {
+        for ( let i = 0; i < invoice.tax.length; i++ ) {
+          const taxAmt = roundAmount( ( invoice.amount * invoice.tax[i].value ) / 100, invoice.currency );
+          invoice.tax[i].taxAmount = String( taxAmt );
+          taxTotal += taxAmt;
         }
       }
+      invoice.totalAmount = roundAmount( Number( invoice.amount ) + taxTotal, invoice.currency );
       await invoiceService.updateOne( { invoice: req.body.invoice }, invoice );
       let logObj = {
         userName: req.user?.userName,
@@ -3035,7 +3064,17 @@ export async function getInvoice( req, res ) {
     if ( !invoice ) {
       return res.sendError( 'Invoice not found', 404 );
     }
-    res.sendSuccess( invoice );
+    // Payment term for the preview: prefer the invoice's own stored paymentTerm
+    // (the value chosen at creation), so preview + download + invoice all agree.
+    // Fall back to the billing group's term (older invoices created before the
+    // field existed), then 30 — mirroring the download.
+    let paymentTerm = invoice.paymentTerm || 30;
+    if ( !invoice.paymentTerm && invoice.groupId ) {
+      const getgroup = await billingService.findOne( { _id: invoice.groupId } );
+      paymentTerm = getgroup?.paymentTerm ? getgroup.paymentTerm : 30;
+    }
+    const invoiceOut = { ...( invoice._doc || invoice ), paymentTerm };
+    res.sendSuccess( invoiceOut );
   } catch ( error ) {
     logger.error( { error: error, function: 'getInvoice' } );
     return res.sendError( error, 500 );
@@ -3068,7 +3107,7 @@ export async function updateInvoice( req, res ) {
     let updateData = {};
     const allowedFields = [
       'companyName', 'companyAddress', 'GSTNumber', 'PlaceOfSupply',
-      'groupName', 'groupId', 'stores', 'billingDate', 'dueDate',
+      'groupName', 'groupId', 'stores', 'billingDate', 'dueDate', 'paymentTerm',
       'currency', 'status', 'paymentStatus', 'products', 'tax',
       'amount', 'totalAmount', 'paymentMethod', 'purchaseOrderNumber',
     ];

package/src/hbs/invoiceBulkEmail.hbs

@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en">
 <head><meta charset="utf-8" /><meta content="width=device-width" name="viewport" />
-<title>Invoices from Tango Eye</title></head>
+<title>Invoice for {{subjectMonth}} - Tango/{{clientName}}</title></head>
 <body style="margin:0;padding:0;background-color:#b1b1b1;font-family:Inter,Arial,sans-serif;">
 <table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center">
 <table bgcolor="#ffffff" width="640" cellspacing="0" cellpadding="0" border="0"
@@ -9,7 +9,7 @@
 <tr><td style="padding:40px 52px;">
   <img src="{{logo}}" width="143" style="display:block;margin-bottom:24px;" />
   <div style="color:#121a26;font-weight:700;font-size:24px;line-height:140%;">
-    Invoices from Tango Eye — attached (ZIP)
+    Invoice for {{subjectMonth}} - Tango/{{clientName}}
   </div>
   <div style="height:24px;"></div>
   <div style="color:#384860;font-size:16px;line-height:150%;">
@@ -22,7 +22,7 @@
   <div style="height:24px;"></div>
 
   <div style="background-color:#f1f5f9;border:1px solid #e2e8f0;border-radius:8px;padding:20px 28px;">
-    <div style="color:#121a26;font-weight:700;font-size:18px;">Virtual Account Details</div>
+    <div style="color:#121a26;font-weight:700;font-size:18px;">Account Details</div>
     <div style="height:12px;"></div>
     <div style="color:#121a26;font-weight:500;font-size:16px;">Account Number - {{virtualaccountNumber}}</div>
     <div style="color:#121a26;font-weight:500;font-size:16px;">IFSC Code - {{virtualifsc}}</div>

package/src/hbs/invoicepaymentemail.hbs

@@ -246,7 +246,7 @@ img {
         <table cellspacing="0" cellpadding="0" border="0">
         <tbody><tr>
         <td>
-        <div style="text-align:left;"><span style="color:#121a26;font-weight:700;font-family:Inter,Arial,sans-serif;font-size:18px;line-height:150%;text-align:left;">Virtual Account Details </span></div>
+        <div style="text-align:left;"><span style="color:#121a26;font-weight:700;font-family:Inter,Arial,sans-serif;font-size:18px;line-height:150%;text-align:left;">Account Details </span></div>
         </td>
         </tr>
         </tbody></table>