Bernt Christian Egeland пре 9 месеци
родитељ
комит
69e6bb0be4

+ 3 - 1
src/app/(public)/share/invoice/[orgId]/[token]/invoice-view.tsx

@@ -34,6 +34,7 @@ interface InvoiceRecord {
   totalAmount: number
   cost: number
   invoiceNumber: string | null
+  manuallyPaid: boolean
   discountType: string | null
   discountValue: number
   discountAmount: number
@@ -136,7 +137,8 @@ export function InvoiceView({
   const df = dateFormat || DEFAULT_DATE_FORMAT
   const tz = timezone || undefined
   const serviceDate = fmtDate(record.serviceDate, df, tz)
-  const totalPaid = record.payments.reduce((sum, p) => sum + p.amount, 0)
+  const paidFromPayments = record.payments.reduce((sum, p) => sum + p.amount, 0)
+  const totalPaid = record.manuallyPaid ? displayTotal : paidFromPayments
   const balanceDue = displayTotal - totalPaid
   const shopName = workshop.name || record.shopName || 'Torqvoice'
 

+ 7 - 3
src/app/api/services/[id]/pdf/route.ts

@@ -147,10 +147,14 @@ export async function GET(
     const pdfDateFormat = settingsMap["workshop.dateFormat"] || undefined;
     const pdfTimezone = settingsMap["workshop.timezone"] || undefined;
 
-    const paymentSummary = record.payments && record.payments.length > 0
+    const paidFromPayments = record.payments?.reduce((sum: number, p: { amount: number }) => sum + p.amount, 0) ?? 0;
+    const effectiveTotal = record.totalAmount > 0 ? record.totalAmount : record.cost;
+    const totalPaidForPdf = record.manuallyPaid ? effectiveTotal : paidFromPayments;
+
+    const paymentSummary = (record.payments && record.payments.length > 0) || record.manuallyPaid
       ? {
-          totalPaid: record.payments.reduce((sum: number, p: { amount: number }) => sum + p.amount, 0),
-          payments: record.payments.map((p: { amount: number; date: Date; method: string }) => ({
+          totalPaid: totalPaidForPdf,
+          payments: (record.payments || []).map((p: { amount: number; date: Date; method: string }) => ({
             amount: p.amount,
             date: formatDateForPdf(p.date, pdfDateFormat, pdfTimezone),
             method: p.method,

+ 2 - 1
src/app/api/share/invoice/[orgId]/[token]/checkout/route.ts

@@ -47,7 +47,8 @@ export async function POST(
     // Calculate balance due
     const displayTotal =
       record.totalAmount > 0 ? record.totalAmount : record.cost;
-    const totalPaid = record.payments.reduce((sum, p) => sum + p.amount, 0);
+    const paidFromPayments = record.payments.reduce((sum, p) => sum + p.amount, 0);
+    const totalPaid = record.manuallyPaid ? displayTotal : paidFromPayments;
     const balanceDue = displayTotal - totalPaid;
 
     if (balanceDue <= 0) {

+ 6 - 2
src/app/api/share/invoice/[orgId]/[token]/pdf/route.ts

@@ -102,9 +102,13 @@ export async function GET(
     const pdfDateFormat = settingsMap["workshop.dateFormat"] || undefined;
     const pdfTimezone = settingsMap["workshop.timezone"] || undefined;
 
-    const paymentSummary = record.payments.length > 0
+    const paidFromPayments = record.payments.reduce((sum: number, p: { amount: number }) => sum + p.amount, 0);
+    const effectiveTotal = record.totalAmount > 0 ? record.totalAmount : record.cost;
+    const totalPaidForPdf = record.manuallyPaid ? effectiveTotal : paidFromPayments;
+
+    const paymentSummary = record.payments.length > 0 || record.manuallyPaid
       ? {
-          totalPaid: record.payments.reduce((sum: number, p: { amount: number }) => sum + p.amount, 0),
+          totalPaid: totalPaidForPdf,
           payments: record.payments.map((p: { amount: number; date: Date; method: string }) => ({
             amount: p.amount,
             date: formatDateForPdf(p.date, pdfDateFormat, pdfTimezone),

+ 26 - 13
src/features/billing/Actions/billingActions.ts

@@ -34,7 +34,10 @@ async function getBillingSummary(organizationId: string): Promise<BillingSummary
       SELECT
         sr."totalAmount" AS total,
         sr.cost,
-        COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0) AS paid
+        CASE WHEN sr."manuallyPaid" = true
+          THEN CASE WHEN sr."totalAmount" > 0 THEN sr."totalAmount" ELSE sr.cost END
+          ELSE COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0)
+        END AS paid
       FROM service_records sr
       JOIN vehicles v ON v.id = sr."vehicleId"
       WHERE v."organizationId" = ${organizationId}
@@ -106,7 +109,10 @@ export async function getBillingHistory(params: {
           SELECT
             sr.id,
             CASE WHEN sr."totalAmount" > 0 THEN sr."totalAmount" ELSE sr.cost END AS effective_total,
-            COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0) AS paid_amount
+            CASE WHEN sr."manuallyPaid" = true
+              THEN CASE WHEN sr."totalAmount" > 0 THEN sr."totalAmount" ELSE sr.cost END
+              ELSE COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0)
+            END AS paid_amount
           FROM service_records sr
           JOIN vehicles v ON v.id = sr."vehicleId"
           WHERE v."organizationId" = ${organizationId}
@@ -158,7 +164,10 @@ export async function getBillingHistory(params: {
             sr."serviceDate",
             sr.status,
             CASE WHEN sr."totalAmount" > 0 THEN sr."totalAmount" ELSE sr.cost END AS effective_total,
-            COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0) AS paid_amount,
+            CASE WHEN sr."manuallyPaid" = true
+              THEN CASE WHEN sr."totalAmount" > 0 THEN sr."totalAmount" ELSE sr.cost END
+              ELSE COALESCE((SELECT SUM(p.amount) FROM payments p WHERE p."serviceRecordId" = sr.id), 0)
+            END AS paid_amount,
             v.id AS vehicle_id,
             v.make AS vehicle_make,
             v.model AS vehicle_model,
@@ -228,16 +237,20 @@ export async function getBillingHistory(params: {
     ]);
 
     return {
-      records: records.map((r) => ({
-        id: r.id,
-        title: r.title,
-        invoiceNumber: r.invoiceNumber,
-        serviceDate: r.serviceDate,
-        totalAmount: r.totalAmount > 0 ? r.totalAmount : r.cost,
-        totalPaid: r.payments.reduce((s, p) => s + p.amount, 0),
-        status: r.status,
-        vehicle: r.vehicle,
-      })),
+      records: records.map((r) => {
+        const effectiveTotal = r.totalAmount > 0 ? r.totalAmount : r.cost;
+        const totalPaid = r.manuallyPaid ? effectiveTotal : r.payments.reduce((s, p) => s + p.amount, 0);
+        return {
+          id: r.id,
+          title: r.title,
+          invoiceNumber: r.invoiceNumber,
+          serviceDate: r.serviceDate,
+          totalAmount: effectiveTotal,
+          totalPaid,
+          status: r.status,
+          vehicle: r.vehicle,
+        };
+      }),
       total,
       page,
       pageSize,

+ 2 - 1
src/features/reports/Actions/reportActions.ts

@@ -23,6 +23,7 @@ export async function getRevenueReport(params: {
         totalAmount: true,
         cost: true,
         type: true,
+        manuallyPaid: true,
         payments: { select: { amount: true } },
       },
       orderBy: { serviceDate: "asc" },
@@ -39,7 +40,7 @@ export async function getRevenueReport(params: {
 
     for (const r of records) {
       const total = r.totalAmount > 0 ? r.totalAmount : r.cost;
-      const paid = r.payments.reduce((s, p) => s + p.amount, 0);
+      const paid = r.manuallyPaid ? total : r.payments.reduce((s, p) => s + p.amount, 0);
       const month = `${r.serviceDate.getFullYear()}-${String(r.serviceDate.getMonth() + 1).padStart(2, "0")}`;
 
       if (!monthly[month]) monthly[month] = { revenue: 0, collected: 0, count: 0 };

+ 2 - 1
src/features/vehicles/Components/service-page/ServicePageClient.tsx

@@ -147,7 +147,8 @@ export function ServicePageClient({
   const [showEmailDialog, setShowEmailDialog] = useState(false)
 
   const displayTotal = totalAmount > 0 ? totalAmount : record.cost
-  const totalPaid = record.payments?.reduce((sum, p) => sum + p.amount, 0) || 0
+  const paidFromPayments = record.payments?.reduce((sum, p) => sum + p.amount, 0) || 0
+  const totalPaid = record.manuallyPaid ? displayTotal : paidFromPayments
   const balanceDue = displayTotal - totalPaid
   const paymentStatus = record.manuallyPaid
     ? 'paid'