tango-app-api-payment-subscription 3.1.20 → 3.1.21-beta.1

package/package.json

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

package/src/controllers/invoice.controller.js

@@ -120,7 +120,7 @@ export async function createInvoice( req, res ) {
       let data = {
         groupName: group.groupName,
         groupId: group._id,
-        invoice: `INV-${Finacialyear}-${invoiceNo}`,
+        invoice: req.body.invoiceId?req.body.invoiceId:`INV-${Finacialyear}-${invoiceNo}`,
         products: products,
         status: 'pending',
         amount: Math.round( amount ),
@@ -140,7 +140,9 @@ export async function createInvoice( req, res ) {
       if ( req.body.invoiceId ) {
         await invoiceService.deleteRecord( { invoice: req.body.invoiceId } );
       }
-      await invoiceService.create( data );
+      if ( Number( totalAmount ) > 0 ) {
+        await invoiceService.create( data );
+      }
     }
 
     res.sendSuccess( 'Invoice Created SuccessFully' );
@@ -178,7 +180,6 @@ export async function invoiceDownload( req, res ) {
       } );
 
 
-    
       let invoiceDate = dayjs( invoiceInfo.createdAt ).format( 'DD/MM/YYYY' );
       let days = clientDetails?.paymentInvoice?.extendPaymentPeriodDays || 10;
       let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD/MM/YYYY' ) : dayjs().add( days, 'days' ).format( 'DD/MM/YYYY' );
@@ -210,9 +211,7 @@ export async function invoiceDownload( req, res ) {
         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,
+        attachAnnexure: getgroup?.attachAnnexure,
         billingAddressLineOne: getgroup?.addressLineOne,
         billingAddressLineTwo: getgroup?.addressLineTwo,
         billingCountry: getgroup?.country,
@@ -220,8 +219,8 @@ export async function invoiceDownload( req, res ) {
         billingCity: getgroup?.city,
         billingPinCode: getgroup?.pinCode,
         billingCurrency: virtualAccount?.currency,
-        virtualaccountNumber: virtualAccount?virtualAccount?.accountNumber:'',
-        virtualifsc: virtualAccount?virtualAccount?.ifsc:'',
+        virtualaccountNumber: virtualAccount ? virtualAccount?.accountNumber : '',
+        virtualifsc: virtualAccount ? virtualAccount?.ifsc : '',
       };
 
       if ( invoiceData?.tax?.length ) {
@@ -939,14 +938,14 @@ export async function clientInvoiceList( req, res ) {
         },
       } );
     }
-    if ( req.body.paymentStatus && req.body.paymentStatus.length>0 ) {
+    if ( req.body.paymentStatus && req.body.paymentStatus.length > 0 ) {
       query.push( {
         $match: {
           paymentStatus: { $in: req.body.paymentStatus },
         },
       } );
     }
-    if ( req.body.status && req.body.status.length>0 ) {
+    if ( req.body.status && req.body.status.length > 0 ) {
       query.push( {
         $match: {
           status: { $in: req.body.status },
@@ -1074,7 +1073,7 @@ export async function creditTransactionlist( req, res ) {
       } );
     }
     let count = await paymentAccountService.aggregate( query );
-    if ( count.length===0 ) {
+    if ( count.length === 0 ) {
       return res.sendError( 'No data', 204 );
     }
     if ( req.body.export ) {
@@ -1150,3 +1149,38 @@ export async function applyDiscount( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+export async function migrateInvoice( req, res ) {
+  try {
+    let OldinvoiceList = await invoiceService.find( { groupId: { $exists: false } } );
+    for ( let Oldinvoice of OldinvoiceList ) {
+      let updateproduct = [];
+      for ( let product of Oldinvoice.products ) {
+        let obj = {
+          productName: product.product.product,
+          storeCount: product.count,
+          amount: product.price,
+          price: product.basePrice,
+          HsnNumber: product.HSNnumber,
+          month: product.Month,
+          description: product.description,
+        };
+        updateproduct.push( obj );
+      }
+
+      let findgroup = await billingService.findOne( { clientId: Oldinvoice.clientId, groupName: 'Default Group' } );
+      let updateInvoice = await invoiceService.updateOne( { invoice: Oldinvoice.invoice },
+          {
+            products: updateproduct,
+            paymentStatus: 'unpaid',
+            groupName: findgroup&&findgroup.groupName ? findgroup.groupName : 'Default Group',
+            groupId: findgroup&&findgroup._id ? findgroup._id : '',
+            currency: findgroup&&findgroup.currency? findgroup.currency : 'inr',
+          },
+      );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'migrateInvoice' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/routes/invoice.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { createInvoice, invoiceDownload, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount } from '../controllers/invoice.controller.js';
+import { createInvoice, invoiceDownload, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice } from '../controllers/invoice.controller.js';
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
 export const invoiceRouter = express.Router();
 
@@ -10,5 +10,6 @@ invoiceRouter.post( '/clientInvoiceList', isAllowedSessionHandler, clientInvoice
 invoiceRouter.post( '/creditTransactionlist', isAllowedSessionHandler, creditTransactionlist );
 invoiceRouter.post( '/pendingInvoices', isAllowedSessionHandler, pendingInvoices );
 invoiceRouter.post( '/applyDiscount', isAllowedSessionHandler, applyDiscount );
+invoiceRouter.post( '/migrateInvoice', migrateInvoice );
 
 

package/src/routes/payment.routes.js

@@ -7,25 +7,25 @@ import { getInvoiceSchema, getVirtualAccountSchema, valletPayValid, verifyPaymen
 
 
 paymentRouter.get( '/get-virtual-account', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
+  userType: [ 'tango', 'client' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isView' ] },
   ],
 } ), validate( getVirtualAccountSchema ), getVirtualAccount );
 
 paymentRouter.get( '/wallet-pay/:invoice', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
+  userType: [ 'tango', 'client' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
 } ), validate( valletPayValid ), payUsingVallet );
 
 paymentRouter.get( '/generate-order/:invoice', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
+  userType: [ 'tango', 'client' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
 } ), validate( valletPayValid ), generateOrder );
 
 paymentRouter.post( '/verify-payment/:invoice', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
+  userType: [ 'tango', 'client' ], access: [
     { featureName: 'settings', name: 'paymentSubscriptions', permissions: [ 'isEdit' ] },
   ],
 } ), validate( verifyPaymentValid ), verifyPayment );