tango-app-api-payment-subscription 3.4.3 → 3.5.0

package/src/controllers/payment.controller.js

@@ -5,6 +5,7 @@ import * as invoiceService from '../services/invoice.service.js';
 import { updateOrder, verifySignature, verifyWebhook } from 'tango-app-api-middleware/src/utils/razorPay.js';
 import { aggregateTransaction, createTransaction } from '../services/transaction.service.js';
 import dayjs from 'dayjs';
+import { symbolFor } from '../utils/currency.js';
 
 
 export const getVirtualAccount = async ( req, res ) => {
@@ -376,9 +377,9 @@ export const transactionList = async ( req, res ) => {
         exportResult.push( {
           'Billing date': transaction?.billingDate ? dayjs( transaction.billingDate ).format( 'DD MMM, YYYY' ) : '',
           'Transaction': transaction?.transactionType === 'debt' ? `Consumption for ${dayjs( transaction?.billingDate ).format( 'MMM YYYY' )}- ${transaction?.groupName}` : 'Paid Credit',
-          'Debit': transaction?.transactionType === 'debt' ? `${transaction?.currency === 'inr' ? '₹' : '$'} ${transaction.amount}` : '',
-          'Credit': transaction?.transactionType === 'credit' ? `${transaction?.currency === 'inr' ? '₹' : '$'} ${transaction.amount}` : '',
-          'Balance credit': `${transaction?.balanceCreditCurrency === 'inr' ? '₹' : '$'} ${transaction.balanceCredit}` || '',
+          'Debit': transaction?.transactionType === 'debt' ? `${symbolFor( transaction?.currency )} ${transaction.amount}` : '',
+          'Credit': transaction?.transactionType === 'credit' ? `${symbolFor( transaction?.currency )} ${transaction.amount}` : '',
+          'Balance credit': `${symbolFor( transaction?.balanceCreditCurrency )} ${transaction.balanceCredit}` || '',
 
         } );
       }

package/src/controllers/paymentSubscription.controllers.js

@@ -13,6 +13,7 @@ import * as cameraService from '../services/camera.service.js';
 import * as billingService from '../services/billing.service.js';
 import * as paymentAccountService from '../services/paymentAccount.service.js';
 import * as taggingService from '../services/tagging.service.js';
+import { symbolFor } from '../utils/currency.js';
 
 
 import dayjs from 'dayjs';
@@ -2417,7 +2418,9 @@ export const pricingListUpdate = async ( req, res ) => {
         amount = amount + item.price;
         subtotal = subtotal+item.originalPrice;
         origPrice = origPrice + ( item.basePrice * count );
-        item.price = item.originalPrice.toFixed( 2 );
+        item.price = String( Math.round( item.originalPrice ) );
+        item.originalPrice = Math.round( item.originalPrice );
+        item.basePrice = Math.round( item.basePrice );
       } );
       let discountAmount = origPrice - amount;
       let discountPercentage = ( discountAmount / origPrice ) * 100;
@@ -2425,7 +2428,7 @@ export const pricingListUpdate = async ( req, res ) => {
         ...productList,
         amount: amount.toFixed( 2 ),
         subtotal: subtotal.toFixed( 2 ),
-        currencyType: req.body.client.paymentInvoice.currencyType == 'dollar' ? '$' : '₹',
+        currencyType: symbolFor( req.body.client.paymentInvoice.currencyType ),
         total: ( parseFloat( subtotal ) + parseFloat( ( amount * GST ) / 100 ) ).toFixed( 2 ),
         final: amount.toFixed( 2 ),
         discount: `${discountPercentage.toFixed( 2 )}% (-${discountAmount.toFixed( 2 )})`,
@@ -2666,7 +2669,7 @@ export const updatedRevisedPrice = async ( req, res ) => {
           extendDays: clientDetails.paymentInvoice.extendPaymentPeriodDays,
           address: clientDetails.billingDetails.billingAddress,
           amount: amount.toFixed( 2 ),
-          currencyType: clientDetails.paymentInvoice.currencyType == 'dollar' ? '$' : '₹',
+          currencyType: symbolFor( clientDetails.paymentInvoice.currencyType ),
           discount: `${req.body.discount.toFixed( 2 )}% (-${discountAmount.toFixed( 2 )})`,
           total: ( parseFloat( amount ) + parseFloat( ( amount * gst ) / 100 ) ).toFixed( 2 ),
           final: req.body.revisedAmount.toFixed( 2 ),
@@ -2975,9 +2978,9 @@ export const invoiceDownload = async ( req, res ) => {
 
         amount = amount + item.price;
 
-        item.basePrice = item.basePrice.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
-        item.price = item.price.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
-        item.currency = clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹';
+        item.basePrice = Math.round( item.basePrice ).toLocaleString( 'en-IN' );
+        item.price = Math.round( item.price ).toLocaleString( 'en-IN' );
+        item.currency = symbolFor( clientDetails?.paymentInvoice?.currencyType );
       } );
       for ( let tax of invoiceInfo.tax ) {
         tax.taxAmount = tax.taxAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } );
