refactor: remove PaymentProviderInterface and TelepagosProvider, simplify CheckoutService and related tests

.env.example

@@ -3,6 +3,8 @@ APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
+FRONTEND_URL=http://localhost:4200
+INTEGRATION_SECRET=
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en

Tenant_CRUD_Postman_Collection.json

@@ -0,0 +1,367 @@
+{
+	"info": {
+		"_postman_id": "76df1733-a3d8-4f2b-9ffb-7c70e3032549",
+		"name": "ShopIt - Tenant CRUD",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "List Tenants",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"url": {
+					"raw": "{{base_url}}/api/tenants",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Bootstrap Tenant",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"url": {
+					"raw": "{{base_url}}/api/tenants/bootstrap/acme.com",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants",
+						"bootstrap",
+						"acme.com"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Create Tenant (JSON)",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n    \"codigo\": \"acme\",\n    \"nombre\": \"Acme Corporation\",\n    \"dominio\": \"acme.com\",\n    \"primary_color\": \"#111111\",\n    \"secondary_color\": \"#222222\",\n    \"danger_color\": \"#333333\",\n    \"header_bg_color\": \"#444444\",\n    \"footer_bg_color\": \"#444444\",\n    \"header_logo\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==\",\n    \"footer_logo\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==\"\n}"
+				},
+				"url": {
+					"raw": "{{base_url}}/api/tenants",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Create Tenant (Form Data)",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "formdata",
+					"formdata": [
+						{
+							"key": "codigo",
+							"value": "acme",
+							"type": "text"
+						},
+						{
+							"key": "nombre",
+							"value": "Acme Corporation",
+							"type": "text"
+						},
+						{
+							"key": "dominio",
+							"value": "acme.com",
+							"type": "text"
+						},
+						{
+							"key": "primary_color",
+							"value": "#111111",
+							"type": "text"
+						},
+						{
+							"key": "secondary_color",
+							"value": "#222222",
+							"type": "text"
+						},
+						{
+							"key": "danger_color",
+							"value": "#333333",
+							"type": "text"
+						},
+						{
+							"key": "header_bg_color",
+							"value": "#444444",
+							"type": "text"
+						},
+						{
+							"key": "footer_bg_color",
+							"value": "#444444",
+							"type": "text"
+						},
+						{
+							"key": "header_logo",
+							"type": "file",
+							"src": []
+						},
+						{
+							"key": "footer_logo",
+							"type": "file",
+							"src": []
+						}
+					]
+				},
+				"url": {
+					"raw": "{{base_url}}/api/tenants",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Show Tenant",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"url": {
+					"raw": "{{base_url}}/api/tenants/acme",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants",
+						"acme"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Update Tenant (JSON)",
+			"request": {
+				"method": "PUT",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					},
+					{
+						"key": "Content-Type",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "raw",
+					"raw": "{\n    \"codigo\": \"acme\",\n    \"nombre\": \"Acme Corporation Updated\",\n    \"dominio\": \"acme.com\",\n    \"primary_color\": \"#555555\",\n    \"secondary_color\": \"#666666\",\n    \"danger_color\": \"#777777\",\n    \"header_bg_color\": \"#888888\",\n    \"footer_bg_color\": \"#888888\"\n}"
+				},
+				"url": {
+					"raw": "{{base_url}}/api/tenants/acme",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants",
+						"acme"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Update Tenant (Form Data)",
+			"request": {
+				"method": "POST",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"body": {
+					"mode": "formdata",
+					"formdata": [
+						{
+							"key": "_method",
+							"value": "PUT",
+							"type": "text"
+						},
+						{
+							"key": "codigo",
+							"value": "acme",
+							"type": "text"
+						},
+						{
+							"key": "nombre",
+							"value": "Acme Corporation Updated",
+							"type": "text"
+						},
+						{
+							"key": "dominio",
+							"value": "acme.com",
+							"type": "text"
+						},
+						{
+							"key": "primary_color",
+							"value": "#555555",
+							"type": "text"
+						},
+						{
+							"key": "secondary_color",
+							"value": "#666666",
+							"type": "text"
+						},
+						{
+							"key": "danger_color",
+							"value": "#777777",
+							"type": "text"
+						},
+						{
+							"key": "header_bg_color",
+							"value": "#888888",
+							"type": "text"
+						},
+						{
+							"key": "footer_bg_color",
+							"value": "#888888",
+							"type": "text"
+						},
+						{
+							"key": "header_logo",
+							"type": "file",
+							"src": []
+						},
+						{
+							"key": "footer_logo",
+							"type": "file",
+							"src": []
+						}
+					]
+				},
+				"url": {
+					"raw": "{{base_url}}/api/tenants/acme",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants",
+						"acme"
+					]
+				}
+			},
+			"response": []
+		},
+		{
+			"name": "Delete Tenant",
+			"request": {
+				"method": "DELETE",
+				"header": [
+					{
+						"key": "Accept",
+						"value": "application/json",
+						"type": "text"
+					}
+				],
+				"url": {
+					"raw": "{{base_url}}/api/tenants/acme",
+					"host": [
+						"{{base_url}}"
+					],
+					"path": [
+						"api",
+						"tenants",
+						"acme"
+					]
+				}
+			},
+			"response": []
+		}
+	],
+	"event": [
+		{
+			"listen": "prerequest",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					""
+				]
+			}
+		},
+		{
+			"listen": "test",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					""
+				]
+			}
+		}
+	],
+	"variable": [
+		{
+			"key": "base_url",
+			"value": "http://localhost:8000",
+			"type": "string"
+		}
+	]
+}

app/Domains/Attachable/Models/AttachableAttachment.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Domains\Attachable\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-#[Fillable([
-    'attachable_type',
-    'attachable_id',
-    'attachment_id',
-])]
-class AttachableAttachment extends Model
-{
-    protected $table = 'attachable_attachments';
-
-    public $timestamps = false;
-
-    protected function casts(): array
-    {
-        return [
-            'attachable_id' => 'integer',
-            'attachment_id' => 'integer',
-        ];
-    }
-
-    /**
-     * @return MorphTo<Model, $this>
-     */
-    public function attachable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    /**
-     * @return BelongsTo<Attachment, $this>
-     */
-    public function attachment(): BelongsTo
-    {
-        return $this->belongsTo(Attachment::class, 'attachment_id');
-    }
-}

app/Domains/Attachable/Models/Attachment.php

@@ -6,7 +6,6 @@ use App\Domains\Attachable\Enums\AttachmentType;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Str;
 
 #[Fillable([
@@ -42,10 +41,13 @@ class Attachment extends Model
     }
 
     /**
-     * @return HasMany<AttachableAttachment, $this>
+     * Get the pre-signed temporary S3 URL for this attachment.
      */
-    public function attachables(): HasMany
+    public function getTemporaryUrl(int $expiresInMinutes = 10): string
     {
-        return $this->hasMany(AttachableAttachment::class, 'attachment_id');
+        return \Illuminate\Support\Facades\Storage::disk('s3')->temporaryUrl(
+            $this->path,
+            now()->addMinutes($expiresInMinutes)
+        );
     }
 }

app/Domains/Attachable/Models/Concerns/HasAttachments.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Domains\Attachable\Models\Concerns;
-
-use App\Domains\Attachable\Models\Attachment;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphToMany;
-
-trait HasAttachments
-{
-    /**
-     * @return MorphToMany<Attachment, Model, $this>
-     */
-    public function attachments(): MorphToMany
-    {
-        return $this->morphToMany(
-            Attachment::class,
-            'attachable',
-            'attachable_attachments',
-            'attachable_id',
-            'attachment_id',
-        );
-    }
-}

app/Domains/Auth/Controllers/LoginController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\LoginUserRequest;
+use App\Domains\Auth\Models\User;
+use App\Domains\Auth\Resources\UserResource;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
+
+class LoginController extends Controller
+{
+    /**
+     * @throws ValidationException
+     */
+    public function __invoke(LoginUserRequest $request): JsonResponse
+    {
+        $credentials = $request->validated();
+        $user = User::query()->where('email', $credentials['email'])->first();
+
+        if (! $user || ! Hash::check($credentials['password'], $user->password)) {
+            throw ValidationException::withMessages([
+                'email' => 'Email o Contraseña incorrectos.',
+            ]);
+        }
+
+        $token = $user->createToken('api-token')->plainTextToken;
+
+        return response()->json([
+            'message' => 'Sesion iniciada correctamente.',
+            'token' => $token,
+            'token_type' => 'Bearer',
+            'user' => UserResource::make($user),
+        ]);
+    }
+}

app/Domains/Auth/Controllers/LogoutController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class LogoutController extends Controller
+{
+    public function __invoke(Request $request): JsonResponse
+    {
+        $user = $request->user();
+
+        $user->currentAccessToken()?->delete();
+        $user->tokens()->delete();
+        Auth::guard('web')->logout();
+
+        if ($request->hasSession()) {
+            $request->session()->invalidate();
+            $request->session()->regenerateToken();
+        }
+
+        return response()->json([
+            'message' => 'Sesion cerrada correctamente.',
+        ]);
+    }
+}

app/Domains/Auth/Controllers/MeController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class MeController
+{
+    public function __invoke(Request $request): JsonResponse
+    {
+        return response()->json($request->user());
+    }
+}

app/Domains/Auth/Controllers/RegisterController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Domains\Auth\Controllers;
+
+use App\Domains\Auth\Requests\RegisterUserRequest;
+use App\Domains\Auth\Resources\UserResource;
+use App\Domains\Auth\Services\RegisterUserService;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+
+class RegisterController extends Controller
+{
+    public function __construct(
+        protected RegisterUserService $registerUserService,
+    ) {
+    }
+
+    public function __invoke(RegisterUserRequest $request): JsonResponse
+    {
+        $user = $this->registerUserService->register($request->validated());
+
+        return UserResource::make($user)
+            ->additional(['message' => 'Usuario registrado correctamente.'])
+            ->response()
+            ->setStatusCode(201);
+    }
+}

app/Domains/Auth/Models/User.php

@@ -1,25 +1,28 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Auth\Models;
 
-// use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Laravel\Sanctum\HasApiTokens;
 
-#[Fillable(['name', 'email', 'password'])]
+#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono'])]
 #[Hidden(['password', 'remember_token'])]
 class User extends Authenticatable
 {
     /** @use HasFactory<UserFactory> */
-    use HasFactory, Notifiable;
+    use HasApiTokens, HasFactory, Notifiable;
+
+    protected static function newFactory(): UserFactory
+    {
+        return UserFactory::new();
+    }
 
     /**
-     * Get the attributes that should be cast.
-     *
      * @return array<string, string>
      */
     protected function casts(): array

app/Domains/Auth/Requests/LoginUserRequest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class LoginUserRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'email' => ['required', 'string', 'email', 'max:255'],
+            'password' => ['required', 'string'],
+        ];
+    }
+}

app/Domains/Auth/Requests/RegisterUserRequest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domains\Auth\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class RegisterUserRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'nombre_apellido' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')],
+            'password' => ['required', 'string', 'confirmed'],
+            'dni' => ['nullable', 'string', 'max:255'],
+            'telefono' => ['nullable', 'string', 'max:255'],
+        ];
+    }
+}

app/Domains/Auth/Resources/UserResource.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Auth\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Auth\Models\User
+ */
+class UserResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'nombre_apellido' => $this->nombre_apellido,
+            'email' => $this->email,
+            'dni' => $this->dni,
+            'telefono' => $this->telefono,
+        ];
+    }
+}

app/Domains/Auth/Services/RegisterUserService.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Domains\Auth\Services;
+
+use App\Domains\Auth\Models\User;
+
+class RegisterUserService
+{
+    /**
+     * @param  array{nombre_apellido: string, email: string, password: string, dni?: string|null, telefono?: string|null}  $data
+     */
+    public function register(array $data): User
+    {
+        return User::query()->create([
+            'nombre_apellido' => $data['nombre_apellido'],
+            'email' => $data['email'],
+            'password' => $data['password'],
+            'dni' => $data['dni'] ?? null,
+            'telefono' => $data['telefono'] ?? null,
+        ]);
+    }
+}

app/Domains/Auth/routes/api.php

@@ -0,0 +1,12 @@
+<?php
+
+use App\Domains\Auth\Controllers\LoginController;
+use App\Domains\Auth\Controllers\LogoutController;
+use App\Domains\Auth\Controllers\MeController;
+use App\Domains\Auth\Controllers\RegisterController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('/register', RegisterController::class);
+Route::post('/login', LoginController::class);
+Route::middleware('auth:sanctum')->post('/logout', LogoutController::class);
+Route::middleware('auth:sanctum')->get('/me', MeController::class);

app/Domains/BankAccount/Controllers/BankAccountController.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Domains\BankAccount\Controllers;
+
+use App\Domains\BankAccount\Models\BankAccount;
+use App\Domains\Tenant\Models\Tenant;
+use App\Domains\BankAccount\Requests\StoreBankAccountRequest;
+use App\Domains\BankAccount\Requests\UpdateBankAccountRequest;
+use App\Domains\BankAccount\Resources\BankAccountResource;
+use App\Domains\Tenant\Resources\TenantResource;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+
+class BankAccountController extends Controller
+{
+    public function index(Tenant $tenant): JsonResponse
+    {
+        $accounts = $tenant->bankAccounts()->latest()->get();
+        return BankAccountResource::collection($accounts)->response();
+    }
+
+    public function store(StoreBankAccountRequest $request, Tenant $tenant): JsonResponse
+    {
+        $data = $request->validated();
+        $data['tenant_code'] = $tenant->codigo;
+
+        $account = BankAccount::query()->create($data);
+
+        return BankAccountResource::make($account)->response()->setStatusCode(201);
+    }
+
+    public function show(Tenant $tenant, BankAccount $bankAccount): BankAccountResource
+    {
+        abort_if($bankAccount->tenant_code !== $tenant->codigo, 404);
+
+        return BankAccountResource::make($bankAccount);
+    }
+
+    public function update(UpdateBankAccountRequest $request, Tenant $tenant, BankAccount $bankAccount): BankAccountResource
+    {
+        abort_if($bankAccount->tenant_code !== $tenant->codigo, 404);
+
+        $bankAccount->update($request->validated());
+
+        return BankAccountResource::make($bankAccount);
+    }
+
+    public function destroy(Tenant $tenant, BankAccount $bankAccount): Response
+    {
+        abort_if($bankAccount->tenant_code !== $tenant->codigo, 404);
+
+        $bankAccount->delete();
+
+        return response()->noContent();
+    }
+
+    public function select(Tenant $tenant, BankAccount $bankAccount): TenantResource
+    {
+        abort_if($bankAccount->tenant_code !== $tenant->codigo, 400, 'La cuenta bancaria no pertenece a este tenant.');
+
+        $tenant->selected_bank_account_id = $bankAccount->id;
+        $tenant->save();
+
+        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
+    }
+
+    public function selected(Tenant $tenant): JsonResponse
+    {
+        $account = $tenant->selectedBankAccount;
+
+        abort_if(!$account, 404, 'No hay ninguna cuenta bancaria seleccionada para este tenant.');
+
+        return BankAccountResource::make($account)->response();
+    }
+}

app/Domains/BankAccount/Models/BankAccount.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Domains\BankAccount\Models;
+
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class BankAccount extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'tenant_code',
+        'titular',
+        'entidad',
+        'alias',
+        'cvu',
+    ];
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
+    }
+}

app/Domains/BankAccount/Requests/StoreBankAccountRequest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Domains\BankAccount\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreBankAccountRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'titular' => ['required', 'string', 'max:255'],
+            'entidad' => ['required', 'string', 'max:255'],
+            'alias' => ['required', 'string', 'max:255'],
+            'cvu' => ['required', 'string', 'max:255'],
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            'titular.required' => 'El campo titular es obligatorio.',
+            'titular.string' => 'El campo titular debe ser una cadena de texto.',
+            'titular.max' => 'El campo titular no debe superar los 255 caracteres.',
+            'entidad.required' => 'El campo entidad es obligatorio.',
+            'entidad.string' => 'El campo entidad debe ser una cadena de texto.',
+            'entidad.max' => 'El campo entidad no debe superar los 255 caracteres.',
+            'alias.required' => 'El campo alias es obligatorio.',
+            'alias.string' => 'El campo alias debe ser una cadena de texto.',
+            'alias.max' => 'El campo alias no debe superar los 255 caracteres.',
+            'cvu.required' => 'El campo cvu es obligatorio.',
+            'cvu.string' => 'El campo cvu debe ser una cadena de texto.',
+            'cvu.max' => 'El campo cvu no debe superar los 255 caracteres.',
+        ];
+    }
+}

