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

package/index.js

@@ -1,7 +1,8 @@
 
 
 import { paymentSubscriptionRouter } from './src/routes/paymentSubscription.routes.js';
+import { paymentDoc } from './src/docs/payment.docs.js';
 
-export { paymentSubscriptionRouter };
+export { paymentSubscriptionRouter, paymentDoc };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.21-dev",
+    "version": "3.0.23-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -18,15 +18,17 @@
         "dotenv": "^16.4.5",
         "express": "^4.18.3",
         "handlebars": "^4.7.8",
+        "html-to-pdfmake": "^2.5.6",
+        "joi-to-swagger": "^6.2.0",
+        "jsdom": "^24.0.0",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
+        "pdfmake": "^0.2.10",
+        "swagger-ui-express": "^5.0.0",
         "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",
-        "html-to-pdfmake": "^2.5.6",
-        "jsdom": "^24.0.0",
-        "pdfmake": "^0.2.10"
+        "winston-daily-rotate-file": "^5.0.0"
     },
     "devDependencies": {
         "eslint": "^8.57.0",

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, appConfig } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData } 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';
@@ -32,19 +32,20 @@ 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',
-      // };
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'billingInfo Updated',
+        changes: [ 'Billing Address', 'Gst Number' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( { message: 'Billing Details Added Successfully', data: resultData } );
     } else {
-      logger.error( 'Error Occurs WHile updating billing Detaisls' );
+      logger.error( 'Error Occurs WHile updating billing Details' );
       return res.sendError( 'Something Went Wrong', 500 );
     }
   } catch ( e ) {
@@ -72,6 +73,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
           price: 1,
           priceType: 1,
           virtualAccount: 1,
+          // paymentInvoice: 1,
         },
       },
       {
@@ -384,6 +386,10 @@ export const updateSubscription = async ( req, res ) => {
     if ( !requestBody?.products?.length ) {
       return res.sendError( 'product is required', 400 );
     }
+    let premiumType = requestBody.client.planDetails.subscriptionType;
+    if ( requestBody.client.planDetails.subscriptionType == 'free' ) {
+      premiumType = 'premium';
+    }
 
     let clientProducts = requestBody.client.planDetails.product;
     for ( let item of requestBody.products ) {
@@ -400,6 +406,17 @@ export const updateSubscription = async ( req, res ) => {
         let productExists = await clientRequestService.findOne( { clientId: requestBody.clientId, name: item.name, category: 'Trial', status: 'pending' } );
         if ( !productExists ) {
           await clientRequestService.insert( params );
+          const logObj = {
+            clientId: req.body.clientId,
+            userName: req.user?.userName,
+            email: req.user?.email,
+            date: new Date(),
+            logType: 'billing',
+            logSubType: 'Trial Request',
+            changes: [ 'Name', 'Description', 'Category' ],
+            eventType: 'insert',
+          };
+          insertOpenSearchData( 'tango-retail-activity-logs', logObj );
         }
       }
       if ( item.type == 'subscription' ) {
@@ -417,7 +434,7 @@ export const updateSubscription = async ( req, res ) => {
     }
 
     let details = {
-      subscriptionType: requestBody.subscriptionType,
+      subscriptionType: premiumType,
       subscriptionPeriod: requestBody.subscriptionPeriod,
       totalCamera: requestBody.totalCamera,
       totalStores: requestBody.totalStores,
@@ -425,13 +442,32 @@ export const updateSubscription = async ( req, res ) => {
       product: clientProducts,
     };
 
+    req.body = {
+      'camaraPerSqft': req.body.storeSize,
+      'storesCount': req.body.totalStores,
+      'planName': requestBody.subscriptionPeriod,
+      'products': clientProducts.map( ( item ) => item.productName ),
+      'currencyType': 'rupees',
+    };
+    let pricingDetails = await calculatePricing( req, res );
     let data = {
       planDetails: details,
-      price: requestBody.price,
+      price: pricingDetails.price,
       priceType: requestBody.priceType,
     };
 
     let result = await paymentService.updateOne( { clientId: req.params.clientId }, data );
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Subscrption Details updated',
+      changes: [ 'Plan Details', 'Price', 'Price Type' ],
+      eventType: 'update',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     let storeProduct = clientProducts.map( ( item ) => item.productName );
     await storeService.updateMany( { clientId: req.params.clientId, status: 'active' }, { product: storeProduct } );
 
@@ -505,6 +541,18 @@ export const unsubscribeProduct = async ( req, res ) => {
     };
     await clientRequestService.insert( params );
 
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Unsubscribed Request',
+      changes: [ 'Reason', 'Description', 'Category' ],
+      eventType: 'insert',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'unsubscribeProduct' } );
@@ -527,6 +575,17 @@ export const trialExtendRequest = async ( req, res ) => {
       status: 'pending',
     };
     await clientRequestService.insert( params );
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Trial Extend Request',
+      changes: [ 'Name', 'Description', 'Category' ],
+      eventType: 'insert',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
 
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
@@ -552,6 +611,18 @@ export const trialRequest = async ( req, res ) => {
     };
     await clientRequestService.insert( params );
 
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Trial Request',
+      changes: [ 'Name', 'Description', 'Category' ],
+      eventType: 'insert',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
+
     return res.sendSuccess( 'Request Send Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'trialRequest' } );
@@ -565,6 +636,13 @@ export const invoiceDetails = async ( req, res ) => {
     if ( !clientInvoiceDetails ) {
       return res.sendError( 'no data found', 204 );
     }
+    if ( !clientInvoiceDetails?.paymentInvoice?.paymentAgreementTo || !clientInvoiceDetails?.paymentInvoice?.paymentAgreementTo.length ) {
+      let userDetails = await userService.findOne( { clientId: req.params.clientId, isActive: true, role: 'superadmin' } );
+      if ( userDetails ) {
+        clientInvoiceDetails.paymentInvoice.paymentAgreementTo = [ userDetails.email ];
+        clientInvoiceDetails.paymentInvoice.invoiceTo = [ userDetails.email ];
+      }
+    }
     let data = {
       proRate: clientInvoiceDetails?.paymentInvoice?.proRate || '',
       paymenttype: clientInvoiceDetails?.paymentInvoice?.paymentType || '',
@@ -598,7 +676,18 @@ export const updateInvoiceDetails = async ( req, res ) => {
     clientInvoiceDetails.paymentInvoice.paymentAgreementTo = data.paymentAgreementTo;
     clientInvoiceDetails.paymentInvoice.invoiceOn = data.invoiceOn;
     clientInvoiceDetails.paymentInvoice.extendPaymentPeriodDays = data.extendPaymentPeriodDays;
-    clientInvoiceDetails.save().then( () => {
+    clientInvoiceDetails.save().then( async () => {
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Update Payment and Invoice Details',
+        changes: [ 'Pro Rate', 'Payment Type', 'Payment Cycle', 'Currency Type', 'Invoice To', 'Payment Agreement To', 'Invoice On', 'Extend Payment PeriodDays' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'Invoice Updated Successfully' );
     } ).catch( ( e ) => {
       return res.sendError( e, 500 );
@@ -697,6 +786,9 @@ export const trialApproval = async ( req, res ) => {
     requestData.save().then( async () => {
       if ( req.body.type == 'approve' ) {
         let clientProducts = await paymentService.findOne( { clientId: requestData.clientId, status: 'active' }, { planDetails: 1 } );
+        if ( clientProducts?.planDetails.subscriptionType == 'free' ) {
+          clientProducts.planDetails.subscriptionType = 'premium';
+        }
         if ( !clientProducts ) {
           return res.sendError( 'no data found', 204 );
         }
@@ -736,6 +828,17 @@ export const trialApproval = async ( req, res ) => {
           await sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
         }
       }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Trial Approved',
+        changes: [ 'status' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -786,6 +889,17 @@ export const trialExtendRequestApproval = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Trial Extend Approved',
+        changes: [ 'status' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'Trial Extended Successfully' );
     } ).catch( ( e ) => {
       logger.error( { error: e, function: 'trialExtendRequestApproval' } );
@@ -852,8 +966,21 @@ export const productSubscribe = async ( req, res ) => {
       }
     }
     product = product.filter( ( item ) => !removeProducts.includes( item.productName ) );
+    // req.body = {
+    //   'camaraPerSqft': clientInfo.planDetails.storeSize,
+    //   'storesCount': clientInfo.planDetails.totalStores,
+    //   'planName': clientInfo.planDetails.subscriptionPeriod,
+    //   'products': product.map( ( item ) => item.productName ),
+    //   'currencyType': 'rupees',
+    // };
+    // let pricingDetails = await calculatePricing( req, res );
+    // clientInfo.price = pricingDetails.price;
+    if ( product.length > 1 ) {
+      clientInfo.planDetails.subscriptionType = 'premium';
+    }
     clientInfo.planDetails.product = product;
     clientInfo.save().then( async () => {
+      updatePricing( req, res, true );
       let userDetails= await userService.findOne( { clientId: clientInfo.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         let data = {
@@ -872,6 +999,17 @@ export const productSubscribe = async ( req, res ) => {
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
     } );
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Product subscribe and unsubscribe',
+      changes: [ 'Plan Details' ],
+      eventType: 'update',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     return res.sendSuccess( 'Product Subscribed Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'updateProductSubscribe' } );
@@ -910,6 +1048,17 @@ export const unsubscribeApproval = async ( req, res ) => {
           sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
         }
       }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Unsubscribed Approved',
+        changes: [ 'status' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'updated Successfully' );
     } );
   } catch ( e ) {
@@ -1177,6 +1326,7 @@ export const addStoreProduct = async ( req, res ) => {
     clientInfo.planDetails.product = clientProduct;
     clientInfo.save();
     storeDetails.forEach( async ( item ) => {
+      updatePricing( req, res, true );
       let product;
       if ( item?.product?.length ) {
         product = item.product.concat( storeProduct );
@@ -1194,6 +1344,17 @@ export const addStoreProduct = async ( req, res ) => {
       }
       await storeService.updateOne( { storeId: item.storeId, clientId: req.body.clientId }, { product: product } );
     } );
+    const logObj = {
+      clientId: req.body.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'billing',
+      logSubType: 'Store Prosuct Addition',
+      changes: [ 'product' ],
+      eventType: 'update',
+    };
+    insertOpenSearchData( 'tango-retail-activity-logs', logObj );
     return res.sendSuccess( 'product updated Successfully' );
   } catch ( e ) {
     logger.error( { error: e, function: 'addStoreProduct' } );
@@ -1406,7 +1567,7 @@ export const priceList = async ( req, res ) => {
     } );
     data = temp;
     let discountPrice = totalProductPrice - totalnegotiatePrice;
-    let discountPercentage = totalnegotiatePrice > 0 ? ( totalnegotiatePrice / totalProductPrice ) * 100 : 0;
+    let discountPercentage = discountPrice > 0 ? ( discountPrice / totalProductPrice ) * 100 : 0;
     let gstAmount = discountTotalPrice * ( 18 / 100 );
     let finalValue = parseFloat( discountTotalPrice ) + gstAmount;
     let result = {
@@ -1430,69 +1591,12 @@ export const priceList = async ( req, res ) => {
 export const pricingListUpdate = async ( req, res ) => {
   try {
     let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
-    let baseProduct = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
     if ( !getPriceInfo ) {
       if ( !req.body.client.planDetails.product.length ) {
         return res.sendError( 'no product found', 204 );
       }
-      let products = req.body.client.planDetails.product.map( ( item ) => item.productName );
-      let standardList = [];
-      let stepList = [];
-      products.forEach( ( product ) => {
-        let baseDetails = baseProduct.basePricing.find( ( item ) => item.productName == product );
-        let discountPrice = ( baseDetails.basePrice * baseDetails.discoutPercentage ) / 100;
-        standardList.push(
-            {
-              productName: product,
-              discountPercentage: baseDetails.discoutPercentage,
-              basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
-            },
-        );
-        stepList.push(
-            {
-              productName: product,
-              discountPercentage: baseDetails.discoutPercentage,
-              basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
-              storeRange: '1-100',
-            },
-        );
-      } );
-      let data = {
-        standard: standardList,
-        step: stepList,
-        clientId: req.body.clientId,
-      };
-      await basePricingService.create( data );
-      let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
-      if ( clientDetails ) {
-        let product = [];
-        let clientId = req.body.clientId;
-        clientDetails.planDetails.product.forEach( ( item ) => {
-          product.push( {
-            productName: item.productName,
-            status: 'trial',
-            trialStartDate: new Date(),
-            trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
-          } );
-        } );
-        req.body = {
-          'camaraPerSqft': clientDetails.planDetails.storeSize,
-          'storesCount': clientDetails.planDetails.totalStores,
-          'planName': clientDetails.planDetails.subscriptionPeriod,
-          'products': product.map( ( item ) => item.productName ),
-          'currencyType': 'rupees',
-        };
-        let pricingDetails = await calculatePricing( req, res );
-        let details = {
-          'priceType': 'standard',
-          'planDetails.paymentStatus': clientDetails?.subscriptionType == 'free' ? 'free' : 'trial',
-          'planDetails.product': product,
-          'price': pricingDetails.price,
-        };
-        await paymentService.updateOne( { clientId: clientId }, details );
-      }
+      updatePricing( req, res, false );
+
       return res.sendSuccess( 'Pricig Updated Successfully' );
     }
     if ( getPriceInfo && !req.body?.products?.length ) {
@@ -1521,7 +1625,7 @@ export const pricingListUpdate = async ( req, res ) => {
       getPriceInfo.step = req.body.products;
     }
     getPriceInfo.save().then( async () => {
-      let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
+      let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
       if ( userDetails ) {
         const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/revisedPriceEmail.hbs', 'utf8' );
         const template = Handlebars.compile( templateHtml );
@@ -1535,7 +1639,24 @@ export const pricingListUpdate = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
-
+      let keys = [];
+      if ( req.body.type == 'standard' ) {
+        keys = [ 'productName', 'discountPercentage', 'basePrice', 'negotiatePrice' ];
+      }
+      if ( req.body.type == 'standard' ) {
+        keys = [ 'productName', 'discountPercentage', 'basePrice', 'negotiatePrice', 'storeRange' ];
+      }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Update Product Pricing Details',
+        changes: keys,
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );
   } catch ( e ) {
@@ -1544,6 +1665,78 @@ export const pricingListUpdate = async ( req, res ) => {
   }
 };
 
+
+async function updatePricing( req, res, update ) {
+  let baseProduct = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
+  let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
+  if ( clientDetails ) {
+    let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
+    let standardList = [];
+    let stepList = [];
+    products.forEach( ( product ) => {
+      let baseDetails = baseProduct.basePricing.find( ( item ) => item.productName == product );
+      let discountPrice = ( baseDetails.basePrice * baseDetails.discoutPercentage ) / 100;
+      standardList.push(
+          {
+            productName: product,
+            discountPercentage: baseDetails.discoutPercentage,
+            basePrice: baseDetails.basePrice,
+            negotiatePrice: baseDetails.basePrice - discountPrice,
+          },
+      );
+      stepList.push(
+          {
+            productName: product,
+            discountPercentage: baseDetails.discoutPercentage,
+            basePrice: baseDetails.basePrice,
+            negotiatePrice: baseDetails.basePrice - discountPrice,
+            storeRange: '1-100',
+          },
+      );
+    } );
+    let data = {
+      standard: standardList,
+      step: stepList,
+      clientId: req.body.clientId,
+    };
+    if ( !update ) {
+      await basePricingService.create( data );
+    } else {
+      delete data.clientId;
+      await basePricingService.updateOne( { clientId: req.body.clientId }, data );
+    }
+    let product = [];
+    let clientId = req.body.clientId;
+    if ( !update ) {
+      clientDetails.planDetails.product.forEach( ( item ) => {
+        product.push( {
+          productName: item.productName,
+          status: 'trial',
+          trialStartDate: new Date(),
+          trialEndDate: new Date( dayjs().add( 13, 'days' ).format( 'YYYY-MM-DD' ) ),
+        } );
+      } );
+    } else {
+      product = clientDetails.planDetails.product;
+    }
+    req.body = {
+      'camaraPerSqft': clientDetails.planDetails.storeSize,
+      'storesCount': clientDetails.planDetails.totalStores,
+      'planName': clientDetails.planDetails.subscriptionPeriod,
+      'products': product.map( ( item ) => item.productName ),
+      'currencyType': 'rupees',
+    };
+    let pricingDetails = await calculatePricing( req, res );
+    let details = {
+      'priceType': 'standard',
+      'planDetails.paymentStatus': clientDetails?.subscriptionType == 'free' ? 'free' : 'trial',
+      'planDetails.product': product,
+      'price': pricingDetails.price,
+    };
+    await paymentService.updateOne( { clientId: clientId }, details );
+  }
+}
+
 export const updatedRevisedPrice = async ( req, res ) => {
   try {
     let invoiceDetails = await invoiceService.findOne( { invoice: req.body.invoice } );
@@ -1568,6 +1761,17 @@ export const updatedRevisedPrice = async ( req, res ) => {
         };
         sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
       }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'billing',
+        logSubType: 'Revised Price Updation',
+        changes: [ 'amount', 'revisedAmount', 'discount' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'Credit notes Updated Successfully' );
     } );
   } catch ( e ) {
@@ -1578,7 +1782,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
 
 export const unpaidInvoiceList = async ( req, res ) => {
   try {
-    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 } );
+    let invoiceDetails = await invoiceService.find( { clientId: req.params.clientId, status: { $nin: [ 'Payment Received', 'trial', 'free' ] } }, { invoice: 1, status: 1, amount: 1, revisedAmount: 1, totalAmount: 1, discount: 1 } );
     if ( !invoiceDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }

package/src/docs/payment.docs.js

@@ -0,0 +1,123 @@
+
+
+import * as schema from '../dtos/validation.dtos.js';
+import j2s from 'joi-to-swagger';
+
+export const paymentDoc = {
+  '/v3/paymentSubscription/addBilling': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Add Billing Details',
+      operationId: '',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateBillingSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Billing Details Updated Successfully.' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+
+  '/v3/paymentSubscription/clientBillingSubscriptionInfo/{clientId}': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'Get Client Details',
+      operationId: '',
+      parameters: [
+        {
+          in: 'path',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Get Client Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+
+  '/v3/paymentSubscription/basePricing': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Client pricing Details',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateProductsSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Get Client pricing Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+
+  '/v3/paymentSubscription/update/subscription/{clientId}': {
+    put: {
+      tags: [ 'payment' ],
+      description: 'Update Subscription CLients',
+      operationId: '',
+      parameters: [
+        {
+          in: 'path',
+          name: 'clientId',
+          schema: {
+            type: 'string',
+          },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateUpdateSubscriptionSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Subscription Details Updated Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+
+  '/v3/paymentSubscription/getTrialProducts': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'Get Trial Products Details',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Get Trial Products Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+
+
+};
+

package/src/dtos/validation.dtos.js

@@ -1,160 +1,193 @@
 import joi from 'joi';
 
+export const validateBillingSchema = joi.object( {
+  clientId: joi.string().required(),
+  gstNo: joi.string().required(),
+  billingAddress: joi.string().required(),
+} );
+
 export const validateBillingParams = {
-  body: joi.object( {
-    clientId: joi.string().required(),
-    gstNo: joi.string().required(),
-    billingAddress: joi.string().required(),
-  } ),
+  body: validateBillingSchema,
 };
 
+export const validateBrandSchema = joi.object( {
+  clientId: joi.string().required(),
+} );
+
 export const validateBrandParams = {
-  params: joi.object( {
-    clientId: joi.string().required(),
-  } ),
+  params: validateBrandSchema,
 };
 
+export const validateStoreSchema = joi.object( {
+  clientId: joi.string().required(),
+} );
+
 export const validateStoreParams = {
-  query: joi.object( {
-    clientId: joi.string().required(),
-  } ),
+  query: validateStoreSchema,
 };
 
+export const validateProductListSchema = joi.object( {
+  clientId: joi.string().required(),
+  sortColumn: joi.string().required(),
+  sortBy: joi.number().required(),
+} );
+
 export const validateProductListParams = {
-  query: joi.object( {
-    clientId: joi.string().required(),
-    sortColumn: joi.string().required(),
-    sortBy: joi.number().required(),
-  } ),
+  query: validateProductListSchema,
 };
 
+export const validateProductsSchema = joi.object( {
+  camaraPerSqft: joi.string().required(),
+  currencyType: joi.string().required(),
+  planName: joi.string().required(),
+  products: joi.array().required(),
+  storesCount: joi.string().required(),
+} );
+
 export const validateProducts = {
-  body: joi.object( {
-    camaraPerSqft: joi.string().required(),
-    currencyType: joi.string().required(),
-    planName: joi.string().required(),
-    products: joi.array().required(),
-    storesCount: joi.string().required(),
-  } ),
+  body: validateProductsSchema,
 };
 
+export const validateunsubscribeSchema = joi.object( {
+  reason: joi.string().required(),
+  description: joi.string().optional().empty( '' ),
+  clientId: joi.string().required(),
+} );
+
 export const validateunsubscribeParams = {
-  body: joi.object( {
-    reason: joi.string().required(),
-    description: joi.string().optional().empty( '' ),
-    clientId: joi.string().required(),
-  } ),
+  body: validateunsubscribeSchema,
 };
 
+export const validateTrialExtendandSubscibeSchema = joi.object( {
+  product: joi.string().required(),
+  clientId: joi.string().required(),
+} );
+
 export const validateTrialExtendandSubscibeParams = {
-  body: joi.object( {
-    product: joi.string().required(),
-    clientId: joi.string().required(),
-  } ),
+  body: validateTrialExtendandSubscibeSchema,
 };
 
+export const validateSubscibeSchema = joi.object( {
+  product: joi.array().required(),
+  clientId: joi.string().required(),
+} );
+
 export const validateSubscibeParams = {
-  body: joi.object( {
-    product: joi.array().required(),
-    clientId: joi.string().required(),
-  } ),
+  body: validateSubscibeSchema,
 };
 
+export const validateTrialandUnsubscribeSchema = joi.object( {
+  id: joi.string().required(),
+  type: joi.string().required(),
+} );
+
 export const validateTrialandUnsubscribeParams = {
-  body: joi.object( {
-    id: joi.string().required(),
-    type: joi.string().required(),
-  } ),
+  body: validateTrialandUnsubscribeSchema,
 };
 
+export const validateTrialExtendRequestSchema = joi.object( {
+  clientId: joi.string().required(),
+  days: joi.number().required(),
+  product: joi.string().required(),
+} );
 
 export const validateTrialExtendRequestParams = {
-  body: joi.object( {
-    clientId: joi.string().required(),
-    days: joi.number().required(),
-    product: joi.string().required(),
-  } ),
+  body: validateTrialExtendRequestSchema,
 };
 
+export const validateStoreViewSchema = joi.object( {
+  limit: joi.number().required(),
+  offset: joi.number().required(),
+  clientId: joi.string().required(),
+  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(),
+} );
 
 export const validateStoreViewParams = {
-  body: joi.object( {
-    limit: joi.number().required(),
-    offset: joi.number().required(),
-    clientId: joi.string().required(),
-    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(),
-  } ),
+  body: validateStoreViewSchema,
 };
 
+export const validateAddStoreProductSchema = joi.object( {
+  clientId: joi.string().required(),
+  store: joi.array().required().empty(),
+  product: joi.array().required(),
+  selectAll: joi.boolean().optional(),
+} );
+
 export const validateAddStoreProductParams = {
-  body: joi.object( {
-    clientId: joi.string().required(),
-    store: joi.array().required().empty(),
-    product: joi.array().required(),
-    selectAll: joi.boolean().optional(),
-  } ),
+  body: validateAddStoreProductSchema,
 };
 
+export const validateInvoiceSchema = joi.object( {
+  limit: joi.number().required(),
+  offset: joi.number().required(),
+  searchValue: joi.string().optional().empty( '' ),
+  filter: joi.string().optional(),
+  sortColumn: joi.string().optional(),
+  sortBy: joi.number().optional(),
+  clientId: joi.string().required(),
+  export: joi.boolean().optional(),
+} );
 
 export const validateInvoiceParams = {
-  body: joi.object( {
-    limit: joi.number().required(),
-    offset: joi.number().required(),
-    searchValue: joi.string().optional().empty( '' ),
-    filter: joi.string().optional(),
-    sortColumn: joi.string().optional(),
-    sortBy: joi.number().optional(),
-    clientId: joi.string().required(),
-    export: joi.boolean().optional(),
-  } ),
+  body: validateInvoiceSchema,
 };
 
+export const validatePriceSchema = joi.object( {
+  type: joi.string().optional(),
+  clientId: joi.string().required(),
+  products: joi.array().optional(),
+} );
+
 export const validatePriceParams = {
-  body: joi.object( {
-    type: joi.string().optional(),
-    clientId: joi.string().required(),
-    products: joi.array().optional(),
-  } ),
+  body: validatePriceSchema,
 };
 
+export const revisedSchema = joi.object( {
+  invoice: joi.string().required(),
+  revisedAmount: joi.number().required(),
+  discount: joi.number().required(),
+} );
+
 export const revisedParams = {
-  body: joi.object( {
-    invoice: joi.string().required(),
-    revisedAmount: joi.number().required(),
-    discount: joi.number().required(),
-  } ),
+  body: revisedSchema,
 };
 
 
+export const validatePriceListSchema = joi.object( {
+  priceType: joi.string().required(),
+  clientId: joi.string().required(),
+} );
+
 export const validatePriceListParams = {
-  body: joi.object( {
-    priceType: joi.string().required(),
-    clientId: joi.string().required(),
-  } ),
+  body: validatePriceListSchema,
 };
 
+export const validateStoreProductsSchema = joi.object( {
+  clientId: joi.string().required(),
+  store: joi.array().required().empty(),
+} );
+
 export const validateStoreProductsParams = {
-  body: joi.object( {
-    clientId: joi.string().required(),
-    store: joi.array().required().empty(),
-  } ),
-};
-
-export const validateUpdateSubscriptionSchema = {
-  body: joi.object( {
-    clientId: joi.string().required(),
-    price: joi.number().required(),
-    priceType: joi.string().required(),
-    subscriptionType: joi.string().required(),
-    subscriptionPeriod: joi.string().required(),
-    totalCamera: joi.number().required(),
-    totalStores: joi.string().required(),
-    storeSize: joi.string().required(),
-    products: joi.array().required(),
-  } ),
+  body: validateStoreProductsSchema,
+};
+
+export const validateUpdateSubscriptionSchema =joi.object( {
+  clientId: joi.string().required(),
+  price: joi.number().required(),
+  priceType: joi.string().required(),
+  subscriptionType: joi.string().required(),
+  subscriptionPeriod: joi.string().required(),
+  totalCamera: joi.number().required(),
+  totalStores: joi.string().required(),
+  storeSize: joi.string().required(),
+  products: joi.array().required(),
+} );
+
+export const validateUpdateSubscriptionParams = {
+  body: validateUpdateSubscriptionSchema,
 };

package/src/routes/paymentSubscription.routes.js

@@ -24,7 +24,7 @@ paymentSubscriptionRouter.put( '/update/subscription/:clientId', isAllowedSessio
   userType: [ 'tango', 'client' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
-} ), validate( validationDtos.validateUpdateSubscriptionSchema ), validateClient, paymentController.updateSubscription );
+} ), validate( validationDtos.validateUpdateSubscriptionParams ), validateClient, paymentController.updateSubscription );
 
 paymentSubscriptionRouter.get( '/getTrialProducts', isAllowedSessionHandler, authorize( {
   userType: [ 'tango', 'client' ], access: [
@@ -84,13 +84,13 @@ paymentSubscriptionRouter.post( '/admin/subscribeproduct', isAllowedSessionHandl
   userType: [ 'tango' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
-} ), validate( validationDtos.validateSubscibeParams ), paymentController.productSubscribe );
+} ), validate( validationDtos.validateSubscibeParams ), validateClient, paymentController.productSubscribe );
 
 paymentSubscriptionRouter.post( '/admin/unsubscribeApproval', isAllowedSessionHandler, authorize( {
   userType: [ 'tango' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
-} ), validate( validationDtos.validateTrialandUnsubscribeParams ), paymentController.unsubscribeApproval );
+} ), validate( validationDtos.validateTrialandUnsubscribeParams ), validateClient, paymentController.unsubscribeApproval );
 
 paymentSubscriptionRouter.get( '/admin/getProductViewList', isAllowedSessionHandler, authorize( {
   userType: [ 'tango' ], access: [

package/src/services/basePrice.service.js

@@ -16,3 +16,7 @@ export const create = ( record ) => {
   return model.basePricingModel.create( record );
 };
 
+export const updateOne = ( query, record ) => {
+  return model.basePricingModel.updateOne( query, { $set: record } );
+};
+