diff --git a/distribution_fe/app/(dashboard)/sales/invoices/[id]/page.tsx b/distribution_fe/app/(dashboard)/sales/invoices/[id]/page.tsx index 6e4f4fc..670245a 100644 --- a/distribution_fe/app/(dashboard)/sales/invoices/[id]/page.tsx +++ b/distribution_fe/app/(dashboard)/sales/invoices/[id]/page.tsx @@ -179,6 +179,7 @@ export default function InvoiceViewPage() {
+ {invoice.discountAmount > 0 && } diff --git a/distribution_fe/lib/api/reports.ts b/distribution_fe/lib/api/reports.ts index ce91694..a620d4e 100644 --- a/distribution_fe/lib/api/reports.ts +++ b/distribution_fe/lib/api/reports.ts @@ -163,6 +163,7 @@ export const productReports = { export interface SalesKpis { grossSales: number returnValue: number + discounts: number netSales: number orders: number averageOrderValue: number @@ -170,11 +171,19 @@ export interface SalesKpis { grossProfitMarginPercent: number | null } +export interface CashKpis { + collected: number + outstanding: number + overdue: number + collectionRatePercent: number | null +} + export interface DashboardSalesSummary { from: string to: string granularity: 'day' | 'month' kpis: { current: SalesKpis; previous: SalesKpis; previousFrom: string; previousTo: string } + cash: { current: CashKpis; previous: CashKpis } trend: Array<{ period: string; sales: number; returns: number }> byCategory: Array<{ id: string | null; name: string; amount: number }> byRegion: Array<{ id: string | null; name: string; amount: number }> diff --git a/distribution_fe/types/api.ts b/distribution_fe/types/api.ts index c0885e1..5ec5790 100644 --- a/distribution_fe/types/api.ts +++ b/distribution_fe/types/api.ts @@ -1045,6 +1045,7 @@ export interface InvoiceResponse { finalizedAt: string | null finalizedBy: string | null totalAmount: number + discountAmount: number paidAmount: number isActive: boolean createdAt: string