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

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -10,6 +10,9 @@ import dayjs from 'dayjs';
 import Handlebars from 'handlebars';
 import fs from 'fs';
 import path from 'path';
+import { JSDOM } from 'jsdom';
+import pdfMake from 'pdfmake';
+import htmlToPdfmake from 'html-to-pdfmake';
 
 export const addBilling = async ( req, res ) => {
   try {
@@ -600,6 +603,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 = [
@@ -629,13 +633,13 @@ export const notificationList = async ( req, res ) => {
         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 startDate = dayjs( item.product.trialStartDate ).startOf( 'day' );
+          let endDate = dayjs( item.product.trialEndDate ).startOf( 'day' ).add( 1, 'days' );
           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;
+          let leftDays = endDate.diff( date, 'day' );
           notificationList.push( {
             product: item.product.productName,
             name: `${firstWord} ${secondWord}`,
@@ -757,7 +761,7 @@ export const trialExtendRequestApproval = async ( req, res ) => {
           days: req.body.days,
           date: trialDate,
         };
-        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExtensionEmail.hbs', 'utf8' );
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExtentionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
         const html = template( { data: data } );
         let params = {
@@ -771,6 +775,7 @@ export const trialExtendRequestApproval = async ( req, res ) => {
       }
       return res.sendSuccess( 'Trial Extended Successfully' );
     } ).catch( ( e ) => {
+      logger.error( { error: e, function: 'trialExtendRequestApproval' } );
       return res.sendError( e, 500 );
     } );
   } catch ( e ) {
@@ -924,6 +929,7 @@ export const productViewList = async ( req, res ) => {
         },
       },
     ];
+
     let storeProductCount = await storeService.aggregate( query );
     let clientProduct = await paymentService.findOne( { clientId: req.query.clientId }, { 'planDetails.product': 1 } );
 
@@ -952,6 +958,11 @@ export const productViewList = async ( req, res ) => {
           },
       );
     } );
+    if ( req.query.sortBy == -1 ) {
+      products.sort( ( a, b ) => b.storeCount - a.storeCount ? -1 : 1 );
+    } else {
+      products.sort( ( a, b ) => a.storeCount - b.storeCount ? 1 : -1 );
+    }
     // storeProductCount.forEach( ( item ) => {
     //   let productBasePrice = productPrice.basePricing.find( ( product ) => product.productName == item.product );
     //   if ( productBasePrice ) {
@@ -1222,6 +1233,21 @@ export const invoiceList = async ( req, res ) => {
       } );
     }
 