app/Domains/BankAccount/Requests/UpdateBankAccountRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\BankAccount\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateBankAccountRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'titular' => ['sometimes', 'string', 'max:255'],
+            'entidad' => ['sometimes', 'string', 'max:255'],
+            'alias' => ['sometimes', 'string', 'max:255'],
+            'cvu' => ['sometimes', 'string', 'max:255'],
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function messages(): array
+    {
+        return [
+            'titular.string' => 'El campo titular debe ser una cadena de texto.',
+            'titular.max' => 'El campo titular no debe superar los 255 caracteres.',
+            'entidad.string' => 'El campo entidad debe ser una cadena de texto.',
+            'entidad.max' => 'El campo entidad no debe superar los 255 caracteres.',
+            'alias.string' => 'El campo alias debe ser una cadena de texto.',
+            'alias.max' => 'El campo alias no debe superar los 255 caracteres.',
+            'cvu.string' => 'El campo cvu debe ser una cadena de texto.',
+            'cvu.max' => 'El campo cvu no debe superar los 255 caracteres.',
+        ];
+    }
+}

app/Domains/BankAccount/Resources/BankAccountResource.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Domains\BankAccount\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\BankAccount\Models\BankAccount
+ */
+class BankAccountResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'tenant_code' => $this->tenant_code,
+            'titular' => $this->titular,
+            'entidad' => $this->entidad,
+            'alias' => $this->alias,
+            'cvu' => $this->cvu,
+        ];
+    }
+}

app/Domains/BankAccount/routes/api.php

@@ -0,0 +1,13 @@
+<?php
+
+use App\Domains\BankAccount\Controllers\BankAccountController;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
+    Route::middleware('auth:sanctum')->group(function (): void {
+        Route::get('bank-accounts/selected', [BankAccountController::class, 'selected']);
+        Route::post('bank-accounts/{bank_account}/select', [BankAccountController::class, 'select']);
+        Route::apiResource('bank-accounts', BankAccountController::class)
+            ->parameters(['bank-accounts' => 'bank_account']);
+    });
+});

app/Domains/Cart/Controllers/CartController.php

@@ -33,7 +33,9 @@ class CartController extends Controller
             (int) $request->validated('cantidad'),
         );
 
-        $response = CartResource::make($result['cart'])->response();
+        $response = CartResource::make($result['cart'])
+            ->additional(['message' => 'Producto agregado al carrito.'])
+            ->response();
 
         if ($result['guest_token'] !== null) {
             $response->withCookie($this->cartService->makeGuestTokenCookie($result['guest_token']));
@@ -54,13 +56,13 @@ class CartController extends Controller
                 $productVariant->getKey(),
                 (int) $request->validated('cantidad'),
             )
-        );
+        )->additional(['message' => 'Cantidad de producto actualizada.']);
     }
 
     public function removeItem(Request $request, Tenant $tenant, ProductVariant $productVariant): CartResource
     {
         return CartResource::make(
             $this->cartService->removeItem($tenant, $request, $productVariant->getKey())
-        );
+        )->additional(['message' => 'Producto eliminado del carrito.']);
     }
 }

app/Domains/Cart/Models/Cart.php

@@ -2,9 +2,9 @@
 
 namespace App\Domains\Cart\Models;
 
+use App\Domains\Auth\Models\User;
 use App\Domains\Catalog\Models\ProductVariant;
 use App\Domains\Tenant\Models\Tenant;
-use App\Models\User;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -68,9 +68,9 @@ class Cart extends Model
         return DB::transaction(function () use ($productVariantId, $quantity): CartItem {
             $variant = $this->resolveScopedVariant($productVariantId, true);
 
-            if ($variant->stock < $quantity) {
+            if ($variant->stock_tecnico < $quantity) {
                 throw ValidationException::withMessages([
-                    'cantidad' => 'Stock insuficiente para la variante solicitada.',
+                    'cantidad' => "Stock insuficiente para la variante solicitada. Maximo disponible: {$variant->stock_tecnico}.",
                 ]);
             }
 
@@ -90,7 +90,7 @@ class Cart extends Model
                 $item->save();
             }
 
-            $variant->decrement('stock', $quantity);
+            $variant->incrementReservedStock($quantity);
 
             return $item->fresh();
         });
@@ -114,9 +114,10 @@ class Cart extends Model
             $variant = $this->resolveScopedVariant($productVariantId, true);
             $delta = $quantity - $item->cantidad;
 
-            if ($delta > 0 && $variant->stock < $delta) {
+            if ($delta > 0 && $variant->stock_tecnico < $delta) {
+                $maxAvailable = $variant->stock_tecnico + $item->cantidad;
                 throw ValidationException::withMessages([
-                    'cantidad' => 'Stock insuficiente para actualizar la cantidad solicitada.',
+                    'cantidad' => "El máximo que se puede agregar es {$maxAvailable}.",
                 ]);
             }
 
@@ -124,11 +125,11 @@ class Cart extends Model
             $item->save();
 
             if ($delta > 0) {
-                $variant->decrement('stock', $delta);
+                $variant->incrementReservedStock($delta);
             }
 
             if ($delta < 0) {
-                $variant->increment('stock', abs($delta));
+                $variant->decrementReservedStock(abs($delta));
             }
 
             return $item->fresh();
@@ -145,7 +146,7 @@ class Cart extends Model
                 ->firstOrFail();
 
             $variant = $this->resolveScopedVariant($productVariantId, true);
-            $variant->increment('stock', $item->cantidad);
+            $variant->decrementReservedStock($item->cantidad);
             $item->delete();
         });
     }

app/Domains/Cart/Resources/CartItemResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Cart\Resources;
 
-use App\Domains\Catalog\Resources\ProductVariantDefinitionResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,21 +18,40 @@ class CartItemResource extends JsonResource
         $variant = $this->variant;
         $product = $variant?->product;
 
+        $attributesText = '';
+        if ($variant && $variant->relationLoaded('definitions')) {
+            $attributesText = $variant->definitions
+                ->map(function ($definition) {
+                    $attrName = $definition->productAttribute?->attribute?->nombre;
+                    $value = $definition->value;
+                    return $attrName ? "{$attrName}: {$value}" : $value;
+                })
+                ->filter()
+                ->implode(', ');
+        }
+
+        $productName = $product?->nombre;
+        if ($productName && $attributesText !== '') {
+            $productName .= " ({$attributesText})";
+        }
+
+        $imageUrl = null;
+        if ($variant && $variant->relationLoaded('attachments')) {
+            $firstAttachment = $variant->attachments->first();
+            if ($firstAttachment) {
+                $imageUrl = $firstAttachment->getTemporaryUrl(1440);
+            }
+        }
+
         return [
             'id' => $this->id,
             'cantidad' => $this->cantidad,
-            'precio_unitario' => $this->formatMoney($variant?->precio),
-            'subtotal' => $this->formatMoney(($variant?->precio ?? 0) * $this->cantidad),
+            'precio_unitario' => $this->formatMoney($product?->precio),
+            'product_id' => $product?->id,
+            'product_variant_id' => $this->producto_variante_id,
             'product' => $product === null ? null : [
-                'id' => $product->id,
-                'nombre' => $product->nombre,
-                'slug' => $product->slug,
-            ],
-            'variant' => $variant === null ? null : [
-                'id' => $variant->id,
-                'nombre' => $variant->nombre,
-                'slug' => $variant->slug,
-                'definitions' => ProductVariantDefinitionResource::collection($variant->definitions),
+                'nombre' => $productName,
+                'imagen' => $imageUrl,
             ],
         ];
     }

app/Domains/Cart/Resources/CartResource.php

@@ -20,7 +20,7 @@ class CartResource extends JsonResource
             : collect();
 
         $subtotal = $items->reduce(
-            fn (float $carry, $item): float => $carry + ((float) ($item->variant?->precio ?? 0) * $item->cantidad),
+            fn (float $carry, $item): float => $carry + ((float) ($item->variant?->product?->precio ?? 0) * $item->cantidad),
             0.0,
         );
 

app/Domains/Cart/Services/CartService.php

@@ -3,8 +3,8 @@
 namespace App\Domains\Cart\Services;
 
 use App\Domains\Cart\Models\Cart;
+use App\Domains\Auth\Models\User;
 use App\Domains\Tenant\Models\Tenant;
