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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.19-dev",
+    "version": "3.0.21-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,10 @@
         "tango-api-schema": "^2.0.62",
         "tango-app-api-middleware": "^1.0.49-dev",
         "winston": "^3.12.0",
-        "winston-daily-rotate-file": "^5.0.0"
+        "winston-daily-rotate-file": "^5.0.0",
+        "html-to-pdfmake": "^2.5.6",
+        "jsdom": "^24.0.0",
+        "pdfmake": "^0.2.10"
     },
     "devDependencies": {
         "eslint": "^8.57.0",

package/src/controllers/paymentSubscription.controllers.js

@@ -1,3 +1,4 @@
+
 /* eslint-disable new-cap */
 import { logger, download, sendEmailWithSES, appConfig } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
@@ -31,6 +32,16 @@ export const addBilling = async ( req, res ) => {
       billingDetails.nextBillingDate = '--';
       resultData.billingDetails = billingDetails;
       logger.info( 'Billing Details Added Successfully' );
+      // const logObj = {
+      //   clientId: req.body.clientId,
+      //   userName: req.user?.userName,
+      //   email: req.user?.email,
+      //   date: new Date(),
+      //   logType: 'billing',
+      //   logSubType: 'billingInfo',
+      //   changes: [ 'billingAddress', 'gstNumber', 'nextBillingDate' ],
+      //   eventType: 'update',
+      // };
       return res.sendSuccess( { message: 'Billing Details Added Successfully', data: resultData } );
     } else {
       logger.error( 'Error Occurs WHile updating billing Detaisls' );
@@ -130,7 +141,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
         if ( element.status == 'trial' ) {
           let differenceInDays = 14;
           if ( element?.trialEndDate ) {
-            differenceInDays = dateDifference( element?.trialEndDate, currentDate );
+            differenceInDays = dateDifference( new Date( dayjs( element?.trialEndDate ).add( 1, 'days' ).startOf( 'day' ) ), new Date( dayjs( currentDate ).startOf( 'day' ) ) );
             if ( element.trialEndDate < currentDate ) {
               expiredProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName, 'toolTip': 'Trial Expired' } );
               element.toolTip = 'Trial Expired';
@@ -386,7 +397,10 @@ export const updateSubscription = async ( req, res ) => {
           category: 'Trial',
           status: 'pending',
         };
-        await clientRequestService.insert( params );
+        let productExists = await clientRequestService.findOne( { clientId: requestBody.clientId, name: item.name, category: 'Trial', status: 'pending' } );
+        if ( !productExists ) {
+          await clientRequestService.insert( params );
+        }
       }
       if ( item.type == 'subscription' ) {
         if ( existsIndex == -1 ) {
@@ -405,7 +419,6 @@ export const updateSubscription = async ( req, res ) => {
     let details = {
       subscriptionType: requestBody.subscriptionType,
       subscriptionPeriod: requestBody.subscriptionPeriod,
-      storeCount: requestBody.storeCount,
       totalCamera: requestBody.totalCamera,
       totalStores: requestBody.totalStores,
       storeSize: requestBody.storeSize,
@@ -471,7 +484,7 @@ export const trialProductList = async ( req, res ) => {
     } );
     return res.sendSuccess( products );
   } catch ( e ) {
-    logger.error( { error: e, function: 'trialRequest' } );
+    logger.error( { error: e, function: 'trialProductList' } );
     return res.sendError( e, 500 );
   }
 };
@@ -541,7 +554,7 @@ export const trialRequest = async ( req, res ) => {
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
-    logger.error( { error: e, function: 'trialExtendRequest' } );
+    logger.error( { error: e, function: 'trialRequest' } );
     return res.sendError( e, 500 );
   }
 };
@@ -588,7 +601,7 @@ export const updateInvoiceDetails = async ( req, res ) => {
     clientInvoiceDetails.save().then( () => {
       return res.sendSuccess( 'Invoice Updated Successfully' );
     } ).catch( ( e ) => {
-      return res.sendError( e );
+      return res.sendError( e, 500 );
     } );
   } catch ( e ) {
     logger.error( { error: e, function: 'invoiceDetails' } );
@@ -759,7 +772,7 @@ export const trialExtendRequestApproval = async ( req, res ) => {
           userName: userDetails.userName,
           product: firstWord +' '+secondWord,
           days: req.body.days,
-          date: trialDate,
+          date: dayjs( trialDate ).format( 'YYYY-MM-DD' ),
         };
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialExtentionEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -1379,11 +1392,11 @@ export const priceList = async ( req, res ) => {
             item.storeCount = item.storeCount - diff;
           }
         }
-        let discountPrice = product.basePrice * ( product.discountPercentage / 100 );
-        let price = product.basePrice - discountPrice;
+        // let discountPrice = product.basePrice * ( product.discountPercentage / 100 );
+        // let price = product.basePrice - discountPrice;
         totalProductPrice = totalProductPrice + product.basePrice;
         totalnegotiatePrice = totalnegotiatePrice + product.negotiatePrice;
-        product.price = price * product.storeCount;
+        product.price = product.negotiatePrice * product.storeCount;
         temp.push( product );
         let originalPrice = product.basePrice * product.storeCount;
         product.originalPrice = originalPrice;
@@ -1392,9 +1405,10 @@ export const priceList = async ( req, res ) => {
       } );
     } );
     data = temp;