+    query.push( {
+      $project: {
+        _id: 1,
+        invoice: 1,
+        billingDate: 1,
+        stores: 1,
+        products: 1,
+        amount: 1,
+        paymentMethod: 1,
+        status: 1,
+        discount: 1,
+        revisedAmount: 1,
+      },
+    } );
+
     query.push(
         {
           $facet: {
@@ -1241,6 +1267,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,
@@ -1248,7 +1284,25 @@ export const invoiceList = async ( req, res ) => {
     if ( !req.body.export ) {
       return res.sendSuccess( data );
     } else {
-      download( invoiceDetails[0].data, res );
+      let exportData = [];
+      invoiceDetails[0].data.forEach( ( item ) => {
+        if ( item.status == 'trial' ) {
+          item.amount = 'Trial';
+        }
+        if ( item.status == 'free' ) {
+          item.amount = 'Free';
+        }
+        exportData.push( {
+          'Invoice': item.invoice,
+          'Billing Date': item.billingDate,
+          'Stores': item.stores,
+          ...( req.user.userType == 'tango' ? { 'Products': item.products } : {} ),
+          'Amount': item.amount,
+          ...( req.user.userType == 'client' ? { 'Payment Method': item.paymentMethod } : {} ),
+          'Status': item.status,
+        } );
+      } );
+      await download( exportData, res );
     }
   } catch ( e ) {
     logger.error( { error: e, function: 'invoiceList' } );
@@ -1344,7 +1398,7 @@ export const priceList = async ( req, res ) => {
     let result = {
       product: data,
       totalActualPrice: originalTotalPrice,
-      totalNegotiatePrice: discountTotalPrice,
+      totalNegotiatePrice: discountTotalPrice.toFixed( 2 ),
       actualPrice: totalProductPrice,
       negotiatePrice: totalnegotiatePrice,
       discountPrice: discountPrice,
@@ -1378,7 +1432,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
             },
         );
         stepList.push(
@@ -1386,7 +1440,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
               storeRange: '1-100',
             },
         );
@@ -1495,7 +1549,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
 
 export const unpaidInvoiceList = async ( req, res ) => {
   try {
-    let invoiceDetails = await invoiceService.find( { clientId: req.params.clientId, status: { $ne: 'paid' } }, { invoice: 1, status: 1, amount: 1, revisedAmount: 1, totalAmount: 1, discount: 1 } );
+    let invoiceDetails = await invoiceService.find( { clientId: req.params.clientId, status: { $nin: [ 'paid', 'trial', 'free' ] } }, { invoice: 1, status: 1, amount: 1, revisedAmount: 1, totalAmount: 1, discount: 1 } );
     if ( !invoiceDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -1641,12 +1695,34 @@ 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: '' } );
+    let fonts = {
+      Helvetica: {
+        normal: 'Helvetica',
+        bold: 'Helvetica-Bold',
+        italics: 'Helvetica-Oblique',
+        bolditalics: 'Helvetica-BoldOblique',
+      },
+    };
+    let printer = new pdfMake( fonts );
+
+    let { window } = new JSDOM( '' );
+    const htmlTemplate = htmlToPdfmake( html, { window: window, tableAutoSize: true } );
+
+    const docDefinition = {
+      content: htmlTemplate,
+      defaultStyle: {
+        font: 'Helvetica',
+      },
+    };
+    let pdfDoc = printer.createPdfKitDocument( docDefinition );
+    res.setHeader( 'Content-disposition', `attachment; filename=Report_1.pdf` );
+    res.setHeader( 'Content-Type', 'application/pdf' );
+    pdfDoc.pipe( res );
+    pdfDoc.end();
   } catch ( e ) {
-    // console.log( e );
     logger.error( { error: e, function: 'invoiceDownload' } );
     return res.sendError( e, 500 );
   }
@@ -1661,7 +1737,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 ) {
@@ -1671,7 +1747,7 @@ export const updateInvoiceStatus = async ( req, res ) => {
       return res.sendSuccess( 'Invoice updated Successfully' );
     } );
   } catch ( e ) {
-    logger.error( { error: e, function: 'invoiceDownload' } );
+    logger.error( { error: e, function: 'updateInvoiceStatus' } );
     return res.sendError( e, 500 );
   }
 };
@@ -1682,12 +1758,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,15 +1777,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 );
-    logger.error( { error: e, function: 'invoiceDownload' } );
+    logger.error( { error: e, function: 'invoiceCreate' } );
     return res.sendError( e, 500 );
   }
 };

package/src/dtos/validation.dtos.js

@@ -20,6 +20,14 @@ export const validateStoreParams = {
   } ),
 };
 
+export const validateProductListParams = {
+  query: joi.object( {
+    clientId: joi.string().required(),
+    sortColumn: joi.string().required(),
+    sortBy: joi.number().required(),
+  } ),
+};
+
 export const validateProducts = {
   body: joi.object( {
     camaraPerSqft: joi.string().required(),
@@ -97,7 +105,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

@@ -96,7 +96,7 @@ paymentSubscriptionRouter.get( '/admin/getProductViewList', isAllowedSessionHand
   userType: [ 'tango' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isView' ] },
   ],
-} ), validate( validationDtos.validateStoreParams ), validateClient, paymentController.productViewList );
+} ), validate( validationDtos.validateProductListParams ), validateClient, paymentController.productViewList );
 
 paymentSubscriptionRouter.post( '/admin/getstoreViewList', isAllowedSessionHandler, authorize( {
   userType: [ 'tango' ], access: [
@@ -154,7 +154,7 @@ paymentSubscriptionRouter.post( '/admin/getStoreProducts', isAllowedSessionHandl
 
 paymentSubscriptionRouter.get( '/trialRemaindList', paymentController.getRemindClients );
 paymentSubscriptionRouter.get( '/trialExpiredList', paymentController.getExpiredClients );
-paymentSubscriptionRouter.get( '/invoiceDownload', paymentController.invoiceDownload );
+paymentSubscriptionRouter.post( '/invoiceDownload', paymentController.invoiceDownload );
 paymentSubscriptionRouter.post( '/invoiceStatusUpdate/:invoiceId', paymentController.updateInvoiceStatus );
 paymentSubscriptionRouter.post( '/invoice/create', validateClient, paymentController.invoiceCreate );
 

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={} ) => {