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

Migrate Schedule Ticket and Merge Ticket to ajax modal also spruce up Schedule Inteface and cleanup code

Browse Source
This commit is contained in:
johnnyq
2025-11-04 18:37:43 -05:00
parent 9fcaf9f5cc
commit df6d955261
4 changed files with 162 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agent/modals/ticket/ticket_billable.php
View File

@@ -18,8 +18,7 @@ ob_start();
<div class="modal-header bg-dark"> <div class="modal-header bg-dark">
<h5 class="modal-title"> <h5 class="modal-title">
<i class="fa fa-fw fa-user mr-2"></i> <i class="fa fa-fw fa-money-bill mr-2"></i>Editing Billable Status: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
Edit Billable Status for <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
</h5> </h5>
<button type="button" class="close text-white" data-dismiss="modal"> <button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span> <span>&times;</span>
@@ -29,7 +28,7 @@ ob_start();
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>"> <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
<div class="form-group"> <div class="form-group">
<label>Billable</label> <label>Billable?</label>
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-money-bill"></i></span>

68
agent/modals/ticket/ticket_edit_schedule.php
View File

@@ -1,40 +1,65 @@
<div class="modal" id="editTicketScheduleModal" tabindex="-1"> <?php
<div class="modal-dialog">
<div class="modal-content"> require_once '../../../includes/modal_header.php';
<div class="modal-header bg-dark">
$ticket_id = intval($_GET['ticket_id']);
$sql = mysqli_query($mysqli, "SELECT * FROM tickets
LEFT JOIN clients ON client_id = ticket_client_id
WHERE ticket_id = $ticket_id
LIMIT 1"
);
$row = mysqli_fetch_array($sql);
$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
$ticket_number = intval($row['ticket_number']);
$ticket_scheduled_for = nullable_htmlentities($row['ticket_schedule']);
$ticket_onsite = intval($row['ticket_onsite']);
$client_id = intval($row['ticket_client_id']);
$client_name = nullable_htmlentities($row['client_name']);
// Generate the HTML form content using output buffering.
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"> <h5 class="modal-title">
<i class="fa fa-fw fa-user mr-2"></i> <i class="fa fa-fw fa-calendar-check mr-2"></i>Scheduling Ticket: <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
Edit Scheduled Time for <strong><?php echo "$ticket_prefix$ticket_number"; ?></strong>
</h5> </h5>
<button type="button" class="close text-white" data-dismiss="modal"> <button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span> <span>&times;</span>
</button> </button>
</div> </div>
<form action="post.php" method="post" autocomplete="off"> <form action="post.php" method="post" autocomplete="off">
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>"> <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
<div class="form-group"> <div class="form-group">
<label>Scheduled Date and Time </label> <label>Date / Time</label>
<div class="input-group">
<?php if (!$ticket_scheduled_for) { ?> <div class="input-group-prepend">
<input type="datetime-local" class="form-control" name="scheduled_date_time" placeholder="Scheduled Date & Time" min="<?php echo date('Y-m-d\TH:i'); ?>"> <span class="input-group-text"><i class="fa fa-fw fa-calendar-day"></i></span>
<?php } else { ?>
<input type="datetime-local" class="form-control" name="scheduled_date_time" min="<?php echo date('Y-m-d\TH:i'); ?>" value="<?php echo $ticket_scheduled_for; ?>">
<?php } ?>
</div> </div>
<input type="datetime-local" class="form-control" name="scheduled_date_time" placeholder="Scheduled Date & Time" min="<?php echo date('Y-m-d\TH:i'); ?>" <?php if ($ticket_scheduled_for) { echo "value='$ticket_scheduled_for'"; } ?>>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label>Onsite </label> <label>Onsite?</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<select class="form-control" name="onsite" required> <select class="form-control" name="onsite" required>
<option value="0" <?php if ($ticket_onsite == 0) echo "selected"; ?>>No</option> <option value="0" <?php if ($ticket_onsite == 0) echo "selected"; ?>>No</option>
<option value="1" <?php if ($ticket_onsite == 1) echo "selected"; ?>>Yes</option> <option value="1" <?php if ($ticket_onsite == 1) echo "selected"; ?>>Yes</option>
</select> </select>
</div> </div>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<?php if (!empty($ticket_scheduled_for)) { ?> <?php if ($ticket_scheduled_for) { ?>
<a href="post.php?cancel_ticket_schedule=<?php echo htmlspecialchars($ticket_id); ?>" class="btn btn-danger text-bold"> <a href="post.php?cancel_ticket_schedule=<?php echo htmlspecialchars($ticket_id); ?>" class="btn btn-danger text-bold">
<i class="fa fa-trash mr-2"></i>Cancel Scheduled Time <i class="fa fa-trash mr-2"></i>Cancel Scheduled Time
</a> </a>
@@ -43,8 +68,7 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button> <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
</div> </div>
</form> </form>
</div> <?php
</div> require_once '../../../includes/modal_footer.php';
</div>

43
agent/modals/ticket/ticket_merge.php
View File

@@ -1,13 +1,32 @@
<div class="modal" id="mergeTicketModal<?php echo $ticket_id; ?>" tabindex="-1"> <?php
<div class="modal-dialog modal-md">
<div class="modal-content"> require_once '../../../includes/modal_header.php';
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?php echo "$ticket_prefix$ticket_number"; ?> into another ticket</h5> $ticket_id = intval($_GET['ticket_id']);
$sql = mysqli_query($mysqli, "SELECT * FROM tickets
LEFT JOIN clients ON client_id = ticket_client_id
WHERE ticket_id = $ticket_id
LIMIT 1"
);
$row = mysqli_fetch_array($sql);
$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
$ticket_number = intval($row['ticket_number']);
$client_id = intval($row['ticket_client_id']);
$client_name = nullable_htmlentities($row['client_name']);
// Generate the HTML form content using output buffering.
ob_start();
?>
<div class="modal-header bg-dark">
<h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & Close <?= "$ticket_prefix$ticket_number" ?> into another ticket</h5>
<button type="button" class="close text-white" data-dismiss="modal"> <button type="button" class="close text-white" data-dismiss="modal">
<span>&times;</span> <span>&times;</span>
</button> </button>
</div> </div>
<form action="post.php" method="post" autocomplete="off"> <form action="post.php" method="post" autocomplete="off">
<input type="hidden" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>"> <input type="hidden" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
<div class="modal-body"> <div class="modal-body">
@@ -68,10 +87,10 @@
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button> <button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
<!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function--> <!-- Merge button starts disabled. Is enabled by the merge_into_number_get_details Javascript function-->
</div> </div>
</form> </form>
</div>
</div>
</div>
<!-- Ticket merge JS --> <!-- Ticket merge JS -->
<script src="js/ticket_merge.js"></script> <script src="/agent/js/ticket_merge.js"></script>
<?php
require_once '../../../includes/modal_footer.php';

10
agent/ticket.php
View File

@@ -46,7 +46,7 @@ if (isset($_GET['ticket_id'])) {
if (mysqli_num_rows($sql) == 0) { if (mysqli_num_rows($sql) == 0) {
echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>"; echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
include_once "../includes/footer.php"; require_once "../includes/footer.php";
} else { } else {
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
@@ -419,7 +419,7 @@ if (isset($_GET['ticket_id'])) {
<a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_summary.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg"> <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_summary.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg">
<i class="fas fa-fw fa-lightbulb mr-2"></i>Summarize <i class="fas fa-fw fa-lightbulb mr-2"></i>Summarize
</a> </a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#mergeTicketModal<?php echo $ticket_id; ?>"> <a class="dropdown-item ajax-modal" href="#" data-modal-url="modals/ticket/ticket_merge.php?ticket_id=<?= $ticket_id ?>">
<i class="fas fa-fw fa-clone mr-2"></i>Merge <i class="fas fa-fw fa-clone mr-2"></i>Merge
</a> </a>
<?php if (empty($ticket_closed_at)) { ?> <?php if (empty($ticket_closed_at)) { ?>
@@ -498,7 +498,7 @@ if (isset($_GET['ticket_id'])) {
<!-- Ticket scheduling --> <!-- Ticket scheduling -->
<?php if (empty ($ticket_closed_at)) { ?> <?php if (empty ($ticket_closed_at)) { ?>
<div class="mt-1"> <div class="mt-1">
<i class="fa fa-fw fa-calendar-check text-secondary mr-2"></i>Scheduled: <a href="#" data-toggle="modal" data-target="#editTicketScheduleModal"> <?=$ticket_scheduled_wording ?> </a> <i class="fa fa-fw fa-calendar-check text-secondary mr-2"></i>Scheduled: <a class='ajax-modal' href="#" data-modal-url="modals/ticket/ticket_edit_schedule.php?ticket_id=<?= $ticket_id ?>"> <?=$ticket_scheduled_wording ?> </a>
</div> </div>
<?php } ?> <?php } ?>
<!-- End ticket scheduling --> <!-- End ticket scheduling -->
@@ -1243,10 +1243,6 @@ if (isset($_GET['ticket_id'])) {
</div> <!-- End row --> </div> <!-- End row -->
<?php <?php
if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) {
require_once "modals/ticket/ticket_edit_schedule.php";
require_once "modals/ticket/ticket_merge.php";
}
} }
} }