From 5e6b03ef08e5a86c86e94fee0bf7b7793f8844e8 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Tue, 30 Dec 2025 21:17:37 +0700 Subject: [PATCH] refactor(FE-435,436): Use location name as fallback for expense titles --- src/components/pages/expense/ExpenseRequestContent.tsx | 4 +++- .../expense/form/ExpenseRealizationKandangDetailExpense.tsx | 6 +++++- src/components/pages/expense/pdf/ExpensePDF.tsx | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/pages/expense/ExpenseRequestContent.tsx b/src/components/pages/expense/ExpenseRequestContent.tsx index bff371df..006c95d1 100644 --- a/src/components/pages/expense/ExpenseRequestContent.tsx +++ b/src/components/pages/expense/ExpenseRequestContent.tsx @@ -588,7 +588,9 @@ const ExpenseRequestContent = ({ colSpan={5} className='font-bold text-center text-base-content text-lg' > - Biaya {kandangExpense.name} + {kandangExpense.name + ? `Biaya ${kandangExpense.name}` + : `Biaya ${initialValues?.location.name || 'Umum'}`} diff --git a/src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx b/src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx index 3482389f..3f6f2220 100644 --- a/src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx +++ b/src/components/pages/expense/form/ExpenseRealizationKandangDetailExpense.tsx @@ -128,7 +128,11 @@ const ExpenseRealizationKandangDetailExpense: React.FC< >
- Biaya {kandangName?.name || location?.label || 'Umum'} + {kandangName?.name + ? `Biaya ${kandangName.name}` + : location?.label + ? `Biaya ${location.label}` + : 'Biaya Umum'}
diff --git a/src/components/pages/expense/pdf/ExpensePDF.tsx b/src/components/pages/expense/pdf/ExpensePDF.tsx index c9c63203..5d057740 100644 --- a/src/components/pages/expense/pdf/ExpensePDF.tsx +++ b/src/components/pages/expense/pdf/ExpensePDF.tsx @@ -340,7 +340,9 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => { style={ExpensePDFStyle.kandangExpenseContainer} > - {kandangExpense.name} + {kandangExpense.name + ? `Biaya ${kandangExpense.name}` + : `Biaya ${expense?.location.name || 'Umum'}`}