Merge branch 'giane' of https://github.com/BryamE/ProyectoLauck into bryam

app/Http/Controllers/ProductosController.php

@@ -73,28 +73,28 @@ class ProductosController extends Controller
      * Muestra el detalle de un producto.
      * Usamos Route Model Binding: Laravel busca el ID solo.
      */
-    public function show(Product $producto) 
+    public function show(Product $product) 
     {
-        return view('productos.show', compact('producto'));
+        return view('productos.show', compact('product'));
     }
 
     /**
      * Muestra el formulario de edición.
      */
-    public function edit(Product $producto)
+    public function edit(Product $product)
     {
-        return view('productos.edit', compact('producto'));
+        return view('productos.edit', compact('product'));
     }
 
     /**
      * Actualiza el producto existente.
      */
-    public function update(Request $request, Product $producto)
+    public function update(Request $request, Product $product)
     {
         $validated = $request->validate([
             'name'            => 'required|string|max:255',
             // Validamos que el SKU sea único PERO ignoramos el ID de este producto actual
-            'sku'             => ['nullable', 'string', Rule::unique('products')->ignore($producto->id)],
+            'sku'             => ['nullable', 'string', Rule::unique('products')->ignore($product->id)],
             'description'     => 'nullable|string',
             'price'           => 'required|numeric|min:0',
             'cost'            => 'nullable|numeric|min:0',
@@ -104,7 +104,7 @@ class ProductosController extends Controller
             'serial_number'   => 'nullable|string|max:100',
         ]);
 
-        $producto->update($validated);
+        $product->update($validated);
 
         return redirect()->route('productos.index')
             ->with('success', 'Producto actualizado exitosamente.');
@@ -113,9 +113,9 @@ class ProductosController extends Controller
     /**
      * Elimina el producto.
      */
-    public function destroy(Product $producto)
+    public function destroy(Product $product)
     {
-        $producto->delete();
+        $product->delete();
         return redirect()->route('productos.index')
             ->with('success', 'Producto eliminado.');
     }

app/Http/Controllers/SaleController.php

@@ -59,8 +59,8 @@ class SaleController extends Controller
                     SaleDetail::create([
                         'sale_id' => $sale->id,
                         'product_id' => $product->id,
-                        'cantidad' => $item['quantity'],
+                        'quantity' => $item['quantity'],
-                        'precio' => $product->price,
+                        'price' => $product->price,
                     ]);
                     $nuevoStock = $product->stock_quantity - $item['quantity'];
                     $product->stock_quantity = $nuevoStock;

app/Models/Product.php

@@ -13,13 +13,12 @@ class Product extends Model
 
     public function hasLowStock(): bool
     {
-        //cambiar
         return $this->stock_quantity <= $this->min_stock_alert;
     }
     
     public function supplier()
     {
-        return $this->belongsTo(Suppliers::class);
+        return $this->belongsTo(Supplier::class);
     }
 
     // Opción 1: Relación directa con los detalles (Renglones de ticket)

app/Models/Supplier.php

@@ -6,11 +6,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class Supplier extends Model
 {
-    protected $fillable = [
+    protected $fillable = [ 'name', 'phone', 'email' ];
-        'nombre',
+    
-        'telefono',
-        'email'
-    ];
     public function products()
     {
         return $this->hasMany(Product::class);

app/View/Components/Alert2.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\View\Components;
-
-use Closure;
-use Illuminate\Contracts\View\View;
-use Illuminate\View\Component;
-
-class Alert2 extends Component
-{
-    public $class;
-    //* Create a new component instance.
-    public function __construct($type = 'dark')
-    {
-        switch ($type) {
-            case 'info':
-                $class = 'text-blue-800 bg-blue-50 dark:text-blue-400';
-                break;
-            case 'danger':
-                $class = 'text-red-800 bg-red-50 dark:text-red-400';
-                break;
-            case 'success':
-                $class = 'text-green-800 bg-green-50 dark:text-green-400';
-                break;
-            case 'warning':
-                $class = 'text-yellow-800 bg-yellow-50 dark:text-yellow-300';
-                break;
-            default:
-                $class = 'text-gray-800 bg-gray-50 dark:text-gray-300';
-                break;
-        }
-        $this->class = $class;
-    }
-
-    //* Get the view / contents that represent the component.
-    public function render(): View|Closure|string
-    {
-        return view('components.alert2');
-    }
-}

database/migrations/2025_12_06_182356_create_suppliers_table.php

@@ -13,8 +13,8 @@ return new class extends Migration
     {
         Schema::create('suppliers', function (Blueprint $table) {
             $table->id();
-            $table->string('nombre');
+            $table->string('name');
-            $table->string('telefono');
+            $table->string('phone');
             $table->string('email');
             $table->timestamps();
         });

database/migrations/2025_12_06_184833_create_clients_table.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('clients', function (Blueprint $table) {
-            $table->id();
-            $table->string('nombre');
-            $table->string('telefono');
-            $table->string('email');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('clients');
-    }
-};

database/migrations/2025_12_06_201853_create_sale_details_table.php

@@ -15,8 +15,8 @@ return new class extends Migration
             $table->id();
             $table->foreignId('sale_id')->constrained()->onDelete('cascade');
             $table->foreignId('product_id')->constrained();
-            $table->integer('cantidad'); 
+            $table->integer('quantity'); 
-            $table->decimal('precio', 10, 2);
+            $table->decimal('price', 10, 2);
             $table->timestamps();
         });
     }

database/migrations/2025_12_07_023045_create_appointments_table.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('appointments', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('client_id')->constrained();            
-            $table->datetime('fecha_programada');
-            $table->string('modelo_bici')->nullable();
-            $table->string('descripcion')->nullable();
-            $table->string('estado')->default('pendiente');
-            $table->string('notas')->nullable();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('appointments');
-    }
-};

