tango-app-api-payment-subscription 3.5.15 → 3.5.17

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById, fileUpload, customSignedUrl } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
 import * as basePriceService from '../services/basePrice.service.js';
 import * as storeService from '../services/store.service.js';
@@ -85,6 +85,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
           billingDetails: 1,
           price: 1,
           priceType: 1,
+          billingGroupWisePricing: 1,
           virtualAccount: 1,
           paymentInvoice: 1,
         },
@@ -259,6 +260,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     currentPlanInfo.dueLimitReached = getPI;
     currentPlanInfo.price = clientInfo[0].price || '--';
     currentPlanInfo.priceType = clientInfo[0].priceType || '--';
+    currentPlanInfo.billingGroupWisePricing = clientInfo[0].billingGroupWisePricing || false;
     currentPlanInfo.subscriptionType = clientInfo[0].planDetails.subscriptionType || '--';
     currentPlanInfo.subscriptionPeriod = clientInfo[0].planDetails.subscriptionPeriod || '--';
     currentPlanInfo.storeCount = storeCount || '--';
@@ -2246,7 +2248,15 @@ export const invoiceList = async ( req, res ) => {
 
 export const priceList = async ( req, res ) => {
   try {
-    let pricingDetails = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
+    // Group-wise pricing: when a groupId is sent, read that group's own
+    // basepricing doc; otherwise read the brand-level doc (groupId unset).
+    const priceQuery = { clientId: req.body.clientId };
+    if ( req.body.groupId ) {
+      priceQuery.groupId = req.body.groupId;
+    } else {
+      priceQuery.groupId = { $exists: false };
+    }
+    let pricingDetails = await basePricingService.findOne( priceQuery, { standard: 1, step: 1, oneTimeFeePerStore: 1 } );
     if ( !pricingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -2301,19 +2311,25 @@ export const priceList = async ( req, res ) => {
               product.showImg = true;
               product.showEditDelete = true;
             }
-            product.storeCount = item.storeCount;
+            // Last tier absorbs whatever stores remain after the earlier tiers.
+            // Never let it go negative when the actual store count is smaller
+            // than the defined tier ranges (e.g. 83 stores across 1-50 / 51-100
+            // left the last tier at 83 - 100 = -17).
+            product.storeCount = Math.max( item.storeCount, 0 );
             product.lastIndex = true;
-          } else if ( index == 0 ) {
-            product.storeCount = 100;
-            item.storeCount = item.storeCount - 100;
           } else {
-            product.showImg = true;
-            let rangeArray = product.storeRange.split( '-' );
+            // Non-last tier: use its own range size (end - start + 1), but cap at
+            // the stores still remaining so a tier can't claim more stores than
+            // exist. The first tier previously hardcoded 100, which overcounted
+            // (and pushed the last tier negative) whenever the range wasn't 1-100.
+            product.showImg = index != 0;
+            let rangeArray = String( product.storeRange || '' ).split( '-' );
             let startNumber = parseInt( rangeArray[0] );
             let endNumber = parseInt( rangeArray[1] );
-            let diff = endNumber - startNumber + 1;
-            product.storeCount = diff;
-            item.storeCount = item.storeCount - diff;
+            let diff = ( endNumber - startNumber + 1 ) || 0;
+            let assigned = Math.max( Math.min( diff, item.storeCount ), 0 );
+            product.storeCount = assigned;
+            item.storeCount = item.storeCount - assigned;
           }
         }
         // let discountPrice = product.basePrice * ( product.discountPercentage / 100 );
@@ -2335,6 +2351,7 @@ export const priceList = async ( req, res ) => {
     let finalValue = parseFloat( discountTotalPrice ) + gstAmount;
     let result = {
       product: data,
+      oneTimeFeePerStore: pricingDetails.oneTimeFeePerStore != null ? pricingDetails.oneTimeFeePerStore : null,
       totalActualPrice: originalTotalPrice,
       totalNegotiatePrice: discountTotalPrice.toFixed( 2 ),
       actualPrice: totalProductPrice,
@@ -2353,7 +2370,15 @@ export const priceList = async ( req, res ) => {
 
 export const pricingListUpdate = async ( req, res ) => {
   try {
-    let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
+    // Group-wise pricing: target the group's own basepricing doc when a groupId
+    // is sent; otherwise the brand-level doc (groupId unset).
+    const priceQuery = { clientId: req.body.clientId };
+    if ( req.body.groupId ) {
+      priceQuery.groupId = req.body.groupId;
+    } else {
+      priceQuery.groupId = { $exists: false };
+    }
+    let getPriceInfo = await basePricingService.findOne( priceQuery, { standard: 1, step: 1 } );
     let findClient = await paymentService.findOneClient( { clientId: req.body.clientId } );
 
     console.log( getPriceInfo );
@@ -2363,8 +2388,10 @@ export const pricingListUpdate = async ( req, res ) => {
       pricingType: findClient.priceType,
     };
 
-    if ( findClient.priceType==='standard' ) {
-      getPriceInfo.standard.map( ( item ) => {
+    // Old-data snapshot for the audit log. Guard on getPriceInfo: a brand-new
+    // billing-group doc has none yet, and the no-doc path is handled below.
+    if ( getPriceInfo && findClient.priceType==='standard' ) {
+      ( getPriceInfo.standard || [] ).map( ( item ) => {
         oldData = {
           ...oldData,
           [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
@@ -2376,8 +2403,8 @@ export const pricingListUpdate = async ( req, res ) => {
           };
         }
       } );
-    } else {
-      getPriceInfo.step.map( ( item ) => {
+    } else if ( getPriceInfo ) {
+      ( getPriceInfo.step || [] ).map( ( item ) => {
         oldData = {
           ...oldData,
           [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
@@ -2484,6 +2511,18 @@ export const pricingListUpdate = async ( req, res ) => {
     } else {
       getPriceInfo.step = req.body.products;
     }
+    // Brand-level one-time fee per store. Only overwrite when the request
+    // actually carries a value so other save paths don't wipe it.
+    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.
+    if ( req.body.groupId ) {
+      getPriceInfo.groupId = req.body.groupId;
+      if ( req.body.groupName ) {
+        getPriceInfo.groupName = req.body.groupName;
+      }
+    }
     getPriceInfo.save().then( async () => {
       let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { priceType: 1, paymentInvoice: 1, planDetails: 1 } );
       clientDetails.priceType = req.body.type;
@@ -2554,7 +2593,15 @@ export const pricingListUpdate = async ( req, res ) => {
 
 async function updatePricing( req, res, update ) {
   let baseProduct = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
-  let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
+  // Group-wise pricing: scope the doc to the group when a groupId is sent;
+  // otherwise the brand-level doc (groupId unset).
+  const pricingDocQuery = { clientId: req.body.clientId };
+  if ( req.body.groupId ) {
+    pricingDocQuery.groupId = req.body.groupId;
+  } else {
+    pricingDocQuery.groupId = { $exists: false };
+  }
+  let getPriceInfo = await basePricingService.findOne( pricingDocQuery, { standard: 1, step: 1 } );
   let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
   if ( clientDetails ) {
     let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
@@ -2625,12 +2672,20 @@ async function updatePricing( req, res, update ) {
       step: stepList,
       clientId: req.body.clientId,
     };
+    // Stamp the group identity so group-wise pricing docs are distinguishable
+    // from the brand-level doc.
+    if ( req.body.groupId ) {
+      data.groupId = req.body.groupId;
+      if ( req.body.groupName ) {
+        data.groupName = req.body.groupName;
+      }
+    }
     console.log( '🚀 ~ updatePricing ~ data:', data );
     if ( !getPriceInfo ) {
       await basePricingService.create( data );
     } else {
       delete data.clientId;
-      await basePricingService.updateOne( { clientId: req.body.clientId }, data );
+      await basePricingService.updateOne( pricingDocQuery, data );
     }
     let product = [];
     let clientId = req.body.clientId;
@@ -4130,3 +4185,113 @@ export async function createDefaultbillings( req, res ) {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Brand documents (Plans & Subscription > Documents accordion).
+// Upload a single PDF for a client, store it in the assets bucket under
+// <clientId>/documents/, and record { documentName, path } on the client's
+// additionalDocuments array. List returns the docs with signed URLs.
+// ---------------------------------------------------------------------------
+export async function uploadClientDocument( req, res ) {
+  try {
+    const clientId = String( req.body?.clientId || '' );
+    const documentName = String( req.body?.documentName || '' ).trim();
+    const expiryDateRaw = req.body?.expiryDate;
+    const file = req.file; // multer single('file')
+
+    if ( !clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+    if ( !documentName ) {
+      return res.sendError( 'documentName is required', 400 );
+    }
+    if ( !file ) {
+      return res.sendError( 'file is required', 400 );
+    }
+    // PDF only.
+    if ( file.mimetype !== 'application/pdf' ) {
+      return res.sendError( 'Only PDF files are allowed', 400 );
+    }
+
+    const client = await paymentService.findOneClient( { clientId }, { clientId: 1 } );
+    if ( !client ) {
+      return res.sendError( 'Client not found', 404 );
+    }
+
+    const bucket = JSON.parse( process.env.BUCKET );
+    // Unique-ish file name so re-uploads with the same display name don't clash.
+    const safeName = documentName.replace( /[^a-zA-Z0-9-_]/g, '_' );
+    const fileName = `${safeName}_${Date.now()}.pdf`;
+    const key = `${clientId}/documents/`;
+
+    await fileUpload( {
+      Bucket: bucket.assets,
+      Key: key,
+      fileName: fileName,
+      ContentType: file.mimetype,
+      body: file.buffer,
+    } );
+
+    const storedPath = `${key}${fileName}`;
+    const expiryDate = expiryDateRaw ? new Date( expiryDateRaw ) : null;
+    await paymentService.pushAdditionalDocument( { clientId }, {
+      documentName: documentName,
+      path: storedPath,
+      expiryDate: ( expiryDate && !isNaN( expiryDate.getTime() ) ) ? expiryDate : null,
+      uploadedAt: new Date(),
+    } );
+
+    return res.sendSuccess( { documentName, path: storedPath, expiryDate } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'uploadClientDocument' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+export async function getClientDocuments( req, res ) {
+  try {
+    const clientId = String( req.query?.clientId || req.params?.clientId || '' );
+    if ( !clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+    const client = await paymentService.findOneClient( { clientId }, { additionalDocuments: 1 } );
+    const bucket = JSON.parse( process.env.BUCKET );
+    const docs = await Promise.all( ( client?.additionalDocuments || [] ).map( async ( d ) => {
+      let url = '';
+      try {
+        url = await customSignedUrl( { Bucket: bucket.assets, file_path: d.path }, 8 );
+      } catch ( e ) {
+        url = '';
+      }
+      return {
+        _id: d._id,
+        documentName: d.documentName,
+        path: d.path,
+        expiryDate: d.expiryDate,
+        uploadedAt: d.uploadedAt,
+        url,
+      };
+    } ) );
+    return res.sendSuccess( { documents: docs } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'getClientDocuments' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+// Toggle billing-group-wise pricing on the client. When enabled, pricing is
+// maintained per billing group (separate basepricing docs keyed by groupId).
+export async function setBillingGroupWisePricing( req, res ) {
+  try {
+    const clientId = String( req.body?.clientId || '' );
+    const enabled = req.body?.enabled === true || req.body?.enabled === 'true';
+    if ( !clientId ) {
+      return res.sendError( 'clientId is required', 400 );
+    }
+    await paymentService.updateOne( { clientId }, { billingGroupWisePricing: enabled } );
+    return res.sendSuccess( { clientId, billingGroupWisePricing: enabled } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'setBillingGroupWisePricing' } );
+    return res.sendError( error, 500 );
+  }
+}
+

package/src/dtos/validation.dtos.js

@@ -153,6 +153,11 @@ export const validatePriceSchema = joi.object( {
   type: joi.string().optional(),
   clientId: joi.string().required(),
   products: joi.array().optional(),
+  oneTimeFeePerStore: joi.number().optional().allow( null, '' ),
+  // Billing-group-wise pricing: when present, the pricing is saved to / read
+  // from the group's own basepricing doc instead of the brand-level one.
+  groupId: joi.string().optional().allow( null, '' ),
+  groupName: joi.string().optional().allow( null, '' ),
   pricing: joi.array().items( joi.object( {
     productName: joi.string().required(),
     negotiatePrice: joi.number().required(),
@@ -177,6 +182,8 @@ export const revisedParams = {
 export const validatePriceListSchema = joi.object( {
   priceType: joi.string().required(),
   clientId: joi.string().required(),
+  // Optional billing group filter for group-wise pricing.
+  groupId: joi.string().optional().allow( null, '' ),
 } );
 
 export const validatePriceListParams = {

package/src/routes/brandsBilling.routes.js

@@ -1,6 +1,6 @@
 
 import express from 'express';
-import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary, additionalProducts } from '../controllers/brandsBilling.controller.js';
+import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary, additionalProducts, additionalProductExport } from '../controllers/brandsBilling.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 
 export const brandsBillingRouter = express.Router();
@@ -17,3 +17,4 @@ brandsBillingRouter.post( '/bulk-update-billing-groups', isAllowedSessionHandler
 brandsBillingRouter.post( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );
 brandsBillingRouter.get( '/additionalProducts', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), additionalProducts );
+brandsBillingRouter.get( '/additionalProductExport', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), additionalProductExport );

package/src/routes/paymentSubscription.routes.js

@@ -1,11 +1,16 @@
 
 import express from 'express';
+import multer from 'multer';
 import * as paymentController from '../controllers/paymentSubscription.controllers.js';
 import { validate, isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 import * as validationDtos from '../dtos/validation.dtos.js';
 import { validateClient } from '../utils/validations/client.validation.js';
 export const paymentSubscriptionRouter = express.Router();
 
+// PDF document upload (Plans & Subscription > Documents). In-memory storage,
+// 10MB cap; the controller streams the buffer to the assets S3 bucket.
+const documentUpload = multer( { storage: multer.memoryStorage(), limits: { fileSize: 10 * 1024 * 1024 } } );
+
 paymentSubscriptionRouter.post( '/addBilling', isAllowedSessionHandler, accessVerification( {
   userType: [ 'tango', 'client' ], access: [
     { featureName: 'Global', name: 'Subscription', permissions: [ 'isAdd' ] },
@@ -146,4 +151,11 @@ paymentSubscriptionRouter.put( '/pushNotification/update/:notificationId', isAll
 paymentSubscriptionRouter.post( '/updateRemind/:notificationId', isAllowedSessionHandler, validate( validationDtos.validateId ), paymentController.updateRemind );
 paymentSubscriptionRouter.post( '/createDefaultbillings', paymentController.createDefaultbillings );
 
+// Brand documents (Plans & Subscription > Documents accordion).
+paymentSubscriptionRouter.post( '/client-document/upload', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [ 'isEdit' ] } ] } ), documentUpload.single( 'file' ), paymentController.uploadClientDocument );
+paymentSubscriptionRouter.get( '/client-document/list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [] } ] } ), paymentController.getClientDocuments );
+
+// Toggle billing-group-wise pricing for a client (tango only, edit perm).
+paymentSubscriptionRouter.post( '/billingGroupWisePricing', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Subscription', permissions: [ 'isEdit' ] } ] } ), paymentController.setBillingGroupWisePricing );
+
 

package/src/services/clientPayment.services.js

@@ -16,6 +16,11 @@ export const updateOne = ( query = {}, record = {} ) => {
   return model.clientModel.updateOne( query, { $set: record } );
 };
 
+// Push a document into the client's additionalDocuments array.
+export const pushAdditionalDocument = ( query = {}, document = {} ) => {
+  return model.clientModel.updateOne( query, { $push: { additionalDocuments: document } } );
+};
+
 export const aggregate = ( query = [] ) => {
   return model.clientModel.aggregate( query );
 };