-use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -14,13 +14,13 @@ class CartService
 {
     public function show(Tenant $tenant, Request $request): Cart
     {
-        $identity = $this->resolveIdentity($request);
+        $resolvedIdentity = $this->resolveIdentity($request);
 
-        if ($identity === null) {
+        if ($resolvedIdentity === null) {
             return $this->makeEmptyCart($tenant);
         }
 
-        $cart = $this->findCart($tenant, $identity);
+        $cart = $this->findCart($tenant, $resolvedIdentity['identity']);
 
         if ($cart === null) {
             return $this->makeEmptyCart($tenant);
@@ -94,7 +94,8 @@ class CartService
     {
         return $cart->fresh()->load([
             'items.variant.product',
-            'items.variant.definitions.attribute',
+            'items.variant.definitions.productAttribute.attribute',
+            'items.variant.attachments',
         ]);
     }
 

app/Domains/Catalog/Controllers/AttributeController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Domains\Catalog\Controllers;
+
+use App\Domains\Catalog\Models\Attribute;
+use App\Domains\Catalog\Requests\StoreAttributeRequest;
+use App\Domains\Catalog\Requests\UpdateAttributeRequest;
+use App\Domains\Catalog\Resources\AttributeResource;
+use App\Domains\Catalog\Services\ProductService;
+use App\Domains\Shared\Enums\FieldType;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class AttributeController extends Controller
+{
+    public function index(Tenant $tenant): JsonResponse
+    {
+        $query = Attribute::query()
+            ->where('tenant_codigo', $tenant->codigo)
+            ->with('options')
+            ->latest();
+
+        return AttributeResource::collection($query->paginateFromRequest())->response();
+    }
+
+    public function store(StoreAttributeRequest $request, Tenant $tenant): JsonResponse
+    {
+        $attribute = ProductService::createAttribute($tenant, $request->validated());
+
+        return AttributeResource::make($attribute)->response()->setStatusCode(201);
+    }
+
+    public function show(Tenant $tenant, Attribute $attribute): AttributeResource
+    {
+        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
+
+        return AttributeResource::make($attribute->load('options'));
+    }
+
+    public function update(UpdateAttributeRequest $request, Tenant $tenant, Attribute $attribute): AttributeResource
+    {
+        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
+        $attribute = ProductService::updateAttribute($attribute, $request->validated());
+
+        return AttributeResource::make($attribute);
+    }
+
+    public function destroy(Tenant $tenant, Attribute $attribute): Response
+    {
+        $attribute = $this->resolveScopedAttribute($tenant, $attribute);
+        ProductService::deleteAttribute($attribute);
+
+        return response()->noContent();
+    }
+
+    protected function resolveScopedAttribute(Tenant $tenant, Attribute $attribute): Attribute
+    {
+        if ($attribute->tenant_codigo !== $tenant->codigo) {
+            throw new NotFoundHttpException('Attribute not found for tenant.');
+        }
+
+        return $attribute;
+    }
+}

app/Domains/Catalog/Controllers/BrandController.php

@@ -17,7 +17,7 @@ class BrandController extends Controller
     public function index(Tenant $tenant): JsonResponse
     {
         return BrandResource::collection(
-            Brand::query()->where('tenant_codigo', $tenant->codigo)->orderByDesc('id')->get()
+            Brand::query()->where('tenant_codigo', $tenant->codigo)->orderByDesc('id')->paginateFromRequest()
         )->response();
     }
 

app/Domains/Catalog/Controllers/CategoryController.php

@@ -10,6 +10,7 @@ use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class CategoryController extends Controller
@@ -18,7 +19,11 @@ class CategoryController extends Controller
     {
         return CategoryResource::collection(
             Category::query()
-                ->where('tenant_code', $tenant->codigo)
+                ->where(function ($query) use ($tenant): void {
+                    $query
+                        ->where('tenant_code', $tenant->codigo)
+                        ->orWhereNull('tenant_code');
+                })
                 ->with(['parent', 'subCategories', 'tenant'])
                 ->orderByDesc('id')
                 ->get()
@@ -47,6 +52,7 @@ class CategoryController extends Controller
     public function update(UpdateCategoryRequest $request, Tenant $tenant, Category $categoria): CategoryResource
     {
         $categoria = $this->resolveScopedCategory($tenant, $categoria);
+        $this->ensureCategoryIsMutable($categoria);
         $categoria->update($request->validated());
 
         return CategoryResource::make($categoria->load(['parent', 'subCategories', 'tenant']));
@@ -55,6 +61,7 @@ class CategoryController extends Controller
     public function destroy(Tenant $tenant, Category $categoria): Response
     {
         $categoria = $this->resolveScopedCategory($tenant, $categoria);
+        $this->ensureCategoryIsMutable($categoria);
         $categoria->delete();
 
         return response()->noContent();
@@ -62,10 +69,17 @@ class CategoryController extends Controller
 
     protected function resolveScopedCategory(Tenant $tenant, Category $category): Category
     {
-        if ($category->tenant_code !== $tenant->codigo) {
+        if ($category->tenant_code !== null && $category->tenant_code !== $tenant->codigo) {
             throw new NotFoundHttpException('Category not found for tenant.');
         }
 
         return $category;
     }
+
+    protected function ensureCategoryIsMutable(Category $category): void
+    {
+        if ($category->isGlobal()) {
+            throw new AccessDeniedHttpException('Global categories are read-only.');
+        }
+    }
 }

app/Domains/Catalog/Controllers/ProductAttributeController.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Controllers;
-
-use App\Domains\Catalog\Models\ProductAttribute;
-use App\Domains\Catalog\Requests\StoreProductAttributeRequest;
-use App\Domains\Catalog\Requests\UpdateProductAttributeRequest;
-use App\Domains\Catalog\Resources\ProductAttributeResource;
-use App\Domains\Catalog\Support\ProductAttributeType;
-use App\Domains\Tenant\Models\Tenant;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\DB;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-class ProductAttributeController extends Controller
-{
-    public function index(Tenant $tenant): JsonResponse
-    {
-        $query = ProductAttribute::query()
-            ->where('tenant_codigo', $tenant->codigo)
-            ->with('options')
-            ->latest();
-
-        return ProductAttributeResource::collection($query->get())->response();
-    }
-
-    public function store(StoreProductAttributeRequest $request, Tenant $tenant): JsonResponse
-    {
-        $attribute = DB::transaction(function () use ($request, $tenant): ProductAttribute {
-            $validated = $request->validated();
-            $options = $validated['options'] ?? [];
-            unset($validated['options']);
-
-            $type = ProductAttributeType::from((string) $validated['type']);
-            if (! $type->supportsOptions()) {
-                $validated['metadata_schema'] = null;
-                $options = [];
-            }
-
-            /** @var ProductAttribute $attribute */
-            $attribute = ProductAttribute::query()->create([
-                ...$validated,
-                'tenant_codigo' => $tenant->codigo,
-            ]);
-            $attribute->options()->createMany($options);
-
-            return $attribute->load('options');
-        });
-
-        return ProductAttributeResource::make($attribute)->response()->setStatusCode(201);
-    }
-
-    public function show(Tenant $tenant, ProductAttribute $productAttribute): ProductAttributeResource
-    {
-        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
-
-        return ProductAttributeResource::make($productAttribute->load('options'));
-    }
-
-    public function update(UpdateProductAttributeRequest $request, Tenant $tenant, ProductAttribute $productAttribute): ProductAttributeResource
-    {
-        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
-
-        $productAttribute = DB::transaction(function () use ($request, $productAttribute): ProductAttribute {
-            $validated = $request->validated();
-            $options = $validated['options'] ?? [];
-            unset($validated['options']);
-
-            $type = ProductAttributeType::from((string) $validated['type']);
-            if (! $type->supportsOptions()) {
-                $validated['metadata_schema'] = null;
-                $options = [];
-            }
-
-            $productAttribute->update($validated);
-            $productAttribute->options()->delete();
-            $productAttribute->options()->createMany($options);
-
-            return $productAttribute->load('options');
-        });
-
-        return ProductAttributeResource::make($productAttribute);
-    }
-
-    public function destroy(Tenant $tenant, ProductAttribute $productAttribute): Response
-    {
-        $productAttribute = $this->resolveScopedAttribute($tenant, $productAttribute);
-        $productAttribute->delete();
-
-        return response()->noContent();
-    }
-
-    protected function resolveScopedAttribute(Tenant $tenant, ProductAttribute $attribute): ProductAttribute
-    {
-        if ($attribute->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Product attribute not found for tenant.');
-        }
-
-        return $attribute;
-    }
-}

app/Domains/Catalog/Controllers/ProductController.php

@@ -3,53 +3,56 @@
 namespace App\Domains\Catalog\Controllers;
 
 use App\Domains\Catalog\Models\Product;
+use App\Domains\Catalog\Requests\ProductDetailRequest;
 use App\Domains\Catalog\Requests\StoreProductRequest;
 use App\Domains\Catalog\Requests\UpdateProductRequest;
 use App\Domains\Catalog\Resources\ProductResource;
+use App\Domains\Catalog\Services\ProductService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class ProductController extends Controller
 {
-    public function index(Tenant $tenant): JsonResponse
+    public function index(Tenant $tenant, ProductService $productService): JsonResponse
     {
         return ProductResource::collection(
-            Product::query()->where('tenant_codigo', $tenant->codigo)->latest()->get()
+            $productService->getProductos($tenant)
         )->response();
     }
 
-    public function store(StoreProductRequest $request, Tenant $tenant): JsonResponse
+    public function store(StoreProductRequest $request, Tenant $tenant, ProductService $productService): JsonResponse
     {
-        $product = Product::query()->create([
-            ...$request->validated(),
-            'tenant_codigo' => $tenant->codigo,
-        ]);
+        $product = $productService->create($tenant, $request->validated());
 
         return ProductResource::make($product)->response()->setStatusCode(201);
     }
 
-    public function show(Tenant $tenant, Product $producto): ProductResource
+    public function show(ProductDetailRequest $request, Tenant $tenant, Product $producto, ProductService $productService): ProductResource
     {
         $producto = $this->resolveScopedProduct($tenant, $producto);
+        $variantId = $request->query('variant_id');
+        $variantId = $variantId !== null ? (int) $variantId : null;
+        $producto = $productService->getProductDetail($tenant, $producto, $variantId);
 
         return ProductResource::make($producto);
     }
 
-    public function update(UpdateProductRequest $request, Tenant $tenant, Product $producto): ProductResource
+    public function update(UpdateProductRequest $request, Tenant $tenant, Product $producto, ProductService $productService): ProductResource
     {
         $producto = $this->resolveScopedProduct($tenant, $producto);
-        $producto->update($request->validated());
+        $producto = $productService->update($producto, $request->validated());
 
         return ProductResource::make($producto);
     }
 
-    public function destroy(Tenant $tenant, Product $producto): Response
+    public function destroy(Tenant $tenant, Product $producto, ProductService $productService): Response
     {
         $producto = $this->resolveScopedProduct($tenant, $producto);
-        $producto->delete();
+        $productService->delete($producto);
 
         return response()->noContent();
     }
@@ -57,7 +60,7 @@ class ProductController extends Controller
     protected function resolveScopedProduct(Tenant $tenant, Product $product): Product
     {
         if ($product->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Product not found for tenant.');
+            throw new NotFoundHttpException('Product not found.');
         }
 
         return $product;

app/Domains/Catalog/Controllers/ProductVariantController.php

@@ -7,103 +7,81 @@ use App\Domains\Catalog\Models\ProductVariant;
 use App\Domains\Catalog\Requests\StoreProductVariantRequest;
 use App\Domains\Catalog\Requests\UpdateProductVariantRequest;
 use App\Domains\Catalog\Resources\ProductVariantResource;
+use App\Domains\Catalog\Services\ProductService;
 use App\Domains\Tenant\Models\Tenant;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\DB;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class ProductVariantController extends Controller
 {
-    public function index(Tenant $tenant): JsonResponse
+    public function index(Tenant $tenant, Product $producto): JsonResponse
     {
+
         $query = ProductVariant::query()
-            ->whereHas('product', fn ($query) => $query->where('tenant_codigo', $tenant->codigo))
-            ->with(['product', 'definitions.attribute'])
+            ->where('producto_id', $producto->id)
+            ->with(['product', 'definitions.productAttribute.attribute.options', 'attachments'])
             ->latest();
 
-        return ProductVariantResource::collection($query->get())->response();
+        return ProductVariantResource::collection($query->paginateFromRequest())->response();
     }
 
-    public function store(StoreProductVariantRequest $request, Tenant $tenant): JsonResponse
+    public function store(StoreProductVariantRequest $request, Tenant $tenant, Product $producto, ProductService $productService): JsonResponse
     {
-        $validated = $request->validated();
-        $variant = DB::transaction(function () use ($request, $tenant): ProductVariant {
-            
-            $definitions = $validated['definitions'] ?? [];
-            unset($validated['definitions']);
+        $producto = $this->resolveScopedProduct($tenant, $producto);
 
-            $product = $this->resolveTenantProduct($tenant, (int) $validated['producto_id']);
-
-            /** @var ProductVariant $variant */
-            $variant = $product->variants()->create($validated);
-            $variant->definitions()->createMany($definitions);
-
-            return $variant->load(['product', 'definitions.attribute']);
-        });
+        $variant = $productService->createVariant($producto, $request->validated());
 
         return ProductVariantResource::make($variant)->response()->setStatusCode(201);
     }
 
-    public function show(Tenant $tenant, ProductVariant $productVariant): ProductVariantResource
+    public function show(Tenant $tenant, Product $producto, ProductVariant $productVariant): ProductVariantResource
     {
-        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
+        $producto = $this->resolveScopedProduct($tenant, $producto);
+        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
 
-        return ProductVariantResource::make($productVariant->load(['product', 'definitions.attribute']));
+        return ProductVariantResource::make($productVariant->load([
+            'attachments' => fn ($query) => $query->orderBy('attachments.id'),
+            'definitions.productAttribute.attribute.options',
+            'product.attachments' => fn ($query) => $query->orderBy('attachments.id'),
+        ]));
     }
 
-    public function update(UpdateProductVariantRequest $request, Tenant $tenant, ProductVariant $productVariant): ProductVariantResource
+    public function update(UpdateProductVariantRequest $request, Tenant $tenant, Product $producto, ProductVariant $productVariant, ProductService $productService): ProductVariantResource
     {
-        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
+        $producto = $this->resolveScopedProduct($tenant, $producto);
+        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
 
-        $productVariant = DB::transaction(function () use ($request, $tenant, $productVariant): ProductVariant {
-            $validated = $request->validated();
-            $definitions = $validated['definitions'] ?? [];
-            unset($validated['definitions']);
-
-            $this->resolveTenantProduct($tenant, (int) $validated['producto_id']);
-
-            $productVariant->update($validated);
-            $productVariant->definitions()->delete();
-            $productVariant->definitions()->createMany($definitions);
-
-            return $productVariant->load(['product', 'definitions.attribute']);
-        });
+        $productVariant = $productService->updateVariant($productVariant, $request->validated());
 
         return ProductVariantResource::make($productVariant);
     }
 
-    public function destroy(Tenant $tenant, ProductVariant $productVariant): Response
+    public function destroy(Tenant $tenant, Product $producto, ProductVariant $productVariant, ProductService $productService): Response
     {
-        $productVariant = $this->resolveScopedVariant($tenant, $productVariant);
-        $productVariant->delete();
+        $producto = $this->resolveScopedProduct($tenant, $producto);
+        $productVariant = $this->resolveScopedVariant($producto, $productVariant);
+        $productService->deleteVariant($productVariant);
 
         return response()->noContent();
     }
 
-    protected function resolveScopedVariant(Tenant $tenant, ProductVariant $variant): ProductVariant
+    protected function resolveScopedProduct(Tenant $tenant, Product $product): Product
     {
-        $variant->loadMissing('product');
-
-        if ($variant->product === null || $variant->product->tenant_codigo !== $tenant->codigo) {
-            throw new NotFoundHttpException('Product variant not found for tenant.');
-        }
-
-        return $variant;
-    }
-
-    protected function resolveTenantProduct(Tenant $tenant, int $productId): Product
-    {
-        $product = Product::query()
-            ->whereKey($productId)
-            ->where('tenant_codigo', $tenant->codigo)
-            ->first();
-
-        if ($product === null) {
+        if ($product->tenant_codigo !== $tenant->codigo) {
             throw new NotFoundHttpException('Product not found for tenant.');
         }
 
         return $product;
     }
+
+    protected function resolveScopedVariant(Product $product, ProductVariant $variant): ProductVariant
+    {
+        if ($variant->producto_id !== $product->id) {
+            throw new NotFoundHttpException('Product variant not found for product.');
+        }
+
+        return $variant;
+    }
 }

app/Domains/Catalog/Models/Attribute.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Domains\Catalog\Models;
+
+use App\Domains\Shared\Enums\FieldType;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
+
+#[Fillable([
+    'tenant_codigo',
+    'codigo',
+    'nombre',
+    'is_required',
+    'metadata_schema',
+    'type',
+])]
+class Attribute extends Model
+{
+    use HasFactory;
+
+    protected $table = 'attribute';
+
+    /**
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'is_required' => 'boolean',
+            'metadata_schema' => 'array',
+            'type' => FieldType::class,
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
+    }
+
+    /**
+     * @return HasMany<AttributeOption, $this>
+     */
+    public function options(): HasMany
+    {
+        return $this->hasMany(AttributeOption::class, 'attribute_id')->orderBy('sort_order');
+    }
+
+    /**
+     * @return HasMany<ProductAttribute, $this>
+     */
+    public function productAttributes(): HasMany
+    {
+        return $this->hasMany(ProductAttribute::class, 'attribute_id');
+    }
+
+    /**
+     * @return HasManyThrough<ProductVariantDefinition, ProductAttribute, $this>
+     */
+    public function variantDefinitions(): HasManyThrough
+    {
+        return $this->hasManyThrough(
+            ProductVariantDefinition::class,
+            ProductAttribute::class,
+            'attribute_id',
+            'products_attribute_id',
+            'id',
+            'id'
+        );
+    }
+}

app/Domains/Catalog/Models/AttributeOption.php

@@ -9,11 +9,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 #[Fillable([
     'attribute_id',
+    'value',
     'label',
     'sort_order',
     'metadata',
 ])]
-class ProductAttributeOption extends Model
+class AttributeOption extends Model
 {
     use HasFactory;
 
@@ -31,10 +32,10 @@ class ProductAttributeOption extends Model
     }
 
     /**
-     * @return BelongsTo<ProductAttribute, $this>
+     * @return BelongsTo<Attribute, $this>
      */
     public function attribute(): BelongsTo
     {
-        return $this->belongsTo(ProductAttribute::class, 'attribute_id');
+        return $this->belongsTo(Attribute::class, 'attribute_id');
     }
 }

app/Domains/Catalog/Models/Product.php

@@ -2,16 +2,22 @@
 
 namespace App\Domains\Catalog\Models;
 
+use App\Domains\Attachable\Models\Attachment;
+use App\Domains\Catalog\Models\Brand;
+use App\Domains\Catalog\Models\Category;
+use App\Domains\Catalog\Models\ProductAttribute;
 use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
     'tenant_codigo',
     'categoria_id',
+    'brand_id',
     'slug',
     'nombre',
     'descripcion',
@@ -22,11 +28,13 @@ class Product extends Model
     use HasFactory;
 
     protected $table = 'productos';
-
+    
+    protected ?ProductVariant $selectedVariant = null;
     protected function casts(): array
     {
         return [
             'categoria_id' => 'integer',
+            'brand_id' => 'integer',
             'precio' => 'decimal:2',
         ];
     }
@@ -39,6 +47,22 @@ class Product extends Model
         return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
     }
 
+    /**
+     * @return BelongsTo<Category, $this>
+     */
+    public function category(): BelongsTo
+    {
+        return $this->belongsTo(Category::class, 'categoria_id');
+    }
+
+    /**
+     * @return BelongsTo<Brand, $this>
+     */
+    public function brand(): BelongsTo
+    {
+        return $this->belongsTo(Brand::class, 'brand_id');
+    }
+
     /**
      * @return HasMany<ProductVariant, $this>
      */
@@ -46,4 +70,235 @@ class Product extends Model
     {
         return $this->hasMany(ProductVariant::class, 'producto_id');
     }
+
+    /**
+     * @return BelongsToMany<Attribute, $this>
+     */
+    public function attributes(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Attribute::class,
+            'products_attributes',
+            'product_id',
+            'attribute_id'
+        )->withTimestamps();
+    }
+
+    /**
+     * @return HasMany<ProductAttribute, $this>
+     */
+    public function productAttributes(): HasMany
+    {
+        return $this->hasMany(ProductAttribute::class, 'product_id');
+    }
+
+    /**
+     * @return BelongsToMany<Attachment, $this>
+     */
+    public function attachments(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Attachment::class,
+            'productos_attachments',
+            'producto_id',
+            'attachment_id'
+        )->withTimestamps();
+    }
+
+    /**
+     * Create a variant for this product with its definitions.
+     *
+     * @param array<string, mixed> $data
+     */
+    public function createVariant(array $data): ProductVariant
+    {
+        $definitions = $data['definitions'] ?? [];
+        $this->validateVariantDefinitions($definitions);
+
+        unset($data['definitions']);
+
+        /** @var ProductVariant $variant */
+        $variant = $this->variants()->create($data);
+        $variant->definitions()->createMany($definitions);
+
+        return $variant;
+    }
+
+    /**
+     * Create multiple variants for this product.
+     *
+     * @param array<int, array<string, mixed>> $variantsData
+     * @return \Illuminate\Database\Eloquent\Collection<int, ProductVariant>
+     */
+    public function createVariants(array $variantsData): \Illuminate\Database\Eloquent\Collection
+    {
+        $variants = new \Illuminate\Database\Eloquent\Collection();
+
+        foreach ($variantsData as $variantData) {
+            $variants->push($this->createVariant($variantData));
+        }
+
+        return $variants;
+    }
+
+    /**
+     * Update a product variant.
+     *
+     * @param array<string, mixed> $data
+     */
+    public function updateVariant(ProductVariant $variant, array $data): ProductVariant
+    {
+        $definitions = $data['definitions'] ?? [];
+        $this->validateVariantDefinitions($definitions);
+
+        unset($data['definitions']);
+        unset($data['producto_id']);
+
+        $variant->update($data);
+        $variant->definitions()->delete();
+        $variant->definitions()->createMany($definitions);
+
+        return $variant;
+    }
+
+    /**
+     * Delete a product variant.
+     */
+    public function deleteVariant(ProductVariant $variant): void
+    {
+        $variant->definitions()->delete();
+        $variant->delete();
+    }
+
+    /**
+     * Validate variant definitions options against Attribute configuration.
+     *
+     * @param array $definitions
+     * @throws \InvalidArgumentException
+     */
+    protected function validateVariantDefinitions(array $definitions): void
+    {
+        foreach ($definitions as $definition) {
+            $productAttributeId = $definition['products_attribute_id'] ?? null;
+            if (! $productAttributeId) {
+                continue;
+            }
+
+            $productAttribute = $this->productAttributes()
+                ->with('attribute.options')
+                ->find($productAttributeId);
+
+            $attribute = $productAttribute?->attribute;
+
+            if (! $productAttribute || ! $attribute) {
+                throw new \InvalidArgumentException("Product attribute with ID {$productAttributeId} not found for product {$this->id}.");
+            }
+
+            if ($attribute->type === \App\Domains\Shared\Enums\FieldType::Select) {
+                $allowedValues = $attribute->options()->pluck('value')->toArray();
+                $val = $definition['value'] ?? null;
+                if ($val !== null && ! in_array($val, $allowedValues, true)) {
+                    throw new \InvalidArgumentException("The value '{$val}' is not a valid option for the select attribute '{$attribute->nombre}'.");
+                }
+            } elseif ($attribute->type === \App\Domains\Shared\Enums\FieldType::Multiselect) {
+                $allowedValues = $attribute->options()->pluck('value')->toArray();
+                $val = $definition['value'] ?? null;
+                if ($val !== null) {
+                    $values = [];
+                    if (is_array($val)) {
+                        $values = $val;
+                    } else {
+                        $decoded = json_decode($val, true);
+                        if (is_array($decoded)) {
+                            $values = $decoded;
+                        } else {
+                            $values = array_map('trim', explode(',', $val));
+                        }
+                    }
+                    foreach ($values as $v) {
+                        if (! in_array($v, $allowedValues, true)) {
+                            throw new \InvalidArgumentException("The value '{$v}' is not a valid option for the multiselect attribute '{$attribute->nombre}'.");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Create an attribute.
+     *
+     * @param array<string, mixed> $data
+     */
+    public static function createAttribute(Tenant $tenant, array $data): Attribute
+    {
+        $options = $data['options'] ?? [];
+        unset($data['options']);
+
+        $type = \App\Domains\Shared\Enums\FieldType::from((string) $data['type']);
+        if (! $type->supportsOptions() && ! empty($options)) {
+            throw new \InvalidArgumentException('Options are only allowed for select and multiselect attributes.');
+        }
+
+        if (! $type->supportsOptions()) {
+            $data['metadata_schema'] = null;
+        }
+
+        /** @var Attribute $attribute */
+        $attribute = Attribute::query()->create([
+            ...$data,
+            'tenant_codigo' => $tenant->codigo,
+        ]);
+        $attribute->options()->createMany($options);
+
+        return $attribute->load('options');
+    }
+
+    /**
+     * Update an attribute.
+     *
+     * @param array<string, mixed> $data
+     */
+    public static function updateAttribute(Attribute $attribute, array $data): Attribute
+    {
+        $options = $data['options'] ?? [];
+        unset($data['options']);
+
+        $typeStr = $data['type'] ?? $attribute->type->value;
+        $type = \App\Domains\Shared\Enums\FieldType::from((string) $typeStr);
+        if (! $type->supportsOptions() && ! empty($options)) {
+            throw new \InvalidArgumentException('Options are only allowed for select and multiselect attributes.');
+        }
+
+        if (! $type->supportsOptions()) {
+            $data['metadata_schema'] = null;
+        }
+
+        $attribute->update($data);
+        $attribute->options()->delete();
+        $attribute->options()->createMany($options);
+
+        return $attribute->load('options');
+    }
+
+    /**
+     * Delete an attribute.
+     */
+    public static function deleteAttribute(Attribute $attribute): void
+    {
+        $attribute->options()->delete();
+        $attribute->delete();
+    }
+
+    
+
+    public function setSelectedVariant(ProductVariant $variant): void
+    {
+        $this->selectedVariant = $variant;
+    }
+
+    public function getSelectedVariant(): ?ProductVariant
+    {
+        return $this->selectedVariant;
+    }
 }

app/Domains/Catalog/Models/ProductAttribute.php

@@ -2,8 +2,6 @@
 
 namespace App\Domains\Catalog\Models;
 
-use App\Domains\Catalog\Support\ProductAttributeType;
-use App\Domains\Tenant\Models\Tenant;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -11,45 +9,29 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 #[Fillable([
-    'tenant_codigo',
-    'codigo',
-    'nombre',
-    'is_required',
-    'metadata_schema',
-    'type',
+    'product_id',
+    'attribute_id',
 ])]
 class ProductAttribute extends Model
 {
     use HasFactory;
 
-    protected $table = 'productos_attributes';
+    protected $table = 'products_attributes';
 
     /**
-     * @return array<string, string>
+     * @return BelongsTo<Product, $this>
      */
-    protected function casts(): array
+    public function product(): BelongsTo
     {
-        return [
-            'is_required' => 'boolean',
-            'metadata_schema' => 'array',
-            'type' => ProductAttributeType::class,
-        ];
+        return $this->belongsTo(Product::class, 'product_id');
     }
 
     /**
-     * @return BelongsTo<Tenant, $this>
+     * @return BelongsTo<Attribute, $this>
      */
-    public function tenant(): BelongsTo
+    public function attribute(): BelongsTo
     {
-        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
-    }
-
-    /**
-     * @return HasMany<ProductAttributeOption, $this>
-     */
-    public function options(): HasMany
-    {
-        return $this->hasMany(ProductAttributeOption::class, 'attribute_id')->orderBy('sort_order');
+        return $this->belongsTo(Attribute::class, 'attribute_id');
     }
 
     /**
@@ -57,6 +39,6 @@ class ProductAttribute extends Model
      */
     public function variantDefinitions(): HasMany
     {
-        return $this->hasMany(ProductVariantDefinition::class, 'attribute_id');
+        return $this->hasMany(ProductVariantDefinition::class, 'products_attribute_id');
     }
 }

app/Domains/Catalog/Models/ProductVariant.php

@@ -2,19 +2,22 @@
 
 namespace App\Domains\Catalog\Models;
 
+use App\Domains\Attachable\Models\Attachment;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
+use Illuminate\Database\Eloquent\Casts\Attribute;
+
 #[Fillable([
     'producto_id',
-    'slug',
-    'nombre',
+    'stock_real',
+    'stock_reservado',
     'stock',
-    'descripcion',
-    'precio',
+    'is_placeholder',
 ])]
 class ProductVariant extends Model
 {
@@ -22,12 +25,88 @@ class ProductVariant extends Model
 
     protected $table = 'productos_variantes';
 
+    protected $appends = ['stock_tecnico'];
+
+    protected static function booted(): void
+    {
+        static::saving(function (ProductVariant $variant) {
+            $variant->validateStock();
+        });
+    }
+
+    public function validateStock(): void
+    {
+        if ($this->stock_real < 0) {
+            throw new \InvalidArgumentException('El stock real no puede ser negativo.');
+        }
+
+        if ($this->stock_reservado < 0) {
+            throw new \InvalidArgumentException('El stock reservado no puede ser negativo.');
+        }
+
+        if ($this->stock_reservado > $this->stock_real) {
+            throw new \InvalidArgumentException('El stock reservado no puede ser mayor que el stock real.');
+        }
+    }
+
+    public function incrementRealStock(int $amount): void
+    {
+        if ($amount < 0) {
+            throw new \InvalidArgumentException('El monto a incrementar debe ser positivo.');
+        }
+        $this->stock_real += $amount;
+        $this->save();
+    }
+
+    public function decrementRealStock(int $amount): void
+    {
+        if ($amount < 0) {
+            throw new \InvalidArgumentException('El monto a decrementar debe ser positivo.');
+        }
+        $this->stock_real -= $amount;
+        $this->save();
+    }
+
+    public function incrementReservedStock(int $amount): void
+    {
+        if ($amount < 0) {
+            throw new \InvalidArgumentException('El monto a incrementar debe ser positivo.');
+        }
+        $this->stock_reservado += $amount;
+        $this->save();
+    }
+
+    public function decrementReservedStock(int $amount): void
+    {
+        if ($amount < 0) {
+            throw new \InvalidArgumentException('El monto a decrementar debe ser positivo.');
+        }
+        $this->stock_reservado -= $amount;
+        $this->save();
+    }
+
+    protected function stockTecnico(): Attribute
+    {
+        return Attribute::get(fn () => $this->stock_real - $this->stock_reservado);
+    }
+
+    protected function stock(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => $this->stock_real,
+            set: fn ($value) => [
+                'stock_real' => $value,
+            ]
+        );
+    }
+
     protected function casts(): array
     {
         return [
             'producto_id' => 'integer',
-            'stock' => 'integer',
-            'precio' => 'decimal:2',
+            'stock_real' => 'integer',
+            'stock_reservado' => 'integer',
+            'is_placeholder' => 'boolean',
         ];
     }
 
