mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:51:07 +03:30
ticket debug store and show ticket
This commit is contained in:
@@ -41,6 +41,10 @@ class MessageController extends Controller
|
||||
})
|
||||
->paginate(10);
|
||||
|
||||
// foreach ($Users as $User) {
|
||||
// $CountMessages = $User->messagesSent->count() + $User->messagesReceived->count();
|
||||
// $User->message_count = $CountMessages;
|
||||
// }
|
||||
|
||||
return \MessageResponse::data($Users);
|
||||
}
|
||||
@@ -53,26 +57,24 @@ class MessageController extends Controller
|
||||
// if (!auth('api')->user()->can('show', $Message)) {
|
||||
// return \MessageResponse::error(trans('messages.access_denied'));
|
||||
// }
|
||||
// $Message->status = 'Read';
|
||||
// $Message->save();
|
||||
|
||||
$User = User::findOrFail($UserID);
|
||||
// dd($UserID);
|
||||
$SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
|
||||
// $SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
|
||||
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
|
||||
|
||||
// foreach ($ReceivedMessages as $ReceivedMessage) {
|
||||
// $ReceivedMessage->status = 'Read';
|
||||
// // $SendMessage->save();
|
||||
// }
|
||||
$Messages = Message::whereHas('sender_user', function($q) use($User){
|
||||
$q->where('id', $User->id);
|
||||
})->orWhereHas('recipient_user', function($q) use($User){
|
||||
$q->where('id', $User->id);
|
||||
})->get();
|
||||
// $Messages = $SendMessages->merge($ReceivedMessages)->sortby('created_at');
|
||||
$Messages = Message::where(function ($query) use ($UserID)
|
||||
{
|
||||
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID);
|
||||
})->orWhere(function ($query) use ($UserID)
|
||||
{
|
||||
$query->where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id);
|
||||
})->get();
|
||||
|
||||
foreach ($ReceivedMessages as $ReceivedMessage) {
|
||||
$ReceivedMessage->status = 'Read';
|
||||
$ReceivedMessage->save();
|
||||
}
|
||||
|
||||
// $Messages =
|
||||
return \MessageResponse::data($Messages);
|
||||
}
|
||||
public function store(StoreMessageRequest $request)
|
||||
|
||||
@@ -26,8 +26,8 @@ class StoreMessageRequest extends FormRequest
|
||||
case 'POST': {
|
||||
return [
|
||||
'title' => 'nullable',
|
||||
'text' => 'required',
|
||||
'recipient_user_id' => 'required',
|
||||
'message' => 'required',
|
||||
'user_id' => 'required',
|
||||
];
|
||||
break;
|
||||
}
|
||||
@@ -36,8 +36,8 @@ class StoreMessageRequest extends FormRequest
|
||||
$Message = $this->route('Message');
|
||||
return [
|
||||
'title' => 'nullable',
|
||||
'text' => 'required',
|
||||
'recipient_user_id' => 'required',
|
||||
'message' => 'required',
|
||||
'user_id' => 'required',
|
||||
];
|
||||
break;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ use App\User;
|
||||
use App\Message;␍
|
||||
use Doctrine\Tests\Common\Inflector\InflectorTest;␍
|
||||
␍
|
||||
class Message␍
|
||||
class MessagePolicy␍
|
||||
{␍
|
||||
public function delete(User $User, Message $Message)␍
|
||||
{␍
|
||||
@@ -14,7 +14,11 @@ class Message
|
||||
return true;␍
|
||||
}␍
|
||||
␍
|
||||
␍
|
||||
public function update(User $User, Message $Message)␍
|
||||
{␍
|
||||
// if($User->hasRole('Admin'))␍
|
||||
return true;␍
|
||||
}␍
|
||||
public function store(User $User)␍
|
||||
{␍
|
||||
// if($User->hasRole('Admin'))␍
|
||||
|
||||
Vendored
+66982
-1
File diff suppressed because one or more lines are too long
@@ -48,6 +48,7 @@ export default {
|
||||
const result = await ApiService.get(urls.userSearch(val));
|
||||
if (result && result.data.data) {
|
||||
this.items = result.data.data;
|
||||
this.user_id = this.data.data.id;
|
||||
this.loading = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,13 +8,16 @@
|
||||
class="mx-2 my-3"
|
||||
v-for="item in items"
|
||||
:key="item.id"
|
||||
:style="(item.sender_user_id == user_id) ? '' : 'float:right' "
|
||||
|
||||
>
|
||||
<span
|
||||
v-if="item.sender_user_id == user_id"
|
||||
class="Chat White"
|
||||
>{{ item.text }}</span>
|
||||
<span v-else class="Chat Cyan">{{ item.text }}</span>
|
||||
<div class="Chat White" v-if="item.sender_user_id == user_id">
|
||||
<span>{{ item.text }}</span>
|
||||
<span class="caption"></span>
|
||||
</div>
|
||||
<div class="Chat Cyan" style="float:right" v-else>
|
||||
<span >{{ item.text }}</span>
|
||||
<span class="caption"></span>
|
||||
</div>
|
||||
</div>
|
||||
</v-flex>
|
||||
</v-layout>
|
||||
@@ -58,6 +61,8 @@ export default {
|
||||
padding: 10px 15px;
|
||||
color: white;
|
||||
border-radius: 10px;
|
||||
width: fit-content;
|
||||
display: block;
|
||||
}
|
||||
.Chat.Cyan {
|
||||
background: cornflowerblue;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
import { ApiService } from "@/services";
|
||||
import { urls } from "@/config/urls";
|
||||
import toast from "@/services/global/toast.service";
|
||||
|
||||
import { mapMutations } from "vuex";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
@@ -47,11 +47,10 @@ export default {
|
||||
this.form.user_id = this.userId;
|
||||
},
|
||||
methods: {
|
||||
...mapMutations("modal", ["closeModal"]),
|
||||
async register() {
|
||||
if(this.userId > 0) {
|
||||
const result = await ApiService.post(
|
||||
urls.showMessages(this.userId), this.form
|
||||
);
|
||||
const result = await ApiService.post( urls.storeMessages, this.form );
|
||||
if (result && result.status == 200) {
|
||||
this.closeModal();
|
||||
}
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ Route::middleware('auth:api')->group(function () {
|
||||
Route::post('Users/ChangeStatus/{User}', 'UserController@changeStatus');
|
||||
Route::post('Users/ChangeRole/{User}', 'UserController@changeRole');
|
||||
Route::post('UpdateInfo', 'UserController@updateInfo');
|
||||
Route::get('Users/Search', 'UserController@searchUser');
|
||||
Route::get('users/search', 'UserController@searchUser');
|
||||
Route::resource('Users', 'UserController');
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user