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

Project_Branch_Management : New Feature Service Project - Branch Management #519

Merged
pramod.mahajan merged 76 commits from Project_Branch_Management into main 2025-11-25 09:42:48 +00:00
Conversation 0 Commits 76 Files Changed 69 +12 -11
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 268bd2875f - Show all commits

21
src/components/collections/CollectionList.jsx
View File

@ -112,6 +112,16 @@ const CollectionList = ({ fromDate, toDate, isPending, searchString }) => {
), ),
align: "text-center", align: "text-center",
}, },
{
key: "status",
label: "Status",
getValue: (col) => (
<span className={`badge bg-label-${col?.isActive ? "primary" : "danger"}`}>
{col?.isActive ? "Active" : "Inactive"}
</span>
),
align: "text-center",
},
{ {
key: "amount", key: "amount",
label: "Total Amount", label: "Total Amount",
@ -128,16 +138,7 @@ const CollectionList = ({ fromDate, toDate, isPending, searchString }) => {
), ),
align: "text-end", align: "text-end",
}, },
{
key: "status",
label: "Status",
getValue: (col) => (
<span className={`badge bg-label-${col?.isActive ? "primary" : "danger"}`}>
{col?.isActive ? "Active" : "Inactive"}
</span>
),
align: "text-center",
},
{ {
key: "balance", key: "balance",
label: "Balance", label: "Balance",

2
src/pages/collections/CollectionPage.jsx
View File

@ -126,7 +126,7 @@ const CollectionPage = () => {
}`} }`}
onClick={() => setShowPending(false)} onClick={() => setShowPending(false)}
> >
All Show All
</button> </button>
<button <button
type="button" type="button"