-    let discountPrice = originalTotalPrice - discountTotalPrice;
-    let discountPercentage = ( discountTotalPrice / originalTotalPrice ) * 100;
-    let finalValue = discountTotalPrice * ( 18 / 100 );
+    let discountPrice = totalProductPrice - totalnegotiatePrice;
+    let discountPercentage = totalnegotiatePrice > 0 ? ( totalnegotiatePrice / totalProductPrice ) * 100 : 0;
+    let gstAmount = discountTotalPrice * ( 18 / 100 );
+    let finalValue = parseFloat( discountTotalPrice ) + gstAmount;
     let result = {
       product: data,
       totalActualPrice: originalTotalPrice,
@@ -1402,7 +1416,7 @@ export const priceList = async ( req, res ) => {
       actualPrice: totalProductPrice,
       negotiatePrice: totalnegotiatePrice,
       discountPrice: discountPrice,
-      discountPercentage: discountPercentage.toFixed(),
+      discountPercentage: discountPercentage.toFixed( 2 ),
       finalValue: finalValue.toFixed( 2 ),
     };
     return res.sendSuccess( result );
@@ -1432,7 +1446,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: discountPrice,
+              negotiatePrice: baseDetails.basePrice - discountPrice,
             },
         );
         stepList.push(
@@ -1440,7 +1454,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: discountPrice,
+              negotiatePrice: baseDetails.basePrice - discountPrice,
               storeRange: '1-100',
             },
         );
@@ -1506,7 +1520,22 @@ export const pricingListUpdate = async ( req, res ) => {
     } else {
       getPriceInfo.step = req.body.products;
     }
-    getPriceInfo.save().then( () => {
+    getPriceInfo.save().then( async () => {
+      let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
+      if ( userDetails ) {
+        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/revisedPriceEmail.hbs', 'utf8' );
+        const template = Handlebars.compile( templateHtml );
+        const html = template( { data: '' } );
+        let params = {
+          toEmail: userDetails.email,
+          mailSubject: 'test',
+          htmlBody: html,
+          attachment: '',
+          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+        };
+        sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+      }
+
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );
   } catch ( e ) {
@@ -1531,7 +1560,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
         const template = Handlebars.compile( templateHtml );
         const html = template( { data: '' } );
         let params = {
-          toEmail: 'sudha@tangotech.co.in',
+          toEmail: userDetails.email,
           mailSubject: 'test',
           htmlBody: html,
           attachment: '',

package/src/dtos/validation.dtos.js

@@ -152,7 +152,6 @@ export const validateUpdateSubscriptionSchema = {
     priceType: joi.string().required(),
     subscriptionType: joi.string().required(),
     subscriptionPeriod: joi.string().required(),
-    storeCount: joi.number().required(),
     totalCamera: joi.number().required(),
     totalStores: joi.string().required(),
     storeSize: joi.string().required(),