ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from twetech:Invoice-add-ticket-modal-update

Browse Source 
Improve invoice add ticket modal UI
This commit is contained in:
Andrew Malsbury
2024-01-10 15:31:48 -06:00
committed by GitHub
parent b7894ffd58 8dad54e450
commit ac405e1eec
2 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
invoice.php
+26 -15
View File
@@ -76,26 +76,37 @@ if (isset($_GET['invoice_id'])) {
$sql_payments = mysqli_query($mysqli, "SELECT * FROM payments, accounts WHERE payment_account_id = account_id AND payment_invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); $sql_payments = mysqli_query($mysqli, "SELECT * FROM payments, accounts WHERE payment_account_id = account_id AND payment_invoice_id = $invoice_id ORDER BY payments.payment_id DESC");
$sql_tickets = mysqli_query($mysqli, " $sql_tickets = mysqli_query($mysqli, "
SELECT SELECT
tickets.*, tickets.*,
SEC_TO_TIME(SUM(TIME_TO_SEC(STR_TO_DATE(ticket_reply_time_worked, '%H:%i:%s')))) AS 'total_time_worked' SEC_TO_TIME(SUM(TIME_TO_SEC(STR_TO_DATE(ticket_reply_time_worked, '%H:%i:%s')))) AS 'total_time_worked'
FROM FROM
tickets tickets
LEFT JOIN LEFT JOIN
ticket_replies ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id ticket_replies ON tickets.ticket_id = ticket_replies.ticket_reply_ticket_id
WHERE WHERE
ticket_invoice_id = $invoice_id ticket_invoice_id = $invoice_id
GROUP BY GROUP BY
tickets.ticket_id tickets.ticket_id
ORDER BY ORDER BY
ticket_id DESC ticket_id DESC
"); ");
//Get billable, and unbilled tickets to add to invoice //Get billable, and unbilled tickets to add to invoice
$sql_tickets_billable = mysqli_query($mysqli, "SELECT * FROM tickets WHERE ticket_client_id = $client_id AND ticket_billable = 1 AND ticket_invoice_id = 0;"); $sql_tickets_billable = mysqli_query(
$mysqli, "
SELECT
*
FROM
tickets
WHERE
ticket_client_id = $client_id
AND
ticket_billable = 1
AND
ticket_invoice_id = 0
AND
ticket_status LIKE '%close%';
");
//Add up all the payments for the invoice and get the total amount paid to the invoice //Add up all the payments for the invoice and get the total amount paid to the invoice
invoice_add_ticket_modal.php
+44 -19
View File
@@ -8,25 +8,50 @@
<span>&times;</span> <span>&times;</span>
</button> </button>
</div> </div>
<div class="modal->body bg-white"> <div class="modal-body bg-white">
<table class="table"> <div class="table-responsive">
<tr> <table class="table table-striped">
<th>Ticket Number</th> <thead>
<th>Scope</th> <tr>
<th></th> <th>Ticket Number</th>
</tr> <th>Scope</th>
<?php while ($row = mysqli_fetch_array($sql_tickets_billable)) { <th>Add to Invoice</th>
$ticket_id = intval($row['ticket_id']); </tr>
$ticket_subject = nullable_htmlentities($row['ticket_subject']); </thead>
?> <?php while ($row = mysqli_fetch_array($sql_tickets_billable)) {
<tr> $ticket_id = intval($row['ticket_id']);
<td><?php echo $ticket_id?></td> $ticket_subject = nullable_htmlentities($row['ticket_subject']);
<td><?php echo $ticket_subject ?></td> $ticket_number = intval($row['ticket_number']);
<td></td> $ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
<td><a href='ticket.php?ticket_id=<?php echo $ticket_id?>&invoice_id=<?php echo $invoice_id?>#addInvoiceFromTicketModal'>Add</a></td> $ticket_status = nullable_htmlentities($row['ticket_status']);
</tr>
<?php } ?> switch ($ticket_status) {
</table> case 'Closed':
$ticket_status_class = 'badge-dark';
break;
case 'Auto Close':
$ticket_status_class = 'badge-warning';
break;
default:
$ticket_status_class = 'badge-secondary';
break;
}
?>
<tr>
<td>
<a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>">
<span class="badge badge-pill <?php echo $ticket_status_class?> p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span>
</a>
</td>
<td><?php echo $ticket_subject ?></td>
<td><a href='ticket.php?ticket_id=<?php echo $ticket_id?>&invoice_id=<?php echo $invoice_id?>#addInvoiceFromTicketModal'>
<i class="fas fa-fw fa-plus-circle"></i></td>
</tr>
<?php } ?>
</table>
</div>
</div> </div>
</div> </div>
</div> </div>