tango-app-api-payment-subscription 3.5.19 → 3.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.19",
+    "version": "3.5.21",
     "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.36",
+        "tango-api-schema": "^2.6.37",
         "tango-app-api-middleware": "^3.6.18",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0",

package/src/controllers/brandsBilling.controller.js

@@ -579,14 +579,20 @@ export async function brandInvoiceList( req, res ) {
       return res.sendError( 'No data', 204 );
     }
 
+    // Footer totals are shown in a single ₹ figure, but individual invoices may
+    // be in USD ($). Convert dollar invoices to INR at today's rate before
+    // summing so the ₹ total is correct (mirrors the table's per-invoice symbol
+    // → one combined rupee total).
+    const usdRate = await getUsdInrRate();
+    const toInr = ( inv, value ) => ( inv.currency === 'dollar' ? ( Number( value ) || 0 ) * usdRate : ( Number( value ) || 0 ) );
     let summary = {
       totalInvoices: allInvoices.length,
-      totalInvoiced: allInvoices.reduce( ( sum, inv ) => sum + ( inv.totalAmount || 0 ), 0 ),
+      totalInvoiced: Math.round( allInvoices.reduce( ( sum, inv ) => sum + toInr( inv, inv.totalAmount ), 0 ) ),
       // Footer totals over the FULL filtered set (not just the current page):
-      // stores, amount excl. GST and amount incl. GST.
+      // stores, amount excl. GST and amount incl. GST (USD → INR converted).
       totalStores: allInvoices.reduce( ( sum, inv ) => sum + ( inv.stores || 0 ), 0 ),
-      totalAmountExclGst: allInvoices.reduce( ( sum, inv ) => sum + ( inv.amount || 0 ), 0 ),
-      totalAmountInclGst: allInvoices.reduce( ( sum, inv ) => sum + ( inv.totalAmount || 0 ), 0 ),
+      totalAmountExclGst: Math.round( allInvoices.reduce( ( sum, inv ) => sum + toInr( inv, inv.amount ), 0 ) ),
+      totalAmountInclGst: Math.round( allInvoices.reduce( ( sum, inv ) => sum + toInr( inv, inv.totalAmount ), 0 ) ),
       pendingApproval: allInvoices.filter( ( inv ) => [ 'pendingCsm', 'pendingFinance', 'pendingApproval' ].includes( inv.status ) ).length,
       pendingPayment: allInvoices.filter( ( inv ) => inv.paymentStatus === 'unpaid' && inv.status === 'approved' ).length,
       paid: allInvoices.filter( ( inv ) => inv.paymentStatus === 'paid' ).length,

package/src/controllers/invoice.controller.js

@@ -13,7 +13,7 @@ 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 { symbolFor, roundAmount, wordFor } 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';
@@ -162,13 +162,14 @@ export async function createInvoice( req, res ) {
       }
       // Recompute totals from the (possibly expanded) line items so a
       // multi-month advance invoice bills the full period.
+      const customCurrency = req.body.currency || 'inr';
       const customAmount = customAdvanceMonths > 1 ?
-        Math.round( customProducts.reduce( ( s, p ) => s + ( Number( p.amount ) || 0 ), 0 ) ) :
-        Math.round( Number( req.body.amount ) || 0 );
+        roundAmount( customProducts.reduce( ( s, p ) => s + ( Number( p.amount ) || 0 ), 0 ), customCurrency ) :
+        roundAmount( Number( req.body.amount ) || 0, customCurrency );
       const customTotal = customAdvanceMonths > 1 ?
-        Math.round( customProducts.reduce( ( s, p ) => s + ( Number( p.amount ) || 0 ), 0 ) +
-          ( Array.isArray( req.body.tax ) ? req.body.tax.reduce( ( s, t ) => s + ( Number( t.taxAmount ) || 0 ) * customAdvanceMonths, 0 ) : 0 ) ) :
-        Math.round( Number( req.body.totalAmount ) || 0 );
+        roundAmount( customProducts.reduce( ( s, p ) => s + ( Number( p.amount ) || 0 ), 0 ) +
+          ( Array.isArray( req.body.tax ) ? req.body.tax.reduce( ( s, t ) => s + ( Number( t.taxAmount ) || 0 ) * customAdvanceMonths, 0 ) : 0 ), customCurrency ) :
+        roundAmount( Number( req.body.totalAmount ) || 0, customCurrency );
 
       const data = {
         invoice: `${invPrefix}${Finacialyear}-${invoiceNo}`,
@@ -287,11 +288,16 @@ export async function createInvoice( req, res ) {
       let baseDate = isAdvance ? dayjs().add( 1, 'month' ).startOf( 'month' ) : dayjs();
       let products;
 
+      // Effective price type: when group-wise pricing applies, the GROUP's own
+      // price type (from its basepricing doc) wins; otherwise the client's.
+      const { priceType: groupPriceType } = await resolveBasePricingScope( group, getClient );
+      const effectivePriceType = groupPriceType || getClient?.priceType;
+
       if ( advanceCoverProducts ) {
         // Reuse the advance invoice's current-month line items (store counts +
         // prices already set) and bill them as a normal monthly invoice.
         products = advanceCoverProducts;
-      } else if ( getClient?.priceType === 'standard' ) {
+      } else if ( effectivePriceType === 'standard' ) {
         products = await standardPrice( group, getClient, baseDate );
       } else {
         products = await stepPrice( group, getClient );
@@ -391,7 +397,7 @@ export async function createInvoice( req, res ) {
               productName: 'oneTimeFee',
               period: 'fullmonth',
               storeCount: newStoreCount,
-              amount: Math.round( newStoreCount * oneTimeFeePerStore * 100 ) / 100,
+              amount: roundAmount( newStoreCount * oneTimeFeePerStore, group.currency ),
               price: oneTimeFeePerStore,
               description: `One-Time Fee - ${newStoreCount} stores`,
               HsnNumber: '998314',
@@ -412,21 +418,21 @@ export async function createInvoice( req, res ) {
       // existing GST/IGST/CGST/SGST behavior for legacy records that have
       // no taxCalculationType set yet.
       if ( group.taxCalculationType === 'international' ) {
-        totalAmount = Math.round( amount );
+        totalAmount = roundAmount( amount, group.currency );
       } else if ( group.gst && group.gst.slice( 0, 2 ) == '33' ) {
         let taxAmount = ( amount * 18 ) / 100;
-        totalAmount = Math.round( amount + taxAmount );
+        totalAmount = roundAmount( amount + taxAmount, group.currency );
         taxList.push(
             {
               'currency': '₹',
               'type': 'CGST',
               'value': 9,
-              'taxAmount': ( ( amount * 9 ) / 100 ).toFixed( 2 ),
+              'taxAmount': String( roundAmount( ( amount * 9 ) / 100, group.currency ) ),
             }, {
               'currency': '₹',
               'type': 'SGST',
               'value': 9,
-              'taxAmount': ( ( amount * 9 ) / 100 ).toFixed( 2 ),
+              'taxAmount': String( roundAmount( ( amount * 9 ) / 100, group.currency ) ),
             },
         );
       } else {
@@ -434,13 +440,13 @@ export async function createInvoice( req, res ) {
         if ( group.currency === 'inr' ) {
           taxAmount = ( amount * 18 ) / 100;
         }
-        totalAmount = Math.round( amount + taxAmount );
+        totalAmount = roundAmount( amount + taxAmount, group.currency );
         taxList.push(
             {
               'currency': '₹',
               'type': 'IGST',
               'value': 18,
-              'taxAmount': ( taxAmount ).toFixed( 2 ),
+              'taxAmount': String( roundAmount( taxAmount, group.currency ) ),
             },
         );
       }
@@ -523,14 +529,14 @@ export async function createInvoice( req, res ) {
         invoice: req.body.invoiceId ? req.body.invoiceId : `${invPrefix}${Finacialyear}-${invoiceNo}`,
         products: products,
         status: 'pendingCsm',
-        amount: Math.round( amount ),
+        amount: roundAmount( amount, group.currency ),
         invoiceIndex: req.body.invoiceId ? findInvoice.invoiceIndex : invoiceNo,
         tax: taxList,
         companyName: ( group.registeredCompanyName || '' ).toUpperCase(),
         companyAddress: address,
         PlaceOfSupply: group.placeOfSupply,
         GSTNumber: group.gst,
-        totalAmount: Math.round( totalAmount ),
+        totalAmount: roundAmount( totalAmount, group.currency ),
         clientId: group.clientId,
         paymentMethod: 'Online',
         billingDate: new Date( invoicedate ),
@@ -746,8 +752,8 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
     // store's position within the product.
     const price = priceForStore( s.productName, productPosition[s.productName] );
     const runningCost = s.workingdays >= monthDays ?
-      Math.round( price * units * 100 ) / 100 :
-      Math.round( ( price / monthDays ) * s.workingdays * units * 100 ) / 100;
+      roundAmount( price * units, invoiceInfo.currency ) :
+      roundAmount( ( price / monthDays ) * s.workingdays * units, invoiceInfo.currency );
     return {
       productName: s.productName ? s.productName.charAt( 0 ).toUpperCase() + s.productName.slice( 1 ) : '',
       currencyType: invoiceCurrency,
@@ -765,8 +771,9 @@ async function buildAnnexureRows( invoiceInfo, getgroup ) {
     };
   } );
 
-  const totalAmount = Math.round( data.reduce( ( a, x ) => a + ( x.runningCost || 0 ), 0 ) * 100 ) / 100;
-  const totalFormatted = totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+  const totalAmount = roundAmount( data.reduce( ( a, x ) => a + ( x.runningCost || 0 ), 0 ), invoiceInfo.currency );
+  const fractionDigits = invoiceInfo.currency === 'inr' ? 0 : 2;
+  const totalFormatted = totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: fractionDigits, maximumFractionDigits: fractionDigits } );
   return { data, totalAmount, totalFormatted };
 }
 
@@ -781,20 +788,23 @@ export async function invoiceDownload( req, res ) {
       // client.paymentInvoice or virtualAccount.currency causes historical
       // invoices to re-render in the wrong currency if those settings change.
       const invoiceCurrency = symbolFor( invoiceInfo.currency );
+      // INR shows whole numbers; every other currency keeps 2 decimals.
+      const fractionDigits = invoiceInfo.currency === 'inr' ? 0 : 2;
+      const moneyFmt = { minimumFractionDigits: fractionDigits, maximumFractionDigits: fractionDigits };
       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 = item.price .toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
-        item.amount = item.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+        item.price = roundAmount( item.price, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt );
+        item.amount = roundAmount( item.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt );
         item.currency = invoiceCurrency;
       } );
 
 
       let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
 
-      invoiceInfo.totalAmount = Math.round( invoiceInfo.totalAmount );
+      invoiceInfo.totalAmount = roundAmount( invoiceInfo.totalAmount, invoiceInfo.currency );
       let AmountinWords = inWords( invoiceInfo.totalAmount );
       let getgroup;
       let days = getgroup?.paymentTerm ? getgroup?.paymentTerm : '30';
@@ -809,10 +819,10 @@ export async function invoiceDownload( req, res ) {
       invoiceData = {
         ...invoiceInfo._doc,
         clientName: clientDetails.clientName,
-        amount: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        amount: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
         extendDays: getgroup?.paymentTerm ? getgroup?.paymentTerm : '30',
         address: clientDetails.billingDetails.billingAddress,
-        subtotal: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        subtotal: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
         companyName: invoiceInfo.companyName,
         companyAddress: invoiceInfo.companyAddress,
         PlaceOfSupply: invoiceInfo.PlaceOfSupply,
@@ -821,7 +831,8 @@ export async function invoiceDownload( req, res ) {
         amountwords: AmountinWords,
         Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
         currencyType: invoiceCurrency,
-        totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        currencyWord: wordFor( invoiceInfo.currency ),
+        totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', moneyFmt ),
         invoiceDate,
         dueDate,
         discountPercentage: invoiceInfo.discountPercentage ? invoiceInfo.discountPercentage : 0,
@@ -980,18 +991,21 @@ async function buildInvoicePdfBuffer( invoiceId ) {
   // field, recorded at creation from the billing group. See invoiceDownload
   // above for the same pattern.
   const invoiceCurrency = symbolFor( invoiceInfo.currency );
+  // INR shows whole numbers; every other currency keeps 2 decimals.
+  const fractionDigits = invoiceInfo.currency === 'inr' ? 0 : 2;
+  const moneyFmt = { minimumFractionDigits: fractionDigits, maximumFractionDigits: fractionDigits };
   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.price = roundAmount( item.price, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt );
+    item.amount = roundAmount( item.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt );
     item.currency = invoiceCurrency;
   } );
 
   let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
-  invoiceInfo.totalAmount = Math.round( invoiceInfo.totalAmount );
+  invoiceInfo.totalAmount = roundAmount( invoiceInfo.totalAmount, invoiceInfo.currency );
   let AmountinWords = inWords( invoiceInfo.totalAmount );
   let getgroup;
   if ( invoiceInfo.groupId ) {
@@ -1005,10 +1019,10 @@ async function buildInvoicePdfBuffer( invoiceId ) {
   let invoiceData = {
     ...invoiceInfo._doc,
     clientName: clientDetails.clientName,
-    amount: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    amount: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
     extendDays: getgroup?.paymentTerm ? getgroup?.paymentTerm : '30',
     address: clientDetails.billingDetails.billingAddress,
-    subtotal: invoiceInfo.amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    subtotal: roundAmount( invoiceInfo.amount, invoiceInfo.currency ).toLocaleString( 'en-IN', moneyFmt ),
     companyName: invoiceInfo.companyName,
     companyAddress: invoiceInfo.companyAddress,
     PlaceOfSupply: invoiceInfo.PlaceOfSupply,
@@ -1017,7 +1031,8 @@ async function buildInvoicePdfBuffer( invoiceId ) {
     amountwords: AmountinWords,
     Terms: `Term ${getgroup?.paymentTerm ? getgroup?.paymentTerm : '30'}`,
     currencyType: invoiceCurrency,
-    totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+    currencyWord: wordFor( invoiceInfo.currency ),
+    totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', moneyFmt ),
     invoiceDate,
     dueDate,
     discountPercentage: invoiceInfo.discountPercentage ? invoiceInfo.discountPercentage : 0,
@@ -1207,20 +1222,25 @@ function inWords( num ) {
 // Resolve which basepricing doc applies to a billing group. When the client
 // has billingGroupWisePricing enabled AND a doc exists for this group, returns
 // that group's doc; otherwise falls back to the brand-level doc (groupId unset).
-// Returns { query, groupId } where query is the mongo filter for the chosen doc
-// and groupId is the group id to use in aggregation lookups (or null for brand).
+// Returns { query, groupId, priceType } where query is the mongo filter for the
+// chosen doc, groupId is the id for aggregation lookups (null for brand), and
+// priceType is the group's own price type when group-wise (else null).
 async function resolveBasePricingScope( group, getClient ) {
   const brandQuery = { clientId: group.clientId, groupId: { $exists: false } };
   if ( getClient?.billingGroupWisePricing && group?._id ) {
     const groupIdStr = String( group._id );
     const groupDoc = await basepricingService.findOne(
-        { clientId: group.clientId, groupId: groupIdStr }, { _id: 1 },
+        { clientId: group.clientId, groupId: groupIdStr }, { _id: 1, priceType: 1 },
     );
     if ( groupDoc ) {
-      return { query: { clientId: group.clientId, groupId: groupIdStr }, groupId: groupIdStr };
+      return {
+        query: { clientId: group.clientId, groupId: groupIdStr },
+        groupId: groupIdStr,
+        priceType: groupDoc.priceType || null,
+      };
     }
   }
-  return { query: brandQuery, groupId: null };
+  return { query: brandQuery, groupId: null, priceType: null };
 }
 
 async function standardPrice( group, getClient, baseDate ) {
@@ -1628,7 +1648,7 @@ async function standardPrice( group, getClient, baseDate ) {
       if ( store.workingDays >= currentMonthDays ) {
         amount = store.price * storeCount;
       } else {
-        amount = Math.round( ( store.price / currentMonthDays ) * store.workingDays * storeCount * 100 ) / 100;
+        amount = roundAmount( ( store.price / currentMonthDays ) * store.workingDays * storeCount, group.currency );
       }
 
       let description = store.productName === 'tangoZone' ? 'Product category/section analytics' : 'Customer Footfall Analytics';
@@ -1827,7 +1847,7 @@ async function stepPrice( group, getClient ) {
       if ( store.workingDays >= currentMonthDays ) {
         amount = price * storeCount;
       } else {
-        amount = Math.round( ( price / currentMonthDays ) * store.workingDays * storeCount * 100 ) / 100;
+        amount = roundAmount( ( price / currentMonthDays ) * store.workingDays * storeCount, group.currency );
       }
 
       let description = store.productName === 'tangoZone' ? 'Product category/section analytics' : 'Customer Footfall Analytics';
@@ -1903,8 +1923,8 @@ async function stepPrice( group, getClient ) {
     const price = tierPriceForPosition( s.productName, productPosition[s.productName] );
     const fullMonth = s.workingDays >= currentMonthDays;
     const amount = fullMonth ?
-      Math.round( units * price * 100 ) / 100 :
-      Math.round( ( units * ( price / currentMonthDays ) * s.workingDays ) * 100 ) / 100;
+      roundAmount( units * price, group.currency ) :
+      roundAmount( units * ( price / currentMonthDays ) * s.workingDays, group.currency );
     const period = fullMonth ? 'fullMonth' : 'proRate';
     const key = `${s.productName}_${period}_${price}`;
     if ( !grouped[key] ) {
@@ -1921,7 +1941,8 @@ async function stepPrice( group, getClient ) {
     } else if ( grp.productName === 'tangoZone' ) {
       description = 'Product category/section analytics';
     }
-    const amount = Math.round( grp.totalAmount * 100 ) / 100;
+    const amount = roundAmount( grp.totalAmount, group.currency );
+    const zeroPrice = group.currency === 'inr' ? '0' : '0.00';
     return {
       productName: grp.productName,
       period: grp.period,
@@ -1933,7 +1954,7 @@ async function stepPrice( group, getClient ) {
       HsnNumber: '998314',
       amount: amount,
       month: dayjs().format( 'MMM YYYY' ),
-      price: grp.unitCount ? ( amount / grp.unitCount ).toFixed( 2 ) : '0.00',
+      price: grp.unitCount ? String( roundAmount( amount / grp.unitCount, group.currency ) ) : zeroPrice,
     };
   } );
 
@@ -2219,9 +2240,11 @@ export async function clientInvoiceList( req, res ) {
         cards.pendingPaymentCount += 1;
       }
     }
-    cards.outstandingAmount = Math.round( cards.outstandingAmount * 100 ) / 100;
-    cards.overdueAmount = Math.round( cards.overdueAmount * 100 ) / 100;
-    cards.pendingPaymentAmount = Math.round( cards.pendingPaymentAmount * 100 ) / 100;
+    // These card totals are normalised to INR (dollar invoices are multiplied
+    // by usdRate above), so they follow the INR rule: whole numbers.
+    cards.outstandingAmount = roundAmount( cards.outstandingAmount, 'inr' );
+    cards.overdueAmount = roundAmount( cards.overdueAmount, 'inr' );
+    cards.pendingPaymentAmount = roundAmount( cards.pendingPaymentAmount, 'inr' );
 
     res.sendSuccess( { count: count.length, data: invoiceList, cards } );
   } catch ( error ) {
@@ -2353,14 +2376,14 @@ export async function applyDiscount( req, res ) {
   try {
     let invoice = await invoiceService.findOne( { invoice: req.body.invoice } );
     if ( invoice ) {
-      invoice.discountAmount = ( ( invoice.amount * req.body.discount ) / 100 ).toFixed( 2 );
-      invoice.amount = invoice.amount - invoice.discountAmount;
+      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 = ( ( invoice.amount * invoice.tax[i].value ) / 100 ).toFixed( 2 );
-            invoice.totalAmount = ( Number( invoice.amount ) + Number( invoice.tax[i].taxAmount ) ).toFixed( 2 );
+            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 );
           }
         }
       }
@@ -2490,7 +2513,7 @@ export async function recordPayment( req, res ) {
     }
 
     const previousPaid = Number( invoice.paidAmount ) || 0;
-    const newPaid = Math.round( ( previousPaid + amountNum ) * 100 ) / 100;
+    const newPaid = roundAmount( previousPaid + amountNum, invoice.currency );
     const totalAmount = Number( invoice.totalAmount ) || 0;
 
     // Reject overpayment — finance teams want this caught early. They can
@@ -2498,7 +2521,7 @@ export async function recordPayment( req, res ) {
     // invoice total; anything beyond that is a data-entry error.
     if ( totalAmount > 0 && newPaid > totalAmount + 0.01 ) {
       return res.sendError(
-          `Payment exceeds outstanding balance. Outstanding: ${( totalAmount - previousPaid ).toFixed( 2 )}`,
+          `Payment exceeds outstanding balance. Outstanding: ${roundAmount( totalAmount - previousPaid, invoice.currency )}`,
           400,
       );
     }

package/src/controllers/paymentSubscription.controllers.js

@@ -13,11 +13,13 @@ import * as cameraService from '../services/camera.service.js';
 import * as billingService from '../services/billing.service.js';
 import * as paymentAccountService from '../services/paymentAccount.service.js';
 import * as taggingService from '../services/tagging.service.js';
-import { symbolFor } from '../utils/currency.js';
+import { symbolFor, roundAmount, wordFor } from '../utils/currency.js';
 
 
 import dayjs from 'dayjs';
-import Handlebars from 'handlebars';
+// Use the shared Handlebars instance that has our custom helpers
+// (ifExists / neq / gtZero) registered, so invoicePdf1.hbs can use them.
+import Handlebars from '../utils/validations/helper/handlebar.helper.js';
 import fs from 'fs';
 import path from 'path';
 // import { JSDOM } from 'jsdom';
@@ -2256,12 +2258,15 @@ export const priceList = async ( req, res ) => {
     } else {
       priceQuery.groupId = { $exists: false };
     }
-    let pricingDetails = await basePricingService.findOne( priceQuery, { standard: 1, step: 1, oneTimeFeePerStore: 1 } );
+    let pricingDetails = await basePricingService.findOne( priceQuery, { standard: 1, step: 1, oneTimeFeePerStore: 1, priceType: 1 } );
     if ( !pricingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
+    // The price type for THIS doc: the doc's own priceType wins (group-wise
+    // pricing stores it per group); fall back to the requested priceType.
+    const effectivePriceType = pricingDetails.priceType || req.body.priceType;
     let data = [];
-    if ( req.body.priceType == 'standard' ) {
+    if ( effectivePriceType == 'standard' ) {
       data = pricingDetails.standard;
     } else {
       data = pricingDetails.step;
@@ -2301,7 +2306,7 @@ export const priceList = async ( req, res ) => {
         if ( !product.billingType ) {
           product.billingType = 'perStore';
         }
-        if ( req.body.priceType == 'standard' ) {
+        if ( effectivePriceType == 'standard' ) {
           product.storeCount = item.storeCount;
         } else {
           product.showImg = false;
@@ -2351,6 +2356,8 @@ export const priceList = async ( req, res ) => {
     let finalValue = parseFloat( discountTotalPrice ) + gstAmount;
     let result = {
       product: data,
+      // The price type actually used for this doc (group-wise type wins).
+      priceType: effectivePriceType,
       oneTimeFeePerStore: pricingDetails.oneTimeFeePerStore != null ? pricingDetails.oneTimeFeePerStore : null,
       totalActualPrice: originalTotalPrice,
       totalNegotiatePrice: discountTotalPrice.toFixed( 2 ),
@@ -2516,16 +2523,23 @@ export const pricingListUpdate = async ( req, res ) => {
     if ( req.body.oneTimeFeePerStore != null && req.body.oneTimeFeePerStore !== '' ) {
       getPriceInfo.oneTimeFeePerStore = Number( req.body.oneTimeFeePerStore ) || 0;
     }
-    // Keep the group identity on the doc when saving group-wise pricing.
+    // Keep the group identity + price type on the doc when saving group-wise
+    // pricing, so each group remembers its own standard/step choice.
     if ( req.body.groupId ) {
       getPriceInfo.groupId = req.body.groupId;
       if ( req.body.groupName ) {
         getPriceInfo.groupName = req.body.groupName;
       }
+      getPriceInfo.priceType = req.body.type;
     }
     getPriceInfo.save().then( async () => {
       let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { priceType: 1, paymentInvoice: 1, planDetails: 1 } );
-      clientDetails.priceType = req.body.type;
+      // For group-wise pricing the client-level priceType must NOT change —
+      // each group keeps its own type on its basepricing doc. Only update the
+      // client's priceType for brand-level (non-group) saves.
+      if ( !req.body.groupId ) {
+        clientDetails.priceType = req.body.type;
+      }
 
       // Update billingType per product in client's planDetails
       if ( req.body.products && req.body.products.length && clientDetails.planDetails?.product?.length ) {
@@ -2690,11 +2704,15 @@ async function updatePricing( req, res, update ) {
     let product = [];
     let clientId = req.body.clientId;
     let paymentInvoice = clientDetails.paymentInvoice;
-    if ( !update ) {
+    // Group-wise pricing only creates/updates the GROUP's basepricing doc — it
+    // must NOT re-run the client-level first-time setup (which resets the
+    // client's currencyType, invoice recipients and product trial statuses).
+    // That initialization is only for a brand-level (non-group) first save.
+    if ( !update && !req.body.groupId ) {
       let userDetails = await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
       paymentInvoice.invoiceTo = [ userDetails.email ];
       paymentInvoice.paymentAgreementTo = [ userDetails.email ];
-      paymentInvoice.currencyType = userDetails.countryCode == '91' ? 'inr' : 'dollar';
+      // paymentInvoice.currencyType = userDetails.countryCode == '91' ? 'inr' : 'dollar';
       clientDetails.planDetails.product.forEach( ( item ) => {
         product.push( {
           productName: item.productName,
@@ -2706,6 +2724,12 @@ async function updatePricing( req, res, update ) {
     } else {
       product = clientDetails.planDetails.product;
     }
+    // Group-wise pricing: stop here — the group's basepricing doc was already
+    // created/updated above. Do NOT touch the client's priceType, currency,
+    // products or payment status (that's brand-level state only).
+    if ( req.body.groupId ) {
+      return;
+    }
     req.body = {
       'camaraPerSqft': clientDetails.planDetails.storeSize,
       'storesCount': clientDetails.planDetails.totalStores,
@@ -3070,6 +3094,10 @@ export const invoiceDownload = async ( req, res ) => {
     if ( invoiceInfo ) {
       let clientDetails = await paymentService.findOne( { clientId: invoiceInfo.clientId } );
       let amount = 0;
+      // INR shows whole numbers; every other currency keeps 2 decimals.
+      const invoicePdfCurrency = clientDetails?.paymentInvoice?.currencyType;
+      const invoicePdfFractionDigits = invoicePdfCurrency === 'inr' ? 0 : 2;
+      const invoicePdfMoneyFmt = { minimumFractionDigits: invoicePdfFractionDigits, maximumFractionDigits: invoicePdfFractionDigits };
       invoiceInfo.products.forEach( ( item, index ) => {
         let [ firstWord, secondWord ] = item.product.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
@@ -3085,12 +3113,12 @@ export const invoiceDownload = async ( req, res ) => {
 
         amount = amount + item.price;
 
-        item.basePrice = Math.round( item.basePrice ).toLocaleString( 'en-IN' );
-        item.price = Math.round( item.price ).toLocaleString( 'en-IN' );
+        item.basePrice = roundAmount( item.basePrice, invoicePdfCurrency ).toLocaleString( 'en-IN', invoicePdfMoneyFmt );
+        item.price = roundAmount( item.price, invoicePdfCurrency ).toLocaleString( 'en-IN', invoicePdfMoneyFmt );
         item.currency = symbolFor( clientDetails?.paymentInvoice?.currencyType );
       } );
       for ( let tax of invoiceInfo.tax ) {
-        tax.taxAmount = tax.taxAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+        tax.taxAmount = roundAmount( tax.taxAmount, invoicePdfCurrency ).toLocaleString( 'en-IN', invoicePdfMoneyFmt );
       }
       let invoiceDate = dayjs( invoiceInfo.createdAt ).format( 'DD/MM/YYYY' );
       let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
@@ -3103,7 +3131,7 @@ export const invoiceDownload = async ( req, res ) => {
         clientName: clientDetails.clientName,
         extendDays: clientDetails.paymentInvoice.extendPaymentPeriodDays,
         address: clientDetails.billingDetails.billingAddress,
-        subtotal: amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        subtotal: roundAmount( amount, invoicePdfCurrency ).toLocaleString( 'en-IN', invoicePdfMoneyFmt ),
         companyName: invoiceInfo.companyName,
         companyAddress: invoiceInfo.companyAddress,
         PlaceOfSupply: invoiceInfo.PlaceOfSupply,
@@ -3112,7 +3140,8 @@ export const invoiceDownload = async ( req, res ) => {
         amountwords: AmountinWords,
         Terms: `Term ${clientDetails.paymentInvoice.extendPaymentPeriodDays}`,
         currencyType: symbolFor( clientDetails?.paymentInvoice?.currencyType ),
-        totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        currencyName: wordFor( invoicePdfCurrency ),
+        totalAmount: roundAmount( invoiceInfo.totalAmount, invoicePdfCurrency ).toLocaleString( 'en-IN', invoicePdfMoneyFmt ),
         invoiceDate,
         dueDate,
       };

package/src/hbs/invoicePdf.hbs

@@ -1401,12 +1401,14 @@
                         <div class="chennai-tamil-nadu-600006-india">
 
                         </div>
-                        <div class="gstin-33-aagct-3124-r-1-z-2">GSTIN {{GSTNumber}}</div>
+                        {{#ifExists GSTNumber}}<div class="gstin-33-aagct-3124-r-1-z-2">GSTIN {{GSTNumber}}</div>{{/ifExists}}
                     </div>
                 </div>
+                {{#ifExists PlaceOfSupply}}
                 <div class="place_of_supply">
                     Place Of Supply: {{PlaceOfSupply}}
                 </div>
+                {{/ifExists}}
             </div>
             <div class="frame-2698">
                 <div class="frame-9155">
@@ -1560,7 +1562,7 @@
                 <div class="frame-23972">
                     {{#neq discountAmount 0}}
                     <div class="frame-2394">
-                        <div class="text9">Discount ({{discountPercentage}}%)</div>
+                        <div class="text9">Discount</div>
                         <div class="frame-9157">
                             <div class="text10">{{currencyType}} {{discountAmount}}</div>
                         </div>
@@ -1575,12 +1577,14 @@
 
                     {{#if gstApplicable}}
                     {{#each tax }}
+                    {{#gtZero taxAmount}}
                     <div class="frame-2392">
                         <div class="text9">{{type}} ({{value}}%)</div>
                         <div class="frame-9157">
                             <div class="text10">{{../currencyType}} {{taxAmount}}</div>
                         </div>
                     </div>
+                    {{/gtZero}}
                     {{/each }}
                     {{/if}}
 
@@ -1605,22 +1609,7 @@
                         <div class="text11">Total In Words</div>
                         <div class="frame-9157">
                             <div class="text13">
-                                {{#eq billingCurrency 'inr'}}
-                                Indian Rupee
-                                {{/eq}}
-
-                                {{#eq billingCurrency 'dollar'}}
-                                US Dollar
-                                {{/eq}}
-
-                                {{#eq billingCurrency 'singaporedollar'}}
-                                Singapore Dollar
-                                {{/eq}}
-
-                                {{#eq billingCurrency 'euro'}}
-                                Euro
-                                {{/eq}}
-                                {{amountwords}} Only
+                                {{currencyWord}} {{amountwords}} Only
                             </div>
                         </div>
                     </div>

package/src/hbs/invoicePdf1.hbs

@@ -1368,16 +1368,20 @@
                                 class="billing-address-given-by-the-client-flat-no-012-ground-floor-the-banyan-apartment-jsr-layout-j-p-nagar-9th-phase-alahalli-anjanapura-post-bengaluru-560062-karnataka-india">
                                 {{companyAddress}}
                             </div>
+                            {{#ifExists GSTNumber}}
                             <div class="frame-562">
                               <div class="gstin-33-aafci-2595-g-1-z-9"> GSTIN {{GSTNumber}}</div>
                             </div>
+                            {{/ifExists}}
                         </div>
                     </div>
                 </div>
             </div>
+            {{#ifExists PlaceOfSupply}}
             <div class="place-of-supply-tamil-nadu-33">
                 Place Of Supply: {{PlaceOfSupply}}
             </div>
+            {{/ifExists}}
         </div>
         <div class="invoice-info">
             <div class="card-header">
@@ -1496,12 +1500,14 @@
                         </div>
                     </div>
                     {{#each tax }}
+                    {{#gtZero taxAmount}}
                     <div class="frame-2392">
                         <div class="text9">{{type}} ({{value}}%)</div>
                         <div class="frame-9157">
                             <div class="text10">{{currency}} {{taxAmount}}</div>
                         </div>
                     </div>
+                    {{/gtZero}}
                     {{/each }}
                     <!-- <div class="frame-2398">
                 <div class="text9">CGST (9%)</div>

package/src/utils/currency.js

@@ -13,3 +13,36 @@ export const CURRENCY_SYMBOLS = {
 };
 
 export const symbolFor = ( currency ) => CURRENCY_SYMBOLS[currency] ?? '$';
+
+/**
+ * Words form of each currency, used in the invoice "Total In Words" line.
+ * Keys match billing.currency enums. Unknown keys fall back to 'US Dollar'
+ * to match the pre-existing default.
+ */
+export const CURRENCY_WORDS = {
+  inr: 'Indian Rupee',
+  dollar: 'US Dollar',
+  singaporedollar: 'Singapore Dollar',
+  euro: 'Euro',
+  aed: 'UAE Dirham',
+};
+
+export const wordFor = ( currency ) => CURRENCY_WORDS[currency] ?? 'US Dollar';
+
+/**
+ * Currency-aware monetary rounding.
+ *  - INR  -> rounded to a whole number (no decimals).
+ *  - every other currency -> kept to exactly 2 decimal places.
+ * Returns a Number (not a string) so downstream arithmetic still works.
+ * Non-finite input is normalised to 0.
+ *
+ * @param {number|string} value - the monetary value to round.
+ * @param {string} currency - the currency code (e.g. 'inr', 'dollar').
+ * @return {number} the rounded amount.
+ */
+export const roundAmount = ( value, currency ) => {
+  const n = Number( value );
+  if ( !isFinite( n ) ) return 0;
+  if ( currency === 'inr' ) return Math.round( n );
+  return Math.round( n * 100 ) / 100;
+};

package/src/utils/validations/helper/handlebar.helper.js

@@ -13,5 +13,11 @@ Handlebars.registerHelper( 'gte', function( a, b, options ) {
 Handlebars.registerHelper( 'ifExists', function( value, options ) {
   return value ? options.fn( this ) : options.inverse( this );
 } );
+// Renders the block only when `value` parses to a number greater than zero.
+// Used to hide tax lines (IGST/CGST/SGST) whose amount is 0 / "0" / "0.00".
+Handlebars.registerHelper( 'gtZero', function( value, options ) {
+  const n = Number( String( value ).replace( /,/g, '' ) );
+  return isFinite( n ) && n > 0 ? options.fn( this ) : options.inverse( this );
+} );
 
 export default Handlebars;