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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.5.19",
+    "version": "3.5.20",
     "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

@@ -287,11 +287,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 );
@@ -1207,20 +1212,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 ) {

package/src/controllers/paymentSubscription.controllers.js

@@ -2256,12 +2256,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 +2304,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 +2354,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 +2521,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 +2702,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 +2722,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,