admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Issues_Expense_2W Changes of Expense, Payment Request and Recurring Expense. #505

Closed
kartik.sharma wants to merge 12 commits from Issues_Expense_2W into upgrade_Expense
pull from: Issues_Expense_2W
merge into: admin:upgrade_Expense
Conversation 0 Commits 12 Files Changed 4 +7 -2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit efef7d273d - Show all commits

9
src/components/PaymentRequest/PaymentRequestList.jsx
View File

@ -180,9 +180,14 @@ const PaymentRequestList = ({ filters, groupBy = "submittedBy", search }) => {
]; ];
if (isLoading) return <ExpenseTableSkeleton headers={header} />; if (isLoading) return <ExpenseTableSkeleton headers={header} />;
const grouped = groupBy const grouped = groupBy
? groupByField(data?.data ?? [], groupBy) ? Object.fromEntries(
Object.entries(groupByField(data?.data ?? [], groupBy)).sort(([keyA], [keyB]) =>
keyA.localeCompare(keyB)
)
)
: { All: data?.data ?? [] }; : { All: data?.data ?? [] };
const IsGroupedByDate = [ const IsGroupedByDate = [
{ key: "transactionDate", displayField: "Transaction Date" }, { key: "transactionDate", displayField: "Transaction Date" },
{ key: "createdAt", displayField: "created Date" }, { key: "createdAt", displayField: "created Date" },