@@ -46,4 +125,17 @@ class ProductVariant extends Model
     {
         return $this->hasMany(ProductVariantDefinition::class, 'producto_variante_id');
     }
+
+    /**
+     * @return BelongsToMany<Attachment, $this>
+     */
+    public function attachments(): BelongsToMany
+    {
+        return $this->belongsToMany(
+            Attachment::class,
+            'variantes_attachments',
+            'variante_id',
+            'attachment_id'
+        )->withTimestamps();
+    }
 }

app/Domains/Catalog/Models/ProductVariantDefinition.php

@@ -9,14 +9,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 #[Fillable([
     'producto_variante_id',
-    'attribute_id',
+    'products_attribute_id',
     'value',
 ])]
 class ProductVariantDefinition extends Model
 {
     use HasFactory;
 
-    protected $table = 'productos_variantes_definiciones';
+    protected $table = 'productos_variantes_values';
 
     /**
      * @return BelongsTo<ProductVariant, $this>
@@ -29,8 +29,8 @@ class ProductVariantDefinition extends Model
     /**
      * @return BelongsTo<ProductAttribute, $this>
      */
-    public function attribute(): BelongsTo
+    public function productAttribute(): BelongsTo
     {
-        return $this->belongsTo(ProductAttribute::class, 'attribute_id');
+        return $this->belongsTo(ProductAttribute::class, 'products_attribute_id');
     }
 }

app/Domains/Catalog/Requests/ProductDetailRequest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Catalog\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProductDetailRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'variant_id' => ['sometimes', 'integer'],
+        ];
+    }
+}

app/Domains/Catalog/Requests/StoreAttributeRequest.php

@@ -2,12 +2,12 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Catalog\Support\ProductAttributeType;
+use App\Domains\Shared\Enums\FieldType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Validator;
 
