Compare commits
60 Commits
370834856b
...
feature/sh
| Author | SHA1 | Date | |
|---|---|---|---|
| 007ba9d572 | |||
| 5ddc304435 | |||
| 675d76fcb0 | |||
| 35fd1277cb | |||
| 1986961942 | |||
| 3f76af8ec8 | |||
| 0ca2bc8d1b | |||
| c40f145b60 | |||
| 0693e52321 | |||
| cfa7acabe0 | |||
| 1633c30a22 | |||
| 7279f9c6e8 | |||
| 878382e867 | |||
| f47212fd2c | |||
| 3472fb2e5b | |||
| cb3da583be | |||
| 53acfda166 | |||
| 85c79514a3 | |||
| 1aaf05c3b0 | |||
| f7d66001a8 | |||
| 1d58e0ad38 | |||
| 856b9a6706 | |||
| e7bece5bfd | |||
| e2cf53eacc | |||
| c7fc867905 | |||
| 3ddff7e0ee | |||
| 22de61c8c0 | |||
| 2d11263adc | |||
| c975b5d51d | |||
| c7afb70196 | |||
| 31955f862d | |||
| bb4495c6cc | |||
| f3e226130f | |||
| 77dd0e2715 | |||
| 917f2dff09 | |||
| 6588d9f1a8 | |||
| 5d5ee7d2a5 | |||
| df19655144 | |||
| 6e1f0d731c | |||
| 0303803f75 | |||
| 94db48467e | |||
| 793e7be756 | |||
| 3b6d6bf28b | |||
| a9d9854e5e | |||
| 4bdd3effcc | |||
| 794acc4814 | |||
| d42896e956 | |||
| 0fe38df019 | |||
| fb5221854c | |||
| a4bd9263a2 | |||
| 85cd1ad04f | |||
| c5aeb19735 | |||
| 9db955bdcf | |||
| e988e55b77 | |||
| bc60f1caa1 | |||
| 068d5d7f4f | |||
| 82c18e9e91 | |||
| dfad6fb4b0 | |||
| 3f9b773367 | |||
| 7996d53e12 |
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Requests\AdminApp\UpdateCategoryConfigurationRequest;
|
||||||
|
use App\Domains\Commerce\Catalog\Resources\AdminApp\CategoryConfigurationResource;
|
||||||
|
use App\Domains\Commerce\Catalog\Services\CategoryConfigurationService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
|
||||||
|
class CategoryConfigurationController extends Controller
|
||||||
|
{
|
||||||
|
public function index(Request $request, CategoryConfigurationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return CategoryConfigurationResource::collection(
|
||||||
|
$service->forTenant($request->user()->tenant()->firstOrFail())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(UpdateCategoryConfigurationRequest $request, CategoryConfigurationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$service->update($tenant, $request->validated());
|
||||||
|
|
||||||
|
return CategoryConfigurationResource::collection($service->forTenant($tenant));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,6 +15,7 @@ use App\Domains\Commerce\Catalog\Resources\CatalogFeaturedGroupResource;
|
|||||||
use App\Domains\Commerce\Catalog\Resources\CatalogItemDetailResource;
|
use App\Domains\Commerce\Catalog\Resources\CatalogItemDetailResource;
|
||||||
use App\Domains\Commerce\Catalog\Resources\CatalogSearchItemResource;
|
use App\Domains\Commerce\Catalog\Resources\CatalogSearchItemResource;
|
||||||
use App\Domains\Commerce\Catalog\Resources\CatalogVariantOptionsResource;
|
use App\Domains\Commerce\Catalog\Resources\CatalogVariantOptionsResource;
|
||||||
|
use App\Domains\Commerce\Catalog\Resources\CategoryResource;
|
||||||
use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
|
use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
|
||||||
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
||||||
use App\Domains\Commerce\Catalog\Services\FeaturedGroupService;
|
use App\Domains\Commerce\Catalog\Services\FeaturedGroupService;
|
||||||
@@ -78,11 +79,7 @@ class CatalogController extends Controller
|
|||||||
$allowances->attach($items->getCollection(), $this->userId($request));
|
$allowances->attach($items->getCollection(), $this->userId($request));
|
||||||
|
|
||||||
return CatalogSearchItemResource::collection($items)->additional([
|
return CatalogSearchItemResource::collection($items)->additional([
|
||||||
'category' => [
|
'category' => CategoryResource::make($category)->resolve($request),
|
||||||
'id' => $category->id,
|
|
||||||
'nombre' => $category->nombre,
|
|
||||||
'categoria_id' => $category->categoria_id,
|
|
||||||
],
|
|
||||||
'layout' => $tenant->search_product_layout->value,
|
'layout' => $tenant->search_product_layout->value,
|
||||||
'group_layout' => $tenant->search_group_layout->value,
|
'group_layout' => $tenant->search_group_layout->value,
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Domains\Commerce\Catalog\Models;
|
|||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -16,6 +17,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
|
|||||||
'categoria_id',
|
'categoria_id',
|
||||||
'nombre',
|
'nombre',
|
||||||
'is_enabled',
|
'is_enabled',
|
||||||
|
'banner_id',
|
||||||
|
'banner_enabled',
|
||||||
|
'sort_order',
|
||||||
])]
|
])]
|
||||||
class Category extends Model
|
class Category extends Model
|
||||||
{
|
{
|
||||||
@@ -25,6 +29,7 @@ class Category extends Model
|
|||||||
|
|
||||||
protected $attributes = [
|
protected $attributes = [
|
||||||
'is_enabled' => true,
|
'is_enabled' => true,
|
||||||
|
'banner_enabled' => false,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -35,6 +40,9 @@ class Category extends Model
|
|||||||
return [
|
return [
|
||||||
'categoria_id' => 'integer',
|
'categoria_id' => 'integer',
|
||||||
'is_enabled' => 'boolean',
|
'is_enabled' => 'boolean',
|
||||||
|
'banner_id' => 'integer',
|
||||||
|
'banner_enabled' => 'boolean',
|
||||||
|
'sort_order' => 'integer',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,6 +67,12 @@ class Category extends Model
|
|||||||
return $this->belongsTo(self::class, 'categoria_id');
|
return $this->belongsTo(self::class, 'categoria_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Attachment, $this> */
|
||||||
|
public function banner(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Attachment::class, 'banner_id');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return HasMany<Category, $this>
|
* @return HasMany<Category, $this>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Requests\AdminApp;
|
||||||
|
|
||||||
|
use App\Shared\Rules\ImageOrBase64Rule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Illuminate\Validation\Validator as ValidationValidator;
|
||||||
|
|
||||||
|
class UpdateCategoryConfigurationRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'categories' => ['present', 'array', 'max:500'],
|
||||||
|
'deleted_ids' => ['present', 'array', 'max:1000'],
|
||||||
|
'deleted_ids.*' => ['required', 'integer', 'min:1', 'distinct'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function withValidator(ValidationValidator $validator): void
|
||||||
|
{
|
||||||
|
$validator->after(function (ValidationValidator $validator): void {
|
||||||
|
if ($validator->errors()->isNotEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$this->validateNodes($validator, $this->input('categories'), 'categories', 0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function validateNodes(ValidationValidator $validator, array $nodes, string $path, int $depth): void
|
||||||
|
{
|
||||||
|
if ($depth > 10) {
|
||||||
|
$validator->errors()->add($path, 'La jerarquía de categorías es demasiado profunda.');
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($nodes as $index => $node) {
|
||||||
|
$key = "{$path}.{$index}";
|
||||||
|
if (! is_array($node)) {
|
||||||
|
$validator->errors()->add($key, 'La categoría debe ser un objeto.');
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$nested = Validator::make($node, [
|
||||||
|
'id' => ['present', 'nullable', 'integer', 'min:1'],
|
||||||
|
'nombre' => ['required', 'string', 'max:255'],
|
||||||
|
'is_enabled' => ['required', 'boolean'],
|
||||||
|
'banner_enabled' => ['required', 'boolean'],
|
||||||
|
'banner' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'subcategories' => ['present', 'array', 'max:500'],
|
||||||
|
]);
|
||||||
|
foreach ($nested->errors()->messages() as $field => $messages) {
|
||||||
|
foreach ($messages as $message) {
|
||||||
|
$validator->errors()->add("{$key}.{$field}", $message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (! $nested->fails()) {
|
||||||
|
$this->validateNodes($validator, $node['subcategories'], "{$key}.subcategories", $depth + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Category */
|
||||||
|
class CategoryConfigurationResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'nombre' => $this->nombre,
|
||||||
|
'is_enabled' => $this->is_enabled,
|
||||||
|
'banner_enabled' => $this->banner_enabled,
|
||||||
|
'banner_key' => $this->banner?->key,
|
||||||
|
'banner_name' => $this->banner?->filename,
|
||||||
|
'banner_url' => $this->banner?->getTemporaryUrl(1440),
|
||||||
|
'subcategories' => self::collection($this->subCategories),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
24
app/Domains/Commerce/Catalog/Resources/CategoryResource.php
Normal file
24
app/Domains/Commerce/Catalog/Resources/CategoryResource.php
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Category */
|
||||||
|
class CategoryResource extends JsonResource
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'nombre' => $this->nombre,
|
||||||
|
'categoria_id' => $this->categoria_id,
|
||||||
|
'banner_url' => $this->banner_enabled
|
||||||
|
? $this->banner?->getTemporaryUrl(1440)
|
||||||
|
: null,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\FeaturedGroup;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Enums\AttachmentType;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
|
class CategoryConfigurationService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly AttachmentService $attachments) {}
|
||||||
|
|
||||||
|
/** @return Collection<int, Category> */
|
||||||
|
public function forTenant(Tenant $tenant): Collection
|
||||||
|
{
|
||||||
|
$all = $tenant->categories()->with('banner')->orderBy('sort_order')->orderBy('id')->get();
|
||||||
|
$children = $all->groupBy('categoria_id');
|
||||||
|
foreach ($all as $category) {
|
||||||
|
$category->setRelation('subCategories', $children->get($category->id, collect()));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $all->filter(fn (Category $category) => $category->categoria_id === null)->values();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function update(Tenant $tenant, array $data): void
|
||||||
|
{
|
||||||
|
$created = [];
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($tenant, $data, &$created): void {
|
||||||
|
// Serialize saves for this tenant, including creation of new categories.
|
||||||
|
Tenant::query()->whereKey($tenant->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$existing = $tenant->categories()->with('banner')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$deleted = array_map('intval', $data['deleted_ids']);
|
||||||
|
$seen = [];
|
||||||
|
$allowedBannerKeys = $existing->pluck('banner.key')->filter()->all();
|
||||||
|
$this->validateNodes($data['categories'], $existing, $deleted, $seen, $allowedBannerKeys);
|
||||||
|
|
||||||
|
foreach ($deleted as $id) {
|
||||||
|
$category = $existing->get($id);
|
||||||
|
if ($category === null) {
|
||||||
|
$this->invalid('deleted_ids', 'Una categoría a eliminar no pertenece a esta tienda.');
|
||||||
|
}
|
||||||
|
if ($category->catalogItems()->withTrashed()->exists()
|
||||||
|
|| FeaturedGroup::query()->where('category_id', $id)->exists()) {
|
||||||
|
$this->invalid('deleted_ids', "No se puede eliminar «{$category->nombre}» porque tiene productos o grupos destacados asociados. Podés ocultarla.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->saveNodes($tenant, $data['categories'], null, $existing, $created);
|
||||||
|
$remaining = $tenant->categories()->whereNotIn('id', $deleted)->get();
|
||||||
|
$parents = $remaining->pluck('categoria_id', 'id');
|
||||||
|
foreach ($remaining as $category) {
|
||||||
|
$visited = [$category->id => true];
|
||||||
|
$parentId = $category->categoria_id;
|
||||||
|
while ($parentId !== null) {
|
||||||
|
if (isset($visited[$parentId]) || ! $parents->has($parentId)) {
|
||||||
|
$this->invalid('categories', 'La jerarquía contiene un ciclo o una categoría padre eliminada.');
|
||||||
|
}
|
||||||
|
$visited[$parentId] = true;
|
||||||
|
$parentId = $parents->get($parentId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detach only explicitly deleted nodes before removing parents and children together.
|
||||||
|
$tenant->categories()->whereIn('id', $deleted)->update(['categoria_id' => null]);
|
||||||
|
$tenant->categories()->whereIn('id', $deleted)->delete();
|
||||||
|
});
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
foreach ($created as $attachment) {
|
||||||
|
Storage::disk('s3')->delete($attachment->path);
|
||||||
|
}
|
||||||
|
throw $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function validateNodes(array $nodes, Collection $existing, array $deleted, array &$seen, array $bannerKeys, string $path = 'categories'): void
|
||||||
|
{
|
||||||
|
foreach ($nodes as $index => $node) {
|
||||||
|
$field = "{$path}.{$index}";
|
||||||
|
if ($node['id'] !== null) {
|
||||||
|
$id = (int) $node['id'];
|
||||||
|
if (! $existing->has($id) || isset($seen[$id]) || in_array($id, $deleted, true)) {
|
||||||
|
$this->invalid("{$field}.id", 'La categoría es ajena a la tienda, está repetida o fue marcada para eliminar.');
|
||||||
|
}
|
||||||
|
$seen[$id] = true;
|
||||||
|
}
|
||||||
|
if (trim($node['nombre']) === '') {
|
||||||
|
$this->invalid("{$field}.nombre", 'Completá el nombre de la categoría.');
|
||||||
|
}
|
||||||
|
if (is_string($node['banner']) && Str::isUuid($node['banner'])
|
||||||
|
&& ! in_array($node['banner'], $bannerKeys, true)) {
|
||||||
|
$this->invalid("{$field}.banner", 'El banner no pertenece a las categorías de esta tienda.');
|
||||||
|
}
|
||||||
|
$this->validateNodes($node['subcategories'], $existing, $deleted, $seen, $bannerKeys, "{$field}.subcategories");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function saveNodes(Tenant $tenant, array $nodes, ?int $parentId, Collection $existing, array &$created): void
|
||||||
|
{
|
||||||
|
foreach (array_values($nodes) as $order => $node) {
|
||||||
|
$category = $node['id'] === null ? new Category : $existing->get((int) $node['id']);
|
||||||
|
$banner = null;
|
||||||
|
if ($node['banner'] !== null) {
|
||||||
|
if (is_string($node['banner']) && Str::isUuid($node['banner'])) {
|
||||||
|
$banner = Attachment::query()->where('key', $node['banner'])->firstOrFail();
|
||||||
|
if ($banner->type !== AttachmentType::Image) {
|
||||||
|
$this->invalid('categories', 'El banner debe ser una imagen.');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$banner = $this->attachments->store($node['banner'], "tenants/{$tenant->codigo}/categories");
|
||||||
|
$created[] = $banner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$category->fill([
|
||||||
|
'tenant_code' => $tenant->codigo,
|
||||||
|
'categoria_id' => $parentId,
|
||||||
|
'nombre' => trim($node['nombre']),
|
||||||
|
'is_enabled' => $node['is_enabled'],
|
||||||
|
'banner_id' => $banner?->id,
|
||||||
|
'banner_enabled' => $node['banner_enabled'],
|
||||||
|
'sort_order' => $order,
|
||||||
|
])->save();
|
||||||
|
$this->saveNodes($tenant, $node['subcategories'], $category->id, $existing, $created);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function invalid(string $field, string $message): never
|
||||||
|
{
|
||||||
|
throw ValidationException::withMessages([$field => $message]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,6 +31,16 @@ Bajo `/tenants/{tenant:codigo}` se publican catálogo, búsqueda, categoría, de
|
|||||||
|
|
||||||
Bajo `/v1/adminapp/tenant/featured-groups`, con `auth:sanctum` y `adminapp.tenant`, se listan, crean y actualizan grupos destacados.
|
Bajo `/v1/adminapp/tenant/featured-groups`, con `auth:sanctum` y `adminapp.tenant`, se listan, crean y actualizan grupos destacados.
|
||||||
|
|
||||||
|
### Configuración de categorías de producto
|
||||||
|
|
||||||
|
`GET /v1/adminapp/tenant/categories` devuelve un árbol ordenado de las categorías del tenant autenticado, incluidas las ocultas. Cada nodo contiene `id`, `nombre`, `is_enabled`, `banner_enabled`, `banner_key`, `banner_name`, `banner_url` y `subcategories`. La URL administrativa se devuelve incluso si el banner está deshabilitado.
|
||||||
|
|
||||||
|
`PUT /v1/adminapp/tenant/categories` recibe `categories` y `deleted_ids`. Cada nodo enviado contiene `id` (null para altas), `nombre`, `is_enabled`, `banner_enabled`, `banner` y `subcategories`. `banner` es una clave UUID de un banner ya asociado a las categorías del tenant, una imagen base64/archivo para reemplazarlo o null para quitarlo. Deshabilitar un banner conserva el adjunto. Duplicar una categoría puede compartir su banner; los adjuntos previos no se eliminan al quitar o reemplazar esa referencia.
|
||||||
|
|
||||||
|
La posición de cada nodo en su lista determina `sort_order`; este campo no se expone en las respuestas públicas ni administrativas. La migración inicial conserva el orden alfabético existente. El bootstrap del storefront ordena por `sort_order` e ID y no muestra categorías ocultas ni sus descendientes.
|
||||||
|
|
||||||
|
El guardado es transaccional. Solo se eliminan los IDs explícitos, se rechazan IDs y banners ajenos, categorías repetidas y jerarquías inválidas. No se pueden eliminar categorías con productos (incluidos los archivados) o grupos destacados asociados. Los archivos recién subidos se limpian si falla la transacción. La respuesta devuelve el árbol persistido y los IDs asignados a las altas.
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Attachable` para imágenes/archivos, `Tenant` para aislamiento y `Ticket`/`Event` para vigencia y fechas. `Cart` y `Purchase` consumen sus precios, variantes e inventario. Los cambios de stock deben pasar por `CatalogInventoryService` para conservar reservas y disponibilidad.
|
Usa `Attachable` para imágenes/archivos, `Tenant` para aislamiento y `Ticket`/`Event` para vigencia y fechas. `Cart` y `Purchase` consumen sus precios, variantes e inventario. Los cambios de stock deben pasar por `CatalogInventoryService` para conservar reservas y disponibilidad.
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Controllers\AdminApp\CategoryConfigurationController;
|
||||||
use App\Domains\Commerce\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
|
use App\Domains\Commerce\Catalog\Controllers\AdminApp\OnTicketFeaturedGroupController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant')
|
Route::prefix('v1/adminapp/tenant')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
|
Route::get('categories', [CategoryConfigurationController::class, 'index']);
|
||||||
|
Route::put('categories', [CategoryConfigurationController::class, 'update']);
|
||||||
Route::get('featured-groups', [OnTicketFeaturedGroupController::class, 'index'])
|
Route::get('featured-groups', [OnTicketFeaturedGroupController::class, 'index'])
|
||||||
->name('adminapp.featured-groups.index');
|
->name('adminapp.featured-groups.index');
|
||||||
Route::post('featured-groups', [OnTicketFeaturedGroupController::class, 'store'])
|
Route::post('featured-groups', [OnTicketFeaturedGroupController::class, 'store'])
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Controllers;
|
namespace App\Domains\Commerce\Purchase\Controllers;
|
||||||
|
|
||||||
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
||||||
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
||||||
@@ -13,6 +12,7 @@ use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
|||||||
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -151,11 +151,14 @@ class PurchaseController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
$compra->refresh();
|
$compra->refresh();
|
||||||
|
$compra->loadMissing('event');
|
||||||
$totalAmount = (float) $compra->total;
|
$totalAmount = (float) $compra->total;
|
||||||
|
|
||||||
if ($method === 'transfer') {
|
if ($method === 'transfer') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$accountInfo = $telepagosService->getAccountInfo();
|
$accountInfo = $telepagosService->getAccountInfo();
|
||||||
@@ -191,7 +194,9 @@ class PurchaseController extends Controller
|
|||||||
|
|
||||||
if ($method === 'qr') {
|
if ($method === 'qr') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Models;
|
namespace App\Domains\Commerce\Purchase\Models;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Models\Cart;
|
use App\Domains\Commerce\Cart\Models\Cart;
|
||||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||||
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
|
||||||
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -21,6 +22,7 @@ use Illuminate\Support\Facades\DB;
|
|||||||
#[Fillable([
|
#[Fillable([
|
||||||
'cart_id',
|
'cart_id',
|
||||||
'stock_reservation_id',
|
'stock_reservation_id',
|
||||||
|
'event_id',
|
||||||
'tenant_codigo',
|
'tenant_codigo',
|
||||||
'user_id',
|
'user_id',
|
||||||
'status',
|
'status',
|
||||||
@@ -149,6 +151,7 @@ class Purchase extends Model
|
|||||||
return [
|
return [
|
||||||
'cart_id' => 'integer',
|
'cart_id' => 'integer',
|
||||||
'stock_reservation_id' => 'integer',
|
'stock_reservation_id' => 'integer',
|
||||||
|
'event_id' => 'integer',
|
||||||
'user_id' => 'integer',
|
'user_id' => 'integer',
|
||||||
'total' => 'decimal:2',
|
'total' => 'decimal:2',
|
||||||
];
|
];
|
||||||
@@ -162,6 +165,12 @@ class Purchase extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Event, $this> */
|
||||||
|
public function event(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return BelongsTo<User, $this>
|
* @return BelongsTo<User, $this>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ class PurchaseResource extends JsonResource
|
|||||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
/** @var Event|null $checkoutEvent */
|
/** @var Event|null $checkoutEvent */
|
||||||
$checkoutEvent = $usesEventSummary
|
$checkoutEvent = $usesEventSummary
|
||||||
? $items
|
? ($this->event ?? $items
|
||||||
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
||||||
->filter()
|
->filter()
|
||||||
->unique('id')
|
->unique('id')
|
||||||
->first()
|
->first())
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
$subtotal = $items->isNotEmpty()
|
$subtotal = $items->isNotEmpty()
|
||||||
@@ -62,6 +62,7 @@ class PurchaseResource extends JsonResource
|
|||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
'cart_id' => $this->cart_id,
|
'cart_id' => $this->cart_id,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
'user_id' => $this->user_id,
|
'user_id' => $this->user_id,
|
||||||
'created_at' => $this->created_at,
|
'created_at' => $this->created_at,
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ class PurchaseResponseLoader
|
|||||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
$relations = [
|
$relations = [
|
||||||
'tenant',
|
'tenant',
|
||||||
|
'event.attachment',
|
||||||
'items.sourceCatalogItem.event.attachment',
|
'items.sourceCatalogItem.event.attachment',
|
||||||
'stockReservation',
|
'stockReservation',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -206,6 +206,7 @@ class StartCheckoutService
|
|||||||
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
||||||
),
|
),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -273,6 +274,7 @@ class StartCheckoutService
|
|||||||
$purchaseData,
|
$purchaseData,
|
||||||
$cart->getTotalAmount(),
|
$cart->getTotalAmount(),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -410,10 +412,12 @@ class StartCheckoutService
|
|||||||
array $purchaseData,
|
array $purchaseData,
|
||||||
float $total,
|
float $total,
|
||||||
?int $cartId,
|
?int $cartId,
|
||||||
|
?int $eventId,
|
||||||
): Purchase {
|
): Purchase {
|
||||||
return Purchase::query()->create([
|
return Purchase::query()->create([
|
||||||
...$purchaseData,
|
...$purchaseData,
|
||||||
'cart_id' => $cartId,
|
'cart_id' => $cartId,
|
||||||
|
'event_id' => $eventId,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
'user_id' => $userId,
|
'user_id' => $userId,
|
||||||
'status' => Purchase::STATUS_CREATED,
|
'status' => Purchase::STATUS_CREATED,
|
||||||
|
|||||||
@@ -8,12 +8,14 @@ use Illuminate\Database\Eloquent\Builder;
|
|||||||
|
|
||||||
class PurchaseRefundSummaryService
|
class PurchaseRefundSummaryService
|
||||||
{
|
{
|
||||||
public function totalForTenant(Tenant $tenant): string
|
public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
$total = TicketRefund::query()
|
$total = TicketRefund::query()
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'purchaseItem.purchase',
|
'purchaseItem.purchase',
|
||||||
fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
|
fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId))
|
||||||
)
|
)
|
||||||
->sum('amount');
|
->sum('amount');
|
||||||
|
|
||||||
|
|||||||
@@ -32,10 +32,10 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleResource::collection(
|
return SaleResource::collection(
|
||||||
$this->saleService->sales($tenant, $request->validated())
|
$this->saleService->sales($tenant, $request->validated(), $request->user()->event_id)
|
||||||
)->additional([
|
)->additional([
|
||||||
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
|
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id),
|
||||||
'refunded_total' => $this->saleService->refundedTotal($tenant),
|
'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleDetailResource($this->saleService->detail($tenant, $sale));
|
return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
||||||
@@ -51,7 +51,7 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleTicketResource::collection(
|
return SaleTicketResource::collection(
|
||||||
$this->saleService->tickets($tenant, $sale)
|
$this->saleService->tickets($tenant, $sale, $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,14 +59,14 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->confirm($tenant, $sale));
|
return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Request $request, int $sale): SaleResource
|
public function cancel(Request $request, int $sale): SaleResource
|
||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->cancel($tenant, $sale));
|
return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function modifications(
|
public function modifications(
|
||||||
@@ -76,6 +76,7 @@ class SaleController extends Controller
|
|||||||
$this->saleService->modifications(
|
$this->saleService->modifications(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -86,7 +87,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadSales(
|
return $this->salePdfService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -97,7 +98,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadModifications(
|
return $this->salePdfService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -108,7 +109,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadSales(
|
return $this->saleExcelService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -120,7 +121,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadModifications(
|
return $this->saleExcelService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Sale\Services;
|
namespace App\Domains\Commerce\Sale\Services;
|
||||||
|
|
||||||
use App\Shared\Logging\Models\ValueChange;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||||
@@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant;
|
|||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use App\Shared\Logging\Models\ValueChange;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -21,19 +21,18 @@ class AdminAppSaleService
|
|||||||
protected PurchaseRefundSummaryService $refundSummaryService,
|
protected PurchaseRefundSummaryService $refundSummaryService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function confirmedSalesTotal(Tenant $tenant): string
|
public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
$total = Purchase::query()
|
$total = $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->where('status', Purchase::STATUS_PAID)
|
->where('status', Purchase::STATUS_PAID)
|
||||||
->sum('total');
|
->sum('total');
|
||||||
|
|
||||||
return number_format((float) $total, 2, '.', '');
|
return number_format((float) $total, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refundedTotal(Tenant $tenant): string
|
public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
return $this->refundSummaryService->totalForTenant($tenant);
|
return $this->refundSummaryService->totalForTenant($tenant, $eventId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -47,43 +46,42 @@ class AdminAppSaleService
|
|||||||
* } $filters
|
* } $filters
|
||||||
* @return LengthAwarePaginator<Purchase>
|
* @return LengthAwarePaginator<Purchase>
|
||||||
*/
|
*/
|
||||||
public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters)
|
return $this->salesQuery($tenant, $filters, $eventId)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function detail(Tenant $tenant, int $saleId): Purchase
|
public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
return Purchase::query()
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->with('items')
|
->with('items')
|
||||||
->findOrFail($saleId);
|
->findOrFail($saleId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return Collection<int, Ticket> */
|
/** @return Collection<int, Ticket> */
|
||||||
public function tickets(Tenant $tenant, int $saleId): Collection
|
public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->findForTenant($tenant, $saleId)
|
return $this->findForTenant($tenant, $saleId, $eventId)
|
||||||
->tickets()
|
->tickets()
|
||||||
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
||||||
->orderBy('id')
|
->orderBy('id')
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function confirm(Tenant $tenant, int $saleId): Purchase
|
public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId);
|
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->confirmPaidPurchase($sale)
|
$this->checkoutService->confirmPaidPurchase($sale)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $saleId): Purchase
|
public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId);
|
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
||||||
@@ -94,18 +92,18 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
*/
|
*/
|
||||||
public function salesForExport(Tenant $tenant, array $filters = []): Collection
|
public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters)->get();
|
return $this->salesQuery($tenant, $filters, $eventId)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return LengthAwarePaginator<ValueChange>
|
* @return LengthAwarePaginator<ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters)
|
return $this->modificationsQuery($tenant, $filters, $eventId)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
@@ -114,13 +112,13 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, ValueChange>
|
* @return Collection<int, ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
|
public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters)->get();
|
return $this->modificationsQuery($tenant, $filters, $eventId)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $filters */
|
/** @param array<string, mixed> $filters */
|
||||||
protected function salesQuery(Tenant $tenant, array $filters): Builder
|
protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
$sortColumns = [
|
$sortColumns = [
|
||||||
'id' => 'id',
|
'id' => 'id',
|
||||||
@@ -137,8 +135,7 @@ class AdminAppSaleService
|
|||||||
? $requestedDirection
|
? $requestedDirection
|
||||||
: 'desc';
|
: 'desc';
|
||||||
|
|
||||||
return Purchase::query()
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -176,11 +173,18 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Builder<ValueChange>
|
* @return Builder<ValueChange>
|
||||||
*/
|
*/
|
||||||
protected function modificationsQuery(Tenant $tenant, array $filters): Builder
|
protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return ValueChange::query()
|
return ValueChange::query()
|
||||||
->where('tenant_code', $tenant->codigo)
|
->where('tenant_code', $tenant->codigo)
|
||||||
->where('trackable_type', (new Purchase)->getMorphClass())
|
->where('trackable_type', (new Purchase)->getMorphClass())
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph(
|
||||||
|
'trackable',
|
||||||
|
[Purchase::class],
|
||||||
|
fn (Builder $sales): Builder => $sales
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->where('event_id', $eventId),
|
||||||
|
))
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -221,11 +225,18 @@ class AdminAppSaleService
|
|||||||
->orderByDesc('id');
|
->orderByDesc('id');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function findForTenant(Tenant $tenant, int $saleId): Purchase
|
protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
|
{
|
||||||
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
|
->findOrFail($saleId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return Builder<Purchase> */
|
||||||
|
protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder
|
||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->findOrFail($saleId);
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function saleForResponse(Purchase $sale): Purchase
|
protected function saleForResponse(Purchase $sale): Purchase
|
||||||
|
|||||||
@@ -29,4 +29,8 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
|
|||||||
|
|
||||||
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
||||||
|
|
||||||
|
Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant.
|
||||||
|
|
||||||
|
El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`.
|
||||||
|
|
||||||
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
||||||
|
|||||||
47
app/Domains/Core/Address/Models/Address.php
Normal file
47
app/Domains/Core/Address/Models/Address.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
|
class Address extends Model
|
||||||
|
{
|
||||||
|
protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'latitude' => 'decimal:7',
|
||||||
|
'longitude' => 'decimal:7',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array{latitude: float, longitude: float}|null */
|
||||||
|
public function coordinates(): ?array
|
||||||
|
{
|
||||||
|
if ($this->latitude === null || $this->longitude === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Tenant, $this> */
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantAddress extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_addresses';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Address */
|
||||||
|
class AddressResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'address_text' => $this->address_text,
|
||||||
|
'latitude' => $this->latitude === null ? null : (float) $this->latitude,
|
||||||
|
'longitude' => $this->longitude === null ? null : (float) $this->longitude,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::collection($this->administratorService->list(
|
return AdministratorResource::collection($this->administratorService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,6 +29,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::make($this->administratorService->create(
|
return AdministratorResource::make($this->administratorService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,6 +39,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$administrator,
|
$administrator,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class AdministratorResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ class AdministratorService
|
|||||||
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null): Collection
|
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->query($tenant)->with('role')
|
return $this->query($tenant, $eventId)->with('role')
|
||||||
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
||||||
$query->where('nombre_apellido', 'like', "%{$search}%")
|
$query->where('nombre_apellido', 'like', "%{$search}%")
|
||||||
->orWhere('dni', 'like', "%{$search}%")
|
->orWhere('dni', 'like', "%{$search}%")
|
||||||
@@ -31,14 +31,15 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data): User
|
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $data): User {
|
return DB::transaction(function () use ($tenant, $data, $eventId): User {
|
||||||
$administrator = User::query()->create([
|
$administrator = User::query()->create([
|
||||||
...$this->attributes($data),
|
...$this->attributes($data),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::AdminApp->value,
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
'event_id' => $eventId,
|
||||||
]);
|
]);
|
||||||
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
||||||
$administrator->email,
|
$administrator->email,
|
||||||
@@ -50,10 +51,10 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $administratorId, array $data): User
|
public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $administratorId, $data): User {
|
return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User {
|
||||||
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId);
|
||||||
$administrator->update($this->attributes($data));
|
$administrator->update($this->attributes($data));
|
||||||
|
|
||||||
return $administrator->load('role');
|
return $administrator->load('role');
|
||||||
@@ -66,11 +67,11 @@ class AdministratorService
|
|||||||
// Serialize deletions for this tenant, including requests already authenticated
|
// Serialize deletions for this tenant, including requests already authenticated
|
||||||
// when another administrator removes their account.
|
// when another administrator removes their account.
|
||||||
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
||||||
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId);
|
||||||
if ($administrator->is($actor)) {
|
if ($administrator->is($actor)) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
||||||
}
|
}
|
||||||
$activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
|
$activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get();
|
||||||
if ($activeAdministrators->count() <= 1) {
|
if ($activeAdministrators->count() <= 1) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
||||||
}
|
}
|
||||||
@@ -80,10 +81,11 @@ class AdministratorService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function query(Tenant $tenant): Builder
|
private function query(Tenant $tenant, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return User::query()->where('tenant_codigo', $tenant->codigo)
|
return User::query()->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::AdminApp->value);
|
->where('rol_codigo', RoleCode::AdminApp->value)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data
|
/** @param array<string, mixed> $data
|
||||||
|
|||||||
@@ -55,6 +55,8 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten
|
|||||||
|
|
||||||
## Verificación
|
## Verificación
|
||||||
|
|
||||||
|
Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant.
|
||||||
|
|
||||||
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
||||||
|
|
||||||
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
||||||
|
|||||||
@@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Auth\Models;
|
namespace App\Domains\Core\Auth\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Core\Authorization\Models\Role;
|
use App\Domains\Core\Authorization\Models\Role;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
||||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||||
use Database\Factories\UserFactory;
|
use Database\Factories\UserFactory;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
@@ -20,7 +21,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
|||||||
use Illuminate\Notifications\Notifiable;
|
use Illuminate\Notifications\Notifiable;
|
||||||
use Laravel\Sanctum\HasApiTokens;
|
use Laravel\Sanctum\HasApiTokens;
|
||||||
|
|
||||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])]
|
||||||
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
||||||
class User extends Authenticatable
|
class User extends Authenticatable
|
||||||
{
|
{
|
||||||
@@ -86,6 +87,12 @@ class User extends Authenticatable
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Event, $this> */
|
||||||
|
public function event(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsToMany<Category, $this> */
|
/** @return BelongsToMany<Category, $this> */
|
||||||
public function scanCategories(): BelongsToMany
|
public function scanCategories(): BelongsToMany
|
||||||
{
|
{
|
||||||
@@ -103,6 +110,7 @@ class User extends Authenticatable
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'event_id' => 'integer',
|
||||||
'email_verified_at' => 'datetime',
|
'email_verified_at' => 'datetime',
|
||||||
'password' => 'hashed',
|
'password' => 'hashed',
|
||||||
'failed_login_attempts' => 'integer',
|
'failed_login_attempts' => 'integer',
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ class UserResource extends JsonResource
|
|||||||
'telefono' => $this->telefono,
|
'telefono' => $this->telefono,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
||||||
->map(fn ($category) => [
|
->map(fn ($category) => [
|
||||||
'id' => $category->id,
|
'id' => $category->id,
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ class AdminAppContextService
|
|||||||
{
|
{
|
||||||
$tenant = $user->tenant()
|
$tenant = $user->tenant()
|
||||||
->with([
|
->with([
|
||||||
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'phoneNumbers',
|
||||||
'menues' => fn ($query) => $query
|
'menues' => fn ($query) => $query
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'roles',
|
'roles',
|
||||||
|
|||||||
@@ -33,12 +33,17 @@ class TenantBootstrapService
|
|||||||
$tenant,
|
$tenant,
|
||||||
[
|
[
|
||||||
'eventDateChanges',
|
'eventDateChanges',
|
||||||
'menues' => fn ($query) => $query->whereHas(
|
'menues' => fn ($query) => $query
|
||||||
'roles',
|
->where(fn ($query) => $query
|
||||||
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
->where('menues.code', 'help.contact')
|
||||||
),
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
$tenant->storefront_website_type_code === 'onticket_multi_event'
|
->whereHas(
|
||||||
? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
|
'roles',
|
||||||
|
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
||||||
|
),
|
||||||
|
...($tenant->storefront_website_type_code === 'onticket_multi_event'
|
||||||
|
? ['eventCategories' => fn ($query) => $query->orderBy('nombre')]
|
||||||
|
: ['categories' => fn ($query) => $query->orderBy('sort_order')->orderBy('id')]),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Client\Models;
|
namespace App\Domains\Core\Client\Models;
|
||||||
|
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
@@ -22,6 +23,12 @@ class Client extends Model
|
|||||||
return $this->hasMany(Tenant::class);
|
return $this->hasMany(Tenant::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return HasMany<ClientIntegration, $this> */
|
/** @return HasMany<ClientIntegration, $this> */
|
||||||
public function integrations(): HasMany
|
public function integrations(): HasMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Menu extends Model
|
|||||||
'codigo'
|
'codigo'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ class TenantMenu extends Pivot
|
|||||||
'tenant_code',
|
'tenant_code',
|
||||||
'menu_code',
|
'menu_code',
|
||||||
'static_content',
|
'static_content',
|
||||||
|
'is_enabled',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'static_content' => 'array',
|
'static_content' => 'array',
|
||||||
|
'is_enabled' => 'boolean',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
|
||||||
|
class PhoneNumber extends Model
|
||||||
|
{
|
||||||
|
protected $attributes = ['country_code' => '+54', 'mobile_prefix' => '9'];
|
||||||
|
|
||||||
|
protected $fillable = ['label', 'country_code', 'mobile_prefix', 'area_code', 'local_number'];
|
||||||
|
|
||||||
|
public function getNumberAttribute(?string $legacyNumber): string
|
||||||
|
{
|
||||||
|
if ($this->local_number === null) {
|
||||||
|
return $legacyNumber ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->mobile_prefix && $this->area_code
|
||||||
|
? '('.$this->area_code.')'
|
||||||
|
: $this->area_code;
|
||||||
|
|
||||||
|
return implode(' ', array_filter([
|
||||||
|
$this->country_code,
|
||||||
|
$this->mobile_prefix,
|
||||||
|
$areaCode,
|
||||||
|
$this->local_number,
|
||||||
|
], fn ($part): bool => $part !== null && $part !== ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function dialableNumber(string $number): string
|
||||||
|
{
|
||||||
|
return preg_replace('/[^0-9+]/', '', $number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function telUrl(): string
|
||||||
|
{
|
||||||
|
if ($this->country_code === null || $this->local_number === null) {
|
||||||
|
return 'tel:'.self::dialableNumber($this->number);
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->area_code ?? '';
|
||||||
|
if ($this->country_code === '+54') {
|
||||||
|
$areaCode = ltrim($areaCode, '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'tel:'.self::dialableNumber(
|
||||||
|
$this->country_code.($this->mobile_prefix ?? '').$areaCode.$this->local_number
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_phone_numbers', 'phone_number_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantPhoneNumber extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_phone_numbers';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'phone_number_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumber(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(PhoneNumber::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class PhoneNumberResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'country_code' => $this->country_code,
|
||||||
|
'mobile_prefix' => $this->mobile_prefix,
|
||||||
|
'area_code' => $this->area_code,
|
||||||
|
'local_number' => $this->local_number,
|
||||||
|
'number' => $this->number,
|
||||||
|
'tel_url' => $this->resource->telUrl(),
|
||||||
|
'is_main' => $this->whenPivotLoaded('tenant_phone_numbers', fn () => (bool) $this->pivot->is_main),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::collection($this->staffService->list(
|
return StaffResource::collection($this->staffService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,6 +35,7 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::make($this->staffService->create(
|
return StaffResource::make($this->staffService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,12 +45,13 @@ class AdminAppStaffController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function destroy(Request $request, int $staff): Response
|
public function destroy(Request $request, int $staff): Response
|
||||||
{
|
{
|
||||||
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
|
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id);
|
||||||
|
|
||||||
return response()->noContent();
|
return response()->noContent();
|
||||||
}
|
}
|
||||||
@@ -60,6 +63,7 @@ class AdminAppStaffController extends Controller
|
|||||||
$scanner = $this->staffService->find(
|
$scanner = $this->staffService->find(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
|
$request->user()->event_id,
|
||||||
);
|
);
|
||||||
|
|
||||||
return ScanAttemptResource::collection(
|
return ScanAttemptResource::collection(
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class StaffResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Staff\Services;
|
namespace App\Domains\Core\Staff\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -22,9 +22,9 @@ class StaffService
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null): Collection
|
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant)
|
return $this->staffQuery($tenant, $eventId)
|
||||||
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
||||||
->when($search, function (Builder $query, string $search): void {
|
->when($search, function (Builder $query, string $search): void {
|
||||||
$query->where(function (Builder $query) use ($search): void {
|
$query->where(function (Builder $query) use ($search): void {
|
||||||
@@ -52,18 +52,19 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data): User
|
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
|
return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
|
||||||
$staff = User::query()->create([
|
$staff = User::query()->create([
|
||||||
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
||||||
'email' => mb_strtolower(trim((string) $data['email'])),
|
'email' => mb_strtolower(trim((string) $data['email'])),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::Scanner->value,
|
'rol_codigo' => RoleCode::Scanner->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
'event_id' => $eventId,
|
||||||
]);
|
]);
|
||||||
$staff->scanCategories()->sync($categoryIds);
|
$staff->scanCategories()->sync($categoryIds);
|
||||||
$this->resetPasswordAttemptService->createForScannerEmail(
|
$this->resetPasswordAttemptService->createForScannerEmail(
|
||||||
@@ -76,9 +77,9 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $staffId, array $data): User
|
public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId);
|
$staff = $this->find($tenant, $staffId, $eventId);
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
@@ -92,9 +93,9 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delete(Tenant $tenant, int $staffId): void
|
public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId);
|
$staff = $this->find($tenant, $staffId, $eventId);
|
||||||
|
|
||||||
DB::transaction(function () use ($staff): void {
|
DB::transaction(function () use ($staff): void {
|
||||||
$staff->tokens()->delete();
|
$staff->tokens()->delete();
|
||||||
@@ -102,16 +103,17 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, int $staffId): User
|
public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant)->findOrFail($staffId);
|
return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function staffQuery(Tenant $tenant): Builder
|
private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return User::query()
|
return User::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::Scanner->value);
|
->where('rol_codigo', RoleCode::Scanner->value)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,3 +18,5 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
|
|||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
||||||
|
|
||||||
|
Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant.
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\BrandService;
|
||||||
|
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class BrandController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(
|
||||||
|
UpdateBrandRequest $request,
|
||||||
|
BrandService $brandService,
|
||||||
|
TenantInformationService $tenantInformationService,
|
||||||
|
): BrandResource {
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$brandService->update($tenant, $request->validated());
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant->fresh()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateContactRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\ContactResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\ContactService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class ContactController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, ContactService $service): ContactResource
|
||||||
|
{
|
||||||
|
return ContactResource::make($service->load($request->user()->tenant()->firstOrFail()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(UpdateContactRequest $request, ContactService $service): ContactResource
|
||||||
|
{
|
||||||
|
return ContactResource::make($service->update($request->user()->tenant()->firstOrFail(), $request->validated()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class HelpMenuController extends Controller
|
||||||
|
{
|
||||||
|
private const MENU_CODES = [
|
||||||
|
'help.faq',
|
||||||
|
'help.terms-and-conditions',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function index(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$menus = $tenant->menues()
|
||||||
|
->whereIn('menues.code', self::MENU_CODES)
|
||||||
|
->get()
|
||||||
|
->keyBy('code');
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => collect(self::MENU_CODES)->mapWithKeys(
|
||||||
|
fn (string $code): array => [$code => [
|
||||||
|
'code' => $code,
|
||||||
|
'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
|
||||||
|
'static_content' => $menus->get($code)?->pivot?->static_content
|
||||||
|
?? $this->emptyContent($code),
|
||||||
|
]]
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function toggle(
|
||||||
|
Request $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$isEnabled = ! $tenantMenu->pivot->is_enabled;
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateContent(
|
||||||
|
UpdateHelpMenuContentRequest $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$staticContent = $request->validated('static_content');
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function emptyContent(string $menuCode): array
|
||||||
|
{
|
||||||
|
return $menuCode === 'help.faq' ? [] : ['html' => ''];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,10 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Address\Models\TenantAddress;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\PhoneNumber;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\TenantPhoneNumber;
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Menu\Models\TenantMenu;
|
use App\Domains\Core\Menu\Models\TenantMenu;
|
||||||
@@ -22,6 +26,7 @@ use Illuminate\Database\Eloquent\Model;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
@@ -308,6 +313,39 @@ class Tenant extends Model
|
|||||||
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Address, $this> */
|
||||||
|
public function addresses(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasOneThrough<Address, TenantAddress, $this> */
|
||||||
|
public function mainAddress(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
|
||||||
|
->where('tenant_addresses.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumbers(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(PhoneNumber::class, 'tenant_phone_numbers', 'tenant_codigo', 'phone_number_id', 'codigo', 'id')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('is_main', 'desc')
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function mainPhoneNumber(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(PhoneNumber::class, TenantPhoneNumber::class, 'tenant_codigo', 'id', 'codigo', 'phone_number_id')
|
||||||
|
->where('tenant_phone_numbers.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
public function menues(): BelongsToMany
|
public function menues(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(
|
return $this->belongsToMany(
|
||||||
@@ -319,7 +357,7 @@ class Tenant extends Model
|
|||||||
'code'
|
'code'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use App\Shared\Rules\CroppedImageOrBase64Rule;
|
||||||
|
use App\Shared\Rules\ImageOrBase64Rule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateBrandRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$shopit = $this->user()->tenant()->firstOrFail()->storefront_website_type_code === 'shopit';
|
||||||
|
|
||||||
|
return [
|
||||||
|
'nombre' => ['required', 'string', 'max:255'],
|
||||||
|
'primary_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'footer_bg_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'header_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'footer_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'banner_images' => [$shopit ? 'present' : 'prohibited', 'array', 'max:10'],
|
||||||
|
'banner_images.*' => ['required', new CroppedImageOrBase64Rule],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class UpdateContactRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$tenantCode = $this->user()->tenant_codigo;
|
||||||
|
|
||||||
|
return [
|
||||||
|
'social_media' => ['present', 'array', 'max:30'],
|
||||||
|
'social_media.*' => ['array:code,url'],
|
||||||
|
'social_media.*.code' => ['required', 'string', 'distinct', Rule::exists('social_media', 'code')],
|
||||||
|
'social_media.*.url' => ['required', 'url:http,https', 'max:255'],
|
||||||
|
'addresses' => ['present', 'array', 'list', 'max:50'],
|
||||||
|
'addresses.*' => ['array:id,address_text,is_main'],
|
||||||
|
'addresses.*.id' => ['nullable', 'integer', 'distinct', Rule::exists('tenant_addresses', 'address_id')->where('tenant_codigo', $tenantCode)],
|
||||||
|
'addresses.*.address_text' => ['required', 'string', 'max:1000'],
|
||||||
|
'addresses.*.is_main' => ['sometimes', 'boolean'],
|
||||||
|
'phone_numbers' => ['present', 'array', 'list', 'max:50'],
|
||||||
|
'phone_numbers.*' => ['array:id,country_code,mobile_prefix,area_code,local_number,is_main'],
|
||||||
|
'phone_numbers.*.id' => ['nullable', 'integer', 'distinct', Rule::exists('tenant_phone_numbers', 'phone_number_id')->where('tenant_codigo', $tenantCode)],
|
||||||
|
'phone_numbers.*.country_code' => ['present', 'nullable', 'regex:/^\+[0-9]{1,4}$/'],
|
||||||
|
'phone_numbers.*.mobile_prefix' => ['present', 'nullable', 'regex:/^[0-9]{1,4}$/'],
|
||||||
|
'phone_numbers.*.area_code' => ['present', 'nullable', 'regex:/^[0-9]{1,8}$/'],
|
||||||
|
'phone_numbers.*.local_number' => ['required', 'string', 'max:50', 'regex:/^[0-9+() .-]+$/', 'regex:/[0-9]/'],
|
||||||
|
'phone_numbers.*.is_main' => ['sometimes', 'boolean'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function attributes(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'social_media' => 'redes sociales',
|
||||||
|
'social_media.*.code' => 'red social',
|
||||||
|
'social_media.*.url' => 'URL de la red social',
|
||||||
|
'addresses' => 'direcciones',
|
||||||
|
'addresses.*.id' => 'dirección',
|
||||||
|
'addresses.*.address_text' => 'dirección',
|
||||||
|
'addresses.*.is_main' => 'dirección principal',
|
||||||
|
'phone_numbers' => 'teléfonos',
|
||||||
|
'phone_numbers.*.id' => 'teléfono',
|
||||||
|
'phone_numbers.*.country_code' => 'código de país',
|
||||||
|
'phone_numbers.*.mobile_prefix' => 'prefijo móvil',
|
||||||
|
'phone_numbers.*.area_code' => 'código de área',
|
||||||
|
'phone_numbers.*.local_number' => 'número de teléfono',
|
||||||
|
'phone_numbers.*.is_main' => 'teléfono principal',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function messages(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'required' => 'Completá :attribute.',
|
||||||
|
'url' => 'La URL debe ser válida y comenzar con http:// o https://.',
|
||||||
|
'regex' => 'El formato de :attribute no es válido.',
|
||||||
|
'exists' => 'El valor de :attribute no está disponible para este comercio.',
|
||||||
|
'distinct' => 'Hay un valor duplicado en :attribute.',
|
||||||
|
'max.string' => 'El campo :attribute admite hasta :max caracteres.',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateHelpMenuContentRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return match ($this->route('menuCode')) {
|
||||||
|
'help.faq' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.*.pregunta' => ['required', 'string'],
|
||||||
|
'static_content.*.respuesta' => ['required', 'string'],
|
||||||
|
'static_content.*.is_active' => ['required', 'boolean'],
|
||||||
|
],
|
||||||
|
'help.terms-and-conditions' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.html' => ['present', 'nullable', 'string'],
|
||||||
|
],
|
||||||
|
default => [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Models\AttachmentCrop;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Tenant */
|
||||||
|
class BrandResource extends JsonResource
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'nombre' => $this->nombre,
|
||||||
|
'primary_color' => $this->primary_color,
|
||||||
|
'header_bg_color' => $this->header_bg_color,
|
||||||
|
'footer_color' => $this->footerColor(),
|
||||||
|
'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
|
||||||
|
'header_logo_key' => $this->headerLogo?->key,
|
||||||
|
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
|
||||||
|
'footer_logo_key' => $this->footerLogo?->key,
|
||||||
|
'can_edit_carousel' => $this->canEditCarousel(),
|
||||||
|
'banner_images' => $this->bannerImages(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function footerColor(): string
|
||||||
|
{
|
||||||
|
$footerColor = strtolower(trim((string) $this->footer_bg_color));
|
||||||
|
$primaryColor = strtolower(trim((string) $this->primary_color));
|
||||||
|
|
||||||
|
if ($footerColor !== '' && $footerColor === $primaryColor) {
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_array($footerColor, ['#000', '#000000', 'black'], true)) {
|
||||||
|
return 'black';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($footerColor === '' || in_array($footerColor, ['#fff', '#ffffff', 'white'], true)) {
|
||||||
|
return 'white';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<int, array<string, mixed>> */
|
||||||
|
private function bannerImages(): array
|
||||||
|
{
|
||||||
|
if (! $this->canEditCarousel()) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->is_enabled && $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($extra === null) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$images = $extra->resolvedConfig();
|
||||||
|
|
||||||
|
if (! is_array($images)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return collect($images)
|
||||||
|
->filter(fn ($image) => $image instanceof Attachment)
|
||||||
|
->map(function (Attachment $image): array {
|
||||||
|
$desktopCrop = $image->cropVariants
|
||||||
|
->firstWhere('variant', AttachmentCrop::DESKTOP);
|
||||||
|
|
||||||
|
return [
|
||||||
|
'key' => $image->key,
|
||||||
|
'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
|
||||||
|
'original_url' => $image->getTemporaryUrl(1440),
|
||||||
|
'crop' => $desktopCrop === null ? null : [
|
||||||
|
'crop_horizontal' => $desktopCrop->crop_horizontal,
|
||||||
|
'crop_vertical' => $desktopCrop->crop_vertical,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
})
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function canEditCarousel(): bool
|
||||||
|
{
|
||||||
|
if ($this->storefront_website_type_code !== 'shopit') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
return $extra === null || $extra->is_enabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\PhoneNumber\Resources\PhoneNumberResource;
|
||||||
|
use App\Domains\Core\Tenant\Resources\TenantAddressResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class ContactResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'social_media' => $this->socialMedia->map(fn ($network) => [
|
||||||
|
'code' => $network->code,
|
||||||
|
'url' => $network->pivot->url,
|
||||||
|
])->values(),
|
||||||
|
'addresses' => TenantAddressResource::collection($this->addresses),
|
||||||
|
'phone_numbers' => PhoneNumberResource::collection($this->phoneNumbers),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TenantAddressResource extends AddressResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [...parent::toArray($request), 'is_main' => (bool) $this->pivot->is_main];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,9 @@
|
|||||||
namespace App\Domains\Core\Tenant\Resources;
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
|
use App\Domains\Core\PhoneNumber\Resources\PhoneNumberResource;
|
||||||
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
@@ -41,7 +43,11 @@ class TenantResource extends JsonResource
|
|||||||
'site_title' => $this->site_title ?? 'ShopitFront',
|
'site_title' => $this->site_title ?? 'ShopitFront',
|
||||||
'asset_url' => config('filesystems.disks.s3.url'),
|
'asset_url' => config('filesystems.disks.s3.url'),
|
||||||
'address' => $this->address,
|
'address' => $this->address,
|
||||||
|
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
|
||||||
|
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
|
||||||
'phone' => $this->phone,
|
'phone' => $this->phone,
|
||||||
|
'phone_numbers' => $this->whenLoaded('phoneNumbers', fn () => PhoneNumberResource::collection($this->phoneNumbers)),
|
||||||
|
'main_phone_number' => $this->whenLoaded('mainPhoneNumber', fn () => PhoneNumberResource::make($this->mainPhoneNumber)),
|
||||||
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
||||||
'primary_color' => $this->primary_color,
|
'primary_color' => $this->primary_color,
|
||||||
'secondary_color' => $this->secondary_color,
|
'secondary_color' => $this->secondary_color,
|
||||||
@@ -99,6 +105,13 @@ class TenantResource extends JsonResource
|
|||||||
])
|
])
|
||||||
->values()
|
->values()
|
||||||
),
|
),
|
||||||
|
'tenant_social_media' => $this->whenLoaded('socialMedia', fn () => $this->socialMedia
|
||||||
|
->map(fn ($socialMedia) => [
|
||||||
|
'code' => $socialMedia->code,
|
||||||
|
'icon' => $socialMedia->icon,
|
||||||
|
'name' => $socialMedia->name,
|
||||||
|
'url' => $socialMedia->pivot->url,
|
||||||
|
])->values()),
|
||||||
'menues' => $this->whenLoaded(
|
'menues' => $this->whenLoaded(
|
||||||
'menues',
|
'menues',
|
||||||
fn () => $this->menuTree($this->menues)
|
fn () => $this->menuTree($this->menues)
|
||||||
@@ -127,6 +140,7 @@ class TenantResource extends JsonResource
|
|||||||
'subtitle' => $event->subtitle,
|
'subtitle' => $event->subtitle,
|
||||||
'description' => $event->description,
|
'description' => $event->description,
|
||||||
'location' => $event->location,
|
'location' => $event->location,
|
||||||
|
'address' => AddressResource::make($event->address),
|
||||||
'date_text' => $event->date_text,
|
'date_text' => $event->date_text,
|
||||||
'dates' => $event->dates
|
'dates' => $event->dates
|
||||||
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
||||||
@@ -193,12 +207,14 @@ class TenantResource extends JsonResource
|
|||||||
'nombre' => $category->nombre,
|
'nombre' => $category->nombre,
|
||||||
'subcategories' => $childrenByParent
|
'subcategories' => $childrenByParent
|
||||||
->get($category->id, collect())
|
->get($category->id, collect())
|
||||||
|
->filter(fn (Category $child) => $child->is_enabled)
|
||||||
->map($formatCategory)
|
->map($formatCategory)
|
||||||
->values(),
|
->values(),
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
return $categories
|
return $categories
|
||||||
|
->filter(fn (Category $category) => $category->is_enabled)
|
||||||
->filter(fn (Category $category) => $category->categoria_id === null
|
->filter(fn (Category $category) => $category->categoria_id === null
|
||||||
|| ! $categoryIds->has($category->categoria_id))
|
|| ! $categoryIds->has($category->categoria_id))
|
||||||
->map($formatCategory)
|
->map($formatCategory)
|
||||||
@@ -226,7 +242,7 @@ class TenantResource extends JsonResource
|
|||||||
'route' => $menu->route,
|
'route' => $menu->route,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($menu->pivot?->static_content !== null) {
|
if ($menu->content_type === Menu::CONTENT_TYPE_STATIC && $menu->pivot?->static_content !== null) {
|
||||||
$formatted['static_content'] = $menu->pivot->static_content;
|
$formatted['static_content'] = $menu->pivot->static_content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Enums\AttachmentType;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
|
class BrandService
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly AttachmentService $attachmentService,
|
||||||
|
private readonly WebsiteExtraService $websiteExtraService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function update(Tenant $tenant, array $data): void
|
||||||
|
{
|
||||||
|
$carousel = $tenant->storefront_website_type_code === 'shopit'
|
||||||
|
? $tenant->websiteExtras()->whereHas('websiteTypeExtra',
|
||||||
|
fn ($query) => $query->where('codigo', 'carousel'))->first()
|
||||||
|
: null;
|
||||||
|
$allowedBannerIds = is_array($carousel?->config) ? $carousel->config : [];
|
||||||
|
if ($carousel !== null && ! $carousel->is_enabled && ($data['banner_images'] ?? []) !== []) {
|
||||||
|
throw ValidationException::withMessages(['banner_images' => 'El carrusel está deshabilitado.']);
|
||||||
|
}
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach (['header_logo' => $tenant->header_logo_id, 'footer_logo' => $tenant->footer_logo_id] as $field => $id) {
|
||||||
|
$this->existingImage($data[$field], $id === null ? [] : [$id], $field);
|
||||||
|
}
|
||||||
|
foreach ($data['banner_images'] ?? [] as $index => $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $allowedBannerIds, "banner_images.{$index}");
|
||||||
|
if ($attachment !== null) {
|
||||||
|
if (isset($seen[$attachment->id])) {
|
||||||
|
throw ValidationException::withMessages(["banner_images.{$index}" => 'La imagen está repetida.']);
|
||||||
|
}
|
||||||
|
$seen[$attachment->id] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$created = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($tenant, $data, $carousel, &$created): void {
|
||||||
|
$header = $this->logo($data['header_logo'], $tenant->header_logo_id, $tenant, $created);
|
||||||
|
$footer = $this->logo($data['footer_logo'], $tenant->footer_logo_id, $tenant, $created);
|
||||||
|
|
||||||
|
$tenant->update([
|
||||||
|
'nombre' => trim($data['nombre']),
|
||||||
|
'primary_color' => $data['primary_color'],
|
||||||
|
'footer_bg_color' => $data['footer_bg_color'],
|
||||||
|
'header_logo_id' => $header?->id,
|
||||||
|
'footer_logo_id' => $footer?->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($tenant->storefront_website_type_code !== 'shopit'
|
||||||
|
|| ($carousel !== null && ! $carousel->is_enabled)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$definition = $this->websiteExtraService->definitionForTenant($tenant, 'carousel');
|
||||||
|
$ids = [];
|
||||||
|
$recrops = [];
|
||||||
|
foreach ($data['banner_images'] as $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $carousel?->config ?? [], 'banner_images');
|
||||||
|
$crops = $this->crops($item);
|
||||||
|
|
||||||
|
if ($attachment === null) {
|
||||||
|
$attachment = $crops === null
|
||||||
|
? $this->attachmentService->store($image, "tenants/{$tenant->codigo}/extras/carousel")
|
||||||
|
: $this->attachmentService->storeCroppedImageVariants(
|
||||||
|
$image, "tenants/{$tenant->codigo}/extras/carousel", $crops
|
||||||
|
);
|
||||||
|
$created[] = $attachment;
|
||||||
|
} elseif ($crops !== null) {
|
||||||
|
$recrops[] = [$attachment, $crops];
|
||||||
|
}
|
||||||
|
$ids[] = $attachment->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant->websiteExtras()->updateOrCreate(
|
||||||
|
['website_type_extra_id' => $definition->id],
|
||||||
|
['config' => $ids]
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($recrops as [$attachment, $crops]) {
|
||||||
|
$this->attachmentService->updateImageCropVariants($attachment, $crops);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
foreach ($created as $attachment) {
|
||||||
|
$paths = [$attachment->path];
|
||||||
|
foreach ($attachment->cropVariants as $crop) {
|
||||||
|
if ($crop->croppedAttachment !== null) {
|
||||||
|
$paths[] = $crop->croppedAttachment->path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Storage::disk('s3')->delete($paths);
|
||||||
|
}
|
||||||
|
throw $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, int> $allowedIds */
|
||||||
|
private function existingImage(mixed $value, array $allowedIds, string $field): ?Attachment
|
||||||
|
{
|
||||||
|
if (! is_string($value) || ! Str::isUuid($value)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = Attachment::query()->where('key', $value)->first();
|
||||||
|
if ($attachment === null || $attachment->type !== AttachmentType::Image
|
||||||
|
|| ! in_array($attachment->id, $allowedIds, true)) {
|
||||||
|
throw ValidationException::withMessages([$field => 'La imagen no pertenece a esta marca.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, Attachment> $created */
|
||||||
|
private function logo(mixed $value, ?int $currentId, Tenant $tenant, array &$created): ?Attachment
|
||||||
|
{
|
||||||
|
if ($value === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$existing = $this->existingImage($value, $currentId === null ? [] : [$currentId], 'logo');
|
||||||
|
if ($existing !== null) {
|
||||||
|
return $existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = $this->attachmentService->store($value, "tenants/{$tenant->codigo}/logos");
|
||||||
|
$created[] = $attachment;
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, array<string, mixed>>|null */
|
||||||
|
private function crops(mixed $item): ?array
|
||||||
|
{
|
||||||
|
if (! is_array($item)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($item['crop_horizontal'], $item['crop_vertical'])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$crop = [
|
||||||
|
'crop_horizontal' => $item['crop_horizontal'],
|
||||||
|
'crop_vertical' => $item['crop_vertical'],
|
||||||
|
];
|
||||||
|
|
||||||
|
return ['desktop' => $crop, 'mobile' => $crop];
|
||||||
|
}
|
||||||
|
}
|
||||||
73
app/Domains/Core/Tenant/Services/ContactService.php
Normal file
73
app/Domains/Core/Tenant/Services/ContactService.php
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\PhoneNumber;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
class ContactService
|
||||||
|
{
|
||||||
|
public function load(Tenant $tenant): Tenant
|
||||||
|
{
|
||||||
|
return $tenant->load([
|
||||||
|
'socialMedia',
|
||||||
|
'addresses' => fn ($query) => $query->reorder()->orderByPivot('is_main', 'desc')->orderByPivot('id'),
|
||||||
|
'phoneNumbers',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(Tenant $tenant, array $data): Tenant
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($tenant, $data): Tenant {
|
||||||
|
// Serialize contact writes, including changes to the principal links.
|
||||||
|
Tenant::query()->whereKey($tenant->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$social = [];
|
||||||
|
foreach ($data['social_media'] as $index => $item) {
|
||||||
|
$social[$item['code']] = ['url' => $item['url'], 'orden' => $index];
|
||||||
|
}
|
||||||
|
$tenant->socialMedia()->sync($social);
|
||||||
|
|
||||||
|
foreach (['addresses', 'phone_numbers'] as $collection) {
|
||||||
|
$relation = $collection === 'addresses' ? $tenant->addresses() : $tenant->phoneNumbers();
|
||||||
|
$existing = $relation->get()->keyBy('id');
|
||||||
|
$links = [];
|
||||||
|
foreach (array_values($data[$collection]) as $index => $item) {
|
||||||
|
$id = $item['id'] ?? null;
|
||||||
|
if ($id !== null && ! $existing->has($id)) {
|
||||||
|
throw ValidationException::withMessages(["{$collection}.{$index}.id" => 'El contacto no pertenece al comercio.']);
|
||||||
|
}
|
||||||
|
$record = $id === null
|
||||||
|
? ($collection === 'addresses' ? new Address : new PhoneNumber)
|
||||||
|
: $existing->get($id);
|
||||||
|
$attributes = collect($item)->except(['id', 'is_main'])->all();
|
||||||
|
$record->fill($attributes);
|
||||||
|
if (! $record->exists) {
|
||||||
|
$record->label = $collection === 'addresses' ? 'Dirección' : 'Teléfono';
|
||||||
|
}
|
||||||
|
if ($record->exists && $record->isDirty()) {
|
||||||
|
$shared = $record->tenants()->where('tenants.codigo', '!=', $tenant->codigo)->exists()
|
||||||
|
|| ($record instanceof Address && $record->events()->exists());
|
||||||
|
if ($shared) {
|
||||||
|
$record = $record->replicate();
|
||||||
|
}
|
||||||
|
// An edited street address must not retain coordinates for the old location.
|
||||||
|
if ($record instanceof Address && $record->isDirty('address_text')) {
|
||||||
|
$record->latitude = null;
|
||||||
|
$record->longitude = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$record->save();
|
||||||
|
$links[$record->id] = ['is_main' => $index === 0];
|
||||||
|
}
|
||||||
|
// Clear the previous principal before sync to respect the unique index.
|
||||||
|
$relation->newPivotStatement()->where('tenant_codigo', $tenant->codigo)->update(['is_main' => false]);
|
||||||
|
$relation->sync($links);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->load($tenant);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
class TenantAddressService
|
||||||
|
{
|
||||||
|
public function setMainAddress(Tenant $tenant, Address $address): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($tenant, $address): void {
|
||||||
|
// Serialize changes for this tenant, including when it has no principal address yet.
|
||||||
|
Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
|
||||||
|
$tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
|
||||||
|
|
||||||
|
DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
|
||||||
|
$tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
|
||||||
|
});
|
||||||
|
|
||||||
|
$tenant->unsetRelation('addresses');
|
||||||
|
$tenant->unsetRelation('mainAddress');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,9 +18,14 @@ class TenantInformationService
|
|||||||
'footerBackgroundImage',
|
'footerBackgroundImage',
|
||||||
'storefrontWebsiteType',
|
'storefrontWebsiteType',
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'mainAddress',
|
||||||
|
'phoneNumbers',
|
||||||
|
'mainPhoneNumber',
|
||||||
'websiteExtras.websiteTypeExtra',
|
'websiteExtras.websiteTypeExtra',
|
||||||
'activeEvent.dates',
|
'activeEvent.dates',
|
||||||
'activeEvent.socialMedia',
|
'activeEvent.socialMedia',
|
||||||
|
'activeEvent.address',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ Es la raíz del modelo multi-tenant. Gestiona organizaciones/sitios, tipos de we
|
|||||||
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
||||||
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
||||||
- `SocialMedia`: catálogo de redes sociales asociables.
|
- `SocialMedia`: catálogo de redes sociales asociables.
|
||||||
|
- `phoneNumbers` y `mainPhoneNumber`: teléfonos públicos del tenant, definidos en el dominio `Core/PhoneNumber` y vinculados por `tenant_phone_numbers`. Solo un vínculo por tenant puede ser principal.
|
||||||
|
|
||||||
## Servicios
|
## Servicios
|
||||||
|
|
||||||
@@ -27,7 +28,16 @@ El par `(dominio, base_path)` es único. Un mismo dominio puede alojar el tenant
|
|||||||
- `GET /tenants`, `GET /tenants/{codigo}` y `DELETE /tenants/{codigo}`.
|
- `GET /tenants`, `GET /tenants/{codigo}` y `DELETE /tenants/{codigo}`.
|
||||||
- La creación y actualización general de tenants se administran mediante seeders o base de datos; no se exponen por API.
|
- La creación y actualización general de tenants se administran mediante seeders o base de datos; no se exponen por API.
|
||||||
- Bajo `/v1/adminapp/tenant/website-extras`, con autenticación y contexto de tenant: consulta general, detalle, actualización y activación/desactivación.
|
- Bajo `/v1/adminapp/tenant/website-extras`, con autenticación y contexto de tenant: consulta general, detalle, actualización y activación/desactivación.
|
||||||
|
- `GET /v1/adminapp/tenant/contact` y `PUT /v1/adminapp/tenant/contact`, con `auth:sanctum` y `adminapp.tenant`: consulta y reemplazo completo del contacto del comercio autenticado.
|
||||||
|
|
||||||
|
El PUT de contacto recibe `social_media` (`code`, `url`), `addresses` (`id` opcional para existentes, `address_text`) y `phone_numbers` (`id` opcional, `country_code`, `mobile_prefix`, `area_code`, `local_number`). Las tres colecciones son obligatorias; un array vacío elimina sus vínculos. El primer elemento enviado en cada lista de direcciones o teléfonos es siempre el principal: el backend calcula `is_main` por posición e ignora las marcas enviadas por clientes anteriores. GET y PUT devuelven el principal primero para conservarlo en el siguiente guardado. Los IDs existentes deben estar vinculados al comercio autenticado. Todos los cambios se realizan en una transacción, serializada por tenant, y la respuesta devuelve los registros persistidos y sus IDs.
|
||||||
|
|
||||||
|
Se conservan etiquetas y coordenadas de direcciones sin modificar; al cambiar el texto se limpian las coordenadas para evitar mostrar el mapa de una ubicación anterior. Las ediciones de registros compartidos crean una copia para el comercio, preservando otros comercios y eventos. Las bajas desvinculan registros sin borrar datos compartidos.
|
||||||
|
|
||||||
|
Contacto administra exclusivamente las redes del comercio. `TenantResource.tenant_social_media` siempre expone esas redes y alimenta Contacto y el footer públicos. `social_media` mantiene la selección histórica del evento activo; `event.social_media` sigue disponible para las vistas de evento. Guardar Contacto no modifica redes del evento.
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
||||||
|
|
||||||
|
Los resources exponen `phone_numbers` (incluye `is_main`) y `main_phone_number`, con `id`, `label`, `number` y `tel_url`. Contacto muestra la colección y el footer usa el principal. La migración copia primero `tenants.phone` como principal y luego el teléfono de `help.contact`, si es distinto; si no existe teléfono del tenant, el del menú pasa a ser principal. Los duplicados por formato se comparan dentro de cada tenant sin inferir país ni código de área. Los campos anteriores se conservan como datos legacy, pero la tienda consume las relaciones nuevas y el adminapp las edita mediante el endpoint de contacto.
|
||||||
|
|||||||
@@ -1,11 +1,21 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\ContactController;
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
|
||||||
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
|
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant')
|
Route::prefix('v1/adminapp/tenant')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
|
Route::get('contact', [ContactController::class, 'show']);
|
||||||
|
Route::put('contact', [ContactController::class, 'update']);
|
||||||
|
Route::get('brand', [BrandController::class, 'show']);
|
||||||
|
Route::put('brand', [BrandController::class, 'update']);
|
||||||
|
Route::get('help-menus', [HelpMenuController::class, 'index']);
|
||||||
|
Route::patch('help-menus/{menuCode}/toggle', [HelpMenuController::class, 'toggle']);
|
||||||
|
Route::put('help-menus/{menuCode}/content', [HelpMenuController::class, 'updateContent']);
|
||||||
Route::get('website-extras', [WebsiteExtraController::class, 'show']);
|
Route::get('website-extras', [WebsiteExtraController::class, 'show']);
|
||||||
Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
|
Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
|
||||||
Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);
|
Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);
|
||||||
|
|||||||
@@ -5,28 +5,28 @@ use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
|
|||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.index');
|
->name('adminapp.desfile.entry-reservations.index');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.pdf');
|
->name('adminapp.desfile.entry-reservations.pdf');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.excel');
|
->name('adminapp.desfile.entry-reservations.excel');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
||||||
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.store');
|
->name('adminapp.desfile.entry-reservations.store');
|
||||||
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.destroy');
|
->name('adminapp.desfile.entry-reservations.destroy');
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant/desfile')
|
Route::prefix('v1/adminapp/tenant/desfile')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('entries', [EntryController::class, 'show'])
|
Route::get('entries', [EntryController::class, 'show'])
|
||||||
->name('adminapp.desfile.entries.show');
|
->name('adminapp.desfile.entries.show');
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
namespace App\Domains\Ticketing\Event\Models;
|
namespace App\Domains\Ticketing\Event\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\SocialMedia;
|
use App\Domains\Core\Tenant\Models\SocialMedia;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
@@ -14,14 +16,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
#[Fillable(['tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
||||||
class Event extends Model
|
class Event extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Tenant, $this> */
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
@@ -30,6 +32,23 @@ class Event extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Client, $this> */
|
||||||
|
public function client(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Client::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function effectiveClient(): Client
|
||||||
|
{
|
||||||
|
return $this->client ?? $this->tenant->client;
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<EventCategory, $this> */
|
/** @return BelongsTo<EventCategory, $this> */
|
||||||
public function eventCategory(): BelongsTo
|
public function eventCategory(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Resources;
|
namespace App\Domains\Ticketing\Event\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -21,6 +22,7 @@ class EventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ class PublicEventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
|
||||||
|
class EventAddressService
|
||||||
|
{
|
||||||
|
/** Called inside the event update transaction, after validating the legacy location fields. */
|
||||||
|
public function syncLocation(Event $event, bool $coordinatesProvided = false): void
|
||||||
|
{
|
||||||
|
$address = $event->address;
|
||||||
|
$coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
|
||||||
|
$values = [
|
||||||
|
'address_text' => $event->location,
|
||||||
|
'latitude' => $coordinates['latitude'] ?? null,
|
||||||
|
'longitude' => $coordinates['longitude'] ?? null,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Editing one event must not change the location of another event or a tenant.
|
||||||
|
if ($address === null || $address->tenants()->exists()
|
||||||
|
|| $address->events()->where('events.id', '!=', $event->id)->exists()) {
|
||||||
|
$address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
|
||||||
|
$event->address()->associate($address);
|
||||||
|
$event->save();
|
||||||
|
} else {
|
||||||
|
$address->update($values);
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->setRelation('address', $address);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Services;
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -32,11 +32,12 @@ class EventService
|
|||||||
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
||||||
private readonly VariantReplacementService $variantReplacementService,
|
private readonly VariantReplacementService $variantReplacementService,
|
||||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||||
|
private readonly EventAddressService $eventAddressService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function forTenant(Tenant $tenant): Event
|
public function forTenant(Tenant $tenant): Event
|
||||||
{
|
{
|
||||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
@@ -49,6 +50,7 @@ class EventService
|
|||||||
'location' => $data['location'],
|
'location' => $data['location'],
|
||||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||||
]);
|
]);
|
||||||
|
$this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
|
||||||
$tenant->update([
|
$tenant->update([
|
||||||
...array_intersect_key($data, array_flip([
|
...array_intersect_key($data, array_flip([
|
||||||
'allow_ticket_refund',
|
'allow_ticket_refund',
|
||||||
@@ -64,7 +66,7 @@ class EventService
|
|||||||
$this->syncLegacyContact($event, $data['contact']);
|
$this->syncLegacyContact($event, $data['contact']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $event->load(['dates.validityTime', 'socialMedia']);
|
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,12 @@ class PublicEventService
|
|||||||
$query->where(function ($query) use ($term): void {
|
$query->where(function ($query) use ($term): void {
|
||||||
$query->where('title', 'like', '%'.$term.'%')
|
$query->where('title', 'like', '%'.$term.'%')
|
||||||
->orWhere('subtitle', 'like', '%'.$term.'%')
|
->orWhere('subtitle', 'like', '%'.$term.'%')
|
||||||
->orWhere('location', 'like', '%'.$term.'%');
|
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
||||||
|
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, Event $event): Event
|
public function find(Tenant $tenant, Event $event): Event
|
||||||
@@ -38,6 +39,7 @@ class PublicEventService
|
|||||||
|
|
||||||
return $event->load([
|
return $event->load([
|
||||||
'attachment',
|
'attachment',
|
||||||
|
'address',
|
||||||
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
'catalogItems.attachments',
|
'catalogItems.attachments',
|
||||||
|
|||||||
@@ -13,6 +13,32 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
|
|||||||
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
||||||
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
||||||
|
|
||||||
|
`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
|
||||||
|
obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
|
||||||
|
eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
|
||||||
|
|
||||||
|
La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
|
||||||
|
`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
|
||||||
|
`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
|
||||||
|
el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
|
||||||
|
ubicación; no modifica los campos ni los timestamps originales, ni vincula la
|
||||||
|
dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
|
||||||
|
Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
|
||||||
|
copia y revierten las inserciones para evitar una migración parcial. Las migraciones
|
||||||
|
deben ejecutarse explícitamente por quien administra la base.
|
||||||
|
|
||||||
|
Las respuestas públicas, administrativas y el evento del bootstrap incluyen
|
||||||
|
`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
|
||||||
|
se serializan como números o `null`. Los campos anteriores de la respuesta conservan
|
||||||
|
sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
|
||||||
|
El guardado administrativo de
|
||||||
|
`location` y `exact_location` también actualiza `addresses`; si una dirección está
|
||||||
|
compartida con otro evento o con un tenant, se crea una copia para el evento editado.
|
||||||
|
El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
|
||||||
|
todas las direcciones en contacto, la principal en el footer y la propia del evento
|
||||||
|
en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
|
||||||
|
coordenadas.
|
||||||
|
|
||||||
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
||||||
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
||||||
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
||||||
|
|||||||
@@ -19,48 +19,48 @@ Route::prefix('v1/adminapp/tenant')
|
|||||||
->middleware("tenant.menu:{$menuCode}");
|
->middleware("tenant.menu:{$menuCode}");
|
||||||
};
|
};
|
||||||
|
|
||||||
$visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
|
$visibilityRoutes('entries', 'entries', 'onticket.adminapp.fiesta-futbol-infantil.entradas');
|
||||||
$visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
|
$visibilityRoutes('foods', 'foods', 'onticket.adminapp.fiesta-futbol-infantil.comida');
|
||||||
$visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
|
$visibilityRoutes('accommodations', 'accommodations', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos');
|
||||||
$visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
|
$visibilityRoutes('merchandise', 'merchandise', 'onticket.adminapp.fiesta-futbol-infantil.merchandising');
|
||||||
|
|
||||||
Route::get('entries', [EntryController::class, 'index'])
|
Route::get('entries', [EntryController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
||||||
Route::post('entries', [EntryController::class, 'store'])
|
Route::post('entries', [EntryController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
||||||
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
||||||
Route::get('foods', [FoodController::class, 'index'])
|
Route::get('foods', [FoodController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
||||||
Route::post('foods', [FoodController::class, 'store'])
|
Route::post('foods', [FoodController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
||||||
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
||||||
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
||||||
Route::get('accommodations', [AccommodationController::class, 'index'])
|
Route::get('accommodations', [AccommodationController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
||||||
Route::post('accommodations', [AccommodationController::class, 'store'])
|
Route::post('accommodations', [AccommodationController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
||||||
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
||||||
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
||||||
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
||||||
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketCollection(
|
return new AdminAppTicketCollection(
|
||||||
$this->ticketService->search($tenant, $request->validated())
|
$this->ticketService->search($tenant, $request->validated(), $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ class TicketController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket));
|
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
||||||
@@ -45,7 +45,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketRefundCalculationResource(
|
return new AdminAppTicketRefundCalculationResource(
|
||||||
$this->ticketService->calculateRefund($tenant, $ticket)
|
$this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketPdfService->download(
|
return $this->ticketPdfService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketExcelService->download(
|
return $this->ticketExcelService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,9 +41,9 @@ class AdminAppTicketService
|
|||||||
/**
|
/**
|
||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
*/
|
*/
|
||||||
public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult
|
public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters);
|
$query = $this->baseQuery($tenant, $filters, $eventId);
|
||||||
$countQuery = clone $query;
|
$countQuery = clone $query;
|
||||||
|
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
@@ -77,7 +77,7 @@ class AdminAppTicketService
|
|||||||
tickets: $tickets,
|
tickets: $tickets,
|
||||||
scannedTickets: $scannedTickets,
|
scannedTickets: $scannedTickets,
|
||||||
totalTickets: $totalTickets,
|
totalTickets: $totalTickets,
|
||||||
refundedTotal: $this->refundSummaryService->totalForTenant($tenant),
|
refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,9 +85,9 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
* @return Collection<int, Ticket>
|
* @return Collection<int, Ticket>
|
||||||
*/
|
*/
|
||||||
public function ticketsForExport(Tenant $tenant, array $filters = []): Collection
|
public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters);
|
$query = $this->baseQuery($tenant, $filters, $eventId);
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
$tickets = $query
|
$tickets = $query
|
||||||
->with(self::RELATIONS)
|
->with(self::RELATIONS)
|
||||||
@@ -97,11 +97,10 @@ class AdminAppTicketService
|
|||||||
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $ticketId): Ticket
|
public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $ticketId): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket {
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
@@ -124,10 +123,9 @@ class AdminAppTicketService
|
|||||||
* partial: string|null,
|
* partial: string|null,
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
public function calculateRefund(Tenant $tenant, int $ticketId): array
|
public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array
|
||||||
{
|
{
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
@@ -175,14 +173,13 @@ class AdminAppTicketService
|
|||||||
string $refundType,
|
string $refundType,
|
||||||
?User $createdBy = null,
|
?User $createdBy = null,
|
||||||
): Ticket {
|
): Ticket {
|
||||||
$this->ensureRefundIsAllowed($tenant, $refundType);
|
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $createdBy?->event_id)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
|
$this->ensureRefundIsAllowed($tenant, $refundType);
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
@@ -310,12 +307,11 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
||||||
* @return Builder<Ticket>
|
* @return Builder<Ticket>
|
||||||
*/
|
*/
|
||||||
private function baseQuery(Tenant $tenant, array $filters): Builder
|
private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
$search = trim((string) ($filters['q'] ?? ''));
|
$search = trim((string) ($filters['q'] ?? ''));
|
||||||
|
|
||||||
$query = Ticket::query()
|
$query = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->when($search !== '', function (Builder $query) use ($search): void {
|
->when($search !== '', function (Builder $query) use ($search): void {
|
||||||
$this->applySearchFilter($query, $search);
|
$this->applySearchFilter($query, $search);
|
||||||
})
|
})
|
||||||
@@ -355,6 +351,14 @@ class AdminAppTicketService
|
|||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return Builder<Ticket> */
|
||||||
|
private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder
|
||||||
|
{
|
||||||
|
return Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId));
|
||||||
|
}
|
||||||
|
|
||||||
/** @param Builder<Ticket> $query */
|
/** @param Builder<Ticket> $query */
|
||||||
private function applySearchFilter(Builder $query, string $search): void
|
private function applySearchFilter(Builder $query, string $search): void
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -82,13 +82,17 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
|
|||||||
- `POST /tickets/pdf`.
|
- `POST /tickets/pdf`.
|
||||||
|
|
||||||
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
||||||
`adminapp.tickets`:
|
`onticket.adminapp.tickets`:
|
||||||
|
|
||||||
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
||||||
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
||||||
|
|
||||||
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
||||||
|
|
||||||
|
Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant.
|
||||||
|
|
||||||
|
La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente.
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
||||||
|
|||||||
@@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant')
|
|||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('tickets', [TicketController::class, 'index'])
|
Route::get('tickets', [TicketController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.index');
|
->name('adminapp.tickets.index');
|
||||||
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.cancel');
|
->name('adminapp.tickets.cancel');
|
||||||
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.calculate-refund');
|
->name('adminapp.tickets.calculate-refund');
|
||||||
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.refund');
|
->name('adminapp.tickets.refund');
|
||||||
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.pdf');
|
->name('adminapp.tickets.pdf');
|
||||||
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.excel');
|
->name('adminapp.tickets.excel');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ class EnsureTenantHasMenu
|
|||||||
$tenant = $request->user()?->tenant()->first();
|
$tenant = $request->user()?->tenant()->first();
|
||||||
$hasMenu = $tenant?->menues()
|
$hasMenu = $tenant?->menues()
|
||||||
->where('menues.code', $menuCode)
|
->where('menues.code', $menuCode)
|
||||||
|
->where(fn ($query) => $query
|
||||||
|
->where('menues.code', 'help.contact')
|
||||||
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
->exists() ?? false;
|
->exists() ?? false;
|
||||||
|
|
||||||
abort_unless($hasMenu, 404);
|
abort_unless($hasMenu, 404);
|
||||||
|
|||||||
@@ -18,12 +18,12 @@ Route::prefix('v1/adminapp/forms')
|
|||||||
Route::get(
|
Route::get(
|
||||||
'desfile/entry-reservation',
|
'desfile/entry-reservation',
|
||||||
DesfileEntryReservationFormController::class
|
DesfileEntryReservationFormController::class
|
||||||
)->middleware('tenant.menu:adminapp.desfile.reservas')
|
)->middleware('tenant.menu:onticket.adminapp.desfile.reservas')
|
||||||
->name('adminapp.forms.desfile.entry-reservation');
|
->name('adminapp.forms.desfile.entry-reservation');
|
||||||
Route::get('sale', SaleFormController::class);
|
Route::get('sale', SaleFormController::class);
|
||||||
Route::get('staff', StaffFormController::class);
|
Route::get('staff', StaffFormController::class);
|
||||||
Route::get('tickets-filter', TicketFilterFormController::class)
|
Route::get('tickets-filter', TicketFilterFormController::class)
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.forms.tickets-filter');
|
->name('adminapp.forms.tickets-filter');
|
||||||
Route::get(
|
Route::get(
|
||||||
'fiesta-futbol-infantil/ticket',
|
'fiesta-futbol-infantil/ticket',
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use App\Shared\Integration\Models\Integration;
|
use App\Shared\Integration\Models\Integration;
|
||||||
use App\Shared\Integration\Models\IntegrationInstance;
|
use App\Shared\Integration\Models\IntegrationInstance;
|
||||||
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Client\PendingRequest;
|
use Illuminate\Http\Client\PendingRequest;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
@@ -86,6 +87,17 @@ abstract class BaseIntegrationService
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
$event->loadMissing(['client', 'tenant.client']);
|
||||||
|
$this->tenant = $event->tenant;
|
||||||
|
$this->tenantCode = $event->tenant_code;
|
||||||
|
$this->clientContext = $event->effectiveClient();
|
||||||
|
$this->loadIntegration();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the integration definition and its effective instance configuration.
|
* Load the integration definition and its effective instance configuration.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
||||||
use Illuminate\Contracts\Mail\Mailer;
|
use Illuminate\Contracts\Mail\Mailer;
|
||||||
@@ -39,14 +40,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function forTenant(string $tenantCode): self
|
public function forTenant(string $tenantCode): self
|
||||||
{
|
{
|
||||||
parent::forTenant($tenantCode);
|
parent::forTenant($tenantCode);
|
||||||
|
$this->configureMailer();
|
||||||
if ($this->integrationInstance) {
|
|
||||||
$this->mailer = $this->resolveMailer();
|
|
||||||
$this->usesInstanceMailer = true;
|
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@@ -55,16 +49,30 @@ class MailService extends BaseIntegrationService
|
|||||||
{
|
{
|
||||||
parent::forClient($client);
|
parent::forClient($client);
|
||||||
$this->tenant = $this->clientContext?->tenants()->first();
|
$this->tenant = $this->clientContext?->tenants()->first();
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
parent::forEvent($event);
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function configureMailer(): void
|
||||||
|
{
|
||||||
if ($this->integrationInstance) {
|
if ($this->integrationInstance) {
|
||||||
$this->mailer = $this->resolveMailer();
|
$this->mailer = $this->resolveMailer();
|
||||||
$this->usesInstanceMailer = true;
|
$this->usesInstanceMailer = true;
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
return;
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
$this->mailer = $this->mailFactory->mailer();
|
||||||
|
$this->usesInstanceMailer = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHeaders(): array
|
public function getHeaders(): array
|
||||||
@@ -83,7 +91,7 @@ class MailService extends BaseIntegrationService
|
|||||||
array $attachments = [],
|
array $attachments = [],
|
||||||
): void {
|
): void {
|
||||||
if (! $this->mailer || ! $this->tenant) {
|
if (! $this->mailer || ! $this->tenant) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$brand ??= $this->tenant;
|
$brand ??= $this->tenant;
|
||||||
@@ -160,7 +168,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function onSetup(): void
|
public function onSetup(): void
|
||||||
{
|
{
|
||||||
if (! $this->mailer || ! $this->clientContext) {
|
if (! $this->mailer || ! $this->clientContext) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
|
|||||||
public function getToken(): string
|
public function getToken(): string
|
||||||
{
|
{
|
||||||
if (! $this->integrationInstance) {
|
if (! $this->integrationInstance) {
|
||||||
throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
|
throw new Exception('Client integration is not loaded. Call forTenant(), forClient(), or forEvent() first.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -75,9 +75,30 @@ class TelepagosWebhookService
|
|||||||
|
|
||||||
$dni = substr($cuit, 2, -1);
|
$dni = substr($cuit, 2, -1);
|
||||||
|
|
||||||
$tenantCodes = $client->tenants()->pluck('codigo');
|
|
||||||
$eligiblePurchases = Purchase::query()
|
$eligiblePurchases = Purchase::query()
|
||||||
->whereIn('tenant_codigo', $tenantCodes)
|
->where(function (Builder $purchases) use ($client): void {
|
||||||
|
$purchases
|
||||||
|
->whereHas('event', function (Builder $events) use ($client): void {
|
||||||
|
$events
|
||||||
|
->where('client_id', $client->id)
|
||||||
|
->orWhere(function (Builder $fallback) use ($client): void {
|
||||||
|
$fallback
|
||||||
|
->whereNull('client_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
->orWhere(function (Builder $legacy) use ($client): void {
|
||||||
|
$legacy
|
||||||
|
->whereNull('event_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
->whereIn('status', [
|
->whereIn('status', [
|
||||||
Purchase::STATUS_CREATED,
|
Purchase::STATUS_CREATED,
|
||||||
Purchase::STATUS_PENDING_PAYMENT,
|
Purchase::STATUS_PENDING_PAYMENT,
|
||||||
@@ -170,7 +191,7 @@ class TelepagosWebhookService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
|
if (! $this->purchaseBelongsToClient($compra, $client)) {
|
||||||
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
||||||
'client_code' => $client->code,
|
'client_code' => $client->code,
|
||||||
'cashin_id' => $cashinId,
|
'cashin_id' => $cashinId,
|
||||||
@@ -244,6 +265,16 @@ class TelepagosWebhookService
|
|||||||
return number_format((float) $amount, 2, '.', '');
|
return number_format((float) $amount, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function purchaseBelongsToClient(Purchase $purchase, Client $client): bool
|
||||||
|
{
|
||||||
|
$purchase->loadMissing(['event.client', 'event.tenant.client', 'tenant.client']);
|
||||||
|
|
||||||
|
$effectiveClient = $purchase->event?->effectiveClient()
|
||||||
|
?? $purchase->tenant?->client;
|
||||||
|
|
||||||
|
return $effectiveClient?->is($client) ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Builder<Purchase> $eligiblePurchases
|
* @param Builder<Purchase> $eligiblePurchases
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
namespace App\Shared\Notification\Services;
|
namespace App\Shared\Notification\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Shared\Integration\Services\MailService;
|
|
||||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use App\Shared\Integration\Services\MailService;
|
||||||
|
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
@@ -158,7 +158,7 @@ class NotificationMailService
|
|||||||
$context = ['purchase_id' => $purchaseId];
|
$context = ['purchase_id' => $purchaseId];
|
||||||
|
|
||||||
$purchase = Purchase::query()
|
$purchase = Purchase::query()
|
||||||
->with(['tenant', 'user', 'items'])
|
->with(['event', 'tenant', 'user', 'items'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
|
|
||||||
if ($purchase === null) {
|
if ($purchase === null) {
|
||||||
@@ -197,8 +197,7 @@ class NotificationMailService
|
|||||||
'mime' => 'application/pdf',
|
'mime' => 'application/pdf',
|
||||||
]];
|
]];
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($purchase->tenant_codigo)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Compra confirmada - Compra #{$purchase->getKey()}",
|
"Compra confirmada - Compra #{$purchase->getKey()}",
|
||||||
@@ -286,7 +285,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$previousDate,
|
$previousDate,
|
||||||
@@ -295,8 +293,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -387,7 +384,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$date,
|
$date,
|
||||||
@@ -396,8 +392,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -421,10 +416,17 @@ class NotificationMailService
|
|||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenantCode)
|
->where('tenant_codigo', $tenantCode)
|
||||||
->with(['tenant', 'user'])
|
->with(['event', 'tenant', 'user'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function mailForPurchase(Purchase $purchase): MailService
|
||||||
|
{
|
||||||
|
return $purchase->event
|
||||||
|
? $this->mailService->forEvent($purchase->event)
|
||||||
|
: $this->mailService->forTenant($purchase->tenant_codigo);
|
||||||
|
}
|
||||||
|
|
||||||
private function recipientFor(Purchase $purchase): string
|
private function recipientFor(Purchase $purchase): string
|
||||||
{
|
{
|
||||||
return (string) ($purchase->email ?: $purchase->user?->email);
|
return (string) ($purchase->email ?: $purchase->user?->email);
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('client_id')
|
||||||
|
->nullable()
|
||||||
|
->after('id')
|
||||||
|
->constrained('clients')
|
||||||
|
->restrictOnDelete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('client_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('compras', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('event_id')
|
||||||
|
->nullable()
|
||||||
|
->after('tenant_codigo')
|
||||||
|
->constrained('events')
|
||||||
|
->nullOnDelete();
|
||||||
|
});
|
||||||
|
|
||||||
|
DB::table('compras')
|
||||||
|
->orderBy('id')
|
||||||
|
->each(function (object $purchase): void {
|
||||||
|
$eventIds = DB::table('compra_items')
|
||||||
|
->join('catalog_items', 'catalog_items.id', '=', 'compra_items.source_catalog_item_id')
|
||||||
|
->where('compra_items.compra_id', $purchase->id)
|
||||||
|
->whereNotNull('catalog_items.event_id')
|
||||||
|
->distinct()
|
||||||
|
->pluck('catalog_items.event_id');
|
||||||
|
|
||||||
|
if ($eventIds->count() === 1) {
|
||||||
|
DB::table('compras')
|
||||||
|
->where('id', $purchase->id)
|
||||||
|
->update(['event_id' => $eventIds->first()]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('compras', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('event_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const EVENT_TITLE = '26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas';
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$clientId = DB::table('clients')
|
||||||
|
->where('code', 'pyme_rural')
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($clientId === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('events')
|
||||||
|
->where('tenant_code', 'onticket')
|
||||||
|
->where('title', self::EVENT_TITLE)
|
||||||
|
->update(['client_id' => $clientId]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$clientId = DB::table('clients')
|
||||||
|
->where('code', 'pyme_rural')
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($clientId === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('events')
|
||||||
|
->where('tenant_code', 'onticket')
|
||||||
|
->where('title', self::EVENT_TITLE)
|
||||||
|
->where('client_id', $clientId)
|
||||||
|
->update(['client_id' => null]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,236 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const ONTICKET_MENUS = [
|
||||||
|
'adminapp.event' => ['onticket.adminapp.event', 'Eventos', '/admin/event'],
|
||||||
|
'adminapp.inicio' => ['onticket.adminapp.inicio', 'Inicio', '/admin/inicio'],
|
||||||
|
'adminapp.catalog' => ['onticket.adminapp.catalog', 'Catálogo', '/admin/catalog'],
|
||||||
|
'adminapp.combos' => ['onticket.adminapp.combos', 'Combos', '/admin/combos'],
|
||||||
|
'adminapp.categories' => ['onticket.adminapp.categories', 'Categorías', '/admin/categories'],
|
||||||
|
'adminapp.ventas' => ['onticket.adminapp.ventas', 'Ventas', '/admin/ventas'],
|
||||||
|
'adminapp.staff' => ['onticket.adminapp.staff', 'Usuarios', '/admin/staff'],
|
||||||
|
'adminapp.tickets' => ['onticket.adminapp.tickets', 'Tickets', '/admin/tickets'],
|
||||||
|
'adminapp.fiesta-futbol-infantil.entradas' => [
|
||||||
|
'onticket.adminapp.fiesta-futbol-infantil.entradas',
|
||||||
|
'Entradas',
|
||||||
|
'/admin/entradas',
|
||||||
|
],
|
||||||
|
'adminapp.fiesta-futbol-infantil.alojamientos' => [
|
||||||
|
'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
|
||||||
|
'Alojamientos',
|
||||||
|
'/admin/alojamientos',
|
||||||
|
],
|
||||||
|
'adminapp.fiesta-futbol-infantil.merchandising' => [
|
||||||
|
'onticket.adminapp.fiesta-futbol-infantil.merchandising',
|
||||||
|
'Merchandising',
|
||||||
|
'/admin/merchandising',
|
||||||
|
],
|
||||||
|
'adminapp.fiesta-futbol-infantil.comida' => [
|
||||||
|
'onticket.adminapp.fiesta-futbol-infantil.comida',
|
||||||
|
'Comida',
|
||||||
|
'/admin/comidas',
|
||||||
|
],
|
||||||
|
'adminapp.desfile.entradas' => [
|
||||||
|
'onticket.adminapp.desfile.entradas',
|
||||||
|
'Entradas',
|
||||||
|
'/admin/desfile/entradas',
|
||||||
|
],
|
||||||
|
'adminapp.desfile.reservas' => [
|
||||||
|
'onticket.adminapp.desfile.reservas',
|
||||||
|
'Reserva de Tickets',
|
||||||
|
'/admin/desfile/reservas',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
private const SHOPIT_MENUS = [
|
||||||
|
'shopit.adminapp.marca' => ['Marca', '/admin/marca'],
|
||||||
|
'shopit.adminapp.contacto' => ['Contacto', '/admin/contacto'],
|
||||||
|
'shopit.adminapp.productos' => ['Productos', '/admin/productos'],
|
||||||
|
'shopit.adminapp.categorias' => ['Categorías', '/admin/categorias'],
|
||||||
|
'shopit.adminapp.transacciones' => ['Transacciones', '/admin/transacciones'],
|
||||||
|
'shopit.adminapp.reportes' => ['Reportes', '/admin/reportes'],
|
||||||
|
'shopit.adminapp.usuarios_roles' => ['Usuarios y roles', '/admin/usuarios-roles'],
|
||||||
|
];
|
||||||
|
|
||||||
|
private const LEGACY_SHOPIT_ADMIN_MENUS = [
|
||||||
|
'adminapp.event',
|
||||||
|
'adminapp.inicio',
|
||||||
|
'adminapp.catalog',
|
||||||
|
'adminapp.combos',
|
||||||
|
'adminapp.categories',
|
||||||
|
'adminapp.ventas',
|
||||||
|
'adminapp.staff',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
|
||||||
|
$this->replaceMenuCode($legacyCode, $code, $label, $route);
|
||||||
|
$this->assignMenuToAdminRoles($code);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (self::SHOPIT_MENUS as $code => [$label, $route]) {
|
||||||
|
$this->upsertMenu($code, $label, $route);
|
||||||
|
$this->assignMenuToAdminRoles($code);
|
||||||
|
}
|
||||||
|
|
||||||
|
$shopItTenantCodes = DB::table('tenants')
|
||||||
|
->where('admin_website_type_code', 'shopit')
|
||||||
|
->pluck('codigo');
|
||||||
|
|
||||||
|
if ($shopItTenantCodes->isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$adminMenuCodes = DB::table('menues')
|
||||||
|
->where('parent_menu_code', 'main.adminapp')
|
||||||
|
->pluck('code');
|
||||||
|
|
||||||
|
DB::table('tenants_menues')
|
||||||
|
->whereIn('tenant_code', $shopItTenantCodes)
|
||||||
|
->whereIn('menu_code', $adminMenuCodes)
|
||||||
|
->delete();
|
||||||
|
|
||||||
|
foreach ($shopItTenantCodes as $tenantCode) {
|
||||||
|
$this->assignMenuToTenant($tenantCode, 'main.adminapp');
|
||||||
|
|
||||||
|
foreach (array_keys(self::SHOPIT_MENUS) as $menuCode) {
|
||||||
|
$this->assignMenuToTenant($tenantCode, $menuCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
if (! DB::table('menues')->where('code', 'main.adminapp')->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$shopItTenantCodes = DB::table('tenants')
|
||||||
|
->where('admin_website_type_code', 'shopit')
|
||||||
|
->pluck('codigo');
|
||||||
|
|
||||||
|
DB::table('tenants_menues')
|
||||||
|
->whereIn('tenant_code', $shopItTenantCodes)
|
||||||
|
->whereIn('menu_code', array_keys(self::SHOPIT_MENUS))
|
||||||
|
->delete();
|
||||||
|
DB::table('roles_menues')
|
||||||
|
->whereIn('menu_codigo', array_keys(self::SHOPIT_MENUS))
|
||||||
|
->delete();
|
||||||
|
DB::table('menues')
|
||||||
|
->whereIn('code', array_keys(self::SHOPIT_MENUS))
|
||||||
|
->delete();
|
||||||
|
|
||||||
|
foreach (self::ONTICKET_MENUS as $legacyCode => [$code, $label, $route]) {
|
||||||
|
$this->replaceMenuCode($code, $legacyCode, $label, $route);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($shopItTenantCodes as $tenantCode) {
|
||||||
|
foreach (self::LEGACY_SHOPIT_ADMIN_MENUS as $menuCode) {
|
||||||
|
$this->assignMenuToTenant($tenantCode, $menuCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function replaceMenuCode(
|
||||||
|
string $sourceCode,
|
||||||
|
string $targetCode,
|
||||||
|
string $label,
|
||||||
|
string $route,
|
||||||
|
): void {
|
||||||
|
$source = DB::table('menues')->where('code', $sourceCode)->first();
|
||||||
|
|
||||||
|
$this->upsertMenu($targetCode, $label, $route, $source);
|
||||||
|
|
||||||
|
if ($source === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('tenants_menues')
|
||||||
|
->where('menu_code', $sourceCode)
|
||||||
|
->get()
|
||||||
|
->each(function (object $assignment) use ($targetCode): void {
|
||||||
|
DB::table('tenants_menues')->updateOrInsert(
|
||||||
|
[
|
||||||
|
'tenant_code' => $assignment->tenant_code,
|
||||||
|
'menu_code' => $targetCode,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'static_content' => $assignment->static_content,
|
||||||
|
'created_at' => $assignment->created_at ?? now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
DB::table('roles_menues')
|
||||||
|
->where('menu_codigo', $sourceCode)
|
||||||
|
->pluck('rol_codigo')
|
||||||
|
->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
|
||||||
|
'rol_codigo' => $roleCode,
|
||||||
|
'menu_codigo' => $targetCode,
|
||||||
|
]));
|
||||||
|
|
||||||
|
DB::table('tenants_menues')->where('menu_code', $sourceCode)->delete();
|
||||||
|
DB::table('roles_menues')->where('menu_codigo', $sourceCode)->delete();
|
||||||
|
DB::table('menues')->where('code', $sourceCode)->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function upsertMenu(
|
||||||
|
string $code,
|
||||||
|
string $label,
|
||||||
|
string $route,
|
||||||
|
?object $source = null,
|
||||||
|
): void {
|
||||||
|
DB::table('menues')->updateOrInsert(
|
||||||
|
['code' => $code],
|
||||||
|
[
|
||||||
|
'label' => $source->label ?? $label,
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'content_type' => $source->content_type ?? 'dynamic',
|
||||||
|
'static_content_schema' => $source->static_content_schema ?? null,
|
||||||
|
'route' => $source->route ?? $route,
|
||||||
|
'created_at' => $source->created_at ?? now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assignMenuToAdminRoles(string $menuCode): void
|
||||||
|
{
|
||||||
|
DB::table('roles')
|
||||||
|
->whereIn('codigo', ['admin', 'adminapp'])
|
||||||
|
->pluck('codigo')
|
||||||
|
->each(fn (string $roleCode) => DB::table('roles_menues')->updateOrInsert([
|
||||||
|
'rol_codigo' => $roleCode,
|
||||||
|
'menu_codigo' => $menuCode,
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assignMenuToTenant(string $tenantCode, string $menuCode): void
|
||||||
|
{
|
||||||
|
DB::table('tenants_menues')->updateOrInsert(
|
||||||
|
[
|
||||||
|
'tenant_code' => $tenantCode,
|
||||||
|
'menu_code' => $menuCode,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'static_content' => null,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('tenants_menues', function (Blueprint $table): void {
|
||||||
|
$table->boolean('is_enabled')->default(true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('tenants_menues', function (Blueprint $table): void {
|
||||||
|
$table->dropColumn('is_enabled');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::table('menues')
|
||||||
|
->where('code', 'help.terms-and-conditions')
|
||||||
|
->update([
|
||||||
|
'content_type' => 'static',
|
||||||
|
'static_content_schema' => json_encode([
|
||||||
|
'html' => 'present|nullable|string',
|
||||||
|
], JSON_THROW_ON_ERROR),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::table('menues')
|
||||||
|
->where('code', 'help.terms-and-conditions')
|
||||||
|
->update([
|
||||||
|
'content_type' => 'dynamic',
|
||||||
|
'static_content_schema' => null,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$driver = DB::connection()->getDriverName();
|
||||||
|
|
||||||
|
if (! in_array($driver, ['mysql', 'mariadb', 'sqlite', 'pgsql', 'sqlsrv'], true)) {
|
||||||
|
throw new RuntimeException("Unsupported address database driver: {$driver}");
|
||||||
|
}
|
||||||
|
|
||||||
|
Schema::create('addresses', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('label');
|
||||||
|
$table->text('address_text');
|
||||||
|
$table->decimal('latitude', 10, 7)->nullable();
|
||||||
|
$table->decimal('longitude', 10, 7)->nullable();
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::create('tenant_addresses', function (Blueprint $table) use ($driver): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('tenant_codigo');
|
||||||
|
$table->foreignId('address_id')->constrained('addresses')->cascadeOnDelete();
|
||||||
|
$table->boolean('is_main')->default(false);
|
||||||
|
$table->timestamps();
|
||||||
|
|
||||||
|
$table->foreign('tenant_codigo')->references('codigo')->on('tenants')->cascadeOnDelete();
|
||||||
|
$table->unique(['tenant_codigo', 'address_id']);
|
||||||
|
|
||||||
|
if (in_array($driver, ['mysql', 'mariadb'], true)) {
|
||||||
|
// NULL allows many secondary addresses, while a tenant code can occur only once.
|
||||||
|
$table->string('main_tenant_codigo')->nullable()
|
||||||
|
->virtualAs('CASE WHEN is_main = 1 THEN tenant_codigo ELSE NULL END');
|
||||||
|
$table->unique('main_tenant_codigo', 'tenant_addresses_one_main_per_tenant');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (! in_array($driver, ['mysql', 'mariadb'], true)) {
|
||||||
|
$condition = $driver === 'pgsql' ? 'is_main = true' : 'is_main = 1';
|
||||||
|
DB::statement('CREATE UNIQUE INDEX tenant_addresses_one_main_per_tenant '
|
||||||
|
."ON tenant_addresses (tenant_codigo) WHERE {$condition}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('tenant_addresses');
|
||||||
|
Schema::dropIfExists('addresses');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
DB::table('tenants_menues')
|
||||||
|
->where('menu_code', 'help.contact')
|
||||||
|
->whereNotNull('static_content')
|
||||||
|
->orderBy('id')
|
||||||
|
->chunkById(100, function ($menus): void {
|
||||||
|
foreach ($menus as $menu) {
|
||||||
|
$content = json_decode($menu->static_content, true, flags: JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
|
if ($content === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! is_array($content) || ! is_array($content['locations'] ?? [])) {
|
||||||
|
throw new RuntimeException("Invalid contact locations for tenant {$menu->tenant_code}");
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($content['locations'] ?? [] as $location) {
|
||||||
|
if (! is_array($location) || ! is_array($location['addresses'] ?? [])) {
|
||||||
|
throw new RuntimeException("Invalid contact addresses for tenant {$menu->tenant_code}");
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($location['addresses'] ?? [] as $address) {
|
||||||
|
$this->copyAddress($menu->tenant_code, $location, $address);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function copyAddress(string $tenantCode, array $location, mixed $address): void
|
||||||
|
{
|
||||||
|
if (! is_array($address) || ! is_string($address['address'] ?? null)
|
||||||
|
|| trim($address['address']) === '') {
|
||||||
|
throw new RuntimeException("Invalid contact address text for tenant {$tenantCode}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$coordinates = $address['coordinates'] ?? null;
|
||||||
|
|
||||||
|
if ($coordinates !== null && (! is_array($coordinates) || count($coordinates) !== 2
|
||||||
|
|| ! is_numeric($coordinates[0] ?? null) || ! is_numeric($coordinates[1] ?? null)
|
||||||
|
|| ! is_finite((float) $coordinates[0]) || ! is_finite((float) $coordinates[1])
|
||||||
|
|| abs((float) $coordinates[0]) > 90 || abs((float) $coordinates[1]) > 180)) {
|
||||||
|
throw new RuntimeException("Invalid contact coordinates for tenant {$tenantCode}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$label = $address['label'] ?? $location['label'] ?? 'Dirección';
|
||||||
|
|
||||||
|
if (! is_string($label) || trim($label) === '' || mb_strlen($label) > 255) {
|
||||||
|
throw new RuntimeException("Invalid contact address label for tenant {$tenantCode}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$values = [
|
||||||
|
'label' => $label,
|
||||||
|
'address_text' => $address['address'],
|
||||||
|
'latitude' => $coordinates === null ? null : number_format((float) $coordinates[0], 7, '.', ''),
|
||||||
|
'longitude' => $coordinates === null ? null : number_format((float) $coordinates[1], 7, '.', ''),
|
||||||
|
];
|
||||||
|
|
||||||
|
// Reuse only within this tenant; equal legacy addresses in different tenants stay independent.
|
||||||
|
$existing = DB::table('addresses')
|
||||||
|
->join('tenant_addresses', 'tenant_addresses.address_id', '=', 'addresses.id')
|
||||||
|
->where('tenant_addresses.tenant_codigo', $tenantCode)
|
||||||
|
->where(array_combine(
|
||||||
|
array_map(fn (string $field): string => 'addresses.'.$field, array_keys($values)),
|
||||||
|
array_values($values),
|
||||||
|
))
|
||||||
|
->first(['addresses.id', 'tenant_addresses.id as link_id']);
|
||||||
|
|
||||||
|
if ($existing !== null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$now = now();
|
||||||
|
$isMain = ! DB::table('tenant_addresses')
|
||||||
|
->where('tenant_codigo', $tenantCode)
|
||||||
|
->where('is_main', true)
|
||||||
|
->exists();
|
||||||
|
$addressId = DB::table('addresses')->insertGetId([
|
||||||
|
...$values,
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
|
||||||
|
DB::table('tenant_addresses')->insert([
|
||||||
|
'tenant_codigo' => $tenantCode,
|
||||||
|
'address_id' => $addressId,
|
||||||
|
'is_main' => $isMain,
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// Keep copies: they may already have been edited or reused. Legacy menus were never changed.
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('address_id')->nullable()->constrained('addresses')->nullOnDelete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('address_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
DB::table('events')->whereNull('address_id')->orderBy('id')->lockForUpdate()
|
||||||
|
->chunkById(100, function ($events): void {
|
||||||
|
foreach ($events as $event) {
|
||||||
|
$coordinates = $event->exact_location === null
|
||||||
|
? null
|
||||||
|
: json_decode($event->exact_location, true, flags: JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
|
if ($coordinates !== null && (! is_array($coordinates)
|
||||||
|
|| ! is_numeric($coordinates['latitude'] ?? null)
|
||||||
|
|| ! is_numeric($coordinates['longitude'] ?? null)
|
||||||
|
|| ! is_finite((float) $coordinates['latitude'])
|
||||||
|
|| ! is_finite((float) $coordinates['longitude'])
|
||||||
|
|| abs((float) $coordinates['latitude']) > 90
|
||||||
|
|| abs((float) $coordinates['longitude']) > 180)) {
|
||||||
|
throw new RuntimeException("Invalid location coordinates for event {$event->id}");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($event->location === null || trim($event->location) === '') {
|
||||||
|
if ($coordinates !== null) {
|
||||||
|
throw new RuntimeException("Missing address text for event {$event->id}");
|
||||||
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$now = now();
|
||||||
|
$addressId = DB::table('addresses')->insertGetId([
|
||||||
|
'label' => 'Ubicación del evento',
|
||||||
|
'address_text' => $event->location,
|
||||||
|
'latitude' => $coordinates === null ? null : $coordinates['latitude'],
|
||||||
|
'longitude' => $coordinates === null ? null : $coordinates['longitude'],
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Update only the new link, preserving the original fields and timestamps.
|
||||||
|
DB::table('events')->where('id', $event->id)->update(['address_id' => $addressId]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// Copies may already have been edited or shared; keep them and the legacy data.
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$driver = DB::connection()->getDriverName();
|
||||||
|
if (! in_array($driver, ['mysql', 'mariadb', 'sqlite', 'pgsql', 'sqlsrv'], true)) {
|
||||||
|
throw new RuntimeException("Unsupported phone number database driver: {$driver}");
|
||||||
|
}
|
||||||
|
|
||||||
|
Schema::create('phone_numbers', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('label');
|
||||||
|
$table->string('number');
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
Schema::create('tenant_phone_numbers', function (Blueprint $table) use ($driver): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('tenant_codigo');
|
||||||
|
$table->foreignId('phone_number_id')->constrained('phone_numbers')->cascadeOnDelete();
|
||||||
|
$table->boolean('is_main')->default(false);
|
||||||
|
$table->timestamps();
|
||||||
|
$table->foreign('tenant_codigo')->references('codigo')->on('tenants')->cascadeOnDelete();
|
||||||
|
$table->unique(['tenant_codigo', 'phone_number_id']);
|
||||||
|
if (in_array($driver, ['mysql', 'mariadb'], true)) {
|
||||||
|
$table->string('main_tenant_codigo')->nullable()
|
||||||
|
->virtualAs('CASE WHEN is_main = 1 THEN tenant_codigo ELSE NULL END');
|
||||||
|
$table->unique('main_tenant_codigo', 'tenant_phones_one_main');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (! in_array($driver, ['mysql', 'mariadb'], true)) {
|
||||||
|
$condition = $driver === 'pgsql' ? 'is_main = true' : 'is_main = 1';
|
||||||
|
DB::statement("CREATE UNIQUE INDEX tenant_phones_one_main ON tenant_phone_numbers (tenant_codigo) WHERE {$condition}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('tenant_phone_numbers');
|
||||||
|
Schema::dropIfExists('phone_numbers');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
DB::table('tenants')->orderBy('id')->chunkById(100, function ($tenants): void {
|
||||||
|
foreach ($tenants as $tenant) {
|
||||||
|
$this->copyPhone($tenant->codigo, $tenant->phone, true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
DB::table('tenants_menues')->where('menu_code', 'help.contact')
|
||||||
|
->whereNotNull('static_content')->orderBy('id')->chunkById(100, function ($menus): void {
|
||||||
|
foreach ($menus as $menu) {
|
||||||
|
$content = json_decode($menu->static_content, true, flags: JSON_THROW_ON_ERROR);
|
||||||
|
if ($content === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (! is_array($content)) {
|
||||||
|
throw new RuntimeException("Invalid contact content for tenant {$menu->tenant_code}");
|
||||||
|
}
|
||||||
|
$this->copyPhone($menu->tenant_code, $content['phone'] ?? null, false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function copyPhone(string $tenantCode, mixed $number, bool $fromTenant): void
|
||||||
|
{
|
||||||
|
if ($number === null || (is_string($number) && trim($number) === '')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (! is_string($number) || mb_strlen($number) > 255 || ! preg_match('/[0-9]/', $number)) {
|
||||||
|
throw new RuntimeException("Invalid phone number for tenant {$tenantCode}");
|
||||||
|
}
|
||||||
|
$numbers = DB::table('phone_numbers')
|
||||||
|
->join('tenant_phone_numbers', 'phone_numbers.id', '=', 'tenant_phone_numbers.phone_number_id')
|
||||||
|
->where('tenant_codigo', $tenantCode)->get(['phone_numbers.number']);
|
||||||
|
$dialable = preg_replace('/[^0-9]/', '', $number);
|
||||||
|
foreach ($numbers as $existing) {
|
||||||
|
if (preg_replace('/[^0-9]/', '', $existing->number) === $dialable) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$isMain = ! DB::table('tenant_phone_numbers')->where('tenant_codigo', $tenantCode)->where('is_main', true)->exists();
|
||||||
|
$now = now();
|
||||||
|
$id = DB::table('phone_numbers')->insertGetId([
|
||||||
|
'label' => $fromTenant ? 'Principal' : 'Contacto',
|
||||||
|
'number' => trim($number), 'created_at' => $now, 'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
DB::table('tenant_phone_numbers')->insert([
|
||||||
|
'tenant_codigo' => $tenantCode, 'phone_number_id' => $id, 'is_main' => $isMain,
|
||||||
|
'created_at' => $now, 'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// Preserve copies that may have been edited. The legacy sources were not changed.
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::table('menues')->where('code', 'help.contact')->update([
|
||||||
|
'content_type' => 'dynamic',
|
||||||
|
'static_content_schema' => null,
|
||||||
|
]);
|
||||||
|
// Preserve legacy pivot content for rollback; dynamic menus do not expose it.
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::table('menues')->where('code', 'help.contact')->update([
|
||||||
|
'content_type' => 'static',
|
||||||
|
'static_content_schema' => json_encode([
|
||||||
|
'whatsapp' => 'required|array',
|
||||||
|
'whatsapp.whatsapp_url' => 'required|url',
|
||||||
|
'whatsapp.whatsapp_label' => 'required|string',
|
||||||
|
'phone' => 'required|string',
|
||||||
|
'locations' => 'required|array|min:1',
|
||||||
|
'locations.*.label' => 'required|string',
|
||||||
|
'locations.*.addresses' => 'required|array|min:1',
|
||||||
|
'locations.*.addresses.*' => 'required|array:label,address,coordinates',
|
||||||
|
'locations.*.addresses.*.label' => 'required|string',
|
||||||
|
'locations.*.addresses.*.address' => 'required|string',
|
||||||
|
'locations.*.addresses.*.coordinates' => 'required|array|size:2',
|
||||||
|
'locations.*.addresses.*.coordinates.0' => 'required|numeric|between:-90,90',
|
||||||
|
'locations.*.addresses.*.coordinates.1' => 'required|numeric|between:-180,180',
|
||||||
|
'map_locations' => 'prohibited',
|
||||||
|
], JSON_THROW_ON_ERROR),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('phone_numbers', function (Blueprint $table): void {
|
||||||
|
$table->string('country_code', 8)->nullable()->default('+54');
|
||||||
|
$table->string('mobile_prefix', 4)->nullable()->default('9');
|
||||||
|
$table->string('area_code', 8)->nullable();
|
||||||
|
$table->string('local_number')->nullable();
|
||||||
|
});
|
||||||
|
|
||||||
|
DB::table('phone_numbers')->orderBy('id')->chunkById(100, function ($numbers): void {
|
||||||
|
foreach ($numbers as $phone) {
|
||||||
|
DB::table('phone_numbers')->where('id', $phone->id)
|
||||||
|
->update($this->components($phone->number));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::table('phone_numbers', function (Blueprint $table): void {
|
||||||
|
$table->dropColumn('number');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('phone_numbers', function (Blueprint $table): void {
|
||||||
|
$table->string('number')->nullable();
|
||||||
|
});
|
||||||
|
|
||||||
|
DB::table('phone_numbers')->orderBy('id')->chunkById(100, function ($numbers): void {
|
||||||
|
foreach ($numbers as $phone) {
|
||||||
|
$parts = array_filter([
|
||||||
|
$phone->country_code,
|
||||||
|
$phone->mobile_prefix,
|
||||||
|
$phone->area_code,
|
||||||
|
$phone->local_number,
|
||||||
|
], fn ($part): bool => $part !== null && $part !== '');
|
||||||
|
DB::table('phone_numbers')->where('id', $phone->id)
|
||||||
|
->update(['number' => implode(' ', $parts)]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::table('phone_numbers', function (Blueprint $table): void {
|
||||||
|
$table->dropColumn(['country_code', 'mobile_prefix', 'area_code', 'local_number']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array{country_code: ?string, mobile_prefix: ?string, area_code: ?string, local_number: string} */
|
||||||
|
private function components(string $number): array
|
||||||
|
{
|
||||||
|
$number = trim($number);
|
||||||
|
|
||||||
|
if (preg_match('/^(\+?\d{1,3})\s+(?:(9)\s+)?\(?(\d{2,5})\)?[\s-]+([\d\s-]+)$/', $number, $match)) {
|
||||||
|
return [
|
||||||
|
'country_code' => '+'.ltrim($match[1], '+'),
|
||||||
|
'mobile_prefix' => ($match[2] ?? '') ?: null,
|
||||||
|
'area_code' => $match[3],
|
||||||
|
'local_number' => preg_replace('/\D/', '', $match[4]),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^\(?(0\d{2,5})\)?[\s-]+([\d\s-]+)$/', $number, $match)) {
|
||||||
|
return [
|
||||||
|
'country_code' => null,
|
||||||
|
'mobile_prefix' => null,
|
||||||
|
'area_code' => $match[1],
|
||||||
|
'local_number' => preg_replace('/\D/', '', $match[2]),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preg_match('/^\+54(9?)(\d+)$/', $number, $match)) {
|
||||||
|
return [
|
||||||
|
'country_code' => '+54',
|
||||||
|
'mobile_prefix' => $match[1] === '9' ? '9' : null,
|
||||||
|
'area_code' => null,
|
||||||
|
'local_number' => $match[2],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'country_code' => null,
|
||||||
|
'mobile_prefix' => null,
|
||||||
|
'area_code' => null,
|
||||||
|
'local_number' => $number,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('categorias', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('banner_id')
|
||||||
|
->nullable()
|
||||||
|
->constrained('attachments')
|
||||||
|
->nullOnDelete();
|
||||||
|
$table->boolean('banner_enabled')->default(false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('categorias', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('banner_id');
|
||||||
|
$table->dropColumn('banner_enabled');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('event_id')
|
||||||
|
->nullable()
|
||||||
|
->after('tenant_codigo')
|
||||||
|
->constrained('events')
|
||||||
|
->cascadeOnUpdate()
|
||||||
|
->restrictOnDelete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('users', function (Blueprint $table): void {
|
||||||
|
$table->dropForeign(['event_id']);
|
||||||
|
$table->dropColumn('event_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::table('admin_website_types')
|
||||||
|
->where('codigo', 'shopit')
|
||||||
|
->update([
|
||||||
|
'secondary_color' => '#ADADAD',
|
||||||
|
'danger_color' => '#FF8888',
|
||||||
|
'success_color' => '#58B341',
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// Presentation settings are operational data; preserve them on rollback.
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('categorias', function (Blueprint $table): void {
|
||||||
|
$table->unsignedInteger('sort_order')->default(0);
|
||||||
|
$table->index(['tenant_code', 'categoria_id', 'sort_order']);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Preserve the alphabetical navigation order until an administrator reorders it.
|
||||||
|
$orders = [];
|
||||||
|
foreach (DB::table('categorias')->orderBy('nombre')->orderBy('id')->get() as $category) {
|
||||||
|
$group = json_encode([$category->tenant_code, $category->categoria_id]);
|
||||||
|
$order = $orders[$group] ?? 0;
|
||||||
|
DB::table('categorias')->where('id', $category->id)->update(['sort_order' => $order]);
|
||||||
|
$orders[$group] = $order + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('categorias', function (Blueprint $table): void {
|
||||||
|
$table->dropIndex(['tenant_code', 'categoria_id', 'sort_order']);
|
||||||
|
$table->dropColumn('sort_order');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -6,6 +6,7 @@ use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
|||||||
use App\Domains\Commerce\Catalog\Models\Attribute;
|
use App\Domains\Commerce\Catalog\Models\Attribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
@@ -13,6 +14,7 @@ use App\Shared\Enums\FieldType;
|
|||||||
use Illuminate\Database\Seeder;
|
use Illuminate\Database\Seeder;
|
||||||
use Illuminate\Http\UploadedFile;
|
use Illuminate\Http\UploadedFile;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use RuntimeException;
|
use RuntimeException;
|
||||||
|
|
||||||
@@ -35,6 +37,12 @@ class FiestaTradicionArrufoSeeder extends Seeder
|
|||||||
throw new RuntimeException("Tenant 'onticket' no encontrado.");
|
throw new RuntimeException("Tenant 'onticket' no encontrado.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$client = Client::query()->where('code', 'pyme_rural')->first();
|
||||||
|
|
||||||
|
if ($client === null) {
|
||||||
|
throw new RuntimeException("Client 'pyme_rural' no encontrado.");
|
||||||
|
}
|
||||||
|
|
||||||
Attribute::query()->firstOrCreate(
|
Attribute::query()->firstOrCreate(
|
||||||
['tenant_codigo' => $tenant->codigo, 'codigo' => 'event_date'],
|
['tenant_codigo' => $tenant->codigo, 'codigo' => 'event_date'],
|
||||||
['nombre' => 'Fecha', 'type' => FieldType::EventDate, 'is_required' => true],
|
['nombre' => 'Fecha', 'type' => FieldType::EventDate, 'is_required' => true],
|
||||||
@@ -44,13 +52,19 @@ class FiestaTradicionArrufoSeeder extends Seeder
|
|||||||
['tenant_code' => $tenant->codigo, 'title' => self::TITLE],
|
['tenant_code' => $tenant->codigo, 'title' => self::TITLE],
|
||||||
['published_at' => now()],
|
['published_at' => now()],
|
||||||
);
|
);
|
||||||
$event->update([
|
$eventData = [
|
||||||
'subtitle' => 'Una noche para celebrar nuestras raíces y mantener viva la tradición gaucha.',
|
'subtitle' => 'Una noche para celebrar nuestras raíces y mantener viva la tradición gaucha.',
|
||||||
'description' => 'La 26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas reunirá a agrupaciones, artesanos, pilcheros y público en general para compartir una jornada dedicada a nuestras costumbres y cultura.'
|
'description' => 'La 26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas reunirá a agrupaciones, artesanos, pilcheros y público en general para compartir una jornada dedicada a nuestras costumbres y cultura.'
|
||||||
."\n\n".'Un encuentro para disfrutar de la tradición, la identidad gaucha y el espíritu de camaradería, en el Predio de Doma del Club Unión Deportiva Arrufó.'
|
."\n\n".'Un encuentro para disfrutar de la tradición, la identidad gaucha y el espíritu de camaradería, en el Predio de Doma del Club Unión Deportiva Arrufó.'
|
||||||
."\n\n".'Organiza: Biblioteca Popular Miguel Ángel Sosa.',
|
."\n\n".'Organiza: Biblioteca Popular Miguel Ángel Sosa.',
|
||||||
'location' => 'Predio de Doma del Club Unión Deportiva Arrufó',
|
'location' => 'Predio de Doma del Club Unión Deportiva Arrufó',
|
||||||
]);
|
];
|
||||||
|
|
||||||
|
if (Schema::hasColumn('events', 'client_id')) {
|
||||||
|
$eventData['client_id'] = $client->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->update($eventData);
|
||||||
|
|
||||||
$eventImage = $event->attachment;
|
$eventImage = $event->attachment;
|
||||||
if ($eventImage === null || ! Storage::disk('s3')->exists($eventImage->path)) {
|
if ($eventImage === null || ! Storage::disk('s3')->exists($eventImage->path)) {
|
||||||
|
|||||||
@@ -53,89 +53,131 @@ class MenuSeeder extends Seeder
|
|||||||
'route' => '/scanner/detail/:id',
|
'route' => '/scanner/detail/:id',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.event',
|
'code' => 'onticket.adminapp.event',
|
||||||
'label' => 'Eventos',
|
'label' => 'Eventos',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/event',
|
'route' => '/admin/event',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.inicio',
|
'code' => 'onticket.adminapp.inicio',
|
||||||
'label' => 'Inicio',
|
'label' => 'Inicio',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/inicio',
|
'route' => '/admin/inicio',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.catalog',
|
'code' => 'onticket.adminapp.catalog',
|
||||||
'label' => 'Catálogo',
|
'label' => 'Catálogo',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/catalog',
|
'route' => '/admin/catalog',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.combos',
|
'code' => 'onticket.adminapp.combos',
|
||||||
'label' => 'Combos',
|
'label' => 'Combos',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/combos',
|
'route' => '/admin/combos',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.categories',
|
'code' => 'onticket.adminapp.categories',
|
||||||
'label' => 'Categorías',
|
'label' => 'Categorías',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/categories',
|
'route' => '/admin/categories',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.ventas',
|
'code' => 'onticket.adminapp.ventas',
|
||||||
'label' => 'Ventas',
|
'label' => 'Ventas',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/ventas',
|
'route' => '/admin/ventas',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.staff',
|
'code' => 'onticket.adminapp.staff',
|
||||||
'label' => 'Usuarios',
|
'label' => 'Usuarios',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/staff',
|
'route' => '/admin/staff',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.tickets',
|
'code' => 'onticket.adminapp.tickets',
|
||||||
'label' => 'Tickets',
|
'label' => 'Tickets',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/tickets',
|
'route' => '/admin/tickets',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.fiesta-futbol-infantil.entradas',
|
'code' => 'onticket.adminapp.fiesta-futbol-infantil.entradas',
|
||||||
'label' => 'Entradas',
|
'label' => 'Entradas',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/entradas',
|
'route' => '/admin/entradas',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.fiesta-futbol-infantil.alojamientos',
|
'code' => 'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
|
||||||
'label' => 'Alojamientos',
|
'label' => 'Alojamientos',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/alojamientos',
|
'route' => '/admin/alojamientos',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.fiesta-futbol-infantil.merchandising',
|
'code' => 'onticket.adminapp.fiesta-futbol-infantil.merchandising',
|
||||||
'label' => 'Merchandising',
|
'label' => 'Merchandising',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/merchandising',
|
'route' => '/admin/merchandising',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.fiesta-futbol-infantil.comida',
|
'code' => 'onticket.adminapp.fiesta-futbol-infantil.comida',
|
||||||
'label' => 'Comida',
|
'label' => 'Comida',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/comidas',
|
'route' => '/admin/comidas',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.desfile.entradas',
|
'code' => 'onticket.adminapp.desfile.entradas',
|
||||||
'label' => 'Entradas',
|
'label' => 'Entradas',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/desfile/entradas',
|
'route' => '/admin/desfile/entradas',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'code' => 'adminapp.desfile.reservas',
|
'code' => 'onticket.adminapp.desfile.reservas',
|
||||||
'label' => 'Reserva de Tickets',
|
'label' => 'Reserva de Tickets',
|
||||||
'parent_menu_code' => 'main.adminapp',
|
'parent_menu_code' => 'main.adminapp',
|
||||||
'route' => '/admin/desfile/reservas',
|
'route' => '/admin/desfile/reservas',
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.marca',
|
||||||
|
'label' => 'Marca',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/marca',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.contacto',
|
||||||
|
'label' => 'Contacto',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/contacto',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.productos',
|
||||||
|
'label' => 'Productos',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/productos',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.categorias',
|
||||||
|
'label' => 'Categorías',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/categorias',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.transacciones',
|
||||||
|
'label' => 'Transacciones',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/transacciones',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.reportes',
|
||||||
|
'label' => 'Reportes',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/reportes',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'shopit.adminapp.usuarios_roles',
|
||||||
|
'label' => 'Usuarios y roles',
|
||||||
|
'parent_menu_code' => 'main.adminapp',
|
||||||
|
'route' => '/admin/usuarios-roles',
|
||||||
|
],
|
||||||
[
|
[
|
||||||
'code' => 'account',
|
'code' => 'account',
|
||||||
'label' => 'Mi cuenta',
|
'label' => 'Mi cuenta',
|
||||||
@@ -182,23 +224,8 @@ class MenuSeeder extends Seeder
|
|||||||
'code' => 'help.contact',
|
'code' => 'help.contact',
|
||||||
'label' => 'Contacto',
|
'label' => 'Contacto',
|
||||||
'parent_menu_code' => 'help',
|
'parent_menu_code' => 'help',
|
||||||
'content_type' => Menu::CONTENT_TYPE_STATIC,
|
'content_type' => Menu::CONTENT_TYPE_DYNAMIC,
|
||||||
'static_content_schema' => [
|
'static_content_schema' => null,
|
||||||
'whatsapp' => 'required|array',
|
|
||||||
'whatsapp.whatsapp_url' => 'required|url',
|
|
||||||
'whatsapp.whatsapp_label' => 'required|string',
|
|
||||||
'phone' => 'required|string',
|
|
||||||
'locations' => 'required|array|min:1',
|
|
||||||
'locations.*.label' => 'required|string',
|
|
||||||
'locations.*.addresses' => 'required|array|min:1',
|
|
||||||
'locations.*.addresses.*' => 'required|array:label,address,coordinates',
|
|
||||||
'locations.*.addresses.*.label' => 'required|string',
|
|
||||||
'locations.*.addresses.*.address' => 'required|string',
|
|
||||||
'locations.*.addresses.*.coordinates' => 'required|array|size:2',
|
|
||||||
'locations.*.addresses.*.coordinates.0' => 'required|numeric|between:-90,90',
|
|
||||||
'locations.*.addresses.*.coordinates.1' => 'required|numeric|between:-180,180',
|
|
||||||
'map_locations' => 'prohibited',
|
|
||||||
],
|
|
||||||
'route' => '/ayuda/contacto',
|
'route' => '/ayuda/contacto',
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
@@ -219,7 +246,10 @@ class MenuSeeder extends Seeder
|
|||||||
'code' => 'help.terms-and-conditions',
|
'code' => 'help.terms-and-conditions',
|
||||||
'label' => 'Términos y condiciones',
|
'label' => 'Términos y condiciones',
|
||||||
'parent_menu_code' => 'help',
|
'parent_menu_code' => 'help',
|
||||||
'content_type' => Menu::CONTENT_TYPE_DYNAMIC,
|
'content_type' => Menu::CONTENT_TYPE_STATIC,
|
||||||
|
'static_content_schema' => [
|
||||||
|
'html' => 'present|nullable|string',
|
||||||
|
],
|
||||||
'route' => '/ayuda/terminos-y-condiciones',
|
'route' => '/ayuda/terminos-y-condiciones',
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
@@ -255,6 +285,10 @@ class MenuSeeder extends Seeder
|
|||||||
])
|
])
|
||||||
->delete();
|
->delete();
|
||||||
|
|
||||||
|
Menu::query()
|
||||||
|
->where('code', 'like', 'adminapp.%')
|
||||||
|
->delete();
|
||||||
|
|
||||||
$allRoleMenuCodes = Menu::query()->pluck('code');
|
$allRoleMenuCodes = Menu::query()->pluck('code');
|
||||||
$adminAppMenuCodes = Menu::query()
|
$adminAppMenuCodes = Menu::query()
|
||||||
->where('code', 'main.adminapp')
|
->where('code', 'main.adminapp')
|
||||||
@@ -299,24 +333,32 @@ class MenuSeeder extends Seeder
|
|||||||
'mutual_smep',
|
'mutual_smep',
|
||||||
];
|
];
|
||||||
$ticketAdminMenuCodes = [
|
$ticketAdminMenuCodes = [
|
||||||
'adminapp.tickets',
|
'onticket.adminapp.tickets',
|
||||||
];
|
];
|
||||||
$fiestaCategoryMenuCodes = [
|
$fiestaCategoryMenuCodes = [
|
||||||
'adminapp.fiesta-futbol-infantil.entradas',
|
'onticket.adminapp.fiesta-futbol-infantil.entradas',
|
||||||
'adminapp.fiesta-futbol-infantil.alojamientos',
|
'onticket.adminapp.fiesta-futbol-infantil.alojamientos',
|
||||||
'adminapp.fiesta-futbol-infantil.merchandising',
|
'onticket.adminapp.fiesta-futbol-infantil.merchandising',
|
||||||
'adminapp.fiesta-futbol-infantil.comida',
|
'onticket.adminapp.fiesta-futbol-infantil.comida',
|
||||||
];
|
];
|
||||||
$fiestaExcludedAdminMenuCodes = [
|
$fiestaExcludedAdminMenuCodes = [
|
||||||
'adminapp.inicio',
|
'onticket.adminapp.inicio',
|
||||||
'adminapp.catalog',
|
'onticket.adminapp.catalog',
|
||||||
'adminapp.categories',
|
'onticket.adminapp.categories',
|
||||||
'adminapp.combos',
|
'onticket.adminapp.combos',
|
||||||
];
|
];
|
||||||
$desfileMenuCodes = [
|
$desfileMenuCodes = [
|
||||||
'adminapp.desfile.entradas',
|
'onticket.adminapp.desfile.entradas',
|
||||||
'adminapp.desfile.reservas',
|
'onticket.adminapp.desfile.reservas',
|
||||||
];
|
];
|
||||||
|
$shopItAdminMenuCodes = Menu::query()
|
||||||
|
->where('code', 'like', 'shopit.adminapp.%')
|
||||||
|
->pluck('code')
|
||||||
|
->all();
|
||||||
|
$onTicketAdminMenuCodes = Menu::query()
|
||||||
|
->where('code', 'like', 'onticket.adminapp.%')
|
||||||
|
->pluck('code')
|
||||||
|
->all();
|
||||||
$onTicketMenuCodes = [
|
$onTicketMenuCodes = [
|
||||||
'event.index',
|
'event.index',
|
||||||
'event.category',
|
'event.category',
|
||||||
@@ -342,30 +384,6 @@ class MenuSeeder extends Seeder
|
|||||||
'is_active' => false,
|
'is_active' => false,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
$contactContent = [
|
|
||||||
'whatsapp' => [
|
|
||||||
'whatsapp_url' => 'https://wa.me/543412602222',
|
|
||||||
'whatsapp_label' => 'Chatea con nosotros',
|
|
||||||
],
|
|
||||||
'phone' => '+54 9 (0341) 6658247',
|
|
||||||
'locations' => [
|
|
||||||
'rosario' => [
|
|
||||||
'label' => 'Rosario',
|
|
||||||
'addresses' => [
|
|
||||||
[
|
|
||||||
'label' => 'Gigante de Arroyito',
|
|
||||||
'address' => 'Av. Génova 640, Rosario',
|
|
||||||
'coordinates' => [-32.913997, -60.674567],
|
|
||||||
],
|
|
||||||
[
|
|
||||||
'label' => 'Telepagos',
|
|
||||||
'address' => 'Rioja 1150, piso 12, dpto. 3, Rosario',
|
|
||||||
'coordinates' => [-32.946820, -60.639320],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
$mutualSmepFrequentlyAskedQuestions = [
|
$mutualSmepFrequentlyAskedQuestions = [
|
||||||
[
|
[
|
||||||
'pregunta' => '¿Hay algún límite de compra?',
|
'pregunta' => '¿Hay algún límite de compra?',
|
||||||
@@ -383,29 +401,17 @@ class MenuSeeder extends Seeder
|
|||||||
'is_active' => false,
|
'is_active' => false,
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
$mutualSmepContactContent = [
|
|
||||||
'whatsapp' => [
|
|
||||||
'whatsapp_url' => 'https://wa.me/5493412474530',
|
|
||||||
'whatsapp_label' => 'Chateá con Mutual SMEP',
|
|
||||||
],
|
|
||||||
'phone' => '+54 9 341 247-4530',
|
|
||||||
'locations' => [
|
|
||||||
'rosario' => [
|
|
||||||
'label' => 'Rosario',
|
|
||||||
'addresses' => [
|
|
||||||
[
|
|
||||||
'label' => 'Mutual SMEP',
|
|
||||||
'address' => 'San Lorenzo 1543, Rosario, Santa Fe',
|
|
||||||
'coordinates' => [-32.9431184, -60.6437991],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
foreach ($tenants as $tenant) {
|
foreach ($tenants as $tenant) {
|
||||||
$menuCodes = $allMenus;
|
$menuCodes = $allMenus;
|
||||||
|
|
||||||
|
$menuCodes = array_diff(
|
||||||
|
$menuCodes,
|
||||||
|
$tenant->admin_website_type_code === 'shopit'
|
||||||
|
? $onTicketAdminMenuCodes
|
||||||
|
: $shopItAdminMenuCodes,
|
||||||
|
);
|
||||||
|
|
||||||
if ($tenant->codigo === 'sonder') {
|
if ($tenant->codigo === 'sonder') {
|
||||||
// Sonder NO tiene tickets
|
// Sonder NO tiene tickets
|
||||||
$menuCodes = array_diff($menuCodes, ['account.tickets']);
|
$menuCodes = array_diff($menuCodes, ['account.tickets']);
|
||||||
@@ -447,11 +453,6 @@ class MenuSeeder extends Seeder
|
|||||||
? $mutualSmepFrequentlyAskedQuestions
|
? $mutualSmepFrequentlyAskedQuestions
|
||||||
: $frequentlyAskedQuestions,
|
: $frequentlyAskedQuestions,
|
||||||
]);
|
]);
|
||||||
$tenant->menues()->updateExistingPivot('help.contact', [
|
|
||||||
'static_content' => $tenant->codigo === 'mutual_smep'
|
|
||||||
? $mutualSmepContactContent
|
|
||||||
: $contactContent,
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,9 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
'site_title' => 'ShopIt',
|
'site_title' => 'ShopIt',
|
||||||
...self::PRESENTATION,
|
...self::PRESENTATION,
|
||||||
'primary_color' => '#2FD3AC',
|
'primary_color' => '#2FD3AC',
|
||||||
|
'secondary_color' => '#ADADAD',
|
||||||
|
'danger_color' => '#FF8888',
|
||||||
|
'success_color' => '#58B341',
|
||||||
'site_logo' => $this->shopItLogo(),
|
'site_logo' => $this->shopItLogo(),
|
||||||
'footer_logo' => $this->shopItFooterLogo(),
|
'footer_logo' => $this->shopItFooterLogo(),
|
||||||
'favicon' => $this->shopItFavicon(),
|
'favicon' => $this->shopItFavicon(),
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
163
tests/Feature/Address/AddressPresentationTest.php
Normal file
163
tests/Feature/Address/AddressPresentationTest.php
Normal file
@@ -0,0 +1,163 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Address;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Core\Tenant\Resources\TenantResource;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Domains\Ticketing\Event\Resources\EventResource;
|
||||||
|
use App\Domains\Ticketing\Event\Resources\PublicEventResource;
|
||||||
|
use App\Domains\Ticketing\Event\Services\EventAddressService;
|
||||||
|
use App\Domains\Ticketing\Event\Services\PublicEventService;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class AddressPresentationTest extends TestCase
|
||||||
|
{
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
Schema::create('tenants', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('codigo')->unique();
|
||||||
|
});
|
||||||
|
Schema::create('events', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->string('tenant_code')->nullable();
|
||||||
|
$table->string('title')->nullable();
|
||||||
|
$table->string('subtitle')->nullable();
|
||||||
|
$table->timestamp('published_at')->nullable();
|
||||||
|
$table->foreignId('attachment_id')->nullable();
|
||||||
|
$table->string('location')->nullable();
|
||||||
|
$table->json('exact_location')->nullable();
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
(require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php'))->up();
|
||||||
|
(require database_path('migrations/2026_09_30_000200_add_address_id_to_events.php'))->up();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_tenant_response_exposes_all_addresses_main_address_and_a_separate_event_address(): void
|
||||||
|
{
|
||||||
|
DB::table('tenants')->insert(['codigo' => 'acme']);
|
||||||
|
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
|
||||||
|
$tenant->forceFill((new Tenant)->getAttributes());
|
||||||
|
$principal = Address::create(['label' => 'Principal', 'address_text' => 'Sede 123', 'latitude' => 0, 'longitude' => 0]);
|
||||||
|
$secondary = Address::create(['label' => 'Sucursal', 'address_text' => 'Otra calle 456']);
|
||||||
|
$venue = Address::create(['label' => 'Predio', 'address_text' => 'Evento 789', 'latitude' => -32.9431184, 'longitude' => -60.6437991]);
|
||||||
|
$tenant->addresses()->attach($principal->id, ['is_main' => true]);
|
||||||
|
$tenant->addresses()->attach($secondary->id);
|
||||||
|
$tenant->load(['addresses', 'mainAddress']);
|
||||||
|
foreach (['headerLogo', 'footerLogo', 'favicon', 'headerBackgroundImage', 'footerBackgroundImage', 'storefrontWebsiteType'] as $relation) {
|
||||||
|
$tenant->setRelation($relation, null);
|
||||||
|
}
|
||||||
|
$event = $this->presentedEvent($venue, $tenant);
|
||||||
|
$tenant->setRelation('activeEvent', $event);
|
||||||
|
$data = (new TenantResource($tenant))->response()->getData(true)['data'];
|
||||||
|
|
||||||
|
$this->assertCount(2, $data['addresses']);
|
||||||
|
$this->assertTrue($data['addresses'][0]['is_main']);
|
||||||
|
$this->assertFalse($data['addresses'][1]['is_main']);
|
||||||
|
$this->assertSame(0, $data['main_address']['latitude']);
|
||||||
|
$this->assertNull($data['addresses'][1]['latitude']);
|
||||||
|
$this->assertSame($venue->id, $data['event']['address']['id']);
|
||||||
|
$this->assertSame(-32.9431184, $data['event']['address']['latitude']);
|
||||||
|
$this->assertSame('Evento 789', $data['event']['address']['address_text']);
|
||||||
|
$this->assertSame('Anterior', $data['event']['location']);
|
||||||
|
$this->assertArrayNotHasKey('is_main', $data['event']['address']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_public_and_admin_event_responses_use_the_same_canonical_address(): void
|
||||||
|
{
|
||||||
|
$address = Address::create(['label' => 'Predio', 'address_text' => 'Nueva 123', 'latitude' => 0, 'longitude' => -60.6437991]);
|
||||||
|
$event = $this->presentedEvent($address, new Tenant);
|
||||||
|
foreach ([EventResource::class, PublicEventResource::class] as $resource) {
|
||||||
|
$data = (new $resource($event))->response()->getData(true)['data'];
|
||||||
|
$this->assertSame('Nueva 123', $data['address']['address_text']);
|
||||||
|
$this->assertSame(0, $data['address']['latitude']);
|
||||||
|
$this->assertSame(-60.6437991, $data['address']['longitude']);
|
||||||
|
$this->assertSame('Anterior', $data['location']);
|
||||||
|
$this->assertSame(20, $data['exact_location']['longitude']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->setRelation('address', null);
|
||||||
|
$data = (new PublicEventResource($event))->response()->getData(true)['data'];
|
||||||
|
$this->assertNull($data['address']);
|
||||||
|
$this->assertSame('Anterior', $data['location']);
|
||||||
|
$address->update(['latitude' => null, 'longitude' => null]);
|
||||||
|
$event->setRelation('address', $address);
|
||||||
|
$data = (new PublicEventResource($event))->response()->getData(true)['data'];
|
||||||
|
$this->assertNull($data['address']['latitude']);
|
||||||
|
$this->assertSame(20, $data['exact_location']['longitude']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_editing_event_location_preserves_canonical_coordinates_unless_explicitly_changed(): void
|
||||||
|
{
|
||||||
|
$address = Address::create(['label' => 'Predio', 'address_text' => 'Anterior', 'latitude' => 0, 'longitude' => -60]);
|
||||||
|
$event = Event::create(['address_id' => $address->id, 'location' => 'Nueva', 'exact_location' => ['latitude' => 10, 'longitude' => 20]]);
|
||||||
|
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
|
||||||
|
$this->assertSame('Nueva', $address->fresh()->address_text);
|
||||||
|
$this->assertSame('0.0000000', $address->fresh()->latitude);
|
||||||
|
$this->assertDatabaseCount('addresses', 1);
|
||||||
|
|
||||||
|
$event->exact_location = null;
|
||||||
|
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event, true));
|
||||||
|
$this->assertNull($address->fresh()->latitude);
|
||||||
|
$this->assertNull($address->fresh()->longitude);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_editing_a_shared_event_address_does_not_change_tenant_or_other_event_addresses(): void
|
||||||
|
{
|
||||||
|
DB::table('tenants')->insert(['codigo' => 'acme']);
|
||||||
|
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
|
||||||
|
$address = Address::create(['label' => 'Compartida', 'address_text' => 'Original', 'latitude' => -32, 'longitude' => -60]);
|
||||||
|
$tenant->addresses()->attach($address->id, ['is_main' => true]);
|
||||||
|
$event = Event::create(['address_id' => $address->id, 'location' => 'Nueva ubicación']);
|
||||||
|
$other = Event::create(['address_id' => $address->id, 'location' => 'Original']);
|
||||||
|
|
||||||
|
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
|
||||||
|
|
||||||
|
$this->assertSame('Original', $address->fresh()->address_text);
|
||||||
|
$this->assertSame($address->id, $other->fresh()->address_id);
|
||||||
|
$this->assertSame($address->id, $tenant->mainAddress->id);
|
||||||
|
$this->assertNotSame($address->id, $event->fresh()->address_id);
|
||||||
|
$this->assertSame('Nueva ubicación', $event->fresh()->address->address_text);
|
||||||
|
$this->assertSame('-32.0000000', $event->fresh()->address->latitude);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_public_event_search_uses_its_address_and_loads_it_for_the_response(): void
|
||||||
|
{
|
||||||
|
DB::table('tenants')->insert(['codigo' => 'acme']);
|
||||||
|
$tenant = Tenant::where('codigo', 'acme')->firstOrFail();
|
||||||
|
$address = Address::create(['label' => 'Predio', 'address_text' => 'Dirección nueva']);
|
||||||
|
$event = Event::create([
|
||||||
|
'tenant_code' => 'acme', 'title' => 'Festival', 'location' => 'Dirección anterior',
|
||||||
|
'address_id' => $address->id, 'published_at' => now()->subMinute(),
|
||||||
|
]);
|
||||||
|
$service = app(PublicEventService::class);
|
||||||
|
$page = $service->list($tenant, 'nueva', 1);
|
||||||
|
$this->assertSame($event->id, $page->items()[0]->id);
|
||||||
|
$this->assertTrue($page->items()[0]->relationLoaded('address'));
|
||||||
|
$this->assertSame(0, $service->list($tenant, 'anterior', 1)->total());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_editing_an_unlinked_event_creates_its_address(): void
|
||||||
|
{
|
||||||
|
$event = Event::create(['location' => 'Predio 123', 'exact_location' => ['latitude' => -32, 'longitude' => -60]]);
|
||||||
|
DB::transaction(fn () => app(EventAddressService::class)->syncLocation($event));
|
||||||
|
$this->assertSame('Predio 123', $event->fresh()->address->address_text);
|
||||||
|
$this->assertSame('-60.0000000', $event->fresh()->address->longitude);
|
||||||
|
$this->assertDatabaseCount('tenant_addresses', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function presentedEvent(?Address $address, Tenant $tenant): Event
|
||||||
|
{
|
||||||
|
$event = new Event(['location' => 'Anterior', 'exact_location' => ['latitude' => 10, 'longitude' => 20]]);
|
||||||
|
$event->setRelation('address', $address)->setRelation('tenant', $tenant)
|
||||||
|
->setRelation('socialMedia', collect())->setRelation('dates', collect())->setRelation('attachment', null);
|
||||||
|
|
||||||
|
return $event;
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user