AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Billable and non billable status use icons check and minus

This commit is contained in:
johnnyq 2025-12-18 20:38:15 -05:00
parent a277380441
commit a82e2c7ea1
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/recurring_invoices.php
View File

@ -222,7 +222,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</form>
<?php } else { ?>
No Cards on File
<?php } ?>
<?php } ?>
</td>
<td>
<span class="p-2 badge badge-<?php echo $status_badge_color; ?>">

18
agent/recurring_tickets.php
View File

@ -65,7 +65,7 @@ $sql = mysqli_query(
$billable_query
$client_query
ORDER BY
CASE
CASE
WHEN '$sort' = 'recurring_ticket_priority' THEN
CASE recurring_ticket_priority
WHEN 'High' THEN 1
@ -74,7 +74,7 @@ $sql = mysqli_query(
ELSE 4 -- Optional: for unexpected priority values
END
ELSE NULL
END $order,
END $order,
$sort $order -- Apply normal sorting by $sort and $order
LIMIT $record_from, $record_to"
);
@ -152,7 +152,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-sm-2">
<div class="form-group">
<select class="form-control select2" name="billable" onchange="this.form.submit()">
<option value="">- Billable Status -</option>
<option value="">- Billable Status -</option>
<option <?php if ($billable_filter == 1) { echo "selected"; } ?> value="1">Billable</option>
<option <?php if ($billable_filter == 0) { echo "selected"; } ?> value="0">Non-Billable</option>
</select>
@ -170,31 +170,31 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<i class="fas fa-fw fa-paper-plane mr-2"></i>Force Reoccur
</button>
<div class="dropdown-divider"></div>
<a class="dropdown-item ajax-modal" href="#"
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_agent_edit.php"
data-bulk="true">
<i class="fas fa-fw fa-user-check mr-2"></i>Assign Agent
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item ajax-modal" href="#"
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_category_edit.php"
data-bulk="true">
<i class="fas fa-fw fa-layer-group mr-2"></i>Set Category
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item ajax-modal" href="#"
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_priority_edit.php"
data-bulk="true">
<i class="fas fa-fw fa-thermometer-half mr-2"></i>Set Priority
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item ajax-modal" href="#"
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_billable_edit.php"
data-bulk="true">
<i class="fas fa-fw fa-dollar-sign mr-2"></i>Set Billable
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item ajax-modal" href="#"
<a class="dropdown-item ajax-modal" href="#"
data-modal-url="modals/recurring_ticket/recurring_ticket_bulk_next_run_edit.php"
data-bulk="true">
<i class="fas fa-fw fa-calendar-day mr-2"></i>Set Next Run Date
@ -260,7 +260,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
Agent <?php if ($sort == 'user_name') { echo $order_icon; } ?>
</a>
</th>
<?php if (!$client_url) { ?>
<th>
<a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">

18
agent/ticket_list.php
View File

@ -7,7 +7,7 @@
<table class="table table-striped table-borderless table-hover">
<thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?> text-nowrap">
<tr>
<td>
<?php if ($status !== 'Closed') { ?>
<div class="form-check">
@ -26,7 +26,7 @@
Subject <?php if ($sort == 'ticket_subject') { echo $order_icon; } ?>
</a>
</th>
<th>
<?php if (!$client_url) { ?>
<a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
@ -39,8 +39,8 @@
</th>
<?php if ($config_module_enable_accounting && lookupUserPermission("module_sales") >= 2) { ?>
<th class="text-center">
<a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_billable&order=<?php echo $disp; ?>">
Billable <?php if ($sort == 'ticket_billable') { echo $order_icon; } ?>
<a class="text-secondary" href="?<?= $url_query_strings_sort ?>&sort=ticket_billable&order=<?= $disp ?>">
Billable <?php if ($sort == 'recurring_ticket_billable') { echo $order_icon; } ?>
</a>
</th>
<?php } ?>
@ -186,7 +186,7 @@
if($task_count) {
$tasks_completed_percent = round(($completed_task_count / $task_count) * 100);
}
?>
<tr class="<?php if(empty($ticket_closed_at) && empty($ticket_updated_at)) { echo "text-bold"; }?> <?php if (empty($ticket_closed_at) && $ticket_reply_type == "Client") { echo "table-warning"; } ?>">
@ -199,7 +199,7 @@
</div>
<?php } ?>
</td>
<!-- Ticket Number -->
<td>
<a href="ticket.php?ticket_id=<?= "$ticket_id$has_client" ?>">
@ -242,9 +242,9 @@
data-modal-url="modals/ticket/ticket_billable.php?id=<?= $ticket_id ?>">
<?php
if ($ticket_billable == 1) {
echo "<span class='badge badge-pill badge-success p-2'>Yes</span>";
echo "<span class='badge badge-pill badge-success p-2'><i class='fas fa-fw fa-check'></i></span>";
} else {
echo "<span class='badge badge-pill badge-secondary p-2'>No</span>";
echo "<span class='badge badge-pill badge-secondary p-2'><i class='fas fa-fw fa-minus'></i></span>";
}
?>
</a>
@ -303,7 +303,7 @@
<?php
}
?>
</tbody>