From 6b56351a49a1eb429b4d7f8869493acc8319475f Mon Sep 17 00:00:00 2001 From: Vaibhav Surve Date: Wed, 12 Nov 2025 11:53:43 +0530 Subject: [PATCH] displayed possible filds in details screen --- .../payment_request_detail_screen.dart | 63 ++++++++++++++++++- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/lib/view/finance/payment_request_detail_screen.dart b/lib/view/finance/payment_request_detail_screen.dart index 4230de8..49ffcb6 100644 --- a/lib/view/finance/payment_request_detail_screen.dart +++ b/lib/view/finance/payment_request_detail_screen.dart @@ -627,14 +627,71 @@ class _DetailsTable extends StatelessWidget { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + // Basic Info _labelValueRow("Payment Request ID:", request.paymentRequestUID), + if (request.paidTransactionId != null && request.paidTransactionId!.isNotEmpty) + _labelValueRow("Transaction ID:", request.paidTransactionId!), + _labelValueRow("Payee:", request.payee), + _labelValueRow("Project:", request.project.name), _labelValueRow("Expense Category:", request.expenseCategory.name), - _labelValueRow("Amount:", - "${request.currency.symbol} ${request.amount.toStringAsFixed(2)}"), + + // Amounts + _labelValueRow( + "Amount:", "${request.currency.symbol} ${request.amount.toStringAsFixed(2)}"), + if (request.baseAmount != null) + _labelValueRow( + "Base Amount:", "${request.currency.symbol} ${request.baseAmount!.toStringAsFixed(2)}"), + if (request.taxAmount != null) + _labelValueRow( + "Tax Amount:", "${request.currency.symbol} ${request.taxAmount!.toStringAsFixed(2)}"), + if (request.expenseCategory.noOfPersonsRequired) + _labelValueRow("Additional Persons Required:", "Yes"), + if (request.expenseCategory.isAttachmentRequried) + _labelValueRow("Attachment Required:", "Yes"), + + // Dates _labelValueRow( "Due Date:", - DateTimeUtils.convertUtcToLocal(request.dueDate.toIso8601String(), + DateTimeUtils.convertUtcToLocal( + request.dueDate.toIso8601String(), format: 'dd MMM yyyy')), + _labelValueRow( + "Created At:", + DateTimeUtils.convertUtcToLocal( + request.createdAt.toIso8601String(), + format: 'dd MMM yyyy')), + _labelValueRow( + "Updated At:", + DateTimeUtils.convertUtcToLocal( + request.updatedAt.toIso8601String(), + format: 'dd MMM yyyy')), + + // Payment Info + if (request.paidAt != null) + _labelValueRow( + "Transaction Date:", + DateTimeUtils.convertUtcToLocal( + request.paidAt!.toIso8601String(), + format: 'dd MMM yyyy')), + if (request.paidBy != null) + _labelValueRow( + "Paid By:", "${request.paidBy!.firstName} ${request.paidBy!.lastName}"), + + // Flags + _labelValueRow("Advance Payment:", request.isAdvancePayment ? "Yes" : "No"), + _labelValueRow("Expense Created:", request.isExpenseCreated ? "Yes" : "No"), + _labelValueRow("Active:", request.isActive ? "Yes" : "No"), + + // Recurring Payment Info + if (request.recurringPayment != null) ...[ + const SizedBox(height: 6), + MyText.bodySmall("Recurring Payment Info:", fontWeight: 600), + _labelValueRow("Recurring ID:", request.recurringPayment!.recurringPaymentUID), + _labelValueRow("Amount:", "${request.currency.symbol} ${request.recurringPayment!.amount.toStringAsFixed(2)}"), + _labelValueRow("Variable Amount:", request.recurringPayment!.isVariable ? "Yes" : "No"), + ], + + // Description & Attachments _labelValueRow("Description:", request.description), _labelValueRow( "Attachment:", request.attachments.isNotEmpty ? "Yes" : "No"),