← All changes
|
app/Services/Integrations/FluentCRM/FluentCrmInit.php
+5
-5
2.2.0
→
2.5.0
View file →
| @@ -75,9 +75,9 @@ | ||
| 75 | 75 | |
| 76 | 76 | $total = (clone $base)->count(); |
| 77 | 77 | |
| 78 | 78 | $meetings = (clone $base) |
| 79 | - ->with(['slot', 'calendar']) | |
| 79 | + ->with(['slot', 'calendar', 'calendar.metas']) | |
| 80 | 80 | ->orderBy('start_time', 'DESC') |
| 81 | 81 | ->limit($limit) |
| 82 | 82 | ->get(); |
| 83 | 83 | |
| @@ -145,11 +145,11 @@ | ||
| 145 | 145 | $groupRef = $meeting->group_id ?: $meeting->id; |
| 146 | 146 | |
| 147 | 147 | return [ |
| 148 | 148 | 'id' => '#' . $groupRef, |
| 149 | - 'title' => $this->getBookingTitle($meeting, $host), | |
| 150 | - 'status' => $meeting->status, | |
| 151 | - 'meeting_at' => $this->getFormattedTime($meeting), | |
| 149 | + 'title' => esc_html($this->getBookingTitle($meeting, $host)), | |
| 150 | + 'status' => esc_html($meeting->status), | |
| 151 | + 'meeting_at' => esc_html($this->getFormattedTime($meeting)), | |
| 152 | 152 | 'action' => $this->getActionUrl($meeting), |
| 153 | 153 | ]; |
| 154 | 154 | } |
| 155 | 155 | |
| @@ -175,9 +175,9 @@ | ||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | private function getFormattedTime($meeting) |
| 178 | 178 | { |
| 179 | - return DateTimeHelper::convertToTimeZone($meeting->start_time, 'utc', $meeting->calendar->author_timezone, 'j M Y, g:i A'); | |
| 179 | + return DateTimeHelper::convertToTimeZone($meeting->start_time, 'UTC', $meeting->calendar->author_timezone, 'j M Y, g:i A'); | |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | private function getBookingTitle($meeting, $host = null) |
| 183 | 183 | { |