fixing issue manage transferfee on edit transfertype

This commit is contained in:
bagusajisaputroo
2025-05-12 14:51:37 +07:00
parent 56455a9be9
commit 189ed724b5
2 changed files with 369 additions and 362 deletions

View File

@ -363,8 +363,8 @@ const ManageTransferFeeContextProvider = ({
return ( return (
<div className="container mx-auto py-5"> <div className="container mx-auto py-5">
<div className="flex justify-between items-center mt-6"> <div className="flex items-center mb-5 px-5">
<h1 className="text-xl font-semibold text-gray-900">Manage Transaction Fee</h1> <h2 className="text-xl font-semibold text-gray-900">Manage Transaction Fee</h2>
</div> </div>
<ManageTransferFeeContext.Provider <ManageTransferFeeContext.Provider
value={{ value={{

View File

@ -454,400 +454,407 @@ const EditDialog = () => {
<p className="mt-4 text-gray-500 text-center">Loading transaction type data...</p> <p className="mt-4 text-gray-500 text-center">Loading transaction type data...</p>
</div> </div>
) : ( ) : (
<form action="" onSubmit={handleSubmit}> <div>
<div className="card-body grid gap-5 p-0"> <form action="" onSubmit={handleSubmit}>
<div className="w-full"> <div className="card-body grid gap-5 p-0">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="w-full">
<label className="form-label flex items-center gap-1 max-w-56"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
Transfer Type Name <label className="form-label flex items-center gap-1 max-w-56">
<span className="text-red-500">*</span> Transfer Type Name
</label> <span className="text-red-500">*</span>
<div className="grow flex flex-col"> </label>
<Input <div className="grow flex flex-col">
className={`input ${errors.name ? 'border-red-500' : ''}`} <Input
type="text" className={`input ${errors.name ? 'border-red-500' : ''}`}
autoComplete="off" type="text"
value={formField.name} autoComplete="off"
onChange={({ target }) => { value={formField.name}
setFormField((prev) => ({ ...prev, name: target.value })); onChange={({ target }) => {
if (target.value) { setFormField((prev) => ({ ...prev, name: target.value }));
setErrors((prev) => ({ ...prev, name: '' })); if (target.value) {
} setErrors((prev) => ({ ...prev, name: '' }));
}} }
/> }}
{errors.name && ( />
<span className="text-red-500 text-xs mt-1">{errors.name}</span> {errors.name && (
)} <span className="text-red-500 text-xs mt-1">{errors.name}</span>
)}
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full"> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56"> <label className="form-label flex items-center gap-1 max-w-56">
Description Description
<span className="text-red-500">*</span> <span className="text-red-500">*</span>
</label> </label>
<div className="grow flex flex-col"> <div className="grow flex flex-col">
<Input <Input
className={`input ${errors.description ? 'border-red-500' : ''}`} className={`input ${errors.description ? 'border-red-500' : ''}`}
type="text" type="text"
autoComplete="off" autoComplete="off"
value={formField.description} value={formField.description}
onChange={({ target }) => { onChange={({ target }) => {
setFormField((prev) => ({ ...prev, description: target.value })); setFormField((prev) => ({ ...prev, description: target.value }));
if (target.value) { if (target.value) {
setErrors((prev) => ({ ...prev, description: '' })); setErrors((prev) => ({ ...prev, description: '' }));
} }
}} }}
/> />
{errors.description && ( {errors.description && (
<span className="text-red-500 text-xs mt-1">{errors.description}</span> <span className="text-red-500 text-xs mt-1">{errors.description}</span>
)} )}
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full"> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56"> <label className="form-label flex items-center gap-1 max-w-56">
Minimum Amount Minimum Amount
</label> </label>
<div className="grow"> <div className="grow">
<NumericFormat <NumericFormat
className="input" className="input"
value={formField.minimum_amount} value={formField.minimum_amount}
thousandSeparator="." thousandSeparator="."
decimalSeparator="," decimalSeparator=","
allowNegative={false} allowNegative={false}
onValueChange={(values) => { onValueChange={(values) => {
setFormField((prev) => ({ setFormField((prev) => ({
...prev, ...prev,
minimum_amount: values.floatValue || 0 minimum_amount: values.floatValue || 0
})); }));
}} }}
placeholder="Enter Minimum Amount" placeholder="Enter Minimum Amount"
/> />
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full"> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56"> <label className="form-label flex items-center gap-1 max-w-56">
Maximum Amount Maximum Amount
</label> </label>
<div className="grow"> <div className="grow">
<NumericFormat <NumericFormat
className="input" className="input"
value={formField.maximum_amount} value={formField.maximum_amount}
thousandSeparator="." thousandSeparator="."
decimalSeparator="," decimalSeparator=","
allowNegative={false} allowNegative={false}
onValueChange={(values) => { onValueChange={(values) => {
setFormField((prev) => ({ setFormField((prev) => ({
...prev, ...prev,
maximum_amount: values.floatValue || 0 maximum_amount: values.floatValue || 0
})); }));
}} }}
placeholder="Enter Maximum Amount" placeholder="Enter Maximum Amount"
/> />
</div>
</div> </div>
</div> </div>
</div> <div className="w-full">
<div className="w-full"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <label className="form-label flex items-center gap-1 max-w-56">
<label className="form-label flex items-center gap-1 max-w-56"> Max Transaction per day
Max Transaction per day </label>
</label> <div className="grow">
<div className="grow"> <NumericFormat
<NumericFormat className="input"
className="input" value={formField.max_transaction_per_day}
value={formField.max_transaction_per_day} thousandSeparator="."
thousandSeparator="." decimalSeparator=","
decimalSeparator="," allowNegative={false}
allowNegative={false} onValueChange={(values) => {
onValueChange={(values) => { setFormField((prev) => ({
setFormField((prev) => ({ ...prev,
...prev, max_transaction_per_day: values.floatValue || 0
max_transaction_per_day: values.floatValue || 0 }));
})); }}
}} placeholder="Enter Max Transaction Per Day"
placeholder="Enter Max Transaction Per Day" />
/> </div>
</div> </div>
</div> </div>
</div> <div className="w-full">
<div className="w-full"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <label className="form-label flex items-center gap-1 max-w-56">
<label className="form-label flex items-center gap-1 max-w-56"> From Account
From Account <span className="text-red-500">*</span>
<span className="text-red-500">*</span> </label>
</label> <div className="grow flex flex-col">
<div className="grow flex flex-col"> {renderSelectWithLoading(
{renderSelectWithLoading( formField.wallet_origin,
formField.wallet_origin, (value) => setFormField({ ...formField, wallet_origin: value }),
(value) => setFormField({ ...formField, wallet_origin: value }), wallets,
wallets, 'Select Wallet',
'Select Wallet', isLoadingWallets
isLoadingWallets )}
)} {errors.wallet_origin && (
{errors.wallet_origin && ( <span className="text-red-500 text-xs mt-1">
<span className="text-red-500 text-xs mt-1">{errors.wallet_origin}</span> {errors.wallet_origin}
)} </span>
)}
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full"> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56"> <label className="form-label flex items-center gap-1 max-w-56">
To Account To Account
<span className="text-red-500">*</span> <span className="text-red-500">*</span>
</label> </label>
<div className="grow flex flex-col"> <div className="grow flex flex-col">
<Select <Select
value={formField.wallet_destination} value={formField.wallet_destination}
onValueChange={(wallet_destination) => { onValueChange={(wallet_destination) => {
setFormField((prev) => ({ ...prev, wallet_destination })); setFormField((prev) => ({ ...prev, wallet_destination }));
setErrors((prev) => ({ ...prev, wallet_destination: '' })); setErrors((prev) => ({ ...prev, wallet_destination: '' }));
}} }}
>
<SelectTrigger
className={errors.wallet_destination ? 'border-red-500' : ''}
> >
<SelectValue placeholder="Select Wallet" /> <SelectTrigger
</SelectTrigger> className={errors.wallet_destination ? 'border-red-500' : ''}
<SelectContent> >
{wallets.map((wallet) => ( <SelectValue placeholder="Select Wallet" />
<SelectItem value={wallet.id} key={wallet.id}> </SelectTrigger>
{wallet.name} <SelectContent>
{wallets.map((wallet) => (
<SelectItem value={wallet.id} key={wallet.id}>
{wallet.name}
</SelectItem>
))}
</SelectContent>
</Select>
{errors.wallet_destination && (
<span className="text-red-500 text-xs mt-1">
{errors.wallet_destination}
</span>
)}
</div>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status Transaction Type
<span className="text-red-500"> *</span>
</label>
<div className="grow flex flex-col">
<Select
value={formField.type}
onValueChange={(value) => {
setFormField((prev) => ({ ...prev, type: value }));
setErrors((prev) => ({ ...prev, type: '' }));
}}
>
<SelectTrigger className={errors.type ? 'border-red-500' : ''}>
<SelectValue placeholder="Select" />
</SelectTrigger>
<SelectContent>
<SelectItem value="D">Disbursement </SelectItem>
<SelectItem value="O">Other </SelectItem>
<SelectItem value="CA">
Change Group Emoney Customer to Agent{' '}
</SelectItem> </SelectItem>
))} <SelectItem value="AC">
</SelectContent> Change Group Emoney Agent to Customer{' '}
</Select> </SelectItem>
{errors.wallet_destination && ( <SelectItem value="PA">
<span className="text-red-500 text-xs mt-1"> Change Group Point Agent to Customer{' '}
{errors.wallet_destination} </SelectItem>
</span> <SelectItem value="PC">
)} Change Group Point Customer to Agent
</SelectItem>
<SelectItem value="CE">Return Customer Emoney </SelectItem>
<SelectItem value="AD">Return Agent Deposit </SelectItem>
<SelectItem value="AM">Return Agent Merchant </SelectItem>
<SelectItem value="AE">Return Agent Emoney </SelectItem>
<SelectItem value="R">Reward Point </SelectItem>
<SelectItem value="TE">Top Up Escrow </SelectItem>
<SelectItem value="TM">Top Up Master Agent </SelectItem>
<SelectItem value="TA">Top Up Agent </SelectItem>
<SelectItem value="PL">Purchase Loja</SelectItem>
<SelectItem value="DE">Disbursment Escrow</SelectItem>
<SelectItem value="DM">Disbursment Master Agent</SelectItem>
<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>
)}
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full"> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56"> <label className="form-label flex items-center gap-1 max-w-56">
Status Transaction Type Status Approval
<span className="text-red-500"> *</span> <span className="text-red-500">*</span>
</label> </label>
<div className="grow flex flex-col"> <div className="grow flex flex-col">
<Select <Select
value={formField.type} value={formField.status_approval}
onValueChange={(value) => { onValueChange={(value) => {
setFormField((prev) => ({ ...prev, type: value })); setFormField((prev) => ({ ...prev, status_approval: value }));
setErrors((prev) => ({ ...prev, type: '' })); setErrors((prev) => ({ ...prev, status_approval: '' }));
}} }}
> >
<SelectTrigger className={errors.type ? 'border-red-500' : ''}> <SelectTrigger
<SelectValue placeholder="Select" /> className={errors.status_approval ? 'border-red-500' : ''}
</SelectTrigger> >
<SelectContent> <SelectValue placeholder="Select" />
<SelectItem value="D">Disbursement </SelectItem> </SelectTrigger>
<SelectItem value="O">Other </SelectItem> <SelectContent>
<SelectItem value="CA"> <SelectItem value="Y">Yes</SelectItem>
Change Group Emoney Customer to Agent{' '} <SelectItem value="N">No</SelectItem>
</SelectItem> </SelectContent>
<SelectItem value="AC"> </Select>
Change Group Emoney Agent to Customer{' '} {errors.status_approval && (
</SelectItem> <span className="text-red-500 text-xs mt-1">
<SelectItem value="PA"> {errors.status_approval}
Change Group Point Agent to Customer{' '} </span>
</SelectItem> )}
<SelectItem value="PC">Change Group Point Customer to Agent</SelectItem> </div>
<SelectItem value="CE">Return Customer Emoney </SelectItem>
<SelectItem value="AD">Return Agent Deposit </SelectItem>
<SelectItem value="AM">Return Agent Merchant </SelectItem>
<SelectItem value="AE">Return Agent Emoney </SelectItem>
<SelectItem value="R">Reward Point </SelectItem>
<SelectItem value="TE">Top Up Escrow </SelectItem>
<SelectItem value="TM">Top Up Master Agent </SelectItem>
<SelectItem value="TA">Top Up Agent </SelectItem>
<SelectItem value="PL">Purchase Loja</SelectItem>
<SelectItem value="DE">Disbursment Escrow</SelectItem>
<SelectItem value="DM">Disbursment Master Agent</SelectItem>
<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>
)}
</div> </div>
</div> </div>
</div> <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status Kind
<span className="text-red-500">*</span>
</label>
<div className="w-full"> <div className="grow flex flex-col">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> <Select
<label className="form-label flex items-center gap-1 max-w-56"> value={formField.status_kind}
Status Approval onValueChange={(value) => {
<span className="text-red-500">*</span> setFormField((prev) => ({ ...prev, status_kind: value }));
</label> setErrors((prev) => ({ ...prev, status_kind: '' }));
<div className="grow flex flex-col"> }}
<Select >
value={formField.status_approval} <SelectTrigger className={errors.status_kind ? 'border-red-500' : ''}>
onValueChange={(value) => { <SelectValue placeholder="Select" />
setFormField((prev) => ({ ...prev, status_approval: value })); </SelectTrigger>
setErrors((prev) => ({ ...prev, status_approval: '' })); <SelectContent>
}} <SelectItem value="R">Return</SelectItem>
> <SelectItem value="T">Transfer</SelectItem>
<SelectTrigger className={errors.status_approval ? 'border-red-500' : ''}> <SelectItem value="P">Purchase</SelectItem>
<SelectValue placeholder="Select" /> <SelectItem value="W">Withdraw</SelectItem>
</SelectTrigger> <SelectItem value="U">Top Up</SelectItem>
<SelectContent> <SelectItem value="N">Top Up Patner</SelectItem>
<SelectItem value="Y">Yes</SelectItem> </SelectContent>
<SelectItem value="N">No</SelectItem> </Select>
</SelectContent> {errors.status_kind && (
</Select> <span className="text-red-500 text-xs mt-1">{errors.status_kind}</span>
{errors.status_approval && ( )}
<span className="text-red-500 text-xs mt-1"> </div>
{errors.status_approval} </div>
</span> </div>
)} <div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status
<span className="text-red-500"> *</span>
</label>
<div className="grow flex flex-col">
<Select
value={formField.status}
onValueChange={(value) => {
setFormField((prev) => ({ ...prev, status: value }));
setErrors((prev) => ({ ...prev, status: '' }));
}}
>
<SelectTrigger className={errors.status ? 'border-red-500' : ''}>
<SelectValue placeholder="Select" />
</SelectTrigger>
<SelectContent>
<SelectItem value="Y">Active</SelectItem>
<SelectItem value="N">Inactive</SelectItem>
</SelectContent>
</Select>
{errors.status && (
<span className="text-red-500 text-xs mt-1">{errors.status}</span>
)}
</div>
</div> </div>
</div> </div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Status Kind
<span className="text-red-500">*</span>
</label>
<div className="grow flex flex-col"> <div className="w-full">
<Select <div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
value={formField.status_kind} <label className="form-label flex items-center gap-1 max-w-56">
onValueChange={(value) => { Groups
setFormField((prev) => ({ ...prev, status_kind: value })); <span className="text-red-500">*</span>
setErrors((prev) => ({ ...prev, status_kind: '' })); </label>
}} <div className="relative w-full">
> <Input
<SelectTrigger className={errors.status_kind ? 'border-red-500' : ''}> type="text"
<SelectValue placeholder="Select" /> placeholder="No groups selected"
</SelectTrigger> value={selectedPermissionNames || ''}
<SelectContent> readOnly
<SelectItem value="R">Return</SelectItem> className={`bg-gray-100 mb-2 ${errors.permission ? 'border-red-500' : ''}`}
<SelectItem value="T">Transfer</SelectItem> />
<SelectItem value="P">Purchase</SelectItem> {errors.permission && (
<SelectItem value="W">Withdraw</SelectItem> <span className="text-red-500 text-xs mt-2">{errors.permission}</span>
<SelectItem value="U">Top Up</SelectItem> )}
<SelectItem value="N">Top Up Patner</SelectItem> <div className="border rounded-md p-3 max-h-48 overflow-y-auto">
</SelectContent> <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
</Select> {groups.map((group) => (
{errors.status_kind && ( <div key={group.id} className="flex items-center space-x-2">
<span className="text-red-500 text-xs mt-1">{errors.status_kind}</span> <Checkbox
)} id={`group-${group.id}`}
</div> checked={formField.permission.includes(group.id)}
</div> onCheckedChange={() => handleGroupChange(group.id)}
</div> />
<div className="w-full"> <label
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"> htmlFor={`group-${group.id}`}
<label className="form-label flex items-center gap-1 max-w-56"> className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
Status >
<span className="text-red-500"> *</span> {group.name}
</label> </label>
<div className="grow flex flex-col"> </div>
<Select ))}
value={formField.status} </div>
onValueChange={(value) => {
setFormField((prev) => ({ ...prev, status: value }));
setErrors((prev) => ({ ...prev, status: '' }));
}}
>
<SelectTrigger className={errors.status ? 'border-red-500' : ''}>
<SelectValue placeholder="Select" />
</SelectTrigger>
<SelectContent>
<SelectItem value="Y">Active</SelectItem>
<SelectItem value="N">Inactive</SelectItem>
</SelectContent>
</Select>
{errors.status && (
<span className="text-red-500 text-xs mt-1">{errors.status}</span>
)}
</div>
</div>
</div>
<div className="w-full">
<div className="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
<label className="form-label flex items-center gap-1 max-w-56">
Groups
<span className="text-red-500">*</span>
</label>
<div className="relative w-full">
<Input
type="text"
placeholder="No groups selected"
value={selectedPermissionNames || ''}
readOnly
className={`bg-gray-100 mb-2 ${errors.permission ? 'border-red-500' : ''}`}
/>
{errors.permission && (
<span className="text-red-500 text-xs mt-2">{errors.permission}</span>
)}
<div className="border rounded-md p-3 max-h-48 overflow-y-auto">
<div className="grid grid-cols-1 md:grid-cols-2 gap-2">
{groups.map((group) => (
<div key={group.id} className="flex items-center space-x-2">
<Checkbox
id={`group-${group.id}`}
checked={formField.permission.includes(group.id)}
onCheckedChange={() => handleGroupChange(group.id)}
/>
<label
htmlFor={`group-${group.id}`}
className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
{group.name}
</label>
</div>
))}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="flex justify-end pt-2.5 gap-5"> <div className="flex justify-end pt-2.5 gap-5">
<Button variant={'outline'} type="button" onClick={() => resetForm()}> <Button variant={'outline'} type="button" onClick={() => resetForm()}>
Reset Reset
</Button> </Button>
<Button <Button
variant={'default'} variant={'default'}
type="submit" type="submit"
disabled={isSubmitting || isLoadingData} disabled={isSubmitting || isLoadingData}
> >
{isSubmitting ? 'Saving...' : 'Save Changes'} {isSubmitting ? 'Saving...' : 'Save Changes'}
</Button> </Button>
</div>
</div> </div>
</form>
<div className="mt-8 pt-6 border-t border-gray-200">
<ManageTransferFeeContextProvider transactionTypeId={selectedTransferType}>
<Container>
<div className="grid gap-5 lg:gap-7.5 mt-5">
<DataGridInner />
</div>
<AddFeeDialog />
<DeleteFeeDialog />
<EditFeeDialog />
</Container>
</ManageTransferFeeContextProvider>
</div> </div>
</form> </div>
)}
{isLoadingData && (
<ManageTransferFeeContextProvider transactionTypeId={selectedTransferType}>
<Container>
<div className="grid gap-5 lg:gap-7.5 mt-5">
<DataGridInner />
</div>
<AddFeeDialog />
<DeleteFeeDialog />
<EditFeeDialog />
</Container>
</ManageTransferFeeContextProvider>
)} )}
</div> </div>
</DialogBody> </DialogBody>