TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add DN in status transaction type on transfertype module

Browse Source
This commit is contained in:
bagusajisaputroo
2025-05-09 17:08:49 +07:00
parent 6afd3099f7
commit e783c9a00c
3 changed files with 405 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/transfer/transfertype/blocks/AddDialog.tsx
View File

@ -482,6 +482,7 @@ const AddDialog = () => {
<SelectItem value="DA">Disbursment Agent</SelectItem> <SelectItem value="DA">Disbursment Agent</SelectItem>
<SelectItem value="WI">Withdraw Merchant</SelectItem> <SelectItem value="WI">Withdraw Merchant</SelectItem>
<SelectItem value="IC">Income Merchant</SelectItem> <SelectItem value="IC">Income Merchant</SelectItem>
<SelectItem value="DN">Donation</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
{errors.type && <span className="text-red-500 text-xs mt-1">{errors.type}</span>} {errors.type && <span className="text-red-500 text-xs mt-1">{errors.type}</span>}

47
src/pages/transfer/transfertype/blocks/EditDialog.tsx
View File

@ -68,6 +68,7 @@ const EditDialog = () => {
message: '' message: ''
}); });
const [errors, setErrors] = useState<Record<string, string>>({}); const [errors, setErrors] = useState<Record<string, string>>({});
const [isLoadingData, setIsLoadingData] = useState(true);
const [isLoadingWallets, setIsLoadingWallets] = useState(false); const [isLoadingWallets, setIsLoadingWallets] = useState(false);
@ -316,6 +317,7 @@ const EditDialog = () => {
if (!showEditDialog || !selectedTransferType) return; if (!showEditDialog || !selectedTransferType) return;
const fetchTransactionType = async () => { const fetchTransactionType = async () => {
setIsLoadingData(true);
try { try {
const response = await GetData( const response = await GetData(
`${API_URL}/transactiontype/getdata/${selectedTransferType}`, `${API_URL}/transactiontype/getdata/${selectedTransferType}`,
@ -357,6 +359,8 @@ const EditDialog = () => {
show: true, show: true,
message: 'Failed to load transaction type data' message: 'Failed to load transaction type data'
}); });
} finally {
setIsLoadingData(false);
} }
}; };
@ -414,7 +418,6 @@ const EditDialog = () => {
<h1 className="text-xl font-semibold leading-none text-gray-900"> <h1 className="text-xl font-semibold leading-none text-gray-900">
Update Transaction Type Update Transaction Type
</h1> </h1>
<div className="flex items-center gap-2 text-sm font-normal text-gray-700"></div>
</div> </div>
<div <div
className="cursor-pointer hover:opacity-100 opacity-50" className="cursor-pointer hover:opacity-100 opacity-50"
@ -427,6 +430,7 @@ const EditDialog = () => {
</div> </div>
</div> </div>
</DialogHeader> </DialogHeader>
<DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}> <DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}>
<div className="flex flex-col px-0"> <div className="flex flex-col px-0">
{alert.show && ( {alert.show && (
@ -436,6 +440,20 @@ const EditDialog = () => {
</Alert> </Alert>
</div> </div>
)} )}
{isLoadingData ? (
<div className="p-5">
<div className="animate-pulse space-y-4">
{[...Array(6)].map((_, idx) => (
<div key={idx}>
<div className="h-4 bg-gray-200 rounded w-1/3 mb-2"></div>
<div className="h-10 bg-gray-200 rounded w-full"></div>
</div>
))}
</div>
<p className="mt-4 text-gray-500 text-center">Loading transaction type data...</p>
</div>
) : (
<form action="" onSubmit={handleSubmit}> <form action="" onSubmit={handleSubmit}>
<div className="card-body grid gap-5 p-0"> <div className="card-body grid gap-5 p-0">
<div className="w-full"> <div className="w-full">
@ -637,9 +655,15 @@ const EditDialog = () => {
<SelectContent> <SelectContent>
<SelectItem value="D">Disbursement </SelectItem> <SelectItem value="D">Disbursement </SelectItem>
<SelectItem value="O">Other </SelectItem> <SelectItem value="O">Other </SelectItem>
<SelectItem value="CA">Change Group Emoney Customer to Agent </SelectItem> <SelectItem value="CA">
<SelectItem value="AC">Change Group Emoney Agent to Customer </SelectItem> Change Group Emoney Customer to Agent{' '}
<SelectItem value="PA">Change Group Point Agent to Customer </SelectItem> </SelectItem>
<SelectItem value="AC">
Change Group Emoney Agent to Customer{' '}
</SelectItem>
<SelectItem value="PA">
Change Group Point Agent to Customer{' '}
</SelectItem>
<SelectItem value="PC">Change Group Point Customer to Agent</SelectItem> <SelectItem value="PC">Change Group Point Customer to Agent</SelectItem>
<SelectItem value="CE">Return Customer Emoney </SelectItem> <SelectItem value="CE">Return Customer Emoney </SelectItem>
<SelectItem value="AD">Return Agent Deposit </SelectItem> <SelectItem value="AD">Return Agent Deposit </SelectItem>
@ -655,6 +679,7 @@ const EditDialog = () => {
<SelectItem value="DA">Disbursment Agent</SelectItem> <SelectItem value="DA">Disbursment Agent</SelectItem>
<SelectItem value="WI">Withdraw Merchant</SelectItem> <SelectItem value="WI">Withdraw Merchant</SelectItem>
<SelectItem value="IC">Income Merchant</SelectItem> <SelectItem value="IC">Income Merchant</SelectItem>
<SelectItem value="DN">Donation</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
{errors.type && ( {errors.type && (
@ -687,7 +712,9 @@ const EditDialog = () => {
</SelectContent> </SelectContent>
</Select> </Select>
{errors.status_approval && ( {errors.status_approval && (
<span className="text-red-500 text-xs mt-1">{errors.status_approval}</span> <span className="text-red-500 text-xs mt-1">
{errors.status_approval}
</span>
)} )}
</div> </div>
</div> </div>
@ -798,12 +825,19 @@ const EditDialog = () => {
<Button variant={'outline'} type="button" onClick={() => resetForm()}> <Button variant={'outline'} type="button" onClick={() => resetForm()}>
Reset Reset
</Button> </Button>
<Button variant={'default'} type="submit" disabled={isSubmitting}> <Button
variant={'default'}
type="submit"
disabled={isSubmitting || isLoadingData}
>
{isSubmitting ? 'Saving...' : 'Save Changes'} {isSubmitting ? 'Saving...' : 'Save Changes'}
</Button> </Button>
</div> </div>
</div> </div>
</form> </form>
)}
{isLoadingData && (
<ManageTransferFeeContextProvider transactionTypeId={selectedTransferType}> <ManageTransferFeeContextProvider transactionTypeId={selectedTransferType}>
<Container> <Container>
<div className="grid gap-5 lg:gap-7.5 mt-5"> <div className="grid gap-5 lg:gap-7.5 mt-5">
@ -814,6 +848,7 @@ const EditDialog = () => {
<EditFeeDialog /> <EditFeeDialog />
</Container> </Container>
</ManageTransferFeeContextProvider> </ManageTransferFeeContextProvider>
)}
</div> </div>
</DialogBody> </DialogBody>
</DialogContent> </DialogContent>

36
src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
View File

@ -203,7 +203,8 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
DM: 'Disbursment Master Agent', DM: 'Disbursment Master Agent',
DA: 'Disbursment Agent', DA: 'Disbursment Agent',
WI: 'Withdraw Merchant', WI: 'Withdraw Merchant',
IC: 'Income Merchant' IC: 'Income Merchant',
DN: 'Donation'
}; };
return mapping[row.type] || 'Unknown'; return mapping[row.type] || 'Unknown';
@ -227,20 +228,18 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
{ {
accessorFn: (row: { status_kind: string }) => { accessorFn: (row: { status_kind: string }) => {
const mapping: Record<string, string> = { const mapping: Record<string, string> = {
R: "Return", R: 'Return',
T: "Transfer", T: 'Transfer',
P: "Purchase", P: 'Purchase',
W: "Withdraw", W: 'Withdraw',
U: "Top Up", U: 'Top Up',
N: "Top Up Patner" N: 'Top Up Patner'
}; };
return mapping[row.status_kind] || 'Unknown'; return mapping[row.status_kind] || 'Unknown';
}, },
id: 'status_kind', id: 'status_kind',
header: ({ column }) => ( header: ({ column }) => <DataGridColumnHeader title="Status Kind" column={column} />,
<DataGridColumnHeader title="Status Kind" column={column} />
),
enableSorting: false, enableSorting: false,
enableHiding: false, enableHiding: false,
meta: { headerClassName: 'w-[250px]' } meta: { headerClassName: 'w-[250px]' }
@ -295,22 +294,19 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
let filterObject: Record<string, any> = {}; let filterObject: Record<string, any> = {};
if (debouncedSearchTerm) { if (debouncedSearchTerm) {
filterObject["any"] = debouncedSearchTerm.toLowerCase(); filterObject['any'] = debouncedSearchTerm.toLowerCase();
} }
if (columnFilters.length > 0) { if (columnFilters.length > 0) {
columnFilters.forEach((filter: any) => { columnFilters.forEach((filter: any) => {
if (filter.id && filter.value) { if (filter.id && filter.value) {
if (filter.id === 'name') { if (filter.id === 'name') {
filterObject["any"] = filter.value.toLowerCase(); filterObject['any'] = filter.value.toLowerCase();
} } else if (filter.id === 'wallet_origin') {
else if (filter.id === 'wallet_origin') { filterObject['wallet_origin.name'] = filter.value.toLowerCase();
filterObject["wallet_origin.name"] = filter.value.toLowerCase(); } else if (filter.id === 'wallet_destination') {
} filterObject['wallet_destination.name'] = filter.value.toLowerCase();
else if (filter.id === 'wallet_destination') { } else {
filterObject["wallet_destination.name"] = filter.value.toLowerCase();
}
else {
filterObject[filter.id] = filter.value.toLowerCase(); filterObject[filter.id] = filter.value.toLowerCase();
} }
} }