-class StoreProductAttributeRequest extends FormRequest
+class StoreAttributeRequest extends FormRequest
 {
     public function authorize(): bool
     {
@@ -24,25 +24,26 @@ class StoreProductAttributeRequest extends FormRequest
                 'required',
                 'string',
                 'max:255',
-                Rule::unique('productos_attributes', 'codigo')->where(
+                Rule::unique('attribute', 'codigo')->where(
                     fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
                 ),
             ],
             'nombre' => ['required', 'string', 'max:255'],
             'is_required' => ['sometimes', 'boolean'],
             'metadata_schema' => ['nullable', 'array'],
-            'type' => ['required', Rule::enum(ProductAttributeType::class)],
+            'type' => ['required', Rule::enum(FieldType::class)],
             'options' => [
                 Rule::requiredIf(fn (): bool => in_array($this->input('type'), [
-                    ProductAttributeType::Select->value,
-                    ProductAttributeType::Multiselect->value,
+                    FieldType::Select->value,
+                    FieldType::Multiselect->value,
                 ], true)),
                 Rule::prohibitedIf(fn (): bool => ! in_array($this->input('type'), [
-                    ProductAttributeType::Select->value,
-                    ProductAttributeType::Multiselect->value,
+                    FieldType::Select->value,
+                    FieldType::Multiselect->value,
                 ], true)),
                 'array',
             ],
+            'options.*.value' => ['required', 'string', 'max:255'],
             'options.*.label' => ['required', 'string', 'max:255'],
             'options.*.sort_order' => ['sometimes', 'integer'],
             'options.*.metadata' => ['nullable', 'array'],
@@ -53,7 +54,7 @@ class StoreProductAttributeRequest extends FormRequest
     {
         $validator->after(function (Validator $validator): void {
             $type = $this->input('type');
-            $supportsOptions = in_array($type, [ProductAttributeType::Select->value, ProductAttributeType::Multiselect->value], true);
+            $supportsOptions = in_array($type, [FieldType::Select->value, FieldType::Multiselect->value], true);
 
             if (! $supportsOptions && $this->filled('metadata_schema')) {
                 $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');

app/Domains/Catalog/Requests/StoreProductRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Catalog\Requests;
 
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -19,10 +20,28 @@ class StoreProductRequest extends FormRequest
     {
         return [
             'categoria_id' => ['required', 'integer'],
+            'brand_id' => [
+                'required',
+                'integer',
+                Rule::exists('brands', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
             'slug' => ['required', 'string', 'max:255', Rule::unique('productos', 'slug')],
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
+            'stock' => ['sometimes', 'integer', 'min:0'],
+            'attribute_ids' => ['sometimes', 'array'],
+            'attribute_ids.*' => [
+                'required',
+                'integer',
+                Rule::exists('attribute', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'images' => ['sometimes', 'nullable', 'array'],
+            'images.*' => ['required', new ImageOrBase64Rule()],
         ];
     }
 }

app/Domains/Catalog/Requests/StoreProductVariantRequest.php

@@ -2,6 +2,7 @@
 
 namespace App\Domains\Catalog\Requests;
 
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -18,35 +19,19 @@ class StoreProductVariantRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'producto_id' => [
-                'required',
-                'integer',
-                Rule::exists('productos', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'slug' => [
-                'nullable',
-                'string',
-                'max:255',
-                Rule::unique('productos_variantes', 'slug')->where(
-                    fn ($query) => $query->where('producto_id', $this->input('producto_id'))
-                ),
-            ],
-            'nombre' => ['nullable', 'string', 'max:255'],
             'stock' => ['sometimes', 'integer', 'min:0'],
-            'descripcion' => ['nullable', 'string'],
-            'precio' => ['required', 'numeric', 'min:0'],
             'definitions' => ['sometimes', 'array'],
-            'definitions.*.attribute_id' => [
+            'definitions.*.products_attribute_id' => [
                 'required',
                 'integer',
                 'distinct',
-                Rule::exists('productos_attributes', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                Rule::exists('products_attributes', 'id')->where(
+                    fn ($query) => $query->where('product_id', $this->route('producto')?->id)
                 ),
             ],
             'definitions.*.value' => ['nullable', 'string'],
+            'images' => ['sometimes', 'nullable', 'array'],
+            'images.*' => ['required', new ImageOrBase64Rule()],
         ];
     }
 }

app/Domains/Catalog/Requests/UpdateAttributeRequest.php

@@ -2,13 +2,13 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Catalog\Models\ProductAttribute;
-use App\Domains\Catalog\Support\ProductAttributeType;
+use App\Domains\Catalog\Models\Attribute;
+use App\Domains\Shared\Enums\FieldType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Validator;
 
-class UpdateProductAttributeRequest extends FormRequest
+class UpdateAttributeRequest extends FormRequest
 {
     public function authorize(): bool
     {
@@ -20,23 +20,24 @@ class UpdateProductAttributeRequest extends FormRequest
      */
     public function rules(): array
     {
-        /** @var ProductAttribute|null $attribute */
-        $attribute = $this->route('productAttribute');
+        /** @var Attribute|null $attribute */
+        $attribute = $this->route('attribute');
 
         return [
             'codigo' => [
                 'required',
                 'string',
                 'max:255',
-                Rule::unique('productos_attributes', 'codigo')
+                Rule::unique('attribute', 'codigo')
                     ->ignore($attribute?->id)
                     ->where(fn ($query) => $query->where('tenant_codigo', $attribute?->tenant_codigo)),
             ],
             'nombre' => ['required', 'string', 'max:255'],
             'is_required' => ['sometimes', 'boolean'],
             'metadata_schema' => ['nullable', 'array'],
-            'type' => ['required', Rule::enum(ProductAttributeType::class)],
+            'type' => ['required', Rule::enum(FieldType::class)],
             'options' => ['sometimes', 'array'],
+            'options.*.value' => ['required', 'string', 'max:255'],
             'options.*.label' => ['required', 'string', 'max:255'],
             'options.*.sort_order' => ['sometimes', 'integer'],
             'options.*.metadata' => ['nullable', 'array'],
@@ -47,7 +48,7 @@ class UpdateProductAttributeRequest extends FormRequest
     {
         $validator->after(function (Validator $validator): void {
             $type = $this->input('type');
-            $supportsOptions = in_array($type, [ProductAttributeType::Select->value, ProductAttributeType::Multiselect->value], true);
+            $supportsOptions = in_array($type, [FieldType::Select->value, FieldType::Multiselect->value], true);
 
             if (! $supportsOptions && $this->filled('metadata_schema')) {
                 $validator->errors()->add('metadata_schema', 'The metadata_schema field is only allowed for select and multiselect attributes.');

app/Domains/Catalog/Requests/UpdateProductRequest.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Catalog\Requests;
 
 use App\Domains\Catalog\Models\Product;
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -23,6 +24,13 @@ class UpdateProductRequest extends FormRequest
 
         return [
             'categoria_id' => ['required', 'integer'],
+            'brand_id' => [
+                'required',
+                'integer',
+                Rule::exists('brands', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
             'slug' => [
                 'required',
                 'string',
@@ -32,6 +40,16 @@ class UpdateProductRequest extends FormRequest
             'nombre' => ['required', 'string', 'max:255'],
             'descripcion' => ['nullable', 'string'],
             'precio' => ['required', 'numeric', 'min:0'],
+            'attribute_ids' => ['sometimes', 'array'],
+            'attribute_ids.*' => [
+                'required',
+                'integer',
+                Rule::exists('attribute', 'id')->where(
+                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                ),
+            ],
+            'images' => ['sometimes', 'nullable', 'array'],
+            'images.*' => ['required', new ImageOrBase64Rule()],
         ];
     }
 }

app/Domains/Catalog/Requests/UpdateProductVariantRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Catalog\Requests;
 
-use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -18,39 +18,20 @@ class UpdateProductVariantRequest extends FormRequest
      */
     public function rules(): array
     {
-        /** @var ProductVariant|null $productVariant */
-        $productVariant = $this->route('productVariant');
-
         return [
-            'producto_id' => [
-                'required',
-                'integer',
-                Rule::exists('productos', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
-                ),
-            ],
-            'slug' => [
-                'nullable',
-                'string',
-                'max:255',
-                Rule::unique('productos_variantes', 'slug')
-                    ->ignore($productVariant?->id)
-                    ->where(fn ($query) => $query->where('producto_id', $this->input('producto_id'))),
-            ],
-            'nombre' => ['nullable', 'string', 'max:255'],
             'stock' => ['sometimes', 'integer', 'min:0'],
-            'descripcion' => ['nullable', 'string'],
-            'precio' => ['required', 'numeric', 'min:0'],
             'definitions' => ['sometimes', 'array'],
-            'definitions.*.attribute_id' => [
+            'definitions.*.products_attribute_id' => [
                 'required',
                 'integer',
                 'distinct',
-                Rule::exists('productos_attributes', 'id')->where(
-                    fn ($query) => $query->where('tenant_codigo', $this->route('tenant')?->codigo)
+                Rule::exists('products_attributes', 'id')->where(
+                    fn ($query) => $query->where('product_id', $this->route('producto')?->id)
                 ),
             ],
             'definitions.*.value' => ['nullable', 'string'],
+            'images' => ['sometimes', 'nullable', 'array'],
+            'images.*' => ['required', new ImageOrBase64Rule()],
         ];
     }
 }

app/Domains/Catalog/Resources/AttributeOptionResource.php

@@ -6,9 +6,9 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Catalog\Models\ProductAttributeOption
+ * @mixin \App\Domains\Catalog\Models\AttributeOption
  */
-class ProductAttributeOptionResource extends JsonResource
+class AttributeOptionResource extends JsonResource
 {
     /**
      * @return array<string, mixed>
@@ -17,6 +17,7 @@ class ProductAttributeOptionResource extends JsonResource
     {
         return [
             'id' => $this->id,
+            'value' => $this->value,
             'label' => $this->label,
             'sort_order' => $this->sort_order,
             'metadata' => $this->metadata,

app/Domains/Catalog/Resources/AttributeResource.php

@@ -6,9 +6,9 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Catalog\Models\ProductAttribute
+ * @mixin \App\Domains\Catalog\Models\Attribute
  */
-class ProductAttributeResource extends JsonResource
+class AttributeResource extends JsonResource
 {
     /**
      * @return array<string, mixed>
@@ -17,13 +17,12 @@ class ProductAttributeResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'tenant_codigo' => $this->tenant_codigo,
             'codigo' => $this->codigo,
             'nombre' => $this->nombre,
             'is_required' => $this->is_required,
             'metadata_schema' => $this->metadata_schema,
             'type' => $this->type?->value ?? $this->type,
-            'options' => ProductAttributeOptionResource::collection($this->whenLoaded('options')),
+            'options' => AttributeOptionResource::collection($this->whenLoaded('options')),
         ];
     }
 }

app/Domains/Catalog/Resources/BrandResource.php

@@ -17,7 +17,6 @@ class BrandResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'tenant_codigo' => $this->tenant_codigo,
             'nombre' => $this->nombre,
             'descripcion' => $this->descripcion,
         ];

app/Domains/Catalog/Resources/CategoryResource.php

@@ -2,7 +2,6 @@
 
 namespace App\Domains\Catalog\Resources;
 
-use App\Domains\Tenant\Resources\TenantResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -18,15 +17,28 @@ class CategoryResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'tenant_code' => $this->tenant_code,
             'is_global' => $this->resource->isGlobal(),
-            'tenant' => $this->resource->isGlobal()
-                ? null
-                : TenantResource::make($this->whenLoaded('tenant')),
-            'categoria_id' => $this->categoria_id,
             'nombre' => $this->nombre,
-            'parent' => self::make($this->whenLoaded('parent')),
-            'sub_categories' => self::collection($this->whenLoaded('subCategories')),
+            'parent' => $this->whenLoaded('parent', fn () => $this->serializeRelatedCategory($this->parent)),
+            'sub_categories' => $this->whenLoaded('subCategories', fn () =>
+                $this->subCategories->map(fn ($category) => $this->serializeRelatedCategory($category))->values()
+            ),
+        ];
+    }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    protected function serializeRelatedCategory(?\App\Domains\Catalog\Models\Category $category): ?array
+    {
+        if ($category === null) {
+            return null;
+        }
+
+        return [
+            'id' => $category->id,
+            'is_global' => $category->isGlobal(),
+            'nombre' => $category->nombre,
         ];
     }
 }

app/Domains/Catalog/Resources/ProductResource.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Catalog\Resources;
 
+use App\Domains\Catalog\Models\Product;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Catalog\Models\Product
+ * @mixin Product
  */
 class ProductResource extends JsonResource
 {
@@ -17,14 +18,36 @@ class ProductResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'tenant_codigo' => $this->tenant_codigo,
-            'categoria_id' => $this->categoria_id,
+            'category_id' => $this->categoria_id,
+            'brand_id' => $this->brand_id,
             'slug' => $this->slug,
             'nombre' => $this->nombre,
             'descripcion' => $this->descripcion,
             'precio' => $this->precio,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'category' => $this->whenLoaded('category', fn () => $this->category?->nombre),
+            'brand' => $this->whenLoaded('brand', fn () => $this->brand?->nombre),
+            'images' => $this->whenLoaded('attachments', fn () => $this->attachments
+                ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                ->values()
+            ),
+            'attributes' => AttributeResource::collection($this->whenLoaded('attributes')),
+            'variants_map' => $this->whenLoaded('variants', fn () => $this->variants
+                ->map(fn ($variant) => [
+                    'variant_id' => $variant->id,
+                    'cantidad_maxima' => $variant->stock_tecnico,
+                    'attributes' => $variant->definitions
+                        ->mapWithKeys(fn ($definition) => [
+                            $definition->productAttribute?->attribute?->codigo => $definition->value,
+                        ])
+                        ->filter(fn ($value, $key) => $key !== null)
+                        ->toArray(),
+                ])
+                ->values()
+            ),
+            'variant' => $this->when(
+                $this->getSelectedVariant() !== null,
+                fn () => ProductVariantResource::make($this->getSelectedVariant())
+            ),
         ];
     }
 }

app/Domains/Catalog/Resources/ProductVariantDefinitionResource.php

@@ -18,9 +18,35 @@ class ProductVariantDefinitionResource extends JsonResource
         return [
             'id' => $this->id,
             'producto_variante_id' => $this->producto_variante_id,
-            'attribute_id' => $this->attribute_id,
+            'products_attribute_id' => $this->products_attribute_id,
+            'attribute_id' => $this->whenLoaded('productAttribute', fn () => $this->productAttribute?->attribute_id),
             'value' => $this->value,
-            'attribute' => ProductAttributeResource::make($this->whenLoaded('attribute')),
+            'attribute' => $this->whenLoaded('productAttribute', fn () => $this->productAttribute?->attribute?->nombre),
+            'metadata' => $this->resolveMetadata(),
         ];
     }
+
+    /**
+     * @return array<string, mixed>|null
+     */
+    protected function resolveMetadata(): ?array
+    {
+        if (! $this->relationLoaded('productAttribute')) {
+            return null;
+        }
+
+        $attribute = $this->productAttribute?->attribute;
+
+        if (! $attribute?->relationLoaded('options')) {
+            return null;
+        }
+
+        $option = $attribute->options->firstWhere('value', $this->value);
+
+        if ($option === null || $option->metadata === null) {
+            return null;
+        }
+
+        return $option->metadata;
+    }
 }

app/Domains/Catalog/Resources/ProductVariantResource.php

@@ -2,11 +2,12 @@
 
 namespace App\Domains\Catalog\Resources;
 
+use App\Domains\Catalog\Models\ProductVariant;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin \App\Domains\Catalog\Models\ProductVariant
+ * @mixin ProductVariant
  */
 class ProductVariantResource extends JsonResource
 {
@@ -17,16 +18,38 @@ class ProductVariantResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'producto_id' => $this->producto_id,
-            'slug' => $this->slug,
-            'nombre' => $this->nombre,
-            'stock' => $this->stock,
-            'descripcion' => $this->descripcion,
-            'precio' => $this->precio,
+            'cantidad_maxima' => $this->stock_tecnico,
             'product' => ProductResource::make($this->whenLoaded('product')),
-            'definitions' => ProductVariantDefinitionResource::collection($this->whenLoaded('definitions')),
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'definitions' => $this->whenLoaded(
+                'definitions',
+                fn () => $this->definitions
+                    ->mapWithKeys(fn ($definition) => [
+                        $definition->productAttribute?->attribute?->codigo => $definition->value,
+                    ])
+                    ->filter(fn ($value, $key) => $key !== null)
+                    ->toArray()
+            ),
+            'images' => $this->whenLoaded('attachments', function () {
+                if ($this->attachments->isNotEmpty()) {
+                    return $this->attachments
+                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                        ->values();
+                }
+
+                if ($this->relationLoaded('fallbackAttachments')) {
+                    return $this->fallbackAttachments
+                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                        ->values();
+                }
+
+                if ($this->relationLoaded('product') && $this->product?->relationLoaded('attachments')) {
+                    return $this->product->attachments
+                        ->map(fn ($attachment) => $attachment->getTemporaryUrl(1440))
+                        ->values();
+                }
+
+                return collect();
+            }),
         ];
     }
 }

app/Domains/Catalog/Services/ProductService.php

@@ -2,7 +2,385 @@
 
 namespace App\Domains\Catalog\Services;
 
+use App\Domains\Attachable\Services\AttachmentService;
+use App\Domains\Catalog\Models\Attribute;
+use App\Domains\Catalog\Models\Product;
+use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
 class ProductService
 {
-    // Reserved for product domain business logic.
+    public function __construct(protected AttachmentService $attachmentService) {}
+
+    /**
+     * Create a product.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public function create(Tenant $tenant, array $data): Product
+    {
+        return DB::transaction(function () use ($tenant, $data) {
+            $attributeIds = $data['attribute_ids'] ?? [];
+            $images = $data['images'] ?? [];
+            $stock = $data['stock'] ?? 0;
+            unset($data['attribute_ids'], $data['images'], $data['stock']);
+
+            /** @var Product $product */
+            $product = Product::query()->create([
+                ...$data,
+                'tenant_codigo' => $tenant->codigo,
+            ]);
+
+            $product->attributes()->sync($attributeIds);
+
+            if (! empty($images)) {
+                $this->syncProductImages($product, $images);
+            }
+
+            // Create default variant with stock
+            $this->createVariant($product, [
+                'stock' => $stock,
+                'is_placeholder' => true,
+                'definitions' => [],
+            ]);
+
+            return $product->load(['attributes.options', 'attachments', 'brand', 'category']);
+        });
+    }
+
+    /**
+     * Update a product.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public function update(Product $product, array $data): Product
+    {
+        return DB::transaction(function () use ($product, $data) {
+            $hasAttributeIds = array_key_exists('attribute_ids', $data);
+            $attributeIds = $data['attribute_ids'] ?? [];
+            $hasImages = array_key_exists('images', $data);
+            $images = $data['images'] ?? [];
+            unset($data['attribute_ids'], $data['images']);
+
+            // Ensure tenant_codigo cannot be updated/changed
+            unset($data['tenant_codigo']);
+
+            $product->update($data);
+
+            if ($hasAttributeIds) {
+                $product->attributes()->sync($attributeIds);
+            }
+
+            if ($hasImages) {
+                $this->syncProductImages($product, $images);
+            }
+
+            return $product->load(['attributes.options', 'attachments', 'brand', 'category']);
+        });
+    }
+
+    /**
+     * Delete a product.
+     */
+    public function delete(Product $product): void
+    {
+        DB::transaction(function () use ($product) {
+            foreach ($product->variants as $variant) {
+                $this->deleteVariantAttachments($variant);
+                $product->deleteVariant($variant);
+            }
+
+            // Delete product-level attachments from S3 and database
+            $existing = $product->attachments()->get();
+            $product->attachments()->detach();
+            foreach ($existing as $attachment) {
+                $this->attachmentService->delete($attachment);
+            }
+
+            $product->attributes()->detach();
+            $product->delete();
+        });
+    }
+
+    /**
+     * Create a product variant.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public function createVariant(Product $product, array $data): ProductVariant
+    {
+        return DB::transaction(function () use ($product, $data) {
+            $images = $data['images'] ?? [];
+            unset($data['images']);
+
+            // Determine if the variant being created is a placeholder one
+            $hasDefinitions = ! empty($data['definitions']);
+            $isPlaceholder = $data['is_placeholder'] ?? (! $hasDefinitions);
+            $data['is_placeholder'] = $isPlaceholder;
+
+            // Remove any existing placeholder variants
+            $defaultVariants = $product->variants()->where('is_placeholder', true)->get();
+            foreach ($defaultVariants as $defaultVariant) {
+                $this->deleteVariantAttachments($defaultVariant);
+                $product->deleteVariant($defaultVariant);
+            }
+
+            $variant = $product->createVariant($data);
+
+            if (! empty($images)) {
+                $this->syncVariantImages($variant, $images);
+            }
+
+            return $variant->load(['product', 'definitions.productAttribute.attribute.options', 'attachments']);
+        });
+    }
+
+    /**
+     * Update a product variant.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public function updateVariant(ProductVariant $variant, array $data): ProductVariant
+    {
+        return DB::transaction(function () use ($variant, $data) {
+            $hasImages = array_key_exists('images', $data);
+            $images = $data['images'] ?? [];
+            unset($data['images']);
+
+            /** @var Product $product */
+            $product = $variant->product;
+            $updatedVariant = $product->updateVariant($variant, $data);
+
+            if ($hasImages) {
+                $this->syncVariantImages($updatedVariant, $images);
+            }
+
+            return $updatedVariant->load(['product', 'definitions.productAttribute.attribute.options', 'attachments']);
+        });
+    }
+
+    /**
+     * Delete a product variant.
+     */
+    public function deleteVariant(ProductVariant $variant): void
+    {
+        DB::transaction(function () use ($variant) {
+            /** @var Product $product */
+            $product = $variant->product;
+            $this->deleteVariantAttachments($variant);
+            $product->deleteVariant($variant);
+
+            // Re-create a default variant with stock 0 if it has no variants left
+            if ($product->variants()->count() === 0) {
+                $product->createVariant([
+                    'stock' => 0,
+                    'is_placeholder' => true,
+                    'definitions' => [],
+                ]);
+            }
+        });
+    }
+
+    /**
+     * Create an attribute.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public static function createAttribute(Tenant $tenant, array $data): Attribute
+    {
+        return DB::transaction(function () use ($tenant, $data) {
+            return Product::createAttribute($tenant, $data);
+        });
+    }
+
+    /**
+     * Update an attribute.
+     *
+     * @param  array<string, mixed>  $data
+     */
+    public static function updateAttribute(Attribute $attribute, array $data): Attribute
+    {
+        return DB::transaction(function () use ($attribute, $data) {
+            return Product::updateAttribute($attribute, $data);
+        });
+    }
+
+    /**
+     * Upload a list of image files/base64 strings and sync them to a variant.
+     *
+     * When called on update, the existing attachments are detached first so the
+     * final set always matches exactly what was sent in the request.
+     *
+     * @param  array<int, UploadedFile|string>  $images
+     */
+    protected function syncVariantImages(ProductVariant $variant, array $images): void
+    {
+        $this->deleteVariantAttachments($variant);
+
+        $attachmentIds = [];
+
+        foreach ($images as $image) {
+            $attachment = $this->attachmentService->store($image, 'variants');
+            $attachmentIds[] = $attachment->id;
+        }
+
+        $variant->attachments()->sync($attachmentIds);
+    }
+
+    /**
+     * Upload a list of image files/base64 strings and sync them to a product.
+     *
+     * Same logic as syncVariantImages but for products without variants.
+     *
+     * @param  array<int, UploadedFile|string>  $images
+     */
+    protected function syncProductImages(Product $product, array $images): void
+    {
+        // Detach pivot record and delete attachment from S3 and database
+        $existing = $product->attachments()->get();
+        $product->attachments()->detach();
+        foreach ($existing as $attachment) {
+            $this->attachmentService->delete($attachment);
+        }
+
+        $attachmentIds = [];
+
+        foreach ($images as $image) {
+            $attachment = $this->attachmentService->store($image, 'products');
+            $attachmentIds[] = $attachment->id;
+        }
+
+        $product->attachments()->sync($attachmentIds);
+    }
+
+    protected function deleteVariantAttachments(ProductVariant $variant): void
+    {
+        $existing = $variant->attachments()->get();
+        $variant->attachments()->detach();
+
+        foreach ($existing as $attachment) {
+            $this->attachmentService->delete($attachment);
+        }
+    }
+
+    /**
+     * Delete an attribute.
+     */
+    public static function deleteAttribute(Attribute $attribute): void
+    {
+        DB::transaction(function () use ($attribute) {
+            Product::deleteAttribute($attribute);
+        });
+    }
+
+    /**
+     * Get products for a tenant with resolved first image (with fallback to first variant's first image).
+     */
+    public function getProductos(Tenant $tenant): LengthAwarePaginator
+    {
+        $products = Product::query()
+            ->where('tenant_codigo', $tenant->codigo)
+            ->with([
+                'attachments' => fn ($query) => $query->orderBy('attachments.id'),
+                'brand',
+                'category',
+                'variants.attachments' => fn ($query) => $query->orderBy('attachments.id'),
+            ])
+            ->latest()
+            ->paginateFromRequest();
+
+        foreach ($products as $product) {
+            $resolvedAttachment = null;
+            if ($product->attachments->isNotEmpty()) {
+                $resolvedAttachment = $product->attachments->first();
+            } else {
+                $firstVariant = $product->variants->sortBy('id')->first();
+                if ($firstVariant && $firstVariant->attachments->isNotEmpty()) {
+                    $resolvedAttachment = $firstVariant->attachments->first();
+                }
+            }
+
+            $product->setRelation('attachments', $resolvedAttachment ? collect([$resolvedAttachment]) : collect());
+            $product->unsetRelation('variants');
+        }
+
+        return $products;
+    }
+
+    public function getProductDetail(Tenant $tenant, Product $product, ?int $variantId = null): Product
+    {
+        $product->load([
+            'attachments' => fn ($query) => $query->orderBy('attachments.id'),
+            'attributes.options',
+            'brand',
+            'category',
+            'variants' => fn ($query) => $query->orderBy('id'),
+            'variants.definitions.productAttribute.attribute.options',
+        ]);
+
+        $this->filterProductDetailAttributeOptions($product);
+
+        $selectedVariant = $variantId !== null
+            ? $product->variants->firstWhere('id', $variantId)
+            : $product->variants->first(fn (ProductVariant $variant) => $variant->stock_tecnico > 0);
+
+        if ($variantId !== null && $selectedVariant === null) {
+            throw new NotFoundHttpException('Product variant not found for product.');
+        }
+
+        if ($variantId !== null && $selectedVariant->stock_tecnico <= 0) {
+            throw ValidationException::withMessages([
+                'variant_id' => 'La variante seleccionada no tiene stock.',
+            ]);
+        }
+
+        $selectedVariant ??= $product->variants->first();
+
+        if ($selectedVariant !== null) {
+            $selectedVariant->load([
+                'attachments' => fn ($query) => $query->orderBy('attachments.id'),
+            ]);
+            $selectedVariant->setRelation('fallbackAttachments', $product->attachments);
+            $product->setSelectedVariant($selectedVariant);
+        }
+
+        return $product;
+    }
+
+    protected function filterProductDetailAttributeOptions(Product $product): void
+    {
+        $availableValuesByAttributeId = [];
+
+        foreach ($product->variants as $variant) {
+            foreach ($variant->definitions as $definition) {
+                $attributeId = $definition->productAttribute?->attribute_id;
+
+                if ($attributeId === null || $definition->value === null) {
+                    continue;
+                }
+
+                $availableValuesByAttributeId[$attributeId][$definition->value] = true;
+            }
+        }
+
+        foreach ($product->attributes as $attribute) {
+            if (! $attribute->relationLoaded('options')) {
+                continue;
+            }
+
+            $availableValues = $availableValuesByAttributeId[$attribute->id] ?? [];
+
+            $attribute->setRelation(
+                'options',
+                $attribute->options
+                    ->filter(fn ($option): bool => array_key_exists($option->value, $availableValues))
+                    ->values()
+            );
+        }
+    }
 }

app/Domains/Catalog/Support/ProductAttributeType.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Domains\Catalog\Support;
-
-enum ProductAttributeType: string
-{
-    case Text = 'text';
-    case Numeric = 'numeric';
-    case Select = 'select';
-    case Multiselect = 'multiselect';
-
-    public function supportsOptions(): bool
-    {
-        return in_array($this, [self::Select, self::Multiselect], true);
-    }
-}

app/Domains/Catalog/routes/api.php

@@ -3,7 +3,7 @@
 use App\Domains\Catalog\Controllers\BrandController;
 use App\Domains\Catalog\Controllers\CategoryController;
 use App\Domains\Catalog\Controllers\ProductController;
-use App\Domains\Catalog\Controllers\ProductAttributeController;
+use App\Domains\Catalog\Controllers\AttributeController;
 use App\Domains\Catalog\Controllers\ProductVariantController;
 use Illuminate\Support\Facades\Route;
 
@@ -11,8 +11,10 @@ Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
     Route::apiResource('marcas', BrandController::class)->parameters(['marcas' => 'marca']);
     Route::apiResource('categorias', CategoryController::class)->parameters(['categorias' => 'categoria']);
     Route::apiResource('productos', ProductController::class);
-    Route::apiResource('product-attributes', ProductAttributeController::class)
-        ->parameters(['product-attributes' => 'productAttribute']);
-    Route::apiResource('product-variants', ProductVariantController::class)
-        ->parameters(['product-variants' => 'productVariant']);
+    Route::apiResource('attributes', AttributeController::class);
+    Route::apiResource('productos.variants', ProductVariantController::class)
+        ->parameters([
+            'productos' => 'producto',
+            'variants' => 'productVariant',
+        ]);
 });

app/Domains/Integration/Casts/EncryptedIntegrationData.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Domains\Integration\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Encryption\Encrypter;
+use Exception;
+
+class EncryptedIntegrationData implements CastsAttributes
+{
+    protected function getEncrypter(): Encrypter
+    {
+        $secret = config('services.integrations.secret');
+        
+        if (empty($secret)) {
+            throw new Exception('The integrations secret is not configured.');
+        }
+
+        // Laravel encrypter requires a key of exact length. Typically 32 bytes for AES-256-CBC.
+        // If the secret is base64 encoded like the APP_KEY:
+        if (str_starts_with($secret, 'base64:')) {
+            $key = base64_decode(substr($secret, 7));
+        } else {
+            // Otherwise, we hash it to ensure 32 bytes for AES-256-CBC.
+            $key = hash('sha256', $secret, true);
+        }
+        
+        return new Encrypter($key, config('app.cipher', 'AES-256-CBC'));
+    }
+
+    /**
+     * Cast the given value.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function get(Model $model, string $key, mixed $value, array $attributes): mixed
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        try {
+            $decrypted = $this->getEncrypter()->decryptString($value);
+            return json_decode($decrypted, true);
+        } catch (Exception $e) {
+            // Return null or throw depending on how strict we want to be.
+            return null;
+        }
+    }
+
+    /**
+     * Prepare the given value for storage.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function set(Model $model, string $key, mixed $value, array $attributes): mixed
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        $json = json_encode($value);
+        return $this->getEncrypter()->encryptString($json);
+    }
+}

app/Domains/Integration/Controllers/IntegrationController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Domains\Integration\Controllers;
+
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Requests\StoreIntegrationRequest;
+use App\Domains\Integration\Requests\UpdateIntegrationRequest;
+use Illuminate\Routing\Controller;
+
+class IntegrationController extends Controller
+{
+    public function index()
+    {
+        return response()->json(Integration::all());
+    }
+
+    public function store(StoreIntegrationRequest $request)
+    {
+        $integration = Integration::create($request->validated());
+
+        return response()->json($integration, 201);
+    }
+
+    public function show(Integration $integration)
+    {
+        return response()->json($integration);
+    }
+
+    public function update(UpdateIntegrationRequest $request, Integration $integration)
+    {
+        $integration->update($request->validated());
+
+        return response()->json($integration->fresh());
+    }
+
+    public function destroy(Integration $integration)
+    {
+        $integration->delete();
+
+        return response()->noContent();
+    }
+}

app/Domains/Integration/Controllers/TenantIntegrationController.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Domains\Integration\Controllers;
+
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Requests\StoreTenantIntegrationRequest;
+use App\Domains\Integration\Services\TenantIntegrationService;
+use Illuminate\Routing\Controller;
+
+class TenantIntegrationController extends Controller
+{
+    protected TenantIntegrationService $tenantIntegrationService;
+
+    public function __construct(TenantIntegrationService $tenantIntegrationService)
+    {
+        $this->tenantIntegrationService = $tenantIntegrationService;
+    }
+
+    public function index(string $tenantCode)
+    {
+        return response()->json($this->tenantIntegrationService->getAllForTenant($tenantCode));
+    }
+
+    public function show(string $tenantCode, string $integrationCode)
+    {
+        $integration = $this->tenantIntegrationService->getTenantIntegration($tenantCode, $integrationCode);
+        
+        if (!$integration) {
+            return response()->json(['message' => 'Integration not configured for this tenant'], 404);
+        }
+
+        return response()->json($integration);
+    }
+
+    public function store(StoreTenantIntegrationRequest $request, string $tenantCode, string $integrationCode)
+    {
+        $integration = Integration::where('integration_code', $integrationCode)->firstOrFail();
+        
+        $tenantIntegration = $this->tenantIntegrationService->updateOrCreateIntegration(
+            $tenantCode,
+            $integration,
+            $request->input('integration_data', [])
+        );
+
+        return response()->json($tenantIntegration);
+    }
+}

app/Domains/Integration/Models/Integration.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Integration\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Integration extends Model
+{
+    protected $table = 'integrations';
+
+    protected $fillable = [
+        'integration_code',
+        'name',
+        'url',
+        'integration_data_schema',
+    ];
+
+    protected $casts = [
+        'integration_data_schema' => 'array',
+    ];
+    
+    public function tenantIntegrations()
+    {
+        return $this->hasMany(TenantIntegration::class, 'integration_code', 'integration_code');
+    }
+}

app/Domains/Integration/Models/TenantIntegration.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Integration\Models;
+
+use App\Domains\Integration\Casts\EncryptedIntegrationData;
+use Illuminate\Database\Eloquent\Model;
+
+class TenantIntegration extends Model
+{
+    protected $table = 'tenant_integration';
+
+    protected $fillable = [
+        'integration_code',
+        'tenant_code',
+        'integration_data',
+    ];
+
+    protected $casts = [
+        'integration_data' => EncryptedIntegrationData::class,
+    ];
+
+    public function integration()
+    {
+        return $this->belongsTo(Integration::class, 'integration_code', 'integration_code');
+    }
+}

app/Domains/Integration/Requests/StoreIntegrationRequest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Domains\Integration\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class StoreIntegrationRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'integration_code' => ['required', 'string', 'unique:integrations,integration_code'],
+            'name' => ['required', 'string', 'max:255'],
+            'url' => ['nullable', 'url', 'max:255'],
+            'integration_data_schema' => ['nullable', 'array'],
+        ];
+    }
+}

app/Domains/Integration/Requests/StoreTenantIntegrationRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\Integration\Requests;
+
+use App\Domains\Integration\Models\Integration;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\ValidationException;
+
+class StoreTenantIntegrationRequest extends FormRequest
+{
+    protected ?Integration $integrationModel = null;
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    protected function prepareForValidation()
+    {
+        $integrationCode = $this->route('integration_code');
+        $this->integrationModel = Integration::where('integration_code', $integrationCode)->first();
+
+        if (!$this->integrationModel) {
+            throw ValidationException::withMessages([
+                'integration_code' => 'Integration not found.'
+            ]);
+        }
+    }
+
+    public function rules(): array
+    {
+        $rules = [];
+
+        // Dynamic validation rules based on the integration data schema
+        if ($this->integrationModel && $this->integrationModel->integration_data_schema) {
+            foreach ($this->integrationModel->integration_data_schema as $field => $rule) {
+                $rules['integration_data.' . $field] = $rule;
+            }
+        }
+
+        return $rules;
+    }
+}

app/Domains/Integration/Requests/UpdateIntegrationRequest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Integration\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateIntegrationRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $integration = $this->route('integration');
+        
+        return [
+            'name' => ['sometimes', 'required', 'string', 'max:255'],
+            'url' => ['nullable', 'url', 'max:255'],
+            'integration_data_schema' => ['nullable', 'array'],
+            // the code shouldn't ideally be updatable, but if it is:
+            'integration_code' => ['sometimes', 'required', 'string', 'unique:integrations,integration_code,' . ($integration->id ?? '')],
+        ];
+    }
+}

app/Domains/Integration/Services/TenantIntegrationService.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Integration\Services;
+
+use App\Domains\Integration\Models\Integration;
+use App\Domains\Integration\Models\TenantIntegration;
+
+class TenantIntegrationService
+{
+    public function getTenantIntegration(string $tenantCode, string $integrationCode): ?TenantIntegration
+    {
+        return TenantIntegration::where('tenant_code', $tenantCode)
+            ->where('integration_code', $integrationCode)
+            ->first();
+    }
+
+    public function getAllForTenant(string $tenantCode)
+    {
+        return TenantIntegration::with('integration')
+            ->where('tenant_code', $tenantCode)
+            ->get();
+    }
+
+    public function updateOrCreateIntegration(string $tenantCode, Integration $integration, array $data): TenantIntegration
+    {
+        return TenantIntegration::updateOrCreate(
+            [
+                'tenant_code' => $tenantCode,
+                'integration_code' => $integration->integration_code,
+            ],
+            [
+                'integration_data' => $data,
+            ]
+        );
+    }
+}

app/Domains/Integration/routes/api.php

@@ -0,0 +1,19 @@
+<?php
+
+use App\Domains\Integration\Controllers\IntegrationController;
+use App\Domains\Integration\Controllers\TenantIntegrationController;
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'integrations'], function () {
+    Route::get('/', [IntegrationController::class, 'index']);
+    Route::post('/', [IntegrationController::class, 'store']);
+    Route::get('/{integration}', [IntegrationController::class, 'show']);
+    Route::put('/{integration}', [IntegrationController::class, 'update']);
+    Route::delete('/{integration}', [IntegrationController::class, 'destroy']);
+});
+
+Route::group(['prefix' => '{tenant_code}/integrations'], function () {
+    Route::get('/', [TenantIntegrationController::class, 'index']);
+    Route::get('/{integration_code}', [TenantIntegrationController::class, 'show']);
+    Route::post('/{integration_code}', [TenantIntegrationController::class, 'store']);
+});

app/Domains/Purchase/Controllers/PurchaseController.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Domains\Purchase\Controllers;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Purchase\Requests\StorePurchaseRequest;
+use App\Domains\Purchase\Resources\PurchaseResource;
+use App\Domains\Tenant\Models\Tenant;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Domains\Purchase\Services\CheckoutService;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class PurchaseController extends Controller
+{
+    public function index(Request $request, Tenant $tenant): JsonResponse
+    {
+        return PurchaseResource::collection(
+            Purchase::query()
+                ->with(['items.variant.product', 'items.variant.definitions.productAttribute.attribute'])
+                ->where('tenant_codigo', $tenant->codigo)
+                ->where('user_id', $request->user()->id)
+                ->latest()
+                ->paginateFromRequest()
+        )->response();
+    }
+
+    public function store(StorePurchaseRequest $request, Tenant $tenant, CheckoutService $checkoutService): JsonResponse
+    {
+        $data = $request->validated();
+
+        $purchase = $checkoutService->processCheckout(
+            $tenant,
+            $request->user()->id,
+            $data
+        );
+
+        return PurchaseResource::make($purchase)->response()->setStatusCode(201);
+    }
+
+    public function show(Request $request, Tenant $tenant, Purchase $compra): PurchaseResource
+    {
+        $compra = $this->resolveScopedPurchase($tenant, $request->user()->id, $compra);
+
+        return PurchaseResource::make(
+            $compra->loadMissing(['items.variant.product', 'items.variant.definitions.productAttribute.attribute'])
+        );
+    }
+
+
+
+    protected function resolveScopedPurchase(Tenant $tenant, int $userId, Purchase $purchase): Purchase
+    {
+        if ($purchase->tenant_codigo !== $tenant->codigo || $purchase->user_id !== $userId) {
+            throw new NotFoundHttpException('Purchase not found for tenant.');
+        }
+
+        return $purchase;
+    }
+}

app/Domains/Purchase/Models/Purchase.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Domains\Purchase\Models;
+
+use App\Domains\Auth\Models\User;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+#[Fillable([
+    'tenant_codigo',
+    'user_id',
+    'status',
+    'payment_status',
+    'payment_method',
+    'dni',
+    'telefono',
+    'nombre_apellido',
+    'email',
+])]
+class Purchase extends Model
+{
+    use HasFactory;
+
+    protected $table = 'compras';
+
+    protected function casts(): array
+    {
+        return [
+            'user_id' => 'integer',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Tenant, $this>
+     */
+    public function tenant(): BelongsTo
+    {
+        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
+    }
+
+    /**
+     * @return BelongsTo<User, $this>
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * @return HasMany<PurchaseItem, $this>
+     */
+    public function items(): HasMany
+    {
+        return $this->hasMany(PurchaseItem::class, 'compra_id');
+    }
+}

app/Domains/Purchase/Models/PurchaseItem.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Domains\Purchase\Models;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'compra_id',
+    'producto_variante_id',
+    'cantidad',
+    'precio_unitario',
+    'discount_total',
+    'tax_total',
+    'total',
+])]
+class PurchaseItem extends Model
+{
+    use HasFactory;
+
+    protected $table = 'compra_items';
+
+    protected function casts(): array
+    {
+        return [
+            'compra_id' => 'integer',
+            'producto_variante_id' => 'integer',
+            'cantidad' => 'integer',
+            'precio_unitario' => 'decimal:2',
+            'discount_total' => 'decimal:2',
+            'tax_total' => 'decimal:2',
+            'total' => 'decimal:2',
+        ];
+    }
+
+    /**
+     * @return BelongsTo<Purchase, $this>
+     */
+    public function purchase(): BelongsTo
+    {
+        return $this->belongsTo(Purchase::class, 'compra_id');
+    }
+
+    /**
+     * @return BelongsTo<ProductVariant, $this>
+     */
+    public function variant(): BelongsTo
+    {
+        return $this->belongsTo(ProductVariant::class, 'producto_variante_id');
+    }
+}

app/Domains/Purchase/Requests/StorePurchaseRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Domains\Purchase\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StorePurchaseRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return $this->user() !== null;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function rules(): array
+    {
+        return [
+            'status' => ['sometimes', 'string', Rule::in(['pending', 'paid', 'cancelled'])],
+            'payment_status' => ['sometimes', 'string', Rule::in(['pending', 'approved', 'rejected'])],
+            'payment_method' => ['required', 'string'],
+            'dni' => ['required', 'string'],
+            'telefono' => ['required', 'string'],
+            'nombre_apellido' => ['required', 'string'],
+            'email' => ['required', 'string', 'email'],
+            'items' => ['required', 'array', 'min:1'],
+            'items.*.producto_variante_id' => ['required', 'integer', 'exists:productos_variantes,id'],
+            'items.*.cantidad' => ['required', 'integer', 'min:1'],
+        ];
+    }
+}

app/Domains/Purchase/Resources/PurchaseItemResource.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Domains\Purchase\Resources;
+
+use App\Domains\Catalog\Resources\ProductVariantDefinitionResource;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Purchase\Models\PurchaseItem
+ */
+class PurchaseItemResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        $variant = $this->variant;
+        $product = $variant?->product;
+
+        return [
+            'id' => $this->id,
+            'cantidad' => $this->cantidad,
+            'precio_unitario' => $this->formatMoney($this->precio_unitario),
+            'total' => $this->formatMoney($this->total),
+            'product' => $product === null ? null : [
+                'id' => $product->id,
+                'nombre' => $product->nombre,
+                'slug' => $product->slug,
+            ],
+            'variant' => $variant === null ? null : [
+                'id' => $variant->id,
+                'definitions' => ProductVariantDefinitionResource::collection($variant->definitions),
+            ],
+        ];
+    }
+
+    protected function formatMoney(float|int|string|null $amount): ?string
+    {
+        if ($amount === null) {
+            return null;
+        }
+
+        return number_format((float) $amount, 2, '.', '');
+    }
+}

app/Domains/Purchase/Resources/PurchaseResource.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Domains\Purchase\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @mixin \App\Domains\Purchase\Models\Purchase
+ */
+class PurchaseResource extends JsonResource
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        $items = $this->resource->relationLoaded('items')
+            ? $this->resource->getRelation('items')
+            : collect();
+
+        $subtotal = $items->reduce(
+            fn (float $carry, $item): float => $carry + ((float) $item->precio_unitario * $item->cantidad),
+            0.0,
+        );
+
+        $total = $items->reduce(
+            fn (float $carry, $item): float => $carry + (float) $item->total,
+            0.0,
+        );
+
+        return [
+            'id' => $this->id,
+            'tenant_codigo' => $this->tenant_codigo,
+            'user_id' => $this->user_id,
+            'status' => $this->status,
+            'payment_status' => $this->payment_status,
+            'payment_method' => $this->payment_method,
+            'dni' => $this->dni,
+            'telefono' => $this->telefono,
+            'nombre_apellido' => $this->nombre_apellido,
+            'email' => $this->email,
+            'items' => PurchaseItemResource::collection($items),
+            'subtotal' => $this->formatMoney($subtotal),
+            'total' => $this->formatMoney($total),
+        ];
+    }
+
+    protected function formatMoney(float|int|string|null $amount): string
+    {
+        return number_format((float) ($amount ?? 0), 2, '.', '');
+    }
+}