@@ -3001,7 +3004,7 @@ export const invoiceDownload = async ( req, res ) => {
         PoNum: '',
         amountwords: AmountinWords,
         Terms: `Term ${clientDetails.paymentInvoice.extendPaymentPeriodDays}`,
-        currencyType: clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹',
+        currencyType: symbolFor( clientDetails?.paymentInvoice?.currencyType ),
         totalAmount: invoiceInfo.totalAmount.toLocaleString( 'en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 } ),
         invoiceDate,
         dueDate,
@@ -3053,7 +3056,18 @@ export const invoiceDownload = async ( req, res ) => {
             return res.sendSuccess( result );
           }
         }
-        res.set( 'Content-Disposition', 'attachment; filename="generated-pdf.pdf"' );
+        const invoiceMonth = invoiceInfo.billingDate ?
+          dayjs( invoiceInfo.billingDate ).format( 'MMMM' ) :
+          ( invoiceInfo.monthOfbilling ? dayjs( invoiceInfo.monthOfbilling, 'MM' ).format( 'MMMM' ) : '' );
+        let groupForName;
+        if ( invoiceInfo.groupId ) {
+          groupForName = await billingService.findOne( { _id: invoiceInfo.groupId } );
+        }
+        const brandName = groupForName?.registeredCompanyName || invoiceInfo.companyName || '';
+        const safeFilename = `${invoiceInfo.invoice}-${invoiceMonth}-${brandName}.pdf`
+            .replace( /[\r\n"\\]/g, '' )
+            .trim();
+        res.set( 'Content-Disposition', `attachment; filename="${safeFilename}"` );
         res.set( 'Content-Type', 'application/pdf' );
         res.send( pdfBuffer );
       } );
@@ -3318,15 +3332,23 @@ export const dailyPricingInsert = async ( req, res ) => {
                 ];
                 let dailyData = await dailyPriceService.aggregate( query );
                 let cameraDetails = await cameraService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], isActivated: true, isUp: true }, { streamName: 1, productModule: 1 } );
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraDetails:', cameraDetails );
 
-                let cameraCount = cameraDetails.filter( ( cam ) =>
+                let trafficCameraCount = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
-                    ( mod.name === 'tangoTraffic' || mod.name === 'tangoTracking' ) && mod.checked === true,
+                    ( mod.productName === 'tangoTraffic' || mod.productName === 'tangoTracking' ) && mod.checked === true,
                   ),
                 ).length;
+
+                let zoneCameraCount = cameraDetails.filter( ( cam ) =>
+                  ( cam.productModule || [] ).some( ( mod ) =>
+                    mod.productName === 'tangoZone' && mod.checked === true,
+                  ),
+                ).length;
+
                 let zoneCameraStreamNames = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
-                    mod.name === 'tangoZone' && mod.checked === true,
+                    mod.productName === 'tangoZone' && mod.checked === true,
                   ),
                 ).map( ( cam ) => cam.streamName );
                 let taggingDetails = await taggingService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], productName: 'tangoZone', coordinates: { $ne: [] }, streamName: { $in: zoneCameraStreamNames } }, { tagName: 1 } );
