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

Merge branch 'alwi'

Browse Source
This commit is contained in:
Wikzyy
2025-03-25 10:33:48 +07:00
parent 881d34da9a 50bd7980b2
commit c70cc8a138
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/master/profession/blocks/AddDialog.tsx
View File

@ -48,7 +48,6 @@ const AddDialog = () => {
const response = await PostData(`${API_URL}/profession/create`, formField); const response = await PostData(`${API_URL}/profession/create`, formField);
if (response?.status) { if (response?.status) {
resetForm();
handleAddDialog(false); handleAddDialog(false);
toast.success('Success Create Profession'); toast.success('Success Create Profession');
reload(); reload();

2
src/pages/master/profession/hooks/ManageProfessionContext.tsx
View File

@ -117,7 +117,7 @@ const ManageProfessionContextProvider = ({ children }: { children: React.ReactNo
const response = await GetData(`${API_URL}/profession/list`, { const response = await GetData(`${API_URL}/profession/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)

2
src/pages/master/sucos/blocks/AddDialog.tsx
View File

@ -117,7 +117,7 @@ const AddDialog = () => {
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'
}); });
console.log('ini data posto :', response?.data); // console.log('ini data posto :', response?.data);
setPostoadms(response?.data.list || []); setPostoadms(response?.data.list || []);
} catch (error) { } catch (error) {
console.log('Error fetching posto', error); console.log('Error fetching posto', error);

11
src/pages/master/sucos/blocks/EditDialog.tsx
View File

@ -48,7 +48,7 @@ const EditDialog = () => {
const initialState = { const initialState = {
name: '', name: '',
postoId: 0, // Pastikan ini sesuai dengan PostoAdms_id postoId: 0,
updated_by: '', updated_by: '',
updated_at: '' updated_at: ''
}; };
@ -96,7 +96,7 @@ const EditDialog = () => {
}); });
setPostoadms(response?.data.list); setPostoadms(response?.data.list);
console.log('Data Posto Adms:', response?.data.list); // Log data postoadms // console.log('Data Posto Adms:', response?.data.list);
} catch (error) { } catch (error) {
console.log('Error fetching postoadms', error); console.log('Error fetching postoadms', error);
} }
@ -104,14 +104,13 @@ const EditDialog = () => {
const doFetchData = useCallback(async (id: string) => { const doFetchData = useCallback(async (id: string) => {
const response = await GetData(`${API_URL}/sucos/getdata/${id}`, { id }); const response = await GetData(`${API_URL}/sucos/getdata/${id}`, { id });
console.log('Data Sucos:', response?.data); // Log data sucos // console.log('Data Sucos:', response?.data);
if (response?.status) { if (response?.status) {
setFormField((prev) => ({ setFormField((prev) => ({
...prev, ...prev,
name: response.data.name, name: response.data.name,
postoId: response.data.posto?.id || '' postoId: response.data.posto.id // Pastikan ini sesuai dengan PostoAdms_id
// Pastikan ini sesuai dengan PostoAdms_id
})); }));
} else { } else {
setFormField((prev) => ({ setFormField((prev) => ({
@ -163,7 +162,7 @@ const EditDialog = () => {
doFetchPostoAdms([{ id: 'name', desc: false }]); doFetchPostoAdms([{ id: 'name', desc: false }]);
}, []); }, []);
console.log(selectedSucos); // console.log(selectedSucos);
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">