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

Merge pull request #842 from twetech/ticket-billable-module 

Disable ticket billable options in accounting module
This commit is contained in:
Johnny 2023-12-22 12:33:18 -05:00 committed by GitHub
parent 27b7db63ee eb29f74fab
commit 471e6a9f8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ticket.php
View File

@ -638,7 +638,7 @@ if (isset($_GET['ticket_id'])) {
</div>
<?php } ?>
<?php if (!empty($ticket_billable)) { ?>
<?php if ($config_module_enable_accounting) { ?>
<div class="mt-1">
<i class="fa fa-fw fa-dollar-sign text-secondary ml-1 mr-2"></i>Billable:
<a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
@ -830,7 +830,7 @@ if (isset($_GET['ticket_id'])) {
</form>
<div class="card card-body card-outline card-dark mb-2">
<?php if ($config_module_enable_accounting) { ?>
<?php if ($config_module_enable_accounting && $ticket_billable == 1) { ?>
<a href="#" class="btn btn-info btn-block" href="#" data-toggle="modal" data-target="#addInvoiceFromTicketModal">
<i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice Ticket
</a>
@ -864,10 +864,10 @@ if (isset($_GET['ticket_id'])) {
require_once "ticket_merge_modal.php";
require_once "ticket_invoice_add_modal.php";
require_once "ticket_edit_billable_modal.php";
if ($config_module_enable_accounting) {
require_once "ticket_edit_billable_modal.php";
require_once "ticket_invoice_add_modal.php";
}
}

5
ticket_edit_modal.php
View File

@ -62,6 +62,8 @@
</div>
</div>
<?php if ($config_module_enable_accounting) {
?>
<div class="form-group">
<label>Billable</label>
<div class="input-group">
@ -73,8 +75,9 @@
<option <?php if ($ticket_billable == 0) { echo "selected"; } ?> value="0">No</option>
</select>
</div>
</div>
<?php } ?>
</div>

43
tickets.php
View File

@ -243,30 +243,36 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
} ?>">
<tr>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">Number</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_number&order=<?php echo $disp; ?>">Number</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">Subject</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_subject&order=<?php echo $disp; ?>">Subject</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client / Contact</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">Client / Contact</a>
</th>
<?php if ($config_module_enable_accounting) {
?>
<th class="text-center"><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_billable&order=<?php echo $disp; ?>">Billable</a>
</th>
<?php
}
?>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">Priority</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_billable&order=<?php echo $disp; ?>">Billable</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">Status</a>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">Assigned</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_priority&order=<?php echo $disp; ?>">Priority</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">Last Response</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_status&order=<?php echo $disp; ?>">Status</a>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">Assigned</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_updated_at&order=<?php echo $disp; ?>">Last Response</a>
</th>
<th><a class="text-dark"
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_created_at&order=<?php echo $disp; ?>">Created</a>
href="?<?php echo $url_query_strings_sort; ?>&sort=ticket_created_at&order=<?php echo $disp; ?>">Created</a>
</th>
</tr>
@ -361,6 +367,8 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
<div class="mt-1"><?php echo $contact_display; ?></div>
</td>
<?php if ($config_module_enabled_accounting) {
?>
<td class="text-center">
<a href="#" data-toggle="modal" data-target="#editTicketBillableModal<?php echo $ticket_id; ?>">
<?php
@ -370,6 +378,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
echo "<span class='badge badge-pill badge-secondary'>X</span>";
}
?></td>
<?php
}
?>
<td><a href="#" data-toggle="modal" data-target="#editTicketPriorityModal<?php echo $ticket_id; ?>"><span class='p-2 badge badge-pill badge-<?php echo $ticket_priority_color; ?>'><?php echo $ticket_priority; ?></span></a></td>
<td><span class='p-2 badge badge-pill badge-<?php echo $ticket_status_color; ?>'><?php echo $ticket_status; ?></span></td>
<td><a href="#" data-toggle="modal" data-target="#assignTicketModal<?php echo $ticket_id; ?>"><?php echo $ticket_assigned_to_display; ?></a></td>
@ -390,7 +401,9 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
require "ticket_edit_priority_modal.php";
require "ticket_edit_billable_modal.php";
if ($config_module_enable_accounting) {
require "ticket_edit_billable_modal.php";
}
}