feat: enhance address handling with coordinates and integrate into event resources

feat(migration): create addresses and tenant_addresses tables
feat(migration): add data migration for copying contact menu addresses
test: add ContactAddressesTest for address and tenant address functionality

app/Domains/Core/Address/Models/Address.php

@@ -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();
+    }
+}

app/Domains/Core/Address/Models/TenantAddress.php

@@ -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);
+    }
+}

app/Domains/Core/Address/Resources/AddressResource.php

@@ -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,
+        ];
+    }
+}

app/Domains/Core/Bootstrap/Services/TenantBootstrapService.php

@@ -33,10 +33,14 @@ class TenantBootstrapService
             $tenant,
             [
                 'eventDateChanges',
-                'menues' => fn ($query) => $query->whereHas(
-                    'roles',
-                    fn ($query) => $query->where('codigo', RoleCode::User->value)
-                ),
+                'menues' => fn ($query) => $query
+                    ->where(fn ($query) => $query
+                        ->where('menues.code', 'help.contact')
+                        ->orWhere('tenants_menues.is_enabled', true))
+                    ->whereHas(
+                        'roles',
+                        fn ($query) => $query->where('codigo', RoleCode::User->value)
+                    ),
                 $tenant->storefront_website_type_code === 'onticket_multi_event'
                     ? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
             ]

app/Domains/Core/Menu/Models/Menu.php

@@ -76,7 +76,7 @@ class Menu extends Model
             'codigo'
         )
             ->using(TenantMenu::class)
-            ->withPivot('static_content')
+            ->withPivot('static_content', 'is_enabled')
             ->withTimestamps();
     }
 

app/Domains/Core/Menu/Models/TenantMenu.php

@@ -16,12 +16,14 @@ class TenantMenu extends Pivot
         'tenant_code',
         'menu_code',
         'static_content',
+        'is_enabled',
     ];
 
     protected function casts(): array
     {
         return [
             'static_content' => 'array',
+            'is_enabled' => 'boolean',
         ];
     }
 

app/Domains/Core/Tenant/Controllers/AdminApp/BrandController.php

@@ -2,17 +2,30 @@
 
 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 __invoke(Request $request, TenantInformationService $tenantInformationService): BrandResource
+    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()));
+    }
 }

app/Domains/Core/Tenant/Controllers/AdminApp/HelpMenuController.php

@@ -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' => ''];
+    }
+}

app/Domains/Core/Tenant/Models/Tenant.php

@@ -6,6 +6,8 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
 use App\Domains\Commerce\Catalog\Enums\ProductLayout;
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
 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\Client\Models\Client;
 use App\Domains\Core\Menu\Models\Menu;
 use App\Domains\Core\Menu\Models\TenantMenu;
@@ -22,6 +24,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Support\Facades\Schema;
 
 #[Fillable([
@@ -308,6 +311,23 @@ class Tenant extends Model
         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 menues(): BelongsToMany
     {
         return $this->belongsToMany(
@@ -319,7 +339,7 @@ class Tenant extends Model
             'code'
         )
             ->using(TenantMenu::class)
-            ->withPivot('static_content')
+            ->withPivot('static_content', 'is_enabled')
             ->withTimestamps();
     }
 }

app/Domains/Core/Tenant/Requests/AdminApp/UpdateBrandRequest.php

@@ -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],
+        ];
+    }
+}

app/Domains/Core/Tenant/Requests/AdminApp/UpdateHelpMenuContentRequest.php

@@ -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 => [],
+        };
+    }
+}

app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php

@@ -20,7 +20,10 @@ class BrandResource extends JsonResource
             '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(),
         ];
     }
@@ -48,7 +51,7 @@ class BrandResource extends JsonResource
     /** @return array<int, array<string, mixed>> */
     private function bannerImages(): array
     {
-        if ($this->storefront_website_type_code !== 'shopit') {
+        if (! $this->canEditCarousel()) {
             return [];
         }
 
@@ -73,6 +76,7 @@ class BrandResource extends JsonResource
                     ->firstWhere('variant', AttachmentCrop::DESKTOP);
 
                 return [
+                    'key' => $image->key,
                     'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
                     'original_url' => $image->getTemporaryUrl(1440),
                     'crop' => $desktopCrop === null ? null : [
@@ -84,4 +88,17 @@ class BrandResource extends JsonResource
             ->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;
+    }
 }

app/Domains/Core/Tenant/Resources/TenantAddressResource.php

@@ -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];
+    }
+}

app/Domains/Core/Tenant/Resources/TenantResource.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Core\Tenant\Resources;
 
 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\Tenant\Models\StorefrontWebsiteType;
 use App\Domains\Core\Tenant\Models\Tenant;
@@ -41,6 +42,8 @@ class TenantResource extends JsonResource
             'site_title' => $this->site_title ?? 'ShopitFront',
             'asset_url' => config('filesystems.disks.s3.url'),
             '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,
             'favicon' => $this->favicon?->getTemporaryUrl(1440),
             'primary_color' => $this->primary_color,
@@ -127,6 +130,7 @@ class TenantResource extends JsonResource
             'subtitle' => $event->subtitle,
             'description' => $event->description,
             'location' => $event->location,
