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

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

Browse Source
This commit is contained in:
Kartik Sharma 2025-11-07 11:55:18 +05:30
commit 1910c6dea2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/PaymentRequest/ViewPaymentRequest.jsx
View File

@ -29,6 +29,7 @@ import { useNavigate } from "react-router-dom";
import { usePaymentRequestContext } from "../../pages/PaymentRequest/PaymentRequestPage"; import { usePaymentRequestContext } from "../../pages/PaymentRequest/PaymentRequestPage";
import { useHasUserPermission } from "../../hooks/useHasUserPermission"; import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { import {
EXPENSE_PROCESSED,
EXPENSE_REJECTEDBY, EXPENSE_REJECTEDBY,
PROCESS_EXPENSE, PROCESS_EXPENSE,
REVIEW_EXPENSE, REVIEW_EXPENSE,
@ -521,7 +522,7 @@ const ViewPaymentRequest = ({ requestId }) => {
)} )}
</div> </div>
</> </>
) : (!data?.isExpenseCreated && ! data?.isAdvancePayment) ? ( ) : (!data?.isExpenseCreated && data?.expenseStatus.id === EXPENSE_PROCESSED) ? (
<div className="text-end flex-wrap gap-2 my-2 mt-3"> <div className="text-end flex-wrap gap-2 my-2 mt-3">
<button <button
className="btn btn-sm btn-primary" className="btn btn-sm btn-primary"