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

solve issue fullname undefined

Browse Source
This commit is contained in:
wayanrivan
2025-05-09 14:48:09 +07:00
parent fc9beeeaa2
commit 94c6b7aea1
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pages/transaction/approval-transaction/hooks/ApprovalTransactionContext.tsx
View File

@ -95,22 +95,27 @@ const ApprovalTransactionProvider = ({ children }: { children: React.ReactNode }
},
{
accessorKey: 'origin_customer.fullname',
header: ({ column }) => <DataGridColumnHeader title="Origin Customer Full Name" column={column} />,
header: ({ column }) => (
<DataGridColumnHeader title="Origin Customer Full Name" column={column} />
),
enableSorting: false,
enableHiding: false,
meta: {
headerClassName: 'w-[250px]',
headerClassName: 'w-[250px]'
},
cell: ({ row }) => row.original.origin_customer?.fullname ?? ''
},
{
accessorFn: (row) => {
const purchase = row?.purchase?.destination_customer.fullname;
const transfer = row?.transfer?.destination_customer.fullname;
const purchase = row?.purchase?.destination_customer?.fullname;
const transfer = row?.transfer?.destination_customer?.fullname;
return purchase ?? transfer ?? "-";
return purchase ?? transfer ?? "";
},
id: 'destination_customer.fullname',
header: ({ column }) => <DataGridColumnHeader title="Destination Customer Full Name" column={column} />,
header: ({ column }) => (
<DataGridColumnHeader title="Destination Customer Full Name" column={column} />
),
enableSorting: false,
enableHiding: false,
meta: {

19
src/pages/transaction/history-transaction/hooks/TransactionContext.tsx
View File

@ -113,22 +113,27 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
},
{
accessorKey: 'origin_customer.fullname',
header: ({ column }) => <DataGridColumnHeader title="Origin Customer Full Name" column={column} />,
header: ({ column }) => (
<DataGridColumnHeader title="Origin Customer Full Name" column={column} />
),
enableSorting: false,
enableHiding: false,
meta: {
headerClassName: 'w-[250px]'
}
},
cell: ({ row }) => row.original.origin_customer?.fullname ?? ''
},
{
accessorFn: (row) => {
const purchase = row?.purchase?.destination_customer.fullname;
const transfer = row?.transfer?.destination_customer.fullname;
const purchase = row?.purchase?.destination_customer?.fullname;
const transfer = row?.transfer?.destination_customer?.fullname;
return purchase ?? transfer ?? "-";
return purchase ?? transfer ?? "";
},
id: 'destination_customer.fullname',
header: ({ column }) => <DataGridColumnHeader title="Destination Customer Full Name" column={column} />,
header: ({ column }) => (
<DataGridColumnHeader title="Destination Customer Full Name" column={column} />
),
enableSorting: false,
enableHiding: false,
meta: {
@ -228,7 +233,7 @@ const TransactionProvider = ({ children }: { children: React.ReactNode }) => {
enableSorting: false,
enableHiding: false,
cell: (data) => {
const row = data.row.original;
const row = data.row.original;
const isVisible = (row.status === 'F' ? true : false || row.status === 'P' ? true : false) && row.status_approve !== 'W' ? true : false;
return (
<div key={`actions-${row.id}`}>