mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 13:32:00 +00:00
Merge branch 'fix/pay' into 'development'
fix bop See merge request mbugroup/lti-web-client!473
This commit is contained in:
@@ -105,7 +105,7 @@ const ExpenseRequestContent = ({
|
|||||||
const isExpensePaidOff = initialValues?.is_paid;
|
const isExpensePaidOff = initialValues?.is_paid;
|
||||||
|
|
||||||
const showPaidOffButton =
|
const showPaidOffButton =
|
||||||
!isExpensePaidOff && (initialValues?.latest_approval.step_number ?? 0) > 4;
|
!isExpensePaidOff && (initialValues?.latest_approval.step_number ?? 0) >= 4;
|
||||||
|
|
||||||
// Modal hooks
|
// Modal hooks
|
||||||
const deleteModal = useModal();
|
const deleteModal = useModal();
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ const RowOptionsMenu = ({
|
|||||||
: false;
|
: false;
|
||||||
|
|
||||||
const showPaidOffButton = props.row.original.latest_approval
|
const showPaidOffButton = props.row.original.latest_approval
|
||||||
? props.row.original.latest_approval.step_number > 4 &&
|
? props.row.original.latest_approval.step_number >= 4 &&
|
||||||
!props.row.original.is_paid
|
!props.row.original.is_paid
|
||||||
: false;
|
: false;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user