add DN in status transaction type on transfertype module
This commit is contained in:
@ -482,6 +482,7 @@ const AddDialog = () => {
|
||||
<SelectItem value="DA">Disbursment Agent</SelectItem>
|
||||
<SelectItem value="WI">Withdraw Merchant</SelectItem>
|
||||
<SelectItem value="IC">Income Merchant</SelectItem>
|
||||
<SelectItem value="DN">Donation</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{errors.type && <span className="text-red-500 text-xs mt-1">{errors.type}</span>}
|
||||
|
||||
@ -68,6 +68,7 @@ const EditDialog = () => {
|
||||
message: ''
|
||||
});
|
||||
const [errors, setErrors] = useState<Record<string, string>>({});
|
||||
const [isLoadingData, setIsLoadingData] = useState(true);
|
||||
|
||||
const [isLoadingWallets, setIsLoadingWallets] = useState(false);
|
||||
|
||||
@ -316,6 +317,7 @@ const EditDialog = () => {
|
||||
if (!showEditDialog || !selectedTransferType) return;
|
||||
|
||||
const fetchTransactionType = async () => {
|
||||
setIsLoadingData(true);
|
||||
try {
|
||||
const response = await GetData(
|
||||
`${API_URL}/transactiontype/getdata/${selectedTransferType}`,
|
||||
@ -357,6 +359,8 @@ const EditDialog = () => {
|
||||
show: true,
|
||||
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">
|
||||
Update Transaction Type
|
||||
</h1>
|
||||
<div className="flex items-center gap-2 text-sm font-normal text-gray-700"></div>
|
||||
</div>
|
||||
<div
|
||||
className="cursor-pointer hover:opacity-100 opacity-50"
|
||||
@ -427,6 +430,7 @@ const EditDialog = () => {
|
||||
</div>
|
||||
</div>
|
||||
</DialogHeader>
|
||||
|
||||
<DialogBody className="scrollable-y px-0 pb-0" ref={parentRef}>
|
||||
<div className="flex flex-col px-0">
|
||||
{alert.show && (
|
||||
@ -436,6 +440,20 @@ const EditDialog = () => {
|
||||
</Alert>
|
||||
</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}>
|
||||
<div className="card-body grid gap-5 p-0">
|
||||
<div className="w-full">
|
||||
@ -637,9 +655,15 @@ const EditDialog = () => {
|
||||
<SelectContent>
|
||||
<SelectItem value="D">Disbursement </SelectItem>
|
||||
<SelectItem value="O">Other </SelectItem>
|
||||
<SelectItem value="CA">Change Group Emoney Customer to Agent </SelectItem>
|
||||
<SelectItem value="AC">Change Group Emoney Agent to Customer </SelectItem>
|
||||
<SelectItem value="PA">Change Group Point Agent to Customer </SelectItem>
|
||||
<SelectItem value="CA">
|
||||
Change Group Emoney Customer to Agent{' '}
|
||||
</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="CE">Return Customer Emoney </SelectItem>
|
||||
<SelectItem value="AD">Return Agent Deposit </SelectItem>
|
||||
@ -655,6 +679,7 @@ const EditDialog = () => {
|
||||
<SelectItem value="DA">Disbursment Agent</SelectItem>
|
||||
<SelectItem value="WI">Withdraw Merchant</SelectItem>
|
||||
<SelectItem value="IC">Income Merchant</SelectItem>
|
||||
<SelectItem value="DN">Donation</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{errors.type && (
|
||||
@ -687,7 +712,9 @@ const EditDialog = () => {
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{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>
|
||||
@ -798,12 +825,19 @@ const EditDialog = () => {
|
||||
<Button variant={'outline'} type="button" onClick={() => resetForm()}>
|
||||
Reset
|
||||
</Button>
|
||||
<Button variant={'default'} type="submit" disabled={isSubmitting}>
|
||||
<Button
|
||||
variant={'default'}
|
||||
type="submit"
|
||||
disabled={isSubmitting || isLoadingData}
|
||||
>
|
||||
{isSubmitting ? 'Saving...' : 'Save Changes'}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
|
||||
{isLoadingData && (
|
||||
<ManageTransferFeeContextProvider transactionTypeId={selectedTransferType}>
|
||||
<Container>
|
||||
<div className="grid gap-5 lg:gap-7.5 mt-5">
|
||||
@ -814,6 +848,7 @@ const EditDialog = () => {
|
||||
<EditFeeDialog />
|
||||
</Container>
|
||||
</ManageTransferFeeContextProvider>
|
||||
)}
|
||||
</div>
|
||||
</DialogBody>
|
||||
</DialogContent>
|
||||
|
||||
@ -203,7 +203,8 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
|
||||
DM: 'Disbursment Master Agent',
|
||||
DA: 'Disbursment Agent',
|
||||
WI: 'Withdraw Merchant',
|
||||
IC: 'Income Merchant'
|
||||
IC: 'Income Merchant',
|
||||
DN: 'Donation'
|
||||
};
|
||||
|
||||
return mapping[row.type] || 'Unknown';
|
||||
@ -227,20 +228,18 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
|
||||
{
|
||||
accessorFn: (row: { status_kind: string }) => {
|
||||
const mapping: Record<string, string> = {
|
||||
R: "Return",
|
||||
T: "Transfer",
|
||||
P: "Purchase",
|
||||
W: "Withdraw",
|
||||
U: "Top Up",
|
||||
N: "Top Up Patner"
|
||||
R: 'Return',
|
||||
T: 'Transfer',
|
||||
P: 'Purchase',
|
||||
W: 'Withdraw',
|
||||
U: 'Top Up',
|
||||
N: 'Top Up Patner'
|
||||
};
|
||||
|
||||
return mapping[row.status_kind] || 'Unknown';
|
||||
},
|
||||
id: 'status_kind',
|
||||
header: ({ column }) => (
|
||||
<DataGridColumnHeader title="Status Kind" column={column} />
|
||||
),
|
||||
header: ({ column }) => <DataGridColumnHeader title="Status Kind" column={column} />,
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
meta: { headerClassName: 'w-[250px]' }
|
||||
@ -295,22 +294,19 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
|
||||
let filterObject: Record<string, any> = {};
|
||||
|
||||
if (debouncedSearchTerm) {
|
||||
filterObject["any"] = debouncedSearchTerm.toLowerCase();
|
||||
filterObject['any'] = debouncedSearchTerm.toLowerCase();
|
||||
}
|
||||
|
||||
if (columnFilters.length > 0) {
|
||||
columnFilters.forEach((filter: any) => {
|
||||
if (filter.id && filter.value) {
|
||||
if (filter.id === 'name') {
|
||||
filterObject["any"] = filter.value.toLowerCase();
|
||||
}
|
||||
else if (filter.id === 'wallet_origin') {
|
||||
filterObject["wallet_origin.name"] = filter.value.toLowerCase();
|
||||
}
|
||||
else if (filter.id === 'wallet_destination') {
|
||||
filterObject["wallet_destination.name"] = filter.value.toLowerCase();
|
||||
}
|
||||
else {
|
||||
filterObject['any'] = filter.value.toLowerCase();
|
||||
} else if (filter.id === 'wallet_origin') {
|
||||
filterObject['wallet_origin.name'] = filter.value.toLowerCase();
|
||||
} else if (filter.id === 'wallet_destination') {
|
||||
filterObject['wallet_destination.name'] = filter.value.toLowerCase();
|
||||
} else {
|
||||
filterObject[filter.id] = filter.value.toLowerCase();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user