feat: API de reportes, fix distancia espacial y protección OneSignal
- GET/POST /api/contracts/reports y /api/postulations/reports
- GET/POST /api/contracts/reports/{id}/comments con verificación de autoría
- Fix distancia withinDistanceTo: 0.5 grados → 5000 metros (SRID 4326)
- Fix FK Report::finishedcontracts() → contract_id
- Wrap todas las llamadas OneSignal en try/catch para evitar crashes
- Chat UI de comentarios: burbujas por rol, botón veredicto fijo, estilos
- Botón veredicto movido de reports/index a reports/comments
- Ruta POST veredict y restructura reports/{id}/comments en web
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -356,53 +356,34 @@ class ContractController extends Controller
|
||||
|
||||
Postulations::destroy($request->postulation_id);
|
||||
|
||||
//Notify the suppliers that they have been hired
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones contratadas en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: has sido contratado"
|
||||
);
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($supplier->user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('suppplier_hired')
|
||||
// ->language('es_US')
|
||||
// ->body(Messages\Components\Body::create([
|
||||
// Messages\Components\Parameters\Text::create('Proveedor has sido contratado: dirígete a la sección de postulaciones contratadas en JobHero para ver más detalles'),
|
||||
// ])));
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones contratadas en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: has sido contratado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
//Schedule a notification for the suppliers about their appointment
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio en " . $contract->address . " hoy en 30 minutos. Dirígete a la sección de postulaciones contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Proveedor, no olvides tu cita de hoy"
|
||||
);
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($supplier->user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('suppplier_appointment')
|
||||
// ->language('es_US')
|
||||
// ->body(Messages\Components\Body::create([
|
||||
// Messages\Components\Parameters\Text::create('Proveedor no olvides tu cita de hoy: Tienes un servicio en ' . $contract->address . ' hoy en 30 minutos. Dírigeta a la sección de postulaciones contratados para más detalles'),
|
||||
// ])));
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio en " . $contract->address . " hoy en 30 minutos. Dirígete a la sección de postulaciones contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Proveedor, no olvides tu cita de hoy"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
|
||||
//Schedule a notification for the users about their appointment
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio agendado hoy en " . $contract->address . " en 30 minutos. Dirígete a la sección de contratos confirmados para más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
$user->name . ", no olvides tu cita de hoy"
|
||||
);
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('user_appointment')
|
||||
// ->language('es_US')
|
||||
// ->body(Messages\Components\Body::create([
|
||||
// Messages\Components\Parameters\Text::create($user->name . ' no olvides tu cita de hoy: Tienes un servicio agendado hoy en ' . $contract->address . ' en 30 minutos. Dírigeta a la sección de contratos confirmados para más detalles'),
|
||||
// ])));
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio agendado hoy en " . $contract->address . " en 30 minutos. Dirígete a la sección de contratos confirmados para más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
$user->name . ", no olvides tu cita de hoy"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Servicio contratado exitosamente'
|
||||
@@ -483,46 +464,34 @@ class ContractController extends Controller
|
||||
|
||||
Postulations::destroy($request->postulation_id);
|
||||
|
||||
//Notify the suppliers that they have been hired
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones contratadas en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: has sido contratado"
|
||||
);
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($supplier->user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('suppplier_hired')
|
||||
// ->language('es_US')
|
||||
// ->body(Messages\Components\Body::create([
|
||||
// Messages\Components\Parameters\Text::create('Proveedor has sido contratado: dirígete a la sección de postulaciones contratadas en JobHero para ver más detalles'),
|
||||
// ])));
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones contratadas en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: has sido contratado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
//Schedule a notification for the suppliers about their appointment
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio en " . $contract->address . " hoy en 30 minutos. Dirígete a la sección de postulaciones contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Proveedor, no olvides tu cita de hoy"
|
||||
);
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($supplier->user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('suppplier_appointment')
|
||||
// ->language('es_US')
|
||||
// ->body(Messages\Components\Body::create([
|
||||
// Messages\Components\Parameters\Text::create('Proveedor no olvides tu cita de hoy: Tienes un servicio en ' . $contract->address . ' hoy en 30 minutos. Dírigeta a la sección de postulaciones contratados para más detalles'),
|
||||
// ])));
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio en " . $contract->address . " hoy en 30 minutos. Dirígete a la sección de postulaciones contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Proveedor, no olvides tu cita de hoy"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
|
||||
//Schedule a notification for the users about their appointment
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio agendado hoy en " . $contract->address . " en 30 minutos. Dirígete a la sección de contratos confirmados para más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
$user->name . ", no olvides tu cita de hoy"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Tienes un servicio agendado hoy en " . $contract->address . " en 30 minutos. Dirígete a la sección de contratos confirmados para más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
$user->name . ", no olvides tu cita de hoy"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($user->phone, Messages\TemplateMessage::create()
|
||||
// ->name('user_appointment')
|
||||
@@ -760,12 +729,14 @@ class ContractController extends Controller
|
||||
|
||||
CurrentContracts::destroy($request->contract_id);
|
||||
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El servicio en " . $fcontract->address . " el día " . substr($fcontract->appointment, 0, 10) . "ha sido cancelado. Dírigeta a la sección de servicios contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: un servicio ha sido cancelado"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El servicio en " . $fcontract->address . " el día " . substr($fcontract->appointment, 0, 10) . "ha sido cancelado. Dírigeta a la sección de servicios contratados para más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: un servicio ha sido cancelado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Servicio cancelado exitosamente'
|
||||
@@ -836,12 +807,14 @@ class ContractController extends Controller
|
||||
$payment->status_id = null;
|
||||
$payment->save();
|
||||
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El servicio en " . $fcontract->address . " el día " . substr($fcontract->appointment, 0, 10) . " ha sido iniciado. Dírigeta a la sección de servicios contratados para más detalles",
|
||||
(string) $fcontract->user_id,
|
||||
null, null, null, null,
|
||||
"Usuario: el proveedor ha iniciado el servicio"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El servicio en " . $fcontract->address . " el día " . substr($fcontract->appointment, 0, 10) . " ha sido iniciado. Dírigeta a la sección de servicios contratados para más detalles",
|
||||
(string) $fcontract->user_id,
|
||||
null, null, null, null,
|
||||
"Usuario: el proveedor ha iniciado el servicio"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Servicio iniciado exitosamente'
|
||||
|
||||
@@ -137,12 +137,14 @@ class NoHomeController extends Controller
|
||||
if (Carbon::now()->diffInMinutes($contract->appointment, false) < 10) {
|
||||
return response()->json($contract);
|
||||
} else {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El proveedor para el servicio en " . $contract->address . " ha llegado. Dírigeta a la sección de contratos confirmados para más detalles",
|
||||
(string) $client->id,
|
||||
null, null, null, null,
|
||||
$client->name . ", tu proveedor del servicio ha llegado"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El proveedor para el servicio en " . $contract->address . " ha llegado. Dírigeta a la sección de contratos confirmados para más detalles",
|
||||
(string) $client->id,
|
||||
null, null, null, null,
|
||||
$client->name . ", tu proveedor del servicio ha llegado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
return response()->json([
|
||||
//'message' => 'Por favor espere a los 10 minutos de tolerancia de la hora acordada'
|
||||
'message' => 'wait'
|
||||
@@ -227,12 +229,14 @@ class NoHomeController extends Controller
|
||||
'message' => 'Ausencia registrada con éxito, nos comunicaremos con usted por correo electrónico en caso de alguna circunstancia'
|
||||
]);
|
||||
} else {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El proveedor para el servicio en " . $ccontract->address . " ha llegado. Dírigeta a la sección de contratos confirmados para más detalles",
|
||||
(string) $client->id,
|
||||
null, null, null, null,
|
||||
$client->name . ", tu proveedor del servicio ha llegado"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"El proveedor para el servicio en " . $ccontract->address . " ha llegado. Dírigeta a la sección de contratos confirmados para más detalles",
|
||||
(string) $client->id,
|
||||
null, null, null, null,
|
||||
$client->name . ", tu proveedor del servicio ha llegado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
return response()->json([
|
||||
'order' => 'wait',
|
||||
'message' => 'Por favor espere a los 10 minutos de tolerancia de la hora acordada'
|
||||
|
||||
@@ -109,7 +109,7 @@ class PostulationController extends Controller
|
||||
$geometry = new Point($request->lat, $request->lng);
|
||||
$category = Categories::where('name', strip_tags($request->category))->orwhere('en_name', strip_tags($request->category))->first();
|
||||
|
||||
$distance = 0.5;
|
||||
$distance = 5000; // metros (5 km)
|
||||
$suppliers = Suppliers::withinDistanceTo('location', $geometry, $distance)->get();
|
||||
|
||||
if ($suppliers != '[]') {
|
||||
@@ -129,21 +129,25 @@ class PostulationController extends Controller
|
||||
$postulation->details = preg_replace('/\d+/', '', strip_tags($request->details));
|
||||
$postulation->save();
|
||||
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Coméntele al Ing. que hay una postulación",
|
||||
"128",
|
||||
null, null, null, null,
|
||||
"Admin: hay nueva postulación"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Coméntele al Ing. que hay una postulación",
|
||||
"128",
|
||||
null, null, null, null,
|
||||
"Admin: hay nueva postulación"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
foreach ($suppliers as $supplier) {
|
||||
if (in_array($category->id, $supplier->categories->pluck('id')->toArray())) {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: hay nueva postulación"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de postulaciones en la app para ver más detalles",
|
||||
(string) $supplier->user_id,
|
||||
null, null, null, null,
|
||||
"Proveedor: hay nueva postulación"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($supplier->user->phone, Messages\TemplateMessage::create()
|
||||
@@ -171,13 +175,15 @@ class PostulationController extends Controller
|
||||
|
||||
$delay_UTC = Carbon::now()->addMinutes(15)->toString();
|
||||
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de contratos en la app para ver más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Búsqueda Finalizada"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de contratos en la app para ver más detalles",
|
||||
(string) $user->id,
|
||||
null, null, null,
|
||||
$delay_UTC,
|
||||
"Búsqueda Finalizada"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
return response()->json([
|
||||
'message' => 'Servicio solicitado, espere a que un proveedor se postule'
|
||||
@@ -217,12 +223,14 @@ class PostulationController extends Controller
|
||||
if ($time_limit > 0) {
|
||||
if (in_array($postulation->category_id, $supplier->categories->pluck('id')->toArray())) {
|
||||
if($supplier->membership == 1) {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de contratos en la app para ver más detalles",
|
||||
(string) $postulation->user_id,
|
||||
null, null, null, null,
|
||||
"Un proveedor certificado se ha postulado"
|
||||
);
|
||||
try {
|
||||
OneSignal::sendNotificationToExternalUser(
|
||||
"Dirígete a la sección de contratos en la app para ver más detalles",
|
||||
(string) $postulation->user_id,
|
||||
null, null, null, null,
|
||||
"Un proveedor certificado se ha postulado"
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
}
|
||||
// TODO: Configurar WhatsApp cuando esté disponible
|
||||
// Whatsapp::send($postulation->user->phone, Messages\TemplateMessage::create()
|
||||
|
||||
@@ -2,111 +2,51 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Report;
|
||||
use App\Models\ReportComment;
|
||||
use App\Models\FinishedContracts;
|
||||
use App\Models\NoHome;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
||||
class ReportCommentController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index(Request $request, $id, $contract_id)
|
||||
public function index(Request $request, $id)
|
||||
{
|
||||
//
|
||||
$request->session()->put('search', $request
|
||||
->has('search') ? strip_tags($request->get('search')) : ($request->session()
|
||||
->has('search') ? strip_tags($request->session()->get('search')) : ''));
|
||||
$report = Report::find($id);
|
||||
$contract = FinishedContracts::with(['user', 'suppliers.user', 'categories'])->find($report->contract_id);
|
||||
$nohome = NoHome::where('contract_id', $contract->id)->first();
|
||||
$comments = ReportComment::with('user')
|
||||
->where('report_id', $id)
|
||||
->orderBy('created_at', 'asc')
|
||||
->paginate(50);
|
||||
|
||||
$request->session()->put('field', $request
|
||||
->has('field') ? strip_tags($request->get('field')) : ($request->session()
|
||||
->has('field') ? strip_tags($request->session()->get('field')) : 'id'));
|
||||
|
||||
$request->session()->put('sort', $request
|
||||
->has('sort') ? strip_tags($request->get('sort')) : ($request->session()
|
||||
->has('sort') ? strip_tags($request->session()->get('sort')) : 'asc'));
|
||||
|
||||
//$headers = $request->get('header') != '' ? $request->get('header') : -1;
|
||||
|
||||
$contract = FinishedContracts::where('id', $contract_id)->first();
|
||||
$nohome = NoHome::where('contract_id', $contract_id)->first();
|
||||
$comments = new ReportComment();
|
||||
$comments = $comments->where('report_id', $id)
|
||||
->orderBy(strip_tags($request->session()->get('field')), strip_tags($request->session()->get('sort')))
|
||||
->paginate(10);
|
||||
|
||||
if ($request->isMethod('get'))
|
||||
return view('reports.comments', compact('comments', 'contract', 'nohome'));
|
||||
return view('reports.comments', compact('comments', 'contract', 'nohome', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function create()
|
||||
public function store(Request $request, $id)
|
||||
{
|
||||
//
|
||||
$validator = Validator::make($request->all(), [
|
||||
'comment' => 'required|string',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return redirect()->back()->withErrors($validator);
|
||||
}
|
||||
|
||||
$comment = new ReportComment();
|
||||
$comment->report_id = $id;
|
||||
$comment->user_id = Auth::id();
|
||||
$comment->comment = strip_tags($request->comment);
|
||||
$comment->save();
|
||||
|
||||
return redirect()->back();
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function destroy($id, $comment_id)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\ReportComment $reportComment
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(ReportComment $reportComment)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\ReportComment $reportComment
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(ReportComment $reportComment)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\ReportComment $reportComment
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, ReportComment $reportComment)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\ReportComment $reportComment
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy($id, $contract_id)
|
||||
{
|
||||
//
|
||||
ReportComment::destroy($id);
|
||||
return redirect('reports/comments/'.$id.'/'.$contract_id);
|
||||
ReportComment::destroy($comment_id);
|
||||
return redirect('reports/' . $id . '/comments');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ class ReportController extends Controller
|
||||
|
||||
$report = Report::find($id);
|
||||
$report->veredict = strip_tags($request->veredict);
|
||||
$coupon->save();
|
||||
$report->save();
|
||||
|
||||
return redirect('reports');
|
||||
}
|
||||
@@ -138,6 +138,155 @@ class ReportController extends Controller
|
||||
return redirect('reports');
|
||||
}
|
||||
|
||||
public function getcomments(Request $request, $id)
|
||||
{
|
||||
$user = Auth::user();
|
||||
$report = Report::with('finishedcontracts.suppliers')->find($id);
|
||||
|
||||
if (!$report) {
|
||||
return response()->json(['message' => 'Reporte no encontrado'], 404);
|
||||
}
|
||||
|
||||
$contract = $report->finishedcontracts;
|
||||
$supplierUserId = $contract->suppliers->user_id ?? null;
|
||||
|
||||
if ($user->id !== $contract->user_id && $user->id !== $supplierUserId) {
|
||||
return response()->json(['message' => 'No autorizado'], 403);
|
||||
}
|
||||
|
||||
$comments = ReportComment::with('user')
|
||||
->where('report_id', $id)
|
||||
->orderBy('created_at', 'asc')
|
||||
->get()
|
||||
->map(function ($c) use ($contract, $supplierUserId) {
|
||||
$isSupplier = $c->user_id === $supplierUserId;
|
||||
$isClient = $c->user_id === $contract->user_id;
|
||||
return [
|
||||
'id' => $c->id,
|
||||
'sender_id' => $c->user_id,
|
||||
'sender_name' => $isSupplier
|
||||
? ($contract->suppliers->company_name ?? null)
|
||||
: ($c->user->name ?? null),
|
||||
'role_id' => $c->user->role_id ?? null,
|
||||
'sender_type' => !$isClient && !$isSupplier ? 'moderator' : null,
|
||||
'comment' => $c->comment,
|
||||
'created_at' => $c->created_at,
|
||||
];
|
||||
});
|
||||
|
||||
return response()->json($comments);
|
||||
}
|
||||
|
||||
public function storecomment(Request $request, $id)
|
||||
{
|
||||
$validator = Validator::make($request->all(), ['comment' => 'required|string']);
|
||||
if ($validator->fails()) {
|
||||
return response()->json($validator->errors(), 422);
|
||||
}
|
||||
|
||||
$user = Auth::user();
|
||||
$report = Report::with('finishedcontracts.suppliers')->find($id);
|
||||
|
||||
if (!$report) {
|
||||
return response()->json(['message' => 'Reporte no encontrado'], 404);
|
||||
}
|
||||
|
||||
$contract = $report->finishedcontracts;
|
||||
$supplierUserId = $contract->suppliers->user_id ?? null;
|
||||
|
||||
if ($user->id !== $contract->user_id && $user->id !== $supplierUserId) {
|
||||
return response()->json(['message' => 'No autorizado'], 403);
|
||||
}
|
||||
|
||||
$comment = new ReportComment();
|
||||
$comment->report_id = $id;
|
||||
$comment->user_id = $user->id;
|
||||
$comment->comment = strip_tags($request->comment);
|
||||
$comment->save();
|
||||
|
||||
$supplierUserId = $contract->suppliers->user_id ?? null;
|
||||
$isSupplier = $user->id === $supplierUserId;
|
||||
$isClient = $user->id === $contract->user_id;
|
||||
|
||||
return response()->json([
|
||||
'id' => $comment->id,
|
||||
'sender_id' => $user->id,
|
||||
'sender_name' => $isSupplier ? ($contract->suppliers->company_name ?? null) : $user->name,
|
||||
'role_id' => $user->role_id,
|
||||
'sender_type' => !$isClient && !$isSupplier ? 'moderator' : null,
|
||||
'comment' => $comment->comment,
|
||||
'created_at' => $comment->created_at,
|
||||
], 201);
|
||||
}
|
||||
|
||||
public function getsupplierreports(Request $request)
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
if (!$user->suppliers) {
|
||||
return response()->json(['success' => false, 'message' => 'No tienes un perfil de proveedor registrado'], 400);
|
||||
}
|
||||
|
||||
$contractIds = FinishedContracts::where('supplier_id', $user->suppliers->id)->pluck('id');
|
||||
|
||||
$reports = Report::with([
|
||||
'finishedcontracts.suppliers.user',
|
||||
'finishedcontracts.categories',
|
||||
])
|
||||
->whereIn('contract_id', $contractIds)
|
||||
->orderBy('created_at', 'desc')
|
||||
->get();
|
||||
|
||||
$data = $reports->map(function ($report) {
|
||||
$contract = $report->finishedcontracts;
|
||||
return [
|
||||
'id' => $report->id,
|
||||
'supplier' => $contract->suppliers->user->name ?? null,
|
||||
'company' => $contract->suppliers->company_name ?? null,
|
||||
'category' => $contract->categories->name ?? null,
|
||||
'en_category' => $contract->categories->en_name ?? null,
|
||||
'appointment' => $contract->appointment,
|
||||
'address' => $contract->address,
|
||||
'amount' => $contract->amount,
|
||||
'veredict' => $report->veredict,
|
||||
];
|
||||
});
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function getreports(Request $request)
|
||||
{
|
||||
$user = Auth::user();
|
||||
|
||||
$contractIds = FinishedContracts::where('user_id', $user->id)->pluck('id');
|
||||
|
||||
$reports = Report::with([
|
||||
'finishedcontracts.suppliers.user',
|
||||
'finishedcontracts.categories',
|
||||
])
|
||||
->whereIn('contract_id', $contractIds)
|
||||
->orderBy('created_at', 'desc')
|
||||
->get();
|
||||
|
||||
$data = $reports->map(function ($report) {
|
||||
$contract = $report->finishedcontracts;
|
||||
return [
|
||||
'id' => $report->id,
|
||||
'supplier' => $contract->suppliers->user->name ?? null,
|
||||
'company' => $contract->suppliers->company_name ?? null,
|
||||
'category' => $contract->categories->name ?? null,
|
||||
'en_category' => $contract->categories->en_name ?? null,
|
||||
'appointment' => $contract->appointment,
|
||||
'address' => $contract->address,
|
||||
'amount' => $contract->amount,
|
||||
'veredict' => $report->veredict,
|
||||
];
|
||||
});
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function report(Request $request) {
|
||||
|
||||
$rules = [
|
||||
|
||||
@@ -1237,7 +1237,7 @@ class SupplierController extends Controller
|
||||
], 400);
|
||||
}
|
||||
|
||||
$distance = 0.5;
|
||||
$distance = 5000; // metros (5 km)
|
||||
$postulations = Postulations::withinDistanceTo('location', $supplier->location, $distance)->orderBy('created_at', 'DESC')->get();
|
||||
|
||||
$postulationsinfo = array();
|
||||
|
||||
@@ -20,7 +20,7 @@ class Report extends Model
|
||||
|
||||
public function finishedcontracts()
|
||||
{
|
||||
return $this->belongsTo(FinishedContracts::class);
|
||||
return $this->belongsTo(FinishedContracts::class, 'contract_id');
|
||||
}
|
||||
|
||||
public function user()
|
||||
|
||||
@@ -17,15 +17,17 @@ class PushNotificationService
|
||||
*/
|
||||
public function sendToUser(int $userId, string $message, string $heading = 'JobHero', array $data = [])
|
||||
{
|
||||
return OneSignal::sendNotificationToExternalUser(
|
||||
$message,
|
||||
(string) $userId,
|
||||
null,
|
||||
$data ?: null,
|
||||
null,
|
||||
null,
|
||||
$heading
|
||||
);
|
||||
try {
|
||||
return OneSignal::sendNotificationToExternalUser(
|
||||
$message,
|
||||
(string) $userId,
|
||||
null,
|
||||
$data ?: null,
|
||||
null,
|
||||
null,
|
||||
$heading
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,15 +60,17 @@ class PushNotificationService
|
||||
*/
|
||||
public function sendScheduledToUser(int $userId, string $message, string $sendAt, string $heading = 'JobHero', array $data = [])
|
||||
{
|
||||
return OneSignal::sendNotificationToExternalUser(
|
||||
$message,
|
||||
(string) $userId,
|
||||
null,
|
||||
$data ?: null,
|
||||
null,
|
||||
$sendAt,
|
||||
$heading
|
||||
);
|
||||
try {
|
||||
return OneSignal::sendNotificationToExternalUser(
|
||||
$message,
|
||||
(string) $userId,
|
||||
null,
|
||||
$data ?: null,
|
||||
null,
|
||||
$sendAt,
|
||||
$heading
|
||||
);
|
||||
} catch (\Exception $e) {}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,7 +84,7 @@ class PushNotificationService
|
||||
*/
|
||||
public function sendToRole(int $roleId, string $message, string $heading = 'JobHero', array $data = [])
|
||||
{
|
||||
return OneSignal::sendNotificationUsingTags(
|
||||
try { return OneSignal::sendNotificationUsingTags(
|
||||
$message,
|
||||
[
|
||||
['field' => 'tag', 'key' => 'iChamba_Role', 'relation' => '=', 'value' => (string) $roleId]
|
||||
@@ -107,7 +111,7 @@ class PushNotificationService
|
||||
null,
|
||||
null,
|
||||
$data
|
||||
);
|
||||
); } catch (\Exception $e) {}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user