tango-app-api-payment-subscription 3.0.16-dev → 3.0.17-dev

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -128,15 +128,16 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
           let differenceInDays = 14;
           if ( element?.trialEndDate ) {
             differenceInDays = dateDifference( element?.trialEndDate, currentDate );
+            if ( element.trialEndDate < currentDate ) {
+              expiredProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': 'Trial Expired' } );
+              element.toolTip = 'Trial Expired';
+              element.active = true;
+            } else {
+              trialProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': differenceInDays +' days trial left' } );
+              element.toolTip = 'On Trial';
+              element.active = true;
+            }
           }
-          trialProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': differenceInDays +' days trial left' } );
-          element.toolTip = 'On Trial';
-          element.active = true;
-        }
-        if ( element.status == 'trial' && ( element.trialEndDate < currentDate ) ) {
-          expiredProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': 'Trial Expired' } );
-          element.toolTip = 'Trial Expired';
-          element.active = true;
         }
       } );
     }
@@ -202,7 +203,6 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
 export const pricingInfo = async ( req, res ) => {
   try {
     let pricingDetails = await calculatePricing( req, res );
-    console.log( await calculatePricing( req, res ), 'details' );
     return res.sendSuccess( pricingDetails );
   } catch ( e ) {
     logger.error( { error: e, function: 'pricingInfo' } );
@@ -213,7 +213,6 @@ export const pricingInfo = async ( req, res ) => {
 async function calculatePricing( req, res ) {
   try {
     let input = req.body;
-    console.log( input, 'input' );
     let finalPrice = 0;
     let dummy = [];
     let camaraArray = [];
@@ -309,7 +308,7 @@ async function calculatePricing( req, res ) {
     } );
     return ( { OriginalPrice: Math.round( OriginalPrice ), price: Math.round( finalPrice ), camaraCount: camaraCount } );
   } catch ( e ) {
-    console.log( e );
+    logger.error( { error: e, function: 'calculatePricing' } );
     return false;
   }
 }
@@ -627,22 +626,24 @@ export const notificationList = async ( req, res ) => {
     let getClientInfo = await paymentService.aggregate( query );
     if ( getClientInfo.length ) {
       getClientInfo.forEach( ( item ) => {
-        let [ firstWord, secondWord ] = item.product.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
-        firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
-        let startDate = dayjs( item.product.trialStartDate );
-        let endDate = dayjs( item.product.trialEndDate ).startOf( 'day' );
-        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 leftDays = endDate.diff( date, 'day' ) + 1;
-        notificationList.push( {
-          product: item.product.productName,
-          name: `${firstWord} ${secondWord}`,
-          day: leftDays < 0 ? 0 : leftDays,
-          percentage: percentage > 100 ? 100 : percentage,
-          category: 'trial product',
-        } );
+        if ( item.product?.trialStartDate && item.product?.trialEndDate ) {
+          let [ firstWord, secondWord ] = item.product.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
+          firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+          let startDate = dayjs( item.product.trialStartDate );
+          let endDate = dayjs( item.product.trialEndDate ).startOf( 'day' );
+          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 leftDays = endDate.diff( date, 'day' ) + 1;
+          notificationList.push( {
+            product: item.product.productName,
+            name: `${firstWord} ${secondWord}`,
+            day: leftDays < 0 ? 0 : leftDays,
+            percentage: percentage > 100 ? 100 : percentage,
+            category: 'trial product',
+          } );
+        }
       } );
     }
 
@@ -1455,7 +1456,6 @@ export const pricingListUpdate = async ( req, res ) => {
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );
   } catch ( e ) {
-    console.log( e );
     logger.error( { error: e, function: 'addPricingList' } );
     return res.sendError( e, 500 );
   }
@@ -1555,7 +1555,7 @@ export const getRemindClients = async ( req, res ) => {
                   username: userDetails.userName,
                   product: firstWord + ' ' + secondWord,
                 };
-                const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trailReminderEmail.hbs', 'utf8' );
+                const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialReminderEmail.hbs', 'utf8' );
                 const template = Handlebars.compile( templateHtml );
                 const html = template( { data: data } );
                 let params = {
@@ -1618,7 +1618,7 @@ export const getExpiredClients = async ( req, res ) => {
             username: userDetails.userName,
             product: firstWord +' '+secondWord,
           };
-          const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trailExpiredEmail.hbs', 'utf8' );
+          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 = {
@@ -1641,12 +1641,12 @@ export const getExpiredClients = async ( req, res ) => {
 
 export const invoiceDownload = async ( req, res ) => {
   try {
-    const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
-    const template = Handlebars.compile( templateHtml );
-    const html = template( { data: '' } );
-    console.log( html );
+    // const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
+    // const template = Handlebars.compile( templateHtml );
+    // const html = template( { data: '' } );
+    // console.log( html );
   } catch ( e ) {
-    console.log( e );
+    // console.log( e );
     logger.error( { error: e, function: 'invoiceDownload' } );
     return res.sendError( e, 500 );
   }
@@ -1707,7 +1707,7 @@ export const invoiceCreate = async ( req, res ) => {
     }
     return res.sendSuccess( 'Invoice Created Successfully' );
   } catch ( e ) {
-    console.log( e );
+    // console.log( e );
     logger.error( { error: e, function: 'invoiceDownload' } );
     return res.sendError( e, 500 );
   }

package/src/dtos/validation.dtos.js

@@ -33,7 +33,7 @@ export const validateProducts = {
 export const validateunsubscribeParams = {
   body: joi.object( {
     reason: joi.string().required(),
-    description: joi.string().required(),
+    description: joi.string().optional().empty( '' ),
     clientId: joi.string().required(),
   } ),
 };

package/src/routes/paymentSubscription.routes.js

@@ -8,7 +8,7 @@ export const paymentSubscriptionRouter = express.Router();
 
 paymentSubscriptionRouter.post( '/addBilling', isAllowedSessionHandler, authorize( {
   userType: [ 'tango', 'client' ], access: [
-    { featureName: 'settings', name: 'tangotraffic', permissions: [ 'isEdit' ] },
+    { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
 } ), validate( validationDtos.validateBillingParams ), validateClient, paymentController.addBilling );