@@ -3336,7 +3358,7 @@ export const dailyPricingInsert = async ( req, res ) => {
                 let workingdays;
                 let workingdaystrax;
                 const givenDate = dayjs( requestData.date );
-
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', trafficCameraCount, zoneCameraCount, zoneCount );
                 const isFirstDayOfMonth = givenDate.isSame( dayjs().startOf( 'month' ), 'day' );
                 if ( getStore[storeIndex]?.edge.firstFile ) {
                   if ( firstDate < requestData.date && getStore[storeIndex]?.status == 'active' &&
@@ -3413,7 +3435,8 @@ export const dailyPricingInsert = async ( req, res ) => {
                       daysDifferenceTrax: workingdaystrax,
                       products: productList,
                       camera: cameraDetails.map( ( item ) => item.streamName ),
-                      cameraCount: cameraCount,
+                      trafficCameraCount: trafficCameraCount,
+                      zoneCameraCount: zoneCameraCount,
                       zoneCount: zoneCount,
                       zoneName: zoneName,
                     },
@@ -3843,7 +3866,7 @@ export const invoiceRevised = async ( req, res ) => {
         ...invoiceDetails._doc,
         amount: amount,
         discount: invoiceDetails.discount,
-        currencyType: clientDetails?.paymentInvoice?.currencyType == 'dollar' ? '$' : '₹',
+        currencyType: symbolFor( clientDetails?.paymentInvoice?.currencyType ),
         total: amount.toFixed( 2 ),
         invoiceDate,
         dueDate,

package/src/dtos/validation.dtos.js

@@ -371,6 +371,31 @@ export const updateBillingGroupsSchema = {
   body: updateBillingGroupBody,
 };
 
+export const bulkUpdateBillingGroupRowSchema = joi.object( {
+  _id: joi.string().length( 24 ).hex().required(),
+  groupName: joi.string().required(),
+  groupTag: joi.string().required(),
+  registeredCompanyName: joi.string().required(),
+  gst: joi.string().allow( '' ).optional(),
+  addressLineOne: joi.string().allow( '' ).optional(),
+  addressLineTwo: joi.string().allow( '' ).optional(),
+  city: joi.string().allow( '' ).optional(),
+  state: joi.string().allow( '' ).optional(),
+  country: joi.string().allow( '' ).optional(),
+  pinCode: joi.string().allow( '' ).optional(),
+  placeOfSupply: joi.string().allow( '' ).optional(),
+  po: joi.string().allow( '' ).optional(),
+  proRata: joi.string().allow( '' ).optional(),
+  paymentCategory: joi.string().allow( '' ).optional(),
+  currency: joi.string().allow( '' ).optional(),
+  paymentCycle: joi.string().allow( '' ).optional(),
+  paymentTerm: joi.number().integer().min( 0 ).max( 365 ).optional(),
+  installationFee: joi.number().min( 0 ).optional(),
+  isInstallationOneTime: joi.boolean().optional(),
+  attachAnnexure: joi.boolean().optional(),
+  advanceInvoice: joi.boolean().optional(),
+} );
+
 export const deleteBillingGroupQuery = {
   _id: joi.string().required(),
 };
@@ -468,3 +493,33 @@ export const clientProductsParam = joi.object().keys( {
 export const clientProductsValid = {
   params: clientProductsParam,
 };
+
+const INVOICE_STATUS_VALUES = [ 'pendingCsm', 'pendingFinance', 'pendingApproval', 'approved' ];
+
+export const invoiceStatusEnum = INVOICE_STATUS_VALUES;
+
+export const approveInvoiceTransitionBody = joi.object( {
+  invoiceId: joi.string().length( 24 ).hex().required(),
+} );
+
+export const approveInvoiceTransitionSchema = {
+  body: approveInvoiceTransitionBody,
+};
+
+export const updateInvoiceHeadsBody = joi.object( {
+  data: joi.array().items(
+      joi.object( {
+        role: joi.string().valid( 'csm', 'finance' ).required(),
+        // email may be a single string (csm) or an array of strings (finance).
+        // Empty string / empty array are allowed for un-setting.
+        email: joi.alternatives().try(
+            joi.string().email().allow( '' ),
+            joi.array().items( joi.string().email() ),
+        ).required(),
+      } ),
+  ).min( 1 ).required(),
+} );
+
+export const updateInvoiceHeadsSchema = {
+  body: updateInvoiceHeadsBody,
+};

package/src/hbs/invoicePdf.hbs

@@ -1612,6 +1612,14 @@
                                 {{#eq billingCurrency 'dollar'}}
                                 US Dollar
                                 {{/eq}}
+
+                                {{#eq billingCurrency 'singaporedollar'}}
+                                Singapore Dollar
+                                {{/eq}}
+
+                                {{#eq billingCurrency 'euro'}}
+                                Euro
+                                {{/eq}}
                                 {{amountwords}} Only
                             </div>
                         </div>

package/src/routes/brandsBilling.routes.js

@@ -1,7 +1,21 @@
 
 import express from 'express';
-import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo } from '../controllers/brandsBilling.controller.js';
+import multer from 'multer';
+import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups } from '../controllers/brandsBilling.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
+
+const bulkUpload = multer( {
+  storage: multer.memoryStorage(),
+  limits: { fileSize: 5 * 1024 * 1024 },
+  fileFilter: ( _req, file, cb ) => {
+    const ok = [
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'application/vnd.ms-excel',
+      'application/octet-stream',
+    ].includes( file.mimetype );
+    cb( ok ? null : new Error( 'Invalid file format — use XLSX' ), ok );
+  },
+} );
 export const brandsBillingRouter = express.Router();
 
 brandsBillingRouter.post( '/brandsBillingList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), brandsBillingList );
@@ -11,3 +25,5 @@ brandsBillingRouter.post( '/brandBillingGroups', isAllowedSessionHandler, access
 brandsBillingRouter.put( '/updateDailyPricingWorkingDays', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingWorkingDays );
 brandsBillingRouter.put( '/updateDailyPricingStoreField', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateDailyPricingStoreField );
 brandsBillingRouter.post( '/getClientBillingInfo', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getClientBillingInfo );
+brandsBillingRouter.get( '/bulk-download-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), bulkDownloadBillingGroups );
+brandsBillingRouter.post( '/bulk-update-billing-groups', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), bulkUpload.single( 'file' ), bulkUpdateBillingGroups );

package/src/routes/invoice.routes.js

@@ -1,11 +1,14 @@
 import express from 'express';
-import { createInvoice, invoiceDownload, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, updateInvoice, getClientBasePricing } from '../controllers/invoice.controller.js';
-import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
+import { createInvoice, invoiceDownload, invoiceDownloadBulk, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, invoiceAnnexure, updateInvoice, getClientBasePricing, deleteInvoice, approveInvoiceCsm, approveInvoiceFinance, approveInvoiceApproval } from '../controllers/invoice.controller.js';
+import { isAllowedSessionHandler, accessVerification, validate } from 'tango-app-api-middleware';
+import { getInvoiceHeads, updateInvoiceHeads } from '../controllers/applicationDefault.controllers.js';
+import { updateInvoiceHeadsSchema } from '../dtos/validation.dtos.js';
 export const invoiceRouter = express.Router();
 
 
 invoiceRouter.post( '/createInvoice', isAllowedSessionHandler, createInvoice );
 invoiceRouter.post( '/regerateInvoice', isAllowedSessionHandler, createInvoice );
+invoiceRouter.post( '/invoiceDownload/bulk', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceDownloadBulk );
 invoiceRouter.post( '/invoiceDownload/:invoiceId', isAllowedSessionHandler, invoiceDownload );
 invoiceRouter.post( '/clientInvoiceList', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), clientInvoiceList );
 invoiceRouter.post( '/creditTransactionlist', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), creditTransactionlist );
@@ -15,7 +18,14 @@ invoiceRouter.post( '/migrateInvoice', migrateInvoice );
 invoiceRouter.post( '/PaymentStatusChange', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), PaymentStatusChange );
 invoiceRouter.post( '/checkPaymentStatus', checkPaymentStatus );
 invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getInvoice );
+invoiceRouter.get( '/invoiceAnnexure/:invoiceId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceAnnexure );
 invoiceRouter.put( '/updateInvoice', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), updateInvoice );
 invoiceRouter.get( '/getClientBasePricing/:clientId', isAllowedSessionHandler, getClientBasePricing );
+invoiceRouter.delete( '/deleteInvoice/:invoiceId', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), deleteInvoice );
 
+invoiceRouter.post( '/approveInvoiceCsm', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'csmApproval', permissions: [ 'isEdit' ] } ] } ), approveInvoiceCsm );
+invoiceRouter.post( '/approveInvoiceFinance', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'financeApproval', permissions: [ 'isEdit' ] } ] } ), approveInvoiceFinance );
+invoiceRouter.post( '/approveInvoiceApproval', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), approveInvoiceApproval );
 
