tango-app-api-payment-subscription 3.5.2 → 3.5.4

package/package.json

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

package/src/controllers/invoice.controller.js

@@ -2,6 +2,7 @@ import * as invoiceService from '../services/invoice.service.js';
 import * as dailyPricingService from '../services/dailyPrice.service.js';
 import * as clientService from '../services/clientPayment.services.js';
 import * as billingService from '../services/billing.service.js';
+import mongoose from 'mongoose';
 import dayjs from 'dayjs';
 import { logger, checkFileExist, signedUrl, download, sendEmailWithSES, insertOpenSearchData } from 'tango-app-api-middleware';
 // import Handlebars from 'handlebars';
@@ -65,6 +66,25 @@ async function getInvoiceCcEmails( clientId ) {
 export async function createInvoice( req, res ) {
   try {
     let invoiceGroupList = [];
+    // Optional groupIds filter — when present, only those billing groups will
+    // be processed. Lets the UI generate an invoice for a specific subset of
+    // groups instead of every group on the client. Strings are matched against
+    // billing _id.
+    const groupIdsFilter = Array.isArray( req.body.groupIds ) && req.body.groupIds.length > 0 ?
+      req.body.groupIds :
+      null;
+    const groupObjectIdFilter = groupIdsFilter ?
+      groupIdsFilter
+          .map( ( id ) => {
+            try {
+              return new mongoose.Types.ObjectId( id );
+            } catch {
+              return null;
+            }
+          } )
+          .filter( ( id ) => id !== null ) :
+      null;
+
     if ( req.body.allClient ) {
       if ( req.body.clientList && req.body.clientList.length > 0 ) {
         req.body.clientList = req.body.clientList;
@@ -74,12 +94,12 @@ export async function createInvoice( req, res ) {
       }
 
       for ( let client of req.body.clientList ) {
+        const matchStage = { clientId: client };
+        if ( groupObjectIdFilter && groupObjectIdFilter.length ) {
+          matchStage._id = { $in: groupObjectIdFilter };
+        }
         let invoiceGroup = await billingService.aggregatebilling( [
-          {
-            $match: {
-              clientId: client,
-            },
-          },
+          { $match: matchStage },
         ] );
         for ( let invGrp of invoiceGroup ) {
           invoiceGroupList.push( invGrp );
@@ -93,9 +113,82 @@ export async function createInvoice( req, res ) {
       invoiceGroupList.push( invoiceGroup );
     }
 
+    // Custom-create path: the Create Invoice modal posts a fully-composed
+    // invoice (companyName, products, tax, totals — all entered by the user).
+    // The legacy aggregation paths above don't handle this shape and would
+    // silently no-op (empty invoiceGroupList → loop skipped → 2xx with nothing
+    // written). When the caller sets customInvoice=true we insert exactly
+    // what they sent, with a server-generated invoice number.
+    if ( req.body.customInvoice === true ) {
+      if ( !req.body.clientId ) {
+        return res.sendError( 'clientId is required for customInvoice', 400 );
+      }
+      const Finacialyear = getCurrentFinancialYear();
+      const previousinvoice = await invoiceService.findandsort(
+          { invoice: { $regex: `^INV-${Finacialyear}-` } },
+          {},
+          { invoiceIndex: -1 },
+      );
+      let invoiceNo = '00001';
+      if ( previousinvoice && previousinvoice.length > 0 ) {
+        invoiceNo = Number( previousinvoice[0].invoiceIndex ) + 1;
+        invoiceNo = invoiceNo.toString().padStart( 5, '0' );
+      }
+      const baseDate = req.body.billingDate ? dayjs( req.body.billingDate ) : dayjs();
+      const data = {
+        invoice: `INV-${Finacialyear}-${invoiceNo}`,
+        invoiceIndex: invoiceNo,
+        clientId: req.body.clientId,
+        groupId: req.body.groupId || undefined,
+        groupName: req.body.groupName || '',
+        companyName: req.body.companyName || '',
+        companyAddress: req.body.companyAddress || '',
+        GSTNumber: req.body.GSTNumber || '',
+        PlaceOfSupply: req.body.PlaceOfSupply || '',
+        products: Array.isArray( req.body.products ) ? req.body.products : [],
+        tax: Array.isArray( req.body.tax ) ? req.body.tax : [],
+        amount: Math.round( Number( req.body.amount ) || 0 ),
+        totalAmount: Math.round( Number( req.body.totalAmount ) || 0 ),
+        stores: Number( req.body.stores ) || 0,
+        currency: req.body.currency || 'inr',
+        billingDate: baseDate.toDate(),
+        dueDate: req.body.dueDate ? new Date( req.body.dueDate ) : baseDate.add( 30, 'days' ).toDate(),
+        monthOfbilling: baseDate.format( 'MM' ),
+        paymentMethod: 'Online',
+        status: 'pendingCsm',
+        paymentStatus: 'unpaid',
+      };
+      const created = await invoiceService.create( data );
+      const logObj = {
+        userName: req.user?.userName,
+        email: req.user?.email,
+        clientId: data.clientId,
+        logSubType: 'invoiceCreated',
+        logType: 'invoice',
+        date: new Date(),
+        changes: [ `${data.invoice} invoice created manually by ${req.user?.email}` ],
+        eventType: 'create',
+        timestamp: new Date(),
+        showTo: [ 'tango' ],
+      };
+      try {
+        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
+      } catch ( logErr ) {
+        logger.error( { error: logErr, function: 'createInvoice.customLog' } );
+      }
+      return res.sendSuccess( { data: created } );
+    }
+
     for ( let group of invoiceGroupList ) {
       let Finacialyear = getCurrentFinancialYear();
-      let previousinvoice = await invoiceService.findandsort( {}, {}, { invoiceIndex: -1 } );
+      // Scope the highest-index lookup to invoices created in the current FY
+      // (invoice IDs are `INV-${FY}-${index}`). Without this scope the new FY
+      // would continue the previous year's sequence instead of resetting.
+      let previousinvoice = await invoiceService.findandsort(
+          { invoice: { $regex: `^INV-${Finacialyear}-` } },
+          {},
+          { invoiceIndex: -1 },
+      );
       let invoiceNo = '00001';
       if ( previousinvoice && previousinvoice.length > 0 ) {
         invoiceNo = Number( previousinvoice[0].invoiceIndex ) + 1;
@@ -2110,6 +2203,13 @@ export async function updateInvoice( req, res ) {
       return res.sendError( 'Invoice not found', 404 );
     }
 
+    // Lock once final-approved. The UI hides the Edit icon for these rows,
+    // but a direct API call would otherwise still let someone mutate a
+    // finalised invoice. Match the frontend's isInvoiceLocked() check.
+    if ( invoice.status === 'approved' ) {
+      return res.sendError( 'Cannot edit a final-approved invoice.', 409 );
+    }
+
     let updateData = {};
     const allowedFields = [
       'companyName', 'companyAddress', 'GSTNumber', 'PlaceOfSupply',
@@ -2220,6 +2320,12 @@ export async function deleteInvoice( req, res ) {
       return res.sendError( 'Invoice not found', 404 );
     }
 
+    // Same lock the UI enforces — a final-approved invoice must not be
+    // deletable, even by a power user hitting the API directly.
+    if ( invoice.status === 'approved' ) {
+      return res.sendError( 'Cannot delete a final-approved invoice.', 409 );
+    }
+
     await invoiceService.deleteRecord( { _id: invoiceId } );
 
     const logObj = {

package/src/controllers/paymentSubscription.controllers.js

@@ -3772,7 +3772,15 @@ export const invoiceGenerate = async ( req, res ) => {
           }
 
 
-          let previousinvoice = await invoiceService.findandsort( {}, {}, { _id: -1 } );
+          // Scope the highest-index lookup to the current financial year
+          // (invoice IDs are `INV-${FY}-${index}`). Sort by invoiceIndex (not
+          // _id) so the largest sequence number wins even if records were
+          // back-dated or imported out of order.
+          let previousinvoice = await invoiceService.findandsort(
+              { invoice: { $regex: `^INV-${Finacialyear}-` } },
+              {},
+              { invoiceIndex: -1 },
+          );
           let invoiceNo = '00001';
           if ( previousinvoice && previousinvoice.length > 0 ) {
             invoiceNo = Number( previousinvoice[0].invoiceIndex ) + 1;

package/src/hbs/invoicePdf.hbs

@@ -1643,7 +1643,7 @@
                     </div>
                     <div class="frame-54">
                         <div class="ifsc-code">IFSC Code</div>
-                        <div class="hdfc-0000269">HDFC0000269</div>
+                        <div class="hdfc-0000269">HDFC0000386</div>
                     </div>
                     <div class="frame-532">
                         <div class="payment-type">Payment Type</div>