+            'address' => AddressResource::make($event->address),
             'date_text' => $event->date_text,
             'dates' => $event->dates
                 ->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)

app/Domains/Core/Tenant/Services/BrandService.php

@@ -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];
+    }
+}

app/Domains/Core/Tenant/Services/TenantAddressService.php

@@ -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');
+    }
+}

app/Domains/Core/Tenant/Services/TenantInformationService.php

@@ -18,9 +18,12 @@ class TenantInformationService
         'footerBackgroundImage',
         'storefrontWebsiteType',
         'socialMedia',
+        'addresses',
+        'mainAddress',
         'websiteExtras.websiteTypeExtra',
         'activeEvent.dates',
         'activeEvent.socialMedia',
+        'activeEvent.address',
     ];
 
     /**

app/Domains/Core/Tenant/routes/adminapp.php

@@ -1,13 +1,18 @@
 <?php
 
 use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
+use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
 use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1/adminapp/tenant')
     ->middleware(['auth:sanctum', 'adminapp.tenant'])
     ->group(function (): void {
-        Route::get('brand', BrandController::class);
+        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/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
         Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);

app/Domains/Ticketing/Event/Models/Event.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Ticketing\Event\Models;
 
 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\Tenant;
@@ -15,14 +16,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
-#[Fillable(['client_id', '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
 {
     use HasFactory;
 
     protected function casts(): array
     {
-        return ['client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
+        return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
     }
 
     /** @return BelongsTo<Tenant, $this> */
@@ -37,6 +38,12 @@ class Event extends Model
         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;

app/Domains/Ticketing/Event/Resources/EventResource.php

@@ -2,6 +2,7 @@
 
 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\Services\EventDateGroupingService;
 use Illuminate\Http\Request;
@@ -21,6 +22,7 @@ class EventResource extends JsonResource
             'title' => $this->title,
             'subtitle' => $this->subtitle,
             'description' => $this->description,
+            'address' => AddressResource::make($this->address),
             'location' => $this->location,
             'exact_location' => $this->exact_location,
             'date_text' => $this->date_text,

app/Domains/Ticketing/Event/Resources/PublicEventResource.php

@@ -5,6 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
 use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
 use App\Domains\Commerce\Catalog\Models\CatalogItem;
 use App\Domains\Commerce\Catalog\Models\Variant;
+use App\Domains\Core\Address\Resources\AddressResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,6 +20,7 @@ class PublicEventResource extends JsonResource
             'title' => $this->title,
             'subtitle' => $this->subtitle,
             'description' => $this->description,
+            'address' => AddressResource::make($this->address),
             'location' => $this->location,
             'exact_location' => $this->exact_location,
             'date_text' => $this->date_text,

app/Domains/Ticketing/Event/Services/EventAddressService.php

@@ -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);
+    }
+}

app/Domains/Ticketing/Event/Services/EventService.php

@@ -2,18 +2,18 @@
 
 namespace App\Domains\Ticketing\Event\Services;
 
-use App\Domains\Core\Auth\Models\User;
 use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
 use App\Domains\Commerce\Catalog\Models\Variant;
 use App\Domains\Commerce\Catalog\Services\StockReservationService;
 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\Events\EventDateRescheduled;
 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\EventDateChange;
-use App\Domains\Ticketing\Event\Models\Event;
-use App\Domains\Core\Tenant\Models\Tenant;
 use App\Domains\Ticketing\Ticket\Models\Ticket;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -32,11 +32,12 @@ class EventService
         private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
         private readonly VariantReplacementService $variantReplacementService,
         private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
+        private readonly EventAddressService $eventAddressService,
     ) {}
 
     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 */
@@ -49,6 +50,7 @@ class EventService
                 'location' => $data['location'],
                 ...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
             ]);
+            $this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
             $tenant->update([
                 ...array_intersect_key($data, array_flip([
                     'allow_ticket_refund',
@@ -64,7 +66,7 @@ class EventService
                 $this->syncLegacyContact($event, $data['contact']);
             }
 
-            return $event->load(['dates.validityTime', 'socialMedia']);
+            return $event->load(['dates.validityTime', 'socialMedia', 'address']);
         });
     }
 

app/Domains/Ticketing/Event/Services/PublicEventService.php

@@ -23,11 +23,12 @@ class PublicEventService
             $query->where(function ($query) use ($term): void {
                 $query->where('title', '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
@@ -38,6 +39,7 @@ class PublicEventService
 
         return $event->load([
             'attachment',
+            'address',
             'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
             'socialMedia',
             'catalogItems.attachments',

app/Domains/Ticketing/Event/documentacion/README.md

@@ -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)
 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
 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

app/Http/Middleware/EnsureTenantHasMenu.php

@@ -13,6 +13,9 @@ class EnsureTenantHasMenu
         $tenant = $request->user()?->tenant()->first();
         $hasMenu = $tenant?->menues()
             ->where('menues.code', $menuCode)
+            ->where(fn ($query) => $query
+                ->where('menues.code', 'help.contact')
+                ->orWhere('tenants_menues.is_enabled', true))
             ->exists() ?? false;
 
         abort_unless($hasMenu, 404);

database/migrations/2026_09_29_010000_add_is_enabled_to_tenants_menues_table.php

@@ -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');
+        });
+    }
+};

database/migrations/2026_09_29_020000_make_help_terms_content_static.php

@@ -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,
+            ]);
+    }
+};

