diff --git a/src/pages/master/products/blocks/AddDialog.tsx b/src/pages/master/products/blocks/AddDialog.tsx
index a854203..343e076 100644
--- a/src/pages/master/products/blocks/AddDialog.tsx
+++ b/src/pages/master/products/blocks/AddDialog.tsx
@@ -24,8 +24,8 @@ import {
 } from '@/components/ui/select';
 
 interface ProviderProps {
-  id: number;
-  name: string;
+  provider_id: number;
+  provider_name: string;
 }
 
 const API_URL = apiConfig.service_master_data;
@@ -40,17 +40,17 @@ const AddDialog = () => {
     message: ''
   });
   const initialState = {
-    name: '',
-    code: '',
-    type: '',
-    description: '',
-    price_point: 0,
-    price_cash: 0,
-    cashback_point: 0,
-    cashback_cash: 0,
-    status: '',
-    provider: '',
-    process_on_third_party: '',
+    products_name: '',
+    products_code: '',
+    products_type: '',
+    products_description: '',
+    products_price_point: 0,
+    products_price_cash: 0,
+    products_cashback_point: 0,
+    products_cashback_cash: 0,
+    products_status: '',
+    products_provider: '',
+    products_process_on_third_party: '',
     created_by: '',
     created_at: ''
   };