resources/views/catalogo.blade.php

@@ -2,9 +2,9 @@
     <div class="max-w-6xl mx-auto px-4 py-8">
         <h1 class="text-center text-2xl font-bold mb-8">CATÁLOGO</h1>
 
-        @if ($productos->count() > 0)
+        @if ($products->count() > 0)
             <div class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-6">
-                @foreach ($productos as $prod)
+                @foreach ($products as $prod)
                     <div class="p-4 border rounded-lg shadow-md bg-white hover:shadow-lg transition">
                         {{-- Imagen si existe --}}
                         @if (!empty($prod->imagen))

resources/views/productos/edit.blade.php

@@ -1,44 +1,44 @@
 <x-appc>
     <x-slot name="title">Lauck - Editar</x-slot>
-    <x-slot name="navTitle">Editar - {{$producto->nombre}}</x-slot>
+    <x-slot name="navTitle">Editar - {{$product->nombre}}</x-slot>
 
     <div class="w-full h-fit flex flex-col justify-start items-center gap-3 p-18">
-        <form class="w-lg mx-auto" action="{{route('productos.update',$producto)}}" method="POST">
+        <form class="w-lg mx-auto" action="{{route('productos.update',$product)}}" method="POST">
             @csrf
             @method('PUT')
             <div class="relative z-0 w-full mb-5 group">
-                <input type="text" value="{{$producto->nombre}}" name="nombre" id="nombre" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                <input type="text" value="{{$product->nombre}}" name="nombre" id="nombre" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                 <label for="nombre" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 rtl:peer-focus:left-auto peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Titulo</label>
             </div>
             <div class="relative z-0 w-full mb-5 group">
-                <input type="text" value="{{$producto->marca}}" name="marca" id="marca" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                <input type="text" value="{{$product->marca}}" name="marca" id="marca" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                 <label for="marca" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Marca</label>
             </div>
             <div class="relative z-0 w-full mb-5 group">
-                <input type="text" value="{{$producto->modelo}}" name="modelo" id="modelo" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                <input type="text" value="{{$product->modelo}}" name="modelo" id="modelo" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                 <label for="modelo" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Modelo</label>
             </div>
             <div class="relative z-0 w-full mb-5 group">
-                <textarea type="text" name="descripcion" id="descripcion" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer">{{$producto->descripcion}}</textarea>
+                <textarea type="text" name="descripcion" id="descripcion" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer">{{$product->descripcion}}</textarea>
                 <label for="descripcion" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Descripcion</label>
             </div>
             <div class="grid md:grid-cols-2 md:gap-6">
                 <div class="relative z-0 w-full mb-5 group">
-                    <input type="number" value="{{$producto->rodado}}" name="rodado" id="rodado" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                    <input type="number" value="{{$product->rodado}}" name="rodado" id="rodado" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                     <label for="rodado" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Rodado</label>
                 </div>
                 <div class="relative z-0 w-full mb-5 group">
-                    <input type="text" value="{{$producto->color}}" name="color" id="color"class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                    <input type="text" value="{{$product->color}}" name="color" id="color"class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                     <label for="color" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Color</label>
                 </div>
             </div>
             <div class="grid md:grid-cols-2 md:gap-6">
                 <div class="relative z-0 w-full mb-5 group">
-                    <input type="text" value="{{$producto->tipo}}" name="tipo" id="tipo" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
+                    <input type="text" value="{{$product->tipo}}" name="tipo" id="tipo" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer"/>
                     <label for="tipo" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Tipo</label>
                 </div>
                 <div class="relative z-0 w-full mb-5 group">
