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

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +22 -21
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cf7db394d - Show all commits

33
src/components/Expenses/ViewExpense.jsx
View File

@ -80,8 +80,8 @@ const ViewExpense = ({ ExpenseId }) => {
<hr /> <hr />
</div> </div>
{/* Expense Info Rows */} {/* Each info block below now has h-100 to stretch */}
<div className="col-12 col-md-6 mb-3"> <div className="col-12 col-md-6 mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Transaction Date : Transaction Date :
@ -92,7 +92,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-6 mb-3"> <div className="col-12 col-md-6 mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Expense Type : Expense Type :
@ -101,7 +101,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Supplier : Supplier :
@ -110,14 +110,14 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold">Amount :</label> <label className="form-label me-2 mb-0 fw-semibold">Amount :</label>
<div className="text-muted">₹ {data.amount}</div> <div className="text-muted">₹ {data.amount}</div>
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Payment Mode : Payment Mode :
@ -126,8 +126,8 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100">
<div className="d-flex"> <div className="d-flex ">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Paid By : Paid By :
</label> </label>
@ -137,9 +137,8 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 text-start col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100 text-start">
<label className="form-label me-2 mb-0 fw-semibold">Status :</label> <label className="form-label me-2 mb-0 fw-semibold">Status :</label>
<span <span
className={`badge bg-label-${ className={`badge bg-label-${
getColorNameFromHex(data?.status?.color) || "secondary" getColorNameFromHex(data?.status?.color) || "secondary"
@ -149,14 +148,16 @@ const ViewExpense = ({ ExpenseId }) => {
</span> </span>
</div> </div>
<div className="col-12 text-start d-flex col-md-4 mb-3"> <div className="col-12 col-md-4 mb-3 h-100">
<div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Pre-Approved : Pre-Approved :
</label> </label>
<div className="text-muted">{data.preApproved ? "Yes" : "No"}</div> <div className="text-muted">{data.preApproved ? "Yes" : "No"}</div>
</div> </div>
</div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-auto mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Project : Project :
@ -165,7 +166,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-auto mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Created By : Created By :
@ -176,7 +177,7 @@ const ViewExpense = ({ ExpenseId }) => {
</div> </div>
</div> </div>
<div className="col-12 col-md-4 mb-3"> <div className="col-12 col-md-auto mb-3 h-100">
<div className="d-flex"> <div className="d-flex">
<label className="form-label me-2 mb-0 fw-semibold"> <label className="form-label me-2 mb-0 fw-semibold">
Created At : Created At :
@ -219,7 +220,7 @@ const ViewExpense = ({ ExpenseId }) => {
> >
<div <div
className="rounded me-1 d-flex align-items-center justify-content-center cursor-pointer" className="rounded me-1 d-flex align-items-center justify-content-center cursor-pointer"
style={{ height: "50px", width: "80px", position: "relative" }} style={{ height: "50px", width: "60px", position: "relative" }}
onClick={() => { onClick={() => {
if (isImage) { if (isImage) {
setDocumentView({ setDocumentView({
@ -233,7 +234,7 @@ const ViewExpense = ({ ExpenseId }) => {
className={`bx ${getIconByType( className={`bx ${getIconByType(
doc.contentType doc.contentType
)} text-primary`} )} text-primary`}
style={{ fontSize: "45px" }} style={{ fontSize: "35px" }}
></i> ></i>
</div> </div>