[update]: refactoring some files

apps/web/src/app/api/auth/[...nextauth]/route.ts

@@ -8,12 +8,12 @@ const isAllowedUser = (email: string | undefined | null) => {
   if (!email) {
     return null
   }
-  const userEmailname = email.split('@')[0]
-  if (!userEmailname) {
+  const userEmailName = email.split('@')[0]
+  if (!userEmailName) {
     return null
   }
-  console.log('your username ->', userEmailname)
-  return ALLOWED_USER.includes(userEmailname)
+  console.log('your username ->', userEmailName)
+  return ALLOWED_USER.includes(userEmailName)
 } // Todo: Currently in dev mode will be removed
 
 export const authOptions = {

apps/web/src/app/api/crons/invoices/update-status/route.ts

@@ -49,7 +49,7 @@ export async function GET(request: Request) {
     )
     return Response.json({
       ok: true,
-      data: 'Your cron job for updating overdue payment is successful done',
+      data: 'Your cron job for updating overdue payments has been successfully completed.',
       status: 200
     })
   } catch (error) {

apps/web/src/app/api/customer/route.ts

@@ -21,7 +21,9 @@ export async function GET() {
 
     const response = await db.customerInfo.findMany({
       where: {
-        organisationId: orgId
+        organization: {
+          id: orgId
+        }
       },
       select: {
         id: true,
@@ -31,7 +33,7 @@ export async function GET() {
       }
     })
 
-    return Response.json({ ok: true, data: response, staus: 200 })
+    return Response.json({ ok: true, data: response, status: 200 })
   } catch (error) {
     console.error('Error:', error)
     return Response.json({ ok: false, data: null, status: 500 })
@@ -56,7 +58,11 @@ export async function POST(request: Request) {
     const data: Customer = await request.json()
     const customerRes = await db.customerInfo.create({
       data: {
-        organisationId: orgId,
+        organization: {
+          connect: {
+            id: orgId
+          }
+        },
         legalName: data.legalName,
         email: data.email,
         whatsAppNumber: data.whatsAppNumber

apps/web/src/app/api/customer/search/route.ts

@@ -23,10 +23,12 @@ export async function GET(request: Request) {
     const query = searchParams.get('query')
     const response = await db.customerInfo.findMany({
       where: {
-        organisationId: orgId,
+        organization: {
+          id: orgId
+        },
         OR: [
-          { legalName: { contains: query || '', mode: 'insensitive' } },
-          { email: { contains: query || '', mode: 'insensitive' } }
+          { legalName: { contains: query ?? '', mode: 'insensitive' } },
+          { email: { contains: query ?? '', mode: 'insensitive' } }
         ]
       },
       select: {
@@ -37,7 +39,7 @@ export async function GET(request: Request) {
       }
     })
 
-    return Response.json({ ok: true, data: response, staus: 200 })
+    return Response.json({ ok: true, data: response, status: 200 })
   } catch (error) {
     console.error('Error:', error)
     return Response.json({ ok: false, data: null, status: 500 })

apps/web/src/app/api/events/invoice/route.ts

@@ -8,7 +8,7 @@ async function handler(req: NextRequest) {
   await Processor.handleMessage(body)
   return NextResponse.json({
     ok: true,
-    data: 'job received successfully',
+    data: 'Job received successfully',
     status: 200
   })
 }

apps/web/src/app/api/invoice/[id]/approval/route.ts

@@ -57,7 +57,7 @@ export async function PATCH(
     return Response.json({
       ok: true,
       data:
-        'Congratulation you have approved the invoice. Your Invoice no. is INV-' +
+        'Congratulations you have approved the invoice. Your Invoice no. is INV-' +
         response.invoiceNumber +
         '. Pay the invoice before due date.',
       status: 200

apps/web/src/app/api/invoice/[id]/og/route.tsx

@@ -1,6 +1,6 @@
 import { db } from '@/lib/db'
 import { ImageResponse } from '@vercel/og'
-import { formatAmountWithRs, formatDate, numTowords } from 'helper/format'
+import { formatAmountWithRs, formatDate, numToWords } from 'helper/format'
 // export const runtime = 'edge'
 
 export async function GET(
@@ -184,7 +184,7 @@ export async function GET(
             <div tw='mt-4 w-full flex justify-center mt-2'>
               <p tw='text-[#718096] text-xs px-4 w-full'>
                 Total Amount (in words) :
-                {numTowords.convert(invoice?.totalAmount || 0, {
+                {numToWords.convert(invoice?.totalAmount || 0, {
                   currency: true
                 })}
               </p>

apps/web/src/app/api/invoice/[id]/route.ts

@@ -109,7 +109,7 @@ export async function PATCH(
       )
       return Response.json({
         ok: false,
-        data: 'Invalid data, please check data',
+        data: 'Invalid data, please check the data you are sending.',
         status: 409
       })
     }
@@ -143,8 +143,8 @@ export async function PATCH(
           title: 'Invoice Approval Status Change',
           description:
             approvalStatus === 'APPROVED'
-              ? 'You approved the invoice.'
-              : 'You reject the invoice.',
+              ? 'You have approved the invoice.'
+              : 'You have rejected the invoice.',
           oldStatus: 'UNAPPROVED',
           newStatus: approvalStatus
         }
@@ -160,7 +160,7 @@ export async function PATCH(
           invoiceId: invoiceId,
           actionType: 'APPROVAL_ACTION',
           title: 'Invoice Approval Status Change',
-          description: 'You approved the invoice.',
+          description: 'You have approved the invoice.',
           oldStatus: 'REJECTED',
           newStatus: 'APPROVED'
         }

apps/web/src/app/api/invoice/route.ts

@@ -94,8 +94,8 @@ export async function POST(request: Request) {
         auditTrailEntries: {
           create: {
             actionType: 'MANUAL_CREATION',
-            title: 'Invoice Manually Created',
-            description: 'You manually created a new invoice.',
+            title: 'Invoice Created Manually',
+            description: 'You have manually created a new invoice.',
             oldStatus: 'N/A',
             newStatus: 'CREATED'
           }

apps/web/src/app/api/magiclinks/invoice/route.ts

@@ -4,7 +4,7 @@ import jwt from 'jsonwebtoken'
 export const dynamic = 'force-dynamic'
 export async function GET(request: Request) {
   try {
-    const secret = process.env.INVOICE_APPROVAL_SECRET_KEY || ''
+    const secret = process.env.INVOICE_APPROVAL_SECRET_KEY ?? ''
 
     const { searchParams } = new URL(request.url)
     const token = searchParams.get('token')

apps/web/src/app/api/organization/route.ts

@@ -100,7 +100,7 @@ export async function POST(request: Request) {
     return Response.json({
       ok: true,
       data: { orgName: orgResponse.orgName, state: orgResponse.state },
-      staus: 200
+      status: 200
     })
   } catch (error) {
     console.error('Error:', error)

apps/web/src/app/manual/invoice/page.tsx

@@ -124,8 +124,8 @@ const createInvoice = () => {
               <div className='w-full text-center'>
                 <h1 className='text-2xl font-semibold'>New Invoice</h1>
                 <p className='text-xs font-medium mt-2'>
-                  Fill in the fields, preview invoice and send it emailed or
-                  whatsapp directly to client.
+                  Complete the fields, preview the invoice, and then send it
+                  directly to the client via email or WhatsApp.
                 </p>
               </div>
             </div>

packages/helpers/src/format.ts

@@ -50,7 +50,7 @@ export const formatDate = (inputDate: Date | undefined) => {
   return formattedDate
 }
 
-export const numTowords = new ToWords({
+export const numToWords = new ToWords({
   localeCode: 'en-IN',
   converterOptions: {
     currency: true,