Show customer info when opening new conversation draft - closes #2402

freescout-help-desk · Nov 18, 2023 · 4bb7e22 · 4bb7e22
1 parent c24efff
commit 4bb7e22
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 45 deletions.
diff --git a/app/Http/Controllers/ConversationsController.php b/app/Http/Controllers/ConversationsController.php
@@ -199,6 +199,25 @@ public function view(Request $request, $id)
             }
         }
 
+        $threads = $conversation->threads()->orderBy('created_at', 'desc')->get();
+
+        // Get To for new conversation.
+        $new_conv_to = [];
+        if (empty($threads[0]) || empty($threads[0]->to)) {
+            // Before new conversation To field was stored in $conversation->customer_email.
+            $emails = Conversation::sanitizeEmails($conversation->customer_email);
+            // Get customers info for emails.
+            if (count($emails)) {
+                $new_conv_to = Customer::emailsToCustomers($emails);
+            }
+        } else {
+            $new_conv_to = Customer::emailsToCustomers($threads[0]->getToArray());
+        }
+
+        if (empty($customer) && count($new_conv_to) == 1) {
+            $customer = Customer::getByEmail(array_key_first($new_conv_to));
+        }
+
         // Previous conversations
         $prev_conversations = [];
         if ($customer) {
@@ -282,8 +301,6 @@ public function view(Request $request, $id)
 
         \Eventy::action('conversation.view.start', $conversation, $request);
 
-        $threads = $conversation->threads()->orderBy('created_at', 'desc')->get();
-
         // Mailbox aliases.
         $from_aliases = $conversation->mailbox->getAliases(true, true);
         $from_alias = '';
@@ -324,19 +341,6 @@ public function view(Request $request, $id)
             }
         }
 
-        // Get To for new conversation draft.
-        $new_conv_to = [];
-        if (empty($threads[0]) || empty($threads[0]->to)) {
-            // Before new conversation To field was stored in $conversation->customer_email.
-            $emails = Conversation::sanitizeEmails($conversation->customer_email);
-            // Get customers info for emails.
-            if (count($emails)) {
-                $new_conv_to = Customer::emailsToCustomers($emails);
-            }
-        } else {
-            $new_conv_to = Customer::emailsToCustomers($threads[0]->getToArray());
-        }
-
         return view($template, [
             'conversation'       => $conversation,
             'mailbox'            => $conversation->mailbox,

diff --git a/resources/views/conversations/create.blade.php b/resources/views/conversations/create.blade.php
@@ -45,6 +45,7 @@
             </div>
         </div>
         <div id="conv-layout-customer">
+            @include('conversations/partials/customer_sidebar')
             @action('conversation.new.customer_sidebar', $conversation, $mailbox)
         </div>
         <div id="conv-layout-main" class="conv-new-form">

diff --git a/resources/views/conversations/partials/customer_sidebar.blade.php b/resources/views/conversations/partials/customer_sidebar.blade.php
@@ -0,0 +1,30 @@
+@if (!empty($customer))
+    <div class="conv-customer-header"></div>
+    <div class="conv-customer-block conv-sidebar-block">
+        @include('customers/profile_snippet', ['customer' => $customer, 'main_email' => $conversation->customer_email, 'conversation' => $conversation])
+        <div class="dropdown customer-trigger" data-toggle="tooltip" title="{{ __("Settings") }}">
+            <a href="#" class="dropdown-toggle glyphicon glyphicon-cog" data-toggle="dropdown" ></a>
+            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                <li role="presentation"><a href="{{ route('customers.update', ['id' => $customer->id]) }}" tabindex="-1" role="menuitem">{{ __("Edit Profile") }}</a></li>
+                @if (!$conversation->isChat())
+                    <li role="presentation"><a href="{{ route('conversations.ajax_html', array_merge(['action' =>
+            'change_customer'], \Request::all(), ['conversation_id' => $conversation->id]) ) }}" data-trigger="modal" data-modal-title="{{ __("Change Customer") }}" data-modal-no-footer="true" data-modal-on-show="changeCustomerInit" tabindex="-1" role="menuitem">{{ __("Change Customer") }}</a></li>
+                @endif
+                @if (count($prev_conversations))
+                    <li role="presentation" class="col3-hidden"><a data-toggle="collapse" href=".collapse-conv-prev" tabindex="-1" role="menuitem">{{ __("Previous Conversations") }}</a></li>
+                @endif
+                {{ \Eventy::action('conversation.customer.menu', $customer, $conversation) }}
+                {{-- No need to use this --}}
+                {{ \Eventy::action('customer_profile.menu', $customer, $conversation) }}
+            </ul>
+        </div>
+        {{--<div data-toggle="collapse" href="#collapse-conv-prev" class="customer-hist-trigger">
+            <div class="glyphicon glyphicon-list-alt" data-toggle="tooltip" title="{{ __("Previous Conversations") }}"></div>
+        </div>--}}
+    </div>
+    @action('conversation.before_prev_convs', $customer, $conversation, $mailbox)
+    @if (count($prev_conversations))
+        @include('conversations/partials/prev_convs_short')
+    @endif
+    @action('conversation.after_prev_convs', $customer, $conversation, $mailbox)
+@endif
diff --git a/resources/views/conversations/view.blade.php b/resources/views/conversations/view.blade.php
@@ -287,36 +287,7 @@
         </div>
 
         <div id="conv-layout-customer">