@@ -104,15 +104,15 @@ const AddDialog = () => {
     e.preventDefault();
 
     if (
-      formField.name.trim() === '' ||
-      formField.type.trim() === '' ||
-      formField.code.trim() === '' ||
-      formField.description.trim() === '' ||
-      formField.price_point === 0 ||
-      formField.price_cash === 0 ||
-      formField.cashback_point === 0 ||
-      formField.cashback_cash === 0 ||
-      formField.status.trim() === '' ||
+      formField.products_name.trim() === '' ||
+      formField.products_type.trim() === '' ||
+      formField.products_code.trim() === '' ||
+      formField.products_description.trim() === '' ||
+      formField.products_price_point === 0 ||
+      formField.products_price_cash === 0 ||
+      formField.products_cashback_point === 0 ||
+      formField.products_cashback_cash === 0 ||
+      formField.products_status.trim() === '' ||
       formField.created_by.trim() === '' ||
       formField.created_at.trim() === ''
     ) {
@@ -152,7 +152,7 @@ const AddDialog = () => {
           <DialogTitle>Product - Create</DialogTitle>
           <DialogDescription></DialogDescription>
         </DialogHeader>
-        <DialogBody ref={parentRef} className='overflow-y-auto'>
+        <DialogBody ref={parentRef} className="overflow-y-auto">
           <div className="flex flex-col">
             {alert.show && (
               <Alert variant="danger">
@@ -170,8 +170,10 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.name}
-                      onChange={(e) => setFormField({ ...formField, name: e.target.value })}
+                      value={formField.products_name}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_name: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -184,8 +186,10 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.type}
-                      onChange={(e) => setFormField({ ...formField, type: e.target.value })}
+                      value={formField.products_type}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_type: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -198,8 +202,10 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.code}
-                      onChange={(e) => setFormField({ ...formField, code: e.target.value })}
+                      value={formField.products_code}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_code: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -212,8 +218,10 @@ const AddDialog = () => {
                     <Input
                       className="input"
                       type="text"
-                      value={formField.description}
-                      onChange={(e) => setFormField({ ...formField, description: e.target.value })}
+                      value={formField.products_description}
+                      onChange={(e) =>
+                        setFormField({ ...formField, products_description: e.target.value })
+                      }
                     />
                   </div>
                 </div>
@@ -228,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>
@@ -247,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>
@@ -266,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>
@@ -285,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>
@@ -300,8 +320,10 @@ const AddDialog = () => {
                       Status<span className="text-red-500">*</span>
                     </label>
                     <Select
-                      value={formField.status}
-                      onValueChange={(value) => setFormField({ ...formField, status: value })}
+                      value={formField.products_status}
+                      onValueChange={(value) =>
+                        setFormField({ ...formField, products_status: value })
+                      }
                     >
                       <SelectTrigger>
                         <SelectValue placeholder="Select Status" />
@@ -320,9 +342,9 @@ const AddDialog = () => {
                       Provider ID
                     </label>
                     <Select
-                      value={formField.provider}
+                      value={formField.products_provider}
                       onValueChange={(value) =>
-                        setFormField({ ...formField, provider: value.toString() })
+                        setFormField({ ...formField, products_provider: value.toString() })
                       }
                     >
                       <SelectTrigger>
@@ -330,8 +352,11 @@ const AddDialog = () => {
                       </SelectTrigger>
                       <SelectContent>
                         {providers.map((provider) => (
-                          <SelectItem key={provider.id} value={provider.id.toString()}>
-                            {provider.name}
+                          <SelectItem
+                            key={provider.provider_id}
+                            value={provider.provider_id.toString()}
+                          >
+                            {provider.provider_name}
                           </SelectItem>
                         ))}
                       </SelectContent>
@@ -345,9 +370,9 @@ const AddDialog = () => {
                       Process on Third Party<span className="text-red-500">*</span>
                     </label>
                     <Select
-                      value={formField.process_on_third_party}
+                      value={formField.products_process_on_third_party}
                       onValueChange={(value) =>
-                        setFormField({ ...formField, process_on_third_party: value })
+                        setFormField({ ...formField, products_process_on_third_party: value })
                       }
                     >
                       <SelectTrigger>
diff --git a/src/pages/master/products/blocks/EditDialog.tsx b/src/pages/master/products/blocks/EditDialog.tsx
index 72aa3bb..d3b9ca2 100644
--- a/src/pages/master/products/blocks/EditDialog.tsx
+++ b/src/pages/master/products/blocks/EditDialog.tsx
@@ -24,8 +24,8 @@ import {
 } from '@/components/ui/select';
 
 interface ProviderProps {
-  id: string;
-  name: string;
+  provider_id: string;
+  provider_name: string;
 }
 
 const API_URL = apiConfig.service_master_data;
@@ -114,7 +114,7 @@ const EditDialog = () => {
         cashback_point: response.data.cashback_point,
         cashback_cash: response.data.cashback_cash,
         status: response.data.status,
-        provider: response.data.provider_id,
+        provider: response.data.provider.id,
         process_on_third_party: response.data.process_on_third_party
       }));
     } else {
@@ -356,8 +356,8 @@ const EditDialog = () => {
                       </SelectTrigger>
                       <SelectContent>
                         {providers.map((provider) => (
-                          <SelectItem key={provider.id} value={provider.id}>
-                            {provider.name}
+                          <SelectItem key={provider.provider_id} value={provider.provider_id}>
+                            {provider.provider_name}
                           </SelectItem>
                         ))}
                       </SelectContent>
diff --git a/src/pages/master/products/hooks/ManageProductsContext.tsx b/src/pages/master/products/hooks/ManageProductsContext.tsx
index 0c23c51..8987177 100644
--- a/src/pages/master/products/hooks/ManageProductsContext.tsx
+++ b/src/pages/master/products/hooks/ManageProductsContext.tsx
@@ -7,12 +7,12 @@ import { Toaster } from 'sonner';
 import ListToolbar from '../blocks/ListToolbar';
 
 interface ProductsProps {
-  name: string;
-  description: string;
-  price_point: number;
-  price_cash: number;
-  status: string;
-  providerId: string;
+  products_name: string;
+  products_description: string;
+  products_price_point: number;
+  products_price_cash: number;
+  products_status: string;
+  products_providerId: string;
 }
 
 interface ContextProps {
@@ -73,7 +73,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
   const columns = useMemo<ColumnDef<any>[]>(
     () => [
       {
-        accessorFn: (row) => row.id,
+        accessorFn: (row) => row.products_id,
         id: 'id',
         header: ({ column }) => <DataGridColumnHeader title="ID" column={column} />,
         enableSorting: true,
@@ -83,7 +83,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
         }
       },
       {
-        accessorFn: (row) => row.name,
+        accessorFn: (row) => row.products_name,
         id: 'name',
         header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
         enableSorting: true,
@@ -93,7 +93,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 +103,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 +113,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 +133,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>
@@ -167,7 +167,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode
         order_direction: sorting[0].desc == false ? 'ASC' : 'DESC',
         filter: JSON.stringify(filter)
       });
-      // console.log(response?.data);
+      console.log(response?.data);
       setProducts(response?.data.list);
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {