functions/src/payments/phonepe/invoice/directInvoice.ts

@@ -65,11 +65,9 @@ export const directGenerateInvoice = onRequest({
           paymentMethod: paymentMethod || 'Online'
         };
         
-        // Generate the invoice without updating any payment records
         const invoicePath = await invoiceService.generateInvoice(invoiceData);
         const downloadUrl = await invoiceService.getInvoiceDownloadUrl(invoicePath);
         
-        // Send email if requested
         let emailSent = false;
         if (sendEmail && email) {
           emailSent = await invoiceService.sendInvoiceEmail(invoicePath, {

functions/src/payments/phonepe/invoice/getInvoiceUrl.ts

@@ -35,7 +35,6 @@ export const getInvoiceUrl = onRequest({
           return;
         }
         
-        // Get a download URL for the invoice
         const downloadUrl = await invoiceService.getInvoiceDownloadUrl(invoicePath as string);
         
         response.json({

functions/src/payments/phonepe/invoice/invoiceService.ts

@@ -58,10 +58,32 @@ export class InvoiceService {
 
       doc.setFontSize(12);
       doc.setFont('helvetica', 'normal');
-      doc.text(data.address, 20, 30);
+
+      const maxWidth = 170;
+      const lineHeight = 5;
+
+      const addressLines = doc.splitTextToSize(data.address, maxWidth);
+
+      if (addressLines.length <= 2) {
+        for (let i = 0; i < addressLines.length; i++) {
+          doc.text(addressLines[i], 20, 30 + (i * lineHeight));
+        }
+      } else {
+        doc.text(addressLines[0], 20, 30);
+
+        let secondLine = addressLines[1];
+        if (secondLine.length > 3) {
+          secondLine = secondLine.substring(0, secondLine.length - 3) + '...';
+        } else {
+          secondLine += '...';
+        }
+        doc.text(secondLine, 20, 35);
+      }
+
+      const gstYPosition = 40;
 
       if (hasGst) {
-        doc.text(`GSTIN: ${data.gstNumber}`, 20, 40);
+        doc.text(`GSTIN: ${data.gstNumber}`, 20, gstYPosition);
       }
 
       doc.setFontSize(24);
@@ -75,6 +97,14 @@ export class InvoiceService {
       doc.line(20, 45, 190, 45);
 
       doc.setFontSize(12);
+      const receiptToBoxX = 15;
+      const receiptToBoxY = 55;
+      const receiptToBoxWidth = 175;
+      const receiptToBoxHeight = 45;
+
+      doc.setDrawColor(0, 0, 0);
+      doc.setLineWidth(0.5);
+      doc.rect(receiptToBoxX, receiptToBoxY, receiptToBoxWidth, receiptToBoxHeight);
       doc.setFont('helvetica', 'bold');
       doc.text('Receipt To:', 20, 60);
 
@@ -83,20 +113,34 @@ export class InvoiceService {
       doc.text(`Phone: ${data.phoneNumber}`, 20, 80);
       doc.text(`Email: ${data.email}`, 20, 90);
 
-      autoTable(doc,{
+      autoTable(doc, {
         startY: 110,
         head: [['No.', 'Description', 'HSN/SAC', 'Amount (INR)']],
         body: [
           ['1', `${data.planName} Subscription`, '999723', baseAmount.toFixed(2)]
         ],
-        headStyles: { fillColor: [220, 220, 220], textColor: [0, 0, 0], fontStyle: 'bold' },
-        styles: { halign: 'center' },
+        headStyles: {
+          fillColor: [220, 220, 220],
+          textColor: [0, 0, 0],
+          fontStyle: 'bold',
+          lineWidth: 0.5,
+          lineColor: [0, 0, 0]
+        },
+        styles: {
+          halign: 'center',
+          lineWidth: 0.5,
+          lineColor: [0, 0, 0]
+        },
         columnStyles: {
           0: { halign: 'center', cellWidth: 20 },
           1: { halign: 'left' },
           2: { halign: 'center', cellWidth: 40 },
           3: { halign: 'right', cellWidth: 40 }
-        }
+        },
+        theme: 'grid',
+        tableLineWidth: 0.5,
+        tableLineColor: [0, 0, 0],
+
       });
 
       const finalY = (doc as any).lastAutoTable.finalY + 20;
@@ -122,6 +166,17 @@ export class InvoiceService {
 
       const paymentY = hasGst ? finalY + 50 : finalY + 20;
 
+      doc.line(20, 45, 190, 45);
+
+      const boxX = 15;
+      const boxY = paymentY - 5;
+      const boxWidth = 175;
+      const boxHeight = 45;
+
+      doc.setDrawColor(0, 0, 0);
+      doc.setLineWidth(0.5);
+      doc.rect(boxX, boxY, boxWidth, boxHeight);
+
       doc.setFont('helvetica', 'bold');
       doc.text('Payment Information:', 20, paymentY);
 
@@ -197,7 +252,7 @@ export class InvoiceService {
       let found = false;
       for (let i = 0; i < paymentsData.length; i++) {
         if (paymentsData[i].referenceNumber === paymentId ||
-            paymentsData[i].transactionId === paymentId) {
+          paymentsData[i].transactionId === paymentId) {
           paymentsData[i].invoicePath = invoicePath;
           found = true;
           break;

functions/src/payments/phonepe/paymentData.ts

@@ -3,7 +3,6 @@ import { getAdmin, getLogger } from "../../shared/config";
 const admin = getAdmin();
 const logger = getLogger();
 
-// Define an interface for the payment data to avoid type errors
 interface PaymentData {
   id: string;
   date: string;
@@ -14,7 +13,7 @@ interface PaymentData {
   discount: any;
   transactionId: string;
   createdAt: Date;
-  invoicePath?: string; // Make this optional
+  invoicePath?: string;
 }
 
 export async function updatePaymentDataAfterSuccess(
@@ -24,7 +23,6 @@ export async function updatePaymentDataAfterSuccess(
   invoicePath?: string
 ): Promise<boolean> {
   try {
-    // Get the payment order from Firestore
     const orderQuery = await admin.firestore()
       .collection('payment_orders')
       .where('merchantOrderId', '==', merchantOrderId)
@@ -39,19 +37,17 @@ export async function updatePaymentDataAfterSuccess(
     const orderDoc = orderQuery.docs[0];
     const orderData = orderDoc.data();
     
-    // Extract membership ID from metaInfo
     const membershipId = orderData.metaInfo?.membershipId;
     if (!membershipId) {
       logger.error(`No membershipId found in metaInfo for order: ${merchantOrderId}`);
       return false;
     }
     
-    const isoDate = new Date().toLocaleDateString('en-GB').split('/').join('-'); // DD-MM-YYYY format
+    const isoDate = new Date().toLocaleDateString('en-GB').split('/').join('-');
     const dateTimestamp = admin.firestore.Timestamp.now();
     
-    // Create payment data object with proper typing
     const paymentData: PaymentData = {
-      id: admin.firestore().collection('_').doc().id, // Generate a UUID
+      id: admin.firestore().collection('_').doc().id,
       date: isoDate,
       dateTimestamp: dateTimestamp,
       amount: orderData.amount,
@@ -62,19 +58,16 @@ export async function updatePaymentDataAfterSuccess(
       createdAt: new Date()
     };
     
-    // Add invoice path if provided
     if (invoicePath) {
       paymentData.invoicePath = invoicePath;
     }
     
-    // Get reference to membership payments document
     const membershipPaymentsRef = admin.firestore()
       .collection('membership_payments')
       .doc(membershipId);
     
     const docSnapshot = await membershipPaymentsRef.get();
     
-    // Update or create the membership payments document
     if (docSnapshot.exists) {
       await membershipPaymentsRef.update({
         'payments': admin.firestore.FieldValue.arrayUnion(paymentData),
@@ -92,7 +85,6 @@ export async function updatePaymentDataAfterSuccess(
       });
     }
     
-    // Update membership status
     await updateMembershipStatus(membershipId, orderData.userId);
     
     logger.info(`Successfully updated payment data for membership: ${membershipId}`);
@@ -118,7 +110,7 @@ async function updateMembershipStatus(membershipId: string, userId: string): Pro
       .collection('memberships')
       .doc(membershipId)
       .update({
-        'status': 'ACTIVE', // Assuming this matches your InvitationStatus.active
+        'status': 'ACTIVE',
         'updatedAt': admin.firestore.FieldValue.serverTimestamp(),
       });