AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-09 15:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.1.8.2' of https://github.com/twetech/itflow into 0.1.8.2

Browse Source
This commit is contained in:
o-psi
2024-02-09 22:49:52 +00:00
parent 2bf0a2aef8 f0d2f5b02a
commit 5ac03e7086
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
functions.php
View File

@@ -1082,8 +1082,6 @@ function createiCalStr($datetime, $title, $description, $location)
// Todo: add organizer details // Todo: add organizer details
// $event->addNode(new ZCiCalDataNode("ORGANIZER;CN=Organizer Name:MAILTO:organizer@example.com")); // $event->addNode(new ZCiCalDataNode("ORGANIZER;CN=Organizer Name:MAILTO:organizer@example.com"));
// Export the iCal object to a string // Return the iCal string
$ics_feed = $cal_event->export(); return $cal_event->export();
return $ics_feed;
} }

4
post/ticket.php
View File

@@ -751,7 +751,7 @@ if (isset($_POST['bulk_ticket_reply'])) {
// Get Contact Details // Get Contact Details
$sql = mysqli_query( $sql = mysqli_query(
$mysqli, $mysqli,
"SELECT contact_name, contact_email, ticket_created_by, ticket_assigned_to "SELECT contact_name, contact_email, ticket_created_by, ticket_assigned_to
FROM tickets FROM tickets
LEFT JOIN contacts ON ticket_contact_id = contact_id LEFT JOIN contacts ON ticket_contact_id = contact_id
WHERE ticket_id = $ticket_id" WHERE ticket_id = $ticket_id"
@@ -1186,7 +1186,7 @@ if (isset($_POST['add_invoice_from_ticket'])) {
$sql = mysqli_query( $sql = mysqli_query(
$mysqli, $mysqli,
"SELECT * FROM tickets "SELECT * FROM tickets
LEFT JOIN clients ON ticket_client_id = client_id LEFT JOIN clients ON ticket_client_id = client_id
LEFT JOIN contacts ON ticket_contact_id = contact_id LEFT JOIN contacts ON ticket_contact_id = contact_id
LEFT JOIN assets ON ticket_asset_id = asset_id LEFT JOIN assets ON ticket_asset_id = asset_id

2
ticket_edit_schedule_modal.php
View File

@@ -40,4 +40,4 @@
</div> </div>
</div> </div>
</div> </div>