tango-app-api-payment-subscription 3.0.26-dev → 3.0.27-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.26-dev",
+    "version": "3.0.27-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.0",
         "pdfmake": "^0.2.10",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.62",
+        "tango-api-schema": "^2.0.78",
         "tango-app-api-middleware": "^1.0.49-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/paymentSubscription.controllers.js

@@ -2,11 +2,13 @@
 /* eslint-disable new-cap */
 import { logger, download, sendEmailWithSES, appConfig, insertOpenSearchData } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
+import * as basePriceService from '../services/basePrice.service.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 * as userService from '../services/user.service.js';
+import * as dailyPriceService from '../services/dailyPrice.service.js';
 import dayjs from 'dayjs';
 import Handlebars from 'handlebars';
 import fs from 'fs';
@@ -73,7 +75,7 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
           price: 1,
           priceType: 1,
           virtualAccount: 1,
-          // paymentInvoice: 1,
+          paymentInvoice: 1,
         },
       },
       {
@@ -199,7 +201,8 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     currentPlanInfo.expiredProducts = expiredProducts || '--';
     currentPlanInfo.product = activeProducts || '--';
     currentPlanInfo.pendingClientRequest = getPCR;
-
+    currentPlanInfo.currencyType = clientInfo[0].paymentInvoice.currencyType;
+    currentPlanInfo.dollarPrice = await convertINRtoUSD( clientInfo[0].price );
     let data = {
       _id: clientInfo[0]._id,
       clientId: clientInfo[0].clientId,
@@ -472,6 +475,8 @@ export const updateSubscription = async ( req, res ) => {
     await storeService.updateMany( { clientId: req.params.clientId, status: 'active' }, { product: storeProduct } );
 
     if ( result.modifiedCount ) {
+      req.body.clientId = req.params.clientId;
+      updatePricing( req, res, true );
       return res.sendSuccess( { message: 'Subscription Updated Successfully' } );
     } else {
       return res.sendError( 'Something went wrong', 500 );
@@ -939,6 +944,7 @@ export const productSubscribe = async ( req, res ) => {
       if ( productList.includes( item.name ) && item.type =='unsubscribe' ) {
         // let findIndex = product.findIndex( ( product ) => product.productName );
         // product.splice( findIndex, 1 );
+        // let requestDetails = await clientRequestService.findOne({});
         await storeService.addremoveElement( { clientId: clientInfo.clientId, status: 'active', product: { $in: item.name } }, { $pull: { product: item.name } } );
       }
       if ( !productList.includes( item.name ) && [ 'trial', 'subscription' ].includes( item.type ) ) {
@@ -1627,6 +1633,11 @@ export const pricingListUpdate = async ( req, res ) => {
       getPriceInfo.step = req.body.products;
     }
     getPriceInfo.save().then( async () => {
+      let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { priceType: 1 } );
+      clientDetails.priceType = req.body.type;
+
+      clientDetails.save();
+
       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' );
@@ -1670,6 +1681,7 @@ export const pricingListUpdate = async ( req, res ) => {
 
 async function updatePricing( req, res, update ) {
   let baseProduct = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
+  let getPriceInfo = await basePricingService.findOne( { clientId: { $exists: true }, clientId: req.body.clientId }, { standard: 1, step: 1 } );
   let clientDetails = await paymentService.findOne( { clientId: req.body.clientId } );
   if ( clientDetails ) {
     let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
@@ -1701,7 +1713,7 @@ async function updatePricing( req, res, update ) {
       step: stepList,
       clientId: req.body.clientId,
     };
-    if ( !update ) {
+    if ( !getPriceInfo ) {
       await basePricingService.create( data );
     } else {
       delete data.clientId;
@@ -1788,6 +1800,7 @@ export const unpaidInvoiceList = async ( req, res ) => {
     if ( !invoiceDetails.length ) {
       return res.sendError( 'no data found', 204 );
     }
+
     return res.sendSuccess( invoiceDetails );
   } catch ( e ) {
     logger.error( { error: e, function: 'unpaidInvoiceList' } );
@@ -1930,9 +1943,32 @@ export const getExpiredClients = async ( req, res ) => {
 
 export const invoiceDownload = async ( req, res ) => {
   try {
+    let invoiceDetails;
+    let invoiceInfo = await invoiceService.findOne( { _id: req.params.invoiceId } );
+    if ( invoiceInfo ) {
+      let clientDetails = await paymentService.findOne( { clientId: invoiceInfo.clientId } );
+      let amount = 0;
+      invoiceInfo.products.forEach( ( item ) => {
+        amount = amount + item.price;
+      } );
+      let invoiceDate= dayjs( invoiceInfo.createdAt ).format( 'DD MMM, YYYY' );
+      let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
+      let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD MMM, YYYY' ) : dayjs().add( days, 'days' ).format( 'DD MMM, YYYY' );
+      invoiceDetails = {
+        ...invoiceInfo._doc,
+        clientName: clientDetails.clientName,
+        extendDays: clientDetails.paymentInvoice.extendPaymentPeriodDays,
+        address: clientDetails.billingDetails.billingAddress,
+        amount: amount,
+        // total: ( amount + ( parseFloat( amount ) * 0.19 ) ).toFixed( 2 ),
+        total: amount.toFixed( 2 ),
+        invoiceDate,
+        dueDate,
+      };
+    }
     const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/invoicePdf.hbs', 'utf8' );
     const template = Handlebars.compile( templateHtml );
-    const html = template( { data: '' } );
+    const html = template( { data: invoiceDetails } );
     let fonts = {
       Helvetica: {
         normal: 'Helvetica',
@@ -1945,8 +1981,8 @@ export const invoiceDownload = async ( req, res ) => {
 
     let { window } = new JSDOM( '' );
     const htmlTemplate = htmlToPdfmake( html, { window: window, tableAutoSize: true } );
-
     const docDefinition = {
+      pageMargins: [ 40, 0, 40, 40 ],
       content: htmlTemplate,
       defaultStyle: {
         font: 'Helvetica',
@@ -1973,12 +2009,25 @@ export const updateInvoiceStatus = async ( req, res ) => {
       return res.sendError( 'no data found', 204 );
     }
     invoiceDetails.status = req.body?.status || 'Payment Received';
+    invoiceDetails.paymentType = req.body?.paymentType;
+    invoiceDetails.paymentReferenceId = req.body?.paymentReferenceId || '';
     invoiceDetails.save().then( async () => {
       let clientInfo = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
       if ( clientInfo ) {
         clientInfo.planDetails.paymentStatus = 'paid';
         clientInfo.save();
       }
+      const logObj = {
+        clientId: req.body.clientId,
+        userName: req.user?.userName,
+        email: req.user?.email,
+        date: new Date(),
+        logType: 'invoice',
+        logSubType: 'Invoice Status Updated to Paid',
+        changes: [ 'amount', 'paymentType', 'status' ],
+        eventType: 'update',
+      };
+      insertOpenSearchData( 'tango-retail-activity-logs', logObj );
       return res.sendSuccess( 'Invoice updated Successfully' );
     } );
   } catch ( e ) {
@@ -2023,3 +2072,195 @@ export const invoiceCreate = async ( req, res ) => {
     return res.sendError( e, 500 );
   }
 };
+
+export const dailyPricingInsert = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let requestClient = requestData.clientId;
+    if ( requestData.clientId && requestClient.length > 0 ) {
+      for ( let clientIndex = 0; clientIndex < requestClient.length; clientIndex++ ) {
+        let getClient = await paymentService.findOne( { clientId: requestClient[clientIndex], status: 'active' } );
+        if ( getClient ) {
+          let getBaseprice = await basePriceService.findOne( { clientId: requestClient[clientIndex] } );
+          let getStore = await storeService.find( { clientId: requestClient[clientIndex], status: 'active' } );
+          if ( getStore.length ) {
+            let storeList = [];
+            for ( let storeIndex = 0; storeIndex < getStore.length; storeIndex++ ) {
+              let productList = [];
+              let priceDetails = getClient.priceType == 'standard' ? getBaseprice.standard : getBaseprice.step;
+              for ( let storeProductIndex = 0; storeProductIndex < getStore[storeIndex].product.length; storeProductIndex++ ) {
+                let productDetails;
+                if ( getClient.priceType == 'standard' ) {
+                  productDetails = priceDetails.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                } else {
+                  productDetails = priceDetails.find( ( item ) => {
+                    let range = item.storeRange.split( '-' );
+                    if ( parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) ) {
+                      return ( item.productName == getStore[storeIndex].product[storeProductIndex] && parseInt( range[0] ) <= ( storeIndex + 1 ) && parseInt( range[1] ) >= ( storeIndex + 1 ) );
+                    }
+                  } );
+                  if ( !productDetails ) {
+                    let stepProductDetails = priceDetails.filter( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                    productDetails = stepProductDetails[stepProductDetails.length -1];
+                  }
+                }
+                let productStatus = getClient.planDetails.product.find( ( item ) => item.productName == getStore[storeIndex].product[storeProductIndex] );
+                if ( productDetails ) {
+                  let newObject = {
+                    productName: productDetails.productName,
+                    status: productStatus ? productStatus.status : '',
+                    price: productStatus ? [ 'trial', 'free' ].includes( productStatus.status ) ? 0 : productDetails.negotiatePrice : 0,
+                    featureStoreCount: storeIndex+1,
+                    basePrice: productDetails.negotiatePrice,
+                    ...( getClient.priceType == 'step' ? { storeRange: productDetails.storeRange } : { storeRange: 'standard' } ),
+                  };
+                  productList.push( newObject );
+                }
+              }
+              storeList.push(
+                  {
+                    storeId: getStore[storeIndex].storeId,
+                    products: productList,
+                  },
+              );
+              if ( storeIndex == getStore.length-1 ) {
+                let params = {
+                  clientId: requestClient[clientIndex],
+                  stores: storeList,
+                  dateISO: new Date( requestData.date ),
+                  dateString: dayjs( requestData.date ).format( 'YYYY-MM-DD' ),
+                };
+                await dailyPriceService.create( params );
+              }
+            }
+          }
+        }
+        if ( clientIndex == requestClient.length-1 ) {
+          return res.sendSuccess( 'Price Details Inserted Successfully' );
+        }
+      }
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'invoiceCreate' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+export const invoiceGenerate = async ( req, res ) => {
+  try {
+    let requestData = req.body;
+    let requestClient = requestData.clientId;
+    let start = new Date( requestData.fromDate );
+    let end = new Date( requestData.toDate );
+    let userTimezoneOffset = end.getTimezoneOffset() * 60000;
+    end = new Date( end.getTime() - userTimezoneOffset );
+    end.setUTCHours( 23, 59, 59, 59 );
+    for ( let clientIndex = 0; clientIndex < requestClient.length; clientIndex++ ) {
+      let getClient = await paymentService.findOne( { clientId: requestClient[clientIndex], status: 'active' } );
+      if ( getClient ) {
+        let query = [
+          {
+            $match: {
+              $and: [
+                { clientId: requestClient[clientIndex] },
+                { dateISO: { $gte: start, $lte: end } },
+              ],
+            },
+          },
+          {
+            $unwind: '$stores',
+          },
+          {
+            $unwind: '$stores.products',
+          },
+          {
+            $group: {
+              _id: { product: '$stores.products.productName', storeRange: '$stores.products.storeRange' },
+              price: { $sum: '$stores.products.price' },
+              count: { $sum: 1 },
+              basePrice: { $first: '$stores.products.basePrice' },
+            },
+          },
+          {
+            $project: {
+              _id: 0,
+              product: '$_id',
+              price: 1,
+              count: 1,
+              basePrice: 1,
+            },
+          },
+        ];
+        //  {
+        //     $facet: {
+        //       data: [
+        //         {
+        //           $unwind: '$stores',
+        //         },
+        //         {
+        //           $unwind: '$stores.products',
+        //         },
+        //         {
+        //           $group: {
+        //             _id: { product: '$stores.products.productName', storeRange: '$stores.products.storeRange' },
+        //             price: { $sum: '$stores.products.price' },
+        //           },
+        //         },
+        //         {
+        //           $project: {
+        //             _id: 0,
+        //             product: '$_id',
+        //             price: 1,
+        //           },
+        //         },
+        //       ],
+        //       count: [
+        //         {
+        //           $unwind: '$stores',
+        //         },
+        //         { $sort: { 'stores.products._id': -1 } },
+        //         { $project: { lastElement: { $arrayElemAt: [ '$stores.products', -1 ] } } },
+        //         { $project: {
+        //           count: '$lastElement.featureStoreCount',
+        //         },
+        //         },
+        //       ],
+        //     },
+        //   },
+        let invoiceDetails = await dailyPriceService.aggregate( query );
+        if ( !invoiceDetails.length ) {
+          return res.sendError( 'no data found', 204 );
+        }
+        let amount = 0;
+        invoiceDetails.forEach( ( item ) => {
+          amount = item.price + amount;
+        } );
+        let data = {
+          invoice: `invoice#${requestClient[clientIndex]}-${dayjs().format( 'MMM YYYY' )}`,
+          products: invoiceDetails,
+          status: 'pending',
+          amount: amount,
+          clientId: requestClient[clientIndex],
+          paymentMethod: getClient?.paymentInvoice?.paymentType || 'online',
+          billingDate: new Date(),
+        };
+
+        await invoiceService.create( data );
+        if ( clientIndex == requestClient.length-1 ) {
+          return res.sendSuccess( 'invocie Generated Succesfully' );
+        }
+      }
+    }
+  } catch ( e ) {
+    logger.error( { error: e, function: 'invoiceCreate' } );
+    return res.sendError( e, 500 );
+  }
+};
+
+function convertINRtoUSD( amountINR ) {
+  // Current exchange rate (1 INR = 0.012 USD)
+  const exchangeRate = 0.012;
+  // Convert INR to USD
+  const amountUSD = amountINR * exchangeRate;
+  return amountUSD;
+}

package/src/docs/payment.docs.js

@@ -367,5 +367,307 @@ export const paymentDocs = {
       },
     },
   },
+  '/paymentSubscription/admin/getStoreLocationList': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'Store Location List',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Store Location List view Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/admin/addStoreProduct': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Add Store Product',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateAddStoreProductSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Store Product Added Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/invoiceList': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Invoice List',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateInvoiceSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: '' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/admin/priceList': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Price List',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validatePriceListSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'PriceList Added Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/admin/pricing': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Pricing',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validatePriceSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Pricing Added Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/creditNotes': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Pricing',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.revisedSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'CreditNoted Updated Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/creditNotes/invoiceList/{clientId}': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'get Invoice List',
+      operationId: '',
+      parameters: [ {
+        in: 'path',
+        name: 'clientId',
+        schema: { type: 'string' },
+        required: true,
+      } ],
+      responses: {
+        200: { description: 'Get Invoice Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/admin/getStoreProducts': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Store Products',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateStoreProductsSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Store Products Updated Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/paymentSubscription/admin/getStoreProducts': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Store Products',
+      operationId: '',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          schema: { type: 'string' },
+          required: true,
+        },
+      ],
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( schema.validateStoreProductsSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Store Products Updated Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/v3/paymentSubscription/trialRemaindList': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'Get Trail Remind List',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+      },
+      responses: {
+        200: { description: 'Trail Remind List Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/v3/paymentSubscription/trialExpiredList': {
+    get: {
+      tags: [ 'payment' ],
+      description: 'Get Trail Expired List',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+      },
+      responses: {
+        200: { description: 'Trail Expired List Details Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/v3/paymentSubscription/invoiceDownload': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Invoice Download',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+      },
+      responses: {
+        200: { description: 'Invoice Downloaded Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/v3/paymentSubscription/invoiceStatusUpdate/{invoiceId}': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Invoice Status Update',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+      },
+      responses: {
+        200: { description: 'Invoice Status Updated Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
+  '/v3/paymentSubscription/invoice/create': {
+    post: {
+      tags: [ 'payment' ],
+      description: 'Get Invoice Create',
+      operationId: '',
+      parameters: [],
+      requestBody: {
+      },
+      responses: {
+        200: { description: 'Invoice Created Successfully' },
+        401: { description: 'Incorrect Update' },
+        422: { description: 'Field Error' },
+      },
+    },
+  },
 };
 

package/src/dtos/validation.dtos.js

@@ -191,3 +191,32 @@ export const validateUpdateSubscriptionSchema =joi.object( {
 export const validateUpdateSubscriptionParams = {
   body: validateUpdateSubscriptionSchema,
 };
+
+export const dailyPricingSchema = {
+  clientId: joi.array().required(),
+  date: joi.string().required(),
+};
+
+export const dailyPricingParams = {
+  body: dailyPricingSchema,
+};
+
+export const invoiceGenerateSchema = {
+  clientId: joi.array().required(),
+  fromDate: joi.string().required(),
+  toDate: joi.string().required(),
+};
+
+export const invoiceGenerateParams = {
+  body: invoiceGenerateSchema,
+};
+
+export const invoiceUpdateSchema = {
+  amount: joi.number().required(),
+  paymentType: joi.string().required(),
+  paymentReferenceId: joi.string().required(),
+};
+export const invoiceUpdateParams = {
+  body: invoiceUpdateSchema,
+};
+

package/src/hbs/invoicePdf.hbs

@@ -8,8 +8,8 @@
 
     <body>
         
-        <div class="frame-2372">
-            <div>
+        <div>
+            <div class="header">
                 <svg class="tango-eye-logo-color-option-03" width="230" height="57" viewBox="0 0 230 57" fill="none"
                     xmlns="http://www.w3.org/2000/svg">
                     <path d="M63.8252 13.75H83.127V15.9331H74.6799V40.3642H72.2484V15.9331H63.8252V13.75Z" fill="#0066CC"
@@ -46,47 +46,43 @@
                         </linearGradient>
                     </defs>
                 </svg>
-            </div>
-            <div class="header">
-                <table border="0" style="border:none">
+                <table border="0" style="border:none; margin-top:0px; !important">
                     <tr style="border:none">
                         <td style="width:50%;border:none">
                             <div style="font-size:20px;"><b>Tango Eye IT Solutions</b></div>
-                            <div class="margin-top:10px;">2nd Floor, Apeejay Business Centre,</div><div style="margin-top:10px;">No 12 Haddows Road, Nungambakkam</div>
-                            <div class="margin-top:10px;">Chennai Tamil Nadu 600006</div>
-                            <div class="margin-top:10px;">GSTIN 33AAGCT3124R1Z2</div>
+                            <div class="margin-top:0px;">2nd Floor, Apeejay Business Centre,</div>
+                            <div style="margin-top:0px;">No 12 Haddows Road, Nungambakkam</div>
+                            <div class="margin-top:0px;">Chennai Tamil Nadu 600006</div>
+                            <div class="margin-top:0px;">GSTIN 33AAGCT3124R1Z2</div>
                         </td>
                         <td style="width:50%;border:none;">
-                            <div style="font-size:20px"><b><span>Invoice</span><span style="font-color:#009bf3;"> #LK 0001/08/2023</span></b></div>
-                            <div style="font-size:15px;margin-left:60px;margin-top:10px;"><span>Invoice Date:</span><span>01 March , 2023</span></div>
-                            <div style="font-size:15px;margin-left:60px;margin-top:10px;"><span>Terms :</span><span>Net 30</span></div>
-                            <div style="font-size:15px;margin-left:60px;margin-top:10px;"><span>Due Date :</span><span>03 March , 2023</span></div>
+                            <div style="font-size:20px;margin-left:80px">
+                                <b> <span>Invoice </span>
+                                <span style="color:#009bf3 !important">{{data.invoice}}</span></b>
+                            </div>
+                            <div style="font-size:15px;margin-left:130px;margin-top:0px;"><span>Invoice Date: </span><span>{{data.invoiceDate}}</span></div>
+                            <div style="font-size:15px;margin-left:130px;margin-top:0px;"><span>Terms : </span><span>Due on Receipt</span></div>
+                            <div style="font-size:15px;margin-left:130px;margin-top:0px;"><span>Due Date : </span><span>{{data.dueDate}}</span></div>
                         </td>
                     </tr>
                 </table>
-            </div>
-            <div class="content-body"style="margin-top:0px;">
-                <table style="border:none">
-                    <tr style="border:none">
-                        <td style="width:50%;border:1px solid grey;">
-                            <div style="font-size:20px;">Bill to</div>
-                            <div class="margin-top:10px;">Tango Eye IT Solutions</div>
-                            <div style="margin-top:10px;">4517 Washington Ave Manchester , Kentucky 397899</div>
-                            <div class="margin-top:10px;">Issued On:</div>
-                            <div class="margin-top:10px;">11 March , 2023</div>
+                <table>
+                    <tr style="gap:60px;">
+                        <td style="width:50%;border:1px solid grey;margin-left:20px;border-radius:12px !important; position:relative">
+                            <div style="font-size:20px"><b>Bill to</b></div>
+                            <div style="font-size:15px;margin-top:0px">{{data.clientName}}</div>
+                            <div style="font-size:15px;margin-top:0px;line-height:2px;">{{data.address}}</div>
+                            <div style="font-size:15px;margin-top:0px">Issued On: {{data.invoiceDate}}</div>
                         </td>
-                        <td style="width:50%;border:1px solid grey;margin-left:30px;">
-                            <div style="font-size:20px;">Ship to</div>
-                            <div class="margin-top:10px;">Lenskart</div>
-                            <div style="margin-top:10px;">4517 Washington Ave Manchester , Kentucky 397899</div>
-                            <div class="margin-top:10px;">Issued On:</div>
-                            <div class="margin-top:10px;">11 March , 2023</div>
+                        <td style="width:50%;border:1px solid grey;margin-left:20px;border-radius:50%">
+                            <div style="font-size:20px"><b>Ship to</b></div>
+                            <div style="font-size:15px;margin-top:0px">{{data.clientName}}</div>
+                            <div style="font-size:15px;margin-top:0px;line-height:2px;">{{data.address}}</div>
+                            <div style="font-size:15px;margin-top:0px">Issued On: {{data.invoiceDate}}</div>
                         </td>
                     </tr>
                 </table>
-            </div>
-            <div class="content-table" style="margin-top:0px;">
-                <div class="font-weight:100px">Invoice Details:</div>
+                <div class="font-weight:100px"><b>Invoice Details:</b></div>
                 <table style="border:none">
                     <tr style="border:none;height:40px;margin-top:10px;">
                         <th style="width:300px;">Description</th>
@@ -94,78 +90,108 @@
                         <th style="width:120px;">Stores</th>
                         <th style="width:120px;">Total Amount</th>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
-                        <td>Traffic</td>
-                        <td>$0</td>
-                        <td>1</td>
-                        <td>$0</td>
+                    {{#each data.products}}
+                    <tr style="border:none;margin-top:10px;">
+                        <td>{{product.product}}</td>
+                        <td>${{basePrice}}</td>
+                        <td>{{count}}</td>
+                        <td>${{price}}</td>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
+                    {{/each}}
+                    <tr style="border:none;">
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;border-top: 5px solid #eaecf0;margin-top:10px;">
                         <td>Sub Total</td>
                         <td></td>
                         <td></td>
-                        <td>$0</td>
+                        <td>${{data.amount}}</td>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
+                    <tr style="border:none;margin-top:10px;">
                         <td>IGST</td>
                         <td></td>
                         <td></td>
-                        <td>9%</td>
+                        <td>0%</td>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
+                    <tr style="border:none;margin-top:10px;">
                         <td>Total</td>
                         <td></td>
                         <td></td>
-                        <td>$0</td>
+                        <td>${{data.total}}</td>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
+                    <tr style="border:none;margin-top:10px;">
                         <td>Discount</td>
                         <td></td>
                         <td></td>
                         <td>0%(-$0)</td>
                     </tr>
-                    <tr style="border:none;margin-top:30px;">
+                    <tr style="border:none;">
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;border-top: 5px solid #eaecf0;margin-top:10px;">
                         <td>Final Value</td>
                         <td></td>
                         <td></td>
-                        <td>0%</td>
+                        <td>${{data.total}}</td>
+                    </tr>
+                </table>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+<br/>
+                <table style="border:none">
+                   <tr style="border:none;margin-top:10px;">
+                        <td><b>Thanks for your business</b></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td>Beneficiary Name</td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td><b>Tango IT Solutions India Private Limited</b></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td>Account Number</td>
+                        <td>IFSC Code</td>
+                        <td>Payment Type</td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td><b>50200027441433</b></td>
+                        <td><b>HDFC0000269</b></td>
+                        <td><b>Virtual Ac</b></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td>SWIFT Code</td>
+                        <td>Branch</td>
+                        <td></td>
+                    </tr>
+                    <tr style="border:none;margin-top:10px;">
+                        <td><b>HDFCINBBCHE</b></td>
+                        <td><b>RS Puram, Coimbatore</b></td>
+                        <td></td>
                     </tr>
                 </table>
-            </div>
-            <div class="content-footer" style="margin-top:0px;">
-                <div class="font-weight:100px">Thanks for your business</div>
-                <div class="font-weight:100px">Beneficiary Name</div>
-                <div class="font-weight:100px">Tango IT Solutions India Private Limited</div>
-                <div class="font-weight:100px;margin-top:0px;">
-                    <table style="border:none;margin-top:0px;">
-                        <tr style="border:none">
-                            <td style="width:200px;">
-                                <div>Account Number </div>
-                                <div>50200027441433</div>
-                            </td>
-                            <td>
-                                <div>IFSC Code</div>
-                                <div>HDFC0000269</div>
-                            </td>
-                            <td>
-                                <div>Payment Type</div>
-                                <div>Virtual Acc</div>
-                            </td>
-                        </tr>
-                        <tr style="border:none">
-                            <td>
-                                <div>SWIFT Code</div>
-                                <div>HDFCINBBCHE</div>
-                            </td>
-                            <td>
-                                <div>Branch</div>
-                                <div>RS Puram, Coimbatore</div>
-                            </td>
-                            <td>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
             </div>
         </div>
     </body>

package/src/routes/paymentSubscription.routes.js

@@ -90,7 +90,7 @@ paymentSubscriptionRouter.post( '/admin/unsubscribeApproval', isAllowedSessionHa
   userType: [ 'tango' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
-} ), validate( validationDtos.validateTrialandUnsubscribeParams ), validateClient, paymentController.unsubscribeApproval );
+} ), validate( validationDtos.validateTrialandUnsubscribeParams ), paymentController.unsubscribeApproval );
 
 paymentSubscriptionRouter.get( '/admin/getProductViewList', isAllowedSessionHandler, authorize( {
   userType: [ 'tango' ], access: [
@@ -154,8 +154,8 @@ paymentSubscriptionRouter.post( '/admin/getStoreProducts', isAllowedSessionHandl
 
 paymentSubscriptionRouter.get( '/trialRemaindList', paymentController.getRemindClients );
 paymentSubscriptionRouter.get( '/trialExpiredList', paymentController.getExpiredClients );
-paymentSubscriptionRouter.post( '/invoiceDownload', paymentController.invoiceDownload );
-paymentSubscriptionRouter.post( '/invoiceStatusUpdate/:invoiceId', paymentController.updateInvoiceStatus );
+paymentSubscriptionRouter.post( '/invoiceDownload/:invoiceId', paymentController.invoiceDownload );
+paymentSubscriptionRouter.post( '/invoiceStatusUpdate/:invoiceId', validate( validationDtos.invoiceUpdateParams ), paymentController.updateInvoiceStatus );
 paymentSubscriptionRouter.post( '/invoice/create', validateClient, paymentController.invoiceCreate );
-
-
+paymentSubscriptionRouter.post( '/dailyPricing/insert', validate( validationDtos.dailyPricingParams ), paymentController.dailyPricingInsert );
+paymentSubscriptionRouter.post( '/invoiceGenerate', validate( validationDtos.invoiceGenerateParams ), paymentController.invoiceGenerate );

package/src/services/dailyPrice.service.js

@@ -0,0 +1,22 @@
+import model from 'tango-api-schema';
+
+export const aggregate = ( query = {} ) => {
+  return model.dailyPricingModel.aggregate( query );
+};
+
+export const find = ( query = {}, record = {} ) => {
+  return model.dailyPricingModel.find( query, record );
+};
+
+export const findOne = ( query = {}, record = {} ) => {
+  return model.dailyPricingModel.findOne( query, record );
+};
+
+export const create = ( record ) => {
+  return model.dailyPricingModel.create( record );
+};
+
+export const updateOne = ( query, record ) => {
+  return model.dailyPricingModel.updateOne( query, { $set: record } );
+};
+

package/src/utils/validations/client.validation.js

@@ -14,7 +14,6 @@ export const validateClient = async ( req, res, next ) => {
     if ( req?.params?.clientId ) {
       data = req.params.clientId;
     }
-
     let clientDetails = await clientPayment.findOne( { clientId: data, status: 'active' } );
     if ( !clientDetails ) {
       return res.sendError( 'no data found', 204 );