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

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

Browse Source
This commit is contained in:
unknown
2025-04-09 13:47:37 +07:00
parent 02535906fd 44e88ac4e0
commit 929bb783f4
10 changed files with 99 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -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,
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,
provider: response.data.provider.id,
process_on_third_party: response.data.process_on_third_party
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,
provider: response.data?.provider?.id,
process_on_third_party: response.data?.process_on_third_party
}));
} else {
setFormField(initialState);

2
src/pages/master/provider/blocks/DeleteDialog.tsx
View File

@ -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');

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

@ -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,

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

@ -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>

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

@ -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)

36
src/pages/master/reward/blocks/AddDialog.tsx
View File

@ -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({
...formField,
setFormField((prev) => ({
...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) => {
const value = parseFloat(e.target.value);
setFormField({
...formField,
amount: isNaN(value) ? 0 : value
});
thousandSeparator="."
decimalSeparator=","
allowNegative={false}
onValueChange={(values) => {
setFormField((prev) => ({
...prev,
amount: values.floatValue || 0
}));
}}
placeholder="Enter Amount"
/>
</div>
<div className="grid grid-cols-8 gap-2 w-full items-center">

7
src/pages/master/reward/blocks/DeleteDialog.tsx
View File

@ -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}`, {
id: selectedReward
// console.log('Ini datanya:', selectedReward);
const response = await DeleteData(`${API_URL}/reward/delete/${selectedReward?.id}/true`, {
id: selectedReward.id
});
if (response?.status) {

98
src/pages/master/reward/blocks/EditDialog.tsx
View File

@ -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,
type: response?.data.type,
amount: response?.data.amount,
status: response?.data.status
name: response.data.name,
type: response.data.type,
amount: response.data.amount,
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) {
setFormField({
...formField,
if (showEditDialog && selectedReward) {
setFormField((prev) => ({
...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">
<label className="form-label">
<div className="grid grid-cols-8 gap-2 w-full items-center">
<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">
<label className="form-label">
<div className="grid grid-cols-8 gap-2 w-full items-center">
<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">
<label className="form-label">
<div className="grid grid-cols-8 gap-2 w-full items-center">
<label className="form-label flex items-center gap-1 col-span-2">
Amount<span className="text-red-500">*</span>
</label>
<Input
className="input"
type="number"
min={0}
step={0.01}
<NumericFormat
className="input col-span-6"
value={formField.amount}
onChange={(e) => {
const value = parseFloat(e.target.value);
setFormField({
...formField,
amount: isNaN(value) ? 0 : value
});
thousandSeparator="."
decimalSeparator=","
allowNegative={false}
onValueChange={(values) => {
setFormField((prev) => ({
...prev,
amount: values.floatValue || 0
}));
}}
placeholder="Enter Amount"
/>
</div>
<div className="w-full">
<label className="form-label">
<div className="grid grid-cols-8 gap-2 w-full items-center">
<label className="form-label flex items-center gap-1 col-span-2">
Status<span className="text-red-500">*</span>
</label>
<Select
value={formField.status}
onValueChange={(value) => setFormField((prev) => ({ ...prev, status: value }))}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select" defaultValue={formField.status} />
</SelectTrigger>
<SelectContent>
<SelectItem value="Y">Active</SelectItem>
<SelectItem value="N">InActive</SelectItem>
</SelectContent>
</Select>
<div className="col-span-6">
<Select
value={formField.status}
onValueChange={(value) =>
setFormField((prev) => ({ ...prev, status: value }))
}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select" defaultValue={formField.status} />
</SelectTrigger>
<SelectContent>
<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}>

12
src/pages/master/reward/hooks/ManageRewardContext.tsx
View File

@ -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;
selectedReward: string | null;
handleDeleteDialog: (show: boolean, selected_rewad: Reward | null) => void;
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);
}, []);