database/migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php

@@ -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');
+    }
+};

database/migrations/2026_09_30_000100_copy_contact_menu_addresses.php

@@ -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.
+    }
+};

database/migrations/2026_09_30_000200_add_address_id_to_events.php

@@ -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');
+        });
+    }
+};

database/migrations/2026_09_30_000300_copy_event_locations_to_addresses.php

@@ -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.
+    }
+};

database/seeders/FiestaTradicionArrufoSeeder.php

@@ -14,6 +14,7 @@ use App\Shared\Enums\FieldType;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Storage;
 use RuntimeException;
 
@@ -51,14 +52,19 @@ class FiestaTradicionArrufoSeeder extends Seeder
             ['tenant_code' => $tenant->codigo, 'title' => self::TITLE],
             ['published_at' => now()],
         );
-        $event->update([
-            'client_id' => $client->id,
+        $eventData = [
             '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.'
                 ."\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.',
             '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;
         if ($eventImage === null || ! Storage::disk('s3')->exists($eventImage->path)) {

database/seeders/MenuSeeder.php

@@ -261,7 +261,10 @@ class MenuSeeder extends Seeder
                 'code' => 'help.terms-and-conditions',
                 'label' => 'Términos y condiciones',
                 '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',
             ],
         ];

tests/Feature/Address/AddressPresentationTest.php

@@ -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;
+    }
+}

tests/Feature/Migrations/ContactAddressesTest.php

