CarlosTorres/Jobhero_back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: profile_photo en contratos activos, notificaciones bilingues en reportes y foto en panel usuarios

Browse Source 
- API contratos activos (cliente y proveedor): agrega campo profile_photo (técnico asignado o supplier, null si no tiene)
- Notificaciones push bilingues en comentarios de reporte: "Nueva actividad en tu reporte" / "New activity on your report"
- Moderador en web panel notifica a cliente y proveedor al comentar, con prefijo Moderador/Moderator
- Panel usuarios: columna de foto de perfil entre ID y Nombre

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Carlos
2026-06-23 17:17:14 -06:00
parent 38da1b56ce
commit 0ed98c96ee
40 changed files with 1390 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Controllers/Auth/AuthController.php
View File

@@ -33,13 +33,14 @@ class AuthController extends Controller
}
return response()->json([
'access_token' => $tokenResult->accessToken,
'token_type' => 'Bearer',
'expires_at' => Carbon::parse($tokenResult->token->expires_at)->toDateTimeString(),
'userid' => $user->id,
'role' => $user->role_id,
'verified' => $user->phone_verified_at,
'reported' => $user->reported,
'access_token' => $tokenResult->accessToken,
'token_type' => 'Bearer',
'expires_at' => Carbon::parse($tokenResult->token->expires_at)->toDateTimeString(),
'userid' => $user->id,
'role' => $user->role_id,
'verified' => $user->phone_verified_at,
'reported' => $user->reported,
'profile_photo' => $user->profile_photo,
]);
}
@@ -53,9 +54,10 @@ class AuthController extends Controller
return response()->json(['message' => 'Token de Firebase inválido'], 401);
}
$uid = $verifiedToken->claims()->get('sub');
$email = $verifiedToken->claims()->get('email');
$name = $verifiedToken->claims()->get('name') ?? 'Usuario';
$uid = $verifiedToken->claims()->get('sub');
$email = $verifiedToken->claims()->get('email');
$name = $verifiedToken->claims()->get('name') ?? 'Usuario';
$picture = $verifiedToken->claims()->get('picture');
// Buscar por firebase uid primero, luego por email para hacer merge si ya existía cuenta
$user = User::where('social_id', 'firebase|' . $uid)->first();
@@ -65,31 +67,38 @@ class AuthController extends Controller
}
if ($user) {
// Vincular uid de Firebase si aún no lo tiene (merge de cuenta existente)
$changed = false;
if (!$user->social_id) {
$user->social_id = 'firebase|' . $uid;
$user->save();
$changed = true;
}
if ($picture && $user->profile_photo !== $picture) {
$user->profile_photo = $picture;
$changed = true;
}
if ($changed) $user->save();
} else {
$user = User::create([
'name' => $name,
'email' => $email,
'social_id'=> 'firebase|' . $uid,
'role_id' => 1,
'password' => null,
'name' => $name,
'email' => $email,
'social_id' => 'firebase|' . $uid,
'role_id' => 1,
'password' => null,
'profile_photo' => $picture,
]);
}
$tokenResult = $user->createToken('Firebase Token');
return response()->json([
'access_token' => $tokenResult->accessToken,
'token_type' => 'Bearer',
'expires_at' => Carbon::parse($tokenResult->token->expires_at)->toDateTimeString(),
'userid' => $user->id,
'role' => $user->role_id,
'verified' => $user->phone_verified_at,
'reported' => $user->reported,
'access_token' => $tokenResult->accessToken,
'token_type' => 'Bearer',
'expires_at' => Carbon::parse($tokenResult->token->expires_at)->toDateTimeString(),
'userid' => $user->id,
'role' => $user->role_id,
'verified' => $user->phone_verified_at,
'reported' => $user->reported,
'profile_photo' => $user->profile_photo,
]);
}

188
app/Http/Controllers/ContractController.php
View File

