refactor(billing): rebuild payments list as flat invoice list (tauri parity)
Align /admin/my-payments with the tauri /payments source (per user): the list
is now a flat, newest-first list of the tenant's recorded invoices — one row
per invoice — instead of the per-patient aggregation built from Figma.
Backend:
- replace InvoiceRepository::patientPaymentSummary aggregation with
tenantInvoices/countTenantInvoices (flat, joins patient name/national code).
- InvoiceService::patientPaymentList → tenantInvoiceList.
- BillingController: GET /api/v1/my/billing/patient-payments →
GET /api/v1/my/billing/payments returning
{ invoice_uuid, patient_uuid, patient_name, national_code, issued_at,
amount_rials, status } rows.
- node-2 patient invoices endpoint unchanged.
Frontend:
- useMyPayments: usePatientPayments → usePayments (flat PaymentRow).
- MyPaymentsPage columns match tauri DetailT: row #, avatar+name, national
code, date-time, amount paid, مشاهده (no status column); 'اضافه کردن بیمار'
links to /admin/patients/new. Filters (national code / status / Jalali date
range) kept.
Tests + docs/api/billing.md updated. Intentionally omitted tauri extras:
mobile Cards view and the advanced ModalFilter.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -15,10 +15,10 @@ import MyPaymentsPage from './MyPaymentsPage';
|
||||
const get = api.get as ReturnType<typeof vi.fn>;
|
||||
|
||||
const ROWS = [
|
||||
{ patient_uuid: 'p1', patient_name: 'دنیا خلیلی', national_code: '1744023654',
|
||||
invoice_count: 2, paid_rials: 2350000, remaining_rials: 500000, status: 'unsettled' },
|
||||
{ patient_uuid: 'p2', patient_name: 'علی بدیعی', national_code: '2200112233',
|
||||
invoice_count: 1, paid_rials: 2000000, remaining_rials: 0, status: 'paid' },
|
||||
{ invoice_uuid: 'iv1', patient_uuid: 'p1', patient_name: 'دنیا خلیلی', national_code: '1744023654',
|
||||
issued_at: 1717000000, amount_rials: 2350000, status: 'paid' },
|
||||
{ invoice_uuid: 'iv2', patient_uuid: 'p2', patient_name: 'علی بدیعی', national_code: '2200112233',
|
||||
issued_at: 1718000000, amount_rials: 6000000, status: 'unsettled' },
|
||||
];
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -28,14 +28,12 @@ beforeEach(() => {
|
||||
});
|
||||
|
||||
describe('MyPaymentsPage (لیست پرداختها)', () => {
|
||||
it('renders patient payment rows with derived status labels', async () => {
|
||||
it('renders a flat row per invoice with patient name and national code', async () => {
|
||||
renderWithProviders(<MyPaymentsPage />, { route: '/admin/my-payments' });
|
||||
expect(await screen.findByText('دنیا خلیلی')).toBeInTheDocument();
|
||||
expect(screen.getByText('علی بدیعی')).toBeInTheDocument();
|
||||
// status labels appear both as a filter <option> and as a row badge
|
||||
expect(screen.getAllByText('تسویه نشده').length).toBeGreaterThan(1);
|
||||
expect(screen.getAllByText('پرداخت شده').length).toBeGreaterThan(1);
|
||||
expect(screen.getByText('1744023654')).toBeInTheDocument();
|
||||
expect(screen.getByText('2200112233')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('navigates to the patient detail on مشاهده', async () => {
|
||||
|
||||
Reference in New Issue
Block a user