feat: profile_photo en contratos activos, notificaciones bilingues en reportes y foto en panel usuarios
- 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:
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user