@@ -0,0 +1,229 @@
+<?php
+
+namespace Tests\Feature\Migrations;
+
+use App\Domains\Core\Address\Models\Address;
+use App\Domains\Core\Address\Models\TenantAddress;
+use App\Domains\Core\Tenant\Models\Tenant;
+use App\Domains\Core\Tenant\Services\TenantAddressService;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Tests\TestCase;
+
+class ContactAddressesTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Schema::create('tenants', function (Blueprint $table): void {
+            $table->id();
+            $table->string('codigo')->unique();
+            $table->string('address')->nullable();
+            $table->timestamps();
+        });
+        Schema::create('tenants_menues', function (Blueprint $table): void {
+            $table->id();
+            $table->string('tenant_code');
+            $table->string('menu_code');
+            $table->json('static_content')->nullable();
+            $table->boolean('is_enabled')->default(true);
+        });
+        DB::table('tenants')->insert([
+            ['codigo' => 'alpha', 'address' => 'Dirección anterior'],
+            ['codigo' => 'beta', 'address' => null],
+            ['codigo' => 'empty', 'address' => null],
+        ]);
+
+        $this->schemaMigration()->up();
+    }
+
+    public function test_it_copies_all_contact_locations_without_changing_legacy_data_and_can_run_again(): void
+    {
+        $sharedAddress = [
+            'label' => 'Sede principal',
+            'address' => 'San Lorenzo 1543, Rosario',
+            'coordinates' => [-32.9431184, -60.6437991],
+        ];
+        $this->contact('alpha', [
+            'rosario' => ['label' => 'Rosario', 'addresses' => [$sharedAddress]],
+            'santa_fe' => ['label' => 'Santa Fe', 'addresses' => [
+                ['label' => 'Sucursal', 'address' => 'San Martín 100', 'coordinates' => [0, 0]],
+                ['label' => 'Sin mapa', 'address' => 'San Martín 200'],
+            ]],
+        ], enabled: false);
+        $this->contact('beta', ['rosario' => ['addresses' => [$sharedAddress]]]);
+        $this->contact('empty', []);
+        DB::table('tenants_menues')->insert([
+            'tenant_code' => 'empty',
+            'menu_code' => 'help.faq',
+            'static_content' => json_encode(['locations' => [['addresses' => [$sharedAddress]]]]),
+        ]);
+        $oldMenus = DB::table('tenants_menues')->orderBy('id')->get()->toArray();
+
+        $migration = $this->dataMigration();
+        $migration->up();
+        $migration->up();
+
+        $this->assertDatabaseCount('addresses', 4);
+        $this->assertDatabaseCount('tenant_addresses', 4);
+        $this->assertDatabaseHas('addresses', [
+            'label' => 'Sede principal',
+            'address_text' => 'San Lorenzo 1543, Rosario',
+            'latitude' => -32.9431184,
+            'longitude' => -60.6437991,
+        ]);
+        $this->assertDatabaseHas('addresses', ['label' => 'Sucursal', 'latitude' => 0, 'longitude' => 0]);
+        $this->assertDatabaseHas('addresses', ['label' => 'Sin mapa', 'latitude' => null, 'longitude' => null]);
+        $this->assertEquals($oldMenus, DB::table('tenants_menues')->orderBy('id')->get()->toArray());
+        $this->assertDatabaseHas('tenants', ['codigo' => 'alpha', 'address' => 'Dirección anterior']);
+
+        $alpha = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
+        $beta = Tenant::query()->where('codigo', 'beta')->firstOrFail();
+        $this->assertCount(3, $alpha->addresses);
+        $this->assertTrue($alpha->addresses->first()->pivot->is_main);
+        $this->assertInstanceOf(TenantAddress::class, $alpha->addresses->first()->pivot);
+        $this->assertSame('Sede principal', $alpha->mainAddress->label);
+        $this->assertSame('-32.9431184', $alpha->mainAddress->latitude);
+        $this->assertNotSame($alpha->mainAddress->id, $beta->mainAddress->id);
+        $this->assertSame('alpha', $alpha->mainAddress->tenants->sole()->codigo);
+        $this->assertNull(Tenant::query()->where('codigo', 'empty')->firstOrFail()->mainAddress);
+        $this->assertSame(2, DB::table('tenant_addresses')->where('is_main', true)->count());
+
+        $migration->down();
+        $this->assertDatabaseCount('addresses', 4);
+        $this->assertEquals($oldMenus, DB::table('tenants_menues')->orderBy('id')->get()->toArray());
+    }
+
+    public function test_a_tenant_can_have_many_secondary_addresses_but_only_one_main(): void
+    {
+        $tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
+        $addresses = $this->addresses(3);
+        $tenant->addresses()->attach($addresses[0], ['is_main' => true]);
+        $tenant->addresses()->attach([$addresses[1], $addresses[2]], ['is_main' => false]);
+        $this->assertCount(3, $tenant->addresses);
+
+        $this->expectException(QueryException::class);
+        $tenant->addresses()->updateExistingPivot($addresses[1], ['is_main' => true]);
+    }
+
+    public function test_it_prevents_duplicate_links(): void
+    {
+        $tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
+        $address = $this->addresses(1)[0];
+        $tenant->addresses()->attach($address);
+
+        $this->expectException(QueryException::class);
+        $tenant->addresses()->attach($address);
+    }
+
+    public function test_main_address_is_specific_to_each_tenant_and_can_be_switched(): void
+    {
+        $alpha = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
+        $beta = Tenant::query()->where('codigo', 'beta')->firstOrFail();
+        $addresses = $this->addresses(2);
+        $alpha->addresses()->attach($addresses[0], ['is_main' => true]);
+        $alpha->addresses()->attach($addresses[1]);
+        $beta->addresses()->attach($addresses[0], ['is_main' => true]);
+        $this->assertSame($addresses[0], $alpha->mainAddress->id);
+
+        app(TenantAddressService::class)->setMainAddress($alpha, Address::findOrFail($addresses[1]));
+
+        $this->assertSame($addresses[1], $alpha->mainAddress->id);
+        $this->assertSame($addresses[0], $beta->mainAddress->id);
+        $this->assertSame(2, DB::table('tenant_addresses')->where('is_main', true)->count());
+        $loaded = Tenant::query()->with('mainAddress')->whereIn('codigo', ['alpha', 'beta'])->get()->keyBy('codigo');
+        $this->assertSame($addresses[1], $loaded['alpha']->mainAddress->id);
+        $this->assertSame($addresses[0], $loaded['beta']->mainAddress->id);
+    }
+
+    public function test_switching_to_an_unlinked_address_preserves_the_previous_main(): void
+    {
+        $tenant = Tenant::query()->where('codigo', 'alpha')->firstOrFail();
+        $addresses = $this->addresses(2);
+        $tenant->addresses()->attach($addresses[0], ['is_main' => true]);
+
+        try {
+            app(TenantAddressService::class)->setMainAddress($tenant, Address::findOrFail($addresses[1]));
+            $this->fail('An unlinked address must be rejected.');
+        } catch (ModelNotFoundException) {
+            $this->assertSame($addresses[0], $tenant->fresh()->mainAddress->id);
+        }
+    }
+
+    public function test_invalid_coordinates_roll_back_all_copies_and_preserve_source_data(): void
+    {
+        $this->contact('alpha', [['addresses' => [
+            ['label' => 'Válida', 'address' => 'Primera 100', 'coordinates' => [-32, -60]],
+            ['label' => 'Inválida', 'address' => 'Segunda 200', 'coordinates' => [-91, -60]],
+        ]]]);
+        $oldContent = DB::table('tenants_menues')->value('static_content');
+
+        try {
+            $this->dataMigration()->up();
+            $this->fail('Invalid latitude must not be silently imported.');
+        } catch (\RuntimeException $exception) {
+            $this->assertStringContainsString('alpha', $exception->getMessage());
+            $this->assertDatabaseCount('addresses', 0);
+            $this->assertDatabaseCount('tenant_addresses', 0);
+            $this->assertSame($oldContent, DB::table('tenants_menues')->value('static_content'));
+        }
+    }
+
+    public function test_deleting_a_tenant_removes_links_but_keeps_shared_addresses(): void
+    {
+        $address = $this->addresses(1)[0];
+        foreach (['alpha', 'beta'] as $code) {
+            Tenant::query()->where('codigo', $code)->firstOrFail()->addresses()->attach($address, ['is_main' => true]);
+        }
+        Tenant::query()->where('codigo', 'alpha')->delete();
+        $this->assertDatabaseCount('tenant_addresses', 1);
+        $this->assertDatabaseCount('addresses', 1);
+
+        Address::findOrFail($address)->delete();
+        $this->assertDatabaseCount('tenant_addresses', 0);
+    }
+
+    public function test_schema_can_be_rolled_back_without_removing_legacy_tables(): void
+    {
+        $this->schemaMigration()->down();
+        $this->assertFalse(Schema::hasTable('addresses'));
+        $this->assertFalse(Schema::hasTable('tenant_addresses'));
+        $this->assertTrue(Schema::hasTable('tenants_menues'));
+        $this->assertTrue(Schema::hasColumn('tenants', 'address'));
+    }
+
+    private function contact(string $code, array $locations, bool $enabled = true): void
+    {
+        DB::table('tenants_menues')->insert([
+            'tenant_code' => $code,
+            'menu_code' => 'help.contact',
+            'static_content' => json_encode(['phone' => '+54 123', 'locations' => $locations], JSON_THROW_ON_ERROR),
+            'is_enabled' => $enabled,
+        ]);
+    }
+
+    private function addresses(int $count): array
+    {
+        $ids = [];
+        for ($i = 0; $i < $count; $i++) {
+            $ids[] = Address::create(['label' => "Sucursal {$i}", 'address_text' => "Calle {$i}"])->id;
+        }
+
+        return $ids;
+    }
+
+    private function schemaMigration(): Migration
+    {
+        return require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php');
+    }
+
+    private function dataMigration(): Migration
+    {
+        return require database_path('migrations/2026_09_30_000100_copy_contact_menu_addresses.php');
+    }
+}

