AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-22 05:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't show Checkbox columns when ticket is closed, compact ticket list now matches round pills for status and priority

Browse Source
This commit is contained in:
johnnyq
2025-05-28 17:02:50 -04:00
parent 8631c06731
commit eb5d59623b
4 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -18,11 +18,17 @@ This file documents all notable changes made to ITFlow.
- Bump TCPDF from 6.8.2 to 6.9.4. - Bump TCPDF from 6.8.2 to 6.9.4.
- Bump tinyMCE from 7.7.1 to 7.9.0. - Bump tinyMCE from 7.7.1 to 7.9.0.
- Bump phpMailer from 6.9.2 to 6.10.0. - Bump phpMailer from 6.9.2 to 6.10.0.
- Bump stripe-php from 16.4.0 to 17.2.1.
- Client Portal Add Recurrung Invoices with option to Enable or Disable Auto Pay per recurring Invoice if Stripe is enabled and Client has a payment method. Also when removing saved auto payment methods delete all recurring payments for that client that are Stripe method also added this to the admin settings. - Client Portal Add Recurrung Invoices with option to Enable or Disable Auto Pay per recurring Invoice if Stripe is enabled and Client has a payment method. Also when removing saved auto payment methods delete all recurring payments for that client that are Stripe method also added this to the admin settings.
- Limit Stripe to just cards.
- Added Card Details and Payment added to Client Stripe.
- UI / UX updates to guest pay Make use of cards.
### Fixed ### Fixed
- Option SMTP Encrytption None now works as intended. - Option SMTP Encrytption None now works as intended.
- Debug: Table Row counts were not very accurate as they were relying on show table status and not actual row counts.
- Show archived categories properly.
## [25.03.6] ## [25.03.6]

2
includes/get_settings.php
View File

@@ -121,6 +121,8 @@ $config_log_retention = intval($row['config_log_retention']);
// Locale // Locale
$config_currency_format = "US_en"; $config_currency_format = "US_en";
$config_timezone = $row['config_timezone']; $config_timezone = $row['config_timezone'];
$config_date_format = "Y-m-d";
$config_time_format = "H:i";
// Theme // Theme
$config_theme = $row['config_theme']; $config_theme = $row['config_theme'];

28
tickets_compact.php
View File

@@ -7,12 +7,13 @@
<table class="table table-striped table-borderless table-hover"> <table class="table table-striped table-borderless table-hover">
<thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?>"> <thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
<tr> <tr>
<?php if ($_GET['status'] !== 'Closed') { ?>
<td> <td>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onKeyPress="checkAll(this)"> <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onKeyPress="checkAll(this)">
</div> </div>
</td> </td>
<?php } ?>
<th scope="col"> <th scope="col">
<a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>"> <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">
Ticket <?php if ($sort == 'ticket_subject') { echo $order_icon; } ?> Ticket <?php if ($sort == 'ticket_subject') { echo $order_icon; } ?>
@@ -164,23 +165,19 @@
?> ?>
<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-warning1"; } ?>"> <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"; } ?>">
<!-- Ticket Bulk Select (for open tickets) --> <!-- Ticket Bulk Select (for open tickets) -->
<?php if (empty($ticket_closed_at)) { ?>
<td> <td>
<?php if (empty($ticket_closed_at)) { ?> <div class="form-check">
<div class="form-check"> <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
<input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>"> </div>
</div>
<?php } ?>
</td> </td>
<?php } ?>
<!-- Ticket Subject --> <!-- Ticket Subject -->
<td> <td>
<div class="mt-1"> <div class="mt-1">
<a href="#" <a href="#"
<?php if (empty($ticket_closed_at)) { ?> <?php if (empty($ticket_closed_at)) { ?>
@@ -189,7 +186,7 @@
data-ajax-id = "<?php echo $ticket_id; ?>" data-ajax-id = "<?php echo $ticket_id; ?>"
<?php } ?> <?php } ?>
> >
<span class='badge badge-<?php echo $ticket_priority_color; ?>'> <span class='badge badge-pill badge-<?php echo $ticket_priority_color; ?>'>
<?php echo $ticket_priority; ?> <?php echo $ticket_priority; ?>
</span> </span>
</a> </a>
@@ -200,7 +197,6 @@
<?php } ?> <?php } ?>
</div> </div>
<a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>"> <a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>">
<?php <?php
if (empty($ticket_closed_at) && $ticket_reply_type == "Client") { if (empty($ticket_closed_at) && $ticket_reply_type == "Client") {
@@ -209,8 +205,6 @@
echo $ticket_subject; echo $ticket_subject;
} ?> } ?>
</a> </a>
<?php if($task_count && $completed_task_count > 0) { ?> <?php if($task_count && $completed_task_count > 0) { ?>
<div class="progress mt-2" style="height: 15px; font-size: 11px; width: 150px;"> <div class="progress mt-2" style="height: 15px; font-size: 11px; width: 150px;">
@@ -257,7 +251,7 @@
<!-- Ticket Status --> <!-- Ticket Status -->
<td> <td>
<span class='badge text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span> <span class='badge badge-pill text-light p-2' style="background-color: <?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span>
<?php if (isset ($ticket_scheduled_for)) { echo "<div class=\"mt-1\"> <small class='text-secondary'> $ticket_scheduled_for </small></div>"; } ?> <?php if (isset ($ticket_scheduled_for)) { echo "<div class=\"mt-1\"> <small class='text-secondary'> $ticket_scheduled_for </small></div>"; } ?>
</td> </td>
@@ -270,7 +264,7 @@
data-ajax-id = "<?php echo $ticket_id; ?>" data-ajax-id = "<?php echo $ticket_id; ?>"
<?php } ?> <?php } ?>
> >
<?php echo $ticket_assigned_to_display; ?> <?php echo $ticket_assigned_to_display; ?>
</a> </a>
</td> </td>

19
tickets_list.php
View File

@@ -7,11 +7,13 @@
<table class="table table-striped table-borderless table-hover"> <table class="table table-striped table-borderless table-hover">
<thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?>"> <thead class="text-dark <?php if (!$num_rows[0]) { echo "d-none"; } ?>">
<tr> <tr>
<?php if ($_GET['status'] !== 'Closed') { ?>
<td> <td>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)"> <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
</div> </div>
</td> </td>
<?php } ?>
<th> <th>
<a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>"> <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">
Ticket <?php if ($sort == 'ticket_number') { echo $order_icon; } ?> Ticket <?php if ($sort == 'ticket_number') { echo $order_icon; } ?>
@@ -183,14 +185,13 @@
<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"; } ?>"> <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"; } ?>">
<!-- Ticket Bulk Select (for open tickets) --> <!-- Ticket Bulk Select (for open tickets) -->
<?php if (empty($ticket_closed_at)) { ?>
<td> <td>
<?php if (empty($ticket_closed_at)) { ?> <div class="form-check">
<div class="form-check"> <input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>">
<input class="form-check-input bulk-select" type="checkbox" name="ticket_ids[]" value="<?php echo $ticket_id ?>"> </div>
</div>
<?php } ?>
</td> </td>
<?php } ?>
<!-- Ticket Number --> <!-- Ticket Number -->
<td> <td>
<a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>"> <a href="ticket.php?<?php echo $client_url; ?>ticket_id=<?php echo $ticket_id; ?>">
@@ -280,12 +281,14 @@
<div title="<?php echo $ticket_reply_created_at; ?>"> <div title="<?php echo $ticket_reply_created_at; ?>">
<?php echo $ticket_reply_created_at_time_ago; ?> <?php echo $ticket_reply_created_at_time_ago; ?>
</div> </div>
<div><?php echo $ticket_reply_by_display; ?></div> <div class="text-secondary"><?php echo $ticket_reply_by_display; ?></div>
</td> </td>
<!-- Ticket Created At --> <!-- Ticket Created At -->
<td title="<?php echo $ticket_created_at; ?>"> <td>
<?php echo $ticket_created_at_time_ago; ?> <?php echo $ticket_created_at_time_ago; ?>
<br>
<small class="text-secondary"><?php echo date("$config_date_format $config_time_format", strtotime($ticket_created_at)); ?></small>
</td> </td>
</tr> </tr>