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-08 21:58:46 +07:00
parent 3043b39c8c 60bc51d7fd
commit 22d163f267
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/master/aldeias/blocks/AddDialog.tsx
View File

@ -175,7 +175,10 @@ const AddDialog = () => {
</label>
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<button type="button" className="input col-span-5 text-left">
<button
type="button"
className="input col-span-5 text-left"
style={{color:'inherit'}}>
{sucos.find((suco) => suco.sucos_id === formField.sucosId)?.sucos_name ||
'Select Sucos'}
</button>
@ -192,7 +195,7 @@ const AddDialog = () => {
{sucos.map((suco) => (
<CommandItem
key={suco.sucos_id}
value={suco.sucos_id.toString()}
value={suco.sucos_name}
onSelect={() => {
setFormField({
...formField,

6
src/pages/master/aldeias/blocks/EditDialog.tsx
View File

@ -198,7 +198,11 @@ const EditDialog = () => {
</label>
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<button type="button" className="input col-span-5 text-left">
<button
type="button"
className="input col-span-5 text-left"
style={{ color: 'inherit' }}
>
{sucos.find((suco) => suco.sucos_id === formField.sucosId)?.sucos_name ||
'Select Sucos'}
</button>

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

@ -145,7 +145,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 || ''
}));
}
}, []);

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

@ -94,7 +94,13 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode
}
},
{
accessorFn: (row) => row.provider_type,
accessorFn: (row) => {
const typeMapping: Record<string, string> = {
h2h: 'Host To Host',
agent: 'Agent'
};
return typeMapping[row.provider_type] || row.provider_type;
},
id: 'type',
header: ({ column }) => <DataGridColumnHeader title="Type" column={column} />,
enableSorting: false,

41
src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx
View File

@ -82,7 +82,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
header: ({ column }) => (
<DataGridColumnHeader title="Transaction Type Name" column={column} />
),
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -90,7 +90,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => row.description,
id: 'description',
header: ({ column }) => <DataGridColumnHeader title="Description" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -98,7 +98,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => row.wallet_origin?.name || 'N/A',
id: 'wallet_origin',
header: ({ column }) => <DataGridColumnHeader title="From Account" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -106,7 +106,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => row.wallet_destination.name || 'N/A',
id: 'wallet_destination',
header: ({ column }) => <DataGridColumnHeader title="To Account" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -114,7 +114,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => row.maximum_amount,
id: 'maximum_amount',
header: ({ column }) => <DataGridColumnHeader title="Maximum Amount" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -122,7 +122,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => row.minimum_amount,
id: 'minimum_amount',
header: ({ column }) => <DataGridColumnHeader title="Minimum Amount" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -132,7 +132,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
header: ({ column }) => (
<DataGridColumnHeader title="Max Transaction Per Day" column={column} />
),
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -142,7 +142,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
header: ({ column }) => (
<DataGridColumnHeader title="Wallet Fee Destination" column={column} />
),
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -152,7 +152,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
header: ({ column }) => (
<DataGridColumnHeader title="Customer Fee Destination" column={column} />
),
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -162,7 +162,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
header: ({ column }) => (
<DataGridColumnHeader title="TransactionType Status" column={column} />
),
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[250px]' }
},
@ -170,7 +170,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => (row.status === 'Y' ? 'Active' : 'Inactive'),
id: 'status',
header: ({ column }) => <DataGridColumnHeader title="Status" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[150px]' }
},
@ -178,7 +178,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
accessorFn: (row) => (row.status_approval === 'Y' ? 'Yes' : 'No'),
id: 'status_approval',
header: ({ column }) => <DataGridColumnHeader title="Approval Status" column={column} />,
enableSorting: true,
enableSorting: false,
enableHiding: false,
meta: { headerClassName: 'w-[150px]' }
},
@ -211,22 +211,29 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
],
[handleEditDialog, handleDeleteDialog]
);
const doGetTransferTypeListData = async (
page: number,
limit: number,
sorting: any,
filter: any
) => {
sorting = sorting.length == 0 ? [{ id: 'id', desc: false }] : sorting;
const orderField = 'created_at';
const orderDirection = sorting.length > 0 ? (sorting[0].desc ? 'DESC' : 'ASC') : 'DESC';
filter = filter.length == 0 ? {} : { any: filter[0].value?.toLowerCase() };
const response = await GetData(`${API_URL}/transactiontype/list`, {
limit: limit,
page: page + 1,
with_deleted: false,
order_field: sorting[0].id,
order_direction: sorting[0].desc ? 'ASC' : 'DESC',
order_field: orderField,
order_direction: orderDirection,
filter: JSON.stringify(filter)
});
return { data: response?.data.list, totalCount: response?.data.total_count };
};
@ -253,7 +260,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
pagination={{ size: 10 }}
layout={{ card: true }}
toolbar={<ListToolbar />}
sorting={[{ id: 'id', desc: true }]}
sorting={[{ id: 'created_at', desc: true }]} // Default sorting
serverSide={true}
onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) =>
doGetTransferTypeListData(pageIndex, pageSize, sorting, columnFilters)
@ -268,4 +275,4 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React
};
export { ManageTransferTypeContext, ManageTransferTypeContextProvider };
export type { TransferType };
export type { TransferType };