tests/Feature/Migrations/EventAddressesTest.php

@@ -0,0 +1,203 @@
+<?php
+
+namespace Tests\Feature\Migrations;
+
+use App\Domains\Core\Address\Models\Address;
+use App\Domains\Ticketing\Event\Models\Event;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\QueryException;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use PHPUnit\Framework\Attributes\DataProvider;
+use RuntimeException;
+use Tests\TestCase;
+
+class EventAddressesTest 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');
+            $table->string('title');
+            $table->string('location')->nullable();
+            $table->json('exact_location')->nullable();
+            $table->timestamps();
+        });
+        $addresses = require database_path('migrations/2026_09_30_000000_create_addresses_and_tenant_addresses_tables.php');
+        $addresses->up();
+        $this->schemaMigration()->up();
+    }
+
+    public function test_it_copies_event_locations_and_coordinates_and_preserves_legacy_data(): void
+    {
+        $precise = $this->event('Predio de Doma', ['latitude' => -32.9431184, 'longitude' => -60.6437991]);
+        $noMap = $this->event('Salón Luz y Fuerza');
+        $zero = $this->event('Punto cero', ['latitude' => 0, 'longitude' => 0]);
+        $missing = $this->event(null);
+        $blank = $this->event('   ');
+        $before = DB::table('events')->orderBy('id')->get()->map(fn (object $event): array => [
+            'id' => $event->id,
+            'tenant_code' => $event->tenant_code,
+            'title' => $event->title,
+            'location' => $event->location,
+            'exact_location' => $event->exact_location,
+            'created_at' => $event->created_at,
+            'updated_at' => $event->updated_at,
+        ])->all();
+
+        $migration = $this->dataMigration();
+        $migration->up();
+        $migration->up();
+
+        $this->assertDatabaseCount('addresses', 3);
+        $this->assertDatabaseCount('tenant_addresses', 0);
+        $event = Event::findOrFail($precise);
+        $this->assertSame('Ubicación del evento', $event->address->label);
+        $this->assertSame('Predio de Doma', $event->address->address_text);
+        $this->assertSame('-32.9431184', $event->address->latitude);
+        $this->assertSame('-60.6437991', $event->address->longitude);
+        $this->assertNull(Event::findOrFail($noMap)->address->latitude);
+        $this->assertNull(Event::findOrFail($noMap)->address->longitude);
+        $this->assertSame('0.0000000', Event::findOrFail($zero)->address->latitude);
+        $this->assertSame('0.0000000', Event::findOrFail($zero)->address->longitude);
+        $this->assertNull(Event::findOrFail($missing)->address);
+        $this->assertNull(Event::findOrFail($blank)->address_id);
+        foreach ($before as $original) {
+            $this->assertDatabaseHas('events', $original);
+        }
+
+        $migration->down();
+        $this->assertDatabaseCount('addresses', 3);
+        $this->assertSame($event->address_id, Event::findOrFail($precise)->address_id);
+    }
+
+    public function test_it_keeps_existing_links_and_creates_independent_copies_for_unlinked_events(): void
+    {
+        $original = Address::create(['label' => 'Existente', 'address_text' => 'Lugar elegido']);
+        $linked = $this->event('Texto anterior');
+        DB::table('events')->where('id', $linked)->update(['address_id' => $original->id]);
+        $first = $this->event('Mismo predio');
+        $second = $this->event('Mismo predio');
+
+        $this->dataMigration()->up();
+
+        $this->assertDatabaseCount('addresses', 3);
+        $this->assertSame($original->id, Event::findOrFail($linked)->address_id);
+        $this->assertNotSame(Event::findOrFail($first)->address_id, Event::findOrFail($second)->address_id);
+        $this->assertSame('Lugar elegido', $original->fresh()->address_text);
+    }
+
+    public function test_multiple_events_can_share_one_address_through_the_model_relations(): void
+    {
+        $address = Address::create(['label' => 'Teatro', 'address_text' => 'San Martín 123']);
+        $first = Event::findOrFail($this->event('Texto original'));
+        $first->address()->associate($address);
+        $first->save();
+        $second = Event::findOrFail($this->event('Otro evento'));
+        $second->fill(['address_id' => (string) $address->id])->save();
+
+        $this->assertSame($address->id, $first->fresh()->address->id);
+        $this->assertSame($address->id, $second->fresh()->address_id);
+        $this->assertSame([$first->id, $second->id], $address->events()->orderBy('id')->pluck('id')->all());
+        $loaded = Event::with('address')->orderBy('id')->get();
+        $this->assertSame($address->id, $loaded->last()->address->id);
+
+        $first->delete();
+        $this->assertDatabaseCount('addresses', 1);
+        $address->delete();
+        $this->assertDatabaseHas('events', ['id' => $second->id, 'address_id' => null, 'location' => 'Otro evento']);
+    }
+
+    public function test_the_foreign_key_rejects_an_unknown_address(): void
+    {
+        $event = Event::findOrFail($this->event('Predio'));
+
+        $this->expectException(QueryException::class);
+        $event->update(['address_id' => 9999]);
+    }
+
+    #[DataProvider('invalidCoordinates')]
+    public function test_invalid_coordinates_roll_back_all_copies(string $coordinates): void
+    {
+        $valid = $this->event('Primero', ['latitude' => -32, 'longitude' => -60]);
+        $invalid = $this->event('Segundo');
+        DB::table('events')->where('id', $invalid)->update(['exact_location' => $coordinates]);
+
+        try {
+            $this->dataMigration()->up();
+            $this->fail('Invalid coordinates must stop the migration.');
+        } catch (\JsonException|RuntimeException) {
+            $this->assertDatabaseCount('addresses', 0);
+            $this->assertNull(Event::findOrFail($valid)->address_id);
+            $this->assertNull(Event::findOrFail($invalid)->address_id);
+            $this->assertSame($coordinates, DB::table('events')->where('id', $invalid)->value('exact_location'));
+        }
+    }
+
+    public static function invalidCoordinates(): array
+    {
+        return [
+            'latitude out of range' => ['{"latitude":-91,"longitude":-60}'],
+            'longitude out of range' => ['{"latitude":-32,"longitude":181}'],
+            'missing longitude' => ['{"latitude":-32}'],
+            'nonnumeric latitude' => ['{"latitude":"unknown","longitude":-60}'],
+            'invalid JSON' => ['not-json'],
+        ];
+    }
+
+    public function test_coordinates_without_address_text_stop_the_copy_instead_of_losing_data(): void
+    {
+        $id = $this->event(null, ['latitude' => -32, 'longitude' => -60]);
+
+        try {
+            $this->dataMigration()->up();
+            $this->fail('Coordinates without address text require correction.');
+        } catch (RuntimeException $exception) {
+            $this->assertStringContainsString("Missing address text for event {$id}", $exception->getMessage());
+            $this->assertDatabaseCount('addresses', 0);
+            $this->assertNull(Event::findOrFail($id)->address_id);
+        }
+    }
+
+    public function test_schema_rollback_preserves_events_legacy_fields_and_copied_addresses(): void
+    {
+        $id = $this->event('Predio', ['latitude' => -32, 'longitude' => -60]);
+        $this->dataMigration()->up();
+        $this->schemaMigration()->down();
+
+        $this->assertFalse(Schema::hasColumn('events', 'address_id'));
+        $this->assertDatabaseHas('events', ['id' => $id, 'location' => 'Predio']);
+        $this->assertDatabaseCount('addresses', 1);
+        $this->assertTrue(Schema::hasColumn('events', 'exact_location'));
+    }
+
+    private function event(?string $location, ?array $coordinates = null): int
+    {
+        return DB::table('events')->insertGetId([
+            'tenant_code' => 'alpha',
+            'title' => 'Evento',
+            'location' => $location,
+            'exact_location' => $coordinates === null ? null : json_encode($coordinates, JSON_THROW_ON_ERROR),
+            'created_at' => '2026-09-01 12:00:00',
+            'updated_at' => '2026-09-02 12:00:00',
+        ]);
+    }
+
+    private function schemaMigration(): Migration
+    {
+        return require database_path('migrations/2026_09_30_000200_add_address_id_to_events.php');
+    }
+
+    private function dataMigration(): Migration
+    {
+        return require database_path('migrations/2026_09_30_000300_copy_event_locations_to_addresses.php');
+    }
+}

