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

stage #1

Merged
ThaMunsta merged 351 commits from stage into main 2025-11-10 14:37:21 +00:00
Conversation 1 Commits 351 Files Changed 2998
+156 -164
3 changed files with 156 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 874d9ddbc3 - Show all commits
guest/guest_pay_invoice_stripe.php
+1 -1
View File
@@ -76,7 +76,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
<!-- Stripe & jQuery -->
<script src="https://js.stripe.com/v3/"></script>
<script src="plugins/jquery/jquery.min.js"></script>
<script src="../plugins/jquery/jquery.min.js"></script>
<div class="row pt-5">
<div class="col-sm">
includes/footer.php
+1 -1
View File
@@ -1,5 +1,5 @@
<?php
require_once "../includes/inc_confirm_modal.php";
require_once "inc_confirm_modal.php";
?>
<?php
user/ticket.php
+25 -33
View File
@@ -374,9 +374,7 @@ if (isset($_GET['ticket_id'])) {
</ol>
<div class="card">
<div class="card-header">
<div class="card-title">
<i class="fa fa-2x fa-fw fa fa-life-ring text-secondary mr-2"></i>
<span class="h3">
@@ -391,12 +389,6 @@ if (isset($_GET['ticket_id'])) {
<div class="card-tools d-print-none">
<div class="btn-toolbar">
<?php if ($config_ai_enable == 1) { ?>
<button class="btn btn-info btn-sm ml-3" data-toggle="modal" data-target="#summaryModal">
<i class="fas fa-fw fa-lightbulb mr-2"></i>Summary
</button>
<?php } ?>
<?php if ($config_module_enable_accounting && $ticket_billable == 1 && empty($invoice_id) && lookupUserPermission("module_sales") >= 2) { ?>
<a href="#" class="btn btn-light btn-sm ml-3" href="#" data-toggle="modal" data-target="#addInvoiceFromTicketModal">
<i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice
@@ -436,6 +428,11 @@ if (isset($_GET['ticket_id'])) {
>
<i class="fas fa-fw fa-edit mr-2"></i>Edit
</a>
<?php if ($config_ai_enable == 1) { ?>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#summaryModal">
<i class="fas fa-fw fa-lightbulb mr-2"></i>Summarize
</a>
<?php } ?>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#mergeTicketModal<?php echo $ticket_id; ?>">
<i class="fas fa-fw fa-clone mr-2"></i>Merge
</a>
@@ -477,12 +474,14 @@ if (isset($_GET['ticket_id'])) {
<?php } ?>
</div> <!-- Card Header -->
</div> <!-- End Card -->
<div class="card-group mb-3">
<div class="card card-body px-3 py-2">
<div class="card-body pt-3 pb-0">
<div class="row">
<div class="col-sm-4">
<h5><?php echo $client_name; ?></h5>
<div class="mt-1" title="<?php echo $ticket_updated_at; ?>">
<div title="<?php echo $ticket_updated_at; ?>">
<i class="fa fa-fw fa-history text-secondary mr-2"></i>Updated: <strong><?php echo $ticket_updated_at_ago; ?></strong>
</div>
@@ -502,12 +501,11 @@ if (isset($_GET['ticket_id'])) {
</div>
<?php } ?>
<!-- End ticket assign -->
</div>
<div class="col-sm-4">
<div class="card card-body px-3 py-2">
<div>
<i class="fa fa-fw fa-thermometer-half text-secondary mr-2"></i>
<i class="fa fa-fw fa-thermometer-half text-secondary mr-1"></i>
<a href="#"
<?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_closed_at)) { ?>
data-toggle = "ajax-modal"
@@ -564,7 +562,7 @@ if (isset($_GET['ticket_id'])) {
</div>
<div class="col-sm-4">
<div class="card card-body px-3 py-2">
<?php if ($task_count) { ?>
Tasks Completed
<span class="float-right text-bold"><?php echo $tasks_completed_percent; ?>%</span>
@@ -578,10 +576,6 @@ if (isset($_GET['ticket_id'])) {
</div>
</div>
</div>
<br>
</div>
</div>
<div class="row">
@@ -590,15 +584,9 @@ if (isset($_GET['ticket_id'])) {
<div class="card card-dark mb-3">
<div class="card-header">
<div class="card-header bg-dark">
<h3 class="card-title">
Ticket Details
</h3>
</div>
<div class="card-header bg-light">
<h3 class="card-title">
<span class="text-muted">Subject:</span> <span><?php echo $ticket_subject; ?></span>
<span>Subject:</span> <span><?php echo $ticket_subject; ?></span>
</h3>
</div>
@@ -619,12 +607,14 @@ if (isset($_GET['ticket_id'])) {
<!-- Only show ticket reply modal if status is not closed -->
<?php if (lookupUserPermission("module_support") >= 2 && empty($ticket_resolved_at) && empty($ticket_closed_at)) { ?>
<div class="card card-body d-print-none pb-0">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="ticket_id" id="ticket_id" value="<?php echo $ticket_id; ?>">
<input type="hidden" name="client_id" id="client_id" value="<?php echo $client_id; ?>">
<div class="card card-body d-print-none pb-0">
<div class="form-group">
<div class="btn-group btn-block btn-group-toggle" data-toggle="buttons">
<label class="btn btn-outline-dark active">
@@ -639,6 +629,8 @@ if (isset($_GET['ticket_id'])) {
</div>
</div>
</div>
<div class="form-group">
<textarea
class="form-control tinymceTicket<?php if ($config_ai_enable) { echo "AI"; } ?>" name="ticket_reply"
@@ -647,6 +639,8 @@ if (isset($_GET['ticket_id'])) {
</textarea>
</div>
<div class="card card-body pb-0">
<div class="form-row">
<div class="col-md-3">
<div class="input-group mb-3">
@@ -699,15 +693,13 @@ if (isset($_GET['ticket_id'])) {
</div>
</div>
</div>
</form>
</div>
<!-- End IF for reply modal -->
<?php } ?>
<!-- Ticket Responses -->
<h6>Responses: <?php echo $ticket_all_comments_count; ?></h6>
<!-- Ticket replies -->
<?php