feat: enrich invoice summary with session payments, consumables and discount
Port the remaining gap of tauri /files/invoice-summary into the admin
invoice summary: GET /api/v1/billing/invoices/{uuid} now includes a
'session' key (full PatientSession payload) so InvoiceSummaryModal can
render the consumables table, the itemized payments table (method,
amount, date-time, recorder) and real discount/paid/remaining figures
instead of heuristics. Invoices without a source session keep the
previous behavior (session: null).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,101 @@
|
||||
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
||||
import { screen, waitFor } from '@testing-library/react';
|
||||
import { renderWithProviders } from '../test/utils';
|
||||
|
||||
vi.mock('../lib/api', () => ({
|
||||
api: { get: vi.fn(), post: vi.fn(), patch: vi.fn(), put: vi.fn(), delete: vi.fn() },
|
||||
ApiError: class extends Error {},
|
||||
}));
|
||||
|
||||
import { api } from '../lib/api';
|
||||
import InvoiceSummaryModal from './InvoiceSummaryModal';
|
||||
|
||||
const get = api.get as ReturnType<typeof vi.fn>;
|
||||
|
||||
const baseInvoice = {
|
||||
uuid: 'iv1', status: 'finalized', issued_at: 1700000000, total_rials: 2_400_000,
|
||||
base_insurance_rials: 0, supplementary_rials: 0, patient_rials: 900_000,
|
||||
items: [{ uuid: 'it1', title: 'فول بادی', quantity: 1, total_rials: 2_400_000, patient_rials: 900_000 }],
|
||||
};
|
||||
|
||||
const fullSession = {
|
||||
session_at: 1700000000, paid_at: 1700100000,
|
||||
services_total_rials: 2_400_000, consumables_total_rials: 40_000,
|
||||
discount_rials: 200_000, final_price_rials: 2_240_000, paid_total_rials: 1_500_000,
|
||||
payments: [
|
||||
{ uuid: 'p1', method: 'wallet', amount_rials: 1_500_000, paid_at: 1700100000, created_by_name: 'منشی تست' },
|
||||
],
|
||||
consumables: [
|
||||
{ uuid: 'c1', item_name: 'عینک', quantity: 2, line_total_rials: 40_000 },
|
||||
],
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
get.mockReset();
|
||||
});
|
||||
|
||||
function mockInvoice(invoice: object) {
|
||||
get.mockResolvedValue({ success: true, data: { data: invoice } });
|
||||
}
|
||||
|
||||
describe('InvoiceSummaryModal', () => {
|
||||
it('با session کامل: جدول کالای مصرفی، پرداختیها و تخفیف را نشان میدهد', async () => {
|
||||
mockInvoice({ ...baseInvoice, session: fullSession });
|
||||
renderWithProviders(<InvoiceSummaryModal invoiceUuid="iv1" onClose={() => {}} />);
|
||||
|
||||
await waitFor(() => expect(screen.getByText('اطلاعات فاکتور')).toBeInTheDocument());
|
||||
|
||||
// کالای مصرفی
|
||||
expect(screen.getByText('اطلاعات کالای مصرفی')).toBeInTheDocument();
|
||||
expect(screen.getByText('عینک')).toBeInTheDocument();
|
||||
|
||||
// پرداختیها با label فارسی روش و ثبتکننده
|
||||
expect(screen.getByText('پرداختی ها')).toBeInTheDocument();
|
||||
expect(screen.getByText('پرداخت از کیف پول')).toBeInTheDocument();
|
||||
expect(screen.getByText('منشی تست')).toBeInTheDocument();
|
||||
|
||||
// خلاصه مالی با ستون تخفیف و جمع کالا
|
||||
expect(screen.getByText('تخفیف')).toBeInTheDocument();
|
||||
expect(screen.getByText('جمع مبلغ کالا')).toBeInTheDocument();
|
||||
|
||||
// وضعیت — مبالغ واقعی (نمایش تومان = ریال ÷ ۱۰):
|
||||
// پرداختشده ۱۵۰٬۰۰۰ (هم در جدول پرداختیها هم وضعیت) و باقیمانده ۷۴٬۰۰۰
|
||||
expect(screen.getAllByText(/۱۵۰٬۰۰۰/).length).toBeGreaterThanOrEqual(2);
|
||||
expect(screen.getByText(/۷۴٬۰۰۰/)).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('بدون session (فاکتور قدیمی): رفتار قبلی حفظ میشود', async () => {
|
||||
mockInvoice({ ...baseInvoice, session: null });
|
||||
renderWithProviders(<InvoiceSummaryModal invoiceUuid="iv1" onClose={() => {}} />);
|
||||
|
||||
await waitFor(() => expect(screen.getByText('اطلاعات فاکتور')).toBeInTheDocument());
|
||||
|
||||
// جدولهای session-محور رندر نمیشوند
|
||||
expect(screen.queryByText('اطلاعات کالای مصرفی')).not.toBeInTheDocument();
|
||||
expect(screen.queryByText('پرداختی ها')).not.toBeInTheDocument();
|
||||
|
||||
// خلاصه مالی قدیمی با سهم بیمار
|
||||
expect(screen.getByText('سهم بیمار')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('session با payments/consumables خالی: ردیف خط تیره', async () => {
|
||||
mockInvoice({
|
||||
...baseInvoice,
|
||||
session: { ...fullSession, payments: [], consumables: [], paid_total_rials: 0, discount_rials: 0 },
|
||||
});
|
||||
renderWithProviders(<InvoiceSummaryModal invoiceUuid="iv1" onClose={() => {}} />);
|
||||
|
||||
await waitFor(() => expect(screen.getByText('اطلاعات فاکتور')).toBeInTheDocument());
|
||||
|
||||
expect(screen.getByText('اطلاعات کالای مصرفی')).toBeInTheDocument();
|
||||
expect(screen.getByText('پرداختی ها')).toBeInTheDocument();
|
||||
// ردیفهای '-' برای هر دو جدول خالی + ستون تخفیف صفر
|
||||
expect(screen.getAllByText('-').length).toBeGreaterThanOrEqual(8);
|
||||
});
|
||||
|
||||
it('invoiceUuid=null: مودال بسته و بدون fetch', () => {
|
||||
renderWithProviders(<InvoiceSummaryModal invoiceUuid={null} onClose={() => {}} />);
|
||||
expect(get).not.toHaveBeenCalled();
|
||||
expect(screen.queryByText('خلاصه فاکتور')).not.toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -2,13 +2,23 @@ import { useQuery } from '@tanstack/react-query';
|
||||
import { api } from '../lib/api';
|
||||
import type { ApiResponse } from '../lib/api';
|
||||
import Modal from './ui/Modal';
|
||||
import { formatDate, formatRial } from '../lib/utils';
|
||||
import { formatDate, formatDateTime, formatRial } from '../lib/utils';
|
||||
import { METHOD_LABELS } from './session/PaymentStep';
|
||||
|
||||
interface InvoiceItem { uuid: string; title: string; quantity: number; total_rials: number; patient_rials: number }
|
||||
interface SessionPayment { uuid: string; method: string; amount_rials: number; paid_at: number; created_by_name: string | null }
|
||||
interface SessionConsumable { uuid: string; item_name: string; quantity: number; line_total_rials: number }
|
||||
interface SessionData {
|
||||
session_at: number | null; paid_at: number | null;
|
||||
services_total_rials: number; consumables_total_rials: number;
|
||||
discount_rials: number; final_price_rials: number; paid_total_rials: number;
|
||||
payments: SessionPayment[]; consumables: SessionConsumable[];
|
||||
}
|
||||
interface Invoice {
|
||||
uuid: string; status: string; issued_at: number; total_rials: number;
|
||||
base_insurance_rials: number; supplementary_rials: number; patient_rials: number;
|
||||
items: InvoiceItem[];
|
||||
session?: SessionData | null;
|
||||
}
|
||||
|
||||
const STATUS_LABEL: Record<string, string> = { paid: 'پرداخت شده', finalized: 'بدهکار', draft: 'پیشنویس', void: 'باطل' };
|
||||
@@ -51,10 +61,14 @@ export default function InvoiceSummaryModal({ invoiceUuid, onClose }: { invoiceU
|
||||
});
|
||||
// billing show wraps as { data: { data: invoice } }
|
||||
const inv = ((data?.data as any)?.data ?? data?.data ?? null) as Invoice | null;
|
||||
const session = inv?.session ?? null;
|
||||
|
||||
const paid = inv?.status === 'paid';
|
||||
const remaining = inv ? (paid ? 0 : inv.patient_rials) : 0;
|
||||
const paidAmount = inv ? inv.total_rials - remaining : 0;
|
||||
// با session: مبالغ واقعی پرداخت؛ بدون آن (فاکتور قدیمی): heuristic قبلی.
|
||||
const remaining = session
|
||||
? session.final_price_rials - session.paid_total_rials
|
||||
: inv ? (paid ? 0 : inv.patient_rials) : 0;
|
||||
const paidAmount = session ? session.paid_total_rials : inv ? inv.total_rials - remaining : 0;
|
||||
|
||||
return (
|
||||
<Modal open={!!invoiceUuid} onClose={onClose} title="خلاصه فاکتور" size="xl">
|
||||
@@ -65,21 +79,62 @@ export default function InvoiceSummaryModal({ invoiceUuid, onClose }: { invoiceU
|
||||
<SectionTable
|
||||
title="اطلاعات فاکتور"
|
||||
cols={['تاریخ سرویس', 'تاریخ پرداخت', 'وضعیت پرداخت']}
|
||||
rows={[[formatDate(inv.issued_at), paid ? formatDate(inv.issued_at) : '—', STATUS_LABEL[inv.status] ?? inv.status]]}
|
||||
rows={[[
|
||||
formatDate(session?.session_at ?? inv.issued_at),
|
||||
session?.paid_at ? formatDate(session.paid_at) : paid ? formatDate(inv.issued_at) : '—',
|
||||
STATUS_LABEL[inv.status] ?? inv.status,
|
||||
]]}
|
||||
/>
|
||||
<SectionTable
|
||||
title="اطلاعات سرویس"
|
||||
cols={['سرویس', 'تعداد', 'مبلغ']}
|
||||
rows={inv.items.length ? inv.items.map((it) => [it.title, it.quantity, formatRial(it.total_rials)]) : [['—', '—', '—']]}
|
||||
/>
|
||||
<SectionTable
|
||||
title="خلاصه مالی"
|
||||
cols={['جمع مبلغ سرویس', 'سهم بیمه پایه', 'سهم بیمه تکمیلی', 'سهم بیمار', 'مبلغ کل']}
|
||||
rows={[[
|
||||
formatRial(inv.total_rials), formatRial(inv.base_insurance_rials),
|
||||
formatRial(inv.supplementary_rials), formatRial(inv.patient_rials), formatRial(inv.total_rials),
|
||||
]]}
|
||||
/>
|
||||
{session && (
|
||||
<SectionTable
|
||||
title="اطلاعات کالای مصرفی"
|
||||
cols={['کالای مصرفی', 'تعداد', 'مبلغ']}
|
||||
rows={session.consumables.length
|
||||
? session.consumables.map((c) => [c.item_name, c.quantity, formatRial(c.line_total_rials)])
|
||||
: [['-', '-', '-']]}
|
||||
/>
|
||||
)}
|
||||
{session ? (
|
||||
<SectionTable
|
||||
title="خلاصه مالی"
|
||||
cols={['جمع مبلغ سرویس', 'جمع مبلغ کالا', 'تخفیف', 'سهم بیمه پایه', 'سهم بیمه تکمیلی', 'مبلغ کل']}
|
||||
rows={[[
|
||||
formatRial(session.services_total_rials), formatRial(session.consumables_total_rials),
|
||||
session.discount_rials > 0 ? formatRial(session.discount_rials) : '-',
|
||||
formatRial(inv.base_insurance_rials), formatRial(inv.supplementary_rials),
|
||||
formatRial(session.final_price_rials),
|
||||
]]}
|
||||
/>
|
||||
) : (
|
||||
<SectionTable
|
||||
title="خلاصه مالی"
|
||||
cols={['جمع مبلغ سرویس', 'سهم بیمه پایه', 'سهم بیمه تکمیلی', 'سهم بیمار', 'مبلغ کل']}
|
||||
rows={[[
|
||||
formatRial(inv.total_rials), formatRial(inv.base_insurance_rials),
|
||||
formatRial(inv.supplementary_rials), formatRial(inv.patient_rials), formatRial(inv.total_rials),
|
||||
]]}
|
||||
/>
|
||||
)}
|
||||
{session && (
|
||||
<SectionTable
|
||||
title="پرداختی ها"
|
||||
cols={['ردیف', 'شیوه پرداخت', 'مبلغ', 'تاریخ و ساعت', 'ثبتکننده']}
|
||||
rows={session.payments.length
|
||||
? session.payments.map((p, i) => [
|
||||
i + 1,
|
||||
METHOD_LABELS[p.method] ?? p.method,
|
||||
formatRial(p.amount_rials),
|
||||
p.paid_at ? formatDateTime(p.paid_at) : '-',
|
||||
p.created_by_name ?? '-',
|
||||
])
|
||||
: [['-', '-', '-', '-', '-']]}
|
||||
/>
|
||||
)}
|
||||
<SectionTable
|
||||
title="وضعیت"
|
||||
cols={['مبلغ کل پرداخت شده', 'مبلغ باقی مانده']}
|
||||
|
||||
Reference in New Issue
Block a user