tests/Feature/Tenant/AdminAppBrandControllerTest.php

@@ -11,6 +11,7 @@ use App\Shared\Attachable\Models\Attachment;
 use App\Shared\Attachable\Models\AttachmentCrop;
 use Database\Seeders\AuthorizationSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use Laravel\Sanctum\Sanctum;
 use Tests\TestCase;
@@ -80,8 +81,10 @@ class AdminAppBrandControllerTest extends TestCase
 
         foreach (['header_logo' => $header, 'footer_logo' => $footer] as $field => $image) {
             $this->assertStringContainsString($image->path, $response->json("data.{$field}"));
+            $response->assertJsonPath("data.{$field}_key", $image->key);
         }
         foreach ([$first, $second] as $index => $image) {
+            $response->assertJsonPath("data.banner_images.{$index}.key", $image->key);
             $this->assertStringContainsString(
                 $image->path,
                 $response->json("data.banner_images.{$index}.original_url")
@@ -94,6 +97,63 @@ class AdminAppBrandControllerTest extends TestCase
         $this->assertStringNotContainsString('other.png', $response->getContent());
     }
 
+    public function test_update_keeps_original_carousel_attachment_and_returns_its_crop(): void
+    {
+        $websiteType = $this->websiteType('shopit');
+        $carousel = $websiteType->extras()->create([
+            'codigo' => 'carousel', 'nombre' => 'Carrusel', 'is_required' => false,
+            'config_schema' => ['request_rules' => [], 'transforms' => [
+                '$.*' => ['handler' => 'attachment', 'attachment_type' => 'image'],
+            ]],
+        ]);
+        $tenant = $this->tenant('acme', $websiteType, [
+            'primary_color' => '#112233', 'footer_bg_color' => '#112233',
+        ]);
+        Sanctum::actingAs($this->admin($tenant));
+        $file = UploadedFile::fake()->image('banner.png', 400, 100);
+        $dataUrl = 'data:image/png;base64,'.base64_encode(file_get_contents($file->getRealPath()));
+
+        $response = $this->putJson('/api/v1/adminapp/tenant/brand', [
+            'nombre' => 'Acme Nueva', 'primary_color' => '#abcdef',
+            'footer_bg_color' => '#abcdef', 'header_logo' => null, 'footer_logo' => null,
+            'banner_images' => [[
+                'image' => $dataUrl,
+                'crop_horizontal' => ['start_percentage' => 10, 'end_percentage' => 90],
+                'crop_vertical' => ['start_percentage' => 0, 'end_percentage' => 100],
+            ]],
+        ])->assertOk()
+            ->assertJsonPath('data.nombre', 'Acme Nueva')
+            ->assertJsonPath('data.footer_color', 'primary')
+            ->assertJsonPath('data.banner_images.0.crop.crop_horizontal.start_percentage', 10);
+
+        $original = Attachment::query()->where('key', $response->json('data.banner_images.0.key'))->firstOrFail();
+        $this->assertSame([$original->id], $tenant->websiteExtras()
+            ->where('website_type_extra_id', $carousel->id)->firstOrFail()->config);
+        $this->assertStringContainsString($original->path, $response->json('data.banner_images.0.original_url'));
+        $this->assertNotSame($response->json('data.banner_images.0.original_url'),
+            $response->json('data.banner_images.0.url'));
+
+        $updated = $this->putJson('/api/v1/adminapp/tenant/brand', [
+            'nombre' => 'Acme Nueva', 'primary_color' => '#abcdef',
+            'footer_bg_color' => '#abcdef', 'header_logo' => null, 'footer_logo' => null,
+            'banner_images' => [[
+                'image' => $original->key,
+                'crop_horizontal' => ['start_percentage' => 20, 'end_percentage' => 80],
+                'crop_vertical' => ['start_percentage' => 0, 'end_percentage' => 100],
+            ]],
+        ])->assertOk()
+            ->assertJsonPath('data.banner_images.0.key', $original->key)
+            ->assertJsonPath('data.banner_images.0.crop.crop_horizontal.start_percentage', 20);
+        $this->assertSame([$original->id], $tenant->websiteExtras()
+            ->where('website_type_extra_id', $carousel->id)->firstOrFail()->config);
+        $this->assertNotSame($response->json('data.banner_images.0.url'),
+            $updated->json('data.banner_images.0.url'));
+
+        $this->assertSame('#abcdef', $tenant->refresh()->footer_bg_color);
+        $tenant->update(['primary_color' => '#123456']);
+        $this->assertSame('#abcdef', $tenant->refresh()->footer_bg_color);
+    }
+
     public function test_footer_color_is_mapped_to_a_supported_option(): void
     {
         $websiteType = $this->websiteType('shopit');

tests/Feature/Tenant/AdminAppHelpMenuControllerTest.php

@@ -0,0 +1,176 @@
+<?php
+
+namespace Tests\Feature\Tenant;
+
+use App\Domains\Core\Auth\Models\User;
+use App\Domains\Core\Authorization\Enums\RoleCode;
+use App\Domains\Core\Menu\Models\Menu;
+use App\Domains\Core\Tenant\Models\Tenant;
+use Database\Seeders\AuthorizationSeeder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class AdminAppHelpMenuControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->seed(AuthorizationSeeder::class);
+    }
+
+    public function test_authentication_is_required(): void
+    {
+        $this->getJson('/api/v1/adminapp/tenant/help-menus')
+            ->assertUnauthorized();
+    }
+
+    public function test_adminapp_user_can_read_help_menu_states(): void
+    {
+        [$tenant] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $response = $this->getJson('/api/v1/adminapp/tenant/help-menus')
+            ->assertOk();
+
+        $states = $response->json('data');
+        $this->assertFalse($states['help.faq']['is_enabled']);
+        $this->assertTrue($states['help.terms-and-conditions']['is_enabled']);
+        $this->assertSame('¿Cómo compro?', $states['help.faq']['static_content'][0]['pregunta']);
+        $this->assertSame(['html' => ''], $states['help.terms-and-conditions']['static_content']);
+        $this->assertArrayNotHasKey('help.contact', $states);
+    }
+
+    public function test_toggling_a_help_menu_preserves_its_static_content(): void
+    {
+        [$tenant, $faq, $content] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $this->patchJson('/api/v1/adminapp/tenant/help-menus/help.faq/toggle')
+            ->assertOk()
+            ->assertJsonPath('data.code', 'help.faq')
+            ->assertJsonPath('data.is_enabled', true);
+
+        $pivot = $tenant->menues()->where('menues.code', $faq->code)->firstOrFail()->pivot;
+
+        $this->assertTrue($pivot->is_enabled);
+        $this->assertSame($content, $pivot->static_content);
+    }
+
+    public function test_an_unrelated_menu_cannot_be_toggled_from_the_help_endpoint(): void
+    {
+        [$tenant] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $this->patchJson('/api/v1/adminapp/tenant/help-menus/catalog/toggle')
+            ->assertNotFound();
+    }
+
+    public function test_contact_menu_cannot_be_toggled(): void
+    {
+        [$tenant] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $this->patchJson('/api/v1/adminapp/tenant/help-menus/help.contact/toggle')
+            ->assertNotFound();
+
+        $this->assertTrue(
+            $tenant->menues()->where('menues.code', 'help.contact')->firstOrFail()->pivot->is_enabled
+        );
+    }
+
+    public function test_adminapp_user_can_update_faq_content_without_changing_its_state(): void
+    {
+        [$tenant] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+        $content = [[
+            'pregunta' => '¿Cuál es el horario?',
+            'respuesta' => 'De lunes a viernes.',
+            'is_active' => true,
+        ]];
+
+        $this->putJson('/api/v1/adminapp/tenant/help-menus/help.faq/content', [
+            'static_content' => $content,
+        ])
+            ->assertOk()
+            ->assertJsonPath('data.is_enabled', false)
+            ->assertJsonPath('data.static_content.0.pregunta', '¿Cuál es el horario?');
+
+        $pivot = $tenant->menues()->where('menues.code', 'help.faq')->firstOrFail()->pivot;
+        $this->assertFalse($pivot->is_enabled);
+        $this->assertSame($content, $pivot->static_content);
+    }
+
+    public function test_adminapp_user_can_update_terms_content(): void
+    {
+        [$tenant] = $this->tenantWithHelpMenus();
+        Sanctum::actingAs($this->createAdminAppUser($tenant));
+
+        $this->putJson('/api/v1/adminapp/tenant/help-menus/help.terms-and-conditions/content', [
+            'static_content' => ['html' => '<p>Nuevos términos</p>'],
+        ])
+            ->assertOk()
+            ->assertJsonPath('data.static_content.html', '<p>Nuevos términos</p>');
+
+        $this->assertSame(
+            ['html' => '<p>Nuevos términos</p>'],
+            $tenant->menues()
+                ->where('menues.code', 'help.terms-and-conditions')
+                ->firstOrFail()
+                ->pivot
+                ->static_content
+        );
+    }
+
+    /** @return array{Tenant, Menu, array<int, array<string, mixed>>} */
+    private function tenantWithHelpMenus(): array
+    {
+        $tenant = Tenant::query()->create([
+            'codigo' => 'acme',
+            'nombre' => 'Acme',
+            'dominio' => 'acme.test',
+        ]);
+        $content = [[
+            'pregunta' => '¿Cómo compro?',
+            'respuesta' => 'Desde el catálogo.',
+            'is_active' => true,
+        ]];
+        $faq = Menu::query()->create([
+            'code' => 'help.faq',
+            'label' => 'Preguntas frecuentes',
+            'content_type' => Menu::CONTENT_TYPE_STATIC,
+            'static_content_schema' => ['*.pregunta' => 'required|string'],
+            'route' => '/ayuda/preguntas-frecuentes',
+        ]);
+        $contact = Menu::query()->create([
+            'code' => 'help.contact',
+            'label' => 'Contacto',
+            'route' => '/ayuda/contacto',
+        ]);
+        $terms = Menu::query()->create([
+            'code' => 'help.terms-and-conditions',
+            'label' => 'Términos y condiciones',
+            'route' => '/ayuda/terminos-y-condiciones',
+        ]);
+
+        $tenant->menues()->attach($faq->code, [
+            'static_content' => $content,
+            'is_enabled' => false,
+        ]);
+        $tenant->menues()->attach($contact->code, ['is_enabled' => true]);
+        $tenant->menues()->attach($terms->code, ['is_enabled' => true]);
+
+        return [$tenant, $faq, $content];
+    }
+
+    private function createAdminAppUser(Tenant $tenant): User
+    {
+        return User::factory()->create([
+            'rol_codigo' => RoleCode::AdminApp->value,
+            'tenant_codigo' => $tenant->codigo,
+        ]);
+    }
+}