-
-
-
-
-
-
-
-
-
- {
- e.currentTarget.scrollTop += e.deltaY;
- }}
+ {formField.type === 'agent' ? (
+
+
+
+
+
+
+ {customers.find((customer) => customer.id === formField.agent)
+ ?.username || 'Select Agent'}
+
+
+
+
+
+ {
+ e.currentTarget.scrollTop += e.deltaY;
+ }}
+ >
+ No Agent found.
+
+ {customers.map((customer) => (
+ {
+ setFormField({
+ ...formField,
+ agent: customer.id
+ });
+ setOpen(false);
+ }}
+ >
+ {customer.username}
+
+ ))}
+
+
+
+
+
+
+ ) : (
+
+ )}
-
-
-
-
-
-
-
-
-
- {
- e.currentTarget.scrollTop += e.deltaY;
- }}
+ {formField.type === 'agent' ? (
+
+
+
+
+
+
+ {customers.find((customer) => customer.id === formField.agent)
+ ?.username || 'Select Agent'}
+
+
+
+
+
+ {
+ e.currentTarget.scrollTop += e.deltaY;
+ }}
+ >
+ No Agent found.
+
+ {customers.map((customer) => (
+ {
+ setFormField({
+ ...formField,
+ agent: customer.id
+ });
+ setOpen(false);
+ }}
+ >
+ {customer.username}
+
+ ))}
+
+
+
+
+
+
+ ) : (
+
+ )}
diff --git a/src/pages/master/reward/Reward.tsx b/src/pages/master/reward/Reward.tsx
deleted file mode 100644
index 32e8691..0000000
--- a/src/pages/master/reward/Reward.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import AddDialog from './blocks/AddDialog';
-import EditDialog from './blocks/EditDialog';
-import DeleteDialog from './blocks/DeleteDialog';
-import { ManageRewardContextProvider } from './hooks/ManageRewardContext';
-import { Container, DataGridInner } from '@/components';
-import { Breadcrumbs, Link } from '@mui/material';
-
-const RewardMaster = () => {
- return (
-
-
- Manage Reward
-
-
- Dashboard
-
-
-
- Master Data
-
-
-
- Manage Reward
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default RewardMaster;
diff --git a/src/pages/master/reward/RewardMaster.tsx b/src/pages/master/reward/RewardMaster.tsx
new file mode 100644
index 0000000..f9b1ddd
--- /dev/null
+++ b/src/pages/master/reward/RewardMaster.tsx
@@ -0,0 +1,43 @@
+import AddDialog from './blocks/AddDialog';
+import EditDialog from './blocks/EditDialog';
+import DeleteDialog from './blocks/DeleteDialog';
+import { ManageRewardContextProvider } from './hooks/ManageRewardContext';
+import { Container, DataGridInner } from '@/components';
+import { Breadcrumbs, Link } from '@mui/material';
+import { Helmet } from 'react-helmet';
+
+const RewardMaster = () => {
+ return (
+ <>
+
+ TPAY | Manage Reward
+
+
+
+ Reward
+
+
+ Dashboard
+
+
+
+ Master Data
+
+
+
+ Manage Reward
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+export default RewardMaster;
diff --git a/src/pages/master/reward/blocks/AddDialog.tsx b/src/pages/master/reward/blocks/AddDialog.tsx
index 9f44be0..6e32603 100644
--- a/src/pages/master/reward/blocks/AddDialog.tsx
+++ b/src/pages/master/reward/blocks/AddDialog.tsx
@@ -55,6 +55,15 @@ const AddDialog = () => {
setAlert({ show: false, message: '' });
};
+ const RewardType = {
+ 'Daily Check in': 'D',
+ Referal: 'R',
+ 'Level Pro': 'P',
+ 'Level Prioritas': 'L'
+ } as const;
+
+ type RewardTypeValue = (typeof RewardType)[keyof typeof RewardType];
+
const doCreateReward = useCallback(
async (e: React.FormEvent
) => {
e.preventDefault();
@@ -140,15 +149,25 @@ const AddDialog = () => {
Type*
-
- setFormField((prev) => ({ ...prev, type: target.value }))
- }
- />
+
+
+
-
setFormField({ ...formField, type: e.target.value })}
- />
+
+
+
diff --git a/src/pages/master/wallet/hooks/ManageWalletContext.tsx b/src/pages/master/wallet/hooks/ManageWalletContext.tsx
index 0142fb8..28a5a96 100644
--- a/src/pages/master/wallet/hooks/ManageWalletContext.tsx
+++ b/src/pages/master/wallet/hooks/ManageWalletContext.tsx
@@ -7,12 +7,12 @@ import { Toaster } from 'sonner';
import ListToolbar from '../blocks/ListToolbar';
interface WalletProps {
- Wallet_id: string;
- Wallet_name: string;
- Wallet_status: string;
- Wallet_description: string;
- Wallet_group: string[];
- Wallet_currency_id: string;
+ id: string;
+ name: string;
+ status: string;
+ description: string;
+ group: string[];
+ currency_id: string;
}
interface ContextProps {
@@ -73,7 +73,7 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode }
const columns = useMemo
[]>(
() => [
{
- accessorFn: (row) => row.Wallet_name,
+ accessorFn: (row) => row.name,
id: 'name',
header: ({ column }) => ,
enableSorting: true,
@@ -83,7 +83,7 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode }
}
},
{
- accessorFn: (row) => row.Wallet_description,
+ accessorFn: (row) => row.description,
id: 'description',
header: ({ column }) => ,
enableSorting: true,
@@ -93,13 +93,13 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode }
}
},
{
- accessorFn: (row) => row.Wallet_status,
+ accessorFn: (row) => row.status,
id: 'status',
header: ({ column }) => ,
enableSorting: true,
enableHiding: false,
cell: ({ row }) => {
- const isActive = row.original.Wallet_status === 'Y';
+ const isActive = row.original.status === 'Y';
return (
}
layout={{ card: true }}
- sorting={[{ id: 'created_at', desc: true }]}
+ sorting={[{ id: 'wallets.created_at', desc: true }]}
serverSide={true}
onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
getWalletLists(pageIndex, pageSize, sorting, columnFilters)
diff --git a/src/pages/master/walletRule/blocks/AddDialog.tsx b/src/pages/master/walletRule/blocks/AddDialog.tsx
index 6bdd088..043f766 100644
--- a/src/pages/master/walletRule/blocks/AddDialog.tsx
+++ b/src/pages/master/walletRule/blocks/AddDialog.tsx
@@ -40,14 +40,24 @@ interface GroupProps {
status: string;
}
-interface WalletProps {
- ID: string;
+interface WalletGroupProps {
+ id: string;
name: string;
- id_currency: string;
+ description: string;
status: string;
}
+interface WalletProps {
+ id: string;
+ name: string;
+ id_currency: string;
+ status: string;
+ group: WalletGroupProps[];
+}
+
const API_URL_WALLET = apiConfig.service_wallet;
+const API_URL_MASTERDATA = apiConfig.service_master_data;
+
const AddDialog = () => {
const { showAddDialog, handleAddDialog, selectedWalletRule } = useManageWalletRuleContext();
const { reload } = useDataGrid();
@@ -77,7 +87,6 @@ const AddDialog = () => {
status: ''
};
const [formField, setFormField] = useState(initialState);
- const [groups, setGroups] = useState([]);
const [wallets, setWallets] = useState([]);
const resetForm = () => {
@@ -114,7 +123,16 @@ const AddDialog = () => {
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
- if (formField.id_group.trim() === '' || formField.status.trim() === '') {
+ if (
+ formField.id_group.trim() === '' ||
+ formField.status.trim() === '' ||
+ formField.id_wallet.trim() === '' ||
+ formField.max_transaction_per_day === null ||
+ formField.balance_minimum === null ||
+ formField.balance_maximum === null ||
+ formField.credit_limit === null ||
+ formField.monthly_limit === null
+ ) {
setAlert({ show: true, message: 'Please fill in all required fields.' });
return;
}
@@ -124,26 +142,9 @@ const AddDialog = () => {
setAlert({ show: false, message: '' });
};
- const getGroupLists = async (sorting: any) => {
- try {
- const response = await GetData(`${API_URL_WALLET}/dashboard/group`, {
- limit: 100,
- page: 1,
- with_deleted: false,
- order_field: sorting[0].id,
- order_direction: sorting[0].desc == false ? 'ASC' : 'DESC'
- });
-
- // console.log('GROUPS: ', response?.data);
- setGroups(response?.data.list);
- } catch (error) {
- console.error('Error fetching groups', error);
- }
- };
-
const getWalletLists = async (sorting: any) => {
try {
- const response = await GetData(`${API_URL_WALLET}/dashboard/wallet`, {
+ const response = await GetData(`${API_URL_MASTERDATA}/wallet/list`, {
limit: 100,
page: 1,
with_deleted: false,
@@ -158,9 +159,11 @@ const AddDialog = () => {
}
};
+ const selectedWallet = wallets.find((wallet) => wallet.id === formField.id_wallet);
+ const filteredGroups = selectedWallet ? selectedWallet.group : [];
+
useEffect(() => {
- getWalletLists([{ id: 'name', desc: false }]);
- getGroupLists([{ id: 'name', desc: false }]);
+ getWalletLists([{ id: 'wallets.name', desc: false }]);
}, []);
useEffect(() => {
@@ -193,14 +196,16 @@ const AddDialog = () => {
diff --git a/src/pages/master/walletRule/hooks/ManageWalletRuleContext.tsx b/src/pages/master/walletRule/hooks/ManageWalletRuleContext.tsx
index 20f699f..14e66c3 100644
--- a/src/pages/master/walletRule/hooks/ManageWalletRuleContext.tsx
+++ b/src/pages/master/walletRule/hooks/ManageWalletRuleContext.tsx
@@ -81,6 +81,26 @@ const ManageWalletRuleContextProvider = ({ children }: { children: React.ReactNo
const columns = useMemo
[]>(
() => [
+ {
+ accessorFn: (row) => row.wallet.name,
+ id: 'wallet_name',
+ header: ({ column }) => ,
+ enableSorting: true,
+ enableHiding: false,
+ meta: {
+ headerClassName: 'w-[250px]'
+ }
+ },
+ {
+ accessorFn: (row) => row.group.name,
+ id: 'group_name',
+ header: ({ column }) => ,
+ enableSorting: true,
+ enableHiding: false,
+ meta: {
+ headerClassName: 'w-[250px]'
+ }
+ },
{
accessorFn: (row) => row.balance_minimum,
id: 'balance_minimum',
@@ -227,7 +247,7 @@ const ManageWalletRuleContextProvider = ({ children }: { children: React.ReactNo
}
layout={{ card: true }}
sorting={[{ id: 'id', desc: false }]}
diff --git a/src/pages/settings/user/log-activity/LogActivityPage.tsx b/src/pages/settings/user/log-activity/LogActivityPage.tsx
index c9a9525..0859c61 100644
--- a/src/pages/settings/user/log-activity/LogActivityPage.tsx
+++ b/src/pages/settings/user/log-activity/LogActivityPage.tsx
@@ -1,33 +1,39 @@
import { Container, DataGridInner } from '@/components';
import { LogActivityContextProvider } from './hooks';
import { Breadcrumbs, Link } from '@mui/material';
+import { Helmet } from 'react-helmet';
export default function LogActivityPage() {
return (
-
-
- Log Activity
-
-
- Dashboard
-
+ <>
+
+ TPAY | Log Activity
+
+
+
+ Log Activity
+
+
+ Dashboard
+
-
- Settings
-
+
+ Settings
+
-
- User Management
-
+
+ User Management
+
-
- Log Activity
-
-
-
-
-
-
-
+
+ Log Activity
+
+
+
+
+
+
+
+
);
}
diff --git a/src/pages/settings/user/manage-user/ManageUserPage.tsx b/src/pages/settings/user/manage-user/ManageUserPage.tsx
index 5f318b0..17a7077 100644
--- a/src/pages/settings/user/manage-user/ManageUserPage.tsx
+++ b/src/pages/settings/user/manage-user/ManageUserPage.tsx
@@ -4,36 +4,42 @@ import { ManageUserContextProvider } from './hooks';
import { AddDialog } from './blocks/AddDialog';
import { DeleteDialog } from './blocks/DeleteDialog';
import { Breadcrumbs, Link } from '@mui/material';
+import { Helmet } from 'react-helmet';
export default function ManageUserPage() {
return (
-
-
- Manage User
-
-
- Dashboard
-
+ <>
+
+ TPAY | Manage User
+
+
+
+ Manage User
+
+
+ Dashboard
+
-
- Settings
-
+
+ Settings
+
-
- User Management
-
+
+ User Management
+
-
- Manage User
-
-
-
-
-
-
-
-
-
-
+
+ Manage User
+
+
+
+
+
+
+
+
+
+
+
);
}
diff --git a/src/pages/settings/user/manage-user/blocks/AddDialog.tsx b/src/pages/settings/user/manage-user/blocks/AddDialog.tsx
index ac69750..84298fa 100644
--- a/src/pages/settings/user/manage-user/blocks/AddDialog.tsx
+++ b/src/pages/settings/user/manage-user/blocks/AddDialog.tsx
@@ -25,6 +25,13 @@ import { useCallApi } from '@/hooks';
import { doSaveLogActivity } from '@/actions/GlobalActions';
import clsx from 'clsx';
+interface RoleListProps {
+ id: string;
+ name: string;
+ roles: string;
+ status: string;
+}
+
interface CreateUserParams {
email: string;
username: string;
@@ -40,9 +47,10 @@ type PasswordType = 'password' | 'retype_password';
const AddDialog = () => {
const parentRef = useRef(null);
- const { showAddDialog, handleAddDialog, roles } = useUserContext();
+ const { showAddDialog, handleAddDialog } = useUserContext();
const { reload } = useDataGrid();
- const { PostData, PutData } = useCallApi();
+ const { PostData, GetData } = useCallApi();
+ const [roles, setRoles] = useState([]);
const [alert, setAlert] = useState({
show: false,
message: ''
@@ -57,10 +65,6 @@ const AddDialog = () => {
status: ''
};
const [formField, setFormField] = useState(initialState);
- const resetForm = () => {
- setFormField(initialState);
- setAlert({ show: false, message: '' });
- };
const [showPassword, setShowPassword] = useState({
password: false,
retype_password: false
@@ -97,6 +101,87 @@ const AddDialog = () => {
};
};
+ const resetForm = () => {
+ setFormField(initialState);
+ setAlert({ show: false, message: '' });
+ };
+
+ /* actions */
+ const doCreateUser = useCallback(
+ async (e: React.FormEvent) => {
+ e.preventDefault();
+
+ const response = await PostData(`${API_URL}/user/create`, formField);
+
+ if (response?.status) {
+ handleAddDialog(false);
+ resetForm();
+ reload();
+ const createActivity = {
+ module: 'Manage User',
+ description: `Create New User => ${formField.username}`,
+ action: 'C'
+ };
+
+ doSaveLogActivity(createActivity);
+ toast.success('Success Create User');
+ } else {
+ toast.error('Failed to create user');
+ setAlert({ show: true, message: 'Failed to create user. Please try again.' });
+ }
+ },
+ [formField]
+ );
+
+ const fetchRoles = useCallback(async () => {
+ const params = {
+ limit: 100,
+ page: 1,
+ with_deleted: false,
+ order_field: 'name',
+ order_direction: 'ASC',
+ filter: JSON.stringify({
+ status: 'Y'
+ })
+ };
+ const response = await GetData(`${API_URL}/user_role/list`, params);
+ // console.log('ini data:', response);
+ if (response?.status) {
+ const roleList = response.data?.list || [];
+ setRoles(roleList);
+ } else {
+ setRoles(() => []);
+ }
+ // console.log('ini data user_role:', response?.data);
+ }, []);
+
+ useEffect(() => {
+ fetchRoles();
+ }, [fetchRoles]);
+
+ const handleSubmit = (e: React.FormEvent) => {
+ e.preventDefault();
+
+ console.log('Form data before submit:', formField);
+
+ if (
+ formField.email.trim() === '' ||
+ formField.username.trim() === '' ||
+ formField.password.trim() === '' ||
+ formField.retype_password.trim() === '' ||
+ formField.name.trim() === '' ||
+ formField.id_role.trim() === '' ||
+ formField.status.trim() === ''
+ ) {
+ setAlert({ show: true, message: 'Please fill name field.' });
+ return;
+ }
+
+ doCreateUser(e);
+ // console.log(formField);
+ setAlert({ show: false, message: '' });
+ };
+
useEffect(() => {
const validation = validatePassword(formField.password, formField.retype_password);
setMessagePassword(validation.isValid);
@@ -111,38 +196,6 @@ const AddDialog = () => {
}
}, [showAddDialog]);
- /* actions */
- const doCreateUser = useCallback(
- async (e: React.FormEvent) => {
- e.preventDefault();
-
- const response = await PostData(`${API_URL}/user/create`, {
- ...formField,
- id_role: undefined
- });
- if (response?.status) {
- const responseUserAddRole = await PutData(
- `${API_URL}/user/add_role/${response?.message?.id}/${formField.id_role}`,
- {}
- );
- resetForm();
- handleAddDialog(false);
- toast.success('Success Create User');
- reload();
- const createActivity = {
- module: 'Manage User',
- description: `Create New User => ${formField.username}`,
- action: 'C'
- };
-
- doSaveLogActivity(createActivity);
- } else {
- setAlert((prev) => ({ ...prev, show: true, message: response?.message }));
- }
- },
- [formField]
- );
-
const togglePassword = useCallback((event: MouseEvent, key: string) => {
event.preventDefault();
setShowPassword((prev) => ({ ...prev, [key]: !prev[key as PasswordType] }));
@@ -177,7 +230,7 @@ const AddDialog = () => {
{alert.message}
)}
-