app/Domains/Purchase/Services/CheckoutService.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Domains\Purchase\Services;
+
+use App\Domains\Catalog\Models\ProductVariant;
+use App\Domains\Purchase\Models\Purchase;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+
+class CheckoutService
+{
+    public function processCheckout(Tenant $tenant, int $userId, array $purchaseData): Purchase
+    {
+        // 1. Preparar items de la compra
+        $items = $purchaseData['items'];
+        unset($purchaseData['items']);
+
+        $variants = $this->resolveTenantVariants($tenant, $items);
+        $purchaseItemsPayload = $this->buildPurchaseItemsPayload($items, $variants);
+
+        // 2. Crear la orden de compra y vaciar carrito
+        return DB::transaction(function () use ($tenant, $userId, $purchaseData, $purchaseItemsPayload): Purchase {
+            /** @var Purchase $purchase */
+            $purchase = Purchase::query()->create([
+                ...$purchaseData,
+                'tenant_codigo' => $tenant->codigo,
+                'user_id' => $userId,
+            ]);
+
+            $purchase->items()->createMany($purchaseItemsPayload);
+
+            // Vaciar y eliminar el carrito activo del usuario
+            $cart = \App\Domains\Cart\Models\Cart::query()
+                ->where('tenant_codigo', $tenant->codigo)
+                ->where('user_id', $userId)
+                ->first();
+            if ($cart) {
+                $cart->items()->delete();
+                $cart->delete();
+            }
+
+            return $purchase->load(['items.variant.product', 'items.variant.definitions.productAttribute.attribute']);
+        });
+    }
+
+    /**
+     * @param  array<int, array<string, mixed>>  $items
+     * @return \Illuminate\Support\Collection<int, ProductVariant>
+     */
+    protected function resolveTenantVariants(Tenant $tenant, array $items)
+    {
+        $variantIds = collect($items)
+            ->pluck('producto_variante_id')
+            ->filter()
+            ->map(static fn (mixed $id): int => (int) $id)
+            ->unique()
+            ->values();
+
+        $variants = ProductVariant::query()
+            ->with('product')
+            ->whereIn('id', $variantIds)
+            ->whereHas('product', fn ($query) => $query->where('tenant_codigo', $tenant->codigo))
+            ->get()
+            ->keyBy('id');
+
+        if ($variants->count() !== $variantIds->count()) {
+            throw ValidationException::withMessages([
+                'items' => 'One or more product variants do not belong to the tenant.',
+            ]);
+        }
+
+        return $variants;
+    }
+
+    /**
+     * @param  array<int, array<string, mixed>>  $items
+     * @param  \Illuminate\Support\Collection<int, ProductVariant>  $variants
+     * @return array<int, array<string, mixed>>
+     */
+    protected function buildPurchaseItemsPayload(array $items, $variants): array
+    {
+        return collect($items)
+            ->map(function (array $item) use ($variants): array {
+                /** @var ProductVariant $variant */
+                $variant = $variants->get((int) $item['producto_variante_id']);
+                $quantity = (int) $item['cantidad'];
+                $unitPrice = (float) ($variant->product?->precio ?? 0);
+
+                return [
+                    'producto_variante_id' => $variant->getKey(),
+                    'cantidad' => $quantity,
+                    'precio_unitario' => $unitPrice,
+                    'discount_total' => null,
+                    'tax_total' => null,
+                    'total' => $unitPrice * $quantity,
+                ];
+            })
+            ->all();
+    }
+}

