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 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1910c6dea2 - Show all commits

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"