update
This commit is contained in:
@ -94,66 +94,65 @@ const DetailTransaction = () => {
|
||||
}
|
||||
}, [showDetailDialog]);
|
||||
|
||||
const handleExport = async () => {
|
||||
if (!selectedTransactionId || !transactionDetails) return;
|
||||
const handleExport = async () => {
|
||||
if (!selectedTransactionId || !transactionDetails) return;
|
||||
|
||||
setIsExporting(true);
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${API_URL}/transaction/export?id_disbursment=${selectedTransactionId}`,
|
||||
{
|
||||
method: 'GET',
|
||||
headers: {
|
||||
Authorization: `Bearer ${getAuth()?.access_token}`
|
||||
setIsExporting(true);
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${API_URL}/transaction/export?id_disbursment=${selectedTransactionId}`,
|
||||
{
|
||||
method: 'GET',
|
||||
headers: {
|
||||
Authorization: `Bearer ${getAuth()?.access_token}`
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to fetch file');
|
||||
}
|
||||
|
||||
const blob = await response.blob();
|
||||
const contentDisposition = response.headers.get('content-disposition');
|
||||
|
||||
const executionDate = transactionDetails.execution_date;
|
||||
const formattedDate = executionDate
|
||||
? moment(executionDate).format('YYYYMMDD_HHmm')
|
||||
: moment().format('YYYYMMDD_HHmm');
|
||||
|
||||
let filename = `transaction_${formattedDate}.xlsx`;
|
||||
|
||||
if (contentDisposition) {
|
||||
const filenameMatch = contentDisposition.match(/filename\*?=(?:UTF-8'')?"?([^;"\n]*)"?/);
|
||||
if (filenameMatch && filenameMatch[1]) {
|
||||
filename = decodeURIComponent(filenameMatch[1]);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to fetch file');
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = filename;
|
||||
a.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
|
||||
toast.success('Export successful');
|
||||
} catch (error) {
|
||||
console.error('Error exporting transaction:', error);
|
||||
toast.error('Failed to export transaction');
|
||||
} finally {
|
||||
setIsExporting(false);
|
||||
}
|
||||
|
||||
const blob = await response.blob();
|
||||
const contentDisposition = response.headers.get('content-disposition');
|
||||
|
||||
const executionDate = transactionDetails.execution_date;
|
||||
const formattedDate = executionDate
|
||||
? moment(executionDate).format('YYYYMMDD_HHmm')
|
||||
: moment().format('YYYYMMDD_HHmm');
|
||||
|
||||
let filename = `transaction_${formattedDate}.xlsx`;
|
||||
|
||||
if (contentDisposition) {
|
||||
const filenameMatch = contentDisposition.match(/filename\*?=(?:UTF-8'')?"?([^;"\n]*)"?/);
|
||||
if (filenameMatch && filenameMatch[1]) {
|
||||
filename = decodeURIComponent(filenameMatch[1]);
|
||||
}
|
||||
}
|
||||
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = filename;
|
||||
a.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
|
||||
toast.success('Export successful');
|
||||
} catch (error) {
|
||||
console.error('Error exporting transaction:', error);
|
||||
toast.error('Failed to export transaction');
|
||||
} finally {
|
||||
setIsExporting(false);
|
||||
}
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
return (
|
||||
<Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>
|
||||
<DialogContent className="container-fixed max-w-[1280px] w-full h-[90vh] flex flex-col p-6 overflow-hidden">
|
||||
<DialogHeader>
|
||||
<DialogHeader>
|
||||
<DialogTitle className="text-2xl font-bold">Transaction Details</DialogTitle>
|
||||
</DialogHeader>
|
||||
<DialogBody>
|
||||
<DialogBody className="flex flex-col overflow-hidden h-full">
|
||||
<div className="py-4 overflow-y-auto max-h-[600px] space-y-6">
|
||||
{/* Summary Info */}
|
||||
{transactionDetails && (
|
||||
@ -213,7 +212,6 @@ const handleExport = async () => {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Log Table */}
|
||||
<div className="border rounded-lg overflow-x-auto">
|
||||
{isLoading ? (
|
||||
<div className="flex flex-col items-center justify-center p-8">
|
||||
@ -229,96 +227,113 @@ const handleExport = async () => {
|
||||
<p className="mt-4 text-gray-500">Loading Logs Details...</p>
|
||||
</div>
|
||||
) : (
|
||||
<table className="min-w-full table-auto">
|
||||
<thead>
|
||||
<tr className="bg-gray-100">
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Username</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Fullname</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Amount</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Status</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Process Date</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Invoice Number</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 1</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 2</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 3</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{transactionDetails?.log && transactionDetails.log.length > 0 ? (
|
||||
transactionDetails.log.map((log: any, index: number) => (
|
||||
<tr key={index} className="border-t">
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.customer?.username ?? 'Not Found'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.customer?.fullname ?? 'Not Found'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">{log.amount ?? '-'}</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{renderStatusBadge(log.status) ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.request_date && moment(log.request_date).isValid()
|
||||
? moment(log.request_date).format('DD/MM/YYYY HH:mm')
|
||||
: '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.reference ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">{log.remark_1 ?? '-'}</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">{log.remark_2 ?? '-'}</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">{log.remark_3 ?? '-'}</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
<button
|
||||
className="btn btn-sm btn-icon btn-clear btn-light"
|
||||
onClick={() => {
|
||||
setDetailLogData(log);
|
||||
setShowDetailLogDialog(true);
|
||||
}}
|
||||
>
|
||||
<KeenIcon icon="eye" />
|
||||
</button>
|
||||
</td>
|
||||
<>
|
||||
<div className="flex justify-end m-5">
|
||||
<button
|
||||
className={`px-5 py-2 bg-green-600 text-white font-semibold rounded-lg hover:bg-green-700 transition-colors flex items-center ${isExporting ? 'opacity-50 pointer-events-none' : ''}`}
|
||||
onClick={() => {
|
||||
if (!isExporting) {
|
||||
handleExport();
|
||||
}
|
||||
}}
|
||||
>
|
||||
{isExporting ? (
|
||||
<>
|
||||
<span className="animate-spin ">
|
||||
<KeenIcon icon="spinner" />
|
||||
</span>
|
||||
Exporting...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<KeenIcon icon="download" />
|
||||
Export
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
<div className="max-h-[900px] overflow-y-auto border rounded-lg">
|
||||
<table className="min-w-full table-auto">
|
||||
<thead>
|
||||
<tr className="bg-gray-100">
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Username</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Fullname</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Amount</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Status</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">
|
||||
Process Date
|
||||
</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">
|
||||
Invoice Number
|
||||
</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 1</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 2</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Remark 3</th>
|
||||
<th className="px-4 py-2 text-left text-sm text-gray-500">Actions</th>
|
||||
</tr>
|
||||
))
|
||||
) : (
|
||||
<tr>
|
||||
<td colSpan={10} className="px-4 py-2 text-center text-sm text-gray-500">
|
||||
No logs available
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody>
|
||||
{transactionDetails?.log && transactionDetails.log.length > 0 ? (
|
||||
transactionDetails.log.map((log: any, index: number) => (
|
||||
<tr key={index} className="border-t">
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.customer?.username ?? 'Not Found'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.customer?.fullname ?? 'Not Found'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.amount ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{renderStatusBadge(log.status) ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.request_date && moment(log.request_date).isValid()
|
||||
? moment(log.request_date).format('DD/MM/YYYY HH:mm')
|
||||
: '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.reference ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.remark_1 ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.remark_2 ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
{log.remark_3 ?? '-'}
|
||||
</td>
|
||||
<td className="px-4 py-2 text-sm text-gray-500">
|
||||
<button
|
||||
className="btn btn-sm btn-icon btn-clear btn-light"
|
||||
onClick={() => {
|
||||
setDetailLogData(log);
|
||||
setShowDetailLogDialog(true);
|
||||
}}
|
||||
>
|
||||
<KeenIcon icon="eye" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
) : (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={10}
|
||||
className="px-4 py-2 text-center text-sm text-gray-500"
|
||||
>
|
||||
No logs available
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Export Button - Moved to bottom right after table */}
|
||||
<div className="flex justify-end">
|
||||
<button
|
||||
className={`px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors flex items-center ${isExporting ? 'opacity-50 pointer-events-none' : ''}`}
|
||||
onClick={() => {
|
||||
if (!isExporting) {
|
||||
handleExport();
|
||||
}
|
||||
}}
|
||||
>
|
||||
{isExporting ? (
|
||||
<>
|
||||
<span className="animate-spin mr-2">
|
||||
<KeenIcon icon="spinner" />
|
||||
</span>
|
||||
Exporting...
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<KeenIcon icon="download" className="mr-2" />
|
||||
Export
|
||||
</>
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</DialogBody>
|
||||
</DialogContent>
|
||||
@ -326,4 +341,4 @@ const handleExport = async () => {
|
||||
);
|
||||
};
|
||||
|
||||
export default DetailTransaction;
|
||||
export default DetailTransaction;
|
||||
|
||||
@ -209,7 +209,7 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
|
||||
|
||||
{(formData.id || dialogType === "create") ? generateList(formData, handleChange, groups, 'group_id', 'Group', true, dialogType === "update"||false): ''}
|
||||
{/* {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Group', 'group_name', 'text', true, true): ''} */}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Username', 'username', 'text', true, dialogType==='create'?false:true): ''}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Username', 'username', 'text', true, viewOnly): ''}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Full Name', 'fullname', 'text', true, viewOnly): ''}
|
||||
{(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'Photo', 'photouser', previewImg, setPreviewImg): ''}
|
||||
{(formData.id || dialogType === "create") ? generateList(formData, handleChange, genders, 'gender', 'Gender', true, false): ''}
|
||||
@ -218,7 +218,7 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Email', 'email', 'text', true, viewOnly): ''}
|
||||
{/* {generateList(formData, handleChange, status, 'status', 'Status', null, true)} */}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Mother Fullname', 'mother_fullname', 'text', true, viewOnly): ''}
|
||||
{(formData.id || dialogType === "create") ? generateList(formData, handleChange, identity_type, 'identity_type', 'Identity Type', false, false): ''}
|
||||
{(formData.id || dialogType === "create") ? generateList(formData, handleChange, identity_type, 'identity_type', 'Identity Type', false, viewOnly): ''}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Address', 'address', 'text', true, viewOnly): ''}
|
||||
{(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Identity Number', 'identity_number', 'text', false, viewOnly): ''}
|
||||
<div className="bg-white space-y-6">
|
||||
|
||||
Reference in New Issue
Block a user