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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.16-dev",
+    "version": "3.0.18-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;
   }
 }
@@ -601,6 +600,7 @@ export const notificationList = async ( req, res ) => {
     query.status = 'pending';
     if ( req?.query?.clientId ) {
       query.clientId = req?.query?.clientId;
+      query.category = { $ne: 'TrialExtend' };
     }
     let notificationList = await clientRequestService.find( query, { createdAt: 0, updatedAt: 0 } );
     query = [
@@ -627,22 +627,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',
+          } );
+        }
       } );
     }
 
@@ -1221,6 +1223,21 @@ export const invoiceList = async ( req, res ) => {
       } );
     }
 
+    query.push( {
+      $project: {
+        _id: 1,
+        invoice: 1,
+        stores: 1,
+        billingDate: 1,
+        status: 1,
+        paymentMethod: 1,
+        amount: 1,
+        discount: 1,
+        revisedAmount: 1,
+        products: 1,
+      },
+    } );
+
     query.push(
         {
           $facet: {
@@ -1240,6 +1257,16 @@ export const invoiceList = async ( req, res ) => {
     if ( !invoiceDetails[0]?.data.length ) {
       return res.sendError( 'no data found', 204 );
     }
+    invoiceDetails[0].data.forEach( ( item ) => {
+      item.billingDate = dayjs( item.billingDate ).format( 'DD MMM, YYYY' );
+    } );
+    if ( req.user.userType == 'client' ) {
+      invoiceDetails[0].data.forEach( ( item ) => {
+        delete item.discount;
+        delete item.revisedAmount;
+        delete item.products;
+      } );
+    }
     let data = {
       data: invoiceDetails[0].data,
       count: invoiceDetails[0].count[0].count,
@@ -1247,6 +1274,16 @@ export const invoiceList = async ( req, res ) => {
     if ( !req.body.export ) {
       return res.sendSuccess( data );
     } else {
+      invoiceDetails[0].data.forEach( ( item ) => {
+        if ( item.status == 'trial' ) {
+          item.amount = 'Trial';
+        }
+        if ( item.status == 'free' ) {
+          item.amount = 'Free';
+        }
+        delete item._id;
+        delete item.paymentMethod;
+      } );
       download( invoiceDetails[0].data, res );
     }
   } catch ( e ) {
@@ -1377,7 +1414,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
             },
         );
         stepList.push(
@@ -1385,7 +1422,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
               storeRange: '1-100',
             },
         );
@@ -1455,7 +1492,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 +1591,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 +1654,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 +1677,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 );
   }
@@ -1661,7 +1697,7 @@ export const updateInvoiceStatus = async ( req, res ) => {
     if ( !invoiceDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    invoiceDetails.status = req.body?.status || 'paid';
+    invoiceDetails.status = req.body?.status || 'Payment Received';
     invoiceDetails.save().then( async () => {
       let clientInfo = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
       if ( clientInfo ) {
@@ -1682,12 +1718,13 @@ export const invoiceCreate = async ( req, res ) => {
     let products = req.body.client.planDetails.product.map( ( item ) => item.productName );
     let storeDetails = await storeService.count( { clientId: req.body.clientId, status: 'active' } );
     let data;
+    let clientId = req.body.clientId;
     data = {
       invoice: `invoice #0${req.body.client.clientId} - ${Math.floor( Math.random() * 100 ) + 1}`,
       billingDate: new Date(),
       products: products,
       stores: storeDetails,
-      status: '',
+      status: 'pending',
       clientId: req.body.clientId,
     };
     req.body = {
@@ -1700,14 +1737,14 @@ export const invoiceCreate = async ( req, res ) => {
     let pricingDetails = await calculatePricing( req, res );
     data.amount = pricingDetails.price;
     await invoiceService.create( data );
-    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId } );
+    let clientInfo = await paymentService.findOne( { clientId: clientId } );
     if ( clientInfo ) {
       clientInfo.planDetails.paymentStatus = 'due';
       clientInfo.save();
     }
     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(),
   } ),
 };
@@ -97,7 +97,7 @@ export const validateInvoiceParams = {
   body: joi.object( {
     limit: joi.number().required(),
     offset: joi.number().required(),
-    searchValue: joi.string().optional(),
+    searchValue: joi.string().optional().empty( '' ),
     filter: joi.string().optional(),
     sortColumn: joi.string().optional(),
     sortBy: joi.number().optional(),

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 );
 

package/src/services/invoice.service.js

@@ -1,7 +1,7 @@
 import model from 'tango-api-schema';
 
 export const aggregate = async ( query ={} ) => {
-  return await model.invoiceModel.aggregate( query );
+  return await model.invoiceModel.aggregate( query, { collation: { locale: 'en_US', numericOrdering: true } } );
 };
 
 export const findOne = async ( query ={}, record={} ) => {