diff --git a/frontend/src/pages/user/workspace/Home.vue b/frontend/src/pages/user/workspace/Home.vue index 42e4bf3..0b87b9a 100644 --- a/frontend/src/pages/user/workspace/Home.vue +++ b/frontend/src/pages/user/workspace/Home.vue @@ -693,15 +693,15 @@ export default { return true } else { if (milestone.status === milestoneStatusEnum.IMPLEMENTING) { - if (project.current_user_id === project.proposer_id) { + if (project.providers.includes(project.current_user_id)) { return false } } else if (milestone.status === milestoneStatusEnum.OUTSTANDING) { - if (project.current_user_id === project.requester_id) { + if (project.issuers.includes(project.current_user_id)) { return false } } else if (milestone.status === milestoneStatusEnum.PAID) { - if (project.current_user_id === project.proposer_id) { + if (project.providers.includes(project.current_user_id)) { return false } } @@ -711,7 +711,7 @@ export default { handleMilestoneAction(project, milestone) { if (milestone.index === project.current_milestone) { if (milestone.status === milestoneStatusEnum.IMPLEMENTING) { - if (project.current_user_id === project.proposer_id) { + if (project.providers.includes(project.current_user_id)) { WorksapceApi.setMillestoneStatus( project.id, milestone.index, @@ -725,7 +725,7 @@ export default { }) } } else if (milestone.status === milestoneStatusEnum.OUTSTANDING) { - if (project.current_user_id === project.requester_id) { + if (project.issuers.includes(project.current_user_id)) { WorksapceApi.createMilestoneCheckoutSession(project.id, milestone.index).then( (response) => { if (response.data.result) { @@ -740,7 +740,7 @@ export default { ) } } else if (milestone.status === milestoneStatusEnum.PAID) { - if (project.current_user_id === project.proposer_id) { + if (project.providers.includes(project.current_user_id)) { WorksapceApi.setMillestoneStatus(project.id, milestone.index, milestoneStatusEnum.DONE) .then((response) => { this.fetchView() @@ -766,19 +766,19 @@ export default { return 'Operation Complete' } else if (milestone.index === project.current_milestone) { if (milestone.status === milestoneStatusEnum.IMPLEMENTING) { - if (project.current_user_id === project.requester_id) { + if (project.issuers.includes(project.current_user_id)) { return 'Wait for completion' } else { return 'Mission complete' } } else if (milestone.status === milestoneStatusEnum.OUTSTANDING) { - if (project.current_user_id === project.requester_id) { + if (project.issuers.includes(project.current_user_id)) { return 'Payment' } else { return 'Wait for payment' } } else if (milestone.status === milestoneStatusEnum.PAID) { - if (project.current_user_id === project.requester_id) { + if (project.issuers.includes(project.current_user_id)) { return 'Wait for confirmation' } else { return 'Confirm receipt' @@ -889,17 +889,17 @@ export default { switch (issue.status) { case projectIssueStatusEnum.OPEN: if (button_text === 'Resolve') { - return project.current_user_id === project.proposer_id + return project.providers.includes(project.current_user_id) } break case 1: if (button_text === 'Reopen' || button_text === 'Confirm') { - return project.current_user_id === project.requester_id + return project.issuers.includes(project.current_user_id) } break case projectIssueStatusEnum.CLOSED: if (button_text === 'Reopen') { - return project.current_user_id === project.requester_id + return project.issuers.includes(project.current_user_id) } break default: