Merge branch 'master' of https://git.shiblysolution.id/TPAY/dashboard

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

@@ -130,7 +130,7 @@ const AddDialog = () => {
     }
 
     doCreateProduct(e);
-    console.log(formField);
+    // console.log(formField);
     setAlert({ show: false, message: '' });
   };
 

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

@@ -109,22 +109,22 @@ const EditDialog = () => {
 
   const doFetchData = useCallback(async (id: string) => {
     const response = await GetData(`${API_URL}/product/getdata/${id}`, { id });
-    console.log(response);
+    // console.log(response);
 
     if (response?.status) {
       setFormField((prev) => ({
         ...prev,
-        name: response.data.name,
+        name: response.data?.name,
-        type: response.data.type,
+        type: response.data?.type,
-        code: response.data.code,
+        code: response.data?.code,
-        description: response.data.description,
+        description: response.data?.description,
-        price_point: response.data.price_point,
+        price_point: response.data?.price_point,
-        price_cash: response.data.price_cash,
+        price_cash: response.data?.price_cash,
-        cashback_point: response.data.cashback_point,
+        cashback_point: response.data?.cashback_point,
-        cashback_cash: response.data.cashback_cash,
+        cashback_cash: response.data?.cashback_cash,
-        status: response.data.status,
+        status: response.data?.status,
-        provider: response.data.provider.id,
+        provider: response.data?.provider?.id,
-        process_on_third_party: response.data.process_on_third_party
+        process_on_third_party: response.data?.process_on_third_party
       }));
     } else {
       setFormField(initialState);

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

@@ -37,6 +37,7 @@ const DeleteDialog = () => {
       setAlert({ show: false, message: '' });
       handleDeleteDialog(false, null);
       toast.success('Success Delete Provider');
+      reload();
       const createActivity = {
         module: 'Manage Provider',
         description: `Delete Provider => ${selectedProvider}`,
@@ -44,7 +45,6 @@ const DeleteDialog = () => {
       };
 
       doSaveLogActivity(createActivity);
-      reload();
     } else {
       setAlert({ show: true, message: response?.message });
       toast.error('Failed Delete Provider');

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

@@ -136,7 +136,7 @@ const EditDialog = () => {
 
   const doFetchData = useCallback(async (id: string) => {
     const response = await GetData(`${API_URL_MASTERDATA}/provider/getdata/${id}`, { id });
-    console.log(response);
+    // console.log(response);
     if (response?.status) {
       setFormField((prev) => ({
         ...prev,

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

@@ -16,9 +16,9 @@ const ListToolbar = () => {
               <input
                 type="text"
                 placeholder="Search Provider"
-                value={(table.getColumn('provider_name')?.getFilterValue() as string) ?? ''}
+                value={(table.getColumn('name')?.getFilterValue() as string) ?? ''}
                 onChange={(event) =>
-                  table.getColumn('provider_name')?.setFilterValue(event.target.value)
+                  table.getColumn('name')?.setFilterValue(event.target.value)
                 }
               />
             </label>

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

@@ -75,7 +75,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
     () => [
       {
         accessorFn: (row) => row.provider_name,
-        id: 'provider_name',
+        id: 'name',
         header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
         enableSorting: true,
         enableHiding: false,
@@ -113,7 +113,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         accessorFn: (row) => row.provider_status,
         id: 'status',
         header: ({ column }) => <DataGridColumnHeader title="Status" column={column} />,
-        enableSorting: false,
+        enableSorting: true,
         enableHiding: false,
         cell: ({ row }) => {
           const isActive = row.original.provider_status === 'Y';
@@ -209,7 +209,7 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
         pagination={{ size: 10 }}
         toolbar={<ListToolbar />}
         layout={{ card: true }}
-        sorting={[{ id: 'id', desc: false }]}
+        sorting={[{ id: 'created_at', desc: true }]}
         serverSide={true}
         onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
           getProviderLists(pageIndex, pageSize, sorting, columnFilters)

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

@@ -14,6 +14,7 @@ import { apiConfig } from '@/config/api.config';
 import { toast } from 'sonner';
 import { getAuth } from '@/auth';
 import { useCallApi } from '@/hooks';
+import { NumericFormat } from 'react-number-format';
 import { useManageRewardContext } from '../hooks/useManageRewardContext';
 import {
   Select,
@@ -57,7 +58,7 @@ const AddDialog = () => {
   const doCreateReward = useCallback(
     async (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
-      console.log('Data yang akan dikirim:', formField);
+      // console.log('Data yang akan dikirim:', formField);
       const response = await PostData(`${API_URL}/reward/create`, formField);
 
       if (response?.status) {
@@ -91,20 +92,15 @@ const AddDialog = () => {
     setAlert({ show: false, message: '' });
   };
 
-  const handleReset = () => {
-    resetForm();
-    setAlert({ show: false, message: '' });
-  };
-
   useEffect(() => {
     if (showAddDialog) {
-      setFormField({
+      setFormField((prev) => ({
-        ...formField,
+        ...prev,
         created_by: parsedUser?.username,
         created_at: formattedTime
-      });
+      }));
     }
-  }, [formattedTime]);
+  }, [showAddDialog, parsedUser?.username, formattedTime]);
 
   useEffect(() => {
     if (showAddDialog === false) {
@@ -159,19 +155,19 @@ const AddDialog = () => {
                     Amount<span className="text-red-500">*</span>
                   </label>
 
-                  <Input
+                  <NumericFormat
                     className="input col-span-6"
-                    type="number"
-                    min={0}
-                    step={0.01}
                     value={formField.amount}
-                    onChange={(e) => {
+                    thousandSeparator="."
-                      const value = parseFloat(e.target.value);
+                    decimalSeparator=","
-                      setFormField({
+                    allowNegative={false}
-                        ...formField,
+                    onValueChange={(values) => {
-                        amount: isNaN(value) ? 0 : value
+                      setFormField((prev) => ({
-                      });
+                        ...prev,
+                        amount: values.floatValue || 0
+                      }));
                     }}
+                    placeholder="Enter Amount"
                   />
                 </div>
                 <div className="grid grid-cols-8 gap-2 w-full items-center">

src/pages/master/reward/blocks/DeleteDialog.tsx

@@ -25,13 +25,16 @@ const DeleteDialog = () => {
     message: ''
   });
 
+  // console.log('ini data :', selectedReward);
+
   const doDeleteReward = useCallback(async () => {
     if (!selectedReward) {
       toast.error('No Reward selected');
       return;
     }
-    const response = await DeleteData(`${API_URL}/reward/delete/${selectedReward}`, {
+    // console.log('Ini datanya:', selectedReward);
-      id: selectedReward
+    const response = await DeleteData(`${API_URL}/reward/delete/${selectedReward?.id}/true`, {
+      id: selectedReward.id
     });
 
     if (response?.status) {

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

@@ -14,6 +14,7 @@ import {
 } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Button } from '@/components/ui/button';
+import { NumericFormat } from 'react-number-format';
 import {
   Select,
   SelectContent,
@@ -58,7 +59,8 @@ const EditDialog = () => {
     async (e: React.FormEvent<HTMLFormElement>) => {
       e.preventDefault();
 
-      const response = await PutData(`${API_URL}/reward/update/${selectedReward}`, formField);
+      // console.log('Ini datanya:', selectedReward);
+      const response = await PutData(`${API_URL}/reward/update/${selectedReward?.id}`, formField);
 
       if (response?.status) {
         resetForm();
@@ -74,16 +76,17 @@ const EditDialog = () => {
   );
 
   const doFetchData = useCallback(async (id: string) => {
+    // console.log('Ini datanya:', id);
     const response = await GetData(`${API_URL}/reward/getdata/${id}`, { id });
-    console.log('API Response:', response);
+    // console.log('API Response:', response);
 
     if (response?.status) {
       setFormField((prev) => ({
         ...prev,
-        name: response?.data.name,
+        name: response.data.name,
-        type: response?.data.type,
+        type: response.data.type,
-        amount: response?.data.amount,
+        amount: response.data.amount,
-        status: response?.data.status
+        status: response.data.status
       }));
     }
   }, []);
@@ -107,21 +110,20 @@ const EditDialog = () => {
   // };
 
   useEffect(() => {
-    // console.log('Selected Reward:', selectedReward);
     if (selectedReward) {
-      doFetchData(selectedReward);
+      doFetchData(selectedReward.id.toString());
     }
   }, [selectedReward]);
 
   useEffect(() => {
-    if (showEditDialog) {
+    if (showEditDialog && selectedReward) {
-      setFormField({
+      setFormField((prev) => ({
-        ...formField,
+        ...prev,
         updated_by: parsedUser.username,
         updated_at: formattedTime
-      });
+      }));
     }
-  }, [formattedTime]);
+  }, [showEditDialog, selectedReward]);
 
   useEffect(() => {
     if (showEditDialog === false) {
@@ -142,67 +144,71 @@ const EditDialog = () => {
 
             <form onSubmit={doUpdateReward}>
               <div className="card-body grid gap-5">
-                <div className="w-full">
+                <div className="grid grid-cols-8 gap-2 w-full items-center">
-                  <label className="form-label">
+                  <label className="form-label flex items-center gap-1 col-span-2">
                     Name<span className="text-red-500">*</span>
                   </label>
 
                   <Input
-                    className="input"
+                    className="input col-span-6"
                     type="text"
                     value={formField.name}
                     onChange={(e) => setFormField((prev) => ({ ...prev, name: e.target.value }))}
                   />
                 </div>
-                <div className="w-full">
+                <div className="grid grid-cols-8 gap-2 w-full items-center">
-                  <label className="form-label">
+                  <label className="form-label flex items-center gap-1 col-span-2">
                     Type<span className="text-red-500">*</span>
                   </label>
 
                   <Input
-                    className="input"
+                    className="input col-span-6"
                     type="text"
                     value={formField.type}
                     onChange={(e) => setFormField({ ...formField, type: e.target.value })}
                   />
                 </div>
-                <div className="w-full">
+                <div className="grid grid-cols-8 gap-2 w-full items-center">
-                  <label className="form-label">
+                  <label className="form-label flex items-center gap-1 col-span-2">
                     Amount<span className="text-red-500">*</span>
                   </label>
 
-                  <Input
+                  <NumericFormat
-                    className="input"
+                    className="input col-span-6"
-                    type="number"
-                    min={0}
-                    step={0.01}
                     value={formField.amount}
-                    onChange={(e) => {
+                    thousandSeparator="."
-                      const value = parseFloat(e.target.value);
+                    decimalSeparator=","
-                      setFormField({
+                    allowNegative={false}
-                        ...formField,
+                    onValueChange={(values) => {
-                        amount: isNaN(value) ? 0 : value
+                      setFormField((prev) => ({
-                      });
+                        ...prev,
+                        amount: values.floatValue || 0
+                      }));
                     }}
+                    placeholder="Enter Amount"
                   />
                 </div>
-                <div className="w-full">
+                <div className="grid grid-cols-8 gap-2 w-full items-center">
-                  <label className="form-label">
+                  <label className="form-label flex items-center gap-1 col-span-2">
                     Status<span className="text-red-500">*</span>
                   </label>
 
-                  <Select
+                  <div className="col-span-6">
-                    value={formField.status}
+                    <Select
-                    onValueChange={(value) => setFormField((prev) => ({ ...prev, status: value }))}
+                      value={formField.status}
-                  >
+                      onValueChange={(value) =>
-                    <SelectTrigger className="w-full">
+                        setFormField((prev) => ({ ...prev, status: value }))
-                      <SelectValue placeholder="Select" defaultValue={formField.status} />
+                      }
-                    </SelectTrigger>
+                    >
-                    <SelectContent>
+                      <SelectTrigger className="w-full">
-                      <SelectItem value="Y">Active</SelectItem>
+                        <SelectValue placeholder="Select" defaultValue={formField.status} />
-                      <SelectItem value="N">InActive</SelectItem>
+                      </SelectTrigger>
-                    </SelectContent>
+                      <SelectContent>
-                  </Select>
+                        <SelectItem value="Y">Active</SelectItem>
+                        <SelectItem value="N">InActive</SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </div>
                 </div>
                 <div className="flex justify-end gap-5">
                   <Button type="button" variant="outline" onClick={resetForm}>

src/pages/master/reward/hooks/ManageRewardContext.tsx

@@ -26,10 +26,10 @@ interface ContextProps {
   showAddDialog: boolean;
   handleAddDialog: (show: boolean) => void;
   showEditDialog: boolean;
-  handleEditDialog: (show: boolean, selected_reward: string | null) => void;
+  handleEditDialog: (show: boolean, selected_reward: Reward | null) => void;
   showDeleteDialog: boolean;
-  handleDeleteDialog: (show: boolean, selected_rewad: string | null) => void;
+  handleDeleteDialog: (show: boolean, selected_rewad: Reward | null) => void;
-  selectedReward: string | null;
+  selectedReward: Reward | null;
   reward: string | null;
 }
 
@@ -52,19 +52,19 @@ const ManageRewardContextProvider = ({ children }: { children: React.ReactNode }
   const [showAddDialog, setShowAddDialog] = useState(false);
   const [showEditDialog, setShowEditDialog] = useState(false);
   const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [selectedReward, setSelectedReward] = useState<string | null>(null);
+  const [selectedReward, setSelectedReward] = useState<Reward | null>(null);
   const { GetData } = useCallApi();
 
   const handleAddDialog = useCallback((show: boolean) => {
     setShowAddDialog(show);
   }, []);
 
-  const handleEditDialog = useCallback((show: boolean, selected_reward: string | null) => {
+  const handleEditDialog = useCallback((show: boolean, selected_reward: Reward | null) => {
     setShowEditDialog(show);
     setSelectedReward(show ? selected_reward : null);
   }, []);
 
-  const handleDeleteDialog = useCallback((show: boolean, selected_reward: string | null) => {
+  const handleDeleteDialog = useCallback((show: boolean, selected_reward: Reward | null) => {
     setShowDeleteDialog(show);
     setSelectedReward(show ? selected_reward : null);
   }, []);