tango-app-api-payment-subscription 3.5.10 → 3.5.11

package/package.json

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

package/scripts/seed-payment-reminders.js

@@ -19,7 +19,12 @@ dotenv.config();
 
 const args = process.argv.slice( 2 );
 const dryRun = args.includes( '--dry-run' );
-const STATIC_EMAIL = args.find( ( a ) => a.includes( '@' ) ) || 'ayyanarkalusulingam13@gmail.com';
+
+// Default reminder recipients seeded onto every active client. Any email(s)
+// passed as args are added on top, de-duped.
+const DEFAULT_EMAILS = [ 'sathish@tangotech.co.in', 'ayyanarkalusulingam13@gmail.com' ];
+const argEmails = args.filter( ( a ) => a.includes( '@' ) );
+const REMINDER_EMAILS = [ ...new Set( [ ...DEFAULT_EMAILS, ...argEmails ] ) ];
 
 // Mirrors the app's DEFAULTS() in paymentReminder.controller.js.
 const DEFAULT_TEMPLATES = {
@@ -34,7 +39,7 @@ async function run() {
   // Reuse the app's own connection builder (reads mongo_* env config).
   const { uri, options } = getConnection();
   await mongoose.connect( uri, options );
-  console.log( `Connected. Static recipient: ${STATIC_EMAIL}${dryRun ? '  (DRY RUN — no writes)' : ''}\n` );
+  console.log( `Connected. Recipients: ${REMINDER_EMAILS.join( ', ' )}${dryRun ? '  (DRY RUN — no writes)' : ''}\n` );
 
   const clients = await model.clientModel.find(
       { status: 'active' },
@@ -60,7 +65,7 @@ async function run() {
         {
           $set: {
             clientId: c.clientId,
-            reminderEmails: [ STATIC_EMAIL ],
+            reminderEmails: REMINDER_EMAILS,
             templates: DEFAULT_TEMPLATES,
             updatedBy: 'seed-script',
           },

package/src/controllers/billing.controllers.js

@@ -106,6 +106,29 @@ export const subscribedStoreList = async ( req, res ) => {
 
     );
 
+    // Selected stores for the group being edited. The backend resolves these
+    // itself from the group's `stores` (by groupId) so the FE doesn't have to
+    // send/compute them. It can also accept an explicit selectedStoreIds list.
+    // Each returned store gets an `isSelected` flag (drives the checkbox), and
+    // selected stores are floated to the top across ALL pages (before
+    // pagination) so they appear first.
+    // The live form selection (selectedStoreIds) is authoritative — it matches
+    // exactly what's checked in the UI (including unsaved edits). Only fall back
+    // to the saved group's stores when the FE didn't send a selection.
+    let selectedStoreIds = Array.isArray( req.body.selectedStoreIds ) ? req.body.selectedStoreIds : [];
+    if ( !selectedStoreIds.length && req.body.groupId ) {
+      const group = await findOne( { _id: req.body.groupId }, { stores: 1 } );
+      if ( group && Array.isArray( group.stores ) ) {
+        selectedStoreIds = group.stores;
+      }
+    }
+    // Always tag isSelected (false when nothing is selected) + sort selected
+    // first; storeId secondary keeps the order stable within each partition.
+    pipeline.push(
+        { $addFields: { isSelected: { $in: [ '$storeId', selectedStoreIds ] } } },
+        { $sort: { isSelected: -1, storeId: 1 } },
+    );
+
     const facetStage = {
       $facet: {
         data: [

package/src/controllers/brandsBilling.controller.js

@@ -426,6 +426,13 @@ export async function brandInvoiceList( req, res ) {
       },
     } ];
 
+    // Client users only ever see APPROVED invoices — the approval pipeline
+    // (pendingCsm/pendingFinance/pendingApproval/pending) is internal to tango
+    // and must not be exposed to clients, even in the raw list response.
+    if ( req.user?.userType === 'client' ) {
+      query.push( { $match: { status: 'approved' } } );
+    }
+
     // If the user picked an explicit Month or Year, ignore durationFilter so the
     // two ranges don't conflict (e.g. "current month" + April would always 0).
     const hasMonthYear = ( req.body.monthFilter && String( req.body.monthFilter ) !== '' ) || ( req.body.yearFilter && String( req.body.yearFilter ) !== '' );
@@ -677,6 +684,76 @@ export async function latestDailyPricing( req, res ) {
       } );
     }
 
+    // Per-product price (basepricing) + month length, used to prorate the
+    // invoice amount: (price / daysInMonth) * workingDays. Computed once here so
+    // BOTH the export and the on-screen table use the same numbers.
+    const priceByProduct = {};
+    let bpCurrency = 'inr';
+    try {
+      const bp = await basePriceService.findOne(
+          { clientId: req.body.clientId },
+          { standard: 1, currency: 1 },
+      );
+      bpCurrency = bp?.currency || 'inr';
+      for ( const p of ( bp?.standard || [] ) ) {
+        const price = Number( p.negotiatePrice ) || Number( p.basePrice ) || 0;
+        if ( p.productName ) {
+          priceByProduct[p.productName] = price;
+        }
+      }
+    } catch ( bpErr ) {
+      logger.error( { error: bpErr, function: 'latestDailyPricing.basePrice', clientId: req.body.clientId } );
+    }
+    // Billing type per product (perStore / perZone / perCamera) from the client
+    // plan — drives whether the amount multiplies by camera/zone count.
+    const billingTypeByProduct = {};
+    try {
+      const planClient = await clientService.findOne(
+          { clientId: req.body.clientId },
+          { 'planDetails.product.productName': 1, 'planDetails.product.billingType': 1 },
+      );
+      for ( const p of ( planClient?.planDetails?.product || [] ) ) {
+        if ( p.productName ) {
+          billingTypeByProduct[p.productName] = p.billingType || 'perStore';
+        }
+      }
+    } catch ( btErr ) {
+      logger.error( { error: btErr, function: 'latestDailyPricing.billingType', clientId: req.body.clientId } );
+    }
+    const daysInMonth = dayjs( record.dateISO ).daysInMonth();
+    const prettyProduct = ( name ) => String( name || '' )
+        .replace( /^tango/i, '' )
+        .replace( /([a-z])([A-Z])/g, '$1 $2' )
+        .replace( /^./, ( ch ) => ch.toUpperCase() );
+    // Units to bill: perZone/perCamera multiply by the store's zone/camera
+    // count (same rule as invoice generation + the annexure); else per-store=1.
+    const productUnits = ( store, product ) => {
+      const billingType = billingTypeByProduct[product.productName] || 'perStore';
+      if ( product.productName === 'tangoZone' ) {
+        if ( billingType === 'perZone' && ( store.zoneCount || 0 ) > 0 ) {
+          return store.zoneCount;
+        }
+        if ( billingType === 'perCamera' && ( store.zoneCameraCount || 0 ) > 0 ) {
+          return store.zoneCameraCount;
+        }
+      } else if ( product.productName === 'tangoTraffic' ) {
+        if ( billingType === 'perCamera' && ( store.trafficCameraCount || 0 ) > 0 ) {
+          return store.trafficCameraCount;
+        }
+      }
+      return 1;
+    };
+    const productInvoiceAmount = ( store, product ) => {
+      const price = priceByProduct[product.productName] || 0;
+      const workingDays = Number( product.workingdays ) || 0;
+      if ( price <= 0 || workingDays <= 0 ) {
+        return 0;
+      }
+      const units = productUnits( store, product );
+      const days = Math.min( workingDays, daysInMonth );
+      return Math.round( ( ( price / daysInMonth ) * days * units ) * 100 ) / 100;
+    };
+
     if ( req.body.export ) {
       const exportdata = [];
       stores.forEach( ( store ) => {
@@ -697,6 +774,7 @@ export async function latestDailyPricing( req, res ) {
               'Zone Camera Count': isZone ? ( store.zoneCameraCount || 0 ) : 0,
               'Zone Count': isZone ? ( store.zoneCount || 0 ) : 0,
               'Working Days': product.workingdays || 0,
+              'Invoice Amount': productInvoiceAmount( store, product ),
               'Status': store.status || '',
             } );
           } );
@@ -711,6 +789,7 @@ export async function latestDailyPricing( req, res ) {
             'Zone Camera Count': 0,
             'Zone Count': 0,
             'Working Days': 0,
+            'Invoice Amount': 0,
             'Status': store.status || '',
           } );
         }
@@ -725,6 +804,34 @@ export async function latestDailyPricing( req, res ) {
       storeList = stores.slice( skip, skip + Number( req.body.limit ) );
     }
 
+    // Invoice Amount per store: prorate each product by the days it ran this
+    // month — (price / daysInMonth) * workingDays — summed across the store's
+    // products, plus a per-product breakdown for the UI. Uses the shared
+    // priceByProduct / daysInMonth / productInvoiceAmount computed above.
+    storeList = storeList.map( ( store ) => {
+      let invoiceAmount = 0;
+      const invoiceBreakdown = [];
+      for ( const product of ( store.products || [] ) ) {
+        const amount = productInvoiceAmount( store, product );
+        invoiceAmount += amount;
+        // One breakdown row per product on the store (so the UI can show
+        // Traffic: ₹x, Zone: ₹y …).
+        invoiceBreakdown.push( {
+          productName: product.productName,
+          label: prettyProduct( product.productName ),
+          price: priceByProduct[product.productName] || 0,
+          workingDays: Number( product.workingdays ) || 0,
+          amount,
+        } );
+      }
+      return {
+        ...( store._doc || store ),
+        invoiceAmount: Math.round( invoiceAmount * 100 ) / 100,
+        invoiceBreakdown,
+        invoiceCurrency: bpCurrency,
+      };
+    } );
+
     // Monthly Billing Summary — one row per month of the brand's invoice
     // history (stores billed + invoice amount), newest first. The UI tags the
     // current/last-generated rows and computes month-over-month deltas.

package/src/dtos/validation.dtos.js

@@ -286,6 +286,12 @@ export const subscribedStoreListBody = joi.object( {
   state: joi.array().optional(),
   city: joi.array().optional(),
   getFilters: joi.boolean().optional(),
+  // Storeids selected in the group being edited — backend floats them to the
+  // top (selected-first ordering across pages).
+  selectedStoreIds: joi.array().items( joi.string() ).optional(),
+  // Group being edited — backend resolves its selected stores and tags each
+  // returned store with isSelected (drives checkbox + selected-first order).
+  groupId: joi.string().optional().allow( '' ),
 } );
 
 export const subscribedStoreListSchema = {

package/src/routes/brandsBilling.routes.js

@@ -6,12 +6,12 @@ import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middl
 export const brandsBillingRouter = express.Router();
 
 brandsBillingRouter.post( '/brandsBillingList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), brandsBillingList );
-brandsBillingRouter.post( '/brandInvoiceList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), brandInvoiceList );
+brandsBillingRouter.post( '/brandInvoiceList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ ] } ), brandInvoiceList );
 brandsBillingRouter.post( '/latestDailyPricing', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), latestDailyPricing );
 brandsBillingRouter.post( '/brandBillingGroups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), brandBillingGroups );
 brandsBillingRouter.put( '/updateDailyPricingWorkingDays', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingWorkingDays );
 brandsBillingRouter.put( '/updateDailyPricingStoreField', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingStoreField );
-brandsBillingRouter.post( '/getClientBillingInfo', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getClientBillingInfo );
+brandsBillingRouter.post( '/getClientBillingInfo', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getClientBillingInfo );
 brandsBillingRouter.get( '/bulk-download-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), bulkDownloadBillingGroups );
 brandsBillingRouter.post( '/bulk-update-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), bulkUpdateBillingGroups );
 brandsBillingRouter.post( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );

package/src/routes/invoice.routes.js

@@ -21,11 +21,11 @@ function superadminBypass( accessConfig ) {
 }
 
 
-invoiceRouter.post( '/createInvoice', isAllowedSessionHandler, createInvoice );
-invoiceRouter.post( '/regerateInvoice', isAllowedSessionHandler, createInvoice );
+invoiceRouter.post( '/createInvoice', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), createInvoice );
+invoiceRouter.post( '/regerateInvoice', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), createInvoice );
 invoiceRouter.post( '/invoiceDownload/bulk', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceDownloadBulk );
 invoiceRouter.post( '/invoiceDownload/:invoiceId', isAllowedSessionHandler, invoiceDownload );
-invoiceRouter.post( '/clientInvoiceList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), clientInvoiceList );
+invoiceRouter.post( '/clientInvoiceList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), clientInvoiceList );
 invoiceRouter.post( '/creditTransactionlist', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), creditTransactionlist );
 invoiceRouter.post( '/pendingInvoices', isAllowedSessionHandler, pendingInvoices );
 invoiceRouter.post( '/applyDiscount', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), applyDiscount );
@@ -33,9 +33,9 @@ invoiceRouter.post( '/migrateInvoice', migrateInvoice );
 invoiceRouter.post( '/PaymentStatusChange', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), PaymentStatusChange );
 invoiceRouter.post( '/recordPayment', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), recordPayment );
 invoiceRouter.post( '/checkPaymentStatus', checkPaymentStatus );
-invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getInvoice );
-invoiceRouter.get( '/invoiceAnnexure/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceAnnexure );
-invoiceRouter.get( '/invoiceBankDetails/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceBankDetails );
+invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango', 'client' ], access: [ ] } ), getInvoice );
+invoiceRouter.get( '/invoiceAnnexure/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceAnnexure );
+invoiceRouter.get( '/invoiceBankDetails/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceBankDetails );
 invoiceRouter.put( '/updateInvoice', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateInvoice );
 invoiceRouter.get( '/getClientBasePricing/:clientId', isAllowedSessionHandler, getClientBasePricing );
 invoiceRouter.delete( '/deleteInvoice/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), deleteInvoice );