tango-app-api-payment-subscription 3.0.9-dev → 3.0.11-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.9-dev",
+    "version": "3.0.11-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -20,7 +20,7 @@
         "handlebars": "^4.7.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.41",
+        "tango-api-schema": "^2.0.54",
         "tango-app-api-middleware": "^1.0.29",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/paymentSubscription.controllers.js

@@ -36,7 +36,6 @@ export const addBilling = async ( req, res ) => {
   }
 };
 
-
 export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
   try {
     let query = [
@@ -88,51 +87,56 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     }
 
     let singleActiveProducts = [];
-    for ( let i = 0; i < activeProducts.length; i++ ) {
-      singleActiveProducts.push( activeProducts[i].productName );
-    }
-
-    for ( let i = 0; i < tangoProducts.length; i++ ) {
-      if ( !singleActiveProducts.includes( tangoProducts[i] ) ) {
-        activeProducts.push( { productName: tangoProducts[i], active: false } );
+    if ( activeProducts && activeProducts.length ) {
+      for ( let i = 0; i < activeProducts.length; i++ ) {
+        singleActiveProducts.push( activeProducts[i].productName );
       }
-    }
 
-    activeProducts.forEach( ( element ) => {
-      switch ( element.productName ) {
-        case 'tangoTraffic':
-          element.aliseProductName = 'Tango Traffic';
-          break;
-        case 'tangoZone':
-          element.aliseProductName = 'Tango Zone';
-          break;
-        case 'tangoSOP':
-          element.aliseProductName = 'Tango SOP';
-          break;
-        case 'prioritySupport':
-          element.aliseProductName = 'Priority Support';
-          break;
-        default:
-          break;
+      for ( let i = 0; i < tangoProducts.length; i++ ) {
+        if ( !singleActiveProducts.includes( tangoProducts[i] ) ) {
+          activeProducts.push( { productName: tangoProducts[i], active: false } );
+        }
       }
 
-      if ( element.status == 'live' ) {
-        liveProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName } );
-        element.toolTip = 'Subscribed';
-        element.active = true;
-      }
-      if ( element.status == 'trial' && ( element.trialEndDate >= currentDate ) ) {
-        let differenceInDays = dateDifference( element.trialEndDate, currentDate );
-        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;
-      }
-    } );
+      activeProducts.forEach( ( element ) => {
+        switch ( element.productName ) {
+          case 'tangoTraffic':
+            element.aliseProductName = 'Tango Traffic';
+            break;
+          case 'tangoZone':
+            element.aliseProductName = 'Tango Zone';
+            break;
+          case 'tangoSOP':
+            element.aliseProductName = 'Tango SOP';
+            break;
+          case 'prioritySupport':
+            element.aliseProductName = 'Priority Support';
+            break;
+          default:
+            break;
+        }
+
+        if ( element.status == 'live' ) {
+          liveProducts.push( { 'productName': element.productName, 'aliseProductName': element.aliseProductName } );
+          element.toolTip = 'Subscribed';
+          element.active = true;
+        }
+        if ( element.status == 'trial' ) {
+          let differenceInDays = 14;
+          if ( element?.trialEndDate ) {
+            differenceInDays = dateDifference( element?.trialEndDate, currentDate );
+          }
+          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;
+        }
+      } );
+    }
 
     let priceType = '';
     if ( clientInfo[0].priceType == 'step' ) {
@@ -169,7 +173,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     currentPlanInfo.storeCount = storeCount || '--';
     currentPlanInfo.totalCamera = clientInfo[0].planDetails.totalCamera || '--';
     currentPlanInfo.totalStores = clientInfo[0].planDetails.totalStores || '--';
-    currentPlanInfo.storeSize = clientInfo[0].planDetails.totalStores || '--';
+    currentPlanInfo.storeSize = clientInfo[0].planDetails.storeSize || '--';
     currentPlanInfo.liveProducts = liveProducts || '--';
     currentPlanInfo.trialProducts = trialProducts || '--';
     currentPlanInfo.expiredProducts = expiredProducts || '--';
@@ -195,6 +199,13 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
 
 export const pricingInfo = async ( req, res ) => {
   try {
+    let input = req.body;
+    let finalPrice = 0;
+    let dummy = [];
+    let camaraArray = [];
+    let OriginalPrice = 0;
+    let productDiscounts = [];
+    let dollerpriceOriginal = 0;
     let query = [
       { $unwind: '$basePricing' },
       {
@@ -203,23 +214,92 @@ export const pricingInfo = async ( req, res ) => {
           'basePricing.productName': { $in: req.body.products },
         },
       },
-      {
-        $group: {
-          _id: '',
-          price: {
-            $sum: '$basePricing.basePrice' },
-        },
-      },
       {
         $project: {
           _id: 0,
-          price: 1,
+          basePricing: 1,
         },
       },
     ];
     let pricingDetails = await basePricingService.aggregate( query );
-
-    return res.sendSuccess( pricingDetails );
+    if ( !pricingDetails.length ) {
+      return res.sendError( 'no data found', 204 );
+    }
+    let productList = pricingDetails.map( ( item ) => {
+      return { ...item.basePricing };
+    } );
+    input.products.forEach( async ( element, index ) => {
+      let getProduct = productList.find( ( item ) => item.productName == element );
+      let camaraPerSqft = getProduct.camaraPerStores.filter( ( data ) => data.sqft == input.camaraPerSqft );
+      console.log( camaraPerSqft, 'rest' );
+      let basicprice = Math.round( getProduct.basePrice * ( camaraPerSqft[0].camaraCount ) );
+      productDiscounts.push( getProduct.discoutPercentage );
+      let stage = 0;
+      if ( input.storesCount == '1-25' ) {
+        stage = 0;
+      } else if ( input.storesCount == '26-50' ) {
+        stage = 1;
+      } else if ( input.storesCount == '51-75' ) {
+        stage = 2;
+      } else if ( input.storesCount == '76-100' ) {
+        stage = 2;
+      } else if ( input.storesCount == '51-100' ) {
+        stage = 2;
+      } else if ( input.storesCount == '101-150' || input.storesCount == '101+' ) {
+        stage = 3;
+      } else if ( input.storesCount == '151-200' ) {
+        stage = 4;
+      } else if ( input.storesCount == '201-250' ) {
+        stage = 5;
+      } else if ( input.storesCount == '251-500' ) {
+        stage = 6;
+      } else if ( input.storesCount == '501-1000' ) {
+        stage = 7;
+      } else if ( input.storesCount == '1001-2000' ) {
+        stage = 8;
+      } else if ( input.storesCount == '2000+' ) {
+        stage = 9;
+      }
+      let discountprice = Math.round( basicprice * Math.pow( 0.9, stage ) );
+      dummy.push( discountprice );
+      OriginalPrice = OriginalPrice + discountprice;
+      // console.log("====>", OriginalPrice);
+      finalPrice = finalPrice + discountprice;
+      camaraArray.push( Number( Math.ceil( camaraPerSqft[0].camaraCount ) ) );
+      if ( dummy.length == input.products.length ) {
+        if ( input.products.length > 1 ) {
+          // for extra product to add maximum discount
+          let maxProductDiscounts = Math.max( ...productDiscounts );
+          let addtionalDiscount = ( finalPrice * maxProductDiscounts ) / 100;
+          console.log( 'addtional product discount', addtionalDiscount );
+          finalPrice = finalPrice - addtionalDiscount;
+          console.log( finalPrice, 'test' );
+          // OriginalPrice = OriginalPrice + addtionalDiscount
+        }
+        if ( input.planName == 'quarterly' ) {
+          let extraDiscount = ( finalPrice * 10 ) / 100;
+          console.log( 'halfyearly extraDiscount', extraDiscount );
+          finalPrice = finalPrice - extraDiscount;
+          console.log( finalPrice, 'rtyu' );
+          // OriginalPrice = OriginalPrice + extra_discount
+        }
+        if ( input.planName == 'annual' ) {
+          let extraDiscount = ( finalPrice * 20 ) / 100;
+          console.log( 'yearly extraDiscount', extraDiscount );
+          finalPrice = finalPrice - extraDiscount;
+          console.log( finalPrice, 'fgvbh' );
+          // OriginalPrice = OriginalPrice + extra_discount
+        }
+        finalPrice = Math.ceil( finalPrice / 10 ) * 10; //  for round off to 10 position
+        if ( input.currencyType && input.currencyType == 'dollar' ) {
+          dollerprice = ( ( finalPrice * 50 ) / 100 );
+          finalPrice = ( dollerprice + finalPrice ) / 84;
+          dollerpriceOriginal = ( ( OriginalPrice * 50 ) / 100 );
+          OriginalPrice = ( dollerpriceOriginal + OriginalPrice ) / 84;
+        }
+        res.sendSuccess( { OriginalPrice: Math.round( OriginalPrice ), price: Math.round( finalPrice ) } );
+      }
+    } );
   } catch ( e ) {
     console.log( 'pricingInfo=>', e );
     logger.error( { error: e, function: 'pricingInfo' } );
@@ -227,7 +307,7 @@ export const pricingInfo = async ( req, res ) => {
   }
 };
 
-export const updateSubscription = async ( req, res ) => {
+export const updateSubscriptionOLD = async ( req, res ) => {
   try {
     if ( !req?.body?.currentPlanInfo ) {
       return res.sendError( 'Plan info detail is required', 400 );
@@ -279,6 +359,86 @@ export const updateSubscription = async ( req, res ) => {
   }
 };
 
+export const updateSubscription = async ( req, res ) => {
+  try {
+    let requestBody = req.body;
+    if ( !req?.body?.currentPlanInfo ) {
+      return res.sendError( 'Plan info detail is required', 400 );
+    }
+    let price = requestBody.currentPlanInfo.price;
+    let priceType = requestBody.currentPlanInfo.priceType;
+    delete requestBody.currentPlanInfo.price;
+    delete requestBody.currentPlanInfo.priceType;
+    delete requestBody.currentPlanInfo.storeCount;
+
+    console.log( 'requestBody.currentPlanInfo.product 1=>', requestBody.currentPlanInfo.product );
+    for ( let i = 0; i < requestBody.currentPlanInfo.product.length; i++ ) {
+      if ( requestBody.currentPlanInfo.product[i].status == 'live' && requestBody.currentPlanInfo.product[i].active == true ) {};
+      if ( requestBody.currentPlanInfo.product[i].status == 'trial' && requestBody.currentPlanInfo.product[i].active == true ) {
+        if ( requestBody.currentPlanInfo.product[i].confirmation == 'subscribenow' ) {
+          requestBody.currentPlanInfo.product[i].subscribedDate = new Date();
+          requestBody.currentPlanInfo.product[i].status = 'live';
+          requestBody.currentPlanInfo.product[i].trialStartDate = requestBody.currentPlanInfo.product[i]?.trialStartDate || '';
+          requestBody.currentPlanInfo.product[i].trialEndDate = requestBody.currentPlanInfo.product[i]?.trialEndDate || '';
+        }
+      };
+      if ( requestBody.currentPlanInfo.product[i].active == true && !requestBody.currentPlanInfo.product[i].hasOwnProperty( 'status' ) ) {
+        if ( requestBody.currentPlanInfo.product[i].confirmation == 'subscribenow' ) {
+          requestBody.currentPlanInfo.product[i].subscribedDate = new Date();
+          requestBody.currentPlanInfo.product[i].status = 'live';
+          requestBody.currentPlanInfo.product[i].trialStartDate = requestBody.currentPlanInfo.product[i]?.trialStartDate || '';
+          requestBody.currentPlanInfo.product[i].trialEndDate = requestBody.currentPlanInfo.product[i]?.trialEndDate || '';
+        }
+        if ( requestBody.currentPlanInfo.product[i].confirmation == 'starttrail' ) {
+          requestBody.currentPlanInfo.product[i].status = 'trial';
+          let params = {
+            user: '65e966e12b1991393cf8ce30', // need to login user id here
+            clientId: requestBody.clientId,
+            name: requestBody.currentPlanInfo.product[i].productName,
+            description: 'Request for Trial',
+            category: 'Trial',
+            status: 'pending',
+          };
+          await clientRequestService.insert( params );
+        }
+        if ( requestBody.currentPlanInfo.product[i].confirmation == 'doitlater' ) {
+          console.log( 'check' );
+          // need to do price changes
+          requestBody.currentPlanInfo.product.splice( i, 1 );
+        }
+      }
+    }
+
+    for ( let j = 0; j < requestBody.currentPlanInfo.product.length; j++ ) {
+      delete requestBody.currentPlanInfo.product[j]?.aliseProductName;
+      delete requestBody.currentPlanInfo.product[j]?.toolTip;
+      delete requestBody.currentPlanInfo.product[j]?.active;
+      delete requestBody.currentPlanInfo.product[j]?.confirmation;
+    }
+
+    console.log( 'requestBody.currentPlanInfo.product 2=>', requestBody.currentPlanInfo.product );
+    let details = {
+      planDetails: requestBody.currentPlanInfo,
+      price: price,
+      priceType: priceType,
+    };
+
+    let result = await paymentService.updateOne( { clientId: req.params.clientId }, details );
+    // let storeProduct = requestBody.currentPlanInfo.product.map( ( item ) => item.productName );
+    // await storeService.updateMany( { clientId: req.params.clientId, status: 'active' }, { product: storeProduct } );
+
+    if ( result.modifiedCount ) {
+      return res.sendSuccess( { message: 'Subscription Updated Successfully' } );
+    } else {
+      return res.sendError( 'Something went wrong', 500 );
+    }
+  } catch ( e ) {
+    console.log( e );
+    logger.error( { error: e, function: 'updateSubscription' } );
+    return res.sendError( e, 500 );
+  }
+};
+
 export const trialProductList = async ( req, res ) => {
   try {
     let query =[
@@ -305,7 +465,16 @@ export const trialProductList = async ( req, res ) => {
     if ( !getClientInfo.length ) {
       return res.sendError( 'no data found', 204 );
     }
-    let products = getClientInfo.map( ( item ) => item.product );
+    let products = [];
+    getClientInfo.forEach( ( item ) => {
+      let [ firstWord, secondWord ] = item.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
+      firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
+      products.push( {
+        name: `${firstWord} ${secondWord}`,
+        value: item.product,
+      },
+      );
+    } );
     return res.sendSuccess( products );
   } catch ( e ) {
     console.log( 'trialRequest =>', e );
@@ -530,40 +699,58 @@ export const trialExtendRequestApproval = async ( req, res ) => {
 
 export const productSubscribe = async ( req, res ) => {
   try {
+    let data = req.body.product;
+    req.body.product = [];
+    data.forEach( ( item ) => {
+      if ( item.type != 'cancel' ) {
+        let arr = item.name.split( ',' );
+        arr.forEach( ( product ) => {
+          req.body.product.push( {
+            name: product,
+            type: item.type,
+          } );
+        } );
+      }
+    } );
+    console.log( req.body.product, 'product' );
     let clientInfo = await paymentService.findOne( { clientId: req.body.clientId, status: 'active' }, { clientId: 1, planDetails: 1 } );
     if ( !clientInfo ) {
       return res.sendError( 'no data found', 204 );
     }
     let product = clientInfo.planDetails.product;
+    let removeProducts = req.body.product.filter( ( item ) => item.type == 'unsubscribe' ).map( ( item ) => item.name );
     let productList = product.map( ( item ) => item.productName );
     for ( let item of req.body.product ) {
       if ( productList.includes( item.name ) && item.type =='unsubscribe' ) {
-        let findIndex = product.findIndex( ( product ) => product.productName );
-        product.splice( findIndex, 1 );
-        console.log( clientInfo.clientId );
+        // let findIndex = product.findIndex( ( product ) => product.productName );
+        // product.splice( findIndex, 1 );
+        // console.log( clientInfo.clientId );
         await storeService.addremoveElement( { clientId: clientInfo.clientId, status: 'active', product: { $in: item.name } }, { $pull: { product: item.name } } );
       }
-      if ( !productList.includes( item.name ) && item.type == 'trial' ) {
-        product.push( {
-          productName: item.name,
-          trialStartDate: new Date(),
-          trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
-          status: 'trial',
-        } );
-      }
-      if ( !productList.includes( item.name ) && item.type == 'subscribe' ) {
-        product.push( {
-          productName: item.name,
-          subscribedDate: new Date(),
-          status: 'live',
-        } );
+      if ( !productList.includes( item.name ) && [ 'trial', 'subscription' ].includes( item.type ) ) {
+        if ( item.type == 'trial' ) {
+          product.push( {
+            productName: item.name,
+            trialStartDate: new Date(),
+            trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
+            status: 'trial',
+          } );
+        } else {
+          product.push( {
+            productName: item.name,
+            subscribedDate: new Date(),
+            status: 'live',
+          } );
+        }
         await storeService.addremoveElement( { clientId: clientInfo.clientId, status: 'active' }, { $push: { product: item.name } } );
       }
     }
+    product = product.filter( ( item ) => !removeProducts.includes( item.productName ) );
+    console.log( product, 'product' );
     clientInfo.planDetails.product = product;
     clientInfo.save().then( async () => {
-      return res.sendSuccess( 'Product Subscribed Successfully' );
     } );
+    return res.sendSuccess( 'Product Subscribed Successfully' );
   } catch ( e ) {
     console.log( 'updateProductSubscribe =>', e );
     logger.error( { error: e, function: 'updateProductSubscribe' } );
@@ -622,18 +809,42 @@ export const productViewList = async ( req, res ) => {
       },
     ];
     let storeProductCount = await storeService.aggregate( query );
-    if ( !storeProductCount.length ) {
+    let clientProduct = await paymentService.findOne( { clientId: req.query.clientId }, { 'planDetails.product': 1 } );
+
+    if ( !clientProduct ) {
       return res.sendError( 'no data found', 204 );
     }
+    console.log( clientProduct.planDetails.product );
     let productPrice = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
-    console.log( productPrice, 'price' );
-    storeProductCount.forEach( ( item ) => {
-      let productBasePrice = productPrice.basePricing.find( ( product ) => product.product_name == item.product );
+    console.log( storeProductCount, 'price' );
+    let products = [];
+    clientProduct.planDetails.product.forEach( ( item ) => {
+      let price;
+      let count;
+      let productBasePrice = productPrice.basePricing.find( ( product ) => product.productName == item.productName );
+      let productCount = storeProductCount.find( ( product ) => product.product == item.productName );
       if ( productBasePrice ) {
-        item.basePrice = productBasePrice.base_price;
+        price = productBasePrice.basePrice;
+      }
+      if ( productCount ) {
+        count = productCount.storeCount;
       }
+      products.push(
+          {
+            product: item.productName,
+            basePrice: price,
+            storeCount: count,
+            status: item.status,
+          },
+      );
     } );
-    return res.sendSuccess( storeProductCount );
+    // storeProductCount.forEach( ( item ) => {
+    //   let productBasePrice = productPrice.basePricing.find( ( product ) => product.productName == item.product );
+    //   if ( productBasePrice ) {
+    //     item.basePrice = productBasePrice.basePrice;
+    //   }
+    // } );
+    return res.sendSuccess( products );
   } catch ( e ) {
     console.log( 'productViewList =>', e );
     logger.error( { error: e, function: 'productViewList' } );
@@ -714,7 +925,10 @@ export const storeViewList = async ( req, res ) => {
         },
     );
 
+    console.log( JSON.stringify( query ), 'query' );
+
     let storeDetails = await storeService.aggregate( query );
+    console.log( storeDetails );
 
     if ( !storeDetails[0].data.length ) {
       return res.sendError( 'no data found', 204 );
@@ -878,12 +1092,12 @@ export const invoiceList = async ( req, res ) => {
 
 export const priceList = async ( req, res ) => {
   try {
-    let pricingDetails = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.params.clientId }, { standard: 1, step: 1 } );
+    let pricingDetails = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
     if ( !pricingDetails ) {
       return res.sendError( 'no data found', 204 );
     }
     let data = [];
-    if ( !req.body.client?.priceType || req.body.client.priceType == 'standard' ) {
+    if ( req.body.priceType == 'standard' ) {
       data = pricingDetails.standard;
     } else {
       data = pricingDetails.step;
@@ -891,7 +1105,7 @@ export const priceList = async ( req, res ) => {
     let query = [
       {
         $match: {
-          clientId: req.params.clientId,
+          clientId: req.body.clientId,
           status: 'active',
         },
       },
@@ -913,21 +1127,29 @@ export const priceList = async ( req, res ) => {
     let storeProduct = await storeService.aggregate( query );
     let originalTotalPrice = 0;
     let discountTotalPrice = 0;
+    let totalProductPrice = 0;
+    let totalnegotiatePrice = 0;
     let temp = [];
-    console.log( data );
-    console.log( storeProduct );
     storeProduct.forEach( ( item ) => {
       let productDetails = data.filter( ( ele ) => ele.productName == item.product );
       productDetails.forEach( ( product, index ) => {
-        if ( req.body.client.priceType == 'standard' ) {
+        if ( req.body.priceType == 'standard' ) {
           product.storeCount = item.storeCount;
         } else {
+          product.showImg = false;
+          product.showEditDelete = false;
           if ( index == productDetails.length-1 ) {
+            if ( index != 0 ) {
+              product.showImg = true;
+              product.showEditDelete = true;
+            }
             product.storeCount = item.storeCount;
+            product.lastIndex = true;
           } else if ( index == 0 ) {
             product.storeCount = 100;
             item.storeCount = item.storeCount - 100;
           } else {
+            product.showImg = true;
             let rangeArray = product.storeRange.split( '-' );
             let startNumber = parseInt( rangeArray[0] );
             let endNumber = parseInt( rangeArray[1] );
@@ -938,19 +1160,29 @@ export const priceList = async ( req, res ) => {
         }
         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;
         temp.push( product );
         let originalPrice = product.basePrice * product.storeCount;
+        product.originalPrice = originalPrice;
         originalTotalPrice = originalTotalPrice + originalPrice;
         discountTotalPrice = discountTotalPrice + product.price;
       } );
     } );
     data = temp;
-    console.log( data, 'data' );
+    let discountPrice = originalTotalPrice - discountTotalPrice;
+    let discountPercentage = ( discountTotalPrice / originalTotalPrice ) * 100;
+    let finalValue = discountTotalPrice * ( 18 / 100 );
     let result = {
       product: data,
       totalActualPrice: originalTotalPrice,
-      TotalPrice: discountTotalPrice,
+      totalNegotiatePrice: discountTotalPrice,
+      actualPrice: totalProductPrice,
+      negotiatePrice: totalnegotiatePrice,
+      discountPrice: discountPrice,
+      discountPercentage: discountPercentage.toFixed(),
+      finalValue: finalValue.toFixed( 2 ),
     };
     return res.sendSuccess( result );
   } catch ( e ) {
@@ -963,6 +1195,19 @@ export const priceList = async ( req, res ) => {
 
 export const pricingListUpdate = async ( req, res ) => {
   try {
+    req.body.products.forEach( ( item ) => {
+      delete item.originalPrice;
+      delete item.oldPrice;
+      delete item.oldStoreCount;
+      delete item.storeCount;
+      delete item.price;
+      if ( req.body.type == 'step' ) {
+        delete item.showImg;
+        delete item.showEditDelete;
+        delete item.lastIndex;
+      }
+    } );
+    console.log( req.body.products, 'products' );
     let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
     let data = {
       ...( req.body.type == 'standard' ) ? { standard: req.body.products } : { step: req.body.products },
@@ -994,6 +1239,8 @@ export const updatedRevisedPrice = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     invoiceDetails.amount = req.body.revisedAmount;
+    invoiceDetails.revisedAmount = req.body.revisedAmount;
+    invoiceDetails.discount = req.body.discount;
     invoiceDetails.save().then( () => {
       return res.sendSuccess( 'Credit notes Updated Successfully' );
     } );
@@ -1006,7 +1253,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' } } );
+    let invoiceDetails = await invoiceService.find( { clientId: req.params.clientId, status: { $ne: 'paid' } }, { invoice: 1, status: 1, amount: 1, revisedAmount: 1, totalAmount: 1, discount: 1 } );
     if ( !invoiceDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }

package/src/dtos/validation.dtos.js

@@ -22,11 +22,11 @@ export const validateStoreParams = {
 
 export const validateProducts = {
   body: joi.object( {
-    camara_per_sqft: joi.string().required(),
-    currency_type: joi.string().required(),
-    plan_name: joi.string().required(),
+    camaraPerSqft: joi.string().required(),
+    currencyType: joi.string().required(),
+    planName: joi.string().required(),
     products: joi.array().required(),
-    stores_count: joi.string().required(),
+    storesCount: joi.string().required(),
   } ),
 };
 
@@ -74,12 +74,12 @@ export const validateStoreViewParams = {
     limit: joi.number().required(),
     offset: joi.number().required(),
     clientId: joi.string().required(),
-    sortColumn: joi.string().optional(),
-    sortBy: joi.number().optional(),
-    searchValue: joi.string().optional(),
-    product: joi.array().optional(),
-    store: joi.array().optional(),
-    location: joi.array().optional(),
+    sortColumn: joi.string().optional().empty( '' ),
+    sortBy: joi.number().optional().empty( '' ),
+    searchValue: joi.string().optional().empty( '' ),
+    product: joi.array().optional().empty(),
+    store: joi.array().optional().empty(),
+    location: joi.array().optional().empty(),
   } ),
 };
 
@@ -116,6 +116,14 @@ export const revisedParams = {
   body: joi.object( {
     invoice: joi.string().required(),
     revisedAmount: joi.number().required(),
+    discount: joi.number().required(),
   } ),
 };
 
+
+export const validatePriceListParams = {
+  body: joi.object( {
+    priceType: joi.string().required(),
+    clientId: joi.string().required(),
+  } ),
+};

package/src/routes/paymentSubscription.routes.js

@@ -46,9 +46,9 @@ paymentSubscriptionRouter.post( '/admin/addStoreProduct', isAllowedSessionHandle
 
 paymentSubscriptionRouter.post( '/invoiceList', isAllowedSessionHandler, validate( validationDtos.validateInvoiceParams ), validateClient, paymentController.invoiceList );
 
-paymentSubscriptionRouter.get( '/priceList/:clientId', isAllowedSessionHandler, validate( validationDtos.validateBrandParams ), validateClient, paymentController.priceList );
+paymentSubscriptionRouter.post( '/admin/priceList', isAllowedSessionHandler, validate( validationDtos.validatePriceListParams ), validateClient, paymentController.priceList );
 
-paymentSubscriptionRouter.post( '/pricing', isAllowedSessionHandler, validate( validationDtos.validatePriceParams ), validateClient, paymentController.pricingListUpdate );
+paymentSubscriptionRouter.post( '/admin/pricing', isAllowedSessionHandler, validate( validationDtos.validatePriceParams ), validateClient, paymentController.pricingListUpdate );
 
 paymentSubscriptionRouter.post( '/creditNotes', isAllowedSessionHandler, validate( validationDtos.revisedParams ), paymentController.updatedRevisedPrice );