tango-app-api-payment-subscription 3.5.21 → 3.5.22

package/package.json

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

package/src/controllers/brandsBilling.controller.js

@@ -1944,7 +1944,11 @@ export async function billingSummary( req, res ) {
           csm: [ ...( csmByClient.get( key ) || [] ) ].join( ', ' ),
           revenueMonths: {},
           billedStoresMonths: {},
-          installationFee: 0,
+          // Installation fee per month (keyed YYYY-MM). The summary surfaces
+          // ONLY the current month's value — see installationOut below — so the
+          // column stays hidden until the current-month invoice is generated
+          // with an installation fee.
+          installationMonths: {},
           invDollar: 0,
           invInr: 0,
         } );
@@ -1956,7 +1960,8 @@ export async function billingSummary( req, res ) {
       const r = rowOf( inv._id.c );
       r.revenueMonths[inv._id.ym] = Math.round( ( ( inv.revenueInr || 0 ) + ( inv.revenueUsd || 0 ) * usdRate ) * 100 ) / 100;
       r.billedStoresMonths[inv._id.ym] = inv.stores || 0;
-      r.installationFee += ( inv.installationInr || 0 ) + ( inv.installationUsd || 0 ) * usdRate;
+      r.installationMonths[inv._id.ym] = ( r.installationMonths[inv._id.ym] || 0 ) +
+        ( inv.installationInr || 0 ) + ( inv.installationUsd || 0 ) * usdRate;
       r.invDollar += ( inv.dollarInvoices || 0 );
       r.invInr += ( inv.inrInvoices || 0 );
       if ( inv.companyName ) {
@@ -2074,7 +2079,11 @@ export async function billingSummary( req, res ) {
       // in native USD for dollar clients.
       revCur = revCur == null ? null : Math.round( revCur );
       const revPrevOut = revPrev == null ? null : Math.round( revPrev );
-      const installationOut = r.installationFee ? Math.round( r.installationFee ) : null;
+      // Show the installation fee ONLY for the current month, and only once
+      // that month's invoice (which carries the installationFee line) exists.
+      // Until then it's null so the UI hides the whole column.
+      const curInstallation = r.installationMonths[curKey] || 0;
+      const installationOut = curInstallation ? Math.round( curInstallation ) : null;
       // Registered Entity from the billings collection (distinct group names).
       // First name shown in the column; the full list is sent so the UI can
       // reveal the others on hover. Fall back to the invoice company name when

package/src/controllers/estimate.controller.js

@@ -7,7 +7,7 @@ import Handlebars from '../utils/validations/helper/handlebar.helper.js';
 import fs from 'fs';
 import path from 'path';
 import htmlpdf from 'html-pdf-node';
-import { symbolFor } from '../utils/currency.js';
+import { symbolFor, roundAmount } from '../utils/currency.js';
 import { getInvoiceCcEmails } from './invoice.controller.js';
 
 // Build the estimate PDF buffer + the template data + a safe filename. Shared
@@ -45,7 +45,9 @@ async function buildEstimatePdf( estimate ) {
     companyAddress: e.companyAddress || '',
     GSTNumber: e.GSTNumber || '',
     PlaceOfSupply: e.PlaceOfSupply || '',
-    groupName: e.groupName || '',
+    // "Default Group" is the placeholder used when no real billing group was
+    // chosen — don't surface it on the estimate (the template hides empty).
+    groupName: ( e.groupName && e.groupName !== 'Default Group' ) ? e.groupName : '',
     period: e.period || '',
     createdDate: e.createdDate ? dayjs( e.createdDate ).format( 'DD/MM/YYYY' ) : '',
     validTill: e.validTill ? dayjs( e.validTill ).format( 'DD/MM/YYYY' ) : '',
@@ -211,11 +213,13 @@ export async function createEstimate( req, res ) {
         { 'clientName': 1, 'paymentInvoice.currencyType': 1 },
     );
 
-    const amount = Math.round( Number( b.amount ) || 0 );
-    let totalAmount = Math.round( Number( b.totalAmount ) || 0 );
+    // INR rounds to whole; other currencies keep 2 decimals.
+    const estimateCurrency = b.currency || ( client?.paymentInvoice?.currencyType === 'dollar' ? 'dollar' : 'inr' );
+    const amount = roundAmount( Number( b.amount ) || 0, estimateCurrency );
+    let totalAmount = roundAmount( Number( b.totalAmount ) || 0, estimateCurrency );
     if ( !totalAmount && amount ) {
       // Default to 18% GST when caller sends only the pre-tax amount.
-      totalAmount = Math.round( amount * 1.18 );
+      totalAmount = roundAmount( amount * 1.18, estimateCurrency );
     }
 
     const { estimate, estimateIndex } = await nextEstimateNumber();
@@ -239,7 +243,7 @@ export async function createEstimate( req, res ) {
       tax: Array.isArray( b.tax ) ? b.tax : [],
       amount,
       totalAmount,
-      currency: b.currency || ( client?.paymentInvoice?.currencyType === 'dollar' ? 'dollar' : 'inr' ),
+      currency: estimateCurrency,
       status: b.status === 'sent' ? 'sent' : 'pending',
       createdDate,
       validTill,
@@ -273,10 +277,12 @@ export async function updateEstimate( req, res ) {
       return res.sendError( 'An accepted estimate cannot be edited.', 409 );
     }
 
-    const amount = Math.round( Number( b.amount ) || 0 );
-    let totalAmount = Math.round( Number( b.totalAmount ) || 0 );
+    // INR rounds to whole; other currencies keep 2 decimals.
+    const estimateCurrency = b.currency || existing.currency;
+    const amount = roundAmount( Number( b.amount ) || 0, estimateCurrency );
+    let totalAmount = roundAmount( Number( b.totalAmount ) || 0, estimateCurrency );
     if ( !totalAmount && amount ) {
-      totalAmount = Math.round( amount * 1.18 );
+      totalAmount = roundAmount( amount * 1.18, estimateCurrency );
     }
 
     // Only the editable fields are updated. The estimate number, index,
@@ -294,7 +300,7 @@ export async function updateEstimate( req, res ) {
       tax: Array.isArray( b.tax ) ? b.tax : existing.tax,
       amount,
       totalAmount,
-      currency: b.currency || existing.currency,
+      currency: estimateCurrency,
       notes: b.notes ?? existing.notes,
       updatedBy: req.user?.email || req.user?.userName || '',
     };

package/src/controllers/invoice.controller.js

@@ -805,7 +805,7 @@ export async function invoiceDownload( req, res ) {
       let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
 
       invoiceInfo.totalAmount = roundAmount( invoiceInfo.totalAmount, invoiceInfo.currency );
-      let AmountinWords = inWords( invoiceInfo.totalAmount );
+      let AmountinWords = amountToWords( invoiceInfo.totalAmount, invoiceInfo.currency );
       let getgroup;
       let days = getgroup?.paymentTerm ? getgroup?.paymentTerm : '30';
       let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD/MM/YYYY' ) : dayjs().add( days, 'days' ).format( 'DD/MM/YYYY' );
@@ -1006,7 +1006,7 @@ async function buildInvoicePdfBuffer( invoiceId ) {
 
   let invoiceDate = dayjs( invoiceInfo.billingDate ).format( 'DD/MM/YYYY' );
   invoiceInfo.totalAmount = roundAmount( invoiceInfo.totalAmount, invoiceInfo.currency );
-  let AmountinWords = inWords( invoiceInfo.totalAmount );
+  let AmountinWords = amountToWords( invoiceInfo.totalAmount, invoiceInfo.currency );
   let getgroup;
   if ( invoiceInfo.groupId ) {
     getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
@@ -1218,6 +1218,32 @@ function inWords( num ) {
   return str.toLowerCase().split( ' ' ).map( ( word ) => word.charAt( 0 ).toUpperCase() + word.slice( 1 ) ).join( ' ' );
 }
 
+// Sub-unit (fraction) name per currency for the "Total In Words" cents part.
+// INR is whole-number only, so it has no fraction.
+const CURRENCY_FRACTION_WORDS = {
+  dollar: 'Cents',
+  singaporedollar: 'Cents',
+  euro: 'Cents',
+  aed: 'Fils',
+};
+
+// Spell out an amount. INR -> whole number only. Other currencies keep 2
+// decimals, so the cents are spelled out too when non-zero
+// (e.g. 3191.10 -> "Three Thousand One Hundred And Ninety One and Ten Cents").
+function amountToWords( value, currency ) {
+  const n = Number( value ) || 0;
+  if ( currency === 'inr' ) {
+    return inWords( Math.round( n ) );
+  }
+  const whole = Math.trunc( n );
+  const cents = Math.round( ( n - whole ) * 100 );
+  const fraction = CURRENCY_FRACTION_WORDS[currency] || 'Cents';
+  if ( cents > 0 ) {
+    return `${inWords( whole )} and ${inWords( cents )} ${fraction}`;
+  }
+  return inWords( whole );
+}
+
 
 // Resolve which basepricing doc applies to a billing group. When the client
 // has billingGroupWisePricing enabled AND a doc exists for this group, returns

package/src/controllers/paymentSubscription.controllers.js

@@ -3125,7 +3125,7 @@ export const invoiceDownload = async ( req, res ) => {
       let dueDate = invoiceInfo?.dueDate ? dayjs( invoiceInfo?.dueDate ).format( 'DD/MM/YYYY' ) : dayjs().add( days, 'days' ).format( 'DD/MM/YYYY' );
 
       invoiceInfo.totalAmount = invoiceInfo.totalAmount;
-      let AmountinWords = inWords( invoiceInfo.totalAmount );
+      let AmountinWords = amountToWords( invoiceInfo.totalAmount, invoicePdfCurrency );
       invoiceData = {
         ...invoiceInfo._doc,
         clientName: clientDetails.clientName,
@@ -3254,6 +3254,31 @@ function inWords( num ) {
   return str.toLowerCase().split( ' ' ).map( ( word ) => word.charAt( 0 ).toUpperCase() + word.slice( 1 ) ).join( ' ' );
 }
 
+// Sub-unit (fraction) name per currency for the "Total In Words" cents part.
+const CURRENCY_FRACTION_WORDS = {
+  dollar: 'Cents',
+  singaporedollar: 'Cents',
+  euro: 'Cents',
+  aed: 'Fils',
+};
+
+// Spell out an amount. INR -> whole number only. Other currencies keep 2
+// decimals, so the cents are spelled out too when non-zero
+// (e.g. 383.04 -> "Three Hundred And Eighty Three and Four Cents").
+function amountToWords( value, currency ) {
+  const n = Number( value ) || 0;
+  if ( currency === 'inr' ) {
+    return inWords( Math.round( n ) );
+  }
+  const whole = Math.trunc( n );
+  const cents = Math.round( ( n - whole ) * 100 );
+  const fraction = CURRENCY_FRACTION_WORDS[currency] || 'Cents';
+  if ( cents > 0 ) {
+    return `${inWords( whole )} and ${inWords( cents )} ${fraction}`;
+  }
+  return inWords( whole );
+}
+
 export const updateInvoiceStatus = async ( req, res ) => {
   try {
     if ( !req.params?.invoiceId ) {

package/src/hbs/estimatePdf.hbs

@@ -1423,7 +1423,6 @@
                         </div>
                     </div>
                     <div class="_1234"># {{estimate}}</div>
-                    <div><span class="pill pill-{{status}}">{{statusLabel}}</span></div>
 
                 </div>
 

package/src/hbs/invoicePdf.hbs

@@ -881,6 +881,10 @@
             align-self: stretch;
             flex-shrink: 0;
             position: relative;
+            /* Keep the whole totals block (Sub Total ... Total In Words) on a
+               single page so the amount-in-words can't be split across pages. */
+            break-inside: avoid;
+            page-break-inside: avoid;
         }
 
         .frame-2394 {
@@ -1011,6 +1015,8 @@
             justify-content: flex-start;
             flex-shrink: 0;
             position: relative;
+            break-inside: avoid;
+            page-break-inside: avoid;
         }
 
         .text13 {

package/src/hbs/invoicePdf1.hbs

@@ -844,6 +844,10 @@
             align-self: stretch;
             flex-shrink: 0;
             position: relative;
+            /* Keep the whole totals block (Sub Total ... Total In Words) on a
+               single page so the amount-in-words can't be split across pages. */
+            break-inside: avoid;
+            page-break-inside: avoid;
         }
 
         .frame-2394 {
@@ -974,6 +978,8 @@
             justify-content: flex-start;
             flex-shrink: 0;
             position: relative;
+            break-inside: avoid;
+            page-break-inside: avoid;
         }
 
         .text13 {