tango-app-api-payment-subscription 3.0.37-dev → 3.0.38-dev

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -464,7 +464,7 @@ export const updateSubscription = async ( req, res ) => {
       let userDetails= await userService.findOne( { clientId: requestBody.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
-          username: userDetails.userName,
+          userName: userDetails.userName,
         };
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -817,7 +817,7 @@ export const trialApproval = async ( req, res ) => {
     requestData.status = 'completed';
     requestData.save().then( async () => {
       if ( req.body.type == 'approve' ) {
-        let clientProducts = await paymentService.findOne( { clientId: requestData.clientId, status: 'active' }, { planDetails: 1 } );
+        let clientProducts = await paymentService.findOne( { clientId: requestData.clientId }, { planDetails: 1 } );
         if ( clientProducts?.planDetails.subscriptionType == 'free' ) {
           clientProducts.planDetails.subscriptionType = 'premium';
         }
@@ -848,6 +848,7 @@ export const trialApproval = async ( req, res ) => {
           let data = {
             userName: userDetails.userName,
             product: firstWord +' '+ secondWord,
+            domain: appConfig.url.domain,
           };
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialInitiateEmail.hbs', 'utf8' );
           const template = Handlebars.compile( templateHtml );
@@ -885,7 +886,7 @@ export const trialApproval = async ( req, res ) => {
 export const trialExtendRequestApproval = async ( req, res ) => {
   try {
     let trialDate;
-    let clientDetails = await paymentService.findOne( { clientId: req.body.clientId, status: 'active' }, { planDetails: 1 } );
+    let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { planDetails: 1 } );
     if ( !clientDetails ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -910,6 +911,7 @@ export const trialExtendRequestApproval = async ( req, res ) => {
           product: firstWord +' '+secondWord,
           days: req.body.days,
           date: dayjs( trialDate ).format( 'YYYY-MM-DD' ),
+          domain: appConfig.url.domain,
         };
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExtentionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -950,6 +952,7 @@ export const productSubscribe = async ( req, res ) => {
     let data = req.body.product;
     req.body.product = [];
     let subscriptionCount = 0;
+    let trialProduct = [];
     data.forEach( ( item ) => {
       if ( item.type != 'cancel' ) {
         let arr = item.name.split( ',' );
@@ -961,7 +964,7 @@ export const productSubscribe = async ( req, res ) => {
         } );
       }
     } );
-    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId, status: 'active' }, { clientId: 1, planDetails: 1 } );
+    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId }, { clientId: 1, planDetails: 1 } );
     if ( !clientInfo ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -970,11 +973,7 @@ export const productSubscribe = async ( req, res ) => {
     let productList = product.map( ( item ) => item.productName );
     for ( let item of req.body.product ) {
       if ( productList.includes( item.name ) && item.type =='unsubscribe' ) {
-        // let findIndex = product.findIndex( ( product ) => product.productName );
-        // product.splice( findIndex, 1 );
-        // let requestDetails = await clientRequestService.findOne({});
         await storeService.addremoveElement( { clientId: clientInfo.clientId, product: { $in: item.name } }, { $pull: { product: item.name } } );
-        // status: 'active',
       }
       if ( !productList.includes( item.name ) && [ 'trial', 'subscription' ].includes( item.type ) ) {
         if ( item.type == 'trial' ) {
@@ -984,6 +983,10 @@ export const productSubscribe = async ( req, res ) => {
             trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
             status: 'trial',
           } );
+          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;
+          trialProduct.push( productName );
         } else {
           product.push( {
             productName: item.name,
@@ -999,29 +1002,20 @@ export const productSubscribe = async ( req, res ) => {
           if ( item.type == 'subscription' ) {
             product[productIndex].subscribedDate = new Date();
             product[productIndex].status = 'live';
+            subscriptionCount = subscriptionCount + 1;
           }
-          subscriptionCount = subscriptionCount + 1;
         }
       }
     }
     product = product.filter( ( item ) => !removeProducts.includes( item.productName ) );
-    // req.body = {
-    //   'camaraPerSqft': clientInfo.planDetails.storeSize,
-    //   'storesCount': clientInfo.planDetails.totalStores,
-    //   'planName': clientInfo.planDetails.subscriptionPeriod,
-    //   'products': product.map( ( item ) => item.productName ),
-    //   'currencyType': 'rupees',
-    // };
-    // let pricingDetails = await calculatePricing( req, res );
-    // clientInfo.price = pricingDetails.price;
     if ( product.length > 1 ) {
       clientInfo.planDetails.subscriptionType = 'premium';
     }
+    let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
     if ( subscriptionCount ) {
-      let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
-          username: userDetails.userName,
+          userName: userDetails.userName,
         };
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -1036,26 +1030,30 @@ export const productSubscribe = async ( req, res ) => {
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
     }
+    if ( trialProduct.length ) {
+      let productEmailName = trialProduct.toString();
+      if ( userDetails ) {
+        let data = {
+          userName: userDetails.userName,
+          product: productEmailName,
+          domain: appConfig.url.domain,
+        };
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialInitiateEmail.hbs', 'utf8' );
+        const template = Handlebars.compile( templateHtml );
+        const html = template( { data: data } );
+        let params = {
+          toEmail: userDetails.email,
+          mailSubject: 'Trial Initiated - Welcome to Tango Suite!',
+          htmlBody: html,
+          attachment: '',
+          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+        };
+        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,
@@ -1084,7 +1082,7 @@ export const unsubscribeApproval = async ( req, res ) => {
     requestData.status = 'completed';
     requestData.save().then( async () => {
       if ( req.body.type == 'unsubscribe' ) {
-        let clientProducts = await paymentService.findOne( { clientId: requestData.clientId, status: 'active' }, { status: 1 } );
+        let clientProducts = await paymentService.findOne( { clientId: requestData.clientId }, { status: 1 } );
         if ( !clientProducts ) {
           return res.sendError( 'no data found', 204 );
         }
@@ -1330,12 +1328,13 @@ export const addStoreProduct = async ( req, res ) => {
         } );
       }
     } );
-    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId, status: 'active' }, { 'planDetails.product': 1 } );
+    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId }, { 'planDetails.product': 1 } );
     let productList = clientInfo.planDetails.product.map( ( product ) => product.productName );
     let clientProduct = [];
     let storeProduct = [];
     let removedProduct = [];
     let subscriptionCount = 0;
+    let trialProduct = [];
     clientProduct = clientInfo.planDetails.product;
     req.body.product.forEach( ( item ) => {
       if ( item.type != 'unsubscribe' ) {
@@ -1356,12 +1355,17 @@ export const addStoreProduct = async ( req, res ) => {
               trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
               status: 'trial',
             };
+            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;
+            trialProduct.push( productName );
           } else {
             clientProduct[productExistsIndex] = {
               productName: item.name,
               subscribedDate: new Date(),
               status: 'live',
             };
+            subscriptionCount = subscriptionCount + 1;
           }
         } else {
           if ( item.type == 'trial' ) {
@@ -1371,6 +1375,10 @@ export const addStoreProduct = async ( req, res ) => {
               trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
               status: 'trial',
             } );
+            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;
+            trialProduct.push( productName );
           }
           if ( item.type == 'subscription' ) {
             clientProduct.push( {
@@ -1384,11 +1392,11 @@ export const addStoreProduct = async ( req, res ) => {
       }
     },
     );
+    let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
     if ( subscriptionCount ) {
-      let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
-          username: userDetails.userName,
+          userName: userDetails.userName,
         };
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialSubscriptionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -1403,6 +1411,27 @@ export const addStoreProduct = async ( req, res ) => {
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
     }
+    if ( trialProduct.length ) {
+      let productEmailName = trialProduct.toString();
+      if ( userDetails ) {
+        let data = {
+          userName: userDetails.userName,
+          product: productEmailName,
+          domain: appConfig.url.domain,
+        };
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialInitiateEmail.hbs', 'utf8' );
+        const template = Handlebars.compile( templateHtml );
+        const html = template( { data: data } );
+        let params = {
+          toEmail: userDetails.email,
+          mailSubject: 'Trial Initiated - Welcome to Tango Suite!',
+          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 ) => {
@@ -1591,7 +1620,7 @@ export const priceList = async ( req, res ) => {
       {
         $match: {
           clientId: req.body.clientId,
-          // status: 'active',
+          status: 'active',
         },
       },
       { $unwind: '$product' },
@@ -1989,22 +2018,18 @@ export const getRemindClients = async ( req, res ) => {
       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 endDate = dayjs( item.trialEndDate ).startOf( 'day' ).add( 1, 'days' );
             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 == 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 = {
-                  username: userDetails.userName,
+                  userName: userDetails.userName,
                   product: firstWord + ' ' + secondWord,
+                  domain: appConfig.url.domain,
                 };
                 const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialReminderEmail.hbs', 'utf8' );
                 const template = Handlebars.compile( templateHtml );
@@ -2067,6 +2092,7 @@ export const getExpiredClientsOld = async ( req, res ) => {
           let data = {
             userName: userDetails.userName,
             product: firstWord +' '+secondWord,
+            domain: appConfig.url.domain,
           };
           const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExpiredEmail.hbs', 'utf8' );
           const template = Handlebars.compile( templateHtml );
@@ -2101,11 +2127,6 @@ 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 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 ) {
@@ -2114,6 +2135,7 @@ export const getExpiredClients = async ( req, res ) => {
                 let data = {
                   userName: userDetails.userName,
                   product: firstWord + ' ' + secondWord,
+                  domain: appConfig.url.domain,
                 };
                 const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExpiredEmail.hbs', 'utf8' );
                 const template = Handlebars.compile( templateHtml );

package/src/hbs/trialExpiredEmail.hbs

@@ -242,8 +242,8 @@
                         <td bgcolor="#ffffff" style="padding: 20px;padding-top:10px;padding-left:30px;">
                             <table border="0" cellpadding="0" cellspacing="0">
                                 <tr>
-                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;">
-                                        <a href="${data.uiDomainName}" target="_blank"
+                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;height:50px;">
+                                        <a href="{{data.domain}}" target="_blank"
                                             style="display: inline-block; padding: 16px 36px;  font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;">Upgrade Now
                                         </a>
                                     </td>

package/src/hbs/trialExtentionEmail.hbs

@@ -148,8 +148,8 @@
                     <td bgcolor="#ffffff" style="padding: 20px;padding-top:30px;padding-left:30px;">
                         <table border="0" cellpadding="0" cellspacing="0">
                             <tr>
-                                <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;">
-                                    <a href="${data.uiDomainName}" target="_blank"
+                                <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;height:50px;">
+                                    <a href="{{data.domain}}" target="_blank"
                                         style="display: inline-block; padding: 16px 36px;  font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;">Upgrade Now
                                     </a>
                                 </td>

package/src/hbs/trialInitiateEmail.hbs

@@ -251,8 +251,8 @@
                         <td bgcolor="#ffffff" style="padding: 20px;padding-top:10px;padding-left:30px;">
                             <table border="0" cellpadding="0" cellspacing="0">
                                 <tr>
-                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;">
-                                        <a href="data.uiDomainName" target="_blank"
+                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;height:50px;">
+                                        <a href="{{data.domain}}" target="_blank"
                                             style="display: inline-block; padding: 16px 36px;  font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;">View
                                             Dashboard
                                         </a>

package/src/hbs/trialReminderEmail.hbs

@@ -242,8 +242,8 @@
                         <td bgcolor="#ffffff" style="padding: 20px;padding-top:10px;padding-left:30px;">
                             <table border="0" cellpadding="0" cellspacing="0">
                                 <tr>
-                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;">
-                                        <a href="${data.uiDomainName}" target="_blank"
+                                    <td align="center" bgcolor="#00A3FF" style="border-radius: 6px;height:50px;">
+                                        <a href="{{data.domain}}" target="_blank"
                                             style="display: inline-block; padding: 16px 36px;  font-size: 16px; color: #ffffff; text-decoration: none; border-radius: 6px;">Upgrade Now
                                         </a>
                                     </td>

package/src/utils/validations/client.validation.js

@@ -14,7 +14,7 @@ export const validateClient = async ( req, res, next ) => {
     if ( req?.params?.clientId ) {
       data = req.params.clientId;
     }
-    let clientDetails = await clientPayment.findOne( { clientId: data, status: 'active' } );
+    let clientDetails = await clientPayment.findOne( { clientId: data } );
     if ( !clientDetails ) {
       return res.sendError( 'no data found', 204 );
     }