app/Domains/Purchase/routes/api.php

@@ -0,0 +1,8 @@
+<?php
+
+use App\Domains\Purchase\Controllers\PurchaseController;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('tenants/{tenant:codigo}')->middleware('auth:sanctum')->group(function (): void {
+    Route::apiResource('compras', PurchaseController::class)->only(['index', 'store', 'show']);
+});

app/Domains/Shared/Enums/FieldType.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Domains\Shared\Enums;
+
+enum FieldType: string
+{
+    case String = 'string';
+    case Number = 'number';
+    case Boolean = 'boolean';
+    case Select = 'select';
+    case Multiselect = 'multiselect';
+    case Color = 'color';
+    case Image = 'image';
+
+    public function supportsOptions(): bool
+    {
+        return in_array($this, [self::Select, self::Multiselect], true);
+    }
+
+    /**
+     * @return list<string>
+     */
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
+}

app/Domains/Shared/Rules/ImageOrBase64Rule.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Domains\Shared\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Http\UploadedFile;
+
+class ImageOrBase64Rule implements ValidationRule
+{
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if ($value instanceof UploadedFile) {
+            $mime = $value->getMimeType();
+            if (! str_starts_with((string) $mime, 'image/')) {
+                $fail("The :attribute must be a valid image file.");
+            }
+            return;
+        }
+
+        if (is_string($value)) {
+            $payload = trim($value);
+
+            if (\Illuminate\Support\Str::isUuid($payload)) {
+                return;
+            }
+
+            if ($payload === '') {
+                $fail("The :attribute must not be empty.");
+                return;
+            }
+
+            $declaredMimeType = null;
+            if (preg_match('/^data:(?<mime>[-\w.+\/]+);base64,(?<data>.+)$/s', $payload, $matches) === 1) {
+                $declaredMimeType = strtolower($matches['mime']);
+                $payload = $matches['data'];
+            }
+
+            $decoded = base64_decode(preg_replace('/\s+/', '', $payload), true);
+            if ($decoded === false || $decoded === '') {
+                $fail("The :attribute must be a valid base64-encoded image.");
+                return;
+            }
+
+            $finfo = new \finfo(FILEINFO_MIME_TYPE);
+            $detectedMime = $finfo->buffer($decoded);
+            $mime = $detectedMime ?: $declaredMimeType;
+
+            if (! $mime || ! str_starts_with((string) $mime, 'image/')) {
+                $fail("The :attribute must be a valid image (file or base64).");
+            }
+
+            return;
+        }
+
+        $fail("The :attribute must be an image file or a base64-encoded image string.");
+    }
+}

app/Domains/Tenant/Controllers/BootstrapTenantController.php

@@ -15,7 +15,7 @@ class BootstrapTenantController extends Controller
         $dominio = $request->validated('dominio');
 
         return TenantResource::make(
-            Tenant::query()->where('dominio', $dominio)->firstOrFail()
+            Tenant::query()->with(['headerLogo', 'footerLogo'])->where('dominio', $dominio)->firstOrFail()
         );
     }
 }

app/Domains/Tenant/Controllers/TenantController.php

@@ -6,40 +6,39 @@ use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Requests\StoreTenantRequest;
 use App\Domains\Tenant\Requests\UpdateTenantRequest;
 use App\Domains\Tenant\Resources\TenantResource;
+use App\Domains\Tenant\Services\TenantService;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 
 class TenantController extends Controller
 {
+    public function __construct(protected TenantService $tenantService)
+    {
+    }
+
     public function index(): JsonResponse
     {
-        return TenantResource::collection(Tenant::query()->latest()->get())->response();
+        return TenantResource::collection(Tenant::query()->with(['headerLogo', 'footerLogo'])->latest()->paginateFromRequest())->response();
     }
 
     public function store(StoreTenantRequest $request): JsonResponse
     {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
+        $tenant = $this->tenantService->create($request->validated());
 
-        $tenant = Tenant::createWithProps($validated, $props);
-
-        return TenantResource::make($tenant)->response()->setStatusCode(201);
+        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']))->response()->setStatusCode(201);
     }
 
     public function show(Tenant $tenant): TenantResource
     {
-        return TenantResource::make($tenant);
+        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
     }
 
     public function update(UpdateTenantRequest $request, Tenant $tenant): TenantResource
     {
-        $validated = $request->validated();
-        $props = $validated['props'] ?? [];
+        $tenant = $this->tenantService->update($tenant, $request->validated());
 
-        $tenant->updateWithProps($validated, $props);
-
-        return TenantResource::make($tenant);
+        return TenantResource::make($tenant->loadMissing(['headerLogo', 'footerLogo']));
     }
 
     public function destroy(Tenant $tenant): Response

app/Domains/Tenant/Controllers/TenantPropController.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Controllers;
-
-use App\Domains\Tenant\Models\TenantProp;
-use App\Domains\Tenant\Requests\StoreTenantPropRequest;
-use App\Domains\Tenant\Requests\UpdateTenantPropRequest;
-use App\Domains\Tenant\Resources\TenantPropResource;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Response;
-
-class TenantPropController extends Controller
-{
-    public function index(): JsonResponse
-    {
-        return TenantPropResource::collection(TenantProp::query()->latest()->get())->response();
-    }
-
-    public function store(StoreTenantPropRequest $request): JsonResponse
-    {
-        $tenantProp = TenantProp::query()->create($request->validated());
-
-        return TenantPropResource::make($tenantProp)->response()->setStatusCode(201);
-    }
-
-    public function show(TenantProp $tenantProp): TenantPropResource
-    {
-        return TenantPropResource::make($tenantProp);
-    }
-
-    public function update(UpdateTenantPropRequest $request, TenantProp $tenantProp): TenantPropResource
-    {
-        $tenantProp->update($request->validated());
-
-        return TenantPropResource::make($tenantProp);
-    }
-
-    public function destroy(TenantProp $tenantProp): Response
-    {
-        $tenantProp->delete();
-
-        return response()->noContent();
-    }
-}

app/Domains/Tenant/Models/Tenant.php

@@ -2,44 +2,51 @@
 
 namespace App\Domains\Tenant\Models;
 
-use App\Domains\Attachable\Models\Concerns\HasAttachments;
+use App\Domains\Attachable\Models\Attachment;
+use App\Domains\BankAccount\Models\BankAccount;
 use App\Domains\Catalog\Models\Product;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Facades\DB;
-use LogicException;
 
 #[Fillable([
     'codigo',
     'nombre',
     'dominio',
+    'primary_color',
+    'secondary_color',
+    'danger_color',
+    'success_color',
+    'header_bg_color',
+    'footer_bg_color',
+    'header_logo_id',
+    'footer_logo_id',
 ])]
 class Tenant extends Model
 {
-    use HasAttachments;
     use HasFactory;
 
-    /**
-     * @param  array<string, mixed>  $attributes
-     * @param  array<string, mixed>  $props
-     * @return static
-     */
-    public static function createWithProps(array $attributes, array $props = []): static
+    public function getRouteKeyName(): string
     {
-        unset($attributes['props']);
+        return 'codigo';
+    }
 
-        /** @var static $tenant */
-        $tenant = DB::transaction(function () use ($attributes, $props): self {
-            /** @var static $createdTenant */
-            $createdTenant = static::query()->create($attributes);
-            $createdTenant->syncPropValues($props);
+    /**
+     * @return BelongsTo<Attachment, $this>
+     */
+    public function headerLogo(): BelongsTo
+    {
+        return $this->belongsTo(Attachment::class, 'header_logo_id');
+    }
 
-            return $createdTenant;
-        });
-
-        return $tenant;
+    /**
+     * @return BelongsTo<Attachment, $this>
+     */
+    public function footerLogo(): BelongsTo
+    {
+        return $this->belongsTo(Attachment::class, 'footer_logo_id');
     }
 
     /**
@@ -49,77 +56,21 @@ class Tenant extends Model
     {
         return $this->hasMany(Product::class, 'tenant_codigo', 'codigo');
     }
+
     /**
-     * @return HasMany<TenantPropValue, $this>
+     * @return HasMany<BankAccount, $this>
      */
-    public function propValues(): HasMany
+    public function bankAccounts(): HasMany
     {
-        return $this->hasMany(TenantPropValue::class, 'tenant_codigo', 'codigo');
-    }
-
-    public function getPropValue(TenantProp|string $prop): ?TenantPropValue
-    {
-        $resolvedProp = $this->resolveProp($prop);
-
-        return $this->propValues()
-            ->where('tenant_prop_codigo', $resolvedProp->codigo)
-            ->first();
-    }
-
-    public function setPropValue(TenantProp|string $prop, mixed $value): TenantPropValue
-    {
-        $this->ensurePropValuesCanBeManaged();
-
-        $resolvedProp = $this->resolveProp($prop);
-
-        return $this->propValues()->updateOrCreate(
-            ['tenant_prop_codigo' => $resolvedProp->codigo],
-            ['value' => $value],
-        );
+        return $this->hasMany(BankAccount::class, 'tenant_code', 'codigo');
     }
 
     /**
-     * @param  array<string, mixed>  $props
+     * @return BelongsTo<BankAccount, $this>
      */
-    public function syncPropValues(array $props): void
+    public function selectedBankAccount(): BelongsTo
     {
-        foreach ($props as $codigo => $value) {
-            $this->setPropValue((string) $codigo, $value);
-        }
-    }
-
-    /**
-     * @param  array<string, mixed>  $attributes
-     * @param  array<string, mixed>  $props
-     * @return static
-     */
-    public function updateWithProps(array $attributes, array $props = []): static
-    {
-        unset($attributes['props']);
-
-        DB::transaction(function () use ($attributes, $props): void {
-            $this->update($attributes);
-            $this->syncPropValues($props);
-        });
-
-        return $this;
-    }
-
-    protected function ensurePropValuesCanBeManaged(): void
-    {
-        if (! $this->exists) {
-            throw new LogicException('Cannot manage prop values for an unsaved tenant.');
-        }
-    }
-
-    protected function resolveProp(TenantProp|string $prop): TenantProp
-    {
-        if ($prop instanceof TenantProp) {
-            return $prop;
-        }
-
-        return TenantProp::query()
-            ->where('codigo', $prop)
-            ->firstOrFail();
+        return $this->belongsTo(BankAccount::class, 'selected_bank_account_id');
     }
 }
