tango-app-api-payment-subscription 3.0.43-dev → 3.0.45-dev

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } 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';
@@ -13,16 +13,18 @@ import dayjs from 'dayjs';
 import Handlebars from 'handlebars';
 import fs from 'fs';
 import path from 'path';
-import { JSDOM } from 'jsdom';
-import pdfMake from 'pdfmake';
-import htmlToPdfmake from 'html-to-pdfmake';
+// import { JSDOM } from 'jsdom';
+// import pdfMake from 'pdfmake';
+// import htmlToPdfmake from 'html-to-pdfmake';
 import axios from 'axios';
-
+import htmlpdf from 'html-pdf-node';
 export const addBilling = async ( req, res ) => {
   try {
     let params = {
       'billingDetails.gstNumber': req.body.gstNo,
       'billingDetails.billingAddress': req.body.billingAddress,
+      'billingDetails.companyName': req.body.companyName,
+      'billingDetails.PlaceOfSupply': req.body.PlaceOfSupply,
     };
     let result = await paymentService.updateOne( { clientId: req.body.clientId }, params );
     if ( result.modifiedCount ) {
@@ -45,7 +47,7 @@ export const addBilling = async ( req, res ) => {
         changes: [ 'Billing Address', 'Gst Number' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( { message: 'Billing Details Added Successfully', data: resultData } );
     } else {
       logger.error( 'Error Occurs WHile updating billing Details' );
@@ -152,7 +154,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
               element.toolTip = 'Trial Expired';
               element.active = true;
             } else {
-              trialProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': differenceInDays +' days trial left' } );
+              trialProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': differenceInDays + ' days trial left' } );
               element.toolTip = 'On Trial';
               element.active = true;
             }
@@ -173,7 +175,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     let getPI = false;
     if ( getPendingInvoice.length > 0 ) {
       if ( getPendingInvoice[0].billingDate >= currentDate ) {
-        getPI= false;
+        getPI = false;
       } else {
         getPI = true;
       }
@@ -202,7 +204,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     currentPlanInfo.expiredProducts = expiredProducts || '--';
     currentPlanInfo.product = activeProducts || '--';
     currentPlanInfo.pendingClientRequest = getPCR;
-    currentPlanInfo.currencyType = clientInfo[0].paymentInvoice.currencyType;
+    currentPlanInfo.currencyType = clientInfo[0].paymentInvoice && clientInfo[0].paymentInvoice.currencyType;
     currentPlanInfo.dollarPrice = await convertINRtoUSD( clientInfo[0].price );
     let data = {
       _id: clientInfo[0]._id,
@@ -273,7 +275,7 @@ async function calculatePricing( req, res ) {
         productDiscounts.push( getProduct.discoutPercentage );
       }
       let stage = 0;
-      if ( input.storesCount == '1-25' ) {
+      if ( input.storesCount == '2-25' ) {
         stage = 0;
       } else if ( input.storesCount == '26-50' ) {
         stage = 1;
@@ -298,7 +300,9 @@ async function calculatePricing( req, res ) {
       } else if ( input.storesCount == '2000+' ) {
         stage = 9;
       }
-      let discountprice = Math.round( basicprice * Math.pow( 0.9, stage ) );
+
+
+      let discountprice = Math.round( basicprice * ( Math.pow( 0.92, stage ) )/10 )*10;
       dummy.push( discountprice );
       OriginalPrice = OriginalPrice + discountprice;
       finalPrice = finalPrice + discountprice;
@@ -426,7 +430,7 @@ export const updateSubscription = async ( req, res ) => {
             changes: [ 'Name', 'Description', 'Category' ],
             eventType: 'insert',
           };
-          insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         }
       }
       if ( item.type == 'subscription' ) {
@@ -436,6 +440,25 @@ export const updateSubscription = async ( req, res ) => {
             subscribedDate: new Date(),
             status: 'live',
           } );
+          let productObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: requestBody.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+            category: 'Brand Activity Log',
+            features: 'Subscription',
+            // title: 'Subscribed',
+            alertCta: [],
+            markasRead: false,
+            logType: 'Subscribed',
+            showPushNotification: true,
+            changes: [ 'Plan Details', 'Price', 'Price Type' ],
+            eventType: 'update',
+            date: new Date(),
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, productObj );
         } else {
           clientProducts[existsIndex].status = 'live';
           clientProducts[existsIndex].subscribedDate = new Date();
@@ -462,7 +485,7 @@ export const updateSubscription = async ( req, res ) => {
     };
     let pricingDetails = await calculatePricing( req, res );
     if ( subscriptionCount ) {
-      let userDetails= await userService.findOne( { clientId: requestBody.clientId, role: 'superadmin' } );
+      let userDetails = await userService.findOne( { clientId: requestBody.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
           userName: userDetails.userName,
@@ -488,17 +511,17 @@ export const updateSubscription = async ( req, res ) => {
     };
 
     let result = await paymentService.updateOne( { clientId: req.params.clientId }, data );
-    const logObj = {
-      clientId: req.body.clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Subscrption Details updated',
-      changes: [ 'Plan Details', 'Price', 'Price Type' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: req.body.clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Subscrption Details updated',
+    //   changes: [ 'Plan Details', 'Price', 'Price Type' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     let storeProduct = clientProducts.map( ( item ) => item.productName );
     await storeService.updateMany( { clientId: req.params.clientId }, { product: storeProduct } );
 
@@ -552,7 +575,7 @@ export const updateSubscription = async ( req, res ) => {
 
 export const trialProductList = async ( req, res ) => {
   try {
-    let query =[
+    let query = [
       {
         $match: {
           clientId: req.query.clientId,
@@ -619,7 +642,7 @@ export const unsubscribeProduct = async ( req, res ) => {
       changes: [ 'Reason', 'Description', 'Category' ],
       eventType: 'insert',
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -653,7 +676,7 @@ export const trialExtendRequest = async ( req, res ) => {
       changes: [ 'Name', 'Description', 'Category' ],
       eventType: 'insert',
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -689,7 +712,7 @@ export const trialRequest = async ( req, res ) => {
       changes: [ 'Name', 'Description', 'Category' ],
       eventType: 'insert',
     };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -717,6 +740,8 @@ export const invoiceDetails = async ( req, res ) => {
       paymentCycle: clientInvoiceDetails?.paymentInvoice?.paymentCycle || '',
       currencyType: clientInvoiceDetails?.paymentInvoice?.currencyType || '',
       invoiceTo: clientInvoiceDetails?.paymentInvoice?.invoiceTo || [],
+      invoiceCC: clientInvoiceDetails?.paymentInvoice?.invoiceCC || [],
+      PomNumber: clientInvoiceDetails?.paymentInvoice?.PomNumber || [],
       paymentAgreementTo: clientInvoiceDetails?.paymentInvoice?.paymentAgreementTo || [],
       invoiceOn: clientInvoiceDetails?.paymentInvoice?.invoiceOn || '',
       extendPaymentPeriodDays: clientInvoiceDetails?.paymentInvoice?.extendPaymentPeriodDays || '',
@@ -741,6 +766,9 @@ export const updateInvoiceDetails = async ( req, res ) => {
     clientInvoiceDetails.paymentInvoice.paymentCycle = data.paymentCycle;
     clientInvoiceDetails.paymentInvoice.currencyType = data.currencyType;
     clientInvoiceDetails.paymentInvoice.invoiceTo = data.invoiceTo;
+    clientInvoiceDetails.paymentInvoice.invoiceCC = data.invoiceCC;
+    clientInvoiceDetails.paymentInvoice.invoiceCC = data.invoiceCC;
+    clientInvoiceDetails.paymentInvoice.PomNumber = data.PomNumber;
     clientInvoiceDetails.paymentInvoice.paymentAgreementTo = data.paymentAgreementTo;
     clientInvoiceDetails.paymentInvoice.invoiceOn = data.invoiceOn;
     clientInvoiceDetails.paymentInvoice.extendPaymentPeriodDays = data.extendPaymentPeriodDays;
@@ -755,7 +783,7 @@ export const updateInvoiceDetails = async ( req, res ) => {
         changes: [ 'Pro Rate', 'Payment Type', 'Payment Cycle', 'Currency Type', 'Invoice To', 'Payment Agreement To', 'Invoice On', 'Extend Payment PeriodDays' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Invoice Updated Successfully' );
     } ).catch( ( e ) => {
       return res.sendError( e, 500 );
@@ -808,7 +836,7 @@ export const notificationList = async ( req, res ) => {
           let date = dayjs().startOf( 'day' );
           let days = date.diff( startDate, 'day' );
           let totalDays = endDate.diff( startDate, 'day' );
-          let percentage = Math.round( ( days / totalDays )* 100 );
+          let percentage = Math.round( ( days / totalDays ) * 100 );
           let leftDays = endDate.diff( date, 'day' );
           notificationList.push( {
             product: item.product.productName,
@@ -853,6 +881,25 @@ export const trialApproval = async ( req, res ) => {
     requestData.status = 'completed';
     requestData.save().then( async () => {
       if ( req.body.type == 'approve' ) {
+        let logObj = {
+          userName: req.user?.userName,
+          email: req.user?.email,
+          clientId: requestData.clientId,
+          clientNotification: false,
+          adminNotification: true,
+          logSubType: 'Subscription - Your 14 Days free trial has been started',
+          category: 'Brand Activity Log',
+          features: 'Subscription',
+          // title: 'Start Trial',
+          alertCta: [],
+          markasRead: false,
+          logType: 'Start Trial',
+          showPushNotification: true,
+          date: new Date(),
+          changes: [ 'Plan Details' ],
+          eventType: 'update',
+        };
+        insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
         let clientProducts = await paymentService.findOne( { clientId: requestData.clientId }, { planDetails: 1 } );
         if ( clientProducts?.planDetails.subscriptionType == 'free' ) {
           clientProducts.planDetails.subscriptionType = 'premium';
@@ -877,13 +924,13 @@ export const trialApproval = async ( req, res ) => {
         await storeService.addremoveElement( { clientId: requestData.clientId }, { $push: { product: requestData.name } } );
         req.body.clientId = requestData.clientId;
         updatePricing( req, res, true );
-        let userDetails= await userService.findOne( { clientId: requestData.clientId, role: 'superadmin' } );
+        let userDetails = await userService.findOne( { clientId: requestData.clientId, role: 'superadmin' } );
         let [ firstWord, secondWord ] = requestData.name.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
         if ( userDetails ) {
           let data = {
             userName: userDetails.userName,
-            product: firstWord +' '+ secondWord,
+            product: firstWord + ' ' + secondWord,
             domain: appConfig.url.domain,
           };
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialInitiateEmail.hbs', 'utf8' );
@@ -934,17 +981,17 @@ export const trialApproval = async ( req, res ) => {
           logger.error( { error: error, function: 'oldBulkStoreUpdate' } );
         } );
       }
-      const logObj = {
-        clientId: req.body.clientId,
-        userName: req.user?.userName,
-        email: req.user?.email,
-        date: new Date(),
-        logType: 'billing',
-        logSubType: 'Trial Approved',
-        changes: [ 'status' ],
-        eventType: 'update',
-      };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      // const logObj = {
+      //   clientId: req.body.clientId,
+      //   userName: req.user?.userName,
+      //   email: req.user?.email,
+      //   date: new Date(),
+      //   logType: 'billing',
+      //   logSubType: 'Trial Approved',
+      //   changes: [ 'status' ],
+      //   eventType: 'update',
+      // };
+      // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -973,13 +1020,13 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         requestData.status = 'completed';
         requestData.save();
       }
-      let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+      let userDetails = await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let [ firstWord, secondWord ] = req.body.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
         let data = {
           userName: userDetails.userName,
-          product: firstWord +' '+secondWord,
+          product: firstWord + ' ' + secondWord,
           days: req.body.days,
           date: dayjs( trialDate ).format( 'YYYY-MM-DD' ),
           domain: appConfig.url.domain,
@@ -996,17 +1043,36 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
-      const logObj = {
-        clientId: req.body.clientId,
+      let notifyObj = {
         userName: req.user?.userName,
         email: req.user?.email,
+        clientId: req.body.clientId,
+        clientNotification: false,
+        adminNotification: true,
+        logSubType: `Your Trial has been extended for ${req.body.days} days, explore the service with no extra charge and keep unlocking better insights`,
+        category: 'Brand Activity Log',
+        features: 'Subscription',
+        // title: 'Trial Extend',
+        alertCta: [],
+        markasRead: false,
+        logType: 'Trial Extend',
+        showPushNotification: true,
         date: new Date(),
-        logType: 'billing',
-        logSubType: 'Trial Extend Approved',
         changes: [ 'status' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, notifyObj );
+      // const logObj = {
+      //   clientId: req.body.clientId,
+      //   userName: req.user?.userName,
+      //   email: req.user?.email,
+      //   date: new Date(),
+      //   logType: 'billing',
+      //   logSubType: 'Trial Extend Approved',
+      //   changes: [ 'status' ],
+      //   eventType: 'update',
+      // };
+      // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Trial Extended Successfully' );
     } ).catch( ( e ) => {
       logger.error( { error: e, function: 'trialExtendRequestApproval' } );
@@ -1043,11 +1109,31 @@ export const productSubscribe = async ( req, res ) => {
     let removeProducts = req.body.product.filter( ( item ) => item.type == 'unsubscribe' ).map( ( item ) => item.name );
     let productList = product.map( ( item ) => item.productName );
     for ( let item of req.body.product ) {
-      if ( productList.includes( item.name ) && item.type =='unsubscribe' ) {
+      if ( productList.includes( item.name ) && item.type == 'unsubscribe' ) {
         await storeService.addremoveElement( { clientId: clientInfo.clientId, product: { $in: item.name } }, { $pull: { product: item.name } } );
+        await clientRequestService.deleteOne( { clientId: clientInfo.clientId, status: 'pending', name: item.name } );
       }
       if ( !productList.includes( item.name ) && [ 'trial', 'subscription' ].includes( item.type ) ) {
         if ( item.type == 'trial' ) {
+          let logObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: clientInfo.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            logSubType: 'Subscription - Your 14 Days free trial has been started',
+            category: 'Brand Activity Log',
+            features: 'Subscription',
+            // title: 'Start Trial',
+            alertCta: [],
+            markasRead: false,
+            logType: 'Start Trial',
+            showPushNotification: true,
+            date: new Date(),
+            changes: [ 'Plan Details' ],
+            eventType: 'update',
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
             productName: item.name,
             trialStartDate: new Date(),
@@ -1056,9 +1142,28 @@ export const productSubscribe = async ( req, res ) => {
           } );
           let [ firstWord, secondWord ] = item.name.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
           firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
-          let productName =firstWord + ' ' +secondWord;
+          let productName = firstWord + ' ' + secondWord;
           trialProduct.push( productName );
         } else {
+          let logObj = {
+            userName: req.user?.userName,
+            email: req.user?.email,
+            clientId: clientInfo.clientId,
+            clientNotification: false,
+            adminNotification: true,
+            logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+            category: 'Brand Activity Log',
+            features: 'Subscription',
+            // title: 'Subscribed',
+            alertCta: [],
+            markasRead: false,
+            logType: 'Subscribed',
+            showPushNotification: true,
+            date: new Date(),
+            changes: [ 'Plan Details' ],
+            eventType: 'update',
+          };
+          insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           product.push( {
             productName: item.name,
             subscribedDate: new Date(),
@@ -1082,7 +1187,7 @@ export const productSubscribe = async ( req, res ) => {
     if ( product.length > 1 ) {
       clientInfo.planDetails.subscriptionType = 'premium';
     }
-    let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
+    let userDetails = await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
     if ( subscriptionCount ) {
       if ( userDetails ) {
         let data = {
@@ -1161,17 +1266,17 @@ export const productSubscribe = async ( req, res ) => {
         logger.error( { error: error, function: 'oldBulkStoreUpdate' } );
       } );
     } );
-    const logObj = {
-      clientId: req.body.clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Product subscribe and unsubscribe',
-      changes: [ 'Plan Details' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: req.body.clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Product subscribe and unsubscribe',
+    //   changes: [ 'Plan Details' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     return res.sendSuccess( 'Product Subscribed Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'updateProductSubscribe' } );
@@ -1196,7 +1301,8 @@ export const unsubscribeApproval = async ( req, res ) => {
         clientProducts.save();
         await storeService.updateMany( { clientId: requestData.clientId }, { status: 'deactive' } );
         await userService.updateMany( { clientId: requestData.clientId }, { isActive: false } );
-        let userDetails= await userService.findOne( { clientId: requestData.clientId, role: 'superadmin' } );
+        await clientRequestService.deleteMany( { clientId: requestData.clientId } );
+        let userDetails = await userService.findOne( { clientId: requestData.clientId, role: 'superadmin' } );
         if ( userDetails ) {
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialUnsubscribeEmail.hbs', 'utf8' );
           const template = Handlebars.compile( templateHtml );
@@ -1221,7 +1327,7 @@ export const unsubscribeApproval = async ( req, res ) => {
         changes: [ 'status' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -1463,7 +1569,7 @@ export const addStoreProduct = async ( req, res ) => {
             };
             let [ firstWord, secondWord ] = item.name.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
             firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
-            let productName =firstWord + ' ' +secondWord;
+            let productName = firstWord + ' ' + secondWord;
             trialProduct.push( productName );
           } else {
             clientProduct[productExistsIndex] = {
@@ -1483,8 +1589,28 @@ export const addStoreProduct = async ( req, res ) => {
             } );
             let [ firstWord, secondWord ] = item.name.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
             firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
-            let productName =firstWord + ' ' +secondWord;
+            let productName = firstWord + ' ' + secondWord;
             trialProduct.push( productName );
+            let logObj = {
+              userName: req.user?.userName,
+              email: req.user?.email,
+              clientId: req.body.clientId,
+              clientNotification: false,
+              adminNotification: true,
+              logSubType: 'Subscription - Your 14 Days free trial has been started',
+              category: 'Brand Activity Log',
+              features: 'Subscription',
+              // title: 'Start Trial',
+              alertCta: [],
+              markasRead: false,
+              logType: 'Start Trial',
+              showPushNotification: true,
+              date: new Date(),
+              changes: [ 'product' ],
+              eventType: 'update',
+
+            };
+            insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           }
           if ( item.type == 'subscription' ) {
             clientProduct.push( {
@@ -1493,12 +1619,31 @@ export const addStoreProduct = async ( req, res ) => {
               status: 'live',
             } );
             subscriptionCount = subscriptionCount + 1;
+            let logObj = {
+              userName: req.user?.userName,
+              email: req.user?.email,
+              clientId: req.body.clientId,
+              clientNotification: false,
+              adminNotification: true,
+              logSubType: 'Your subscription is now active! Get ready to maximize your instore sales potential with the Tangoeye suite',
+              category: 'Brand Activity Log',
+              features: 'Subscription',
+              // title: 'Subscribed',
+              alertCta: [],
+              markasRead: false,
+              logType: 'Subscribed',
+              showPushNotification: true,
+              date: new Date(),
+              changes: [ 'product' ],
+              eventType: 'update',
+            };
+            insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
           }
         }
       }
     },
     );
-    let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+    let userDetails = await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
     if ( subscriptionCount ) {
       if ( userDetails ) {
         let data = {
@@ -1560,17 +1705,17 @@ export const addStoreProduct = async ( req, res ) => {
       }
       await storeService.updateOne( { storeId: item.storeId, clientId: clientId }, { product: product } );
     } );
-    const logObj = {
-      clientId: clientId,
-      userName: req.user?.userName,
-      email: req.user?.email,
-      date: new Date(),
-      logType: 'billing',
-      logSubType: 'Store Prosuct Addition',
-      changes: [ 'product' ],
-      eventType: 'update',
-    };
-    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+    // const logObj = {
+    //   clientId: clientId,
+    //   userName: req.user?.userName,
+    //   email: req.user?.email,
+    //   date: new Date(),
+    //   logType: 'billing',
+    //   logSubType: 'Store Product Addition',
+    //   changes: [ 'product' ],
+    //   eventType: 'update',
+    // };
+    // insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
     let products = clientInfo.planDetails.product.map( ( item ) => {
       let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
       return firstWord.toLowerCase() + '_' + secondWord.toLowerCase();
@@ -1620,13 +1765,13 @@ export const invoiceList = async ( req, res ) => {
       req.body.limit = 10000;
     }
     let limit = req.body.limit || 10;
-    let offset = ( req.body.offset-1 ) || 0;
+    let offset = ( req.body.offset - 1 ) || 0;
     let skip = limit * offset;
     let date;
     let endDate;
     if ( req.body.filter && req.body.filter == 'current' ) {
       date = new Date( dayjs().startOf( 'month' ).format( 'YYYY-MM-DD' ) );
-      endDate= new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
+      endDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
     }
     if ( req.body.filter && req.body.filter == 'prev' ) {
       date = new Date( dayjs().subtract( 1, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
@@ -1634,7 +1779,7 @@ export const invoiceList = async ( req, res ) => {
     }
     if ( req.body.filter && req.body.filter == 'last' ) {
       date = new Date( dayjs().subtract( 2, 'month' ).startOf( 'month' ).format( 'YYYY-MM-DD' ) );
-      endDate= new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
+      endDate = new Date( dayjs().endOf( 'month' ).format( 'YYYY-MM-DD' ) );
     }
     let query = [];
     query = [
@@ -1694,7 +1839,7 @@ export const invoiceList = async ( req, res ) => {
     }
     invoiceDetails[0].data.forEach( ( item ) => {
       item.billingDate = dayjs( item.billingDate ).format( 'DD MMM, YYYY' );
-      if ( item.products?.length>0 ) {
+      if ( item.products?.length > 0 ) {
         let newProducts = [];
         for ( let productIndex = 0; productIndex < item.products.length; productIndex++ ) {
           let [ firstWord, secondWord ] = item.products[productIndex]?.product?.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
@@ -1800,7 +1945,7 @@ export const priceList = async ( req, res ) => {
         } else {
           product.showImg = false;
           product.showEditDelete = false;
-          if ( index == productDetails.length-1 ) {
+          if ( index == productDetails.length - 1 ) {
             if ( index != 0 ) {
               product.showImg = true;
               product.showEditDelete = true;
@@ -1815,7 +1960,7 @@ export const priceList = async ( req, res ) => {
             let rangeArray = product.storeRange.split( '-' );
             let startNumber = parseInt( rangeArray[0] );
             let endNumber = parseInt( rangeArray[1] );
-            let diff = endNumber - startNumber +1;
+            let diff = endNumber - startNumber + 1;
             product.storeCount = diff;
             item.storeCount = item.storeCount - diff;
           }
@@ -1875,8 +2020,8 @@ export const pricingListUpdate = async ( req, res ) => {
     let productList;
     if ( req.body?.products && req.body?.products?.length ) {
       productList = JSON.parse( JSON.stringify( req.body ) );
-      let amount =0;
-      let origPrice=0;
+      let amount = 0;
+      let origPrice = 0;
       let IGST = 18;
       let CGST = 9;
       let SGST = 9;
@@ -1969,7 +2114,7 @@ export const pricingListUpdate = async ( req, res ) => {
         changes: keys,
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );
   } catch ( e ) {
@@ -2024,10 +2169,10 @@ async function updatePricing( req, res, update ) {
     let clientId = req.body.clientId;
     let paymentInvoice = clientDetails.paymentInvoice;
     if ( !update ) {
-      let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+      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,
@@ -2051,9 +2196,9 @@ async function updatePricing( req, res, update ) {
     if ( subscriptionProduct.length ) {
       let invoiceCount = await invoiceService.count( { clientId: req.params.clientId, status: 'pending' } );
       if ( invoiceCount ) {
-        paymentStatus ='due';
+        paymentStatus = 'due';
       } else {
-        paymentStatus ='unbilled';
+        paymentStatus = 'unbilled';
       }
     }
     let details = {
@@ -2099,7 +2244,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
           }
           amount = amount + item.price;
         } );
-        let invoiceDate= dayjs( invoiceDetails.createdAt ).format( 'DD MMM, YYYY' );
+        let invoiceDate = dayjs( invoiceDetails.createdAt ).format( 'DD MMM, YYYY' );
         let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
         let dueDate = invoiceDetails?.dueDate ? dayjs( invoiceDetails?.dueDate ).format( 'DD MMM, YYYY' ) : dayjs().add( days, 'days' ).format( 'DD MMM, YYYY' );
         let discountAmount = ( amount * req.body.discount ) / 100;
@@ -2143,7 +2288,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
         changes: [ 'amount', 'revisedAmount', 'discount' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Credit notes Updated Successfully' );
     } );
   } catch ( e ) {
@@ -2204,7 +2349,7 @@ export const getRemindClients = async ( req, res ) => {
             let endDate = dayjs( item.trialEndDate ).startOf( 'day' ).add( 1, 'days' );
             let date = dayjs().startOf( 'day' );
             let leftDays = endDate.diff( date, 'day' );
-            let userDetails= await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
+            let userDetails = await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
             if ( userDetails ) {
               if ( leftDays == 3 ) {
                 let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
@@ -2214,6 +2359,23 @@ export const getRemindClients = async ( req, res ) => {
                   product: firstWord + ' ' + secondWord,
                   domain: appConfig.url.domain,
                 };
+                let logObj = {
+                  clientId: client.clientId,
+                  clientNotification: false,
+                  adminNotification: true,
+                  logSubType: 'Subscription - Your Free trial is about to expire in 3 days. Pleas make sure to subscribe to the products',
+                  category: 'Brand Activity Log',
+                  features: 'Subscription',
+                  // title: 'Trial reminder',
+                  alertCta: [ { buttonName: 'Subscribe now', redirectionUrl: 'manage/settings/payment-subscription' }, { buttonName: 'Remind me later', redirectionUrl: 'cancel' } ],
+                  markasRead: false,
+                  logType: 'Trial reminder',
+                  showPushNotification: true,
+                  date: new Date(),
+                  userName: userDetails?.userName,
+                  email: userDetails?.email,
+                };
+                insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
                 const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialReminderEmail.hbs', 'utf8' );
                 const template = Handlebars.compile( templateHtml );
                 const html = template( { data: data } );
@@ -2268,13 +2430,13 @@ export const getExpiredClientsOld = async ( req, res ) => {
     clientDetails.forEach( async ( client ) => {
       if ( client.planDetails?.product ) {
         let item = client.planDetails.product;
-        let userDetails= await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
+        let userDetails = await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
         if ( userDetails ) {
           let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
           firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
           let data = {
             userName: userDetails.userName,
-            product: firstWord +' '+secondWord,
+            product: firstWord + ' ' + secondWord,
             domain: appConfig.url.domain,
           };
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExpiredEmail.hbs', 'utf8' );
@@ -2310,7 +2472,7 @@ export const getExpiredClients = async ( req, res ) => {
             let endDate = dayjs( item.trialEndDate ).startOf( 'day' );
             let date = dayjs().startOf( 'day' );
             let leftDays = endDate.diff( date, 'day' );
-            let userDetails= await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
+            let userDetails = await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
             if ( userDetails ) {
               if ( leftDays == -1 ) {
                 let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
@@ -2346,12 +2508,12 @@ export const getExpiredClients = async ( req, res ) => {
 
 export const invoiceDownload = async ( req, res ) => {
   try {
-    let invoiceDetails;
+    let invoiceData;
     let invoiceInfo = await invoiceService.findOne( { _id: req.params.invoiceId } );
     if ( invoiceInfo ) {
       let clientDetails = await paymentService.findOne( { clientId: invoiceInfo.clientId } );
       let amount = 0;
-      invoiceInfo.products.forEach( ( item ) => {
+      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 );
         item.product.product = firstWord + ' ' + secondWord;
@@ -2359,60 +2521,141 @@ export const invoiceDownload = async ( req, res ) => {
           item.basePrice = convertINRtoUSD( item.basePrice );
           item.price = convertINRtoUSD( item.price );
         }
+        item.index = index + 1;
         if ( clientDetails.priceType == 'step' ) {
           item.count = item.product.storeRange;
         }
+
         amount = amount + item.price;
+
+        item.basePrice = item.basePrice.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+        item.price = item.price.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+        item.currency = clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹';
       } );
-      let invoiceDate= dayjs( invoiceInfo.createdAt ).format( 'DD MMM, YYYY' );
+      for ( let tax of invoiceInfo.tax ) {
+        tax.taxAmount = tax.taxAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
+      }
+      let invoiceDate = dayjs( invoiceInfo.createdAt ).format( 'DD/MM/YYYY' );
       let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
-      let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD MMM, YYYY' ) : dayjs().add( days, 'days' ).format( 'DD MMM, YYYY' );
+      let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD/MM/YYYY' ) : dayjs().add( days, 'days' ).format( 'DD/MM/YYYY' );
 
-      invoiceDetails = {
+      invoiceInfo.totalAmount = invoiceInfo.totalAmount;
+      let AmountinWords = inWords( invoiceInfo.totalAmount );
+      invoiceData = {
         ...invoiceInfo._doc,
         clientName: clientDetails.clientName,
         extendDays: clientDetails.paymentInvoice.extendPaymentPeriodDays,
         address: clientDetails.billingDetails.billingAddress,
-        amount: amount,
+        subtotal: amount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
+        companyName: invoiceInfo.companyName,
+        companyAddress: invoiceInfo.companyAddress,
+        PlaceOfSupply: invoiceInfo.PlaceOfSupply,
+        GSTNumber: invoiceInfo.GSTNumber,
+        PoNum: '',
+        amountwords: AmountinWords,
+        Terms: `Term ${clientDetails.paymentInvoice.extendPaymentPeriodDays}`,
         currencyType: clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹',
-        // total: ( amount + ( parseFloat( amount ) * 0.19 ) ).toFixed( 2 ),
-        total: amount.toFixed( 2 ),
+        totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
         invoiceDate,
         dueDate,
       };
-    }
-    const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
-    const template = Handlebars.compile( templateHtml );
-    const html = template( { data: invoiceDetails } );
-    let fonts = {
-      Helvetica: {
-        normal: 'Helvetica',
-        bold: 'Helvetica-Bold',
-        italics: 'Helvetica-Oblique',
-        bolditalics: 'Helvetica-BoldOblique',
-      },
-    };
-    let printer = new pdfMake( fonts );
-
-    let { window } = new JSDOM( '' );
-    const htmlTemplate = htmlToPdfmake( html, { window: window, tableAutoSize: true } );
-    const docDefinition = {
-      pageMargins: [ 40, 10, 40, 40 ],
-      content: htmlTemplate,
-      defaultStyle: {
-        font: 'Helvetica',
-      },
-    };
-    let pdfDoc = printer.createPdfKitDocument( docDefinition );
-    res.setHeader( 'Content-disposition', `attachment; filename=Report_1.pdf` );
-    res.setHeader( 'Content-Type', 'application/pdf' );
-    pdfDoc.pipe( res );
-    pdfDoc.end();
+      const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
+      const template = Handlebars.compile( templateHtml );
+      const html = template( { ...invoiceData } );
+      let file = {
+        content: html,
+      };
+      let options = {
+        format: 'A4', margin: {
+          top: '0.5in',
+          right: '0.5in',
+          bottom: '0.5in',
+          left: '0.5in',
+        },
+        printBackground: true, preferCSSPageSize: true,
+      };
+      const date = dayjs( invoiceData.monthOfbilling, 'MM' );
+      const monthName = date.format( 'MMMM' );
+
+
+      htmlpdf.generatePdf( file, options ).then( async function( pdfBuffer ) {
+        if ( req.body.sendInvoice ) {
+          let mailSubject = `Invoice for ${monthName} - Tango/${clientDetails.clientName}`;
+          let mailbody = `<div>Dear Team,</div>
+          <div style="margin-top:10px">
+          Please find attached the Invoice for the month of ${monthName}'24.
+          </div>
+          <div style="margin-top:10px">
+          Best Regards,
+          </div>
+          <div style="margin-top:5px">
+          Tango Finance
+          </div>`;
+
+          let filename = `${clientDetails.clientName}-${invoiceData.invoice}-${monthName}.pdf`;
+          let attachments = {
+            filename: `${filename}`,
+            content: pdfBuffer,
+            contentType: 'application/pdf', // e.g., 'application/pdf'
+          };
+          clientDetails.paymentInvoice.invoiceCC = [ ...clientDetails.paymentInvoice.invoiceCC, ...[ 'sireesha@tangotech.co.in' ] ];
+          // return;
+          const result = await sendEmailWithSES( clientDetails.paymentInvoice.invoiceTo, mailSubject, mailbody, attachments, 'no-reply@tangotech.ai', clientDetails.paymentInvoice.invoiceCC );
+          if ( result ) {
+            await invoiceService.updateOne( { _id: req.params.invoiceId }, { status: req.body.status } );
+            return res.sendSuccess( result );
+          }
+        }
+        res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
+        res.set( 'Content-Type', 'application/pdf' );
+        res.send( pdfBuffer );
+      } );
+      return;
+    }
+
+
+    // let fonts = {
+    //   Helvetica: {
+    //     normal: 'Helvetica',
+    //     bold: 'Helvetica-Bold',
+    //     italics: 'Helvetica-Oblique',
+    //     bolditalics: 'Helvetica-BoldOblique',
+    //   },
+    // };
+    // let printer = new pdfMake( fonts );
+
+    // let { window } = new JSDOM( '' );
+    // const htmlTemplate = htmlToPdfmake( html, { window: window, tableAutoSize: true } );
+    // const docDefinition = {
+    //   pageMargins: [ 40, 10, 40, 40 ],
+    //   content: htmlTemplate,
+    //   defaultStyle: {
+    //     font: 'Helvetica',
+    //   },
+    // };
+    // let pdfDoc = printer.createPdfKitDocument( docDefinition );
+    // res.setHeader( 'Content-disposition', `attachment; filename=Report_1.pdf` );
+    // res.setHeader( 'Content-Type', 'application/pdf' );
+    // pdfDoc.pipe( res );
+    // pdfDoc.end();
   } catch ( e ) {
     logger.error( { error: e, function: 'invoiceDownload' } );
     return res.sendError( e, 500 );
   }
 };
+function inWords( num ) {
+  let a = [ '', 'one ', 'two ', 'three ', 'four ', 'five ', 'six ', 'seven ', 'eight ', 'nine ', 'ten ', 'eleven ', 'twelve ', 'thirteen ', 'fourteen ', 'fifteen ', 'sixteen ', 'seventeen ', 'eighteen ', 'nineteen ' ]; let b = [ '', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety' ];
+  if ( ( num = num.toString() ).length > 9 ) return 'overflow';
+  let n = ( '000000000' + num ).substr( -9 ).match( /^(\d{2})(\d{2})(\d{2})(\d{1})(\d{2})$/ );
+  if ( !n ) return; let str = '';
+  str += ( n[1] != 0 ) ? ( a[Number( n[1] )] || b[n[1][0]] + ' ' + a[n[1][1]] ) + 'crore ' : '';
+  str += ( n[2] != 0 ) ? ( a[Number( n[2] )] || b[n[2][0]] + ' ' + a[n[2][1]] ) + 'lakh ' : '';
+  str += ( n[3] != 0 ) ? ( a[Number( n[3] )] || b[n[3][0]] + ' ' + a[n[3][1]] ) + 'thousand ' : '';
+  str += ( n[4] != 0 ) ? ( a[Number( n[4] )] || b[n[4][0]] + ' ' + a[n[4][1]] ) + 'hundred ' : '';
+  str += ( n[5] != 0 ) ? ( ( str != '' ) ? 'and ' : '' ) + ( a[Number( n[5] )] || b[n[5][0]] + ' ' + a[n[5][1]] ) : '';
+
+  return str.toLowerCase().split( ' ' ).map( ( word ) => word.charAt( 0 ).toUpperCase() + word.slice( 1 ) ).join( ' ' );
+}
 
 export const updateInvoiceStatus = async ( req, res ) => {
   try {
@@ -2442,7 +2685,7 @@ export const updateInvoiceStatus = async ( req, res ) => {
         changes: [ 'amount', 'paymentType', 'status' ],
         eventType: 'update',
       };
-      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+      insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
       return res.sendSuccess( 'Invoice updated Successfully' );
     } );
   } catch ( e ) {
@@ -2491,7 +2734,12 @@ export const invoiceCreate = async ( req, res ) => {
 export const dailyPricingInsert = async ( req, res ) => {
   try {
     let requestData = req.body;
-    let requestClient = requestData.clientId;
+    let clientlist = await paymentService.find( { 'status': 'active' } );
+    let requestClient = [];
+
+    for ( let client of clientlist ) {
+      requestClient.push( client.clientId );
+    }
     if ( requestData.clientId && requestClient.length > 0 ) {
       for ( let clientIndex = 0; clientIndex < requestClient.length; clientIndex++ ) {
         let getClient = await paymentService.findOne( { clientId: requestClient[clientIndex], status: 'active' } );
@@ -2502,55 +2750,57 @@ export const dailyPricingInsert = async ( req, res ) => {
             let storeList = [];
             for ( let storeIndex = 0; storeIndex < getStore.length; storeIndex++ ) {
               let productList = [];
-              let priceDetails = getClient.priceType == 'standard' ? getBaseprice.standard : getBaseprice.step;
-              for ( let storeProductIndex = 0; storeProductIndex < getStore[storeIndex].product.length; storeProductIndex++ ) {
-                let productDetails;
-                if ( getClient.priceType == 'standard' ) {
-                  productDetails = priceDetails.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
-                } else {
-                  productDetails = priceDetails.find( ( item ) => {
-                    let range = item.storeRange.split( '-' );
-                    if ( parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) ) {
-                      return ( item.productName == getStore[storeIndex].product[storeProductIndex] && parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) );
+              if ( getBaseprice ) {
+                let priceDetails = getClient.priceType == 'standard' ? getBaseprice.standard : getBaseprice.step;
+                for ( let storeProductIndex = 0; storeProductIndex < getStore[storeIndex].product.length; storeProductIndex++ ) {
+                  let productDetails;
+                  if ( getClient.priceType == 'standard' ) {
+                    productDetails = priceDetails.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                  } else {
+                    productDetails = priceDetails.find( ( item ) => {
+                      let range = item.storeRange.split( '-' );
+                      if ( parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) ) {
+                        return ( item.productName == getStore[storeIndex].product[storeProductIndex] && parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) );
+                      }
+                    } );
+                    if ( !productDetails ) {
+                      let stepProductDetails = priceDetails.filter( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                      productDetails = stepProductDetails[stepProductDetails.length - 1];
                     }
-                  } );
-                  if ( !productDetails ) {
-                    let stepProductDetails = priceDetails.filter( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
-                    productDetails = stepProductDetails[stepProductDetails.length -1];
+                  }
+                  let productStatus = getClient.planDetails.product.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                  if ( productDetails ) {
+                    let newObject = {
+                      productName: productDetails.productName,
+                      status: productStatus ? productStatus.status : '',
+                      price: productStatus ? [ 'trial', 'free' ].includes( productStatus.status ) ? 0 : productDetails.negotiatePrice : 0,
+                      featureStoreCount: storeIndex + 1,
+                      basePrice: productDetails.negotiatePrice,
+                      ...( getClient.priceType == 'step' ? { storeRange: productDetails.storeRange } : { storeRange: 'standard' } ),
+                    };
+                    productList.push( newObject );
                   }
                 }
-                let productStatus = getClient.planDetails.product.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
-                if ( productDetails ) {
-                  let newObject = {
-                    productName: productDetails.productName,
-                    status: productStatus ? productStatus.status : '',
-                    price: productStatus ? [ 'trial', 'free' ].includes( productStatus.status ) ? 0 : productDetails.negotiatePrice : 0,
-                    featureStoreCount: storeIndex+1,
-                    basePrice: productDetails.negotiatePrice,
-                    ...( getClient.priceType == 'step' ? { storeRange: productDetails.storeRange } : { storeRange: 'standard' } ),
+                storeList.push(
+                    {
+                      storeId: getStore[storeIndex].storeId,
+                      products: productList,
+                    },
+                );
+                if ( storeIndex == getStore.length - 1 ) {
+                  let params = {
+                    clientId: requestClient[clientIndex],
+                    stores: storeList,
+                    dateISO: new Date( requestData.date ),
+                    dateString: dayjs( requestData.date ).format( 'YYYY-MM-DD' ),
                   };
-                  productList.push( newObject );
+                  await dailyPriceService.create( params );
                 }
               }
-              storeList.push(
-                  {
-                    storeId: getStore[storeIndex].storeId,
-                    products: productList,
-                  },
-              );
-              if ( storeIndex == getStore.length-1 ) {
-                let params = {
-                  clientId: requestClient[clientIndex],
-                  stores: storeList,
-                  dateISO: new Date( requestData.date ),
-                  dateString: dayjs( requestData.date ).format( 'YYYY-MM-DD' ),
-                };
-                await dailyPriceService.create( params );
-              }
             }
           }
         }
-        if ( clientIndex == requestClient.length-1 ) {
+        if ( clientIndex == requestClient.length - 1 ) {
           return res.sendSuccess( 'Price Details Inserted Successfully' );
         }
       }
@@ -2563,13 +2813,18 @@ export const dailyPricingInsert = async ( req, res ) => {
 
 export const invoiceGenerate = async ( req, res ) => {
   try {
-    let requestData = req.body;
-    let requestClient = requestData.clientId;
-    let start = new Date( requestData.fromDate );
-    let end = new Date( requestData.toDate );
-    let userTimezoneOffset = end.getTimezoneOffset() * 60000;
-    end = new Date( end.getTime() - userTimezoneOffset );
-    end.setUTCHours( 23, 59, 59, 59 );
+    // let requestData = req.body;
+
+    let clientlist = await paymentService.find( { 'status': 'active' } );
+    let requestClient = [];
+
+    for ( let client of clientlist ) {
+      requestClient.push( client.clientId );
+    }
+    const currentYear = dayjs().year();
+    const date = dayjs( `${currentYear}-${req.body.monthOfbilling}-01` );
+    let billingmonth = dayjs( date ).format( 'MMM-YYYY' );
+
     for ( let clientIndex = 0; clientIndex < requestClient.length; clientIndex++ ) {
       let getClient = await paymentService.findOne( { clientId: requestClient[clientIndex], status: 'active' } );
       if ( getClient ) {
@@ -2578,10 +2833,17 @@ export const invoiceGenerate = async ( req, res ) => {
             $match: {
               $and: [
                 { clientId: requestClient[clientIndex] },
-                { dateISO: { $gte: start, $lte: end } },
               ],
             },
           },
+          {
+            $sort: {
+              _id: -1,
+            },
+          },
+          {
+            $limit: 1,
+          },
           {
             $unwind: '$stores',
           },
@@ -2590,10 +2852,13 @@ export const invoiceGenerate = async ( req, res ) => {
           },
           {
             $group: {
-              _id: { product: '$stores.products.productName', storeRange: '$stores.products.storeRange' },
+              _id: {
+                product: '$stores.products.productName',
+                storeRange: '$stores.products.storeRange',
+              },
               price: { $sum: '$stores.products.price' },
               count: { $sum: 1 },
-              basePrice: { $first: '$stores.products.basePrice' },
+              basePrice: { $first: '$stores.products.price' },
             },
           },
           {
@@ -2605,72 +2870,104 @@ export const invoiceGenerate = async ( req, res ) => {
               basePrice: 1,
             },
           },
+          {
+            $project: {
+              'price': 1,
+              'count': 1,
+              'basePrice': 1,
+              'product': 1,
+              'HSNnumber': '998314',
+              'Month': billingmonth,
+              'description': 'Footfall Traffic Analytics',
+            },
+          },
         ];
-        //  {
-        //     $facet: {
-        //       data: [
-        //         {
-        //           $unwind: '$stores',
-        //         },
-        //         {
-        //           $unwind: '$stores.products',
-        //         },
-        //         {
-        //           $group: {
-        //             _id: { product: '$stores.products.productName', storeRange: '$stores.products.storeRange' },
-        //             price: { $sum: '$stores.products.price' },
-        //           },
-        //         },
-        //         {
-        //           $project: {
-        //             _id: 0,
-        //             product: '$_id',
-        //             price: 1,
-        //           },
-        //         },
-        //       ],
-        //       count: [
-        //         {
-        //           $unwind: '$stores',
-        //         },
-        //         { $sort: { 'stores.products._id': -1 } },
-        //         { $project: { lastElement: { $arrayElemAt: [ '$stores.products', -1 ] } } },
-        //         { $project: {
-        //           count: '$lastElement.featureStoreCount',
-        //         },
-        //         },
-        //       ],
-        //     },
-        //   },
+
         let invoiceDetails = await dailyPriceService.aggregate( query );
-        if ( !invoiceDetails.length ) {
-          return res.sendError( 'no data found', 204 );
-        }
-        let amount = 0;
-        invoiceDetails.forEach( ( item ) => {
-          amount = item.price + amount;
-        } );
-        let storeQuery = {
-          clientId: requestClient[clientIndex],
-          status: 'active',
-        };
-        let storeCount = await storeService.count( storeQuery );
-        let data = {
-          invoice: `invoice#${requestClient[clientIndex]}-${new Date().getTime()}`,
-          products: invoiceDetails,
-          status: 'pending',
-          amount: amount,
-          totalAmount: amount,
-          clientId: requestClient[clientIndex],
-          paymentMethod: getClient?.paymentInvoice?.paymentType || 'online',
-          billingDate: new Date(),
-          stores: storeCount,
-        };
+        if ( invoiceDetails.length > 0 ) {
+          let amount = 0;
+          invoiceDetails.forEach( ( item ) => {
+            amount = item.price + amount;
+          } );
+          let storeQuery = {
+            clientId: requestClient[clientIndex],
+            status: 'active',
+          };
+          let storeCount = await storeService.count( storeQuery );
+          let Finacialyear = getCurrentFinancialYear();
+
+          let taxList = [];
+          let totalAmount = 0;
+          if ( getClient.billingDetails.gstNumber && getClient.billingDetails.gstNumber.slice( 0, 2 ) == '33' ) {
+            let taxAmount = ( amount * 9 ) / 100;
+            totalAmount = amount + taxAmount;
+            taxList.push(
+                {
+                  'currency': '₹',
+                  'type': 'CGST',
+                  'value': 9,
+                  'taxAmount': taxAmount,
+                }, {
+                  'currency': '₹',
+                  'type': 'SGST',
+                  'value': 9,
+                  'taxAmount': taxAmount,
+                },
+            );
+          } else {
+            let taxAmount = ( amount * 18 ) / 100;
+            totalAmount = amount + taxAmount;
+
+            taxList.push(
+                {
+                  'currency': '₹',
+                  'type': 'IGST',
+                  'value': 18,
+                  'taxAmount': taxAmount,
+                },
+            );
+          }
+
+
+          let previousinvoice = await invoiceService.findandsort( {}, {}, { _id: -1 } );
+          let invoiceNo = '00001';
+          if ( previousinvoice && previousinvoice.length > 0 ) {
+            invoiceNo = Number( previousinvoice[0].invoiceIndex ) + 1;
+            invoiceNo = invoiceNo.toString().padStart( 5, '0' );
+          }
+          let data = {
+            invoice: `INV-${Finacialyear}-${invoiceNo}`,
+            products: invoiceDetails,
+            status: 'pending',
+            amount: amount,
+            monthOfbilling: req.body.monthOfbilling,
+            invoiceIndex: invoiceNo,
+            tax: taxList,
+            companyName: getClient.billingDetails.companyName,
+            companyAddress: getClient.billingDetails.billingAddress,
+            PlaceOfSupply: getClient.billingDetails.PlaceOfSupply,
+            GSTNumber: getClient.billingDetails.gstNumber,
+            totalAmount: totalAmount,
+            clientId: requestClient[clientIndex],
+            paymentMethod: getClient?.paymentInvoice?.paymentType || 'Fund Trasfer',
+            billingDate: new Date(),
+            stores: storeCount,
+          };
+
+          let invoiceExists = await invoiceService.findOne( { monthOfbilling: req.body.monthOfbilling, clientId: getClient.clientId } );
+
 
-        await invoiceService.create( data );
-        if ( clientIndex == requestClient.length-1 ) {
+          if ( invoiceExists ) {
+            logger.info( `invoice already exist for the month${req.body.monthOfbilling} for ${getClient.clientId}` );
+          } else {
+            await invoiceService.create( data );
+          }
+        }
+        if ( clientIndex == requestClient.length - 1 ) {
           return res.sendSuccess( 'invocie Generated Succesfully' );
         }
+      } else {
+        return res.sendError( 'client not found', 204 );
       }
     }
   } catch ( e ) {
@@ -2680,12 +2977,20 @@ export const invoiceGenerate = async ( req, res ) => {
 };
 
 function convertINRtoUSD( amountINR ) {
-  // Current exchange rate (1 INR = 0.012 USD)
   const exchangeRate = 0.012;
-  // Convert INR to USD
   const amountUSD = amountINR * exchangeRate;
   return amountUSD;
 }
+function getCurrentFinancialYear() {
+  const today = new Date();
+  const currentMonth = today.getMonth();
+  const currentYear = today.getFullYear();
+  if ( currentMonth >= 3 ) {
+    return currentYear.toString().slice( -2 ) + '-' + ( currentYear + 1 ).toString().slice( -2 );
+  } else {
+    return ( ( currentYear - 1 ).toString().slice( -2 ) ) + '-' + currentYear.toString().slice( -2 );
+  }
+}
 
 
 export const invoiceRevised = async ( req, res ) => {
@@ -2694,11 +2999,11 @@ export const invoiceRevised = async ( req, res ) => {
     if ( !invoiceDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
+    let userDetails = await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
     let clientDetails = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
     if ( userDetails ) {
       let amount = 0;
-      let invoiceDate= dayjs( invoiceDetails.createdAt ).format( 'DD MMM, YYYY' );
+      let invoiceDate = dayjs( invoiceDetails.createdAt ).format( 'DD MMM, YYYY' );
       let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
       let dueDate = invoiceDetails?.dueDate ? dayjs( invoiceDetails?.dueDate ).format( 'DD MMM, YYYY' ) : dayjs().add( days, 'days' ).format( 'DD MMM, YYYY' );
       invoiceDetails.products.forEach( ( item ) => {
@@ -2741,3 +3046,90 @@ export const invoiceRevised = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+export const clientNotificationList = async ( req, res ) => {
+  try {
+    let query;
+    if ( req.user.role == 'superadmin' ) {
+      query = {
+        query: {
+          bool: {
+            must: [
+              { match: { clientId: req.user.clientId } },
+              { match: { type: 'notification' } },
+              { match: { adminNotification: true } },
+              { match: { markasRead: false } },
+            ],
+          },
+        },
+        _source: [ 'description', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'title' ],
+        stored_fields: [ '_source' ],
+      };
+    } else {
+      query = {
+        query: {
+          bool: {
+            must: [
+              { match: { clientId: req.user.clientId } },
+              { match: { type: 'notification' } },
+              { match: { clientNotification: true } },
+              { match: { markasRead: false } },
+            ],
+          },
+        },
+        _source: [ 'description', 'alertCta', 'clientId', 'markasRead', 'showPushNotification', 'date', 'title' ],
+        stored_fields: [ '_source' ],
+      };
+    }
+    let result = await getOpenSearchData( appConfig.opensearch.activityLog, query );
+    if ( !result || !result.body.hits.hits.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    return res.sendSuccess( result.body.hits.hits );
+  } catch ( e ) {
+    logger.error( { error: e, function: 'clientNotificationList' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updateNotification = async ( req, res ) => {
+  try {
+    let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
+    if ( openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+      const document = {
+        doc: {
+          markasRead: true,
+        },
+      };
+      let updateResult = await updateOpenSearchData( appConfig.opensearch.activityLog, req.params.notificationId, document );
+      if ( updateResult?.statusCode == 200 && updateResult?.body?.result == 'updated' ) {
+        return res.sendSuccess( 'Notification Updated SUccessfully' );
+      }
+      return res.sendError( 'Something went wrong', 500 );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updateNotification' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const updatePushNotification = async ( req, res ) => {
+  try {
+    let openSearchDetails = await getOpenSearchById( appConfig.opensearch.activityLog, req.params.notificationId );
+    if ( openSearchDetails.statusCode == 200 && openSearchDetails?.body?._source ) {
+      const document = {
+        doc: {
+          showPushNotification: false,
+        },
+      };
+      let updateResult = await updateOpenSearchData( appConfig.opensearch.activityLog, req.params.notificationId, document );
+      if ( updateResult?.statusCode == 200 && updateResult?.body?.result == 'updated' ) {
+        return res.sendSuccess( 'Notification Updated SUccessfully' );
+      }
+      return res.sendError( 'Something went wrong', 500 );
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'updatePushNotification' } );
+    return res.sendError( e, 500 );
+  }
+};