From cb5c7115522b2a7e44f9cd23df4b749e52681716 Mon Sep 17 00:00:00 2001
From: andyv4 <andyv4@gmail.com>
Date: Wed, 16 Sep 2020 21:31:09 +0700
Subject: [PATCH] v1.0.100

---
 src/Http/Controllers/ChatController.php       |  4 +---
 src/Http/Controllers/LogoutController.php     |  3 +++
 src/Models/ChatDiscussion.php                 |  2 +-
 .../chat-admin-message-body.blade.php         | 22 +++++++++++++------
 .../chat-admin-online-status.blade.php        | 10 ++++-----
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/Http/Controllers/ChatController.php b/src/Http/Controllers/ChatController.php
index 10939bd..9784ec2 100644
--- a/src/Http/Controllers/ChatController.php
+++ b/src/Http/Controllers/ChatController.php
@@ -152,9 +152,7 @@ public function offline($request){
 
   protected function sendMessage($request){
 
-    $discussion_id = Session::get('chat.id');
-    $discussion = ChatDiscussion::whereId($discussion_id)
-      ->first();
+    $discussion = ChatDiscussion::whereId(Session::get('chat.id'))->first();
 
     if(!$discussion){
 
diff --git a/src/Http/Controllers/LogoutController.php b/src/Http/Controllers/LogoutController.php
index 8fde820..476d2c9 100644
--- a/src/Http/Controllers/LogoutController.php
+++ b/src/Http/Controllers/LogoutController.php
@@ -5,6 +5,7 @@
 use Andiwijaya\AppCore\Facades\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Cookie;
 
 class LogoutController extends BaseController{
 
@@ -14,6 +15,8 @@ public function index(Request $request){
 
     Auth::logout();
 
+    Cookie::queue('kliknss_ctoken', '', 0);
+
     if($request->ajax())
       return [ 'redirect'=>$this->redirectTo ];
 
diff --git a/src/Models/ChatDiscussion.php b/src/Models/ChatDiscussion.php
index b594a41..52ce432 100644
--- a/src/Models/ChatDiscussion.php
+++ b/src/Models/ChatDiscussion.php
@@ -62,11 +62,11 @@ public function customer(){
   public function getLatestMessagesAttribute(){
 
     return ChatMessage::whereDiscussionId($this->id)
+      ->where('created_at', '>=', Carbon::now()->addHour(-6)->format('Y-m-d H:i:s'))
       ->orderBy('created_at', 'desc')
       ->limit(5)
       ->get()
       ->reverse();
-
   }
 
   public function getLatestMessageAttribute(){
diff --git a/src/views/components/chat-admin-message-body.blade.php b/src/views/components/chat-admin-message-body.blade.php
index e8a066d..095ecfe 100644
--- a/src/views/components/chat-admin-message-body.blade.php
+++ b/src/views/components/chat-admin-message-body.blade.php
@@ -2,15 +2,23 @@
 
   @component('andiwijaya::components.chat-admin-message-items', compact('discussion', 'messages', 'prev_id', 'last_id', 'view_message_item', 'storage'))@endcomponent
 
-  <div class="chat-admin-mobile-header hidden">
-    <div class="col-sm-2">
+  <div class="chat-admin-mobile-header hidden cls">
+    <div class="pc-20">
       <span class="fa fa-chevron-left pad-2" onclick="$('.chat-admin').chatadmin_close()"></span>
     </div>
-    <div class="col-sm-8 align-center"><a href="#"><h5>{{ $discussion->name ?? $discussion->key }}</h5></a></div>
-    <div class="col-sm-2 align-right">
-{{--      <div>--}}
-{{--        <span class="fa fa-ellipsis-h pad-2"></span>--}}
-{{--      </div>--}}
+    <div class="pc-60 align-left">
+      <h5>{{ $discussion->name ?? $discussion->key }}</h5>
+      <div>
+        @if(isset($discussion->extra['phone_number']))
+          <a href="tel:{{ $discussion->extra['phone_number'] }}"><span class="fa fa-mobile-alt"></span> {{ $discussion->extra['phone_number'] }}</a>
+        @endif
+        @if(isset($discussion->extra['whatsapp_number']))
+          <a href="https://wa.me/{{ $discussion->extra['whatsapp_number'] }}"><span class="fab fa-whatsapp"></span> {{ $discussion->extra['whatsapp_number'] }}</a>
+        @endif
+      </div>
+    </div>
+    <div class="pc-20 align-right">
+
     </div>
   </div>
 
diff --git a/src/views/components/chat-admin-online-status.blade.php b/src/views/components/chat-admin-online-status.blade.php
index 5b8f110..6e20dab 100644
--- a/src/views/components/chat-admin-online-status.blade.php
+++ b/src/views/components/chat-admin-online-status.blade.php
@@ -1,13 +1,11 @@
 @if($customer_is_online ?? 0)
-  <span class="fa fa-circle cl-green"></span>
-  <span>Online</span>
   <a href="?action=check-online&discussion_id={{ $discussion->id }}" class="async hmarl-05" data-push-state="0">
-    <span class="fa fa-sync small selectable"></span>
+    <span class="fa fa-circle cl-green"></span>
+    <span class="hidden-sm">Online</span>
   </a>
 @else
-  <span class="fa fa-circle"></span>
-  <span>Offline</span>
   <a href="?action=check-online&discussion_id={{ $discussion->id }}" class="async hmarl-05" data-push-state="0">
-    <span class="fa fa-sync small selectable"></span>
+    <span class="fa fa-circle"></span>
+    <span class="hidden-sm">Offline</span>
   </a>
 @endif
\ No newline at end of file