tango-app-api-payment-subscription 3.0.17-dev → 3.0.18-dev

package/package.json

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

package/src/controllers/paymentSubscription.controllers.js

@@ -600,6 +600,7 @@ export const notificationList = async ( req, res ) => {
     query.status = 'pending';
     if ( req?.query?.clientId ) {
       query.clientId = req?.query?.clientId;
+      query.category = { $ne: 'TrialExtend' };
     }
     let notificationList = await clientRequestService.find( query, { createdAt: 0, updatedAt: 0 } );
     query = [
@@ -1222,6 +1223,21 @@ export const invoiceList = async ( req, res ) => {
       } );
     }
 
+    query.push( {
+      $project: {
+        _id: 1,
+        invoice: 1,
+        stores: 1,
+        billingDate: 1,
+        status: 1,
+        paymentMethod: 1,
+        amount: 1,
+        discount: 1,
+        revisedAmount: 1,
+        products: 1,
+      },
+    } );
+
     query.push(
         {
           $facet: {
@@ -1241,6 +1257,16 @@ export const invoiceList = async ( req, res ) => {
     if ( !invoiceDetails[0]?.data.length ) {
       return res.sendError( 'no data found', 204 );
     }
+    invoiceDetails[0].data.forEach( ( item ) => {
+      item.billingDate = dayjs( item.billingDate ).format( 'DD MMM, YYYY' );
+    } );
+    if ( req.user.userType == 'client' ) {
+      invoiceDetails[0].data.forEach( ( item ) => {
+        delete item.discount;
+        delete item.revisedAmount;
+        delete item.products;
+      } );
+    }
     let data = {
       data: invoiceDetails[0].data,
       count: invoiceDetails[0].count[0].count,
@@ -1248,6 +1274,16 @@ export const invoiceList = async ( req, res ) => {
     if ( !req.body.export ) {
       return res.sendSuccess( data );
     } else {
+      invoiceDetails[0].data.forEach( ( item ) => {
+        if ( item.status == 'trial' ) {
+          item.amount = 'Trial';
+        }
+        if ( item.status == 'free' ) {
+          item.amount = 'Free';
+        }
+        delete item._id;
+        delete item.paymentMethod;
+      } );
       download( invoiceDetails[0].data, res );
     }
   } catch ( e ) {
@@ -1378,7 +1414,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
             },
         );
         stepList.push(
@@ -1386,7 +1422,7 @@ export const pricingListUpdate = async ( req, res ) => {
               productName: product,
               discountPercentage: baseDetails.discoutPercentage,
               basePrice: baseDetails.basePrice,
-              negotiatePrice: baseDetails.basePrice - discountPrice,
+              negotiatePrice: discountPrice,
               storeRange: '1-100',
             },
         );
@@ -1661,7 +1697,7 @@ export const updateInvoiceStatus = async ( req, res ) => {
     if ( !invoiceDetails ) {
       return res.sendError( 'no data found', 204 );
     }
-    invoiceDetails.status = req.body?.status || 'paid';
+    invoiceDetails.status = req.body?.status || 'Payment Received';
     invoiceDetails.save().then( async () => {
       let clientInfo = await paymentService.findOne( { clientId: invoiceDetails.clientId } );
       if ( clientInfo ) {
@@ -1682,12 +1718,13 @@ export const invoiceCreate = async ( req, res ) => {
     let products = req.body.client.planDetails.product.map( ( item ) => item.productName );
     let storeDetails = await storeService.count( { clientId: req.body.clientId, status: 'active' } );
     let data;
+    let clientId = req.body.clientId;
     data = {
       invoice: `invoice #0${req.body.client.clientId} - ${Math.floor( Math.random() * 100 ) + 1}`,
       billingDate: new Date(),
       products: products,
       stores: storeDetails,
-      status: '',
+      status: 'pending',
       clientId: req.body.clientId,
     };
     req.body = {
@@ -1700,7 +1737,7 @@ export const invoiceCreate = async ( req, res ) => {
     let pricingDetails = await calculatePricing( req, res );
     data.amount = pricingDetails.price;
     await invoiceService.create( data );
-    let clientInfo = await paymentService.findOne( { clientId: req.body.clientId } );
+    let clientInfo = await paymentService.findOne( { clientId: clientId } );
     if ( clientInfo ) {
       clientInfo.planDetails.paymentStatus = 'due';
       clientInfo.save();

package/src/dtos/validation.dtos.js

@@ -97,7 +97,7 @@ export const validateInvoiceParams = {
   body: joi.object( {
     limit: joi.number().required(),
     offset: joi.number().required(),
-    searchValue: joi.string().optional(),
+    searchValue: joi.string().optional().empty( '' ),
     filter: joi.string().optional(),
     sortColumn: joi.string().optional(),
     sortBy: joi.number().optional(),

package/src/services/invoice.service.js

@@ -1,7 +1,7 @@
 import model from 'tango-api-schema';
 
 export const aggregate = async ( query ={} ) => {
-  return await model.invoiceModel.aggregate( query );
+  return await model.invoiceModel.aggregate( query, { collation: { locale: 'en_US', numericOrdering: true } } );
 };
 
 export const findOne = async ( query ={}, record={} ) => {