tango-app-api-payment-subscription 3.0.39-dev → 3.0.40-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-payment-subscription",
-    "version": "3.0.39-dev",
+    "version": "3.0.40-dev",
     "description": "paymentSubscription",
     "main": "index.js",
     "type": "module",
@@ -25,8 +25,8 @@
         "nodemon": "^3.1.0",
         "pdfmake": "^0.2.10",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.83",
-        "tango-app-api-middleware": "^1.0.2-test",
+        "tango-api-schema": "^2.0.89",
+        "tango-app-api-middleware": "^1.0.58-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/paymentSubscription.controllers.js

@@ -324,7 +324,7 @@ async function calculatePricing( req, res ) {
         }
         finalPrice = Math.ceil( finalPrice / 10 ) * 10; //  for round off to 10 position
         if ( input.currencyType && input.currencyType == 'dollar' ) {
-          dollerprice = ( ( finalPrice * 50 ) / 100 );
+          let dollerprice = ( ( finalPrice * 50 ) / 100 );
           finalPrice = ( dollerprice + finalPrice ) / 84;
           dollerpriceOriginal = ( ( OriginalPrice * 50 ) / 100 );
           OriginalPrice = ( dollerpriceOriginal + OriginalPrice ) / 84;
@@ -696,7 +696,7 @@ export const invoiceDetails = async ( req, res ) => {
 
 export const updateInvoiceDetails = async ( req, res ) => {
   try {
-    let clientInvoiceDetails = await paymentService.findOne( { clientId: req.params.clientId, status: 'active' }, { paymentInvoice: 1 } );
+    let clientInvoiceDetails = await paymentService.findOne( { clientId: req.params.clientId }, { paymentInvoice: 1 } );
     if ( !clientInvoiceDetails ) {
       return res.sendError( 'no data found', 204 );
     }
@@ -1580,6 +1580,11 @@ export const invoiceList = async ( req, res ) => {
         delete item.products;
       } );
     }
+    invoiceDetails[0].data.forEach( ( item ) => {
+      if ( req.body?.client?.paymentInvoice?.currencyType == 'dollar' ) {
+        item.amount = convertINRtoUSD( item.amount );
+      }
+    } );
     let data = {
       data: invoiceDetails[0].data,
       count: invoiceDetails[0].count[0].count,
@@ -1595,12 +1600,13 @@ export const invoiceList = async ( req, res ) => {
         if ( item.status == 'free' ) {
           item.amount = 'Free';
         }
+        item.products = item.products.map( ( item ) => item.product.product );
         exportData.push( {
           'Invoice': item.invoice,
           'Billing Date': item.billingDate,
           'Stores': item.stores,
           ...( req.user.userType == 'tango' ? { 'Products': item.products } : {} ),
-          'Amount': item.amount,
+          'Amount': req.body?.client?.paymentInvoice?.currencyType == 'dollar' ? item.amount : item.amount,
           ...( req.user.userType == 'client' ? { 'Payment Method': item.paymentMethod } : {} ),
           'Status': item.status,
         } );
@@ -1695,8 +1701,8 @@ export const priceList = async ( req, res ) => {
       } );
     } );
     data = temp;
-    let discountPrice = totalProductPrice - totalnegotiatePrice;
-    let discountPercentage = discountPrice > 0 ? ( discountPrice / totalProductPrice ) * 100 : 0;
+    let discountPrice = originalTotalPrice - discountTotalPrice;
+    let discountPercentage = discountPrice > 0 ? ( discountPrice / originalTotalPrice ) * 100 : 0;
     let gstAmount = discountTotalPrice * ( 18 / 100 );
     let finalValue = parseFloat( discountTotalPrice ) + gstAmount;
     let result = {
@@ -1738,6 +1744,11 @@ export const pricingListUpdate = async ( req, res ) => {
     if ( req.body?.products && req.body?.products?.length ) {
       productList = JSON.parse( JSON.stringify( req.body ) );
       let amount =0;
+      let origPrice=0;
+      let IGST = 18;
+      let CGST = 9;
+      let SGST = 9;
+      let gst = req.body.client.paymentInvoice.currencyType == 'dollar' ? IGST : ( CGST + SGST );
       productList.products.forEach( ( item ) => {
         let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
@@ -1746,17 +1757,28 @@ export const pricingListUpdate = async ( req, res ) => {
           item.basePrice = convertINRtoUSD( item.basePrice );
           item.price = convertINRtoUSD( item.price );
         }
-        if ( req.body.client.priceType == 'step' ) {
+        let count = item.storeCount;
+        if ( req.body.type == 'step' ) {
           item.storeCount = item.storeRange;
+          let rangeSplit = item.storeRange.split( '-' );
+          count = parseInt( rangeSplit[1] ) - parseInt( rangeSplit[0] );
         }
         amount = amount + item.price;
+        origPrice = origPrice + ( item.basePrice * count );
+        item.price = item.price.toFixed( 2 );
       } );
+      let discountAmount = origPrice - amount;
+      let discountPercentage = ( discountAmount / origPrice ) * 100;
       productList = {
         ...productList,
-        amount: amount,
+        amount: amount.toFixed( 2 ),
         currencyType: req.body.client.paymentInvoice.currencyType == 'dollar' ? '$' : '₹',
         total: amount.toFixed( 2 ),
-        discount: 0,
+        final: ( parseFloat( amount ) + parseFloat( ( amount * gst ) / 100 ) ).toFixed( 2 ),
+        discount: `${discountPercentage.toFixed( 2 )}% (-${discountAmount.toFixed( 2 )})`,
+        IGST: req.body.client.paymentInvoice.currencyType == 'dollar' ? IGST : 0,
+        CGST: req.body.client.paymentInvoice.currencyType == 'inr' ? CGST : 0,
+        SGST: req.body.client.paymentInvoice.currencyType == 'inr' ? SGST : 0,
       };
       req.body.products.forEach( ( item ) => {
         delete item.originalPrice;
@@ -1777,24 +1799,26 @@ 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 } );
+      let clientDetails = await paymentService.findOne( { clientId: req.body.clientId }, { priceType: 1, paymentInvoice: 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' );
-        const template = Handlebars.compile( templateHtml );
-        const html = template( { data: productList } );
-        let params = {
-          toEmail: userDetails.email,
-          mailSubject: 'Invoice Revised',
-          htmlBody: html,
-          attachment: '',
-          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
-        };
-        sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+      // let userDetails= await userService.findOne( { clientId: req.body.clientId, role: 'superadmin' } );
+      if ( clientDetails?.paymentInvoice?.paymentAgreementTo?.length ) {
+        clientDetails.paymentInvoice.paymentAgreementTo.forEach( ( email ) => {
+          const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/revisedPriceEmail.hbs', 'utf8' );
+          const template = Handlebars.compile( templateHtml );
+          const html = template( { data: productList } );
+          let params = {
+            toEmail: email,
+            mailSubject: 'Invoice Revised',
+            htmlBody: html,
+            attachment: '',
+            sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+          };
+          sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+        } );
       }
       let keys = [];
       if ( req.body.type == 'standard' ) {
@@ -1866,7 +1890,11 @@ async function updatePricing( req, res, update ) {
     }
     let product = [];
     let clientId = req.body.clientId;
+    let paymentInvoice = clientDetails.paymentInvoice;
     if ( !update ) {
+      let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
+      paymentInvoice.invoiceTo = [ userDetails.email ];
+      paymentInvoice.paymentAgreementTo = [ userDetails.email ];
       clientDetails.planDetails.product.forEach( ( item ) => {
         product.push( {
           productName: item.productName,
@@ -1900,6 +1928,7 @@ async function updatePricing( req, res, update ) {
       'planDetails.paymentStatus': clientDetails?.subscriptionType == 'free' ? 'free' : paymentStatus,
       'planDetails.product': product,
       'price': pricingDetails.price,
+      'paymentInvoice': paymentInvoice,
     };
     await paymentService.updateOne( { clientId: clientId }, details );
   }
@@ -1915,11 +1944,15 @@ export const updatedRevisedPrice = async ( req, res ) => {
     invoiceDetails.revisedAmount = req.body.revisedAmount;
     invoiceDetails.discount = req.body.discount;
     invoiceDetails.save().then( async () => {
-      let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
-      if ( userDetails ) {
+      let clientDetails = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
+      // let userDetails= await userService.findOne( { clientId: invoiceDetails.clientId, role: 'superadmin' } );
+      if ( clientDetails.paymentInvoice.invoiceTo.length ) {
         let invoiceInfo;
-        let clientDetails = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
         let amount = 0;
+        let IGST = 18;
+        let CGST = 9;
+        let SGST = 9;
+        let gst = clientDetails?.paymentInvoice?.currencyType == 'dollar' ? IGST : ( CGST + SGST );
         invoiceDetails.products.forEach( ( item ) => {
           let [ firstWord, secondWord ] = item.product.product.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
           firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
@@ -1936,6 +1969,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
         let invoiceDate= dayjs( invoiceDetails.createdAt ).format( 'DD MMM, YYYY' );
         let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
         let dueDate = invoiceDetails?.dueDate ? dayjs( invoiceDetails?.dueDate ).format( 'DD MMM, YYYY' ) : dayjs().add( days, 'days' ).format( 'DD MMM, YYYY' );
+        let discountAmount = ( amount * req.body.discount ) / 100;
         invoiceInfo = {
           ...invoiceDetails._doc,
           clientName: clientDetails.clientName,
@@ -1943,22 +1977,28 @@ export const updatedRevisedPrice = async ( req, res ) => {
           address: clientDetails.billingDetails.billingAddress,
           amount: amount.toFixed( 2 ),
           currencyType: clientDetails.paymentInvoice.currencyType == 'dollar' ? '$' : '₹',
-          discount: req.body.discount,
-          total: req.body.revisedAmount.toFixed( 2 ),
+          discount: `${req.body.discount.toFixed( 2 )}% (-${discountAmount.toFixed( 2 )})`,
+          total: ( parseFloat( amount ) + parseFloat( ( amount * gst ) / 100 ) ).toFixed( 2 ),
+          final: req.body.revisedAmount.toFixed( 2 ),
+          IGST: clientDetails.paymentInvoice.currencyType == 'dollar' ? IGST : 0,
+          CGST: clientDetails.paymentInvoice.currencyType == 'inr' ? CGST : 0,
+          SGST: clientDetails.paymentInvoice.currencyType == 'inr' ? SGST : 0,
           invoiceDate,
           dueDate,
         };
-        const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialCreditNoteEmail.hbs', 'utf8' );
-        const template = Handlebars.compile( templateHtml );
-        const html = template( { data: invoiceInfo } );
-        let params = {
-          toEmail: userDetails.email,
-          mailSubject: 'Credit Note',
-          htmlBody: html,
-          attachment: '',
-          sourceEmail: appConfig.cloud.aws.ses.adminEmail,
-        };
-        sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+        clientDetails.paymentInvoice.invoiceTo.forEach( ( email ) => {
+          const templateHtml = fs.readFileSync( path.resolve( path.dirname( '' ) ) + '/src/hbs/trialCreditNoteEmail.hbs', 'utf8' );
+          const template = Handlebars.compile( templateHtml );
+          const html = template( { data: invoiceInfo } );
+          let params = {
+            toEmail: email,
+            mailSubject: 'Credit Note',
+            htmlBody: html,
+            attachment: '',
+            sourceEmail: appConfig.cloud.aws.ses.adminEmail,
+          };
+          sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+        } );
       }
       const logObj = {
         clientId: req.body.clientId,

package/src/dtos/validation.dtos.js

@@ -192,39 +192,55 @@ export const validateUpdateSubscriptionParams = {
   body: validateUpdateSubscriptionSchema,
 };
 
-export const dailyPricingSchema = {
+export const dailyPricingSchema = joi.object( {
   clientId: joi.array().required(),
   date: joi.string().required(),
-};
+} );
 
 export const dailyPricingParams = {
   body: dailyPricingSchema,
 };
 
-export const invoiceGenerateSchema = {
+export const invoiceGenerateSchema = joi.object( {
   clientId: joi.array().required(),
   fromDate: joi.string().required(),
   toDate: joi.string().required(),
-};
+} );
 
 export const invoiceGenerateParams = {
   body: invoiceGenerateSchema,
 };
 
-export const invoiceUpdateSchema = {
+export const invoiceUpdateSchema = joi.object( {
   amount: joi.number().required(),
   paymentType: joi.string().required(),
   paymentReferenceId: joi.string().required(),
-};
+} );
+
 export const invoiceUpdateParams = {
   body: invoiceUpdateSchema,
 };
 
 
-export const invoiceRevisedSchema = {
+export const invoiceRevisedSchema = joi.object( {
   invoiceId: joi.string().required(),
-};
+} );
+
 export const invoiceRevisedParams = {
   params: invoiceRevisedSchema,
 };
 
+export const validateInvoiceUpdateSchema = joi.object( {
+  proRate: joi.string().required(),
+  paymenttype: joi.string().required(),
+  paymentCycle: joi.string().required(),
+  currencyType: joi.string().required(),
+  invoiceTo: joi.array().items( joi.string().email().message( 'Enter valid Email' ) ).required(),
+  paymentAgreementTo: joi.array().items( joi.string().email().message( 'Enter valid Email' ) ).required(),
+  invoiceOn: joi.string().required(),
+  extendPaymentPeriodDays: joi.number().required(),
+} );
+
+export const validateInvoiceUpdateParams = {
+  body: validateInvoiceUpdateSchema,
+};

package/src/hbs/revisedPriceEmail.hbs

@@ -211,7 +211,19 @@
                         <td class="invoicesub" style="padding-left:30px; line-height: 24px;">IGST</td>
                         <td></td>
                         <td></td>
-                        <td class="invoicesub">0%</td>
+                        <td class="invoicesub">{{data.IGST}}%</td>
+                    </tr>
+                    <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">CGST</td>
+                        <td></td>
+                        <td></td>
+                        <td class="invoicesub">{{data.CGST}}%</td>
+                    </tr>
+                    <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
+                        <td class="invoicesub" style="padding-left:30px; line-height: 24px;">SGST</td>
+                        <td></td>
+                        <td></td>
+                        <td class="invoicesub">{{data.SGST}}%</td>
                     </tr>
                     <tr bgcolor="#ffffff" style="border:none;margin-top:0px;">
                         <td class="invoicesub" style="padding-left:30px; line-height: 24px;">Total</td>
@@ -223,7 +235,7 @@
                         <td class="invoicesub" style="padding-left:30px; line-height: 24px;">Discount</td>
                         <td></td>
                         <td></td>
-                        <td class="invoicesub">{{data.discount}}%</td>
+                        <td class="invoicesub">{{data.discount}}</td>
                     </tr>
                     <tr>
                         <td colspan="4" align="left" bgcolor="#ffffff"
@@ -236,7 +248,7 @@
                         <td class="invoicesub" style="padding-left:30px; ">Final Value</td>
                         <td></td>
                         <td></td>
-                        <td class="invoicesub">{{data.currencyType}} {{data.total}}</td>
+                        <td class="invoicesub">{{data.currencyType}} {{data.final}}</td>
                     </tr>
                 </table>
             </td>

package/src/hbs/trialCreditNoteEmail.hbs

@@ -514,7 +514,19 @@
                                                 <td class="invoicesub">IGST</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td class="invoicesub">0%</td>
+                                                <td class="invoicesub">{{data.IGST}}%</td>
+                                            </tr>
+                                            <tr style="border:none;margin-top:10px;">
+                                                <td class="invoicesub">CGST</td>
+                                                <td></td>
+                                                <td></td>
+                                                <td class="invoicesub">{{data.CGST}}%</td>
+                                            </tr>
+                                            <tr style="border:none;margin-top:10px;">
+                                                <td class="invoicesub">SGST</td>
+                                                <td></td>
+                                                <td></td>
+                                                <td class="invoicesub">{{data.SGST}}%</td>
                                             </tr>
                                             <tr style="border:none;margin-top:10px;">
                                                 <td class="invoicesub">Total</td>
@@ -539,7 +551,7 @@
                                                 <td class="invoicesub">Final Value</td>
                                                 <td></td>
                                                 <td></td>
-                                                <td class="invoicesub">{{data.currencyType}} {{data.total}}</td>
+                                                <td class="invoicesub">{{data.currencyType}} {{data.final}}</td>
                                             </tr>
                                         </table>
                                     </td>

package/src/routes/paymentSubscription.routes.js

@@ -60,7 +60,7 @@ paymentSubscriptionRouter.put( '/update/InvoiceDetails/:clientId', isAllowedSess
   userType: [ 'tango' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
-} ), validate( validationDtos.validateBrandParams ), paymentController.updateInvoiceDetails );
+} ), validate( validationDtos.validateInvoiceUpdateParams ), paymentController.updateInvoiceDetails );
 
 paymentSubscriptionRouter.get( '/admin/notificationList', isAllowedSessionHandler, authorize( {
   userType: [ 'tango' ], access: [