mirror of https://github.com/itflow-org/itflow
Remove old ticket merge code, rename kanban_v2 to to just kanban
This commit is contained in:
johnnyq
parent
747b62d78c
commit
f39e6ccbc9
|
|
@ -40,31 +40,6 @@ if (isset($_GET['certificate_fetch_parse_json_details'])) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Looks up info on the ticket number provided, used to populate the ticket merge modal
|
|
||||||
*/
|
|
||||||
if (isset($_GET['merge_ticket_get_json_details'])) {
|
|
||||||
enforceUserPermission('module_support');
|
|
||||||
|
|
||||||
$merge_into_ticket_number = intval(preg_replace('/[^0-9]/', '', $_GET['merge_into_ticket_number']));
|
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_number, ticket_prefix, ticket_subject, ticket_priority, ticket_status, ticket_status_name, client_name, contact_name FROM tickets
|
|
||||||
LEFT JOIN clients ON ticket_client_id = client_id
|
|
||||||
LEFT JOIN contacts ON ticket_contact_id = contact_id
|
|
||||||
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
|
||||||
WHERE ticket_number = $merge_into_ticket_number");
|
|
||||||
|
|
||||||
if (mysqli_num_rows($sql) == 0) {
|
|
||||||
//Do nothing.
|
|
||||||
echo "No ticket found!";
|
|
||||||
} else {
|
|
||||||
//Return ticket, client and contact details for the given ticket number
|
|
||||||
$response = mysqli_fetch_assoc($sql);
|
|
||||||
|
|
||||||
echo json_encode($response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($_POST['client_set_notes'])) {
|
if (isset($_POST['client_set_notes'])) {
|
||||||
enforceUserPermission('module_client', 2);
|
enforceUserPermission('module_client', 2);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
// Ticket merging
|
|
||||||
|
|
||||||
// Gets details of the ticket we're going to merge this ticket into
|
|
||||||
// Shows the details under the comments box & enables the merge button if the status of the merge into ticket is not closed
|
|
||||||
function merge_into_number_get_details() {
|
|
||||||
|
|
||||||
// Get the ticket number to merge into
|
|
||||||
var merge_into_ticket_number = document.getElementById("merge_into_ticket_number").value;
|
|
||||||
|
|
||||||
// Reset the form
|
|
||||||
document.getElementById("merge_ticket_btn").disabled = true;
|
|
||||||
document.getElementById("merge_into_details_div").hidden = true;
|
|
||||||
|
|
||||||
// Send a GET request to post.php as post.php?merge_ticket_get_json_details=true&merge_into_ticket_number=NUMBER
|
|
||||||
jQuery.get(
|
|
||||||
"ajax.php",
|
|
||||||
{merge_ticket_get_json_details: 'true', merge_into_ticket_number: merge_into_ticket_number},
|
|
||||||
function(data){
|
|
||||||
// If we get a response from post.php, parse it as JSON
|
|
||||||
const merge_into_ticket_info = JSON.parse(data);
|
|
||||||
|
|
||||||
// Check that the current ticket ID isn't also the new/merge ticket ID
|
|
||||||
if(parseInt(merge_into_ticket_info.ticket_id) !== parseInt(document.getElementById("current_ticket_id").value)){
|
|
||||||
|
|
||||||
// Show the div with the parent ("master") ticket details, populate
|
|
||||||
document.getElementById("merge_into_details_div").hidden = false;
|
|
||||||
document.getElementById("merge_into_details_number").innerText = "Parent ticket details: " + merge_into_ticket_info.ticket_prefix + merge_into_ticket_info.ticket_number;
|
|
||||||
document.getElementById("merge_into_details_client").innerText = "Client Contact: " + merge_into_ticket_info.client_name + " / " + merge_into_ticket_info.contact_name;
|
|
||||||
document.getElementById("merge_into_details_subject").innerText = "Subject: " + merge_into_ticket_info.ticket_subject;
|
|
||||||
document.getElementById("merge_into_details_priority").innerText = "Priority: " + merge_into_ticket_info.ticket_priority;
|
|
||||||
document.getElementById("merge_into_details_status").innerText = "Status: " + merge_into_ticket_info.ticket_status_name;
|
|
||||||
|
|
||||||
// Enable the merge button if the merge into ticket isn't in a closed state
|
|
||||||
if(merge_into_ticket_info.ticket_status_name.toLowerCase() != "closed"){
|
|
||||||
document.getElementById("merge_ticket_btn").disabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -6,6 +6,20 @@ $ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []);
|
||||||
|
|
||||||
$count = count($ticket_ids);
|
$count = count($ticket_ids);
|
||||||
|
|
||||||
|
$whereNotIn = '';
|
||||||
|
if (!empty($ticket_ids)) {
|
||||||
|
$ids = implode(',', $ticket_ids);
|
||||||
|
$whereNotIn = "AND ticket_id NOT IN ($ids)";
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
|
||||||
|
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
||||||
|
LEFT JOIN clients ON client_id = ticket_client_id
|
||||||
|
WHERE ticket_closed_at IS NULL
|
||||||
|
$whereNotIn
|
||||||
|
ORDER BY ticket_status ASC, ticket_id DESC"
|
||||||
|
);
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
@ -23,21 +37,32 @@ ob_start();
|
||||||
<input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
|
<input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
|
|
||||||
|
<div class="alert alert-dark">
|
||||||
|
Selected tickets will be closed once merging is complete.
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Ticket number to merge tickets into <strong class="text-danger">*</strong></label>
|
<label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-prepend">
|
<div class="input-group-prepend">
|
||||||
<?php
|
<span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
|
||||||
// Show the ticket prefix, or just the tag icon
|
|
||||||
if (empty($ticket_prefix)) {
|
|
||||||
echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
|
|
||||||
} else {
|
|
||||||
echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</div>
|
</div>
|
||||||
<input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" onfocusout="merge_into_number_get_details()">
|
<select class="form-control select2" name="merge_into_ticket_number" required>
|
||||||
<!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
|
<option value=''>- Select a Ticket -</option>
|
||||||
|
<?php
|
||||||
|
while ($row = mysqli_fetch_assoc($sql_merge)) {
|
||||||
|
$ticket_id_merge = intval($row['ticket_id']);
|
||||||
|
$ticket_prefix_merge = nullable_htmlentities($row['ticket_prefix']);
|
||||||
|
$ticket_number_merge = intval($row['ticket_number']);
|
||||||
|
$ticket_status_name_merge = nullable_htmlentities($row['ticket_status_name']);
|
||||||
|
$client_name_merge = nullable_htmlentities($row['client_name']);
|
||||||
|
$ticket_subject_merge = nullable_htmlentities($row['ticket_subject']);
|
||||||
|
?>
|
||||||
|
<option value="<?= $ticket_id_merge ?>">
|
||||||
|
<?= "$ticket_prefix_merge$ticket_number_merge ($ticket_status_name_merge) $client_name_merge - $ticket_subject_merge" ?>
|
||||||
|
</option>
|
||||||
|
<?php } ?>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -51,29 +76,11 @@ ob_start();
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="alert alert-dark" role="alert">
|
|
||||||
<i>Selected tickets will be closed once merging is complete.</i>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
<div class="form-group" id="merge_into_details_div" hidden>
|
|
||||||
<h5 id="merge_into_details_number"></h5>
|
|
||||||
<p id="merge_into_details_client"></p>
|
|
||||||
<p id="merge_into_details_subject"></p>
|
|
||||||
<p id="merge_into_details_priority"></p>
|
|
||||||
<p id="merge_into_details_status"></p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="submit" id="merge_ticket_btn" name="bulk_merge_tickets" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
|
<button type="submit" name="bulk_merge_tickets" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Merge</button>
|
||||||
<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-->
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<!-- Ticket merge JS -->
|
|
||||||
<script src="/agent/js/ticket_merge.js"></script>
|
|
||||||
|
|
||||||
<?php require_once '../../../includes/modal_footer.php';
|
<?php require_once '../../../includes/modal_footer.php';
|
||||||
|
|
|
||||||
|
|
@ -1,86 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
require_once '../../../includes/modal_header.php';
|
|
||||||
|
|
||||||
$ticket_ids = array_map('intval', $_GET['ticket_ids'] ?? []);
|
|
||||||
|
|
||||||
$count = count($ticket_ids);
|
|
||||||
|
|
||||||
$whereNotIn = '';
|
|
||||||
if (!empty($ticket_ids)) {
|
|
||||||
$ids = implode(',', $ticket_ids);
|
|
||||||
$whereNotIn = "AND ticket_id NOT IN ($ids)";
|
|
||||||
}
|
|
||||||
|
|
||||||
$sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
|
|
||||||
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
|
||||||
LEFT JOIN clients ON client_id = ticket_client_id
|
|
||||||
WHERE ticket_closed_at IS NULL
|
|
||||||
$whereNotIn
|
|
||||||
ORDER BY ticket_status ASC, ticket_id DESC"
|
|
||||||
);
|
|
||||||
|
|
||||||
ob_start();
|
|
||||||
|
|
||||||
?>
|
|
||||||
<div class="modal-header bg-dark">
|
|
||||||
<h5 class="modal-title"><i class="fa fa-fw fa-clone mr-2"></i>Merge & close <strong><?= $count ?></strong> tickets</h5>
|
|
||||||
<button type="button" class="close text-white" data-dismiss="modal">
|
|
||||||
<span>×</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form action="post.php" method="post" autocomplete="off">
|
|
||||||
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
|
|
||||||
<?php foreach ($ticket_ids as $ticket_id) { ?><input type="hidden" name="ticket_ids[]" value="<?= $ticket_id ?>"><?php } ?>
|
|
||||||
<input type="hidden" id="current_ticket_id" value="0"> <!-- Can't currently bulk check this -->
|
|
||||||
<input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
|
|
||||||
<div class="modal-body">
|
|
||||||
|
|
||||||
<div class="alert alert-dark">
|
|
||||||
Selected tickets will be closed once merging is complete.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
|
|
||||||
</div>
|
|
||||||
<select class="form-control select2" name="merge_into_ticket_number" required>
|
|
||||||
<option value=''>- Select a Ticket -</option>
|
|
||||||
<?php
|
|
||||||
while ($row = mysqli_fetch_assoc($sql_merge)) {
|
|
||||||
$ticket_id_merge = intval($row['ticket_id']);
|
|
||||||
$ticket_prefix_merge = nullable_htmlentities($row['ticket_prefix']);
|
|
||||||
$ticket_number_merge = intval($row['ticket_number']);
|
|
||||||
$ticket_status_name_merge = nullable_htmlentities($row['ticket_status_name']);
|
|
||||||
$client_name_merge = nullable_htmlentities($row['client_name']);
|
|
||||||
$ticket_subject_merge = nullable_htmlentities($row['ticket_subject']);
|
|
||||||
?>
|
|
||||||
<option value="<?= $ticket_id_merge ?>">
|
|
||||||
<?= "$ticket_prefix_merge$ticket_number_merge ($ticket_status_name_merge) $client_name_merge - $ticket_subject_merge" ?>
|
|
||||||
</option>
|
|
||||||
<?php } ?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Reason for merge <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="form-control" name="merge_comment" placeholder="Comments">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="submit" name="bulk_merge_tickets" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Merge</button>
|
|
||||||
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<?php require_once '../../../includes/modal_footer.php';
|
|
||||||
|
|
@ -16,6 +16,13 @@ $ticket_number = intval($row['ticket_number']);
|
||||||
$client_id = intval($row['ticket_client_id']);
|
$client_id = intval($row['ticket_client_id']);
|
||||||
$client_name = nullable_htmlentities($row['client_name']);
|
$client_name = nullable_htmlentities($row['client_name']);
|
||||||
|
|
||||||
|
$sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
|
||||||
|
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
||||||
|
LEFT JOIN clients ON client_id = ticket_client_id
|
||||||
|
WHERE ticket_closed_at IS NULL AND ticket_id != $ticket_id
|
||||||
|
ORDER BY ticket_status ASC, ticket_id DESC"
|
||||||
|
);
|
||||||
|
|
||||||
// Generate the HTML form content using output buffering.
|
// Generate the HTML form content using output buffering.
|
||||||
ob_start();
|
ob_start();
|
||||||
|
|
||||||
|
|
@ -30,21 +37,32 @@ ob_start();
|
||||||
<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">
|
||||||
|
|
||||||
|
<div class="alert alert-dark">
|
||||||
|
The current ticket <strong><?= "$ticket_prefix$ticket_number" ?></strong> will be closed once merging is complete.
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
|
<label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<div class="input-group-prepend">
|
<div class="input-group-prepend">
|
||||||
<?php
|
<span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
|
||||||
// Show the ticket prefix, or just the tag icon
|
|
||||||
if (empty($ticket_prefix)) {
|
|
||||||
echo "<span class=\"input-group-text\"><i class=\"fa fa-fw fa-tag\"></i></span>";
|
|
||||||
} else {
|
|
||||||
echo "<div class=\"input-group-text\"> $ticket_prefix </div>";
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</div>
|
</div>
|
||||||
<input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" required onfocusout="merge_into_number_get_details()">
|
<select class="form-control select2" name="merge_into_ticket_number" required>
|
||||||
<!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
|
<option value=''>- Select a Ticket -</option>
|
||||||
|
<?php
|
||||||
|
while ($row = mysqli_fetch_assoc($sql_merge)) {
|
||||||
|
$ticket_id_merge = intval($row['ticket_id']);
|
||||||
|
$ticket_prefix_merge = nullable_htmlentities($row['ticket_prefix']);
|
||||||
|
$ticket_number_merge = intval($row['ticket_number']);
|
||||||
|
$ticket_status_name_merge = nullable_htmlentities($row['ticket_status_name']);
|
||||||
|
$client_name_merge = nullable_htmlentities($row['client_name']);
|
||||||
|
$ticket_subject_merge = nullable_htmlentities($row['ticket_subject']);
|
||||||
|
?>
|
||||||
|
<option value="<?= $ticket_id_merge ?>">
|
||||||
|
<?= "$ticket_prefix_merge$ticket_number_merge ($ticket_status_name_merge) $client_name_merge - $ticket_subject_merge" ?>
|
||||||
|
</option>
|
||||||
|
<?php } ?>
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -60,37 +78,19 @@ ob_start();
|
||||||
|
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<input class="form-check-input" type="checkbox" name="merge_move_replies" value="1" id="checkMoveReplies">
|
<input class="form-check-input" type="checkbox" name="merge_move_replies" value="1">
|
||||||
<label class="form-check-label" for="checkMoveReplies">
|
<label class="form-check-label" for="checkMoveReplies">
|
||||||
Move notes & replies to the new parent ticket
|
Move notes & replies to the new parent ticket
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="alert alert-dark" role="alert">
|
|
||||||
<i>The current ticket will be closed once merging is complete.</i>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
<div class="form-group" id="merge_into_details_div" hidden>
|
|
||||||
<h5 id="merge_into_details_number"></h5>
|
|
||||||
<p id="merge_into_details_client"></p>
|
|
||||||
<p id="merge_into_details_subject"></p>
|
|
||||||
<p id="merge_into_details_priority"></p>
|
|
||||||
<p id="merge_into_details_status"></p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="submit" id="merge_ticket_btn" name="merge_ticket" class="btn btn-primary text-bold" disabled><i class="fa fa-check mr-2"></i>Merge</button>
|
<button type="submit" name="merge_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Merge</button>
|
||||||
<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-->
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<!-- Ticket merge JS -->
|
|
||||||
<script src="/agent/js/ticket_merge.js"></script>
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
require_once '../../../includes/modal_footer.php';
|
require_once '../../../includes/modal_footer.php';
|
||||||
|
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
require_once '../../../includes/modal_header.php';
|
|
||||||
|
|
||||||
$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_assoc($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']);
|
|
||||||
|
|
||||||
$sql_merge = mysqli_query($mysqli, "SELECT * FROM tickets
|
|
||||||
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
|
|
||||||
LEFT JOIN clients ON client_id = ticket_client_id
|
|
||||||
WHERE ticket_closed_at IS NULL AND ticket_id != $ticket_id
|
|
||||||
ORDER BY ticket_status ASC, ticket_id DESC"
|
|
||||||
);
|
|
||||||
|
|
||||||
// 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">
|
|
||||||
<span>×</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<form action="post.php" method="post" autocomplete="off">
|
|
||||||
<input type="hidden" id="current_ticket_id" name="ticket_id" value="<?php echo $ticket_id; ?>">
|
|
||||||
<div class="modal-body">
|
|
||||||
|
|
||||||
<div class="alert alert-dark">
|
|
||||||
The current ticket <strong><?= "$ticket_prefix$ticket_number" ?></strong> will be closed once merging is complete.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Ticket number to merge this ticket into <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
|
|
||||||
</div>
|
|
||||||
<select class="form-control select2" name="merge_into_ticket_number" required>
|
|
||||||
<option value=''>- Select a Ticket -</option>
|
|
||||||
<?php
|
|
||||||
while ($row = mysqli_fetch_assoc($sql_merge)) {
|
|
||||||
$ticket_id_merge = intval($row['ticket_id']);
|
|
||||||
$ticket_prefix_merge = nullable_htmlentities($row['ticket_prefix']);
|
|
||||||
$ticket_number_merge = intval($row['ticket_number']);
|
|
||||||
$ticket_status_name_merge = nullable_htmlentities($row['ticket_status_name']);
|
|
||||||
$client_name_merge = nullable_htmlentities($row['client_name']);
|
|
||||||
$ticket_subject_merge = nullable_htmlentities($row['ticket_subject']);
|
|
||||||
?>
|
|
||||||
<option value="<?= $ticket_id_merge ?>">
|
|
||||||
<?= "$ticket_prefix_merge$ticket_number_merge ($ticket_status_name_merge) $client_name_merge - $ticket_subject_merge" ?>
|
|
||||||
</option>
|
|
||||||
<?php } ?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label>Reason for merge <strong class="text-danger">*</strong></label>
|
|
||||||
<div class="input-group">
|
|
||||||
<div class="input-group-prepend">
|
|
||||||
<span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
|
|
||||||
</div>
|
|
||||||
<input type="text" class="form-control" name="merge_comment" placeholder="Comments" required>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="form-check">
|
|
||||||
<input class="form-check-input" type="checkbox" name="merge_move_replies" value="1">
|
|
||||||
<label class="form-check-label" for="checkMoveReplies">
|
|
||||||
Move notes & replies to the new parent ticket
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="submit" name="merge_ticket" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Merge</button>
|
|
||||||
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fa fa-times mr-2"></i>Cancel</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
require_once '../../../includes/modal_footer.php';
|
|
||||||
|
|
@ -396,8 +396,8 @@ 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 ajax-modal" href="#" data-modal-url="modals/ticket/ticket_merge_v2.php?ticket_id=<?= $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 Ticket
|
||||||
</a>
|
</a>
|
||||||
<?php if (empty($ticket_closed_at) && $client_id) { ?>
|
<?php if (empty($ticket_closed_at) && $client_id) { ?>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
|
|
|
||||||
|
|
@ -241,7 +241,7 @@ $sql_categories_filter = mysqli_query(
|
||||||
<a class="dropdown-item" href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'list']))); ?>">List</a>
|
<a class="dropdown-item" href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'list']))); ?>">List</a>
|
||||||
<?php if ($status !== 'Closed') {?>
|
<?php if ($status !== 'Closed') {?>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'kanbanv2']))); ?>">Kanban</a>
|
<a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'kanban']))); ?>">Kanban</a>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -299,7 +299,7 @@ $sql_categories_filter = mysqli_query(
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-divider"></div>
|
<div class="dropdown-divider"></div>
|
||||||
<a class="dropdown-item ajax-modal" href="#"
|
<a class="dropdown-item ajax-modal" href="#"
|
||||||
data-modal-url="modals/ticket/ticket_bulk_merge_v2.php"
|
data-modal-url="modals/ticket/ticket_bulk_merge.php"
|
||||||
data-bulk="true">
|
data-bulk="true">
|
||||||
<i class="fas fa-fw fa-clone mr-2"></i>Merge
|
<i class="fas fa-fw fa-clone mr-2"></i>Merge
|
||||||
</a>
|
</a>
|
||||||
|
|
@ -416,8 +416,8 @@ $sql_categories_filter = mysqli_query(
|
||||||
if (isset($_GET["view"])) {
|
if (isset($_GET["view"])) {
|
||||||
if ($_GET["view"] == "list") {
|
if ($_GET["view"] == "list") {
|
||||||
require_once "ticket_list.php";
|
require_once "ticket_list.php";
|
||||||
} elseif ($_GET["view"] == "kanbanv2") {
|
} elseif ($_GET["view"] == "kanban") {
|
||||||
require_once "ticket_kanban_v2.php";
|
require_once "ticket_kanban.php";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// here we have to get default view setting
|
// here we have to get default view setting
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue