tango-app-api-payment-subscription 3.4.0-alpha.1 → 3.4.0-alpha.3

package/package.json

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

package/src/controllers/invoice.controller.js

@@ -1280,22 +1280,22 @@ export async function migrateInvoice( req, res ) {
 }
 export async function PaymentStatusChange( req, res ) {
   try {
-    let invoice=  await invoiceService.findOne({ invoice: req.body.invoiceId })
+    let invoice= await invoiceService.findOne( { invoice: req.body.invoiceId } );
     let updateInvoice = await invoiceService.updateOne( { invoice: req.body.invoiceId }, { paymentStatus: req.body.status } );
     let logObj = {
-          userName: req.user?.userName,
-          email: req.user?.email,
-          clientId: invoice.clientId,
-          logSubType: 'PaymentStatus',
-          logType: 'invoice',
-          date: new Date(),
-          changes: [ `The payment status has been updated to ${req.body.status} for invoice ${req.body.invoiceId}.` ],
-          eventType: '',
-          timestamp: new Date(),
-          showTo: [ 'tango' ],
-        };
-        console.log( logObj );
-        insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
+      userName: req.user?.userName,
+      email: req.user?.email,
+      clientId: invoice.clientId,
+      logSubType: 'PaymentStatus',
+      logType: 'invoice',
+      date: new Date(),
+      changes: [ `The payment status has been updated to ${req.body.status} for invoice ${req.body.invoiceId}.` ],
+      eventType: '',
+      timestamp: new Date(),
+      showTo: [ 'tango' ],
+    };
+    console.log( logObj );
+    insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
     if ( updateInvoice ) {
       res.sendSuccess( 'Payment status aginst the invoice changed to '+req.body.status );
     }

package/src/controllers/paymentSubscription.controllers.js

@@ -2316,6 +2316,46 @@ 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 findClient = await paymentService.findOneClient( { clientId: req.body.clientId } );
+
+    console.log( getPriceInfo );
+
+
+    let oldData ={
+      pricingType: findClient.priceType,
+    };
+
+    if ( findClient.priceType==='standard' ) {
+      getPriceInfo.standard.map( ( item ) => {
+        oldData = {
+          ...oldData,
+          [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
+        };
+        if ( item.discountPercentage ) {
+          oldData = {
+            ...oldData,
+            [item.productName+' '+'discountPercentage']: item.discountPercentage+'%',
+          };
+        }
+      } );
+    } else {
+      getPriceInfo.step.map( ( item ) => {
+        oldData = {
+          ...oldData,
+          [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
+        };
+        if ( item.discountPercentage ) {
+          oldData = {
+            ...oldData,
+            [item.productName+' '+'discountPercentage']: item.discountPercentage+'%',
+          };
+        }
+      } );
+    }
+
+    let newData ={
+      pricingType: req.body.type,
+    };
     if ( !getPriceInfo ) {
       if ( !req.body.client.planDetails.product.length ) {
         return res.sendError( 'no product found', 204 );
@@ -2338,8 +2378,9 @@ export const pricingListUpdate = async ( req, res ) => {
       let subtotal = 0;
       let origPrice = 0;
 
-      let GST = req.body.client.paymentInvoice.currencyType == 'dollar'?5:18;
+      let GST = req.body.client.paymentInvoice.currencyType == 'dollar'?0:18;
       productList.products.forEach( ( item ) => {
+        console.log( '---->1', item );
         let [ firstWord, secondWord ] = item.productName.replace( /([a-z])([A-Z])/g, '$1 $2' ).split( ' ' );
         firstWord = firstWord.charAt( 0 ).toUpperCase() + firstWord.slice( 1 );
         item.productName = firstWord + ' ' + secondWord;
@@ -2367,16 +2408,27 @@ export const pricingListUpdate = async ( req, res ) => {
         GST: req.body.client.paymentInvoice.currencyType == 'dollar' ? 5 : GST,
       };
       req.body.products.forEach( ( item ) => {
+        console.log( '---->', item );
         delete item.originalPrice;
         delete item.oldPrice;
         delete item.oldStoreCount;
         delete item.storeCount;
         delete item.price;
+
+
         if ( item.negotiatePrice ) {
           item.negotiatePrice = Number( item.negotiatePrice );
+          newData = {
+            ...newData,
+            [item.productName+' '+'negotiatePrice']: item.negotiatePrice,
+          };
         }
         if ( item.discountPercentage ) {
           item.discountPercentage = Number( item.discountPercentage );
+          newData = {
+            ...newData,
+            [item.productName+' '+'discountPercentage']: item.discountPercentage+'%',
+          };
         }
 
         if ( req.body.type == 'step' ) {
@@ -2414,11 +2466,12 @@ export const pricingListUpdate = async ( req, res ) => {
       }
       let keys = [];
       if ( req.body.type == 'standard' ) {
-        keys = [ 'productName', 'discountPercentage', 'basePrice', 'negotiatePrice' ];
+        keys = [ 'discountPercentage', 'negotiatePrice' ];
       }
-      if ( req.body.type == 'standard' ) {
-        keys = [ 'productName', 'discountPercentage', 'basePrice', 'negotiatePrice', 'storeRange' ];
+      if ( req.body.type == 'step' ) {
+        keys = [ 'discountPercentage', 'negotiatePrice', 'storeRange' ];
       }
+
       const logObj = {
         clientId: req.body.clientId,
         userName: req.user?.userName,
@@ -2429,7 +2482,12 @@ export const pricingListUpdate = async ( req, res ) => {
         changes: keys,
         eventType: 'update',
         showTo: [ 'client', 'tango' ],
+        previous: oldData,
+        current: newData,
+        oldData: oldData,
+        newData: newData,
       };
+      console.log( logObj );
       insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
       return res.sendSuccess( 'Pricig Updated Successfully' );
     } );