+invoiceRouter.get( '/getInvoiceHeads', isAllowedSessionHandler, getInvoiceHeads );
+invoiceRouter.post( '/updateInvoiceHeads', isAllowedSessionHandler, validate( updateInvoiceHeadsSchema ), updateInvoiceHeads );

package/src/services/applicationDefault.service.js

@@ -0,0 +1,13 @@
+import model from 'tango-api-schema';
+
+export async function findOneApplicationDefault( query, projection ) {
+  return model.applicationDefaultModel.findOne( query, projection );
+}
+
+export async function upsertApplicationDefault( query, payload ) {
+  return model.applicationDefaultModel.findOneAndUpdate(
+      query,
+      { $set: payload },
+      { new: true, upsert: true },
+  );
+}

package/src/utils/currency.js

@@ -0,0 +1,14 @@
+/**
+ * Centralised currency symbol map for invoices, transactions, and PDFs.
+ * Keys must match the values stored in billing.currency / transaction.currency
+ * enums (see tango-api-schema). Unknown keys fall back to '$' to preserve the
+ * pre-existing two-currency-ternary behaviour.
+ */
+export const CURRENCY_SYMBOLS = {
+  inr: '₹',
+  dollar: '$',
+  singaporedollar: 'S$',
+  euro: '€',
+};
+
+export const symbolFor = ( currency ) => CURRENCY_SYMBOLS[currency] ?? '$';