tango-app-api-payment-subscription 3.0.34-dev → 3.0.36-dev

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -375,7 +375,7 @@ export const updateSubscriptionOLD = async ( req, res ) => {
 
     let result = await paymentService.updateOne( { clientId: req.params.clientId }, details );
     let storeProduct = products.map( ( item ) => item.productName );
-    await storeService.updateMany( { clientId: req.params.clientId, status: 'active' }, { product: storeProduct } );
+    await storeService.updateMany( { clientId: req.params.clientId }, { product: storeProduct } );
 
     if ( result.modifiedCount ) {
       return res.sendSuccess( { message: 'Subscription Updated Successfully' } );
@@ -391,6 +391,7 @@ export const updateSubscriptionOLD = async ( req, res ) => {
 export const updateSubscription = async ( req, res ) => {
   try {
     let requestBody = req.body;
+    let subscriptionCount = 0;
     if ( !requestBody?.products?.length ) {
       return res.sendError( 'product is required', 400 );
     }
@@ -438,6 +439,7 @@ export const updateSubscription = async ( req, res ) => {
           clientProducts[existsIndex].status = 'live';
           clientProducts[existsIndex].subscribedDate = new Date();
         }
+        subscriptionCount = subscriptionCount + 1;
       }
     }
 
@@ -458,10 +460,30 @@ export const updateSubscription = async ( req, res ) => {
       'currencyType': 'rupees',
     };
     let pricingDetails = await calculatePricing( req, res );
+    if ( subscriptionCount ) {
+      let userDetails= await userService.findOne( { clientId: requestBody.clientId, role: 'superadmin' } );
+      if ( userDetails ) {
+        let data = {
+          username: userDetails.userName,
+        };
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
+        const template = Handlebars.compile( templateHtml );
+        const html = template( { data: data } );
+        let params = {
+          toEmail: userDetails.email,
+          mailSubject: 'Subscribe - Tango Eye',
+          htmlBody: html,
+          attachment: '',
+          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+        };
+        sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+      }
+    }
     let data = {
       planDetails: details,
       price: pricingDetails.price,
       priceType: requestBody.priceType,
+
     };
 
     let result = await paymentService.updateOne( { clientId: req.params.clientId }, data );
@@ -477,7 +499,7 @@ export const updateSubscription = async ( req, res ) => {
     };
     insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     let storeProduct = clientProducts.map( ( item ) => item.productName );
-    await storeService.updateMany( { clientId: req.params.clientId, status: 'active' }, { product: storeProduct } );
+    await storeService.updateMany( { clientId: req.params.clientId }, { product: storeProduct } );
 
     if ( result.modifiedCount ) {
       req.body.clientId = req.params.clientId;
@@ -816,7 +838,7 @@ export const trialApproval = async ( req, res ) => {
           } );
         }
         clientProducts.save();
-        await storeService.addremoveElement( { clientId: requestData.clientId, status: 'active' }, { $push: { product: requestData.name } } );
+        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' } );
@@ -927,6 +949,7 @@ export const productSubscribe = async ( req, res ) => {
   try {
     let data = req.body.product;
     req.body.product = [];
+    let subscriptionCount = 0;
     data.forEach( ( item ) => {
       if ( item.type != 'cancel' ) {
         let arr = item.name.split( ',' );
@@ -967,8 +990,9 @@ export const productSubscribe = async ( req, res ) => {
             subscribedDate: new Date(),
             status: 'live',
           } );
+          subscriptionCount = subscriptionCount + 1;
         }
-        await storeService.addremoveElement( { clientId: clientInfo.clientId, status: 'active' }, { $push: { product: item.name } } );
+        await storeService.addremoveElement( { clientId: clientInfo.clientId }, { $push: { product: item.name } } );
       } else {
         let productIndex = product.findIndex( ( ele ) => ele.productName == item.name );
         if ( productIndex != -1 ) {
@@ -976,6 +1000,7 @@ export const productSubscribe = async ( req, res ) => {
             product[productIndex].subscribedDate = new Date();
             product[productIndex].status = 'live';
           }
+          subscriptionCount = subscriptionCount + 1;
         }
       }
     }
@@ -992,9 +1017,7 @@ export const productSubscribe = async ( req, res ) => {
     if ( product.length > 1 ) {
       clientInfo.planDetails.subscriptionType = 'premium';
     }
-    clientInfo.planDetails.product = product;
-    clientInfo.save().then( async () => {
-      updatePricing( req, res, true );
+    if ( subscriptionCount ) {
       let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
@@ -1012,6 +1035,27 @@ export const productSubscribe = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
+    }
+    clientInfo.planDetails.product = product;
+    clientInfo.save().then( async () => {
+      updatePricing( req, res, true );
+      // let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
+      // if ( userDetails ) {
+      //   let data = {
+      //     username: userDetails.userName,
+      //   };
+      //   const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
+      //   const template = Handlebars.compile( templateHtml );
+      //   const html = template( { data: data } );
+      //   let params = {
+      //     toEmail: userDetails.email,
+      //     mailSubject: 'Subscribe - Tango Eye',
+      //     htmlBody: html,
+      //     attachment: '',
+      //     sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+      //   };
+      //   sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+      // }
     } );
     const logObj = {
       clientId: req.body.clientId,
@@ -1247,7 +1291,7 @@ export const storeViewList = async ( req, res ) => {
 export const storeLocationList = async ( req, res ) => {
   try {
     let storeDetails;
-    storeDetails = await storeService.find( { clientId: req.query.clientId, status: 'active' }, { 'storeId': 1, 'storeName': 1, 'storeProfile.city': 1 } );
+    storeDetails = await storeService.find( { clientId: req.query.clientId }, { 'storeId': 1, 'storeName': 1, 'storeProfile.city': 1 } );
     let store = [];
     let location = [];
     if ( storeDetails.length ) {
@@ -1291,6 +1335,7 @@ export const addStoreProduct = async ( req, res ) => {
     let clientProduct = [];
     let storeProduct = [];
     let removedProduct = [];
+    let subscriptionCount = 0;
     clientProduct = clientInfo.planDetails.product;
     req.body.product.forEach( ( item ) => {
       if ( item.type != 'unsubscribe' ) {
@@ -1333,11 +1378,31 @@ export const addStoreProduct = async ( req, res ) => {
               subscribedDate: new Date(),
               status: 'live',
             } );
+            subscriptionCount = subscriptionCount + 1;
           }
         }
       }
     },
     );
+    if ( subscriptionCount ) {
+      let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+      if ( userDetails ) {
+        let data = {
+          username: userDetails.userName,
+        };
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
+        const template = Handlebars.compile( templateHtml );
+        const html = template( { data: data } );
+        let params = {
+          toEmail: userDetails.email,
+          mailSubject: 'Subscribe - Tango Eye',
+          htmlBody: html,
+          attachment: '',
+          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+        };
+        sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+      }
+    }
     clientInfo.planDetails.product = clientProduct;
     clientInfo.save();
     storeDetails.forEach( async ( item ) => {
@@ -1461,6 +1526,9 @@ export const invoiceList = async ( req, res ) => {
       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( ' ' );
+          firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+          item.products[productIndex].product.product = firstWord + ' ' + secondWord;
           newProducts.push( item.products[productIndex]?.product?.product );
         }
         item.productList = newProducts;
@@ -1632,6 +1700,9 @@ export const pricingListUpdate = async ( req, res ) => {
       productList = JSON.parse( JSON.stringify( req.body ) );
       let amount =0;
       productList.products.forEach( ( item ) => {
+        let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
+        firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+        item.productName = firstWord + ' ' + secondWord;
         if ( req.body.client.paymentInvoice.currencyType == 'dollar' ) {
           item.basePrice = convertINRtoUSD( item.basePrice );
           item.price = convertINRtoUSD( item.price );
@@ -1719,6 +1790,7 @@ async function updatePricing( req, res, update ) {
   let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
   if ( clientDetails ) {
     let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
+    let subscriptionCount = clientDetails.planDetails.product.map( ( item ) => item.status == 'live' );
     let standardList = [];
     let stepList = [];
     products.forEach( ( product ) => {
@@ -1775,9 +1847,18 @@ async function updatePricing( req, res, update ) {
       'currencyType': 'rupees',
     };
     let pricingDetails = await calculatePricing( req, res );
+    let paymentStatus = clientDetails?.subscriptionType == 'free' ? 'free' : 'trial';
+    if ( subscriptionCount ) {
+      let invoiceCount = await invoiceService.count( { clientId: req.params.clientId, status: 'pending' } );
+      if ( invoiceCount ) {
+        paymentStatus ='due';
+      } else {
+        paymentStatus ='unbilled';
+      }
+    }
     let details = {
       'priceType': 'standard',
-      'planDetails.paymentStatus': clientDetails?.subscriptionType == 'free' ? 'free' : 'trial',
+      'planDetails.paymentStatus': clientDetails?.subscriptionType == 'free' ? 'free' : paymentStatus,
       'planDetails.product': product,
       'price': pricingDetails.price,
     };
@@ -1801,6 +1882,13 @@ export const updatedRevisedPrice = async ( req, res ) => {
         let clientDetails = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
         let amount = 0;
         invoiceDetails.products.forEach( ( item ) => {
+          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;
+          if ( clientDetails?.paymentInvoice?.currencyType == 'dollar' ) {
+            item.basePrice = convertINRtoUSD( item.basePrice );
+            item.price = convertINRtoUSD( item.price );
+          }
           if ( clientDetails.priceType == 'step' ) {
             item.count = item.product.storeRange;
           }
@@ -1814,7 +1902,8 @@ export const updatedRevisedPrice = async ( req, res ) => {
           clientName: clientDetails.clientName,
           extendDays: clientDetails.paymentInvoice.extendPaymentPeriodDays,
           address: clientDetails.billingDetails.billingAddress,
-          amount: amount,
+          amount: amount.toFixed( 2 ),
+          currencyType: clientDetails.paymentInvoice.currencyType == 'dollar' ? '$' : '₹',
           discount: req.body.discount,
           total: req.body.revisedAmount.toFixed( 2 ),
           invoiceDate,
@@ -1870,9 +1959,9 @@ export const getStoreProducts = async ( req, res ) => {
   try {
     let storeProductDetails;
     if ( !req.body.store.length ) {
-      storeProductDetails = await storeService.find( { clientId: req.body.clientId, status: 'active' } );
+      storeProductDetails = await storeService.find( { clientId: req.body.clientId } );
     } else {
-      storeProductDetails = await storeService.find( { storeId: { $in: req.body.store }, clientId: req.body.clientId, status: 'active' } );
+      storeProductDetails = await storeService.find( { storeId: { $in: req.body.store }, clientId: req.body.clientId } );
     }
 
     let product = new Set();
@@ -1899,15 +1988,18 @@ export const getRemindClients = async ( req, res ) => {
     clientDetails.forEach( async ( client ) => {
       if ( client.planDetails?.product && client.planDetails?.product.length ) {
         client.planDetails.product.forEach( async ( item ) => {
-          if ( item.status == 'trial' ) {
-            let date = new Date();
-            let userTimezoneOffset = item.trialEndDate.getTimezoneOffset() / 60000;
-            item.trialEndDate = new Date( item.trialEndDate.getTime() - userTimezoneOffset );
-            item.trialEndDate.setUTCHours( 0, 0, 0, 0 );
-            const diffTime = parseInt( ( item.trialEndDate - date ) / ( 1000 * 60 * 60 * 24 ), 10 ) + 1;
+          if ( item.status == 'trial' && item?.trialEndDate ) {
+            let endDate = dayjs( item.trialEndDate ).startOf( 'day' );
+            let date = dayjs().startOf( 'day' );
+            let leftDays = endDate.diff( date, 'day' );
+            // let date = new Date();
+            // let userTimezoneOffset = item.trialEndDate.getTimezoneOffset() / 60000;
+            // item.trialEndDate = new Date( item.trialEndDate.getTime() - userTimezoneOffset );
+            // item.trialEndDate.setUTCHours( 0, 0, 0, 0 );
+            // const diffTime = parseInt( ( item.trialEndDate - date ) / ( 1000 * 60 * 60 * 24 ), 10 ) + 1;
             let userDetails= await userService.findOne( { clientId: client.clientId, role: 'superadmin' } );
             if ( userDetails ) {
-              if ( diffTime == 3 ) {
+              if ( leftDays == 3 ) {
                 let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
                 firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
                 let data = {
@@ -1939,7 +2031,7 @@ export const getRemindClients = async ( req, res ) => {
 };
 
 
-export const getExpiredClients = async ( req, res ) => {
+export const getExpiredClientsOld = async ( req, res ) => {
   try {
     let start = new Date();
     let userTimezoneOffset = start.getTimezoneOffset() * 60000;
@@ -1958,7 +2050,6 @@ export const getExpiredClients = async ( req, res ) => {
       {
         $match: {
           'planDetails.product.status': 'trial',
-          'planDetails.product.trialEndDate': { $gt: end },
         },
       },
     ];
@@ -1974,7 +2065,7 @@ export const getExpiredClients = async ( req, res ) => {
           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,
+            userName: userDetails.userName,
             product: firstWord +' '+secondWord,
           };
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExpiredEmail.hbs', 'utf8' );
@@ -1997,6 +2088,56 @@ export const getExpiredClients = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+export const getExpiredClients = async ( req, res ) => {
+  try {
+    let clientDetails = await paymentService.find( { status: 'active' } );
+    if ( !clientDetails.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    clientDetails.forEach( async ( client ) => {
+      if ( client.planDetails?.product && client.planDetails?.product.length ) {
+        client.planDetails.product.forEach( async ( item ) => {
+          if ( item.status == 'trial' && item?.trialEndDate ) {
+            let endDate = dayjs( item.trialEndDate ).startOf( 'day' );
+            let date = dayjs().startOf( 'day' );
+            let leftDays = endDate.diff( date, 'day' );
+            // let date = new Date();
+            // let userTimezoneOffset = item.trialEndDate.getTimezoneOffset() / 60000;
+            // item.trialEndDate = new Date( item.trialEndDate.getTime() - userTimezoneOffset );
+            // item.trialEndDate.setUTCHours( 0, 0, 0, 0 );
+            // const diffTime = parseInt( ( item.trialEndDate - date ) / ( 1000 * 60 * 60 * 24 ), 10 ) + 1;
+            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( ' ' );
+                firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+                let data = {
+                  userName: userDetails.userName,
+                  product: firstWord + ' ' + secondWord,
+                };
+                const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExpiredEmail.hbs', 'utf8' );
+                const template = Handlebars.compile( templateHtml );
+                const html = template( { data: data } );
+                let params = {
+                  toEmail: userDetails.email,
+                  mailSubject: 'TangoEye | Trial Expired - Upgrade to Continue',
+                  htmlBody: html,
+                  attachment: '',
+                  sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+                };
+                await sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+              }
+            }
+          }
+        } );
+      }
+    } );
+    return res.sendSuccess();
+  } catch ( e ) {
+    logger.error( { error: e, function: 'getExpiredClients' } );
+    return res.sendError( e, 500 );
+  }
+};
 
 export const invoiceDownload = async ( req, res ) => {
   try {
@@ -2006,6 +2147,9 @@ export const invoiceDownload = async ( req, res ) => {
       let clientDetails = await paymentService.findOne( { clientId: invoiceInfo.clientId } );
       let amount = 0;
       invoiceInfo.products.forEach( ( item ) => {
+        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;
         if ( clientDetails.paymentInvoice.currencyType == 'dollar' ) {
           item.basePrice = convertINRtoUSD( item.basePrice );
           item.price = convertINRtoUSD( item.price );
@@ -2307,7 +2451,7 @@ export const invoiceGenerate = async ( req, res ) => {
         };
         let storeCount = await storeService.count( storeQuery );
         let data = {
-          invoice: `invoice#${requestClient[clientIndex]}-${dayjs().format( 'MMM YYYY' )}`,
+          invoice: `invoice#${requestClient[clientIndex]}-${new Date().getTime()}`,
           products: invoiceDetails,
           status: 'pending',
           amount: amount,
@@ -2353,6 +2497,9 @@ export const invoiceRevised = async ( req, res ) => {
       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 ) => {
+        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;
         if ( clientDetails?.paymentInvoice?.currencyType == 'dollar' ) {
           item.basePrice = convertINRtoUSD( item.basePrice );
           item.price = convertINRtoUSD( item.price );

package/src/hbs/revisedPriceEmail.hbs

@@ -80,6 +80,31 @@
             border: 0;
             outline: none;
         }
+
+        .invoicedescription {
+            /* width:300px;
+            padding-left:30px;  */
+            color: #667085 !important
+        }
+
+        .productstext {
+            font-size: 16px !important;
+            font-weight: 500 !important;
+            text-align: left;
+            color: #475467 !important;
+            /* border-bottom:1px solid #f0ecea !important; */
+            line-height: 24px !important;
+        }
+
+        .invoicesub {
+            /* font-family: 'Inter'; */
+            color: #667085 !important;
+            font-size: 16px;
+            font-weight: 600;
+            line-height: 24px;
+            text-align: left;
+
+        }
     </style>
 
 </head>
@@ -133,7 +158,7 @@
                 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 680px;">
                     <tr>
                         <td align="left" bgcolor="#ffffff"
-                            style="padding-left: 30px;padding-right: 24px;padding-top:10px; font-size: 16px; line-height: 24px;font-weight:400;color:#384860">
+                            style="padding-left: 30px;padding-right: 24px;padding-top:10px; font-size: 16px; line-height: 24px;font-weight:400;color:#384860; padding-bottom: 20px;">
                             <p style="margin: 0;">"Notice:Subscription price revised.Please review updated pricing
                                 details.we <br />
                                 appreciated your continued
@@ -148,68 +173,70 @@
             <td align="center" bgcolor="#dbe5ea" style="padding:0 10px 0 10px">
                 <table align="center" bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%"
                     style="max-width: 680px;">
-                    <tr bgcolor="#ffffff"
-                        style="border:none;height:40px;margin-top:10px;text-align:left">
-                        <th style="width:300px;padding-left:30px;">Description</th>
-                        <th style="width:120px;">Price</th>
-                        <th style="width:120px;">Stores</th>
-                        <th style="width:120px;">Total Amount</th>
+                    <tr bgcolor="#F9FAFB"
+                        style="border-bottom:1px solid #f0ecea;height:40px;margin-top:10px;text-align:left">
+                        <th class="invoicedescription" style="width:300px;padding-left:30px;">Description</th>
+                        <th class="invoicedescription" style="width:120px;">Price</th>
+                        <th class="invoicedescription" style="width:120px;">Stores</th>
+                        <th class="invoicedescription" style="width:120px;">Total Amount</th>
+                    </tr>
+                    <tr style="border:none;">
+                        <td colspan="4" align="left" bgcolor="#ffffff" style="padding-left: 30px;padding-right: 24px;  font-size: 14px; line-height: 24px;">
+                            <p class="" style="border: 0px solid #EAECF0;">
+                            </p>
+                        </td>
                     </tr>
                     {{#each data.products}}
                     <tr bgcolor="#ffffff" style="border:none;margin-top:10px;">
-                        <td style="padding-left:30px;">{{productName}}</td>
-                        <td>{{../data.currencyType}} {{basePrice}}</td>
-                        <td>{{storeCount}}</td>
-                        <td>{{../data.currencyType}} {{price}}</td>
+                        <td class="productstext" style="padding-left:30px;">{{productName}}</td>
+                        <td class="productstext">{{../data.currencyType}} {{basePrice}}</td>
+                        <td class="productstext">{{storeCount}}</td>
+                        <td class="productstext">{{../data.currencyType}} {{price}}</td>
                     </tr>
                     {{/each}}
                     <tr>
-                        <td align="left" bgcolor="#ffffff"
+                        <td colspan="4" align="left" bgcolor="#ffffff"
                             style="padding-left: 30px;padding-right: 24px;  font-size: 14px; line-height: 24px;">
-                            <p class="o_heading o_mb-xxs"
-                                style="width: 624px;height: 0px;border: 1px solid #CBD5E1;flex: none;order: 1;flex-grow: 0;">
+                            <p class="" style="border: 1px solid #EAECF0;">
                             </p>
                         </td>
                     </tr>
-                    <tr bgcolor="#ffffff"
-                        style="border:none;margin-top:0px;">
-                        <td style="padding-left:30px;">Sub Total</td>
+                    <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">Sub Total</td>
                         <td></td>
                         <td></td>
-                        <td>{{data.currencyType}} {{data.amount}}</td>
+                        <td class="invoicesub">{{data.currencyType}} {{data.amount}}</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
-                        <td style="padding-left:30px;">IGST</td>
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">IGST</td>
                         <td></td>
                         <td></td>
-                        <td>0%</td>
+                        <td class="invoicesub">0%</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
-                        <td style="padding-left:30px;">Total</td>
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">Total</td>
                         <td></td>
                         <td></td>
-                        <td>{{data.currencyType}} {{data.total}}</td>
+                        <td class="invoicesub">{{data.currencyType}}  {{data.total}}</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
-                        <td style="padding-left:30px;">Discount</td>
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">Discount</td>
                         <td></td>
                         <td></td>
-                        <td>{{data.discount}}%</td>
+                        <td class="invoicesub">{{data.discount}}%</td>
                     </tr>
                     <tr>
-                        <td align="left" bgcolor="#ffffff"
+                        <td colspan="4" align="left" bgcolor="#ffffff"
                             style="padding-left: 30px;padding-right: 24px;  font-size: 14px; line-height: 24px;">
-                            <p class="o_heading o_mb-xxs"
-                                style="width: 624px;height: 0px;border: 1px solid #CBD5E1;flex: none;order: 1;flex-grow: 0;">
+                            <p class="" style="border: 1px solid #EAECF0;">
                             </p>
                         </td>
                     </tr>
-                    <tr bgcolor="#ffffff"
-                        style="border:none;margin-top:10px;">
-                        <td style="padding-left:30px;">Final Value</td>
+                    <tr bgcolor="#ffffff" style="border:none;margin-top:10px;">
+                        <td class="invoicesub" style="padding-left:30px; ">Final Value</td>
                         <td></td>
                         <td></td>
-                        <td>{{data.currencyType}} {{data.total}}</td>
+                        <td class="invoicesub">{{data.currencyType}} {{data.total}}</td>
                     </tr>
                 </table>
             </td>

package/src/hbs/trialCreditNoteEmail.hbs

@@ -385,6 +385,30 @@
             transform-origin: 0 0;
             transform: rotate(0deg) scale(1, 1);
         }
+        .invoicedescription {
+            /* width:300px;
+            padding-left:30px;  */
+            color: #667085 !important
+        }
+        .productstext {
+            font-size: 16px !important;
+            font-weight: 500 !important;
+            text-align: left;
+            color: #475467 !important;
+            /* border-bottom:1px solid #f0ecea !important; */
+            line-height: 24px !important;
+        }
+
+        .invoicesub {
+            /* font-family: 'Inter'; */
+            color: #667085 !important;
+            font-size: 16px;
+            font-weight: 600;
+            line-height: 24px;
+            text-align: left;
+
+        }
+
     </style>
 
 </head>
@@ -441,7 +465,7 @@
                               </tr> -->
                                 <tr>
                                     <td align="left" bgcolor="#ffffff"
-                                        style="padding-left: 27px;padding-right: 24px;padding-top:10px; font-size: 16px; line-height: 24px;font-weight:400;color:#384860">
+                                        style="padding-left: 27px;padding-right: 24px;padding-top:10px; font-size: 16px; line-height: 24px;font-weight:400;color:#384860; padding-bottom: 20px;">
                                         <p style="margin: 0;">"Notice: Subscription price revised. Please review updated
                                             pricing details. We appreciate your continued support. Thank you for
                                             understanding."
@@ -452,61 +476,70 @@
                                     <td class="o_bg-white o_px-md o_py-xl o_xs-py-md"
                             style="background-color: #ffffff;padding-left: 30px;padding-right: 24px;padding-bottom: 10px;">
                                         <table style="max-width: 600px;border:none" border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr style="border:none;height:40px;margin-top:10px;text-align:left">
-                                                <th style="width:300px;">Description</th>
-                                                <th style="width:120px;">Price</th>
-                                                <th style="width:120px;">Stores</th>
-                                                <th style="width:120px;">Total Amount</th>
+                                            <tr bgcolor="#F9FAFB" style="border-bottom:1px solid #f0ecea;height:40px;;margin-top:10px;text-align:left">
+                                                <th class="invoicedescription" style="width:300px;">Description</th>
+                                                <th class="invoicedescription" style="width:120px;">Price</th>
+                                                <th class="invoicedescription" style="width:120px;">Stores</th>
+                                                <th class="invoicedescription" style="width:120px;">Total Amount</th>
+                                            </tr>
+                                            <tr style="border:none;">
+                                                <td colspan="4" align="left" bgcolor="#ffffff" style="font-size: 14px; line-height: 24px;">
+                                                    <p class="" style="border: 0px solid #EAECF0;">
+                                                    </p>
+                                                </td>
                                             </tr>
                                             {{#each data.products}}
                                             <tr style="border:none;margin-top:10px;">
-                                                <td>{{product.product}}</td>
-                                                <td>${{basePrice}}</td>
-                                                <td>{{count}}</td>
-                                                <td>${{price}}</td>
+                                                <td class="productstext">{{product.product}}</td>
+                                                <td class="productstext">{{../data.currencyType}} {{basePrice}}</td>
+                                                <td class="productstext">{{count}}</td>
+                                                <td class="productstext">{{../data.currencyType}} {{price}}</td>
                                             </tr>
                                             {{/each}}
-                                            <tr style="border:none;">
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
+                                           
+                                            <tr>
+                                                <td colspan="4" align="left" bgcolor="#ffffff"
+                                                    style="font-size: 14px; line-height: 24px;">
+                                                    <p class="" style="border: 1px solid #EAECF0;">
+                                                    </p>
+                                                </td>
                                             </tr>
-                                            <tr style="border:none;border-top: 5px solid #eaecf0;margin-top:10px;">
-                                                <td>Sub Total</td>
+                                            <tr style="border:none;margin-top:10px;">
+                                                <td class="invoicesub">Sub Total</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td>${{data.amount}}</td>
+                                                <td class="invoicesub">{{data.currencyType}} {{data.amount}}</td>
                                             </tr>
                                             <tr style="border:none;margin-top:10px;">
-                                                <td>IGST</td>
+                                                <td class="invoicesub">IGST</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td>0%</td>
+                                                <td class="invoicesub">0%</td>
                                             </tr>
                                             <tr style="border:none;margin-top:10px;">
-                                                <td>Total</td>
+                                                <td class="invoicesub">Total</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td>${{data.total}}</td>
+                                                <td class="invoicesub">{{data.currencyType}} {{data.total}}</td>
                                             </tr>
                                             <tr style="border:none;margin-top:10px;">
-                                                <td>Discount</td>
+                                                <td class="invoicesub">Discount</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td>{{data.discount}}</td>
+                                                <td class="invoicesub">{{data.discount}}</td>
                                             </tr>
-                                            <tr style="border:none;">
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
-                                                <td></td>
+                                            <tr>
+                                                <td colspan="4" align="left" bgcolor="#ffffff"
+                                                    style="font-size: 14px; line-height: 24px;">
+                                                    <p class="" style="border: 1px solid #EAECF0;">
+                                                    </p>
+                                                </td>
                                             </tr>
-                                            <tr style="border:none;border-top: 5px solid #eaecf0;margin-top:10px;">
-                                                <td>Final Value</td>
+                                            <tr style="border:none;margin-top:10px;">
+                                                <td class="invoicesub">Final Value</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td>${{data.total}}</td>
+                                                <td class="invoicesub">{{data.currencyType}} {{data.total}}</td>
                                             </tr>
                                         </table>
                                     </td>
@@ -514,41 +547,43 @@
                             </table>
                         </td>
                     </tr>
-                </table>
-            </td>
-        </tr>
-
-
-        <tr>
-            <td align="center" bgcolor="#dbe5ea" style="padding: 0px 15px 32px 15px;">
-                <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 648px;">
-                    <tr>
-                        <td class="o_bg-white o_px-md o_py-xl o_xs-py-md"
-                            style="background-color: #ffffff;padding-left: 35px;padding-right: 24px;padding-top:10px">
-                            <div class="o_col-6s o_sans o_text-md o_text-light o_center"
-                                style="margin-top: 35px;margin-bottom: 0px;font-size: 12px;color: #202B3C;font-style: normal;font-weight: 400;font-size: 12px;line-height: 150%;">
-                                <p>
-                                    If you'd rather not receive this kind of email, Don’t want any more emails from
-                                    TangoEye? <a
-                                        style="color: var(--Primary-Base, #00A3FF); text-decoration-line: underline; letter-spacing: 0.2px;">Unsubscribe.</a>
-                                </p>
-                            </div>
-                        </td>
-                    </tr>
                     <tr>
-                        <td class="o_bg-white o_px-md o_py-xl o_xs-py-md"
-                            style="background-color: #ffffff;padding:0px 24px 15px 27px">
-                            <div class="o_col-6s o_sans o_text-md o_text-light o_center"
-                                style="margin-top: 0px;margin-bottom: 0px;font-size: 12px;color: #202B3C;font-style: normal;font-weight: 400;font-size: 12px;line-height: 150%; padding-left: 7px;">
-                                <p>
-                                    © Tango Eye. All rights reserved.</p>
-                            </div>
+                        <td align="center" bgcolor="#dbe5ea" style="padding:0 0px 32px 0px;">
+                            <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 648px;">
+                                <tr>
+                                    <td class="o_bg-white o_px-md o_py-xl o_xs-py-md"
+                                        style="background-color: #ffffff;padding-left: 35px;padding-right: 24px;padding-top:10px">
+                                        <div class="o_col-6s o_sans o_text-md o_text-light o_center"
+                                            style="margin-top: 35px;margin-bottom: 0px;font-size: 12px;color: #202B3C;font-style: normal;font-weight: 400;font-size: 12px;line-height: 150%;">
+                                            <p>
+                                                If you'd rather not receive this kind of email, Don’t want any more emails from
+                                                TangoEye? <a
+                                                    style="color: var(--Primary-Base, #00A3FF); text-decoration-line: underline; letter-spacing: 0.2px;">Unsubscribe.</a>
+                                            </p>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td class="o_bg-white o_px-md o_py-xl o_xs-py-md"
+                                        style="background-color: #ffffff;padding:0px 24px 15px 27px">
+                                        <div class="o_col-6s o_sans o_text-md o_text-light o_center"
+                                            style="margin-top: 0px;margin-bottom: 0px;font-size: 12px;color: #202B3C;font-style: normal;font-weight: 400;font-size: 12px;line-height: 150%; padding-left: 7px;">
+                                            <p>
+                                                © Tango Eye. All rights reserved.</p>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </table>
                         </td>
                     </tr>
                 </table>
             </td>
+            
         </tr>
 
+
+       
+
     </table>
 
 </body>

package/src/hbs/trialExpiredEmail.hbs

@@ -121,7 +121,7 @@
                                 style="margin-top: 0px;margin-bottom: 0px;font-size: 24px;line-height: 28px;color: #82899a;">
                                 <span class="o_heading o_text-dark o_mb-xxs"
                                     style="font-weight: 700;margin-top: 0px;margin-bottom: 4px;color: #121A26;line-height: 39px;">
-                                    Unlock Premium Features - Your Tango Traffic Trial Has Ended</span>
+                                    Unlock Premium Features - Your {{data.product}} Trial Has Ended</span>
                             </div>
                         </td>
                     </tr>

package/src/services/invoice.service.js

@@ -15,3 +15,7 @@ export const find = async ( query ={}, record={} ) => {
 export const create = async ( data ) => {
   return await model.invoiceModel.create( data );
 };
+
+export const count = async ( query ) => {
+  return await model.invoiceModel.count( query );
+};