tango-app-api-payment-subscription 3.0.13-dev → 3.0.14-dev

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -1,11 +1,10 @@
-import { logger, download, sendEmailWithSES } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, appConfig } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
 import * as storeService from '../services/store.service.js';
 import * as basePricingService from '../services/basePrice.service.js';
 import * as clientRequestService from '../services/clientRequest.service.js';
 import * as invoiceService from '../services/invoice.service.js';
 import dayjs from 'dayjs';
-import appConfig from '../../config/env/env.js';
 import Handlebars from 'handlebars';
 import fs from 'fs';
 import path from 'path';
@@ -622,11 +621,12 @@ export const notificationList = async ( req, res ) => {
         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: endDate.diff( date, 'day' ) + 1,
-          percentage: percentage,
+          day: leftDays < 0 ? 0 : leftDays,
+          percentage: percentage > 100 ? 100 : percentage,
           category: 'trial product',
         } );
       } );
@@ -691,7 +691,7 @@ export const trialApproval = async ( req, res ) => {
           mailSubject: 'test',
           htmlBody: html,
           attachment: '',
-          sourceEmail: appConfig.cloud.aws.ses.from,
+          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
@@ -848,7 +848,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 } );
 
-    if ( !clientProduct ) {
+    if ( !clientProduct.planDetails.product.length ) {
       return res.sendError( 'no data found', 204 );
     }
     let productPrice = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );