Allow to close a project with resolved tickets

Author: johnnyq

project_details.php

@@ -82,14 +82,23 @@
 
     // Get Closed Ticket Count
     $sql_closed_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_closed_at IS NOT NULL");
-
     $closed_ticket_count = mysqli_num_rows($sql_closed_tickets);
 
+    // Get Resolved Ticket Count
+    $sql_resolved_tickets = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_project_id = $project_id AND ticket_resolved_at IS NOT NULL");
+
+    $resolved_ticket_count = mysqli_num_rows($sql_resolved_tickets);
+
     $tickets_closed_percent = 100; //Default
     if ($ticket_count) {
         $tickets_closed_percent = round(($closed_ticket_count / $ticket_count) * 100);
     }
 
+    $tickets_resolved_percent = 100; //Default
+    if ($ticket_count) {
+        $tickets_resolved_percent = round(($resolved_ticket_count / $ticket_count) * 100);
+    }
+
     // Get All Tasks
     $sql_tasks = mysqli_query($mysqli,
         "SELECT * FROM tickets, tasks
@@ -214,7 +223,7 @@
                             </div>
                         </div>
                     <?php } ?>
-                    <?php if ($tickets_closed_percent == 100 && empty($project_completed_at)) { ?>
+                    <?php if (($tickets_closed_percent == 100 || $tickets_resolved_percent == 100) && empty($project_completed_at)) { ?>
                         <a class="btn btn-dark btn-sm confirm-link" href="post.php?close_project=<?php echo $project_id; ?>">
                             <i class="fas fa-fw fa-check mr-2"></i>Close
                         </a>

ticket.php

@@ -179,9 +179,7 @@
             $row = mysqli_fetch_array($sql_project_manager);
             $project_manager_name = nullable_htmlentities($row['user_name']);
         }
-
-      
-
+        
         if ($contact_id) {
             //Get Contact Ticket Stats
             $ticket_related_open = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_related_open FROM tickets WHERE ticket_status != 'Closed' AND ticket_contact_id = $contact_id ");