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

fix create and edit provider

Browse Source
This commit is contained in:
Wikzyy
2025-03-25 16:48:23 +07:00
parent d8400c49d2
commit 72825d737b
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/master/provider/blocks/AddDialog.tsx
View File

@ -292,7 +292,7 @@ const AddDialog = () => {
<PopoverTrigger asChild> <PopoverTrigger asChild>
<button type="button" className="input col-span-5 text-left"> <button type="button" className="input col-span-5 text-left">
{customers.find((customer) => customer.id === formField.agent) {customers.find((customer) => customer.id === formField.agent)
?.fullname || 'Select Agent'} ?.username || 'Select Agent'}
</button> </button>
</PopoverTrigger> </PopoverTrigger>
<PopoverContent className="w-[400px] p-0"> <PopoverContent className="w-[400px] p-0">
@ -313,7 +313,7 @@ const AddDialog = () => {
setOpen(false); setOpen(false);
}} }}
> >
{customer.fullname} {customer.username}
</CommandItem> </CommandItem>
))} ))}
</CommandGroup> </CommandGroup>

24
src/pages/master/provider/blocks/EditDialog.tsx
View File

@ -55,7 +55,7 @@ const EditDialog = () => {
description: '', description: '',
type: '', type: '',
status: '', status: '',
transactionTypeId: '', transaction_type: '',
agent: '', agent: '',
updated_by: '', updated_by: '',
updated_at: '' updated_at: ''
@ -128,7 +128,7 @@ const EditDialog = () => {
const doFetchData = useCallback(async (id: string) => { const doFetchData = useCallback(async (id: string) => {
const response = await GetData(`${API_URL_MASTERDATA}/provider/getdata/${id}`, { id }); const response = await GetData(`${API_URL_MASTERDATA}/provider/getdata/${id}`, { id });
// console.log(response); console.log(response);
if (response?.status) { if (response?.status) {
setFormField((prev) => ({ setFormField((prev) => ({
...prev, ...prev,
@ -136,8 +136,8 @@ const EditDialog = () => {
description: response?.data.description, description: response?.data.description,
type: response?.data.type, type: response?.data.type,
status: response?.data.status, status: response?.data.status,
transactionTypeId: response?.data.transaction_type.id, transaction_type: response?.data.transaction_type.id,
agent: response?.data.agent agent: response?.data.agent.id
})); }));
} }
}, []); }, []);
@ -150,7 +150,7 @@ const EditDialog = () => {
formField.description.trim() === '' || formField.description.trim() === '' ||
formField.type.trim() === '' || formField.type.trim() === '' ||
formField.status.trim() === '' || formField.status.trim() === '' ||
formField.transactionTypeId.trim() === '' || formField.transaction_type.trim() === '' ||
formField.agent.trim() === '' formField.agent.trim() === ''
) { ) {
setAlert({ show: true, message: 'Please fill in all required fields.' }); setAlert({ show: true, message: 'Please fill in all required fields.' });
@ -188,7 +188,7 @@ const EditDialog = () => {
getCustomerList([{ id: 'id', desc: false }]); getCustomerList([{ id: 'id', desc: false }]);
getTransactionTypeList([{ id: 'name', desc: false }]); getTransactionTypeList([{ id: 'name', desc: false }]);
}, []); }, []);
// console.log(selectedProvider);
return ( return (
<Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}> <Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}>
<DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden"> <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden">
@ -282,9 +282,9 @@ const EditDialog = () => {
Transaction Type Id<span className="text-red-500">*</span> Transaction Type Id<span className="text-red-500">*</span>
</label> </label>
<Select <Select
value={formField.transactionTypeId} value={formField.transaction_type}
onValueChange={(value) => onValueChange={(value) =>
setFormField({ ...formField, transactionTypeId: value }) setFormField({ ...formField, transaction_type: value })
} }
> >
<SelectTrigger> <SelectTrigger>
@ -309,7 +309,7 @@ const EditDialog = () => {
<Popover open={open} onOpenChange={setOpen}> <Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild> <PopoverTrigger asChild>
<button type="button" className="input col-span-5 text-left"> <button type="button" className="input col-span-5 text-left">
{customers.find((customer) => customer.msisdn === formField.agent) {customers.find((customer) => customer.id === formField.agent)
?.fullname || 'Select Agent'} ?.fullname || 'Select Agent'}
</button> </button>
</PopoverTrigger> </PopoverTrigger>
@ -321,12 +321,12 @@ const EditDialog = () => {
<CommandGroup> <CommandGroup>
{customers.map((customer) => ( {customers.map((customer) => (
<CommandItem <CommandItem
key={customer.msisdn} key={customer.id}
value={customer.fullname} value={customer.id}
onSelect={() => { onSelect={() => {
setFormField({ setFormField({
...formField, ...formField,
agent: customer.msisdn agent: customer.id
}); });
setOpen(false); setOpen(false);
}} }}

4
src/pages/master/provider/hooks/ManageProviderContext.tsx
View File

@ -153,12 +153,12 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
const response = await GetData(`${API_URL}/provider/list`, { const response = await GetData(`${API_URL}/provider/list`, {
limit, limit,
page: page + 1, page: page + 1,
with_deleted: true, with_deleted: false,
order_field: sorting[0].id, order_field: sorting[0].id,
order_direction: sorting[0].desc == false ? 'ASC' : 'DESC', order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
filter: JSON.stringify(filter) filter: JSON.stringify(filter)
}); });
console.log(response?.data); // console.log(response?.data);
setProvider(response?.data.list); setProvider(response?.data.list);
return { data: response?.data.list, totalCount: response?.data.total_count }; return { data: response?.data.list, totalCount: response?.data.total_count };
} catch (error) { } catch (error) {