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

Merge branch 'migrate_main' of https://git.marcoaiot.com/admin/marco.pms.web into migrate_main

Browse Source
This commit is contained in:
pramod.mahajan 2025-11-10 18:54:01 +05:30
commit 4eecaf0509
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Expenses/ManageExpense.jsx
View File

@ -566,7 +566,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
? "Please Wait..." ? "Please Wait..."
: expenseToEdit : expenseToEdit
? "Update" ? "Update"
: "Submit"} : "Save as Draft"}
</button> </button>
</div> </div>
</form> </form>

2
src/components/PaymentRequest/ManagePaymentRequest.jsx
View File

@ -564,7 +564,7 @@ function ManagePaymentRequest({ closeModal, requestToEdit = null }) {
? "Please Wait..." ? "Please Wait..."
: requestToEdit : requestToEdit
? "Update" ? "Update"
: "Submit"} : "Save as Draft"}
</button> </button>
</div> </div>
</form> </form>

2
src/components/RecurringExpense/ManageRecurringExpense.jsx
View File

@ -570,7 +570,7 @@ const ManageRecurringExpense = ({ closeModal, requestToEdit = null }) => {
? "Please wait...." ? "Please wait...."
: requestToEdit : requestToEdit
? "Update" ? "Update"
: "Submit"} : "Save as Draft"}
</button> </button>
</div> </div>
</form> </form>

45
src/components/RecurringExpense/ViewRecurringExpense.jsx
View File

@ -31,9 +31,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
<div className="col-12 d-flex justify-content-between text-start fw-semibold my-2 mb-4"> <div className="col-12 d-flex justify-content-between text-start fw-semibold my-2 mb-4">
<span>{data?.recurringPaymentUID}</span> <span>{data?.recurringPaymentUID}</span>
<span <span
className={`badge bg-label-${ className={`badge bg-label-${statusColorMap[data?.status?.id] || "secondary"
statusColorMap[data?.status?.id] || "secondary" }`}
}`}
> >
{data?.status?.name || "N/A"} {data?.status?.name || "N/A"}
</span> </span>
@ -68,8 +67,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
<div className="text-muted"> <div className="text-muted">
{data?.amount != null {data?.amount != null
? `${data?.currency?.symbol ?? "¥"} ${Number( ? `${data?.currency?.symbol ?? "¥"} ${Number(
data.amount data.amount
).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}` ).toFixed(2)} ${data?.currency?.currencyCode ?? "CN"}`
: "N/A"} : "N/A"}
</div> </div>
</div> </div>
@ -83,7 +82,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
> >
Project : Project :
</label> </label>
<div className="text-muted">{data?.project?.name || "N/A"}</div> <div className="text-muted" style={{ textAlign: "left" }}>{data?.project?.name || "N/A"}</div>
</div> </div>
</div> </div>
@ -117,7 +116,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
> >
Title : Title :
</label> </label>
<div className="text-muted">{data?.title || "N/A"}</div> <div className="text-muted" style={{ textAlign: "left" }}>{data?.title || "N/A"}</div>
</div> </div>
</div> </div>
@ -131,7 +130,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
> >
Payee : Payee :
</label> </label>
<div className="text-muted">{data?.payee || "N/A"}</div> <div className="text-muted" style={{ textAlign: "left" }}>{data?.payee || "N/A"}</div>
</div> </div>
</div> </div>
@ -147,11 +146,11 @@ const ViewRecurringExpense = ({ RecurringId }) => {
<div className="text-muted" style={{ textAlign: "left" }}> <div className="text-muted" style={{ textAlign: "left" }}>
{data?.notifyTo?.length > 0 {data?.notifyTo?.length > 0
? data.notifyTo?.map((user, index) => ( ? data.notifyTo?.map((user, index) => (
<span key={user.id}> <span key={user.id}>
{user.email} {user.email}
{index < data?.notifyTo?.length - 1 && ", "} {index < data?.notifyTo?.length - 1 && ", "}
</span> </span>
)) ))
: "N/A"} : "N/A"}
</div> </div>
</div> </div>
@ -220,7 +219,7 @@ const ViewRecurringExpense = ({ RecurringId }) => {
> >
Updated At : Updated At :
</label> </label>
<div className="text-muted"> <div className="text-muted" style={{ textAlign: "left" }}>
{data?.updatedAt {data?.updatedAt
? formatUTCToLocalTime(data.updatedAt, true) ? formatUTCToLocalTime(data.updatedAt, true)
: "N/A"} : "N/A"}
@ -234,10 +233,12 @@ const ViewRecurringExpense = ({ RecurringId }) => {
className="form-label me-2 mb-0 fw-semibold text-start" className="form-label me-2 mb-0 fw-semibold text-start"
style={{ minWidth: "130px" }} style={{ minWidth: "130px" }}
> >
Number of Iteration : End Date :
</label> </label>
<div className="text-muted"> <div className="text-muted" style={{ textAlign: "left" }}>
{data?.numberOfIteration || "N/A"} {data?.endDate
? formatUTCToLocalTime(data.endDate, true)
: "N/A"}
</div> </div>
</div> </div>
</div> </div>
@ -259,9 +260,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
lastName={data?.createdBy?.lastName} lastName={data?.createdBy?.lastName}
/> />
<span className="text-muted"> <span className="text-muted">
{`${data?.createdBy?.firstName ?? ""} ${ {`${data?.createdBy?.firstName ?? ""} ${data?.createdBy?.lastName ?? ""
data?.createdBy?.lastName ?? "" }`.trim() || "N/A"}
}`.trim() || "N/A"}
</span> </span>
</div> </div>
</div> </div>
@ -283,9 +283,8 @@ const ViewRecurringExpense = ({ RecurringId }) => {
lastName={data.updatedBy.lastName} lastName={data.updatedBy.lastName}
/> />
<span className="text-muted"> <span className="text-muted">
{`${data.updatedBy.firstName ?? ""} ${ {`${data.updatedBy.firstName ?? ""} ${data.updatedBy.lastName ?? ""
data.updatedBy.lastName ?? "" }`.trim() || "N/A"}
}`.trim() || "N/A"}
</span> </span>
</> </>
</div> </div>