Merge pull request #1211 from Crown-Commercial-Service/p3sprint7

# (#1210)
Crown-Commercial-Service · Mar 24, 2023 · fd03dbd · fd03dbd
2 parents 2bf55fa + dd0beda
commit fd03dbd
Showing 1 changed file with 28 additions and 11 deletions.
diff --git a/src/app/pages/buyer/update-org-service/update-org-service.component.ts b/src/app/pages/buyer/update-org-service/update-org-service.component.ts
@@ -247,22 +247,39 @@ export class UpdateOrgServiceComponent implements OnInit {
 
   public orgRoleEligibilty(orgType: any, role: any) {
     if (orgType == '0') {
-      if (role.tradeEligibility == '0' || role.tradeEligibility == '2') {
-        return true
-      }
+      this.supplierEligibilty(role)
     } else if (orgType == '1') {
-      if (role.tradeEligibility == '1' || role.tradeEligibility == '2') {
-        return true
-      }
-    }
-    else if (orgType == '2') {
-      if (role.tradeEligibility == '0' || role.tradeEligibility == '1' || role.tradeEligibility == '2') {
-        return true
-      }
+      this.buyerEligibilty(role)
+    } else if (orgType == '2') {
+      this.bothEligibilty(role)
     }
     return false
   }
 
+  private supplierEligibilty(role:any){
+    if (role.tradeEligibility == '0' || role.tradeEligibility == '2') {
+      return true
+    } else {
+      return false
+    }
+  }
+
+  private buyerEligibilty(role:any){
+    if (role.tradeEligibility == '1' || role.tradeEligibility == '2') {
+      return true
+    }  else {
+      return false
+    }
+  }
+
+  private bothEligibilty(role:any){
+    if (role.tradeEligibility == '0' || role.tradeEligibility == '1' || role.tradeEligibility == '2') {
+      return true
+    }  else {
+      return false
+    }
+  }
+
 
   public checkRoleMatrixInDeleteRoles(orgType: any): void {
     if (orgType === 2) {