tango-app-api-payment-subscription 3.5.4 → 3.5.6

package/src/controllers/paymentSubscription.controllers.js

@@ -1,6 +1,6 @@
 
 /* eslint-disable new-cap */
-import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById, sendTeamsNotification } from 'tango-app-api-middleware';
+import { logger, download, sendEmailWithSES, insertOpenSearchData, getOpenSearchData, updateOpenSearchData, getOpenSearchById } from 'tango-app-api-middleware';
 import * as paymentService from '../services/clientPayment.services.js';
 import * as basePriceService from '../services/basePrice.service.js';
 import * as storeService from '../services/store.service.js';
@@ -102,6 +102,15 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
     let storeCount = await storeService.count( { clientId: clientInfo[0].clientId, status: 'active' } );
     let tangoProductsList = await basePricingService.findOne( { clientId: { $exists: false } }, { basePricing: 1 } );
     let tangoProducts = tangoProductsList.basePricing.map( ( item ) => item.productName );
+    // Client-specific negotiated pricing — used to show the agreed per-store
+    // price for subscribed (live) products in the upgrade-plan popup.
+    let clientPricing = await basePricingService.findOne( { clientId: clientInfo[0].clientId }, { standard: 1, step: 1 } );
+    let negotiateByProduct = {};
+    ( clientPricing?.standard || clientPricing?.step || [] ).forEach( ( p ) => {
+      if ( p && p.productName != null && p.negotiatePrice != null ) {
+        negotiateByProduct[p.productName] = p.negotiatePrice;
+      }
+    } );
     let activeProducts = clientInfo[0].planDetails.product;
     let liveProducts = [];
     let trialProducts = [];
@@ -160,6 +169,10 @@ export const clientBillingSubscriptionInfo = async ( req, res, next ) => {
         if ( price ) {
           element.price = price.basePrice;
         }
+        // Negotiated (agreed) per-store price for subscribed products.
+        if ( negotiateByProduct[element.productName] != null ) {
+          element.negotiatePrice = negotiateByProduct[element.productName];
+        }
         let getProductCount = productDetails.find( ( item ) => item.product == element.productName );
         element.storeCount = getProductCount?.count || 0;
         element.aliseProductName = convertTitleCase( element.productName );
@@ -2546,17 +2559,55 @@ async function updatePricing( req, res, update ) {
   if ( clientDetails ) {
     let products = clientDetails.planDetails.product.map( ( item ) => item.productName );
     let subscriptionProduct = clientDetails.planDetails.product.filter( ( item ) => item.status == 'live' );
+    // Negotiated prices coming from the Subscribe popup (or any caller) take
+    // precedence; otherwise we keep whatever was already saved for this
+    // client and only fall back to the global base defaults for brand-new
+    // products. This stops updatePricing from clobbering a manually agreed
+    // price every time the product list changes.
+    let pricingOverride = {};
+    if ( Array.isArray( req.body.pricing ) ) {
+      req.body.pricing.forEach( ( p ) => {
+        if ( p && p.productName ) {
+          pricingOverride[p.productName] = p;
+        }
+      } );
+    }
+    logger.info?.( { function: 'updatePricing', clientId: req.body.clientId, override: pricingOverride } );
+    let existingStandard = {};
+    let existingStep = {};
+    ( getPriceInfo?.standard || [] ).forEach( ( s ) => {
+      existingStandard[s.productName] = s;
+    } );
+    ( getPriceInfo?.step || [] ).forEach( ( s ) => {
+      existingStep[s.productName] = s;
+    } );
     let standardList = [];
     let stepList = [];
     products.forEach( ( product ) => {
       let baseDetails = baseProduct.basePricing.find( ( item ) => item.productName == product );
+      // A product missing from the global base pricing would otherwise crash
+      // the whole pricing save (and silently drop the negotiated override,
+      // since this runs un-awaited in a .then()). Fall back to safe zeros.
+      if ( !baseDetails ) {
+        baseDetails = { basePrice: 0, discoutPercentage: 0 };
+      }
       let discountPrice = ( baseDetails.basePrice * baseDetails.discoutPercentage ) / 100;
+      let defaultNegotiate = Number( baseDetails.basePrice - discountPrice );
+      // Precedence: explicit override from the request > previously saved
+      // client price > computed default from the global base pricing.
+      let override = pricingOverride[product];
+      let prevStandard = existingStandard[product];
+      let prevStep = existingStep[product];
+      let negotiateStandard = override && override.negotiatePrice != null ? Number( override.negotiatePrice ) :
+        ( prevStandard && prevStandard.negotiatePrice != null ? Number( prevStandard.negotiatePrice ) : defaultNegotiate );
+      let negotiateStep = override && override.negotiatePrice != null ? Number( override.negotiatePrice ) :
+        ( prevStep && prevStep.negotiatePrice != null ? Number( prevStep.negotiatePrice ) : defaultNegotiate );
       standardList.push(
           {
             productName: product,
             discountPercentage: baseDetails.discoutPercentage,
             basePrice: baseDetails.basePrice,
-            negotiatePrice: Number( baseDetails.basePrice - discountPrice ),
+            negotiatePrice: negotiateStandard,
           },
       );
       stepList.push(
@@ -2564,8 +2615,8 @@ async function updatePricing( req, res, update ) {
             productName: product,
             discountPercentage: baseDetails.discoutPercentage,
             basePrice: baseDetails.basePrice,
-            negotiatePrice: Number( baseDetails.basePrice - discountPrice ),
-            storeRange: '1-100',
+            negotiatePrice: negotiateStep,
+            storeRange: ( prevStep && prevStep.storeRange ) || '1-100',
           },
       );
     } );
@@ -2574,6 +2625,7 @@ async function updatePricing( req, res, update ) {
       step: stepList,
       clientId: req.body.clientId,
     };
+    console.log( '🚀 ~ updatePricing ~ data:', data );
     if ( !getPriceInfo ) {
       await basePricingService.create( data );
     } else {
@@ -3332,7 +3384,7 @@ 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 );
+                // console.log( '🚀 ~ dailyPricingInsert ~ cameraDetails:', cameraDetails );
 
                 let trafficCameraCount = cameraDetails.filter( ( cam ) =>
                   ( cam.productModule || [] ).some( ( mod ) =>
@@ -3351,14 +3403,16 @@ export const dailyPricingInsert = async ( req, res ) => {
                     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 } );
+                let allcameraname = cameraDetails?.map( ( cam ) => cam?.streamName );
+                console.log( '🚀 ~ dailyPricingInsert ~ zoneCameraStreamNames:', zoneCameraStreamNames );
+                let taggingDetails = await taggingService.find( { storeId: getStore[storeIndex].storeId, clientId: requestClient[clientIndex], productName: 'tangoZone', coordinates: { $ne: [] }, streamName: { $in: allcameraname } }, { tagName: 1 } );
                 let zoneCount = taggingDetails.length;
                 let zoneName = taggingDetails.map( ( item ) => item.tagName );
                 let firstDate = dayjs( getStore[storeIndex]?.edge?.firstFileDate ).format( 'YYYY-MM-DD' );
                 let workingdays;
                 let workingdaystrax;
                 const givenDate = dayjs( requestData.date );
-                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', trafficCameraCount, zoneCameraCount, zoneCount );
+                console.log( '🚀 ~ dailyPricingInsert ~ cameraCount:', getStore[storeIndex].storeId, trafficCameraCount, zoneCameraCount, zoneCount );
                 const isFirstDayOfMonth = givenDate.isSame( dayjs().startOf( 'month' ), 'day' );
                 if ( getStore[storeIndex]?.edge.firstFile ) {
                   if ( firstDate < requestData.date && getStore[storeIndex]?.status == 'active' &&
@@ -3471,13 +3525,24 @@ export const dailyPricingInsert = async ( req, res ) => {
         }
         // console.log( clientIndex, requestClient.length-1 );
         if ( clientIndex == requestClient.length - 1 ) {
-          let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
+          // let teamsAlertUrls = process.env.teamsAlertURL ? JSON.parse( process.env.teamsAlertURL ) : '';
           let totalcount = await dailyPriceService.find( { dateString: dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) } );
           let teamsMsg = `${totalcount.length} clients data is inserted on ${dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' )}`;
           console.log( teamsMsg );
-          if ( teamsAlertUrls.invoiceAlert ) {
-            sendTeamsNotification( teamsAlertUrls.invoiceAlert, teamsMsg );
+          // if ( teamsAlertUrls.invoiceAlert ) {
+          //   sendTeamsNotification( teamsAlertUrls.invoiceAlert, teamsMsg );
+          // }
+
+          const SES = JSON.parse( process.env.SES );
+          let fromEmail = SES.accountsEmail;
+          console.log( process.env.invoiceAlert );
+          let invoiceEmails = JSON.parse( process.env.invoiceAlert );
+          let mailSubject = `Daily Invoice Alert ${dayjs( requestData.date, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' )}`;
+          if ( invoiceEmails ) {
+            const result = await sendEmailWithSES( invoiceEmails?.email, mailSubject, teamsMsg, '', fromEmail, [] );
+            console.log( '🚀 ~ dailyPricingInsert ~ result:', result );
           }
+
           return res.sendSuccess( 'Price Details Inserted Successfully' );
         }
       }

package/src/dtos/validation.dtos.js

@@ -75,6 +75,12 @@ export const validateSubscibeSchema = joi.object( {
   product: joi.array().required(),
   clientId: joi.string().required(),
   stores: joi.array().optional(),
+  // Negotiated price overrides from the Subscribe popup — applied in
+  // updatePricing so a manually-agreed price isn't reset to base defaults.
+  pricing: joi.array().items( joi.object( {
+    productName: joi.string().required(),
+    negotiatePrice: joi.number().min( 0 ).required(),
+  } ).unknown( true ) ).optional(),
 } );
 
 export const validateSubscibeParams = {
@@ -314,6 +320,7 @@ export const createBillingGroupBody = joi.object(
       proRata: joi.string().optional().allow( '' ),
       paymentCategory: joi.string().optional().allow( '' ),
       currency: joi.string().optional().allow( '' ),
+      taxCalculationType: joi.string().valid( 'domestic', 'international' ).optional(),
       isInstallationOneTime: joi.boolean().optional(),
       installationFee: joi.number().optional(),
       paymentCycle: joi.string().optional().allow( '' ),
@@ -352,6 +359,7 @@ export const updateBillingGroupBody = joi.object(
       proRata: joi.string().optional().allow( '' ),
       paymentCategory: joi.string().optional().allow( '' ),
       currency: joi.string().optional().allow( '' ),
+      taxCalculationType: joi.string().valid( 'domestic', 'international' ).optional(),
       isInstallationOneTime: joi.boolean().optional(),
       installationFee: joi.number().optional(),
       paymentCycle: joi.string().optional().allow( '' ),

package/src/hbs/estimatePdf.hbs

@@ -0,0 +1,125 @@
+<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<style>
+  * { box-sizing: border-box; }
+  body { font-family: Arial, Helvetica, sans-serif; color: #1f2937; font-size: 12px; margin: 0; }
+  .wrap { padding: 6px 4px; }
+  .head { display: flex; justify-content: space-between; align-items: flex-start; }
+  .brand { display: flex; align-items: center; gap: 10px; }
+  .brand img { height: 40px; }
+  .doc-title { font-size: 26px; font-weight: 800; color: #101828; letter-spacing: .5px; }
+  .doc-sub { color: #667085; font-size: 12px; margin-top: 2px; }
+  .pill { display: inline-block; padding: 3px 11px; border-radius: 999px; font-size: 11px; font-weight: 700; }
+  .pill-draft { background: #f1f3f6; color: #667085; }
+  .pill-sent { background: #e8f3fe; color: #1573c4; }
+  .pill-accepted { background: #e7f7ee; color: #138a52; }
+  .pill-declined, .pill-expired { background: #fdecec; color: #d64545; }
+  .row { display: flex; justify-content: space-between; margin-top: 22px; }
+  .label { font-size: 10px; letter-spacing: .05em; text-transform: uppercase; color: #98a2b3; font-weight: 700; }
+  .client-name { font-size: 15px; font-weight: 700; color: #101828; margin-top: 4px; }
+  .meta td { padding: 2px 0; }
+  .meta .m-label { color: #98a2b3; padding-right: 14px; }
+  .meta .m-val { font-weight: 700; color: #344054; text-align: right; }
+  .total-box { text-align: right; }
+  .total-box .t-label { color: #667085; font-size: 12px; font-weight: 600; }
+  .total-box .t-amt { font-size: 24px; font-weight: 800; color: #101828; }
+  table.items { width: 100%; border-collapse: collapse; margin-top: 26px; }
+  table.items thead th { background: #f4f6f9; color: #667085; font-size: 10px; text-transform: uppercase;
+    letter-spacing: .04em; text-align: left; padding: 9px 10px; border-bottom: 1px solid #e4e6ea; }
+  table.items tbody td { padding: 11px 10px; border-bottom: 1px solid #eceef1; vertical-align: top; }
+  .prod-name { font-weight: 700; color: #101828; }
+  .prod-desc { color: #98a2b3; font-size: 11px; margin-top: 2px; }
+  .ta-r { text-align: right; }
+  .ta-c { text-align: center; }
+  .totals { width: 46%; margin-left: auto; margin-top: 16px; }
+  .totals td { padding: 6px 0; }
+  .totals .tl { color: #667085; }
+  .totals .tv { text-align: right; font-weight: 700; color: #101828; }
+  .totals .grand td { border-top: 1px solid #e4e6ea; padding-top: 10px; font-size: 15px; font-weight: 800; }
+  .note { margin-top: 24px; background: #f7f8fa; border: 1px solid #eceef1; border-radius: 8px;
+    padding: 10px 14px; color: #475467; }
+  .foot { margin-top: 26px; color: #98a2b3; font-size: 11px; border-top: 1px solid #eceef1; padding-top: 10px; }
+</style>
+</head>
+<body>
+<div class="wrap">
+  <div class="head">
+    <div class="brand">
+      <img src="{{logo}}" alt="">
+      <div>
+        <div style="font-weight:800;font-size:16px;color:#101828">Tango Eye</div>
+        <div class="doc-sub">Tango IT Solutions India Pvt Ltd</div>
+      </div>
+    </div>
+    <div style="text-align:right">
+      <div class="doc-title">ESTIMATE</div>
+      <div class="doc-sub">{{estimate}}</div>
+      <div style="margin-top:6px"><span class="pill pill-{{status}}">{{statusLabel}}</span></div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div style="max-width:55%">
+      <div class="label">Estimate For</div>
+      <div class="client-name">{{companyName}}</div>
+      {{#if companyAddress}}<div style="margin-top:3px">{{companyAddress}}</div>{{/if}}
+      {{#if GSTNumber}}<div style="margin-top:6px"><strong>GSTIN {{GSTNumber}}</strong></div>{{/if}}
+      {{#if PlaceOfSupply}}<div>Place Of Supply: {{PlaceOfSupply}}</div>{{/if}}
+      {{#if groupName}}<div style="margin-top:6px">Billing Group: {{groupName}}</div>{{/if}}
+    </div>
+    <div class="total-box">
+      <div class="t-label">Estimate Total</div>
+      <div class="t-amt">{{currencyType}} {{totalAmount}}</div>
+      <table class="meta" style="margin-top:12px;margin-left:auto">
+        <tr><td class="m-label">Period</td><td class="m-val">{{period}}</td></tr>
+        <tr><td class="m-label">Generated</td><td class="m-val">{{createdDate}}</td></tr>
+        <tr><td class="m-label">Valid Till</td><td class="m-val">{{validTill}}</td></tr>
+      </table>
+    </div>
+  </div>
+
+  <table class="items">
+    <thead>
+      <tr>
+        <th style="width:36px">#</th>
+        <th>Product &amp; Description</th>
+        <th style="width:90px">HSN/SAC</th>
+        <th class="ta-c" style="width:80px">Stores</th>
+        <th class="ta-r" style="width:110px">Rate</th>
+        <th class="ta-r" style="width:120px">Amount</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{#each products}}
+      <tr>
+        <td>{{index}}</td>
+        <td>
+          <div class="prod-name">{{productName}}</div>
+          {{#if description}}<div class="prod-desc">{{description}}</div>{{/if}}
+        </td>
+        <td>{{hsn}}</td>
+        <td class="ta-c"><strong>{{storeCount}}</strong></td>
+        <td class="ta-r">{{../currencyType}} {{price}}</td>
+        <td class="ta-r">{{../currencyType}} {{amount}}</td>
+      </tr>
+      {{/each}}
+    </tbody>
+  </table>
+
+  <table class="totals">
+    <tr><td class="tl">Sub Total</td><td class="tv">{{currencyType}} {{amount}}</td></tr>
+    {{#each tax}}
+    <tr><td class="tl">{{type}} ({{value}}%)</td><td class="tv">{{../currencyType}} {{taxAmount}}</td></tr>
+    {{/each}}
+    <tr class="grand"><td class="tl">Total Amount</td><td class="tv">{{currencyType}} {{totalAmount}}</td></tr>
+  </table>
+
+  {{#if notes}}<div class="note">{{notes}}</div>{{/if}}
+
+  <div class="foot">This is an estimate, not a tax invoice. Valid until {{validTill}}. Prices are subject to the
+    terms agreed in the final subscription.</div>
+</div>
+</body>
+</html>

package/src/hbs/invoicePdf.hbs

@@ -1730,6 +1730,30 @@
                         {{/each}}
 
                     </div>
+                    <div class="column" style="max-width: 90px;">
+                        <div class="table-header-cell" style="padding: 13px 30px 12px 22px; background-color:#D0D5DD;">
+                            <div class="table-header">
+                                <div class="text6">Qty</div>
+                            </div>
+                        </div>
+                        {{#each annuxureData}}
+                        <div class="table-cell" style="height: 70px !important;">
+                            <div class="text7">{{units}}</div>
+                        </div>
+                        {{/each}}
+                    </div>
+                    <div class="column" style="max-width: 150px;">
+                        <div class="table-header-cell" style="padding: 13px 30px 12px 22px; background-color:#D0D5DD;">
+                            <div class="table-header">
+                                <div class="text6">Unit Price</div>
+                            </div>
+                        </div>
+                        {{#each annuxureData}}
+                        <div class="table-cell" style="height: 70px !important;">
+                            <div class="text7">{{../currencyType}} {{standardPrice}}<br>{{unitBasis}}</div>
+                        </div>
+                        {{/each}}
+                    </div>
                     <div class="column">
                         <div class="table-header-cell" style="padding: 13px 60px 12px 22px; background-color:#D0D5DD;">
                             <div class="table-header">
@@ -1744,6 +1768,9 @@
                     </div>
                 </div>
             </div>
+            <div style="display:flex; justify-content:flex-end; margin-top:14px; padding-right:10px;">
+                <div class="text6" style="font-weight:700;">Total: {{currencyType}} {{annuxureTotal}}</div>
+            </div>
             {{/eq}}
         </div>
     </div>

package/src/routes/billing.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 export const billingRouter = express.Router();
 import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { createBillingGroup, deleteBillingGroup, getAllBillingGroups, getBillingGroups, getClientProducts, getInvoices, getLeadProducts, onetimePayment, subscribedStoreList, updateBillingGroup } from '../controllers/billing.controllers.js';
+import { createBillingGroup, deleteBillingGroup, getAllBillingGroups, getBillingGroups, getClientProducts, getInvoices, getLeadProducts, onetimePayment, subscribedStoreList, updateBillingGroup, gstinLookup } from '../controllers/billing.controllers.js';
 import { billingGroupSchema, clientProductsValid, createBillingGroupsSchema, deleteBillingGroupsSchema, getBillingGroupsSchema, getInvoiceSchema, leadProductsValid, onetimeFeeValid, subscribedStoreListSchema, updateBillingGroupsSchema } from '../dtos/validation.dtos.js';
 
 
@@ -27,3 +27,4 @@ billingRouter.get( '/getLeadProducts/:email', isAllowedSessionHandler, validate(
 billingRouter.get( '/getClientProducts/:id', isAllowedSessionHandler, validate( clientProductsValid ), getClientProducts );
 
 
+billingRouter.get( '/gst-lookup/:gstin', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'Global', name: 'Billing', permissions: [ 'isAdd' ] } ] } ), gstinLookup );

package/src/routes/brandsBilling.routes.js

@@ -1,6 +1,6 @@
 
 import express from 'express';
-import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups } from '../controllers/brandsBilling.controller.js';
+import { brandsBillingList, brandInvoiceList, latestDailyPricing, brandBillingGroups, updateDailyPricingWorkingDays, updateDailyPricingStoreField, getClientBillingInfo, bulkDownloadBillingGroups, bulkUpdateBillingGroups, billingSummary } from '../controllers/brandsBilling.controller.js';
 import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 
 export const brandsBillingRouter = express.Router();
@@ -14,3 +14,4 @@ brandsBillingRouter.put( '/updateDailyPricingStoreField', isAllowedSessionHandle
 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' ] } ] } ), bulkUpdateBillingGroups );
+brandsBillingRouter.get( '/billingSummary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), billingSummary );

package/src/routes/invoice.routes.js

@@ -1,7 +1,9 @@
 import express from 'express';
-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 { createInvoice, invoiceDownload, invoiceDownloadBulk, clientInvoiceList, creditTransactionlist, pendingInvoices, applyDiscount, migrateInvoice, PaymentStatusChange, checkPaymentStatus, getInvoice, invoiceAnnexure, updateInvoice, getClientBasePricing, deleteInvoice, approveInvoiceCsm, approveInvoiceFinance, approveInvoiceApproval, recordPayment } from '../controllers/invoice.controller.js';
 import { isAllowedSessionHandler, accessVerification, validate } from 'tango-app-api-middleware';
 import { getInvoiceHeads, updateInvoiceHeads } from '../controllers/applicationDefault.controllers.js';
+import { uploadBankStatement, bankTransactionList, resolveOptions, resolveBankTransaction } from '../controllers/bankTransaction.controller.js';
+import { estimateList, createEstimate, getEstimate, estimateStatusUpdate, deleteEstimate, downloadEstimate } from '../controllers/estimate.controller.js';
 import { updateInvoiceHeadsSchema } from '../dtos/validation.dtos.js';
 export const invoiceRouter = express.Router();
 
@@ -29,6 +31,7 @@ invoiceRouter.post( '/pendingInvoices', isAllowedSessionHandler, pendingInvoices
 invoiceRouter.post( '/applyDiscount', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), applyDiscount );
 invoiceRouter.post( '/migrateInvoice', migrateInvoice );
 invoiceRouter.post( '/PaymentStatusChange', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), PaymentStatusChange );
+invoiceRouter.post( '/recordPayment', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), recordPayment );
 invoiceRouter.post( '/checkPaymentStatus', checkPaymentStatus );
 invoiceRouter.get( '/getInvoice/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getInvoice );
 invoiceRouter.get( '/invoiceAnnexure/:invoiceId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), invoiceAnnexure );
@@ -42,3 +45,19 @@ invoiceRouter.post( '/approveInvoiceApproval', isAllowedSessionHandler, superadm
 
 invoiceRouter.get( '/getInvoiceHeads', isAllowedSessionHandler, getInvoiceHeads );
 invoiceRouter.post( '/updateInvoiceHeads', isAllowedSessionHandler, validate( updateInvoiceHeadsSchema ), updateInvoiceHeads );
+
+// Bank-statement reconciliation (billing "Transactions" tab). Upload mutates
+// the banktransaction collection so it needs edit rights; list is read-only.
+invoiceRouter.post( '/bankStatement/upload', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), uploadBankStatement );
+invoiceRouter.post( '/bankStatement/list', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), bankTransactionList );
+invoiceRouter.get( '/bankStatement/resolveOptions', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), resolveOptions );
+invoiceRouter.post( '/bankStatement/resolve', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), resolveBankTransaction );
+
+// Estimates (quotations) — per-brand quotation documents with their own
+// lifecycle. List/get are read; create/status/delete need edit rights.
+invoiceRouter.post( '/estimate/list', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), estimateList );
+invoiceRouter.post( '/estimate/create', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), createEstimate );
+invoiceRouter.post( '/estimate/download/:estimateId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), downloadEstimate );
+invoiceRouter.get( '/estimate/:estimateId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [] } ] } ), getEstimate );
+invoiceRouter.post( '/estimate/statusUpdate', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), estimateStatusUpdate );
+invoiceRouter.delete( '/estimate/:estimateId', isAllowedSessionHandler, superadminBypass( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'invoiceApproval', permissions: [ 'isEdit' ] } ] } ), deleteEstimate );

package/src/services/bankTransaction.service.js

@@ -0,0 +1,21 @@
+import model from 'tango-api-schema';
+
+// Bank-statement transactions (uploaded from the billing Transactions tab).
+// Lives in its own `banktransaction` collection — the legacy `transaction`
+// collection holds payment/wallet entries and must not be mixed with these.
+
+export const insertMany = async ( data ) => {
+  return await model.bankTransactionModel.insertMany( data );
+};
+
+export const aggregate = async ( query = [] ) => {
+  return await model.bankTransactionModel.aggregate( query );
+};
+
+export const find = async ( query = {}, projection = {} ) => {
+  return await model.bankTransactionModel.find( query, projection );
+};
+
+export const updateOne = async ( filter, update ) => {
+  return await model.bankTransactionModel.updateOne( filter, update );
+};

package/src/services/estimate.service.js

@@ -0,0 +1,25 @@
+import model from 'tango-api-schema';
+
+export const aggregate = async ( query = [] ) => {
+  return await model.estimateModel.aggregate( query );
+};
+
+export const find = async ( query = {}, projection = {} ) => {
+  return await model.estimateModel.find( query, projection );
+};
+
+export const findOne = async ( query = {}, projection = {} ) => {
+  return await model.estimateModel.findOne( query, projection );
+};
+
+export const create = async ( data ) => {
+  return await model.estimateModel.create( data );
+};
+
+export const updateOne = async ( filter, update ) => {
+  return await model.estimateModel.updateOne( filter, update );
+};
+
+export const count = async ( query = {} ) => {
+  return await model.estimateModel.countDocuments( query );
+};

package/src/services/paymentAccount.service.js

@@ -9,6 +9,11 @@ export const findOneAccount = ( query = {}, record = {} ) => {
 export const updateOneAccount = async ( query ={}, record={} ) => {
   return await model.paymentAccountModel.updateOne( query, { $set: record } );
 };
+
+export const createAccount = async ( record ) => {
+  return await model.paymentAccountModel.create( record );
+};
+
 export const aggregate = ( query = [] ) => {
   return model.paymentAccountModel.aggregate( query );
 };