AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-17 03:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update report to not have modal. Too many steps for UI.

Browse Source
This commit is contained in:
o-psi
2024-01-10 22:06:19 +00:00
parent c7c6b08a11
commit 77d115d1f2
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
report_tickets_unbilled.php
View File

@@ -80,7 +80,6 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
<th class="text-right">Tickets Raised</th> <th class="text-right">Tickets Raised</th>
<th class="text-right">Billable Tickets</th> <th class="text-right">Billable Tickets</th>
<th class="text-right">Unbilled Tickets</th> <th class="text-right">Unbilled Tickets</th>
<th class="text-right">Invoice Tickets</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -124,7 +123,22 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
$ticket_closed_count = intval($row['ticket_closed_count']); $ticket_closed_count = intval($row['ticket_closed_count']);
// Calculate total tickets raised in period that are closed and billable, but not invoiced // Calculate total tickets raised in period that are closed and billable, but not invoiced
$sql_ticket_unbilled_count = mysqli_query($mysqli, "SELECT COUNT(ticket_id) AS ticket_unbilled_count FROM tickets WHERE YEAR(ticket_created_at) = $year AND ticket_client_id = $client_id AND ticket_status = 'Closed' AND ticket_billable = 1 AND ticket_invoice_id IS NULL"); $sql_ticket_unbilled_count = mysqli_query(
$mysqli,
"SELECT
COUNT(ticket_id) AS ticket_unbilled_count
FROM
tickets
WHERE
YEAR(ticket_created_at) = $year
AND
ticket_client_id = $client_id
AND
ticket_status = 'Closed'
AND
ticket_billable = 1
AND
ticket_invoice_id = 0");
$row = mysqli_fetch_array($sql_ticket_unbilled_count); $row = mysqli_fetch_array($sql_ticket_unbilled_count);
$ticket_unbilled_count = intval($row['ticket_unbilled_count']); $ticket_unbilled_count = intval($row['ticket_unbilled_count']);
@@ -136,13 +150,6 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
<td class="text-right"><?php echo $ticket_raised_count; ?></td> <td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $ticket_closed_count; ?></td> <td class="text-right"><?php echo $ticket_closed_count; ?></td>
<td class="text-right"><?php echo $ticket_unbilled_count; ?></td> <td class="text-right"><?php echo $ticket_unbilled_count; ?></td>
<td>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#AddTicketInvoiceModal<?php echo $client_id; ?>">
<i class="fas fa-fw fa-plus mr-2"></i>Invoice Ticket
</button>
</td>
</tr> </tr>
<?php <?php
} }