alumnos_ti/LauckCycles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

php artisan migrate:fresh y php artisan importar:excel, les tengo que pasar el archivo csv

Browse Source
This commit is contained in:
gianella
2026-04-04 20:59:30 -03:00
parent d1467ca098
commit b4476431e4
9 changed files with 224 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CatalogoController.php
+21 -21
View File
@@ -8,39 +8,39 @@ use Illuminate\Http\Request;
class CatalogoController extends Controller
{
/**
* Muestra los registros de ventas con buscador y paginación.
* Muestra el catálogo público de productos.
*/
public function index(Request $request)
{
// --- 1. CONSULTA PARA LA GRILLA (PAGINADA) ---
$query = Product::query();
// 1. Atrapamos lo que el usuario escribió o seleccionó
$query = $request->input('search');
$type = $request->input('type');
// Lógica del Buscador tradicional (por si seguís usando un input de texto además de Select2)
if ($request->has('search')) {
$searchTerm = $request->input('search');
// --- CONSULTA PARA LA GRILLA (PAGINADA) ---
$productsQuery = Product::query();
$query->where(function($q) use ($searchTerm) {
$q->where('name', 'like', "%{$searchTerm}%")
->orWhere('sku', 'like', "%{$searchTerm}%");
});
$productsQuery->when($query, function ($q) use ($query) {
return $q->where('name', 'like', "%{$query}%");
});
if ($type) {
$productsQuery->where('type', $type);
} else {
$productsQuery->where('type', '!=', 'service');
}
// Filtros base para la grilla
$query->whereIn('type', ['bike', 'accessory', 'clothing', 'spare']);
$query->where('stock_quantity', '>', 0); // Solo mostrar si tiene stock
//mostrar si tiene stock mayor a 0
$productsQuery->where('stock_quantity', '>', 0);
// Resultados paginados
$products = $query->paginate(12)->withQueryString();
$products = $productsQuery->orderBy('name', 'asc')->paginate(12)->withQueryString();
// --- 2. CONSULTA PARA EL BUSCADOR SELECT2 (TODOS) ---
// Traemos todos los productos válidos para llenar el desplegable de búsqueda rápida.
// Hacemos la misma validación de stock y tipo para no mostrar cosas agotadas.
$allProducts = Product::whereIn('type', ['bike', 'accessory', 'clothing', 'spare'])
$allProducts = Product::where('type', '!=', 'service')
->where('stock_quantity', '>', 0)
->orderBy('name') // Ordenados alfabéticamente
->orderBy('name', 'asc')
->get();
// Devuelve la vista pasando ambas variables
// Devuelve la vista
return view('catalogo.index', compact('products', 'allProducts'));
}
@@ -48,4 +48,4 @@ class CatalogoController extends Controller
{
return view('catalogo.show', compact('product'));
}
}
}
app/Http/Controllers/ProductosController.php
+11 -8
View File
@@ -16,12 +16,15 @@ class ProductosController extends Controller
{
$query = $request->input('search');
$status = $request->input('stock_status');
$type = $request->input('type');
$products = Product::query()
->when($query, function ($q) use ($query) {
// CORREGIDO: Filtramos solo por description
return $q->where('name', 'like', "%{$query}%");
})
->when($type, function ($q) use ($type) {
return $q->where('type', $type);
})
->when($status, function ($q) use ($status) {
if ($status === 'low') {
return $q->whereColumn('stock_quantity', '<', 'min_stock_alert')
@@ -29,17 +32,17 @@ class ProductosController extends Controller
}
elseif ($status === 'medium') {
return $q->whereColumn('stock_quantity', '>=', 'min_stock_alert')
->whereRaw('stock_quantity <= (min_stock_alert + 1)')
->whereRaw('stock_quantity <= (min_stock_alert + 5)')
->where('type', '!=', 'service');
}
elseif ($status === 'ok') {
return $q->whereRaw('stock_quantity > (min_stock_alert + 1)')
return $q->whereRaw('stock_quantity > (min_stock_alert + 5)')
->where('type', '!=', 'service');
}
})
->orderBy('stock_quantity', 'asc')
->paginate(10)
->withQueryString();
->orderBy('stock_quantity', 'asc') // Ordena primero los que tienen poco stock
->paginate(10) // Muestra de a 10 productos
->withQueryString(); // Mantiene los filtros al pasar a la página 2, 3, etc.
return view('productos.index', compact('products'));
}
@@ -64,7 +67,7 @@ class ProductosController extends Controller
'cost' => 'nullable|numeric|min:0',
'stock_quantity' => 'required|integer|min:0',
'min_stock_alert' => 'required|integer|min:0',
'type' => 'required|in:bike,accessory,clothing,spare,service', // CORREGIDO: agregados nuevos tipos
'type' => 'required|in:bike,accessory,clothing,spare,service,children,skate,rollers,other',
'serial_number' => 'nullable|string|max:100',
'image' => 'nullable|image|mimes:jpeg,png,jpg,webp|max:2048',
]);
@@ -110,7 +113,7 @@ class ProductosController extends Controller
{
$validated = $request->validate([
'name' => 'required|string|max:255', // CORREGIDO
'type' => 'required|in:bike,accessory,clothing,spare,service', // CORREGIDO
'type' => 'required|in:bike,accessory,clothing,spare,service,children,skate,rollers,other', // CORREGIDO
'price' => 'required|numeric|min:0',
'cost' => 'nullable|numeric|min:0',
'stock_quantity' => 'required|integer|min:0',
app/Http/Controllers/TallerController.php
+2 -2
View File
@@ -35,9 +35,9 @@ class TallerController extends Controller
{
$clients = Client::orderBy('name')->get();
$products = Product::whereIn('type', ['accessory','spare'])
$products = Product::whereIn('type', ['accessory','spare', 'service'])
->where('stock_quantity', '>', 0)
->get(['id', 'name', 'price', 'sku', 'stock_quantity']); // Solo campos necesarios
->get(['id', 'name', 'price', 'stock_quantity']); // Solo campos necesarios
return view('taller.create', compact('clients', 'products'));
}