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

src/auth/pages/jwt/Login.tsx

@@ -9,6 +9,7 @@ import { useAuthContext } from '@/auth';
 import { useLayout } from '@/providers';
 import { Alert } from '@/components';
 import moment from 'moment';
+import { Helmet } from 'react-helmet';
 
 const loginSchema = Yup.object().shape({
   username: Yup.string().required('Username is required'),
@@ -76,101 +77,106 @@ const Login = () => {
   };
 
   return (
-    <div className="card max-w-[390px] w-full">
+    <>
-      <form
+      <Helmet>
-        className="card-body flex flex-col gap-5 p-10"
+        <title>TPAY | Sign In</title>
-        onSubmit={formik.handleSubmit}
+      </Helmet>
-        noValidate
+      <div className="card max-w-[390px] w-full">
-      >
+        <form
-        <div className="text-center">
+          className="card-body flex flex-col gap-5 p-10"
-          <h3 className="text-lg font-semibold text-gray-900 leading-none ">Sign in</h3>
+          onSubmit={formik.handleSubmit}
-        </div>
+          noValidate
-        {formik.status && <Alert variant="danger">{formik.status}</Alert>}
-        <div className="flex flex-col gap-1">
-          <label className="form-label text-gray-900 ps-2.5">Login</label>
-          <label className="input">
-            <input
-              placeholder="Enter username"
-              autoComplete="off"
-              {...formik.getFieldProps('username')}
-              className={clsx('form-control', {
-                'is-invalid': formik.touched.username && formik.errors.username
-              })}
-              onKeyPress={handleKeyPress}
-            />
-          </label>
-          {formik.touched.username && formik.errors.username && (
-            <span role="alert" className="text-danger text-xs mt-1">
-              {formik.errors.username}
-            </span>
-          )}
-        </div>
-
-        <div className="flex flex-col gap-1">
-          <div className="flex items-center justify-between gap-1">
-            <label className="form-label text-gray-900 ps-2.5">Password</label>
-          </div>
-          <label className="input">
-            <input
-              type={showPassword ? 'text' : 'password'}
-              placeholder="Enter Password"
-              autoComplete="off"
-              {...formik.getFieldProps('password')}
-              className={clsx('form-control', {
-                'is-invalid': formik.touched.password && formik.errors.password
-              })}
-              onKeyPress={handleKeyPress}
-            />
-            <button className="btn btn-icon" onClick={togglePassword} type="button">
-              <KeenIcon icon="eye" className={clsx('text-gray-500', { hidden: showPassword })} />
-              <KeenIcon
-                icon="eye-slash"
-                className={clsx('text-gray-500', { hidden: !showPassword })}
-              />
-            </button>
-          </label>
-          {formik.touched.password && formik.errors.password && (
-            <span role="alert" className="text-danger text-xs mt-1">
-              {formik.errors.password}
-            </span>
-          )}
-        </div>
-
-        <div className="flex items-center justify-between gap-1">
-          <label className="checkbox-group">
-            <input
-              className="checkbox checkbox-sm"
-              type="checkbox"
-              {...formik.getFieldProps('remember')}
-            />
-            <span className="checkbox-label">Remember me</span>
-          </label>
-          <Link
-            to={
-              currentLayout?.name === 'auth-branded'
-                ? '/auth/reset-password'
-                : '/auth/classic/reset-password'
-            }
-            className="text-2sm link shrink-0"
-          >
-            Forgot Password?
-          </Link>
-        </div>
-
-        <button
-          type="submit"
-          className="btn btn-primary flex justify-center grow"
-          disabled={loading || formik.isSubmitting}
         >
-          {loading ? 'Please wait...' : 'Sign In'}
+          <div className="text-center">
-        </button>
+            <h3 className="text-lg font-semibold text-gray-900 leading-none ">Sign in</h3>
-        <div>
+          </div>
-          <p className="text-2sm text-center" style={{ fontSize: '12px', letterSpacing: 0.25 }}>
+          {formik.status && <Alert variant="danger">{formik.status}</Alert>}
-            Copyright {moment().year()} &copy; Telkomcel All rights reserved.
+          <div className="flex flex-col gap-1">
-          </p>
+            <label className="form-label text-gray-900 ps-2.5">Login</label>
-        </div>
+            <label className="input">
-      </form>
+              <input
-    </div>
+                placeholder="Enter username"
+                autoComplete="off"
+                {...formik.getFieldProps('username')}
+                className={clsx('form-control', {
+                  'is-invalid': formik.touched.username && formik.errors.username
+                })}
+                onKeyPress={handleKeyPress}
+              />
+            </label>
+            {formik.touched.username && formik.errors.username && (
+              <span role="alert" className="text-danger text-xs mt-1">
+                {formik.errors.username}
+              </span>
+            )}
+          </div>
+
+          <div className="flex flex-col gap-1">
+            <div className="flex items-center justify-between gap-1">
+              <label className="form-label text-gray-900 ps-2.5">Password</label>
+            </div>
+            <label className="input">
+              <input
+                type={showPassword ? 'text' : 'password'}
+                placeholder="Enter Password"
+                autoComplete="off"
+                {...formik.getFieldProps('password')}
+                className={clsx('form-control', {
+                  'is-invalid': formik.touched.password && formik.errors.password
+                })}
+                onKeyPress={handleKeyPress}
+              />
+              <button className="btn btn-icon" onClick={togglePassword} type="button">
+                <KeenIcon icon="eye" className={clsx('text-gray-500', { hidden: showPassword })} />
+                <KeenIcon
+                  icon="eye-slash"
+                  className={clsx('text-gray-500', { hidden: !showPassword })}
+                />
+              </button>
+            </label>
+            {formik.touched.password && formik.errors.password && (
+              <span role="alert" className="text-danger text-xs mt-1">
+                {formik.errors.password}
+              </span>
+            )}
+          </div>
+
+          <div className="flex items-center justify-between gap-1">
+            <label className="checkbox-group">
+              <input
+                className="checkbox checkbox-sm"
+                type="checkbox"
+                {...formik.getFieldProps('remember')}
+              />
+              <span className="checkbox-label">Remember me</span>
+            </label>
+            <Link
+              to={
+                currentLayout?.name === 'auth-branded'
+                  ? '/auth/reset-password'
+                  : '/auth/classic/reset-password'
+              }
+              className="text-2sm link shrink-0"
+            >
+              Forgot Password?
+            </Link>
+          </div>
+
+          <button
+            type="submit"
+            className="btn btn-primary flex justify-center grow"
+            disabled={loading || formik.isSubmitting}
+          >
+            {loading ? 'Please wait...' : 'Sign In'}
+          </button>
+          <div>
+            <p className="text-2sm text-center" style={{ fontSize: '12px', letterSpacing: 0.25 }}>
+              Copyright {moment().year()} &copy; Telkomcel All rights reserved.
+            </p>
+          </div>
+        </form>
+      </div>
+    </>
   );
 };
 

src/auth/pages/jwt/reset-password/ResetPassword.tsx

@@ -9,6 +9,7 @@ import { useAuthContext } from '@/auth/useAuthContext';
 import { Alert, KeenIcon } from '@/components';
 import { useLayout } from '@/providers';
 import { AxiosError } from 'axios';
+import { Helmet } from 'react-helmet';
 
 const initialValues = {
   email: ''
@@ -64,70 +65,75 @@ const ResetPassword = () => {
     }
   });
   return (
-    <div className="card max-w-[370px] w-full">
+    <>
-      <form
+      <Helmet>
-        className="card-body flex flex-col gap-5 p-10"
+        <title>TPAY | Reset Password</title>
-        noValidate
+      </Helmet>
-        onSubmit={formik.handleSubmit}
+      <div className="card max-w-[370px] w-full">
-      >
+        <form
-        <div className="text-center">
+          className="card-body flex flex-col gap-5 p-10"
-          <h3 className="text-lg font-semibold text-gray-900">Your Email</h3>
+          noValidate
-          <span className="text-2sm text-gray-600 font-medium">
+          onSubmit={formik.handleSubmit}
-            Enter your email to reset password
+        >
-          </span>
+          <div className="text-center">
-        </div>
+            <h3 className="text-lg font-semibold text-gray-900">Your Email</h3>
-
+            <span className="text-2sm text-gray-600 font-medium">
-        {hasErrors && <Alert variant="danger">{formik.status}</Alert>}
+              Enter your email to reset password
-
-        {hasErrors === false && (
-          <Alert variant="success">
-            Password reset link sent. Please check your email to proceed
-          </Alert>
-        )}
-
-        <div className="flex flex-col gap-1">
-          <label className="form-label text-gray-900">Email</label>
-          <label className="input">
-            <input
-              type="email"
-              placeholder="email@email.com"
-              autoComplete="off"
-              {...formik.getFieldProps('email')}
-              className={clsx(
-                'form-control bg-transparent',
-                { 'is-invalid': formik.touched.email && formik.errors.email },
-                {
-                  'is-valid': formik.touched.email && !formik.errors.email
-                }
-              )}
-            />
-          </label>
-          {formik.touched.email && formik.errors.email && (
-            <span role="alert" className="text-danger text-xs mt-1">
-              {formik.errors.email}
             </span>
+          </div>
+
+          {hasErrors && <Alert variant="danger">{formik.status}</Alert>}
+
+          {hasErrors === false && (
+            <Alert variant="success">
+              Password reset link sent. Please check your email to proceed
+            </Alert>
           )}
-        </div>
 
-        <div className="flex flex-col gap-5 items-stretch">
+          <div className="flex flex-col gap-1">
-          <button
+            <label className="form-label text-gray-900">Email</label>
-            type="submit"
+            <label className="input">
-            className="btn btn-primary flex justify-center grow"
+              <input
-            disabled={loading || formik.isSubmitting}
+                type="email"
-          >
+                placeholder="email@email.com"
-            {loading ? 'Please wait...' : 'Continue'}
+                autoComplete="off"
-          </button>
+                {...formik.getFieldProps('email')}
+                className={clsx(
+                  'form-control bg-transparent',
+                  { 'is-invalid': formik.touched.email && formik.errors.email },
+                  {
+                    'is-valid': formik.touched.email && !formik.errors.email
+                  }
+                )}
+              />
+            </label>
+            {formik.touched.email && formik.errors.email && (
+              <span role="alert" className="text-danger text-xs mt-1">
+                {formik.errors.email}
+              </span>
+            )}
+          </div>
 
-          <Link
+          <div className="flex flex-col gap-5 items-stretch">
-            to={currentLayout?.name === 'auth-branded' ? '/auth/login' : '/auth/classic/login'}
+            <button
-            className="flex items-center justify-center text-sm gap-2 text-gray-700 hover:text-primary"
+              type="submit"
-          >
+              className="btn btn-primary flex justify-center grow"
-            <KeenIcon icon="black-left" />
+              disabled={loading || formik.isSubmitting}
-            Back to Login
+            >
-          </Link>
+              {loading ? 'Please wait...' : 'Continue'}
-        </div>
+            </button>
-      </form>
+
-    </div>
+            <Link
+              to={currentLayout?.name === 'auth-branded' ? '/auth/login' : '/auth/classic/login'}
+              className="flex items-center justify-center text-sm gap-2 text-gray-700 hover:text-primary"
+            >
+              <KeenIcon icon="black-left" />
+              Back to Login
+            </Link>
+          </div>
+        </form>
+      </div>
+    </>
   );
 };
 

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

@@ -23,6 +23,7 @@ import {
   SelectValue
 } from '@/components/ui/select';
 import { doSaveLogActivity } from '@/actions/GlobalActions';
+import { NumericFormat } from 'react-number-format';
 
 interface ProviderProps {
   provider_id: number;
@@ -40,15 +41,29 @@ const AddDialog = () => {
     show: false,
     message: ''
   });
-  const initialState = {
+  const initialState: {
+    name: string;
+    code: string;
+    type: string;
+    description: string;
+    price_point: string | number | null;
+    price_cash: string | number | null;
+    cashback_point: string | number | null;
+    cashback_cash: string | number | null;
+    status: string;
+    provider: string;
+    process_on_third_party: string;
+    created_by: string;
+    created_at: string;
+  } = {
     name: '',
     code: '',
     type: '',
     description: '',
-    price_point: 0,
+    price_point: null,
-    price_cash: 0,
+    price_cash: null,
-    cashback_point: 0,
+    cashback_point: null,
-    cashback_cash: 0,
+    cashback_cash: null,
     status: '',
     provider: '',
     process_on_third_party: '',
@@ -117,11 +132,13 @@ const AddDialog = () => {
       formField.type.trim() === '' ||
       formField.code.trim() === '' ||
       formField.description.trim() === '' ||
-      formField.price_point === 0 ||
+      formField.price_point === null ||
-      formField.price_cash === 0 ||
+      formField.price_cash === null ||
-      formField.cashback_point === 0 ||
+      formField.cashback_point === null ||
-      formField.cashback_cash === 0 ||
+      formField.cashback_cash === null ||
       formField.status.trim() === '' ||
+      formField.provider.trim() === '' ||
+      formField.process_on_third_party.trim() === '' ||
       formField.created_by.trim() === '' ||
       formField.created_at.trim() === ''
     ) {
@@ -234,19 +251,19 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Price Point<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <NumericFormat
                       className="input"
-                      type="number"
+                      value={formField.price_point ?? ''}
-                      min={0}
+                      thousandSeparator="."
-                      step={0.01}
+                      decimalSeparator=","
-                      value={formField.price_point}
+                      allowNegative={false}
-                      onChange={(e) => {
+                      onValueChange={(values) => {
-                        const value = parseFloat(e.target.value);
+                        setFormField((prev) => ({
-                        setFormField({
+                          ...prev,
-                          ...formField,
+                          price_point: values.floatValue !== undefined ? values.floatValue : ''
-                          price_point: isNaN(value) ? 0 : value
+                        }));
-                        });
                       }}
+                      placeholder="Enter Price Point"
                     />
                   </div>
                 </div>
@@ -256,19 +273,19 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Price Cash<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <NumericFormat
                       className="input"
-                      type="number"
+                      value={formField.price_cash ?? ''}
-                      min={0}
+                      thousandSeparator="."
-                      step={0.01}
+                      decimalSeparator=","
-                      value={formField.price_cash}
+                      allowNegative={false}
-                      onChange={(e) => {
+                      onValueChange={(values) => {
-                        const value = parseFloat(e.target.value);
+                        setFormField((prev) => ({
-                        setFormField({
+                          ...prev,
-                          ...formField,
+                          price_cash: values.floatValue !== undefined ? values.floatValue : ''
-                          price_cash: isNaN(value) ? 0 : value
+                        }));
-                        });
                       }}
+                      placeholder="Enter Price Cash"
                     />
                   </div>
                 </div>
@@ -278,19 +295,19 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Cashback Point<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <NumericFormat
                       className="input"
-                      type="number"
+                      value={formField.cashback_point ?? ''}
-                      min={0}
+                      thousandSeparator="."
-                      step={0.01}
+                      decimalSeparator=","
-                      value={formField.cashback_point}
+                      allowNegative={false}
-                      onChange={(e) => {
+                      onValueChange={(values) => {
-                        const value = parseFloat(e.target.value);
+                        setFormField((prev) => ({
-                        setFormField({
+                          ...prev,
-                          ...formField,
+                          cashback_point: values.floatValue !== undefined ? values.floatValue : ''
-                          cashback_point: isNaN(value) ? 0 : value
+                        }));
-                        });
                       }}
+                      placeholder="Enter Cashback Point"
                     />
                   </div>
                 </div>
@@ -300,19 +317,19 @@ const AddDialog = () => {
                     <label className="form-label flex items-center gap-1 max-w-56">
                       Cashback Cash<span className="text-red-500">*</span>
                     </label>
-                    <Input
+                    <NumericFormat
                       className="input"
-                      type="number"
+                      value={formField.cashback_cash ?? ''}
-                      min={0}
+                      thousandSeparator="."
-                      step={0.01}
+                      decimalSeparator=","
-                      value={formField.cashback_cash}
+                      allowNegative={false}
-                      onChange={(e) => {
+                      onValueChange={(values) => {
-                        const value = parseFloat(e.target.value);
+                        setFormField((prev) => ({
-                        setFormField({
+                          ...prev,
-                          ...formField,
+                          cashback_cash: values.floatValue !== undefined ? values.floatValue : ''
-                          cashback_cash: isNaN(value) ? 0 : value
+                        }));
-                        });
                       }}
+                      placeholder="Enter Cashback Cash"
                     />
                   </div>
                 </div>

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

@@ -68,7 +68,7 @@ const AddDialog = () => {
     type: string;
     status: string;
     transaction_type: string;
-    agent: string;
+    agent: string | null;
     created_by: string;
     created_at: string;
   } = {
@@ -77,7 +77,7 @@ const AddDialog = () => {
     type: '',
     status: '',
     transaction_type: '',
-    agent: '',
+    agent: null,
     created_by: '',
     created_at: ''
   };
@@ -133,7 +133,7 @@ const AddDialog = () => {
       return;
     }
 
-    console.log(formField);
+    // console.log(formField);
     doCreateProvider(e);
     setAlert({ show: false, message: '' });
   };

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

@@ -58,7 +58,7 @@ const EditDialog = () => {
     type: string;
     status: string;
     transaction_type: string;
-    agent: string;
+    agent: string | null;
     updated_by: string;
     updated_at: string;
   } = {
@@ -67,7 +67,7 @@ const EditDialog = () => {
     type: '',
     status: '',
     transaction_type: '',
-    agent: '',
+    agent: null,
     updated_by: '',
     updated_at: ''
   };
@@ -156,7 +156,7 @@ const EditDialog = () => {
         type: response?.data.type,
         status: response?.data.status,
         transaction_type: response?.data.transaction_type.id,
-        agent: response?.data.agent?.id || ''
+        agent: response?.data.agent?.id || null
       }));
     }
   }, []);
@@ -169,8 +169,7 @@ const EditDialog = () => {
       formField.description.trim() === '' ||
       formField.type.trim() === '' ||
       formField.status.trim() === '' ||
-      formField.transaction_type.trim() === '' ||
+      formField.transaction_type.trim() === ''
-      formField.agent.trim() === ''
     ) {
       setAlert({ show: true, message: 'Please fill in all required fields.' });
       return;

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

@@ -123,7 +123,16 @@ const AddDialog = () => {
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     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;
     }

src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx

@@ -155,7 +155,7 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
       },
       {
         accessorKey: 'type.name',
-        header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
+        header: ({ column }) => <DataGridColumnHeader title="Transaction Type" column={column} />,
         enableSorting: false,
         enableHiding: false,
         meta: {

src/pages/transaction/history-transaction/hooks/TransactionContext.tsx

@@ -157,7 +157,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
       },
       {
         accessorKey: 'type.name',
-        header: ({ column }) => <DataGridColumnHeader title="Name" column={column} />,
+        header: ({ column }) => <DataGridColumnHeader title="Transaction Type" column={column} />,
         enableSorting: false,
         enableHiding: false,
         meta: {

src/pages/transfer/transfertype/blocks/AddDialog.tsx

@@ -218,7 +218,7 @@ const AddDialog = () => {
       order_direction: 'ASC',
     };
     const response = await GetData(`${API_URL_MASTERDATA}/wallet/list`, params);
-    console.log(response)
+    // console.log(response)
     if (response?.status && response?.data) {
       setWallets(response.data.list);
     } else {
@@ -230,7 +230,7 @@ const AddDialog = () => {
     if (!showAddDialog) return;
     fetchWallets();
   }, [showAddDialog]);
-
+  // console.log(formField)
   return (
     <Dialog open={showAddDialog} onOpenChange={(open) => handleAddDialog(open)}>
       <DialogContent className="container-fixed max-w-[1080px] flex flex-col p-5 overflow-hidden [&>button]:hidden">

src/pages/transfer/transfertype/blocks/DeleteDialog.tsx

@@ -19,7 +19,9 @@ const DeleteDialog = () => {
     message: ''
   });
 
-  const doDeleteTransferType = useCallback(async () => {
+
+
+  const doDeleteTransferType = useCallback(async (id:string|null) => {
     if (!selectedTransferType) {
       toast.error('No Transfer Type selected');
       return;
@@ -37,9 +39,15 @@ const DeleteDialog = () => {
       setTimeout(() => toast.success('Success Delete Transaction Type'), 0);
     } else {
       setAlert({ show: true, message: response?.message });
-      setTimeout(() => toast.error('Failed Delete Product'), 0);
+      // setTimeout(() => toast.error('Failed Delete Product'), 0);
     }
   }, [selectedTransferType, DeleteData, handleDeleteDialog, reload]);
+  
+  const handleDelete = ((id:string|null) => {
+    console.log(id);
+    doDeleteTransferType(id);
+  })
+  
   return (
     <Dialog open={showDeleteDialog} onOpenChange={(open) => handleDeleteDialog(open, null)}>
       <DialogContent className="container-fixed max-w-md flex flex-col p-5 overflow-hidden [&>button]:hidden">
@@ -60,7 +68,7 @@ const DeleteDialog = () => {
           <Button variant={'outline'} onClick={() => handleDeleteDialog(false, null)}>
             Cancel
           </Button>
-          <Button variant={'destructive'} onClick={() => doDeleteTransferType()}>
+          <Button variant={'destructive'} onClick={() => handleDelete(selectedTransferType)}>
             Delete
           </Button>
         </DialogFooter>

src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx

@@ -70,8 +70,8 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
   }, []);
 
   const handleDeleteDialog = useCallback((show: boolean, selected_transfertype: string | null) => {
-    setShowDeleteDialog(show);
     setSelectedTransferType(show ? selected_transfertype : null);
+    setShowDeleteDialog(show);
   }, []);
 
   const columns = useMemo<ColumnDef<any>[]>(