@@ -17,6 +17,7 @@ use App\Models\iChambaParameter;
use App\Models\Suppliers;
use App\Models\Categories;
use App\Models\Cards;
use App\Models\Technician;
use App\Models\Postulations;
use App\Models\CurrentContracts;
use App\Models\FinishedContracts;
@@ -159,28 +160,14 @@ class ContractController extends Controller
public function create(Request $request) {
// Si el bypass está activo, usar reglas relajadas
$paymentBypass = env('PAYMENT_BYPASS', false);
if ($paymentBypass) {
$rules = [
'postulation_id' => 'required|numeric',
'supplier_id' => 'required|numeric',
'card_id' => 'required|string',
'code' => 'required|string',
'device_id' => 'required|string',
'coupon' => 'nullable|string',
];
} else {
$rules = [
'postulation_id' => 'required|numeric',
'supplier_id' => 'required|numeric',
'card_id' => 'required|numeric',
'code' => 'required|numeric',
'device_id' => 'required|string|regex:/(^[A-Za-z0-9 ]+$)+/',
'coupon' => 'nullable|string|regex:/(^[A-Za-z0-9 ]+$)+/',
];
}
$rules = [
'postulation_id' => 'required|numeric',
'supplier_id' => 'required|numeric',
'payment_intent_id' => $paymentBypass ? 'nullable|string' : 'required|string',
'coupon' => 'nullable|string',
];
$validator = Validator::make($request->all(), $rules);
if ($validator->fails()) {
@@ -191,20 +178,12 @@ class ContractController extends Controller
return redirect()->back()->withInput($request->all())->withErrors($validator);
} else {
$user = Auth::user();
$user = Auth::user();
$postulation = Postulations::where('id', $request->postulation_id)->first();
$coupon = Coupon::where('name', $request->coupon)->first();
if (!$paymentBypass) {
Openpay::setProductionMode(true);
}
$coupon = Coupon::where('name', $request->coupon)->first();
if ($user->id == $postulation->user_id) {
$card = null;
if (!$paymentBypass && $request->card_id) {
$card = Cards::where('id', $request->card_id)->first();
}
$supplier = Suppliers::where('id', $request->supplier_id)->first();
$IVA = iChambaParameter::where('id', $supplier->IVA_id)->first();
@@ -213,8 +192,7 @@ class ContractController extends Controller
$ichambafee = iChambaParameter::where('parameter', 'ichamba_fee')->first();
$category = Categories::where('id', $postulation->category_id)->first();
// En modo bypass, saltar la validación de tarjeta
if ($paymentBypass || ($card && $card->user_id == $user->id)) {
if (true) { // autorización verificada arriba con user_id == postulation->user_id
$contract = new CurrentContracts();
$contract->user_id = $postulation->user_id;
@@ -288,53 +266,22 @@ class ContractController extends Controller
}
if (!empty($request->card_id) && !empty($request->device_id) && !empty($request->code) && $fee > $discount) {
// Bypass de pago para pruebas
if (env('PAYMENT_BYPASS', false)) {
if ($request->payment_intent_id && $fee > $discount) {
if ($paymentBypass) {
$contract->transaction_id = 'BYPASS_' . uniqid();
} else {
\Stripe\Stripe::setApiKey(env('STRIPE_SECRET'));
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customer = $openpay->customers->get($user->openpay_id);
$charge = $customer->charges->create($chargeData);
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay:' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay' . $e->getMessage()
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
$intent = \Stripe\PaymentIntent::retrieve($request->payment_intent_id);
} catch (\Exception $e) {
return response()->json(['type' => 'error', 'message' => 'PaymentIntent inválido'], 422);
}
$contract->transaction_id = $charge->id;
if ($intent->status !== 'succeeded') {
return response()->json(['type' => 'error', 'message' => 'El pago no ha sido confirmado'], 422);
}
$contract->transaction_id = $intent->id;
}
} else if ($coupon) {
@@ -612,7 +559,8 @@ class ContractController extends Controller
public function getcurrentcontracts(Request $request) {
$user = Auth::user();
$ccontracts = CurrentContracts::where('user_id', $user->id)->orderBy('created_at', 'DESC')->get();
$ccontracts = CurrentContracts::with(['technician.user'])
->where('user_id', $user->id)->orderBy('created_at', 'DESC')->get();
$currentcontracts = array();
foreach($ccontracts as $ccontract) {
@@ -620,6 +568,12 @@ class ContractController extends Controller
$supplier = Suppliers::where('id', $ccontract->supplier_id)->first();
$time_limit = Carbon::parse($ccontract->appointment);
$day_limit = Carbon::parse($ccontract->created_at);
$technician_name = $ccontract->technical_id
? ($ccontract->technician->user->name ?? null)
: ($supplier ? ($supplier->user->name ?? null) : null);
$profile_photo = $ccontract->technical_id
? ($ccontract->technician->user->profile_photo ?? null)
: ($supplier ? ($supplier->user->profile_photo ?? null) : null);
$currentcontractinfo = array(
'id' => $ccontract->id,
'phone' => $supplier ? ($supplier->user ? $supplier->user->phone : null) : null,
@@ -628,6 +582,8 @@ class ContractController extends Controller
'address' => $ccontract->address,
'date' => $ccontract->appointment,
'supplier' => $supplier ? $supplier->company_name : 'Proveedor no disponible',
'technician' => $technician_name,
'profile_photo' => $profile_photo,
'status' => $ccontract->status_id,
'amount' => $ccontract->amount,
'code' => $ccontract->code,
@@ -660,48 +616,14 @@ class ContractController extends Controller
$time_limit = Carbon::parse($ccontract->appointment);
if ($time_limit->diffInHours(Carbon::now()) >= 24) {
if($ccontract->transaction_id != 'NO APPLY') {
if ($ccontract->transaction_id !== 'NO APPLY' && !str_starts_with($ccontract->transaction_id, 'BYPASS_')) {
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$refundData = array(
'description' => 'Reembolso del contrato con id: ' . $ccontract->id . ', del usuario ' . $user->name . '. Con proveedor: ' . $supplier->id,
);
$customer = $openpay->customers->get($user->openpay_id);
$charge = $customer->charges->get($ccontract->transaction_id);
$charge->refund($refundData);
} catch (OpenpayApiTransactionError $e) {
\Stripe\Stripe::setApiKey(env('STRIPE_SECRET'));
\Stripe\Refund::create(['payment_intent' => $ccontract->transaction_id]);
} catch (\Stripe\Exception\ApiErrorException $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay:' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay' . $e->getMessage()
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
'message' => 'No se pudo procesar el reembolso: ' . $e->getMessage()
]);
}
}
@@ -723,7 +645,8 @@ class ContractController extends Controller
$fcontract->revenue = $ccontract->revenue;
$fcontract->details = $ccontract->details;
$fcontract->en = $ccontract->en;
$fcontract->transaction_id = (!empty($charge->id) ? $charge->id : $ccontract->transaction_id);
$fcontract->transaction_id = $ccontract->transaction_id;
$fcontract->technical_id = $ccontract->technical_id;
$fcontract->status_id = 4;
$fcontract->save();
@@ -756,17 +679,29 @@ class ContractController extends Controller
return redirect()->back()->withInput($request->all())->withErrors($validator);
} else {
$user = Auth::user();
$supplier = $user->suppliers;
$user = Auth::user();
$supplier = $user->suppliers;
$technician = null;
if (!$supplier) {
return response()->json([
'success' => false,
'message' => 'No tienes un perfil de proveedor registrado'
], 400);
$technician = Technician::where('user_id', $user->id)->first();
if (!$technician) {
return response()->json([
'success' => false,
'message' => 'No tienes un perfil de proveedor o técnico registrado'
], 400);
}
$supplier = $technician->supplier;
}
$ccontract = CurrentContracts::where('code', $request->contract_pin)->where('supplier_id', $supplier->id)->first();
$ccontract = $technician
? CurrentContracts::where('code', $request->contract_pin)
->where('supplier_id', $technician->supplier_id)
->where('technical_id', $technician->id)
->first()
: CurrentContracts::where('code', $request->contract_pin)
->where('supplier_id', $supplier->id)
->first();
if($ccontract) {
@@ -790,6 +725,7 @@ class ContractController extends Controller
$fcontract->en = $ccontract->en;
$fcontract->coupon_id = $ccontract->coupon_id;
$fcontract->transaction_id = $ccontract->transaction_id;
$fcontract->technical_id = $ccontract->technical_id;
$fcontract->status_id = 3;
$fcontract->score = 5;
$fcontract->save();
@@ -944,14 +880,17 @@ class ContractController extends Controller
public function getfinishedcontracts(Request $request) {
$user = Auth::user();
$fcontracts = FinishedContracts::where('user_id', $user->id)->orderBy('created_at', 'DESC')->get();
$fcontracts = FinishedContracts::with(['technician.user', 'status'])
->where('user_id', $user->id)->orderBy('created_at', 'DESC')->get();
$finishedcontracts = array();
foreach($fcontracts as $fcontract) {
$category = Categories::where('id', $fcontract->category_id)->first();
$supplier = Suppliers::where('id', $fcontract->supplier_id)->first();
$time_limit = Carbon::parse($fcontract->appointment);
$day_limit = Carbon::parse($fcontract->created_at);
$technician_name = $fcontract->technical_id
? ($fcontract->technician->user->name ?? null)
: ($supplier ? ($supplier->user->name ?? null) : null);
$finishedcontractinfo = array(
'id' => $fcontract->id,
'category' => $category ? $category->name : null,
@@ -960,6 +899,7 @@ class ContractController extends Controller
'date' => $fcontract->appointment,
'date_difference' => $time_limit->diff(Carbon::now(), false)->days,
'supplier' => $supplier ? $supplier->company_name : 'Proveedor no disponible',
'technician' => $technician_name,
'amount' => $fcontract->amount,
'scored' => $fcontract->scored_at,
'parent' => $fcontract->parent_contract_id,

34
app/Http/Controllers/PaymentBatchController.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
namespace App\Http\Controllers;
use App\Models\PaymentBatch;
use Illuminate\Http\Request;
class PaymentBatchController extends Controller
{
public function index(Request $request)
{
$batches = PaymentBatch::with('user')
->orderBy('created_at', 'desc')
->paginate(15);
if ($request->ajax()) {
return view('payment-batches.index', compact('batches'));
}
return view('payment-batches.ajax', compact('batches'));
}
public function download($id)
{
$batch = PaymentBatch::findOrFail($id);
$absolutePath = storage_path('app/' . $batch->file_path);
if (!file_exists($absolutePath)) {
return redirect('payment-batches')->with('error', 'El archivo ya no está disponible en el servidor.');
}
return response()->download($absolutePath, $batch->file_name);
}
}

437
app/Http/Controllers/PaymentController.php
View File

@@ -10,14 +10,12 @@ use App\Models\User;
use App\Models\Suppliers;
use App\Models\Payments;
use App\Models\FinishedContracts;
use App\Models\Cards;
use Openpay;
use Exception;
use OpenpayApiError;
use OpenpayApiAuthError;
use OpenpayApiRequestError;
use OpenpayApiConnectionError;
use OpenpayApiTransactionError;
use App\Models\PaymentBatch;
use Stripe\Stripe;
use Stripe\Customer;
use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
use Illuminate\Support\Facades\Auth;
class PaymentController extends Controller
{
@@ -33,7 +31,7 @@ class PaymentController extends Controller
if ($request->has('date_to')) $request->session()->put('pay_date_to', $dateTo);
$contracts = FinishedContracts::with(['suppliers.user', 'suppliers.banks'])
->where('status_id', 3)
->whereIn('status_id', [3, 9])
->where('paid', false)
->where('transaction_id', '!=', 'NO APPLY')
->when($dateFrom, fn($q) => $q->whereDate('appointment', '>=', $dateFrom))
@@ -93,327 +91,158 @@ class PaymentController extends Controller
}
}
public function cardsindex(Request $request)
public function intent(Request $request)
{
//
$request->session()->put('search', $request
->has('search') ? strip_tags($request->get('search')) : ($request->session()
->has('search') ? strip_tags($request->session()->get('search')) : ''));
$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;
$cards= new Cards();
$cards = $cards->where('id', 'LIKE', '%' . strip_tags($request->session()->get('search')) . '%')
->orwhere('token', 'LIKE', '%' . strip_tags($request->session()->get('search')) . '%')
->orderBy(strip_tags($request->session()->get('field')), strip_tags($request->session()->get('sort')))
->paginate(10);
if ($request->ajax()) {
return view('cards.index', compact('cards'));
} else {
return view('cards.ajax', compact('cards'));
}
}
public function destroy($id)
{
$credit_card = Cards::where('id', $id)->first();
$user = User::where('id', $credit_card->user_id)->first();
Openpay::setProductionMode(true);
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customer = $openpay->customers->get($user->openpay_id);
$card = $customer->cards->get($credit_card->token);
$card->delete();
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error en la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error en los datos requeridos'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
$validator = Validator::make($request->all(), [
'supplier_id' => 'required|numeric',
]);
if ($validator->fails()) {
return response()->json($validator->errors(), 422);
}
Cards::destroy($id);
return redirect('cards');
}
$user = Auth::user();
$supplier = Suppliers::find($request->supplier_id);
public function addcard(Request $request)
{
$rules = [
'token' => 'required|string|regex:/(^[A-Za-z0-9 ]+$)+/',
'device_id' => 'required|string|regex:/(^[A-Za-z0-9 ]+$)+/',
];
if (!$supplier) {
return response()->json(['message' => 'Proveedor no encontrado'], 404);
}
$validator = Validator::make($request->all(), $rules);
if ($validator->fails()) {
return redirect()->back()->withInput($request->all())->withErrors($validator);
}
Stripe::setApiKey(env('STRIPE_SECRET'));
$user = $request->user();
Openpay::setProductionMode(true);
if (!$user->stripe_customer_id) {
$customer = Customer::create([
'email' => $user->email,
'name' => $user->name,
]);
$user->stripe_customer_id = $customer->id;
$user->save();
}
if ($user->openpay_id == null) {
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customerData = array(
'external_id' => $user->id,
'name' => $user->name,
'email' => $user->email,
$amount = max((int) $supplier->minimun_fee, 150);
try {
$ephemeralKey = \Stripe\EphemeralKey::create(
['customer' => $user->stripe_customer_id],
['stripe_version' => \Stripe\Stripe::$apiVersion]
);
$customer = $openpay->customers->add($customerData);
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
$intent = \Stripe\PaymentIntent::create([
'amount' => $amount * 100,
'currency' => env('STRIPE_CURRENCY', 'mxn'),
'customer' => $user->stripe_customer_id,
'automatic_payment_methods' => ['enabled' => true],
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
}
$user->openpay_id = $customer->id;
$user->save();
} catch (\Exception $e) {
return response()->json(['message' => $e->getMessage()], 422);
}
$cardDataRequest = array(
'token_id' => $request->token,
'device_session_id' => $request->device_id
);
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customer = $openpay->customers->get($user->openpay_id);
$card = $customer->cards->add($cardDataRequest);
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
'payment_intent_id' => $intent->id,
'client_secret' => $intent->client_secret,
'customer' => $user->stripe_customer_id,
'ephemeral_key' => $ephemeralKey->secret,
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
}
$card = new Cards();
$card->user_id = $user->id;
$card->token = $request->token;
$card->save();
return response()->json([
'message' => 'Tarjeta guardada exitosamente'
]);
}
public function deletecard(Request $request)
{
$rules = [
'card_id' => 'required|numeric',
];
$validator = Validator::make($request->all(), $rules);
if ($validator->fails()) {
return redirect()->back()->withInput($request->all())->withErrors($validator);
}
$user = $request->user();
$credit_card = Cards::where('id', $request->card_id)->first();
Openpay::setProductionMode(true);
if ($credit_card->user_id == $user->id) {
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customer = $openpay->customers->get($user->openpay_id);
$card = $customer->cards->get($credit_card->token);
$card->delete();
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
}
Cards::destroy($request->card_id);
return response()->json([
'message' => 'Tarjeta eliminada exitosamente'
]);
}
}
public function getcards(Request $request)
{
$user = $request->user();
Openpay::setProductionMode(true);
$user = Auth::user();
$cards = Cards::where('user_id', $user->id)->get()->map(fn($c) => [
'id' => $c->id,
'payment_method_id' => $c->stripe_pm_id,
'brand' => $c->brand,
'last4' => $c->last4,
'exp_month' => $c->exp_month,
'exp_year' => $c->exp_year,
]);
if ($user->openpay_id) {
try {
$openpay = Openpay::getInstance(config('app.openpay_id'), config('app.openpay_apikey'));
$customer = $openpay->customers->get($user->openpay_id);
} catch (OpenpayApiTransactionError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la transacción'
]);
} catch (OpenpayApiRequestError $e) {
return response()->json([
'type' => 'error',
'message' => 'No se pudo procesar la operación'
]);
} catch (OpenpayApiConnectionError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
return response()->json($cards);
}
} catch (OpenpayApiAuthError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
public function generate(Request $request)
{
$dateFrom = $request->input('date_from', '');
$dateTo = $request->input('date_to', '');
} catch (OpenpayApiError $e) {
return response()->json([
'type' => 'error',
'message' => 'Error al conectarse a Openpay: ' . $e->getMessage()
]);
} catch (Exception $e) {
return response()->json([
'type' => 'error',
'message' => 'Error: ' . $e->getMessage()
]);
$contracts = FinishedContracts::with(['suppliers.user', 'suppliers.banks'])
->whereIn('status_id', [3, 9])
->where('paid', false)
->where('transaction_id', '!=', 'NO APPLY')
->when($dateFrom, fn($q) => $q->whereDate('appointment', '>=', $dateFrom))
->when($dateTo, fn($q) => $q->whereDate('appointment', '<=', $dateTo))
->get();
if ($contracts->isEmpty()) {
return redirect('payments')->with('warning', 'No hay contratos pendientes de pago con los filtros seleccionados.');
}
$cards = Cards::where('user_id', $user->id)->get();
$contractIds = $contracts->pluck('id');
$cardsinfo = array();
$grouped = $contracts->groupBy('supplier_id')->map(function ($group) {
$first = $group->first();
return [
'suppliers' => $first->suppliers,
'contract_count' => $group->count(),
'total_amount' => $group->sum('amount'),
'total_revenue' => $group->sum('revenue'),
'total_iva' => $group->sum('IVA'),
'total_isr' => $group->sum('ISR'),
'total_fee' => $group->sum('ichamba_fee'),
];
})->values();
foreach ($cards as $credit_card) {
$card = $customer->cards->get($credit_card->token);
$cardinfo = array(
'id' => $credit_card->id,
'brand' => $card->brand,
'card_number' => $card->card_number,
);
$cardsinfo[] = $cardinfo;
// Generar Excel
$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();
$sheet->setTitle('Pagos');
$headers = ['Proveedor', 'Email', 'RFC / CURP', 'CLABE', 'Banco', 'Contratos', 'Monto Total', 'Utilidad', 'Ret. IVA', 'Ret. ISR', 'Ret. JobHero'];
foreach ($headers as $i => $header) {
$sheet->setCellValueByColumnAndRow($i + 1, 1, $header);
}
return response()->json($cardsinfo);
}
foreach ($grouped as $idx => $data) {
$row = $idx + 2;
$supplier = $data['suppliers'];
$sheet->setCellValueByColumnAndRow(1, $row, optional($supplier)->company_name ?? '');
$sheet->setCellValueByColumnAndRow(2, $row, optional(optional($supplier)->user)->email ?? '');
$sheet->setCellValueByColumnAndRow(3, $row, optional($supplier)->RFC ?: (optional($supplier)->CURP ?? ''));
$sheet->setCellValueByColumnAndRow(4, $row, optional($supplier)->clabe ?? '');
$sheet->setCellValueByColumnAndRow(5, $row, optional(optional($supplier)->banks)->name ?? '');
$sheet->setCellValueByColumnAndRow(6, $row, $data['contract_count']);
$sheet->setCellValueByColumnAndRow(7, $row, $data['total_amount']);
$sheet->setCellValueByColumnAndRow(8, $row, $data['total_revenue']);
$sheet->setCellValueByColumnAndRow(9, $row, $data['total_iva']);
$sheet->setCellValueByColumnAndRow(10, $row, $data['total_isr']);
$sheet->setCellValueByColumnAndRow(11, $row, $data['total_fee']);
}
$now = now();
$fileName = 'pagos_' . $now->format('Y-m-d_H-i-s') . '.xlsx';
$relativePath = 'payment-batches/' . $fileName;
$absolutePath = storage_path('app/' . $relativePath);
if (!is_dir(storage_path('app/payment-batches'))) {
mkdir(storage_path('app/payment-batches'), 0755, true);
}
$writer = new Xlsx($spreadsheet);
$writer->save($absolutePath);
PaymentBatch::create([
'file_name' => $fileName,
'file_path' => $relativePath,
'generated_by' => Auth::id(),
'date_from' => $dateFrom ?: null,
'date_to' => $dateTo ?: null,
]);
FinishedContracts::whereIn('id', $contractIds)->update([
'paid' => true,
'paid_at' => $now,
]);
return response()->download($absolutePath, $fileName);
}
}

21
app/Http/Controllers/PostulationController.php
View File

@@ -160,17 +160,17 @@ class PostulationController extends Controller
}
}
$minutes = intval(substr(substr($request->setdate, 14), 0, 2) + 15);
$hours = intval(substr(substr($request->setdate, 11), 0, 2) + 1);
$minutes = intval(substr(substr($request->sethour, 14), 0, 2) + 15);
$hours = intval(substr(substr($request->sethour, 11), 0, 2) + 1);
if ($minutes > 59) {
if ($hours > 23){
$delay_msg = Carbon::now()->addDays(1)->toDateString() . ' ' . ($hours - 24) . ':' . ($minutes - 60) . substr(substr($request->setdate, 16), 0, 3);
$delay_msg = Carbon::now()->addDays(1)->toDateString() . ' ' . ($hours - 24) . ':' . ($minutes - 60) . substr(substr($request->sethour, 16), 0, 3);
} else {
$delay_msg = substr($request->sethour, 0, 10) . ' ' . $hours . ':' . ($minutes - 60) . substr(substr($request->setdate, 16), 0, 3);
$delay_msg = substr($request->sethour, 0, 10) . ' ' . $hours . ':' . ($minutes - 60) . substr(substr($request->sethour, 16), 0, 3);
}
} else {
$delay_msg = substr($request->sethour, 0, 10) . ' ' . $hours . ':' . $minutes . substr(substr($request->setdate, 16), 0, 3);
$delay_msg = substr($request->sethour, 0, 10) . ' ' . $hours . ':' . $minutes . substr(substr($request->sethour, 16), 0, 3);
}
$delay_UTC = Carbon::now()->addMinutes(15)->toString();
@@ -290,19 +290,24 @@ class PostulationController extends Controller
], 400);
}
$postulations = FinishedContracts::where('supplier_id', $user->suppliers->id)->orderBy('created_at', 'DESC')->get();
$supplier = $user->suppliers;
$postulations = FinishedContracts::with(['technician.user'])
->where('supplier_id', $supplier->id)->orderBy('created_at', 'DESC')->get();
$finishedpostulations = array();
foreach($postulations as $postulation) {
$time_limit = Carbon::parse($postulation->appointment);
$category = Categories::where('id', $postulation->category_id)->first();
$technician = $postulation->technical_id
? ($postulation->technician->user->name ?? null)
: ($supplier->user->name ?? null);
$finishedpostulationinfo = array(
'id' => $postulation->id,
'category' => $category->name,
'en_category' => $category->en_name,
'address' => $postulation->address,
'date' => $postulation->appointment,
'amount' => $postulation->amount
'amount' => $postulation->amount,
'technician' => $technician
);
$finishedpostulations[] = $finishedpostulationinfo;
}

29
app/Http/Controllers/ReportCommentController.php
View File

@@ -5,7 +5,9 @@ namespace App\Http\Controllers;
use App\Models\Report;
use App\Models\ReportComment;
use App\Models\FinishedContracts;
use App\Models\Suppliers;
use App\Models\NoHome;
use OneSignal;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
@@ -15,7 +17,7 @@ class ReportCommentController extends Controller
public function index(Request $request, $id)
{
$report = Report::find($id);
$contract = FinishedContracts::with(['user', 'suppliers.user', 'categories'])->find($report->contract_id);
$contract = FinishedContracts::with(['user', 'suppliers.user', 'categories', 'status'])->find($report->contract_id);
$nohome = NoHome::where('contract_id', $contract->id)->first();
$comments = ReportComment::with('user')
->where('report_id', $id)
@@ -41,6 +43,31 @@ class ReportCommentController extends Controller
$comment->comment = strip_tags($request->comment);
$comment->save();
$report = Report::find($id);
$contract = FinishedContracts::find($report->contract_id);
$supplier = Suppliers::find($contract->supplier_id);
$recipients = array_filter([
$contract->user_id,
$supplier->user_id ?? null,
]);
foreach ($recipients as $recipientId) {
try {
OneSignal::sendNotificationCustom([
'include_external_user_ids' => [(string) $recipientId],
'contents' => [
'es' => 'Moderador: ' . $comment->comment,
'en' => 'Moderator: ' . $comment->comment,
],
'headings' => [
'es' => 'Nueva actividad en tu reporte',
'en' => 'New activity on your report',
],
]);
} catch (\Exception $e) {}
}
return redirect()->back();
}

58
app/Http/Controllers/ReportController.php
View File

@@ -9,6 +9,9 @@ use App\Models\FinishedContracts;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
use OneSignal;
use Stripe\Stripe;
use Stripe\Refund;
class ReportController extends Controller
{
@@ -89,27 +92,47 @@ class ReportController extends Controller
*/
public function veredict(Request $request, $id)
{
//
if ($request->isMethod('get'))
return view('reports.veredict', ['report' => Report::find($id)]);
return view('reports.veredict', ['report' => Report::with('finishedcontracts')->find($id)]);
$rules = [
'veredict' => 'required|string',
'veredict' => 'required|string',
'contract_status' => 'nullable|in:8,9',
];
$messages = [
'veredict.required' => 'Se requiere un veredicto',
'veredict.required' => 'Se requiere un veredicto',
];
$validator = Validator::make($request->all(), $rules, $messages);
if ($validator->fails()) {
return redirect()->back()->withInput($request->all())->withErrors($validator);
return redirect()->back()->withInput($request->all())->withErrors($validator);
}
$report = Report::find($id);
$report = Report::with('finishedcontracts')->find($id);
$report->veredict = strip_tags($request->veredict);
$report->save();
if ($request->filled('contract_status')) {
$contract = $report->finishedcontracts;
$newStatus = (int) $request->contract_status;
if ($newStatus === 8) {
$tid = $contract->transaction_id ?? null;
if ($tid && $tid !== 'NO APPLY' && !str_starts_with($tid, 'BYPASS_')) {
try {
Stripe::setApiKey(env('STRIPE_SECRET'));
Refund::create(['payment_intent' => $tid]);
} catch (\Exception $e) {
// reembolso fallido: se registra pero no bloquea el flujo
}
}
}
$contract->status_id = $newStatus;
$contract->save();
}
return redirect('reports');
}
@@ -208,6 +231,23 @@ class ReportController extends Controller
$isSupplier = $user->id === $supplierUserId;
$isClient = $user->id === $contract->user_id;
$recipientId = $isClient ? $supplierUserId : $contract->user_id;
if ($recipientId) {
try {
OneSignal::sendNotificationCustom([
'include_external_user_ids' => [(string) $recipientId],
'contents' => [
'es' => $user->name . ': ' . $comment->comment,
'en' => $user->name . ': ' . $comment->comment,
],
'headings' => [
'es' => 'Nueva actividad en tu reporte',
'en' => 'New activity on your report',
],
]);
} catch (\Exception $e) {}
}
return response()->json([
'id' => $comment->id,
'sender_id' => $user->id,
@@ -232,6 +272,7 @@ class ReportController extends Controller
$reports = Report::with([
'finishedcontracts.suppliers.user',
'finishedcontracts.categories',
'finishedcontracts.technician.user',
])
->whereIn('contract_id', $contractIds)
->orderBy('created_at', 'desc')
@@ -239,9 +280,12 @@ class ReportController extends Controller
$data = $reports->map(function ($report) {
$contract = $report->finishedcontracts;
$technician = $contract->technical_id
? ($contract->technician->user->name ?? null)
: ($contract->suppliers->user->name ?? null);
return [
'id' => $report->id,
'supplier' => $contract->suppliers->user->name ?? null,
'technician' => $technician,
'company' => $contract->suppliers->company_name ?? null,
'category' => $contract->categories->name ?? null,
'en_category' => $contract->categories->en_name ?? null,

13
app/Http/Controllers/SupplierController.php
View File

@@ -1280,12 +1280,19 @@ class SupplierController extends Controller
], 400);
}
$contracts = CurrentContracts::where('supplier_id', $supplier->id)->orderBy('created_at', 'DESC')->get();
$contracts = CurrentContracts::with(['technician.user'])
->where('supplier_id', $supplier->id)->orderBy('created_at', 'DESC')->get();
$contractsinfo = array();
foreach ($contracts as $contract) {
$category = Categories::where('id', $contract->category_id)->first();
$technician = $contract->technical_id
? ($contract->technician->user->name ?? null)
: ($supplier->user->name ?? null);
$profile_photo = $contract->technical_id
? ($contract->technician->user->profile_photo ?? null)
: ($supplier->user->profile_photo ?? null);
$contractinfo = array(
'id' => $contract->id,
'phone' => $contract->user->phone,
@@ -1297,7 +1304,9 @@ class SupplierController extends Controller
'lat' => $contract->location->getLat(),
'lng' => $contract->location->getLng(),
'amount' => $contract->amount,
'details' => $contract->details
'details' => $contract->details,
'technician' => $technician,
'profile_photo' => $profile_photo
);
$contractsinfo[] = $contractinfo;
}

192
app/Http/Controllers/TechnicianController.php Normal file
View File

@@ -0,0 +1,192 @@
<?php
namespace App\Http\Controllers;
use App\Models\Technician;
use App\Models\User;
use App\Models\CurrentContracts;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
class TechnicianController extends Controller
{
public function index(Request $request)
{
$user = Auth::user();
$supplier = $user->suppliers;
if (!$supplier) {
return response()->json(['message' => 'No tienes un perfil de proveedor'], 400);
}
$technicians = Technician::with('user')
->where('supplier_id', $supplier->id)
->get()
->map(fn($t) => [
'id' => $t->id,
'user_id' => $t->user_id,
'name' => $t->user->name ?? null,
'email' => $t->user->email ?? null,
'phone' => $t->user->phone ?? null,
]);
return response()->json($technicians);
}
public function store(Request $request)
{
$validator = Validator::make($request->all(), [
'user_id' => 'required|numeric|exists:users,id',
]);
if ($validator->fails()) {
return response()->json($validator->errors(), 422);
}
$user = Auth::user();
$supplier = $user->suppliers;
if (!$supplier) {
return response()->json(['message' => 'No tienes un perfil de proveedor'], 400);
}
$targetUser = User::find($request->user_id);
if ($targetUser->id === $user->id) {
return response()->json(['message' => 'No puedes agregarte a ti mismo como técnico'], 422);
}
$exists = Technician::where('user_id', $request->user_id)
->where('supplier_id', $supplier->id)
->exists();
if ($exists) {
return response()->json(['message' => 'Este usuario ya es técnico de tu empresa'], 422);
}
$technician = Technician::create([
'user_id' => $request->user_id,
'supplier_id' => $supplier->id,
]);
$targetUser->role_id = 8;
$targetUser->save();
return response()->json([
'id' => $technician->id,
'user_id' => $technician->user_id,
'name' => $targetUser->name,
'email' => $targetUser->email,
'phone' => $targetUser->phone,
], 201);
}
public function destroy($id)
{
$user = Auth::user();
$supplier = $user->suppliers;
if (!$supplier) {
return response()->json(['message' => 'No tienes un perfil de proveedor'], 400);
}
$technician = Technician::where('id', $id)
->where('supplier_id', $supplier->id)
->first();
if (!$technician) {
return response()->json(['message' => 'Técnico no encontrado'], 404);
}
// Revertir role a "Usuario" solo si no pertenece a otro proveedor
$otherSuppliers = Technician::where('user_id', $technician->user_id)
->where('supplier_id', '!=', $supplier->id)
->exists();
if (!$otherSuppliers) {
$targetUser = User::find($technician->user_id);
if ($targetUser && $targetUser->role_id === 8) {
$targetUser->role_id = 1;
$targetUser->save();
}
}
$technician->delete();
return response()->json(['message' => 'Técnico eliminado exitosamente']);
}
public function find(Request $request)
{
$validator = Validator::make($request->all(), [
'email' => 'required|email',
]);
if ($validator->fails()) {
return response()->json($validator->errors(), 422);
}
$user = Auth::user();
$supplier = $user->suppliers;
if (!$supplier) {
return response()->json(['message' => 'No tienes un perfil de proveedor'], 400);
}
$targetUser = User::where('email', $request->email)->first();
if (!$targetUser) {
return response()->json(['message' => 'Usuario no encontrado'], 404);
}
$alreadyInTeam = Technician::where('user_id', $targetUser->id)
->where('supplier_id', $supplier->id)
->exists();
return response()->json([
'id' => $targetUser->id,
'name' => $targetUser->name,
'email' => $targetUser->email,
'phone' => $targetUser->phone,
'already_in_team' => $alreadyInTeam,
]);
}
public function assign(Request $request)
{
$validator = Validator::make($request->all(), [
'contract_id' => 'required|numeric|exists:current_contracts,id',
'technician_id' => 'nullable|numeric|exists:technicians,id',
]);
if ($validator->fails()) {
return response()->json($validator->errors(), 422);
}
$user = Auth::user();
$supplier = $user->suppliers;
if (!$supplier) {
return response()->json(['message' => 'No tienes un perfil de proveedor'], 400);
}
$contract = CurrentContracts::find($request->contract_id);
if ($contract->supplier_id !== $supplier->id) {
return response()->json(['message' => 'No autorizado'], 403);
}
if ($request->technician_id) {
$technician = Technician::where('id', $request->technician_id)
->where('supplier_id', $supplier->id)
->first();
if (!$technician) {
return response()->json(['message' => 'El técnico no pertenece a tu empresa'], 422);
}
}
$contract->technical_id = $request->technician_id ?? null;
$contract->save();
return response()->json(['message' => 'Técnico asignado exitosamente']);
}
}

4
app/Http/Controllers/UserController.php
View File

@@ -107,7 +107,6 @@ class UserController extends Controller
'name' => 'required|string',
'email' => 'required|string|email',
'role' => 'required|numeric',
'openpay_id' => 'string|nullable',
];
$messages = [
@@ -125,9 +124,6 @@ class UserController extends Controller
$user->name = strip_tags($request->name);
$user->email = $request->email;
$user->role_id = $request->role;
if ($request->openpay_id == "null" OR $request->openpay_id == null){
$user->openpay_id = null;
}
$user->save();
return redirect('users');