-            @if ($customer)
-                <div class="conv-customer-header"></div>
-                <div class="conv-customer-block conv-sidebar-block">
-                    @include('customers/profile_snippet', ['customer' => $customer, 'main_email' => $conversation->customer_email, 'conversation' => $conversation])
-                    <div class="dropdown customer-trigger" data-toggle="tooltip" title="{{ __("Settings") }}">
-                        <a href="#" class="dropdown-toggle glyphicon glyphicon-cog" data-toggle="dropdown" ></a>
-                        <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                            <li role="presentation"><a href="{{ route('customers.update', ['id' => $customer->id]) }}" tabindex="-1" role="menuitem">{{ __("Edit Profile") }}</a></li>
-                            @if (!$conversation->isChat())
-                                <li role="presentation"><a href="{{ route('conversations.ajax_html', array_merge(['action' =>
-                        'change_customer'], \Request::all(), ['conversation_id' => $conversation->id]) ) }}" data-trigger="modal" data-modal-title="{{ __("Change Customer") }}" data-modal-no-footer="true" data-modal-on-show="changeCustomerInit" tabindex="-1" role="menuitem">{{ __("Change Customer") }}</a></li>
-                            @endif
-                            @if (count($prev_conversations))
-                                <li role="presentation" class="col3-hidden"><a data-toggle="collapse" href=".collapse-conv-prev" tabindex="-1" role="menuitem">{{ __("Previous Conversations") }}</a></li>
-                            @endif
-                            {{ \Eventy::action('conversation.customer.menu', $customer, $conversation) }}
-                            {{-- No need to use this --}}
-                            {{ \Eventy::action('customer_profile.menu', $customer, $conversation) }}
-                        </ul>
-                    </div>
-                    {{--<div data-toggle="collapse" href="#collapse-conv-prev" class="customer-hist-trigger">
-                        <div class="glyphicon glyphicon-list-alt" data-toggle="tooltip" title="{{ __("Previous Conversations") }}"></div>
-                    </div>--}}
-                </div>
-                @action('conversation.before_prev_convs', $customer, $conversation, $mailbox)
-                @if (count($prev_conversations))
-                    @include('conversations/partials/prev_convs_short')
-                @endif
-            @endif
-            @action('conversation.after_prev_convs', $customer, $conversation, $mailbox)
+            @include('conversations/partials/customer_sidebar')
         </div>
         <div id="conv-layout-main">
             @include('conversations/partials/threads')