tango-app-api-payment-subscription 3.5.25 → 3.5.27

package/package.json

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

package/src/controllers/invoice.controller.js

@@ -815,14 +815,16 @@ export async function invoiceDownload( req, res ) {
 
       invoiceInfo.totalAmount = roundAmount( invoiceInfo.totalAmount, invoiceInfo.currency );
       let AmountinWords = amountToWords( invoiceInfo.totalAmount, invoiceInfo.currency );
+      // Fetch the group BEFORE computing the payment term / due-date fallback.
+      // Previously `getgroup` was read while still undefined, so `days` always
+      // fell back to 30 and the due-date fallback ignored the real paymentTerm —
+      // leaving Due Date out of sync with the "Term N" shown on the invoice.
       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' );
-
-      console.log( invoiceInfo.groupId );
       if ( invoiceInfo.groupId ) {
         getgroup = await billingService.findOne( { _id: invoiceInfo.groupId } );
       }
+      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' );
       let virtualAccount = await paymentAccountService.findOneAccount( { clientId: invoiceInfo.clientId } );
 
       invoiceData = {
@@ -1280,7 +1282,11 @@ async function resolveBasePricingScope( group, getClient ) {
 
 async function standardPrice( group, getClient, baseDate ) {
   console.log( '🚀 ~ standardPrice ~ baseDate:', baseDate.format( 'MMM YYYY' ) );
-  const currentMonthDays = 30;
+  // Prorate against the actual number of days in the invoice's billing month
+  // (e.g. 31 for July, 28/29 for Feb) so invoice line amounts match the
+  // annexure, which uses billingMonth.daysInMonth() in buildAnnexureRows().
+  // Previously hardcoded to 30, which inflated 31-day-month invoices.
+  const currentMonthDays = baseDate.daysInMonth();
   console.log( '🚀 ~ standardPrice ~ currentMonthDays:', currentMonthDays );
   // Pricing method: 'flat' => bill every store for the full month
   // regardless of working days. 'prorate' => bill for actual working days.