tango-app-api-payment-subscription 3.1.15 → 3.1.16

package/package.json

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

package/src/controllers/invoice.controller.js

@@ -108,7 +108,7 @@ export async function createInvoice( req, res ) {
               $filter: {
                 input: '$stores',
                 as: 'item',
-                cond: { $gt: [ '$$item.daysDifference', 0 ] },
+                cond: { $and: [ { $gt: [ '$$item.daysDifference', 0 ] }, { $in: [ '$$item.storeId', group.stores ] } ] },
               },
             },
           },
@@ -210,9 +210,10 @@ export async function invoiceDownload( req, res ) {
         discountPercentage: invoiceInfo.discountPercentage ? invoiceInfo.discountPercentage : 0,
         discountAmount: invoiceInfo.discountAmount ? invoiceInfo.discountAmount : 0,
         logo: `${JSON.parse( process.env.URL ).apiDomain}/logo.png`,
+        uidomain: `${JSON.parse( process.env.URL ).domain}`,
         attachAnnexure: getgroup.attachAnnexure,
-        virtualaccountNumber: virtualAccount.accountNumber,
-        virtualifsc: virtualAccount.ifsc,
+        virtualaccountNumber: virtualAccount?virtualAccount?.accountNumber:'',
+        virtualifsc: virtualAccount?virtualAccount?.ifsc:'',
       };
       const currentMonthDays = dayjs().daysInMonth();
 

package/src/controllers/paymentSubscription.controllers.js

@@ -1113,13 +1113,13 @@ export const trialApproval = async ( req, res ) => {
             attachment: '',
             sourceEmail: JSON.parse( process.env.SES ).adminEmail,
           };
-          await sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
+          sendEmailWithSES( params.toEmail, params.mailSubject, params.htmlBody, params.attachment, params.sourceEmail );
         }
         let products = clientProducts.planDetails.product.map( ( item ) => {
           let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
           return firstWord.toLowerCase() + '_' + secondWord.toLowerCase();
         } );
-        await axios.get( `${JSON.parse( process.env.URL ).oldapidomain}/oldBrandGet/${requestData.clientId}`, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( async ( response ) => {
+        axios.get( `${JSON.parse( process.env.URL ).oldapidomain}/oldBrandGet/${requestData.clientId}`, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( async ( response ) => {
           let existsProducts = Object.keys( response.data.data.subscribed_features );
           existsProducts.forEach( ( item ) => {
             if ( products.includes( item ) ) {
@@ -1133,7 +1133,7 @@ export const trialApproval = async ( req, res ) => {
               response.data.data.subscribed_features[item] = true;
             }
           } );
-          await axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/oldBrandUpdate/${response.data.data._id}`, response.data.data, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( result ) => {
+          axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/oldBrandUpdate/${response.data.data._id}`, response.data.data, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( result ) => {
             logger.info( result.data );
           } ).catch( ( error ) => {
             logger.error( { error: error, function: 'old Product update' } );
@@ -1145,7 +1145,7 @@ export const trialApproval = async ( req, res ) => {
         storeProductDetails = storeProductDetails.map( ( item ) => {
           return { id: item.storeId, product: item.product };
         } );
-        await axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/oldBulkStoreUpdate`, storeProductDetails, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( response ) => {
+        axios.post( `${JSON.parse( process.env.URL ).oldapidomain}/oldBulkStoreUpdate`, storeProductDetails, { headers: { Authorization: 'Bearer d47433f8-9a33-47c7-ba43-1a0fbac28f66' } } ).then( ( response ) => {
           logger.info( 'store Updated Successfully' );
         } ).catch( ( error ) => {
           logger.error( { error: error, function: 'oldBulkStoreUpdate' } );
@@ -1588,8 +1588,9 @@ export const productViewList = async ( req, res ) => {
     let query = [
       {
         $match: {
-          clientId: req.query.clientId,
-          status: 'active',
+          'clientId': req.query.clientId,
+          'status': 'active',
+          'edge.firstFile': true,
         },
       },
       { $unwind: '$product' },
@@ -1653,8 +1654,9 @@ export const productViewList = async ( req, res ) => {
     //   }
     // } );
     let storecount = await storeService.count( {
-      clientId: req.query.clientId,
-      status: 'active',
+      'clientId': req.query.clientId,
+      'status': 'active',
+      'edge.firstFile': true,
     } );
     let totalSum = products.reduce( ( sum, product ) => sum + product.totalCost, 0 );
     let transaction = await paymentAccountService.findOneAccount( { clientId: req.query.clientId } );
@@ -1804,6 +1806,7 @@ export const addStoreProduct = async ( req, res ) => {
         } );
       }
     } );
+
     let clientInfo = await paymentService.findOne( { clientId: req.body.clientId }, { 'planDetails.product': 1, 'clientName': 1 } );
     let getClientCount = await paymentService.getClientCount( { status: 'active' } );
     let productList = clientInfo.planDetails.product.map( ( product ) => product.productName );
@@ -2221,8 +2224,9 @@ export const priceList = async ( req, res ) => {
     let query = [
       {
         $match: {
-          clientId: req.body.clientId,
-          status: 'active',
+          'clientId': req.body.clientId,
+          'status': 'active',
+          'edge.firstFile': true,
         },
       },
       { $unwind: '$product' },

package/src/dtos/validation.dtos.js

@@ -421,6 +421,7 @@ export const verifyPaymentBody = joi.object().keys( {
   razorpay_payment_id: joi.string().required(),
   razorpay_order_id: joi.string().required(),
   razorpay_signature: joi.string().required(),
+  status_code: joi.number().optional(),
 } );
 
 export const verifyPaymentValid = {