+

app/Domains/Tenant/Models/TenantProp.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Models;
-
-use App\Domains\Tenant\Support\TenantPropDataType;
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-#[Fillable([
-    'codigo',
-    'nombre',
-    'descripcion',
-    'is_required',
-    'data_type',
-])]
-class TenantProp extends Model
-{
-    use HasFactory;
-
-    protected $table = 'tenant_props';
-
-    /**
-     * @return array<string, string>
-     */
-    protected function casts(): array
-    {
-        return [
-            'is_required' => 'boolean',
-            'data_type' => TenantPropDataType::class,
-        ];
-    }
-
-    /**
-     * @return HasMany<TenantPropValue, $this>
-     */
-    public function values(): HasMany
-    {
-        return $this->hasMany(TenantPropValue::class, 'tenant_prop_codigo', 'codigo');
-    }
-}

app/Domains/Tenant/Models/TenantPropValue.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Models;
-
-use Illuminate\Database\Eloquent\Attributes\Fillable;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-#[Fillable([
-    'tenant_codigo',
-    'tenant_prop_codigo',
-    'value',
-])]
-class TenantPropValue extends Model
-{
-    use HasFactory;
-
-    protected $table = 'tenant_prop_values';
-
-    /**
-     * @return BelongsTo<Tenant, $this>
-     */
-    public function tenant(): BelongsTo
-    {
-        return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
-    }
-
-    /**
-     * @return BelongsTo<TenantProp, $this>
-     */
-    public function prop(): BelongsTo
-    {
-        return $this->belongsTo(TenantProp::class, 'tenant_prop_codigo', 'codigo');
-    }
-}

app/Domains/Tenant/Requests/StoreTenantPropRequest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Requests;
-
-use App\Domains\Tenant\Support\TenantPropDataType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class StoreTenantPropRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('tenant_props', 'codigo')],
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
-            'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(TenantPropDataType::class)],
-        ];
-    }
-}

app/Domains/Tenant/Requests/StoreTenantRequest.php

@@ -2,7 +2,7 @@
 
 namespace App\Domains\Tenant\Requests;
 
-use App\Domains\Tenant\Support\TenantPropRules;
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
@@ -35,6 +35,9 @@ class StoreTenantRequest extends FormRequest
      */
     public function rules(): array
     {
+        $logoRule = ['required', new ImageOrBase64Rule()];
+
+
         return [
             'codigo' => ['required', 'string', 'max:255', Rule::unique('tenants', 'codigo')],
             'nombre' => ['required', 'string', 'max:255'],
@@ -45,12 +48,19 @@ class StoreTenantRequest extends FormRequest
                         $fail("The {$attribute} field must contain a valid domain or URL.");
                     }
                 },
-                'nullable',
+                'required',
                 'string',
                 'max:255',
                 Rule::unique('tenants', 'dominio'),
             ],
-            ...TenantPropRules::sync(),
+            'primary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'secondary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'danger_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'success_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'header_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'footer_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'header_logo' => $logoRule,
+            'footer_logo' => $logoRule,
         ];
     }
 }

app/Domains/Tenant/Requests/UpdateTenantPropRequest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Requests;
-
-use App\Domains\Tenant\Models\TenantProp;
-use App\Domains\Tenant\Support\TenantPropDataType;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
-
-class UpdateTenantPropRequest extends FormRequest
-{
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function rules(): array
-    {
-        /** @var TenantProp|null $tenantProp */
-        $tenantProp = $this->route('tenantProp');
-
-        return [
-            'codigo' => ['required', 'string', 'max:255', Rule::unique('tenant_props', 'codigo')->ignore($tenantProp?->id)],
-            'nombre' => ['required', 'string', 'max:255'],
-            'descripcion' => ['nullable', 'string'],
-            'is_required' => ['sometimes', 'boolean'],
-            'data_type' => ['required', Rule::enum(TenantPropDataType::class)],
-        ];
-    }
-}

app/Domains/Tenant/Requests/UpdateTenantRequest.php

@@ -2,9 +2,9 @@
 
 namespace App\Domains\Tenant\Requests;
 
+use App\Domains\Shared\Rules\ImageOrBase64Rule;
 use App\Domains\Tenant\Models\Tenant;
 use App\Domains\Tenant\Support\TenantDomainNormalizer;
-use App\Domains\Tenant\Support\TenantPropRules;
 use Closure;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -20,15 +20,17 @@ class UpdateTenantRequest extends FormRequest
 
     protected function prepareForValidation(): void
     {
-        $rawDomain = $this->input('dominio');
-        $normalizedDomain = TenantDomainNormalizer::normalize($rawDomain);
+        if ($this->has('dominio')) {
+            $rawDomain = $this->input('dominio');
+            $normalizedDomain = TenantDomainNormalizer::normalize($rawDomain);
 
-        $this->hasInvalidDomain = TenantDomainNormalizer::hasValue($rawDomain)
-            && $normalizedDomain === null;
+            $this->hasInvalidDomain = TenantDomainNormalizer::hasValue($rawDomain)
+                && $normalizedDomain === null;
 
-        $this->merge([
-            'dominio' => $normalizedDomain,
-        ]);
+            $this->merge([
+                'dominio' => $normalizedDomain,
+            ]);
+        }
     }
 
     /**
@@ -39,14 +41,17 @@ class UpdateTenantRequest extends FormRequest
         /** @var Tenant|null $tenant */
         $tenant = $this->route('tenant');
 
+        $logoRule = ['nullable', new ImageOrBase64Rule()];
+
+
         return [
             'codigo' => [
-                'required',
+                'nullable',
                 'string',
                 'max:255',
                 Rule::unique('tenants', 'codigo')->ignore($tenant?->id),
             ],
-            'nombre' => ['required', 'string', 'max:255'],
+            'nombre' => ['nullable', 'string', 'max:255'],
             'dominio' => [
                 'bail',
                 function (string $attribute, mixed $value, Closure $fail): void {
@@ -59,7 +64,14 @@ class UpdateTenantRequest extends FormRequest
                 'max:255',
                 Rule::unique('tenants', 'dominio')->ignore($tenant?->id),
             ],
-            ...TenantPropRules::sync(),
+            'primary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'secondary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'danger_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'success_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'header_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'footer_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
+            'header_logo' => $logoRule,
+            'footer_logo' => $logoRule,
         ];
     }
 }

app/Domains/Tenant/Resources/TenantPropResource.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin \App\Domains\Tenant\Models\TenantProp
- */
-class TenantPropResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'codigo' => $this->codigo,
-            'nombre' => $this->nombre,
-            'descripcion' => $this->descripcion,
-            'is_required' => $this->is_required,
-            'data_type' => $this->data_type?->value ?? $this->data_type,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
-}

app/Domains/Tenant/Resources/TenantResource.php

@@ -10,29 +10,6 @@ use Illuminate\Http\Resources\Json\JsonResource;
  */
 class TenantResource extends JsonResource
 {
-    /**
-     * @return array<string, mixed>
-     */
-    protected function collapseProps(): array
-    {
-        return $this->resource->propValues()
-            ->with('prop')
-            ->get()
-            ->mapWithKeys(fn ($propValue): array => [
-                $propValue->tenant_prop_codigo => $this->normalizePropValue($propValue->value, $propValue->prop?->data_type?->value),
-            ])
-            ->all();
-    }
-
-    protected function normalizePropValue(mixed $value, ?string $dataType): mixed
-    {
-        return match ($dataType) {
-            'boolean' => filter_var($value, FILTER_VALIDATE_BOOL, FILTER_NULL_ON_FAILURE) ?? $value,
-            'number' => is_numeric($value) ? $value + 0 : $value,
-            default => $value,
-        };
-    }
-
     /**
      * @return array<string, mixed>
      */
@@ -43,7 +20,15 @@ class TenantResource extends JsonResource
             'codigo' => $this->codigo,
             'nombre' => $this->nombre,
             'dominio' => $this->dominio,
-            'props' => $this->collapseProps(),
+            'primary_color' => $this->primary_color,
+            'secondary_color' => $this->secondary_color,
+            'danger_color' => $this->danger_color,
+            'success_color' => $this->success_color,
+            'header_bg_color' => $this->header_bg_color,
+            'footer_bg_color' => $this->footer_bg_color,
+            // 1 day
+            'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
+            'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440 ),
         ];
     }
 }

app/Domains/Tenant/Services/TenantService.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Domains\Tenant\Services;
+
+use App\Domains\Attachable\Services\AttachmentService;
+use App\Domains\Tenant\Models\Tenant;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class TenantService
+{
+    public function __construct(protected AttachmentService $attachmentService)
+    {
+    }
+
+    /**
+     * Create a new tenant and store its logos.
+     *
+     * @param  array<string, mixed>  $data
+     * @return Tenant
+     */
+    public function create(array $data): Tenant
+    {
+        return DB::transaction(function () use ($data): Tenant {
+            $headerLogo = $data['header_logo'] ?? null;
+            $footerLogo = $data['footer_logo'] ?? null;
+
+            unset($data['header_logo'], $data['footer_logo']);
+
+            $headerAttachmentId = null;
+            if ($headerLogo) {
+                $attachment = Str::isUuid($headerLogo)
+                    ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
+                    : $this->attachmentService->store($headerLogo, 'tenants');
+
+                if ($attachment) {
+                    $headerAttachmentId = $attachment->id;
+                }
+            }
+
+            $footerAttachmentId = null;
+            if ($footerLogo) {
+                $attachment = Str::isUuid($footerLogo)
+                    ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
+                    : $this->attachmentService->store($footerLogo, 'tenants');
+
+                if ($attachment) {
+                    $footerAttachmentId = $attachment->id;
+                }
+            }
+
+            $data['header_logo_id'] = $headerAttachmentId;
+            $data['footer_logo_id'] = $footerAttachmentId;
+
+            /** @var Tenant $tenant */
+            $tenant = Tenant::query()->create($data);
+
+            return $tenant;
+        });
+    }
+
+    /**
+     * Update an existing tenant and store new logos if uploaded.
+     *
+     * @param  Tenant  $tenant
+     * @param  array<string, mixed>  $data
+     * @return Tenant
+     */
+    public function update(Tenant $tenant, array $data): Tenant
+    {
+        return DB::transaction(function () use ($tenant, $data): Tenant {
+            $hasHeaderLogoKey = array_key_exists('header_logo', $data);
+            $hasFooterLogoKey = array_key_exists('footer_logo', $data);
+            $headerLogo = $data['header_logo'] ?? null;
+            $footerLogo = $data['footer_logo'] ?? null;
+
+            unset($data['header_logo'], $data['footer_logo']);
+
+            $tenant->fill($data);
+
+            if ($hasHeaderLogoKey) {
+                if ($headerLogo) {
+                    $attachment = Str::isUuid($headerLogo)
+                        ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $headerLogo)->first()
+                        : $this->attachmentService->store($headerLogo, 'tenants');
+
+                    if ($attachment) {
+                        $tenant->header_logo_id = $attachment->id;
+                    } else {
+                        $tenant->header_logo_id = null;
+                    }
+                } else {
+                    $tenant->header_logo_id = null;
+                }
+            }
+
+            if ($hasFooterLogoKey) {
+                if ($footerLogo) {
+                    $attachment = Str::isUuid($footerLogo)
+                        ? \App\Domains\Attachable\Models\Attachment::query()->where('key', $footerLogo)->first()
+                        : $this->attachmentService->store($footerLogo, 'tenants');
+
+                    if ($attachment) {
+                        $tenant->footer_logo_id = $attachment->id;
+                    } else {
+                        $tenant->footer_logo_id = null;
+                    }
+                } else {
+                    $tenant->footer_logo_id = null;
+                }
+            }
+
+            $tenant->save();
+
+            return $tenant;
+        });
+    }
+}

app/Domains/Tenant/Support/TenantPropDataType.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Support;
-
-enum TenantPropDataType: string
-{
-    case String = 'string';
-    case Number = 'number';
-    case Boolean = 'boolean';
-
-    /**
-     * @return list<string>
-     */
-    public static function values(): array
-    {
-        return array_column(self::cases(), 'value');
-    }
-}

app/Domains/Tenant/Support/TenantPropRules.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Domains\Tenant\Support;
-
-use App\Domains\Tenant\Models\TenantProp;
-use Closure;
-
-class TenantPropRules
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public static function sync(): array
-    {
-        return [
-            'props' => [
-                'sometimes',
-                'array',
-                static function (string $attribute, mixed $value, Closure $fail): void {
-                    static::validateExistingProps($attribute, $value, $fail);
-                },
-            ],
-            'props.*' => ['nullable'],
-        ];
-    }
-
-    protected static function validateExistingProps(string $attribute, mixed $value, Closure $fail): void
-    {
-        if (! is_array($value) || $value === []) {
-            return;
-        }
-
-        $propCodes = array_map('strval', array_keys($value));
-        $existingPropCodes = TenantProp::query()
-            ->whereIn('codigo', $propCodes)
-            ->pluck('codigo')
-            ->all();
-
-        $missingPropCodes = array_values(array_diff($propCodes, $existingPropCodes));
-
-        if ($missingPropCodes === []) {
-            return;
-        }
-
-        $fail(sprintf(
-            'The selected %s are invalid for Tenant: %s.',
-            $attribute,
-            implode(', ', $missingPropCodes),
-        ));
-    }
-}

app/Domains/Tenant/routes/api.php

@@ -2,12 +2,9 @@
 
 use App\Domains\Tenant\Controllers\BootstrapTenantController;
 use App\Domains\Tenant\Controllers\TenantController;
-use App\Domains\Tenant\Controllers\TenantPropController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('tenants/bootstrap/{dominio}', BootstrapTenantController::class)
     ->where('dominio', '.*');
 
 Route::apiResource('tenants', TenantController::class);
-Route::apiResource('tenant-props', TenantPropController::class)
-    ->parameters(['tenant-props' => 'tenantProp']);

app/Providers/AppServiceProvider.php

@@ -19,6 +19,22 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        //
+        \Illuminate\Database\Eloquent\Builder::macro('paginateFromRequest', function (int $defaultPerPage = 15, int $maxPerPage = 100, ?int $page = null) {
+            /** @var \Illuminate\Database\Eloquent\Builder $this */
+            $perPage = (int) request()->query('per_page', $defaultPerPage);
+            $page = $page ?? (int) request()->query('page', 1);
+
+            if ($perPage <= 0) {
+                $perPage = $defaultPerPage;
+            }
+            if ($perPage > $maxPerPage) {
+                $perPage = $maxPerPage;
+            }
+            if ($page <= 0) {
+                $page = 1;
+            }
+
+            return $this->paginate(perPage: $perPage, page: $page);
+        });
     }
 }

bootstrap/app.php

@@ -13,7 +13,9 @@ return Application::configure(basePath: dirname(__DIR__))
         health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware): void {
-        //
+        $middleware->encryptCookies(except: [
+            'guest_token',
+        ]);
     })
     ->withExceptions(function (Exceptions $exceptions): void {
         $exceptions->shouldRenderJsonWhen(

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "php": "^8.3",
         "laravel/framework": "^13.8",
-        "laravel/sanctum": "^4.0",
+        "laravel/sanctum": "^4.3",
         "laravel/tinker": "^3.0",
         "league/flysystem-aws-s3-v3": "3.0"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c1933c09dc4d90a389d19d7cffff4e43",
+    "content-hash": "08dac456d84023cd816d5c96086a3b3c",
     "packages": [
         {
             "name": "aws/aws-crt-php",

config/auth.php

@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Auth\Models\User;
 
 return [
 

config/cors.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cross-Origin Resource Sharing (CORS) Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure your settings for cross-origin resource sharing
+    | or "CORS". This determines what cross-origin operations may execute
+    | in web browsers. You are free to adjust these settings as needed.
+    |
+    | To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+    |
+    */
+
+    'paths' => ['api/*', 'sanctum/csrf-cookie'],
+
+    'allowed_methods' => ['*'],
+
+    'allowed_origins' => [env('FRONTEND_URL', 'http://localhost:4200')],
+
+    'allowed_origins_patterns' => [],
+
+    'allowed_headers' => ['*'],
+
+    'exposed_headers' => [],
+
+    'max_age' => 0,
+
+    'supports_credentials' => true,
+
+];

config/sanctum.php

@@ -37,7 +37,7 @@ return [
     |
     */
 
-    'guard' => ['web'],
+    'guard' => [],
 
     /*
     |--------------------------------------------------------------------------

config/services.php

@@ -35,4 +35,8 @@ return [
         ],
     ],
 
+    'integrations' => [
+        'secret' => env('INTEGRATION_SECRET'),
+    ],
+
 ];