merge master into raja

.env

@@ -1,7 +0,0 @@
-VITE_APP_NAME=tpay-dashboard-tl
-VITE_APP_VERSION=1=9.1.1
-GENERATE_SOURCEMAP=false
-
-VITE_APP_API_URL=https://tpay.shiblysolution.id/api
-# VITE_APP_API_URL=http://0.0.0.0:4001/api
-VITE_ENV=default

.gitignore

@@ -7,6 +7,7 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
+.env
 node_modules
 dist
 dist-ssr

src/config/api.config.ts

@@ -3,6 +3,7 @@ interface apiConfigProps {
   service_customer: string;
   service_master_data: string;
   service_transaction: string;
+  service_wallet: string;
 }
 
 const API_URL = import.meta.env.VITE_APP_API_URL;
@@ -12,7 +13,8 @@ const apiConfig: apiConfigProps = {
   service_customer: `${API_URL}/c`,
   // service_master_data: `${API_URL}/m`
   service_master_data: `${API_URL}/t`,
-  service_transaction: `${API_URL}/tt`
+  service_transaction: `${API_URL}/tt`,
+  service_wallet: `${API_URL}/w`
 };
 
 export { apiConfig };

src/pages/account/home/user-profile/blocks/BasicSettings.tsx

@@ -14,7 +14,7 @@ const BasicSettings = () => {
   // const user = localStorage.getItem('user');
   // const parsedUser = user ? JSON.parse(user) : null;
   const parsedUser = getAuth()?.user;
-  console.log('parsedUser :', parsedUser);
+  // console.log('parsedUser :', parsedUser);
   const [newUsername, setNewUsername] = useState<string>(parsedUser?.username || '');
   const [newEmail, setNewEmail] = useState<string>(parsedUser?.email || '');
   const [newName, setNewName] = useState<string>(parsedUser?.name || '');

src/pages/account/manage-currency/ManageCurrency.tsx

@@ -21,7 +21,6 @@ const ManageCurrency = () => {
             <span className="text-sm">Manage Currency</span>
           </Link>
         </Breadcrumbs>
-
         <div className="grid gap-5 lg:gap-7.5">
           <DataGridInner />
         </div>

src/pages/groups/ManageGroups.tsx

@@ -148,7 +148,7 @@ const ManageGroups = () => {
 
   return (
     <div>
-      <div className="container mx-auto pt-2">
+      <div className="container mx-auto">
         <ConfirmDialog
           open={dialogOpen}
           onClose={() => setDialogOpen(false)}

src/pages/master/aldeias/AldeiasMaster.tsx

@@ -9,7 +9,7 @@ const AldeiasMaster = () => {
   return (
     <ManageAldeiasContextProvider>
       <Container>
-        <h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Aldeias</h1>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Aldeias</h1>
         <Breadcrumbs sx={{ mb: 2 }}>
           <Link underline="none" color="inherit" href="/">
             <span className="text-sm hover:underline">Dashboard</span>

src/pages/master/aldeias/blocks/ListToolbar.tsx

@@ -20,17 +20,17 @@ const ListToolbar = () => {
                 onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
-                // disabled={isLoading}
+                disabled={isLoading}
-                // onClick={handleFilterData}
+                onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
             {/* <Button
               variant="outline"
               className="h-7.5 text-[0.8rem]"

src/pages/master/aldeias/hooks/ManageAldeiasContext.tsx

@@ -77,16 +77,6 @@ const ManageAldeiasContextProvider = ({ children }: { children: React.ReactNode
 
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
-      {
-        accessorFn: (row) => row.id,
-        id: 'id',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
       {
         accessorFn: (row) => row.name,
         id: 'name',
@@ -152,7 +142,7 @@ const ManageAldeiasContextProvider = ({ children }: { children: React.ReactNode
         order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
         filter: JSON.stringify(filter)
       });
-      console.log(response?.data);
+      // console.log(response?.data);
       setAldeias(response?.data.list);
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {
@@ -179,7 +169,7 @@ const ManageAldeiasContextProvider = ({ children }: { children: React.ReactNode
       <Toaster expand visibleToasts={9} duration={3000} />
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/conversion/ConversionMaster.tsx

@@ -0,0 +1,32 @@
+import { Container, DataGridInner } from '@/components';
+import { ManageConversionContextProvider } from './hooks/ManageConversionContext';
+import { Breadcrumbs, Link } from '@mui/material';
+
+const ConversionMaster = () => {
+  return (
+    <ManageConversionContextProvider>
+      <Container>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Conversion</h1>
+        <Breadcrumbs sx={{ mb: 2 }}>
+          <Link underline="none" color="inherit" href="/">
+            <span className="text-sm hover:underline">Dashboard</span>
+          </Link>
+
+          <Link underline="none" color="inherit">
+            <span className="text-sm">Master Data</span>
+          </Link>
+
+          <Link underline="none" color="inherit">
+            <span className="text-sm">Manage Conversion</span>
+          </Link>
+        </Breadcrumbs>
+
+        <div className="grid gap-5 lg:gap-7.5">
+          <DataGridInner />
+        </div>
+      </Container>
+    </ManageConversionContextProvider>
+  );
+};
+
+export default ConversionMaster;

src/pages/master/conversion/blocks/ListToolbar.tsx

@@ -0,0 +1,55 @@
+import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
+import { Button } from '@/components/ui/button';
+import { useManageConversionContext } from '../hooks/useManageConversionContext';
+
+const ListToolbar = () => {
+  const { table, reload } = useDataGrid();
+  const { handleAddDialog } = useManageConversionContext();
+
+  return (
+    <div className="card-header flex-wrap gap-2 border-b-0 px-5">
+      <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
+        <div className="flex justify-between w-full items-center">
+          <div className="flex w-[50%] gap-3 items-center">
+            <label className="input input-sm w-1/3">
+              <KeenIcon icon="magnifier" />
+              <input
+                type="text"
+                placeholder="Search Conversion"
+                value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
+                onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
+              />
+            </label>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
+              <Button
+                variant="outline"
+                className="h-7.5 disabled:bg-gray-400"
+                disabled={isLoading}
+                onClick={handleFilterData}
+              >
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
+                <KeenIcon icon="filter" />
+              </Button>
+            </DefaultTooltip> */}
+          </div>
+          <div className="flex gap-3 items-center">
+            <Button
+              variant="outline"
+              className="h-7.5 text-[0.8rem]"
+              onClick={() => handleAddDialog(true)}
+            >
+              Add Data
+            </Button>
+            <DefaultTooltip title={'Refresh'} placement={'top'}>
+              <Button variant="outline" className="h-7.5" onClick={() => reload()}>
+                <KeenIcon icon="arrows-circle" />
+              </Button>
+            </DefaultTooltip>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ListToolbar;

src/pages/master/conversion/hooks/ManageConversionContext.tsx

@@ -0,0 +1,167 @@
+import { DataGridColumnHeader, DataGridProvider, KeenIcon } from '@/components';
+import { Toaster } from '@/components/ui/sonner';
+import { apiConfig } from '@/config/api.config';
+import { useCallApi } from '@/hooks';
+import { ColumnDef } from '@tanstack/react-table';
+import { createContext, useCallback, useMemo, useState } from 'react';
+import ListToolbar from '../blocks/ListToolbar';
+
+interface ConversionProps {
+  id: string;
+  name: string;
+}
+
+interface ContextProps {
+  conversion: ConversionProps[];
+  showAddDialog: boolean;
+  handleAddDialog: (show: boolean) => void;
+  showEditDialog: boolean;
+  handleEditDialog: (show: boolean, selected_conversion: string | null) => void;
+  showDeleteDialog: boolean;
+  handleDeleteDialog: (show: boolean, selected_conversion: string | null) => void;
+  selectedConversion: string | null;
+  getConversionLists: (
+    limit: number,
+    page: number,
+    with_deleted: boolean,
+    order_field: any,
+    order_direction: any
+  ) => Promise<{ data: ConversionProps[]; totalCount: number } | undefined>;
+}
+
+const initialProps: ContextProps = {
+  conversion: [],
+  showAddDialog: false,
+  handleAddDialog: () => {},
+  showEditDialog: false,
+  handleEditDialog: () => {},
+  showDeleteDialog: false,
+  handleDeleteDialog: () => {},
+  selectedConversion: null,
+  getConversionLists: async () => undefined
+};
+
+const ManageConversionContext = createContext<ContextProps>(initialProps);
+const API_URL_WALLET = apiConfig.service_wallet;
+
+const ManageConversionContextProvider = ({ children }: { children: React.ReactNode }) => {
+  const [conversions, setConversions] = useState<ConversionProps[]>([]);
+  const [showAddDialog, setShowAddDialog] = useState(false);
+  const [showEditDialog, setShowEditDialog] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [selectedConversion, setSelectedConversion] = useState<string | null>(null);
+  const { GetData } = useCallApi();
+
+  const handleAddDialog = useCallback((show: boolean) => {
+    setShowAddDialog(show);
+  }, []);
+
+  const handleEditDialog = useCallback((show: boolean, selected_conversion: string | null) => {
+    setShowEditDialog(show);
+    setSelectedConversion(show ? selected_conversion : null);
+  }, []);
+
+  const handleDeleteDialog = useCallback((show: boolean, selected_conversion: string | null) => {
+    setShowEditDialog(show);
+    setSelectedConversion(show ? selected_conversion : null);
+  }, []);
+
+  const columns = useMemo<ColumnDef<any>[]>(
+    () => [
+      {
+        accessorFn: (row) => row.name,
+        id: 'name',
+        header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        id: 'actions',
+        header: ({ column }) => <DataGridColumnHeader title="Actions" column={column} />,
+        enableSorting: false,
+        enableHiding: false,
+        cell: (data) => {
+          const row = data.row.original;
+          return (
+            <>
+              <button
+                className="btn btn-sm btn-icon btn-clear btn-light"
+                onClick={() => handleEditDialog(true, row.id)}
+              >
+                <KeenIcon icon="notepad-edit" />
+              </button>
+              <button
+                className="btn btn-sm btn-icon btn-clear btn-light"
+                onClick={() => handleDeleteDialog(true, row.id)}
+              >
+                <KeenIcon icon="trash" />
+              </button>
+            </>
+          );
+        },
+        meta: {
+          headerClassName: 'w-[100px]',
+          cellClassName: 'text-center'
+        }
+      }
+    ],
+    []
+  );
+
+  const getConversionLists = async (page: number, limit: number, sorting: any, filter: any) => {
+    try {
+      sorting = sorting.length == 0 ? [{ id: 'name', desc: false }] : sorting;
+      filter = filter.length == 0 ? {} : { any: filter[0].value?.toLowerCase() };
+      const response = await GetData(`${API_URL_WALLET}/dashboard/conversion`, {
+        limit,
+        page: page + 1,
+        with_deleted: false,
+        order_field: sorting[0].id,
+        order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
+        filter: JSON.stringify(filter)
+      });
+      console.log(response?.data);
+      setConversions(response?.data.list);
+      return { data: response?.data.list, totalCount: response?.data.total_count };
+    } catch (error) {
+      console.error('Error fetching Conversion', error);
+    }
+  };
+
+  return (
+    <ManageConversionContext.Provider
+      value={{
+        conversion: conversions,
+        showAddDialog,
+        handleAddDialog,
+        showEditDialog,
+        handleEditDialog,
+        showDeleteDialog,
+        handleDeleteDialog,
+        selectedConversion,
+        getConversionLists
+      }}
+    >
+      <Toaster expand visibleToasts={9} duration={3000} />
+      <DataGridProvider
+        columns={columns}
+        pagination={{ size: 10 }}
+        toolbar={<ListToolbar />}
+        layout={{ card: true }}
+        sorting={[{ id: 'id', desc: false }]}
+        serverSide={true}
+        onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
+          getConversionLists(pageIndex, pageSize, sorting, columnFilters)
+        }
+      >
+        {children}
+      </DataGridProvider>
+    </ManageConversionContext.Provider>
+  );
+};
+
+export { ManageConversionContext, ManageConversionContextProvider };
+export type { ConversionProps };

src/pages/master/conversion/hooks/useManageConversionContext.tsx

@@ -0,0 +1,12 @@
+import { useContext } from 'react';
+import { ManageConversionContext } from './ManageConversionContext';
+
+const useManageConversionContext = () => {
+  const context = useContext(ManageConversionContext);
+
+  if (!context) throw new Error('useManageConversionContext must be used within AuthProvider');
+
+  return context;
+};
+
+export { useManageConversionContext };

src/pages/master/municipios/blocks/ListToolbar.tsx

@@ -33,17 +33,17 @@ const ListToolbar = () => {
                 onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
             {/* <Button
               variant="outline"
               className="h-7.5 text-[0.8rem]"

src/pages/master/municipios/hooks/ManageMunicipiosContext.tsx

@@ -102,16 +102,6 @@ const ManageMunicipiosProvider = ({ children }: { children: React.ReactNode }) =
 
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
-      {
-        accessorFn: (row) => row.id,
-        id: 'id',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
       {
         // accessorFn: (row) => row.name,
         // id: 'name',
@@ -120,7 +110,7 @@ const ManageMunicipiosProvider = ({ children }: { children: React.ReactNode }) =
         enableSorting: true,
         enableHiding: false,
         meta: {
-          headerClassName: 'w-[1000px]'
+          headerClassName: 'w-[250px]'
         }
       },
       {
@@ -201,7 +191,7 @@ const ManageMunicipiosProvider = ({ children }: { children: React.ReactNode }) =
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/postoadms/blocks/ListToolbar.tsx

@@ -17,23 +17,23 @@ const ListToolbar = () => {
               <input
                 type="text"
                 placeholder="Search Postu"
-                value={(table.getColumn('PostoAdms_name')?.getFilterValue() as string) ?? ''}
+                value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
                 onChange={(event) =>
-                  table.getColumn('PostoAdms_name')?.setFilterValue(event.target.value)
+                  table.getColumn('name')?.setFilterValue(event.target.value)
                 }
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 // onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
             {/* <Button
               variant="outline"
               className="h-7.5 text-[0.8rem]"

src/pages/master/postoadms/hooks/ManagePostoAdmsContext.tsx

@@ -84,37 +84,26 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
       {
-        // accessorFn: (row) => row.PostoAdms_id,
+        accessorFn: (row) => row.PostoAdms_name,
-        // id: 'PostoAdms_id',
+        id: 'name',
-        accessorKey: 'PostoAdms_id',
+        // accessorKey: 'PostoAdms_name',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
-      {
-        // accessorFn: (row) => row.posto_adms_name,
-        // id: 'posto_adms_name',
-        accessorKey: 'PostoAdms_name',
         header: ({ column }) => (
           <DataGridColumnHeader title="Posto Administrativo Name" column={column} />
         ),
         enableSorting: true,
         enableHiding: false,
         meta: {
-          headerClassName: 'w-[1000px]'
+          headerClassName: 'w-[250px]'
         }
       },
       {
         accessorFn: (row) => row.municipios_name,
         id: 'municipios_name',
         header: ({ column }) => <DataGridColumnHeader title="Municipio Name" column={column} />,
-        enableSorting: true,
+        enableSorting: false,
         enableHiding: false,
         meta: {
-          headerClassName: 'w-[1000px]'
+          headerClassName: 'w-[250px]'
         }
       },
       {
@@ -162,7 +151,7 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod
         order_direction: sorting[0].desc ? 'DESC' : 'ASC',
         filter: JSON.stringify(filter)
       });
-      console.log(response?.data);
+      // console.log(response?.data);
       // const sortedList = response.data.data.list.sort((a: PostoAdmsProps, b: PostoAdmsProps) => {
       //   if (a.name < b.name) return -1;
       //   if (a.name > b.name) return 1;
@@ -195,7 +184,7 @@ const ManagePostoAdmsContextProvider = ({ children }: { children: React.ReactNod
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/products/blocks/AddDialog.tsx

@@ -15,31 +15,47 @@ import {
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select';
+
+interface ProviderProps {
+  provider_id: number;
+  provider_name: string;
+}
 
 const API_URL = apiConfig.service_master_data;
 const AddDialog = () => {
   const parentRef = useRef<any | null>(null);
   const parsedUser = getAuth()?.user;
   const { showAddDialog, handleAddDialog } = useManageProductsContext();
-  const { PostData } = useCallApi();
+  const { PostData, GetData } = useCallApi();
   const { reload } = useDataGrid();
   const [alert, setAlert] = useState({
     show: false,
     message: ''
   });
   const initialState = {
-    name: '',
+    products_name: '',
-    description: '',
+    products_code: '',
-    price_point: 0,
+    products_type: '',
-    price_cash: 0,
+    products_description: '',
-    cashback_point: 0,
+    products_price_point: 0,
-    cashback_cash: 0,
+    products_price_cash: 0,
-    status: '',
+    products_cashback_point: 0,
-    providerId: '',
+    products_cashback_cash: 0,
+    products_status: '',
+    products_provider: '',
+    products_process_on_third_party: '',
     created_by: '',
     created_at: ''
   };
   const [formField, setFormField] = useState(initialState);
+  const [providers, setProviders] = useState<ProviderProps[]>([]);
   const created_time = new Date();
   const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
 
@@ -67,17 +83,36 @@ const AddDialog = () => {
     [formField]
   );
 
+  const doFetchProvider = useCallback(async (sorting: any) => {
+    try {
+      const response = await GetData(`${API_URL}/provider/list`, {
+        limit: 100,
+        page: 1,
+        with_deleted: false,
+        order_field: sorting[0].id,
+        order_direction: sorting[0].desc == false ? 'ASC' : 'DESC'
+      });
+
+      // console.log('PROVIDER: ', response?.data);
+      setProviders(response?.data.list);
+    } catch (error) {
+      console.error('Error fetching provider', error);
+    }
+  }, []);
+
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
     if (
-      formField.name.trim() === '' ||
+      formField.products_name.trim() === '' ||
-      formField.description.trim() === '' ||
+      formField.products_type.trim() === '' ||
-      formField.price_point === 0 ||
+      formField.products_code.trim() === '' ||
-      formField.price_cash === 0 ||
+      formField.products_description.trim() === '' ||
-      formField.cashback_point === 0 ||
+      formField.products_price_point === 0 ||
-      formField.cashback_cash === 0 ||
+      formField.products_price_cash === 0 ||
-      formField.status.trim() === '' ||
+      formField.products_cashback_point === 0 ||
+      formField.products_cashback_cash === 0 ||
+      formField.products_status.trim() === '' ||
       formField.created_by.trim() === '' ||
       formField.created_at.trim() === ''
     ) {
@@ -90,6 +125,10 @@ const AddDialog = () => {
     setAlert({ show: false, message: '' });
   };
 
+  useEffect(() => {
+    doFetchProvider([{ id: 'id', desc: false }]);
+  }, []);
+
   useEffect(() => {
     if (showAddDialog) {
       setFormField({
@@ -113,7 +152,7 @@ const AddDialog = () => {
           <DialogTitle>Product - Create</DialogTitle>
           <DialogDescription></DialogDescription>
         </DialogHeader>
-        <DialogBody ref={parentRef}>
+        <DialogBody ref={parentRef} className="overflow-y-auto">
           <div className="flex flex-col">
             {alert.show && (
               <Alert variant="danger">
@@ -131,8 +170,42 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.name}
+                      value={formField.products_name}
-                      onChange={(e) => setFormField({ ...formField, name: e.target.value })}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_name: e.target.value })
+                      }
+                    />
+                  </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">
+                      Type<span className="text-red-500">*</span>
+                    </label>
+                    <Input
+                      className="input"
+                      type="text"
+                      value={formField.products_type}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_type: e.target.value })
+                      }
+                    />
+                  </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">
+                      Code<span className="text-red-500">*</span>
+                    </label>
+                    <Input
+                      className="input"
+                      type="text"
+                      value={formField.products_code}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_code: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -145,8 +218,10 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.description}
+                      value={formField.products_description}
-                      onChange={(e) => setFormField({ ...formField, description: e.target.value })}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_description: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -161,10 +236,13 @@ const AddDialog = () => {
                       type="number"
                       min={0}
                       step={0.01}
-                      value={formField.price_point}
+                      value={formField.products_price_point}
                       onChange={(e) => {
                         const value = parseFloat(e.target.value);
-                        setFormField({ ...formField, price_point: isNaN(value) ? 0 : value });
+                        setFormField({
+                          ...formField,
+                          products_price_point: isNaN(value) ? 0 : value
+                        });
                       }}
                     />
                   </div>
@@ -180,10 +258,13 @@ const AddDialog = () => {
                       type="number"
                       min={0}
                       step={0.01}
-                      value={formField.price_cash}
+                      value={formField.products_price_cash}
                       onChange={(e) => {
                         const value = parseFloat(e.target.value);
-                        setFormField({ ...formField, price_cash: isNaN(value) ? 0 : value });
+                        setFormField({
+                          ...formField,
+                          products_price_cash: isNaN(value) ? 0 : value
+                        });
                       }}
                     />
                   </div>
@@ -199,10 +280,13 @@ const AddDialog = () => {
                       type="number"
                       min={0}
                       step={0.01}
-                      value={formField.cashback_point}
+                      value={formField.products_cashback_point}
                       onChange={(e) => {
                         const value = parseFloat(e.target.value);
-                        setFormField({ ...formField, cashback_point: isNaN(value) ? 0 : value });
+                        setFormField({
+                          ...formField,
+                          products_cashback_point: isNaN(value) ? 0 : value
+                        });
                       }}
                     />
                   </div>
@@ -218,10 +302,13 @@ const AddDialog = () => {
                       type="number"
                       min={0}
                       step={0.01}
-                      value={formField.cashback_cash}
+                      value={formField.products_cashback_cash}
                       onChange={(e) => {
                         const value = parseFloat(e.target.value);
-                        setFormField({ ...formField, cashback_cash: isNaN(value) ? 0 : value });
+                        setFormField({
+                          ...formField,
+                          products_cashback_cash: isNaN(value) ? 0 : value
+                        });
                       }}
                     />
                   </div>
@@ -232,12 +319,20 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Status<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <Select
-                      className="input"
+                      value={formField.products_status}
-                      type="text"
+                      onValueChange={(value) =>
-                      value={formField.status}
+                        setFormField({ ...formField, products_status: value })
-                      onChange={(e) => setFormField({ ...formField, status: e.target.value })}
+                      }
-                    />
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select Status" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="Y">Yes</SelectItem>
+                        <SelectItem value="N">No</SelectItem>
+                      </SelectContent>
+                    </Select>
                   </div>
                 </div>
 
@@ -246,12 +341,48 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Provider ID
                     </label>
-                    <Input
+                    <Select
-                      className="input"
+                      value={formField.products_provider}
-                      type="text"
+                      onValueChange={(value) =>
-                      value={formField.providerId}
+                        setFormField({ ...formField, products_provider: value.toString() })
-                      onChange={(e) => setFormField({ ...formField, providerId: e.target.value })}
+                      }
-                    />
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select Provider" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {providers.map((provider) => (
+                          <SelectItem
+                            key={provider.provider_id}
+                            value={provider.provider_id.toString()}
+                          >
+                            {provider.provider_name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </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">
+                      Process on Third Party<span className="text-red-500">*</span>
+                    </label>
+                    <Select
+                      value={formField.products_process_on_third_party}
+                      onValueChange={(value) =>
+                        setFormField({ ...formField, products_process_on_third_party: value })
+                      }
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select Status" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="Y">Yes</SelectItem>
+                        <SelectItem value="N">No</SelectItem>
+                      </SelectContent>
+                    </Select>
                   </div>
                 </div>
 

src/pages/master/products/blocks/EditDialog.tsx

@@ -15,6 +15,18 @@ import {
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select';
+
+interface ProviderProps {
+  provider_id: string;
+  provider_name: string;
+}
 
 const API_URL = apiConfig.service_master_data;
 const EditDialog = () => {
@@ -30,17 +42,21 @@ const EditDialog = () => {
   });
   const initialState = {
     name: '',
+    code: '',
+    type: '',
     description: '',
     price_point: 0,
     price_cash: 0,
     cashback_point: 0,
     cashback_cash: 0,
     status: '',
-    providerId: '',
+    provider: '',
+    process_on_third_party: '',
     updated_by: '',
     updated_at: ''
   };
   const [formField, setFormField] = useState(initialState);
+  const [providers, setProviders] = useState<ProviderProps[]>([]);
 
   const resetForm = () => {
     setFormField(initialState);
@@ -66,19 +82,40 @@ const EditDialog = () => {
     [selectedProducts, formField]
   );
 
+  const doFetchProvider = useCallback(async (sorting: any) => {
+    try {
+      const response = await GetData(`${API_URL}/provider/list`, {
+        limit: 100,
+        page: 1,
+        with_deleted: false,
+        order_field: sorting[0].id,
+        order_direction: sorting[0].desc == false ? 'ASC' : 'DESC'
+      });
+      // console.log('PROVIDER: ', response?.data);
+      setProviders(response?.data.list);
+    } catch (error) {
+      console.error('Error fetching provider', error);
+    }
+  }, []);
+
   const doFetchData = useCallback(async (id: string) => {
-    const response = await GetData(`${API_URL}/product/getdata/${selectedProducts}`, { id });
+    const response = await GetData(`${API_URL}/product/getdata/${id}`, { id });
+    console.log(response);
 
     if (response?.status) {
       setFormField((prev) => ({
         ...prev,
         name: response.data.name,
+        type: response.data.type,
+        code: response.data.code,
         description: response.data.description,
         price_point: response.data.price_point,
         price_cash: response.data.price_cash,
         cashback_point: response.data.cashback_point,
         cashback_cash: response.data.cashback_cash,
-        status: response.data.status
+        status: response.data.status,
+        provider: response.data.provider.id,
+        process_on_third_party: response.data.process_on_third_party
       }));
     } else {
       setFormField(initialState);
@@ -90,6 +127,8 @@ const EditDialog = () => {
 
     if (
       formField.name.trim() === '' ||
+      formField.type.trim() === '' ||
+      formField.code.trim() === '' ||
       formField.description.trim() === '' ||
       formField.price_point === 0 ||
       formField.price_cash === 0 ||
@@ -130,6 +169,10 @@ const EditDialog = () => {
     }
   }, [formattedTime]);
 
+  useEffect(() => {
+    doFetchProvider([{ id: 'name', desc: false }]);
+  }, []);
+
   return (
     <Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}>
       <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden">
@@ -137,7 +180,7 @@ const EditDialog = () => {
           <DialogTitle>Product - Update</DialogTitle>
           <DialogDescription></DialogDescription>
         </DialogHeader>
-        <DialogBody>
+        <DialogBody className="overflow-y-auto">
           <div className="flex flex-col">
             {alert.show && (
               <Alert variant="danger">
@@ -161,6 +204,34 @@ const EditDialog = () => {
                   </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">
+                      Type<span className="text-red-500">*</span>
+                    </label>
+                    <Input
+                      className="input"
+                      type="text"
+                      value={formField.type}
+                      onChange={(e) => setFormField({ ...formField, type: e.target.value })}
+                    />
+                  </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">
+                      Code<span className="text-red-500">*</span>
+                    </label>
+                    <Input
+                      className="input"
+                      type="text"
+                      value={formField.code}
+                      onChange={(e) => setFormField({ ...formField, code: e.target.value })}
+                    />
+                  </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">
@@ -256,12 +327,18 @@ const EditDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Status<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <Select
-                      className="input"
-                      type="text"
                       value={formField.status}
-                      onChange={(e) => setFormField({ ...formField, status: e.target.value })}
+                      onValueChange={(e) => setFormField({ ...formField, status: e })}
-                    />
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select a Status" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="Y">Active</SelectItem>
+                        <SelectItem value="N">Inactive</SelectItem>
+                      </SelectContent>
+                    </Select>
                   </div>
                 </div>
 
@@ -270,12 +347,43 @@ const EditDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Provider ID
                     </label>
-                    <Input
+                    <Select
-                      className="input"
+                      value={formField.provider}
-                      type="text"
+                      onValueChange={(e) => setFormField({ ...formField, provider: e })}
-                      value={formField.providerId}
+                    >
-                      onChange={(e) => setFormField({ ...formField, providerId: e.target.value })}
+                      <SelectTrigger>
-                    />
+                        <SelectValue placeholder="Select a Provider" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {providers.map((provider) => (
+                          <SelectItem key={provider.provider_id} value={provider.provider_id}>
+                            {provider.provider_name}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  </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">
+                      Process on Third Party<span className="text-red-500">*</span>
+                    </label>
+                    <Select
+                      value={formField.process_on_third_party}
+                      onValueChange={(value) =>
+                        setFormField({ ...formField, process_on_third_party: value })
+                      }
+                    >
+                      <SelectTrigger>
+                        <SelectValue placeholder="Select Status" />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="Y">Yes</SelectItem>
+                        <SelectItem value="N">No</SelectItem>
+                      </SelectContent>
+                    </Select>
                   </div>
                 </div>
 

src/pages/master/products/blocks/ListToolbar.tsx

@@ -20,17 +20,17 @@ const ListToolbar = () => {
                 onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 // onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button

src/pages/master/products/hooks/ManageProductsContext.tsx

@@ -7,12 +7,12 @@ import { Toaster } from 'sonner';
 import ListToolbar from '../blocks/ListToolbar';
 
 interface ProductsProps {
-  name: string;
+  products_name: string;
-  description: string;
+  products_description: string;
-  price_point: number;
+  products_price_point: number;
-  price_cash: number;
+  products_price_cash: number;
-  status: string;
+  products_status: string;
-  providerId: string;
+  products_providerId: string;
 }
 
 interface ContextProps {
@@ -73,17 +73,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
       {
-        accessorFn: (row) => row.id,
+        accessorFn: (row) => row.products_name,
-        id: 'id',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
-      {
-        accessorFn: (row) => row.name,
         id: 'name',
         header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
         enableSorting: true,
@@ -93,7 +83,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.description,
+        accessorFn: (row) => row.products_description,
         id: 'description',
         header: ({ column }) => <DataGridColumnHeader title="Description" column={column} />,
         enableSorting: true,
@@ -103,7 +93,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.price_point,
+        accessorFn: (row) => row.products_price_point,
         id: 'price_point',
         header: ({ column }) => <DataGridColumnHeader title="Price Point" column={column} />,
         enableSorting: true,
@@ -113,7 +103,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.price_cash,
+        accessorFn: (row) => row.products_price_cash,
         id: 'price_cash',
         header: ({ column }) => <DataGridColumnHeader title="Price Cash" column={column} />,
         enableSorting: true,
@@ -133,13 +123,13 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
             <>
               <button
                 className="btn btn-sm btn-icon btn-clear btn-light"
-                onClick={() => handleEditDialog(true, row.id)}
+                onClick={() => handleEditDialog(true, row.products_id)}
               >
                 <KeenIcon icon="notepad-edit" />
               </button>
               <button
                 className="btn btn-sm btn-icon btn-clear btn-light"
-                onClick={() => handleDeleteDialog(true, row.id)}
+                onClick={() => handleDeleteDialog(true, row.products_id)}
               >
                 <KeenIcon icon="trash" />
               </button>
@@ -193,7 +183,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/profession/blocks/EditDialog.tsx

@@ -20,7 +20,7 @@ const API_URL = apiConfig.service_master_data;
 const EditDialog = () => {
   const { showEditDialog, handleEditDialog, selectedProfession } = useManageProfessionContext();
   const { reload } = useDataGrid();
-  const { PutData } = useCallApi();
+  const { PutData, GetData } = useCallApi();
   const parsedUser = getAuth()?.user;
   const created_time = new Date();
   const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' ');
@@ -62,6 +62,19 @@ const EditDialog = () => {
     [selectedProfession, formField]
   );
 
+  const doFetchData = useCallback(async (id: string) => {
+    const response = await GetData(`${API_URL}/profession/getdata/${id}`, { id });
+
+    if (response?.status) {
+      setFormField((prev) => ({
+        ...prev,
+        name: response.data.name
+      }));
+    } else {
+      setFormField(initialState);
+    }
+  }, []);
+
   const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
 
@@ -75,6 +88,12 @@ const EditDialog = () => {
     setAlert({ show: false, message: '' });
   };
 
+  useEffect(() => {
+    if (selectedProfession) {
+      doFetchData(selectedProfession);
+    }
+  }, [selectedProfession]);
+
   useEffect(() => {
     if (showEditDialog) {
       setFormField({
@@ -85,6 +104,12 @@ const EditDialog = () => {
     }
   }, [formattedTime]);
 
+  useEffect(() => {
+    if (showEditDialog === false) {
+      resetForm();
+    }
+  }, [showEditDialog]);
+
   return (
     <Dialog open={showEditDialog} onOpenChange={(open) => handleEditDialog(open, null)}>
       <DialogContent className="container-fixed max-w-[768px] flex flex-col p-5 overflow-hidden">

src/pages/master/profession/blocks/ListToolbar.tsx

@@ -22,17 +22,17 @@ const ListToolbar = () => {
                 }
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 // onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button

src/pages/master/profession/hooks/ManageProfessionContext.tsx

@@ -67,16 +67,6 @@ const ManageProfessionContextProvider = ({ children }: { children: React.ReactNo
 
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
-      {
-        accessorFn: (row) => row.id,
-        id: 'id',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
       {
         accessorFn: (row) => row.name,
         id: 'name',
@@ -132,7 +122,7 @@ const ManageProfessionContextProvider = ({ children }: { children: React.ReactNo
         order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
         filter: JSON.stringify(filter)
       });
-      console.log(response?.data);
+      // console.log(response?.data);
       setProfession(response?.data.list);
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {
@@ -158,7 +148,7 @@ const ManageProfessionContextProvider = ({ children }: { children: React.ReactNo
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/provider/blocks/EditDialog.tsx

@@ -56,7 +56,7 @@ const EditDialog = () => {
     type: '',
     status: '',
     transactionTypeId: '',
-    agentId: '',
+    agent: '',
     updated_by: '',
     updated_at: ''
   };
@@ -91,62 +91,6 @@ const EditDialog = () => {
     [selectedProvider, formField]
   );
 
-  const doFetchData = useCallback(async () => {
-    if (selectedProvider) {
-      const data = provider.find((item) => item.id === selectedProvider);
-      if (data) {
-        setFormField((prev) => ({
-          ...prev,
-          name: data.name,
-          description: data.description,
-          type: data.type,
-          status: data.status,
-          transactionTypeId: data.transactionTypeId,
-          agentId: data.agentId
-        }));
-      }
-    } else {
-      resetForm();
-    }
-  }, []);
-
-  const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
-    e.preventDefault();
-
-    if (
-      formField.name.trim() === '' ||
-      formField.description.trim() === '' ||
-      formField.type.trim() === '' ||
-      formField.status.trim() === '' ||
-      formField.transactionTypeId.trim() === '' ||
-      formField.agentId.trim() === ''
-    ) {
-      setAlert({ show: true, message: 'Please fill in all required fields.' });
-      return;
-    }
-
-    doUpdateProvider(e);
-    // console.log(formField);
-    setAlert({ show: false, message: '' });
-  };
-
-  useEffect(() => {
-    if (selectedProvider) {
-      doFetchData();
-    }
-  }, [selectedProvider]);
-
-  useEffect(() => {
-    if (showEditDialog) {
-      setFormField({
-        ...formField,
-        updated_by: parsedUser.username,
-        updated_at: formattedTime
-      });
-    }
-  }, [formattedTime]);
-
-  useEffect(() => {
   const getCustomerList = async (sorting: any) => {
     try {
       sorting = sorting.length == 0 ? [{ id: 'name', desc: false }] : sorting;
@@ -182,6 +126,65 @@ const EditDialog = () => {
     }
   };
 
+  const doFetchData = useCallback(async (id: string) => {
+    const response = await GetData(`${API_URL_MASTERDATA}/provider/getdata/${id}`, { id });
+    console.log(response);
+    if (response?.status) {
+      setFormField((prev) => ({
+        ...prev,
+        name: response?.data.name,
+        description: response?.data.description,
+        type: response?.data.type,
+        status: response?.data.status,
+        transactionTypeId: response?.data.transactionTypeId,
+        agent: response?.data.agent
+      }));
+    }
+  }, []);
+
+  const handleUpdate = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    if (
+      formField.name.trim() === '' ||
+      formField.description.trim() === '' ||
+      formField.type.trim() === '' ||
+      formField.status.trim() === '' ||
+      formField.transactionTypeId.trim() === '' ||
+      formField.agent.trim() === ''
+    ) {
+      setAlert({ show: true, message: 'Please fill in all required fields.' });
+      return;
+    }
+
+    doUpdateProvider(e);
+    // console.log(formField);
+    setAlert({ show: false, message: '' });
+  };
+
+  useEffect(() => {
+    if (showEditDialog === false) {
+      resetForm();
+    }
+  }, [showEditDialog]);
+
+  useEffect(() => {
+    if (selectedProvider) {
+      doFetchData(selectedProvider);
+    }
+  }, [selectedProvider]);
+
+  useEffect(() => {
+    if (showEditDialog) {
+      setFormField({
+        ...formField,
+        updated_by: parsedUser.username,
+        updated_at: formattedTime
+      });
+    }
+  }, [formattedTime]);
+
+  useEffect(() => {
     getCustomerList([{ id: 'msisdn', desc: false }]);
     getTransactionTypeList([{ id: 'name', desc: false }]);
   }, []);
@@ -306,7 +309,7 @@ const EditDialog = () => {
                     <Popover open={open} onOpenChange={setOpen}>
                       <PopoverTrigger asChild>
                         <button type="button" className="input col-span-5 text-left">
-                          {customers.find((customer) => customer.msisdn === formField.agentId)
+                          {customers.find((customer) => customer.msisdn === formField.agent)
                             ?.fullname || 'Select Agent'}
                         </button>
                       </PopoverTrigger>
@@ -323,7 +326,7 @@ const EditDialog = () => {
                                   onSelect={() => {
                                     setFormField({
                                       ...formField,
-                                      agentId: customer.msisdn
+                                      agent: customer.msisdn
                                     });
                                     setOpen(false);
                                   }}

src/pages/master/provider/blocks/ListToolbar.tsx

@@ -20,17 +20,17 @@ const ListToolbar = () => {
                 onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 // onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
           </div>
           <div className="flex gap-3 items-center">
             <Button

src/pages/master/provider/hooks/ManageProviderContext.tsx

@@ -74,17 +74,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
       {
-        accessorFn: (row) => row.id,
+        accessorFn: (row) => row.provider_name,
-        id: 'id',
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
-      {
-        accessorFn: (row) => row.name,
         id: 'name',
         header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
         enableSorting: true,
@@ -94,7 +84,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.description,
+        accessorFn: (row) => row.provider_description,
         id: 'description',
         header: ({ column }) => <DataGridColumnHeader title="Description" column={column} />,
         enableSorting: false,
@@ -104,7 +94,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.type,
+        accessorFn: (row) => row.provider_type,
         id: 'type',
         header: ({ column }) => <DataGridColumnHeader title="Type" column={column} />,
         enableSorting: false,
@@ -114,7 +104,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.status,
+        accessorFn: (row) => row.provider_status,
         id: 'status',
         header: ({ column }) => <DataGridColumnHeader title="Status" column={column} />,
         enableSorting: false,
@@ -134,13 +124,13 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
             <>
               <button
                 className="btn btn-sm btn-icon btn-clear btn-light"
-                onClick={() => handleEditDialog(true, row.id)}
+                onClick={() => handleEditDialog(true, row.provider_id)}
               >
                 <KeenIcon icon="notepad-edit" />
               </button>
               <button
                 className="btn btn-sm btn-icon btn-clear btn-light"
-                onClick={() => handleDeleteDialog(true, row.id)}
+                onClick={() => handleDeleteDialog(true, row.provider_id)}
               >
                 <KeenIcon icon="trash" />
               </button>
@@ -168,7 +158,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
         filter: JSON.stringify(filter)
       });
-      // console.log(response?.data);
+      console.log(response?.data);
       setProvider(response?.data.list);
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {
@@ -194,7 +184,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/master/sucos/SucosMaster.tsx

@@ -10,7 +10,7 @@ const SucosMaster = () => {
   return (
     <ManageSucosContextProvider>
       <Container>
-        <h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Sucos</h1>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Sucos</h1>
         <Breadcrumbs sx={{ mb: 2 }}>
           <Link underline="none" color="inherit" href="/">
             <span className="text-sm hover:underline">Dashboard</span>

src/pages/master/sucos/blocks/ListToolbar.tsx

@@ -30,17 +30,17 @@ const ListToolbar = () => {
                 }
               />
             </label>
-            <DefaultTooltip title={'Filter'} placement={'top'}>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
                 className="h-7.5 disabled:bg-gray-400"
                 // disabled={isLoading}
                 // onClick={handleFilterData}
               >
-                {/* {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />} */}
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
                 <KeenIcon icon="filter" />
               </Button>
-            </DefaultTooltip>
+            </DefaultTooltip> */}
             {/* <Button
               variant="outline"
               className="h-7.5 text-[0.8rem]"

src/pages/master/sucos/hooks/ManageSucosContext.tsx

@@ -85,21 +85,6 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
 
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
-      {
-        accessorKey: 'sucos_id',
-        id: 'sucos_id',
-        filterFn: (row, columnId, filterValue) => {
-          const value = row.getValue<number>(columnId);
-          console.log('Filtering:', { value, filterValue });
-          return String(value).includes(String(filterValue));
-        },
-        header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
-        enableSorting: true,
-        enableHiding: false,
-        meta: {
-          headerClassName: 'w-[100px]'
-        }
-      },
       {
         accessorFn: (row) => row.sucos_name,
         id: 'sucos_name',

src/pages/master/walletRule/WalletRuleMaster.tsx

@@ -0,0 +1,32 @@
+import { Container, DataGridInner } from '@/components';
+import { ManageWalletRuleContextProvider } from './hooks/ManageWalletRuleContext';
+import { Breadcrumbs, Link } from '@mui/material';
+
+const WalletRuleMaster = () => {
+  return (
+    <ManageWalletRuleContextProvider>
+      <Container>
+        <h1 className="text-xl font-medium leading-none text-gray-900 mb-5">Wallet Rule</h1>
+        <Breadcrumbs sx={{ mb: 2 }}>
+          <Link underline="none" color="inherit" href="/">
+            <span className="text-sm hover:underline">Dashboard</span>
+          </Link>
+
+          <Link underline="none" color="inherit">
+            <span className="text-sm">Master Data</span>
+          </Link>
+
+          <Link underline="none" color="inherit">
+            <span className="text-sm">Manage Wallet Rule</span>
+          </Link>
+        </Breadcrumbs>
+
+        <div className="grid gap-5 lg:gap-7.5">
+          <DataGridInner />
+        </div>
+      </Container>
+    </ManageWalletRuleContextProvider>
+  );
+};
+
+export default WalletRuleMaster;

src/pages/master/walletRule/blocks/ListToolbar.tsx

@@ -0,0 +1,55 @@
+import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
+import { Button } from '@/components/ui/button';
+import { useManageProductsContext } from '../../products/hooks/useManageProductsContext';
+
+const ListToolbar = () => {
+  const { table, reload } = useDataGrid();
+  const { handleAddDialog } = useManageProductsContext();
+
+  return (
+    <div className="card-header flex-wrap gap-2 border-b-0 px-5">
+      <div className="flex flex-wrap gap-2 lg:gap-5 w-full">
+        <div className="flex justify-between w-full items-center">
+          <div className="flex w-[50%] gap-3 items-center">
+            <label className="input input-sm w-1/3">
+              <KeenIcon icon="magnifier" />
+              <input
+                type="text"
+                placeholder="Search Products"
+                value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
+                onChange={(event) => table.getColumn('name')?.setFilterValue(event.target.value)}
+              />
+            </label>
+            {/* <DefaultTooltip title={'Filter'} placement={'top'}>
+              <Button
+                variant="outline"
+                className="h-7.5 disabled:bg-gray-400"
+                // disabled={isLoading}
+                // onClick={handleFilterData}
+              >
+                {loadingButton === 'filter' ? <ContentLoader /> : <KeenIcon icon="filter" />}
+                <KeenIcon icon="filter" />
+              </Button>
+            </DefaultTooltip> */}
+          </div>
+          <div className="flex gap-3 items-center">
+            <Button
+              variant="outline"
+              className="h-7.5 text-[0.8rem]"
+              onClick={() => handleAddDialog(true)}
+            >
+              Add Data
+            </Button>
+            <DefaultTooltip title={'Refresh'} placement={'top'}>
+              <Button variant="outline" className="h-7.5" onClick={() => reload()}>
+                <KeenIcon icon="arrows-circle" />
+              </Button>
+            </DefaultTooltip>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default ListToolbar;

src/pages/master/walletRule/hooks/ManageWalletRuleContext.tsx

@@ -0,0 +1,220 @@
+import { DataGridColumnHeader, DataGridProvider, KeenIcon } from '@/components';
+import { Toaster } from '@/components/ui/sonner';
+import { apiConfig } from '@/config/api.config';
+import { useCallApi } from '@/hooks';
+import { ColumnDef } from '@tanstack/react-table';
+import React, { createContext, useCallback, useMemo, useState } from 'react';
+import ListToolbar from '../blocks/ListToolbar';
+
+interface WalletRuleProps {
+  name: string;
+  id_currency: string;
+  status: string;
+}
+
+interface ContextProps {
+  walletRules: WalletRuleProps[];
+  showAddDialog: boolean;
+  handleAddDialog: (show: boolean) => void;
+  showEditDialog: boolean;
+  handleEditDialog: (show: boolean, selected_walletRule: string | null) => void;
+  showDeleteDialog: boolean;
+  handleDeleteDialog: (show: boolean, selected_walletRule: string | null) => void;
+  selectedWalletRule: string | null;
+  getWalletRuleLists: (
+    limit: number,
+    page: number,
+    with_deleted: boolean,
+    order_field: any,
+    order_direction: any
+  ) => Promise<{ data: WalletRuleProps[]; totalCount: number } | undefined>;
+}
+
+const initialProps: ContextProps = {
+  walletRules: [],
+  showAddDialog: false,
+  handleAddDialog: (show: boolean) => {},
+  showEditDialog: false,
+  handleEditDialog: (show: boolean, selected_walletRule: string | null) => {},
+  showDeleteDialog: false,
+  handleDeleteDialog: (show: boolean, selected_walletRule: string | null) => {},
+  selectedWalletRule: null,
+  getWalletRuleLists: async () => undefined
+};
+
+const ManageWalletRuleContext = createContext<ContextProps>(initialProps);
+const API_URL_WALLET = apiConfig.service_wallet;
+
+const ManageWalletRuleContextProvider = ({ children }: { children: React.ReactNode }) => {
+  const [walletRules, setWalletRules] = useState<WalletRuleProps[]>([]);
+  const [showAddDialog, setShowAddDialog] = useState(false);
+  const [showEditDialog, setShowEditDialog] = useState(false);
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false);
+  const [selectedWalletRule, setSelectedWalletRule] = useState<string | null>(null);
+  const { GetData } = useCallApi();
+
+  const handleAddDialog = useCallback((show: boolean) => {
+    setShowAddDialog(show);
+  }, []);
+
+  const handleEditDialog = useCallback((show: boolean, selected_walletRule: string | null) => {
+    setShowEditDialog(show);
+    setSelectedWalletRule(show ? selected_walletRule : null);
+  }, []);
+
+  const handleDeleteDialog = useCallback((show: boolean, selected_walletRule: string | null) => {
+    setShowDeleteDialog(show);
+    setSelectedWalletRule(show ? selected_walletRule : null);
+  }, []);
+
+  const columns = useMemo<ColumnDef<any>[]>(
+    () => [
+      {
+        accessorFn: (row) => row.balance_minimum,
+        id: 'balance_minimum',
+        header: ({ column }) => <DataGridColumnHeader title="Balance Minimum" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        accessorFn: (row) => row.balance_maximum,
+        id: 'balance_maximum',
+        header: ({ column }) => <DataGridColumnHeader title="Balance Maximum" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        accessorFn: (row) => row.credit_limit,
+        id: 'credit_limit',
+        header: ({ column }) => <DataGridColumnHeader title="Credit Limit" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        accessorFn: (row) => row.max_transaction_per_day,
+        id: 'max_transaction_per_day',
+        header: ({ column }) => (
+          <DataGridColumnHeader title="Max Transaction Per Day" column={column} />
+        ),
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        accessorFn: (row) => row.monthly_limit,
+        id: 'monthly_limit',
+        header: ({ column }) => <DataGridColumnHeader title="Monthly Limit" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        accessorFn: (row) => row.status,
+        id: 'status',
+        header: ({ column }) => <DataGridColumnHeader title="Status" column={column} />,
+        enableSorting: true,
+        enableHiding: false,
+        meta: {
+          headerClassName: 'w-[250px]'
+        }
+      },
+      {
+        id: 'actions',
+        header: ({ column }) => <DataGridColumnHeader title="Actions" column={column} />,
+        enableSorting: false,
+        enableHiding: false,
+        cell: (data) => {
+          const row = data.row.original;
+          return (
+            <>
+              <button
+                className="btn btn-sm btn-icon btn-clear btn-light"
+                onClick={() => handleEditDialog(true, row.id)}
+              >
+                <KeenIcon icon="notepad-edit" />
+              </button>
+              <button
+                className="btn btn-sm btn-icon btn-clear btn-light"
+                onClick={() => handleDeleteDialog(true, row.id)}
+              >
+                <KeenIcon icon="trash" />
+              </button>
+            </>
+          );
+        },
+        meta: {
+          headerClassName: 'w-[100px]',
+          cellClassName: 'text-center'
+        }
+      }
+    ],
+    []
+  );
+
+  const getWalletRuleLists = async (page: number, limit: number, sorting: any, filter: any) => {
+    try {
+      sorting = sorting.length == 0 ? [{ id: 'name', desc: false }] : sorting;
+      filter = filter.length == 0 ? {} : { any: filter[0].value?.toLowerCase() };
+      const response = await GetData(`${API_URL_WALLET}/dashboard/wallet_rule`, {
+        limit,
+        page: page + 1,
+        with_deleted: false,
+        order_field: sorting[0].id,
+        order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
+        filter: JSON.stringify(filter)
+      });
+      console.log(response?.data);
+      setWalletRules(response?.data.list);
+      return { data: response?.data.list, totalCount: response?.data.total_count };
+    } catch (error) {
+      console.error('Error fetching Wallet Rule', error);
+    }
+  };
+
+  return (
+    <ManageWalletRuleContext.Provider
+      value={{
+        walletRules: walletRules,
+        showAddDialog,
+        handleAddDialog,
+        showEditDialog,
+        handleEditDialog,
+        showDeleteDialog,
+        handleDeleteDialog,
+        selectedWalletRule,
+        getWalletRuleLists
+      }}
+    >
+      <Toaster expand visibleToasts={9} duration={3000} />
+      <DataGridProvider
+        columns={columns}
+        pagination={{ size: 10 }}
+        toolbar={<ListToolbar />}
+        layout={{ card: true }}
+        sorting={[{ id: 'id', desc: false }]}
+        serverSide={true}
+        onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
+          getWalletRuleLists(pageIndex, pageSize, sorting, columnFilters)
+        }
+      >
+        {children}
+      </DataGridProvider>
+    </ManageWalletRuleContext.Provider>
+  );
+};
+
+export { ManageWalletRuleContext, ManageWalletRuleContextProvider };
+export type { WalletRuleProps };

src/pages/master/walletRule/hooks/useManageWalletRuleContext.tsx

@@ -0,0 +1,16 @@
+import { useContext } from 'react';
+import { ManageWalletRuleContext } from './ManageWalletRuleContext';
+
+const useManageWalletRuleContext = () => {
+  const context = useContext(ManageWalletRuleContext);
+
+  if (!context) {
+    throw new Error(
+      'useManageWalletRuleContext must be used within a ManageWalletRuleContextProvider'
+    );
+  }
+
+  return context;
+};
+
+export { useManageWalletRuleContext };

src/pages/members/manage-members/CustomerDetailModal.tsx

@@ -1,18 +1,9 @@
 import React, { useState, useEffect } from "react";
 import axios from 'axios';
-import {
+import { Dialog,DialogActions,DialogContent,DialogTitle,TextField,Button,MenuItem,Select,InputLabel,FormControl,Typography,
-  Dialog,
+  InputAdornment,Grid,Box
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  TextField,
-  Button,
-  MenuItem,
-  Select,
-  InputLabel,
-  FormControl,
-  Typography
 } from "@mui/material";
+import UploadFileIcon from "@mui/icons-material/UploadFile";
 import Divider from '@mui/material/Divider';
 import { initialMember } from "./Columns";
 import { apiConfig } from '@/config/api.config';
@@ -81,7 +72,11 @@ const CustomerDialog = ({ open, handleClose, handleSubmit, initialData, viewStat
   const handleChange = async (e: any) => {
     const { name, value } = e.target;
     if (name === 'municipio' || name === 'posto_adms' || name === 'suco') await getMasterAfter(name, value);
+    if (name === "file_selfie" || name === "photouser") { // FOR FILE ONLY
+      setFormData({ ...formData, [name]: e.target.files[0] });
+    } else {
       setFormData({ ...formData, [name]: value });
+    }
   };
 
   async function getMasterAfter(name: string, id: any) {
@@ -159,7 +154,7 @@ const CustomerDialog = ({ open, handleClose, handleSubmit, initialData, viewStat
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Full Name" name="fullname" value={formData.fullname} onChange={handleChange} />
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Email" name="email" value={formData.email} onChange={handleChange} />
         <TextField disabled fullWidth margin="dense" label="Group" name="group" value={formData.group_name} onChange={handleChange} />
-        <TextField disabled={viewOnly} type="file" fullWidth margin="dense" label="Photo" name="photouser" value={formData.photouser} onChange={handleChange} />
+        {fileTextFile("Photo", formData.photouser, "photouser", handleChange)}
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Username" name="username" value={formData.username} onChange={handleChange} />
         <TextField disabled={viewOnly} fullWidth margin="dense" label="MSISDN" name="msisdn" value={formData.msisdn} onChange={handleChange} />
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Address" name="address" value={formData.address} onChange={handleChange} />
@@ -180,8 +175,17 @@ const CustomerDialog = ({ open, handleClose, handleSubmit, initialData, viewStat
             <MenuItem value="passport">Passport</MenuItem>
           </Select>
         </FormControl>
+        
+        {/* AGENT & PREMIUM DATA */}
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Identity Number" name="identity_number" value={formData.identity_number} onChange={handleChange} />
         <TextField disabled={viewOnly} type="number" fullWidth margin="dense" label="License Number" name="license_number" value={formData.license_number} onChange={handleChange} />
+        <TextField disabled={viewOnly} type="text" fullWidth margin="dense" label="Merchant Address" name="merchantaddress" value={formData.merchantaddress} onChange={handleChange} />
+        {fileTextFile("File Selfie", formData.file_selfie, "file_selfie", handleChange)}
+        {fileTextFile("File Document", formData.file_document_id, "file_document_id", handleChange)}
+        {fileTextFile("File Document & Selfie", formData.file_document_id_selfie, "file_document_id_selfie", handleChange)}
+        {fileTextFile("File Commercial License", formData.file_commercial_license, "file_commercial_license", handleChange)}
+        {/* AGENT & PREMIUM DATA */}
+        
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Profession" name="profession" value={formData.profession} onChange={handleChange} />
         {/* <TextField fullWidth margin="dense" label="Password" name="password" type="password" value={formData.password} onChange={handleChange} /> */}
         {/* <TextField fullWidth margin="dense" label="PIN" name="pin" value={formData.pin} onChange={handleChange} /> */}
@@ -239,14 +243,25 @@ const CustomerDialog = ({ open, handleClose, handleSubmit, initialData, viewStat
 
         <Divider className="pt-7"/>
         <Typography sx={{color:'grey'}}>Bank</Typography>
-        <TextField disabled={viewOnly} fullWidth margin="dense" label="Bank Name" name="bank_name" value={formData.bank_name} onChange={handleChange} />
+        <FormControl fullWidth margin="dense">
+          <InputLabel>Bank Name</InputLabel>
+          <Select disabled={viewOnly} name="bank_name" value={formData.bank_name} onChange={handleChange}>
+            <MenuItem value="BNCTL">BNCTL</MenuItem>
+            <MenuItem value="BRI">BRI</MenuItem>
+            <MenuItem value="BNU">BNU</MenuItem>
+            <MenuItem value="Mandiri">Mandiri</MenuItem>
+          </Select>
+        </FormControl>
         <TextField disabled={viewOnly} fullWidth margin="dense" label="Bank Account" name="bank_account" value={formData.bank_account} onChange={handleChange} />
         <TextField disabled={viewOnly} fullWidth margin="dense" label="iBank Number" name="ibank_number" value={formData.ibank_number} onChange={handleChange} />
         <Divider className="pt-7"/>
-        <Typography sx={{color:'grey'}}>Approval</Typography>
+        {getAdmAccess(page)}
         {
           page === 'kyc' ? (
+            <>
+              <Typography sx={{color:'grey'}}>Approval</Typography>
               <TextField fullWidth margin="dense" label="Approval Description" name="description" value={formData.description} onChange={handleChange} />
+            </>
           ) : ('')
         }
       </DialogContent>
@@ -267,3 +282,74 @@ const CustomerDialog = ({ open, handleClose, handleSubmit, initialData, viewStat
 };
 
 export default CustomerDialog;
+
+function fileTextFile(label: string, value: any, name: string, handleChange: any) {
+  return (
+    <TextField
+    margin="dense"
+    label={label}
+    variant="outlined"
+    fullWidth
+    value={value}
+    placeholder="Choose a file..."
+    InputProps={{
+      readOnly: true,
+      endAdornment: (
+        <InputAdornment position="end">
+          <input
+            type="file"
+            id="file-upload"
+            style={{ display: "none" }}
+            onChange={handleChange}
+            name={name}
+          />
+          <label htmlFor="file-upload">
+            <Button
+              component="span"
+              variant="contained"
+              color="primary"
+              startIcon={<UploadFileIcon />}
+            >
+              Browse
+            </Button>
+          </label>
+        </InputAdornment>
+      ),
+    }}
+  />
+  )
+}
+
+function getAdmAccess(page: string) {
+  if (page !== "kyc") {
+    return (
+      <Box p={3} boxShadow={3} borderRadius={2} bgcolor="white">
+        <Typography variant="h6" gutterBottom>Access Administration</Typography>
+        <Grid container spacing={3}>
+          <Grid item xs={6} container direction="column" spacing={2}>
+            <Grid item>
+              <Typography variant="body2">Unblock PIN</Typography>
+              <Button variant="contained" color="primary">Unblock PIN</Button>
+            </Grid>
+            <Grid item>
+              <Typography variant="body2">Reset PIN</Typography>
+              <Button variant="contained" color="primary">Reset PIN</Button>
+            </Grid>
+          </Grid>
+          <Grid item xs={6} container direction="column" spacing={2}>
+            <Grid item>
+              <Typography variant="body2">Change Group</Typography>
+              <Button variant="contained" color="primary">Change Group</Button>
+            </Grid>
+            <Grid item>
+              <Typography variant="body2">Edit Member</Typography>
+              <Button variant="contained" color="primary">Edit Member</Button>
+            </Grid>
+          </Grid>
+        </Grid>
+      </Box>
+    )
+  } else {
+    return ('')
+  }
+}

src/pages/menu/manage-menu/blocks/AddDIalog.tsx

@@ -143,6 +143,7 @@ const AddDialog = () => {
                           id: 'uncontrolled-native',
                         }}
                       >
+                      <option value={''}>As Parent</option>
                       {
                         parents ? parents.map((el: any) => (
                           <option key={el.id} value={el.id}>{el.name}</option>
@@ -175,6 +176,7 @@ const AddDialog = () => {
                   <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">Icon</label>
                     <Input
+                      disabled
                       className="input"
                       type="text"
                       value={formField.icon}
@@ -198,6 +200,7 @@ const AddDialog = () => {
                           id: 'uncontrolled-native',
                         }}
                       >
+                        <option value={''}>Select</option>
                         <option value={"Y"}>Active</option>
                         <option value={"N"}>Inactive</option>
                       </NativeSelect>

src/pages/menu/manage-menu/hooks/ManageMenusContext.tsx

@@ -175,7 +175,8 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode })
 
   const flattenChildren = (parent: any, parentIdx: number, depth = 0, parentName = '') => {
     if (parent.link === '/') {
-      if (!parents.find((el: any) => el.id === parent.id)) setParents((el: any) => [...el, { id: parent.id, name: parent.name }]) // GET PARENTS
+      if (!parents.find((el: any) => el.id === parent.id))
+        setParents((el: any) => [...el, { id: parent.id, name: parent.name }]); // GET PARENTS
     }
     if (!parent.children || parent.children.length === 0) {
       return []; // Jika tidak ada children, kembalikan array kosong
@@ -220,8 +221,9 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode })
 
       const total_count = transformedData.length;
 
+      console.log(response.data);
       setMenus(transformedData);
-      return { data: transformedData, totalCount: total_count };
+      return { data: transformedData, totalCount: response.data.total_count };
     } catch (error) {
       console.error('Error fetching Menus', error);
       return { data: [], totalCount: 0 };
@@ -248,7 +250,7 @@ const ManageMenusContextProvider = ({ children }: { children: React.ReactNode })
 
       <DataGridProvider
         columns={columns}
-        pagination={{ size: 25 }}
+        pagination={{ size: 30 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
         sorting={[{ id: 'id', desc: false }]}

src/pages/settings/user/manage-position/blocks/AddDialog.tsx

@@ -83,6 +83,12 @@ const AddDialog = () => {
   const doCreatePosition = useCallback(
     async (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
+
+      if (formField.name.trim() === '') {
+        setAlert({ show: true, message: 'Please fill in all required fields.' });
+        return;
+      }
+
       const response = await PostData(`${API_URL}/user_role/create`, {
         name: formField.name,
         roles: selectMenus,

src/pages/settings/user/manage-position/blocks/EditDialog.tsx

@@ -91,6 +91,12 @@ const EditDialog = () => {
   const doEditPosition = useCallback(
     async (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
+
+      if (formField.name.trim() === '') {
+        setAlert((prev) => ({ ...prev, show: true, message: 'Please fill name field.' }));
+        return;
+      }
+
       if (!selectedPosition) {
         toast.success('Please Select Position');
         return;

src/pages/transaction/transaction.tsx

@@ -0,0 +1,12 @@
+const Transaction = () => {
+    return (
+      <div>
+        <div className="container mx-auto p-5">
+          <h1 className="text-xl font-medium leading-none text-gray-900">Transaction</h1>
+        </div>
+      </div>
+    );
+  };
+  
+  export default Transaction;
+  

src/routing/AppRoutingSetup.tsx

@@ -33,6 +33,9 @@ import Municipios from '@/pages/master/municipios/Municipios';
 import ProfessionMaster from '@/pages/master/profession/ProfessionMaster';
 import ProductsMaster from '@/pages/master/products/ProductsMaster';
 import ProviderMaster from '@/pages/master/provider/ProviderMaster';
+import Transaction from '@/pages/transaction/transaction';
+import ConversionMaster from '@/pages/master/conversion/ConversionMaster';
+import WalletRuleMaster from '@/pages/master/walletRule/WalletRuleMaster';
 
 const AppRoutingSetup = (): ReactElement => {
   return (
@@ -49,11 +52,12 @@ const AppRoutingSetup = (): ReactElement => {
           <Route path="/master-data/profession" element={<ProfessionMaster />} />
           <Route path="/master-data/products" element={<ProductsMaster />} />
           <Route path="/master-data/provider" element={<ProviderMaster />} />
-
           <Route
             path="/master-data/municipios/postoadms/:municipioId"
             element={<PostoAdmsMaster />}
           />
+          <Route path="/master-data/conversion" element={<ConversionMaster />} />
+          <Route path="/master-data/wallet-rule" element={<WalletRuleMaster />} />
 
           <Route path="/account/home/user-profile" element={<AccountUserProfilePage />} />
 
@@ -61,9 +65,9 @@ const AppRoutingSetup = (): ReactElement => {
 
           <Route path="/members/kyc" element={<Kyc />} />
           <Route path="/members/member-management" element={<ManageMembers />} />
+          <Route path="/members/create-member-credential" element={<MemberCredential />} />
 
           <Route path="/access/access-type-management" element={<AccessType />} />
-          <Route path="/members/create-member-credential" element={<MemberCredential />} />
 
           <Route path="/accounts/account-management" element={<ManageAccount />} />
           <Route path="/accounts/currency-management" element={<ManageCurrency />} />
@@ -75,11 +79,9 @@ const AppRoutingSetup = (): ReactElement => {
           <Route path="/menu/menu-category" element={<MenuCategory />} />
           <Route path="/menu/menu-management" element={<ManageMenu />} />
           <Route path="/menu/welcome" element={<Welcome />} />
-
+          <Route path="/transaction" element={<Transaction />} />
           <Route path="/message/inbox" element={<Inbox />} />
-
           <Route path="/webservice/webservice-management" element={<ManageWebServices />} />
-
           <Route path="/settings/user-management/manage-user" element={<ManageUserPage />} />
           <Route path="/settings/user-management/log-activity" element={<LogActivityPage />} />
           <Route