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

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -1526,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;
@@ -1985,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 = {
@@ -2025,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;
@@ -2044,7 +2050,6 @@ export const getExpiredClients = async ( req, res ) => {
       {
         $match: {
           'planDetails.product.status': 'trial',
-          'planDetails.product.trialEndDate': { $gt: end },
         },
       },
     ];
@@ -2060,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' );
@@ -2083,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 {
@@ -2396,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,

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>