From b288ec57a324dc10d12f6dd422904ba2cf24b112 Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Wed, 5 Sep 2018 16:35:13 +0530
Subject: [PATCH] Bug fix patches

- Added language translation words in langusge files
- Updated bugsnage API key
- Fixed PHP7.2 issues in organization view and ticket reply reading
---
 app/Http/Controllers/Agent/helpdesk/TicketController.php  | 2 +-
 config/bugsnag.php                                        | 2 +-
 resources/lang/en/lang.php                                | 8 ++++++++
 .../default1/agent/helpdesk/organization/show.blade.php   | 8 ++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 7761ada6b..9a5870c7b 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -904,7 +904,7 @@ class TicketController extends Controller
             $find_number = Tickets::where('ticket_number', '=', $new_subject)->first();
             $thread_body = explode('---Reply above this line---', $body);
             $body = $thread_body[0];
-            if (count($find_number) > 0) {
+            if ($find_number->count() > 0) {
                 $id = $find_number->id;
                 $ticket_number = $find_number->ticket_number;
                 if ($find_number->status > 1) {
diff --git a/config/bugsnag.php b/config/bugsnag.php
index 73263372f..b9ec40cf5 100644
--- a/config/bugsnag.php
+++ b/config/bugsnag.php
@@ -13,7 +13,7 @@ return [
     | which should receive your application's uncaught exceptions.
     |
     */
-    'api_key' => 'd946b1758d755ba6f0095348a4924a63',
+    'api_key' => '280264db78f78f46e37169b2b65bed2d',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 5c842d760..d50dc4636 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -1634,4 +1634,12 @@ return [
     'do-not-refresh'                               => '(Please do not use "Refresh" or "Back" button)',
     'cleaning-in-progress'                         => 'Cleaning in progress, please wait while we are cleaning your database',
     'cleaning-database'                            => 'Cleaning dummy data from database.',
+    'native-name'                                  => 'Native name',
+    'choose'                                       => 'Choose',
+    'going-overdue-today'                          => 'This ticket will become overdue today.',
+    'ticket_has_attachments'                       => 'This ticket contains attachment(s)',
+    'is_overdue'                                   => 'This ticket is marked as overdue',
+    'ticket_has_collaborator'                      => 'This ticket has collaborator(s)',
+    'ticket_created_source'                        => 'This ticket is created via :source',
+    'ticket-has-x-priority'                        => 'This ticket has :priority priority',
 ];
diff --git a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
index bb8f999ec..13eae76e4 100644
--- a/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/organization/show.blade.php
@@ -208,8 +208,8 @@ class="active"
                                         $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
                                         $string = strip_tags($title->title);
                                         // check atatchments
-                                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->first();
-                                        $attach = count($attachments);
+                                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->count();
+                                        $attach = $attachments;
 
                                         if (strlen($string) > 40) {
                                             $stringCut = substr($string, 0, 40);
@@ -449,8 +449,8 @@ class="active"
                                         $title = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->first();
                                         $string = strip_tags($title->title);
                                         // check atatchments
-                                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->first();
-                                        $attach = count($attachments);
+                                        $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $title->id)->count();
+                                        $attach = $attachments;
 
                                         if (strlen($string) > 40) {
                                             $stringCut = substr($string, 0, 40);