Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ticket updates - Default to internal update if contact is agent #733

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Ticket updates - Default to internal update if contact is agent #733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69eef82
Ticket update behaviour - Default to internal update when contact ema…
wrongecho Oct 7, 2023
edf6e18
Merge branch 'master' into ticket-update-type-email-match
johnnyq Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ticket.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,14 @@
</div>
</div>

<?php if(!empty($contact_email)){ ?>

<div class="col-md-2">
<div class="form-group">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="ticket_reply_type_checkbox" name="public_reply_type" value="1" checked>
<label class="custom-control-label" for="ticket_reply_type_checkbox">Email contact<br><small class="text-secondary">(Public Update)</small></label>
</div>
<?php if(!empty($contact_email && $contact_email !== $session_email)){ ?>

<div class="col-md-2">
<div class="form-group">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="ticket_reply_type_checkbox" name="public_reply_type" value="1" checked>
<label class="custom-control-label" for="ticket_reply_type_checkbox">Email contact<br><small class="text-secondary">(Public Update)</small></label>
</div>
</div>

Expand Down Expand Up @@ -538,14 +538,9 @@
</div>
<div class="mt-1">
<i class="fa fa-fw fa-hourglass-start text-secondary ml-1 mr-2"></i><strong>Status:</strong>
<?php if ($prev_ticket_status == 'Open') { ?>
<span class="text-danger"><?php echo $prev_ticket_status; ?></span>
<?php } else { ?>
<span class="text-success"><?php echo $prev_ticket_status; ?></span>
<?php } ?>
</div>

<?php } ?> <!-- End previous ticket IF statement -->
<span class="text-success"><?php echo $prev_ticket_status; ?></span>
<?php } ?>
</div>

<?php } else { ?>
<div>
Expand Down Expand Up @@ -596,7 +591,8 @@
$sql_closed_by = mysqli_query($mysqli, "SELECT * FROM tickets, users WHERE ticket_closed_by = user_id");
$row = mysqli_fetch_array($sql_closed_by);
$ticket_closed_by_display = nullable_htmlentities($row['user_name']);
?>
?>


<div class="mt-1">
<i class="fa fa-fw fa-user text-secondary ml-1 mr-2"></i>Closed by: <?php echo ucwords($ticket_closed_by_display); ?>
Expand Down
Loading