Merge pull request #266 from ZsgsDesign/dev

0.3.2 Meyeri patch 1
ZsgsDesign · Aug 20, 2019 · 0af5047 · 0af5047
2 parents beb6dda + 280406b
commit 0af5047
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/Http/Controllers/Ajax/GroupManageController.php b/app/Http/Controllers/Ajax/GroupManageController.php
@@ -253,13 +253,13 @@ public function inviteMember(Request $request)
         $groupModel->inviteMember($all_data["gid"], $all_data["email"]);
         $basic = $groupModel->basic($all_data['gid']);
         $url = route('group.detail',['gcode' => $basic['gcode']]);
-        $receiver_id = UserModel::where('email',$all_data['email'])->first()['id'];
+        $receiverInfo = UserModel::where('email',$all_data['email'])->first();
         $sender_name = Auth::user()->name;
         sendMessage([
-            'receiver' => $receiver_id,
+            'receiver' => $receiverInfo["id"],
             'sender' => Auth::user()->id,
-            'title' => 'A group invitation.',
-            'content' => "{$sender_name} has just invited you to join the group **[{$basic['name']}]({$url})**."
+            'title' => "{$sender_name} invites you to group {$basic['name']}",
+            'content' => "Hi, Dear **{$receiverInfo['name']}**,\n\n  **{$sender_name}** has just invited you to join the group **[{$basic['name']}]({$url})**. Take a look and meet other fascinating people right now!\n\nSincerely, NOJ"
         ]);
         return ResponseModel::success(200);
     }

diff --git a/resources/views/message/detail.blade.php b/resources/views/message/detail.blade.php
@@ -35,7 +35,7 @@
         max-width: calc(100% - 4rem);
     }
 
-    h5.title  {
+    h5.msg-title  {
         font-weight: bold;
         font-family: 'Roboto Slab';
         margin-bottom: 1rem;
@@ -56,7 +56,7 @@
 </style>
 <div class="container mundb-standard-container">
     <paper-card>
-        <h5 class="title"><a class="btn btn-default" href="/message" role="button"><i class="MDI arrow-left"></i></a> {{$message["title"]}}</h5>
+        <h5 class="msg-title"><a class="btn btn-default" href="/message" role="button"><i class="MDI arrow-left"></i></a> {{$message["title"]}}</h5>
         <div class="sender">
             <div class="pr-3"><img src="{{$message['sender_avatar']}}" class="cm-avatar"></div>
             <div>