-                    <input type="number" value={{$producto->precio}} name="precio" id="precio" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer" step="0.01"/>
+                    <input type="number" value={{$product->precio}} name="precio" id="precio" class="block py-2.5 px-0 w-full text-sm text-gray-300 bg-transparent border-0 border-b-2 border-gray-300 appearance-none dark:text-white dark:border-gray-600 dark:focus:border-blue-500 focus:outline-none focus:ring-0 focus:border-blue-600 peer" step="0.01"/>
                     <label for="precio" class="peer-focus:font-medium absolute text-sm text-gray-300 dark:text-gray-300 duration-300 transform -translate-y-6 scale-75 top-3 -z-10 origin-[0] peer-focus:start-0 rtl:peer-focus:translate-x-1/4 peer-focus:text-blue-600 peer-focus:dark:text-blue-500 peer-placeholder-shown:scale-100 peer-placeholder-shown:translate-y-0 peer-focus:scale-75 peer-focus:-translate-y-6">Precio (Ej. $9999)</label>
                 </div>
             </div>
@@ -46,7 +46,7 @@
                 <button type="submit" class="w-full sm:w-auto px-4 py-2 rounded-full text-white font-semibold bg-blue-700 hover:bg-blue-800 dark:bg-blue-700 dark:hover:bg-blue-800">
                     Editar
                 </button>
-                <a href="{{route('productos.show',$producto)}}" class="w-full sm:w-auto px-5 py-2 rounded-full text-white font-semibold bg-stone-500">
+                <a href="{{route('productos.show',$product)}}" class="w-full sm:w-auto px-5 py-2 rounded-full text-white font-semibold bg-stone-500">
                     Volver
                 </a>
             </div>

resources/views/productos/show.blade.php

@@ -48,9 +48,3 @@
     </div>
 
 </x-layout>
-    
-    {{--  componente alerta --}}
-    {{-- <x-alert type="success">
-        <x-slot name="title">Jose!</x-slot>
-        <x-slot name="content">Lorem ipsum dolor sit amet consectetur adipisicing elit. Libero, vel omnis</x-slot>
-    </x-alert> --}}

resources/views/sales/create.blade.php

@@ -1,8 +1,4 @@
-@extends('layouts.app')
+<x-layout>
-
-@section('title', 'Nueva Venta')
-
-@section('main')
     <div class="py-12 bg-gray-100 min-h-screen">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             
@@ -44,7 +40,7 @@
                             <select name="client_id" class="select2-enable w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 py-2 px-3 border">
                                 <option value="">-- Consumidor Final (Anónimo) --</option>
                                 @foreach($clients as $client)
-                                <option value="{{ $client->id }}">{{ $client->nombre }} ({{ $client->telefono }})</option>
+                                    <option value="{{ $client->id }}">{{ $client->name }} ({{ $client->phone }})</option>
                                 @endforeach
                             </select>
                             
@@ -61,8 +57,8 @@
                                 <select name="items[0][product_id]" class="product-select select2-enable w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 py-2 px-3 border" required onchange="calcularTotal()">
                                     <option value="" data-price="0" selected disabled>Seleccione...</option>
                                     @foreach($products as $product)
-                                    <option value="{{ $product->id }}" data-price="{{ $product->precio }}">
+                                        <option value="{{ $product->id }}" data-price="{{ $product->price }}">
-                                        {{ $product->codigo }} - {{ $product->nombre }} (${{ $product->precio }})
+                                            {{ $product->sku }} - {{ $product->name }} (${{ $product->price }})
                                         </option>
                                     @endforeach
                                 </select>
@@ -114,7 +110,7 @@
                         </div>
     
                         <div class="flex items-end gap-4 justify-end">
-                        <a href="{{ url('/') }}" class="bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow">
+                            <a href="{{ route('sales.create') }}" class="bg-white hover:bg-gray-100 text-gray-800 font-semibold py-2 px-4 border border-gray-400 rounded shadow">
                                 Cancelar
                             </a>
                             <button type="submit" class="bg-indigo-600 hover:bg-indigo-700 text-white font-bold py-2 px-6 rounded shadow-lg">
@@ -126,6 +122,7 @@
             </div>
         </div>
     </div>
+</x-layout>
 
 @push('scripts')
 <script>
@@ -224,4 +221,3 @@
     });
 </script>
 @endpush
-@endsection

routes/web.php

@@ -41,14 +41,16 @@ Route::post('register', RegisterController::class)->name('register.store');
 
 Route::middleware(['auth'])->group(function () {
     Route::resource('productos', ProductosController::class)->parameters([
-        'productos' => 'producto' 
+        'products' => 'product' 
     ]);
+    Route::resource('clients', ClientController::class);
+    Route::get('/checker', [ProductosController::class, 'checker'])->name('productos.checker');
     Route::get('/productos/{id}', [ProductosController::class,'show'])->name('productos.show');
     Route::get('/productos/{id}/edit', [ProductosController::class,'edit'])->name('productos.edit');
-    Route::get('/checker', [ProductosController::class, 'checker'])->name('productos.checker');
+
     //Route::get('/sales', [SaleController::class, 'index'])->name('sales.index');
     Route::get('/sales/create', [SaleController::class, 'create'])->name('sales.create');
-    Route::resource('clients', ClientController::class);
+    Route::get('/sales/store', [SaleController::class, 'store'])->name('sales.store');
 });