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

src/pages/dashboards/home/DashboardHomePage.tsx

@@ -261,15 +261,15 @@ const DashboardHomePage = () => {
       </Helmet>
       <Container>
         {/* Account Balance Cards */}
-        {currentRole === 'Escrow' || currentRole === 'Master Agent' ? (
+        {/* {currentRole === 'Escrow' || currentRole === 'Master Agent' ? (
           <div className="grid gap-5 lg:gap-7.5 mb-14 mt-7">
             <BalanceCard id={idCustomer} />
           </div>
-        ) : null}
+        ) : null} */}
 
         <div className="flex space-x-4 mt-5">
           {bankaccount?.data && bankaccount?.data.length > 0 
-          && getAuth()?.statusbalance=='Y' 
+          // && getAuth()?.statusbalance=='Y' 
           ? (
             bankaccount?.data.map((bankaccountdatas: { id_balance:string,amount: string, credit_limit: string, monthly_limit: string; wallet: string; }, index: number) => (
               <BankSaldo

src/pages/dashboards/home/blocks/ShowDetailWalletDialog.tsx

@@ -75,14 +75,42 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
     useEffect(() => {
         fetchTransferType();
     }, [fetchTransferType]);
-
+    
     useEffect(() => {
+        const categoryMap: Record<string, string> = {
+            T: 'TRANSFER',
+            P: 'PURCHASE',
+            W: 'WITHDRAW',
+            U: 'TOP UP',
+            R: 'RETURN',
+            N: 'TOP UP PARTNER',
+            E: 'REWARD',
+            L: 'PURCHASE LOJA',
+            B: 'TOP UP P24',
+            A: 'TRANSFER AGENT',
+            M: 'WITHDRAWAL AGENT',
+            O: 'TOP UP AGENT',
+            S: 'TRANSFER P24',
+            I: 'WIJTDRAW MERCHANT',
+            D: 'DONATION',
+            F: 'FEE',
+            V: 'REVERSAL',
+            C: 'CASHBACK CASH',
+            H: 'CASHBACK POINT',
+        };
+
         const uniqueCategories = Array.from(
-            new Set(transaction.map((tx) => tx.category).filter((cat) => !!cat))
+            new Set(
+                transaction
+                    .map((tx) => categoryMap[tx.category] || '_') // map code to label or default to '_'
+                    .filter((cat) => !!cat && cat !== '_') // remove undefined/null or underscore
+            )
         );
+
         setCategory(uniqueCategories);
     }, [transaction]);
 
+
     const handleTransferTypeChange = (value: string) => {
         setSelectedTransferType(value === 'all' ? null : value);
     };
@@ -102,11 +130,26 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
     const handleApplyFilters = () => {
         const appliedFilters: any = {};
 
-        if (dateRange.from) appliedFilters.date_from = dateRange.from+" 00:00:00";
+        if (dateRange.from && dateRange.to) {
-        if (dateRange.to) appliedFilters.date_to = dateRange.to+" 23:59:59";
+            const fromDate = new Date(`${dateRange.from}T00:00:00Z`);
-        if (selectedTransferType) appliedFilters.transaction_type_id = selectedTransferType;
+            const toDate = new Date(`${dateRange.to}T23:59:59Z`);
-        if (selectedCategory) appliedFilters.category = selectedCategory;
+            appliedFilters.date = {
-        if (searchValue) appliedFilters.transaction_code = searchValue;
+                from: fromDate.toISOString(),
+                to: toDate.toISOString(),
+            };
+        }
+
+        if (selectedTransferType) {
+            appliedFilters.transaction_type_id = selectedTransferType;
+        }
+
+        if (selectedCategory) {
+            appliedFilters.category = selectedCategory;
+        }
+
+        if (searchValue) {
+            appliedFilters.transaction_code = searchValue;
+        }
 
         setFilters(appliedFilters);
     };
@@ -159,10 +202,37 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
             meta: { headerClassName: 'min-w-[100px]' },
         },
         {
+            accessorFn: (row: any) => {
+                switch (row.category) {
+                    case 'T': return 'TRANSFER';
+                    case 'P': return 'PURCHASE';
+                    case 'W': return 'WITHDRAW';
+                    case 'U': return 'TOP UP';
+                    case 'R': return 'RETURN';
+                    case 'N': return 'TOP UP PARTNER';
+                    case 'E': return 'REWARD';
+                    case 'L': return 'PURCHASE LOJA';
+                    case 'B': return 'TOP UP P24';
+                    case 'A': return 'TRANSFER AGENT';
+                    case 'M': return 'WITHDRAWAL AGENT';
+                    case 'O': return 'TOP UP AGENT';
+                    case 'S': return 'TRANSFER P24';
+                    case 'I': return 'WIJTDRAW MERCHANT';
+                    case 'D': return 'DONATION';
+                    case 'F': return 'FEE';
+                    case 'V': return 'REVERSAL';
+                    case 'C': return 'CASHBACK CASH';
+                    case 'H': return 'CASHBACK POINT';
+                    default: return '_';
+                }
+            },
             accessorKey: 'category',
             header: ({ column }: any) => <DataGridColumnHeader title="Category" column={column} />,
             enableSorting: false,
-            meta: { headerClassName: 'min-w-[80px]' },
+            enableHiding: false,
+            meta: {
+                headerClassName: 'w-[250px]'
+            }
         },
         {
             accessorKey: 'date',
@@ -207,10 +277,10 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
                     with_deleted: false,
                     order_field: "created_at",
                     order_direction: 'DESC',
-                    filter: filters
+                    filter: JSON.stringify(filters)
                 });
 
-                // console.log(filters);
+                // console.log(response);
 
                 if (!response || !response.data) {
                     console.warn('No data received:', response);
@@ -229,7 +299,7 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
 
     return (
         <Dialog open={open} onOpenChange={onClose}>
-            <DialogContent className="max-w-[95vw] sm:max-w-[1200px] p-4 overflow-hidden">
+            <DialogContent className="w-screen max-w-screen max-h-screen p-4 overflow-hidden">
                 <DialogHeader>
                     <DialogTitle>Details Wallet Statement</DialogTitle>
                 </DialogHeader>
@@ -318,7 +388,7 @@ const ShowDetailWalletDialog: React.FC<ShowDetailWalletDialogProps> = ({
                         <DataGridProvider
                             key={JSON.stringify(filters)}
                             columns={columns}
-                            pagination={{ size: 10 }}
+                            pagination={{ size: 5 }}
                             layout={{ card: true }}
                             sorting={[{ id: 'id', desc: false }]}
                             serverSide={true}

src/pages/disbursement/history-transaction/blocks/DetailTransaction.tsx

@@ -94,66 +94,65 @@ const DetailTransaction = () => {
     }
   }, [showDetailDialog]);
 
-const handleExport = async () => {
+  const handleExport = async () => {
-  if (!selectedTransactionId || !transactionDetails) return;
+    if (!selectedTransactionId || !transactionDetails) return;
 
-  setIsExporting(true);
+    setIsExporting(true);
-  try {
+    try {
-    const response = await fetch(
+      const response = await fetch(
-      `${API_URL}/transaction/export?id_disbursment=${selectedTransactionId}`,
+        `${API_URL}/transaction/export?id_disbursment=${selectedTransactionId}`,
-      {
+        {
-        method: 'GET',
+          method: 'GET',
-        headers: {
+          headers: {
-          Authorization: `Bearer ${getAuth()?.access_token}`
+            Authorization: `Bearer ${getAuth()?.access_token}`
+          }
+        }
+      );
+
+      if (!response.ok) {
+        throw new Error('Failed to fetch file');
+      }
+
+      const blob = await response.blob();
+      const contentDisposition = response.headers.get('content-disposition');
+
+      const executionDate = transactionDetails.execution_date;
+      const formattedDate = executionDate
+        ? moment(executionDate).format('YYYYMMDD_HHmm')
+        : moment().format('YYYYMMDD_HHmm');
+
+      let filename = `transaction_${formattedDate}.xlsx`;
+
+      if (contentDisposition) {
+        const filenameMatch = contentDisposition.match(/filename\*?=(?:UTF-8'')?"?([^;"\n]*)"?/);
+        if (filenameMatch && filenameMatch[1]) {
+          filename = decodeURIComponent(filenameMatch[1]);
         }
       }
-    );
 
-    if (!response.ok) {
+      const url = window.URL.createObjectURL(blob);
-      throw new Error('Failed to fetch file');
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = filename;
+      a.click();
+      window.URL.revokeObjectURL(url);
+
+      toast.success('Export successful');
+    } catch (error) {
+      console.error('Error exporting transaction:', error);
+      toast.error('Failed to export transaction');
+    } finally {
+      setIsExporting(false);
     }
-
+  };
-    const blob = await response.blob();
-    const contentDisposition = response.headers.get('content-disposition');
-
-    const executionDate = transactionDetails.execution_date;
-    const formattedDate = executionDate
-      ? moment(executionDate).format('YYYYMMDD_HHmm')
-      : moment().format('YYYYMMDD_HHmm');
-
-    let filename = `transaction_${formattedDate}.xlsx`;
-
-    if (contentDisposition) {
-      const filenameMatch = contentDisposition.match(/filename\*?=(?:UTF-8'')?"?([^;"\n]*)"?/);
-      if (filenameMatch && filenameMatch[1]) {
-        filename = decodeURIComponent(filenameMatch[1]);
-      }
-    }
-
-    const url = window.URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = filename;
-    a.click();
-    window.URL.revokeObjectURL(url);
-
-    toast.success('Export successful');
-  } catch (error) {
-    console.error('Error exporting transaction:', error);
-    toast.error('Failed to export transaction');
-  } finally {
-    setIsExporting(false);
-  }
-};
-
 
   return (
     <Dialog open={showDetailDialog} onOpenChange={setShowDetailDialog}>
       <DialogContent className="container-fixed max-w-[1280px] w-full h-[90vh] flex flex-col p-6 overflow-hidden">
-         <DialogHeader>
+        <DialogHeader>
           <DialogTitle className="text-2xl font-bold">Transaction Details</DialogTitle>
         </DialogHeader>
-        <DialogBody>
+        <DialogBody className="flex flex-col overflow-hidden h-full">
           <div className="py-4 overflow-y-auto max-h-[600px] space-y-6">
             {/* Summary Info */}
             {transactionDetails && (
@@ -213,7 +212,6 @@ const handleExport = async () => {
               </div>
             )}
 
-            {/* Log Table */}
             <div className="border rounded-lg overflow-x-auto">
               {isLoading ? (
                 <div className="flex flex-col items-center justify-center p-8">
@@ -229,96 +227,113 @@ const handleExport = async () => {
                   <p className="mt-4 text-gray-500">Loading Logs Details...</p>
                 </div>
               ) : (
-                <table className="min-w-full table-auto">
+                <>
-                  <thead>
+                  <div className="flex justify-end m-5">
-                    <tr className="bg-gray-100">
+                    <button
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Username</th>
+                      className={`px-5 py-2 bg-green-600 text-white font-semibold rounded-lg hover:bg-green-700 transition-colors flex items-center ${isExporting ? 'opacity-50 pointer-events-none' : ''}`}
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Fullname</th>
+                      onClick={() => {
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Amount</th>
+                        if (!isExporting) {
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Status</th>
+                          handleExport();
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Process Date</th>
+                        }
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Invoice Number</th>
+                      }}
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 1</th>
+                    >
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 2</th>
+                      {isExporting ? (
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 3</th>
+                        <>
-                      <th className="px-4 py-2 text-left text-sm text-gray-500">Actions</th>
+                          <span className="animate-spin ">
-                    </tr>
+                            <KeenIcon icon="spinner" />
-                  </thead>
+                          </span>
-                  <tbody>
+                          Exporting...
-                    {transactionDetails?.log && transactionDetails.log.length > 0 ? (
+                        </>
-                      transactionDetails.log.map((log: any, index: number) => (
+                      ) : (
-                        <tr key={index} className="border-t">
+                        <>
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                          <KeenIcon icon="download" />
-                            {log.customer?.username ?? 'Not Found'}
+                          Export
-                          </td>
+                        </>
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                      )}
-                            {log.customer?.fullname ?? 'Not Found'}
+                    </button>
-                          </td>
+                  </div>
-                          <td className="px-4 py-2 text-sm text-gray-500">{log.amount ?? '-'}</td>
+                  <div className="max-h-[900px] overflow-y-auto border rounded-lg">
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                    <table className="min-w-full table-auto">
-                            {renderStatusBadge(log.status) ?? '-'}
+                      <thead>
-                          </td>
+                        <tr className="bg-gray-100">
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Username</th>
-                            {log.request_date && moment(log.request_date).isValid()
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Fullname</th>
-                              ? moment(log.request_date).format('DD/MM/YYYY HH:mm')
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Amount</th>
-                              : '-'}
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Status</th>
-                          </td>
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                            Process Date
-                            {log.reference ?? '-'}
+                          </th>
-                          </td>
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">
-                          <td className="px-4 py-2 text-sm text-gray-500">{log.remark_1 ?? '-'}</td>
+                            Invoice Number
-                          <td className="px-4 py-2 text-sm text-gray-500">{log.remark_2 ?? '-'}</td>
+                          </th>
-                          <td className="px-4 py-2 text-sm text-gray-500">{log.remark_3 ?? '-'}</td>
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 1</th>
-                          <td className="px-4 py-2 text-sm text-gray-500">
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 2</th>
-                            <button
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Remark 3</th>
-                              className="btn btn-sm btn-icon btn-clear btn-light"
+                          <th className="px-4 py-2 text-left text-sm text-gray-500">Actions</th>
-                              onClick={() => {
-                                setDetailLogData(log);
-                                setShowDetailLogDialog(true);
-                              }}
-                            >
-                              <KeenIcon icon="eye" />
-                            </button>
-                          </td>
                         </tr>
-                      ))
+                      </thead>
-                    ) : (
+                      <tbody>
-                      <tr>
+                        {transactionDetails?.log && transactionDetails.log.length > 0 ? (
-                        <td colSpan={10} className="px-4 py-2 text-center text-sm text-gray-500">
+                          transactionDetails.log.map((log: any, index: number) => (
-                          No logs available
+                            <tr key={index} className="border-t">
-                        </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
-                      </tr>
+                                {log.customer?.username ?? 'Not Found'}
-                    )}
+                              </td>
-                  </tbody>
+                              <td className="px-4 py-2 text-sm text-gray-500">
-                </table>
+                                {log.customer?.fullname ?? 'Not Found'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.amount ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {renderStatusBadge(log.status) ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.request_date && moment(log.request_date).isValid()
+                                  ? moment(log.request_date).format('DD/MM/YYYY HH:mm')
+                                  : '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.reference ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.remark_1 ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.remark_2 ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                {log.remark_3 ?? '-'}
+                              </td>
+                              <td className="px-4 py-2 text-sm text-gray-500">
+                                <button
+                                  className="btn btn-sm btn-icon btn-clear btn-light"
+                                  onClick={() => {
+                                    setDetailLogData(log);
+                                    setShowDetailLogDialog(true);
+                                  }}
+                                >
+                                  <KeenIcon icon="eye" />
+                                </button>
+                              </td>
+                            </tr>
+                          ))
+                        ) : (
+                          <tr>
+                            <td
+                              colSpan={10}
+                              className="px-4 py-2 text-center text-sm text-gray-500"
+                            >
+                              No logs available
+                            </td>
+                          </tr>
+                        )}
+                      </tbody>
+                    </table>
+                  </div>
+                </>
               )}
             </div>
-
-            {/* Export Button - Moved to bottom right after table */}
-            <div className="flex justify-end">
-              <button
-                className={`px-4 py-2 bg-green-600 text-white rounded-lg hover:bg-green-700 transition-colors flex items-center ${isExporting ? 'opacity-50 pointer-events-none' : ''}`}
-                onClick={() => {
-                  if (!isExporting) {
-                    handleExport();
-                  }
-                }}
-              >
-                {isExporting ? (
-                  <>
-                    <span className="animate-spin mr-2">
-                      <KeenIcon icon="spinner" />
-                    </span>
-                    Exporting...
-                  </>
-                ) : (
-                  <>
-                    <KeenIcon icon="download" className="mr-2" />
-                    Export
-                  </>
-                )}
-              </button>
-            </div>
           </div>
         </DialogBody>
       </DialogContent>
@@ -326,4 +341,4 @@ const handleExport = async () => {
   );
 };
 
-export default DetailTransaction;
+export default DetailTransaction;

src/pages/members/manage-members/blocks/DetailMember.tsx

@@ -209,16 +209,16 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
 
                             {(formData.id || dialogType === "create") ? generateList(formData, handleChange, groups, 'group_id', 'Group', true, dialogType === "update"||false): ''}
                             {/* {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Group', 'group_name', 'text', true, true): ''} */}
-                            {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Username', 'username', 'text', true, dialogType==='create'?false:true): ''}
+                            {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Username', 'username', 'text', true, viewOnly): ''}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Full Name', 'fullname', 'text', true, viewOnly): ''}
                             {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'Photo', 'photouser', previewImg, setPreviewImg): ''}
                             {(formData.id || dialogType === "create") ? generateList(formData, handleChange, genders, 'gender', 'Gender', true, false): ''}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Date of Birth', 'date_birth', 'date', true, viewOnly): ''}
-                            {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Phone Number', 'msisdn', 'text', true, dialogType === "update"||false): ''}
+                            {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Phone Number', 'msisdn', 'text', true, dialogType === "create"||false): ''}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Email', 'email', 'text', true, viewOnly): ''}
                             {/* {generateList(formData, handleChange, status, 'status', 'Status', null, true)} */}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Mother Fullname', 'mother_fullname', 'text', true, viewOnly): ''}
-                            {(formData.id || dialogType === "create") ? generateList(formData, handleChange, identity_type, 'identity_type', 'Identity Type', false, false): ''}
+                            {(formData.id || dialogType === "create") ? generateList(formData, handleChange, identity_type, 'identity_type', 'Identity Type', false, viewOnly): ''}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Address', 'address', 'text', true, viewOnly): ''}
                             {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Identity Number', 'identity_number', 'text', false, viewOnly): ''}
                             <div className="bg-white space-y-6">