Compare commits
120 Commits
14c81fec1b
...
feature/sh
| Author | SHA1 | Date | |
|---|---|---|---|
| 35fd1277cb | |||
| 1986961942 | |||
| 3f76af8ec8 | |||
| 0ca2bc8d1b | |||
| c40f145b60 | |||
| 0693e52321 | |||
| cfa7acabe0 | |||
| 1633c30a22 | |||
| 7279f9c6e8 | |||
| 878382e867 | |||
| f47212fd2c | |||
| 3472fb2e5b | |||
| cb3da583be | |||
| 53acfda166 | |||
| 85c79514a3 | |||
| 1aaf05c3b0 | |||
| f7d66001a8 | |||
| 1d58e0ad38 | |||
| 856b9a6706 | |||
| e7bece5bfd | |||
| e2cf53eacc | |||
| c7fc867905 | |||
| 3ddff7e0ee | |||
| 22de61c8c0 | |||
| 2d11263adc | |||
| c975b5d51d | |||
| c7afb70196 | |||
| 31955f862d | |||
| bb4495c6cc | |||
| f3e226130f | |||
| 77dd0e2715 | |||
| 917f2dff09 | |||
| 6588d9f1a8 | |||
| 5d5ee7d2a5 | |||
| df19655144 | |||
| 6e1f0d731c | |||
| 0303803f75 | |||
| 94db48467e | |||
| 793e7be756 | |||
| 3b6d6bf28b | |||
| a9d9854e5e | |||
| 4bdd3effcc | |||
| 794acc4814 | |||
| d42896e956 | |||
| 0fe38df019 | |||
| fb5221854c | |||
| a4bd9263a2 | |||
| 85cd1ad04f | |||
| c5aeb19735 | |||
| 9db955bdcf | |||
| e988e55b77 | |||
| bc60f1caa1 | |||
| 068d5d7f4f | |||
| 82c18e9e91 | |||
| dfad6fb4b0 | |||
| 3f9b773367 | |||
| 7996d53e12 | |||
| 370834856b | |||
| ad054127aa | |||
| a05d15d17f | |||
| 717f02ce16 | |||
| 863e911120 | |||
| 6c56b338c1 | |||
| a40a2065a9 | |||
| 57677f55e6 | |||
| a8afd92f46 | |||
| 1df0d2e2ef | |||
| d3cac7a590 | |||
| df13a636ba | |||
| d85841742e | |||
| 0e3fdc5460 | |||
| 0dc2675dae | |||
| 28d1de072c | |||
| b09e8a4b96 | |||
| 7f754037bb | |||
| f29c5692b9 | |||
| 57d278336d | |||
| b309738222 | |||
| b3eb59983a | |||
| cf3f0ceb1b | |||
| 41c0902b83 | |||
| a2439bf43b | |||
| 8d5a12f212 | |||
| 92170b72f2 | |||
| c3def0678f | |||
| 74b72a7d4e | |||
| 16e2ca679c | |||
| 6b0efbc6ee | |||
| 2db83271fa | |||
| e259bba1d1 | |||
| b3cd9f5de5 | |||
| 64820fe12b | |||
| e72b6cfdde | |||
| 0e870776c4 | |||
| d8d8354070 | |||
| 5bb61fc74c | |||
| 9e9af70ba8 | |||
| 884da2c89a | |||
| 3671b95a83 | |||
| 5e78f2bb1e | |||
| 5296d595f1 | |||
| 9901d449e1 | |||
| 57605a56c4 | |||
| d9f19b42f1 | |||
| 90b2784859 | |||
| 6f191b27f9 | |||
| 3401c934b2 | |||
| 6efe8439c7 | |||
| 506f8a5176 | |||
| 03bb7709c4 | |||
| c90a393081 | |||
| a4a8a3ef8f | |||
| f5f4cb4e87 | |||
| d33b435ba5 | |||
| 969e99b3ae | |||
| 3e3b3bfac0 | |||
| f4de2ff5b2 | |||
| fcb8386735 | |||
| 6d077647ba | |||
| bd77727f58 |
@@ -2470,45 +2470,6 @@
|
|||||||
},
|
},
|
||||||
"response": []
|
"response": []
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Create Tenant",
|
|
||||||
"request": {
|
|
||||||
"method": "POST",
|
|
||||||
"header": [
|
|
||||||
{
|
|
||||||
"key": "Accept",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "Content-Type",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Ruta Laravel: `POST /api/tenants`\n\nControlador: `App\\Domains\\Tenant\\Controllers\\TenantController@store`",
|
|
||||||
"url": {
|
|
||||||
"raw": "{{base_url}}/api/tenants",
|
|
||||||
"host": [
|
|
||||||
"{{base_url}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"api",
|
|
||||||
"tenants"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"body": {
|
|
||||||
"mode": "raw",
|
|
||||||
"raw": "{\n \"client_id\": {{client_id}},\n \"codigo\": \"{{tenant_code}}\",\n \"nombre\": \"Tenant Demo\",\n \"dominio\": \"{{tenant_domain}}\",\n \"site_title\": \"ShopIt Demo\",\n \"primary_color\": \"#111827\",\n \"secondary_color\": \"#2563EB\",\n \"danger_color\": \"#DC2626\",\n \"success_color\": \"#16A34A\",\n \"header_bg_color\": \"#FFFFFF\",\n \"footer_bg_color\": \"#111827\",\n \"header_logo\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==\",\n \"footer_logo\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==\",\n \"search_product_layout\": \"column_with_image\",\n \"search_group_layout\": \"paginated\",\n \"search_items_per_page\": 12,\n \"display_categories\": true,\n \"display_seach_bar\": true,\n \"display_cart\": true,\n \"cart_editing_policy\": \"full\",\n \"admin_website_type_code\": \"shopit\",\n \"storefront_website_type_code\": \"shopit\"\n}",
|
|
||||||
"options": {
|
|
||||||
"raw": {
|
|
||||||
"language": "json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Get Tenant",
|
"name": "Get Tenant",
|
||||||
"request": {
|
"request": {
|
||||||
@@ -2535,86 +2496,6 @@
|
|||||||
},
|
},
|
||||||
"response": []
|
"response": []
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Update Tenant (PUT)",
|
|
||||||
"request": {
|
|
||||||
"method": "PUT",
|
|
||||||
"header": [
|
|
||||||
{
|
|
||||||
"key": "Accept",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "Content-Type",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Ruta Laravel: `PUT /api/tenants/{tenant}`\n\nControlador: `App\\Domains\\Tenant\\Controllers\\TenantController@update`",
|
|
||||||
"url": {
|
|
||||||
"raw": "{{base_url}}/api/tenants/{{tenant_id}}",
|
|
||||||
"host": [
|
|
||||||
"{{base_url}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"api",
|
|
||||||
"tenants",
|
|
||||||
"{{tenant_id}}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"body": {
|
|
||||||
"mode": "raw",
|
|
||||||
"raw": "{\n \"nombre\": \"Tenant Demo Actualizado\",\n \"site_title\": \"ShopIt Demo\",\n \"primary_color\": \"#111827\",\n \"cart_editing_policy\": \"full\"\n}",
|
|
||||||
"options": {
|
|
||||||
"raw": {
|
|
||||||
"language": "json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Update Tenant (PATCH)",
|
|
||||||
"request": {
|
|
||||||
"method": "PATCH",
|
|
||||||
"header": [
|
|
||||||
{
|
|
||||||
"key": "Accept",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "Content-Type",
|
|
||||||
"value": "application/json",
|
|
||||||
"type": "text"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "Ruta Laravel: `PATCH /api/tenants/{tenant}`\n\nControlador: `App\\Domains\\Tenant\\Controllers\\TenantController@update`",
|
|
||||||
"url": {
|
|
||||||
"raw": "{{base_url}}/api/tenants/{{tenant_id}}",
|
|
||||||
"host": [
|
|
||||||
"{{base_url}}"
|
|
||||||
],
|
|
||||||
"path": [
|
|
||||||
"api",
|
|
||||||
"tenants",
|
|
||||||
"{{tenant_id}}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"body": {
|
|
||||||
"mode": "raw",
|
|
||||||
"raw": "{\n \"nombre\": \"Tenant Demo Actualizado\",\n \"site_title\": \"ShopIt Demo\",\n \"primary_color\": \"#111827\",\n \"cart_editing_policy\": \"full\"\n}",
|
|
||||||
"options": {
|
|
||||||
"raw": {
|
|
||||||
"language": "json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"response": []
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Delete Tenant",
|
"name": "Delete Tenant",
|
||||||
"request": {
|
"request": {
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Enums;
|
||||||
|
|
||||||
|
enum InventoryMovementOperation: string
|
||||||
|
{
|
||||||
|
case StockInitialized = 'stock_initialized';
|
||||||
|
case StockIncreased = 'stock_increased';
|
||||||
|
case StockDecreased = 'stock_decreased';
|
||||||
|
case StockReserved = 'stock_reserved';
|
||||||
|
case StockReleased = 'stock_released';
|
||||||
|
case PurchaseCommitted = 'purchase_committed';
|
||||||
|
case StockRefunded = 'stock_refunded';
|
||||||
|
case EntryStockReserved = 'entry_stock_reserved';
|
||||||
|
case EntryStockReleased = 'entry_stock_released';
|
||||||
|
case InventoryReset = 'inventory_reset';
|
||||||
|
case InventoryTransferred = 'inventory_transferred';
|
||||||
|
}
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Enums\InventorySubject;
|
use App\Domains\Commerce\Catalog\Enums\InventorySubject;
|
||||||
@@ -10,6 +9,7 @@ use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
|
|||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -19,6 +19,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
|||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
'tenant_code',
|
'tenant_code',
|
||||||
@@ -213,10 +214,14 @@ class CatalogItem extends Model
|
|||||||
/** @param Builder<CatalogItem> $query */
|
/** @param Builder<CatalogItem> $query */
|
||||||
public function scopeWhereAvailable(Builder $query): Builder
|
public function scopeWhereAvailable(Builder $query): Builder
|
||||||
{
|
{
|
||||||
|
$availableInventory = static fn (Builder $inventoryQuery): Builder => Schema::hasColumn('inventories', 'available_stock')
|
||||||
|
? $inventoryQuery->where('inventories.available_stock', '>', 0)
|
||||||
|
: $inventoryQuery->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock');
|
||||||
|
|
||||||
return $query->where(function (Builder $query): void {
|
return $query->where(function (Builder $query): void {
|
||||||
$query->whereNull('catalog_items.sales_end_at')
|
$query->whereNull('catalog_items.sales_end_at')
|
||||||
->orWhere('catalog_items.sales_end_at', '>', now());
|
->orWhere('catalog_items.sales_end_at', '>', now());
|
||||||
})->where(function (Builder $query): void {
|
})->where(function (Builder $query) use ($availableInventory): void {
|
||||||
$query
|
$query
|
||||||
->where(function (Builder $unlimitedQuery): void {
|
->where(function (Builder $unlimitedQuery): void {
|
||||||
$unlimitedQuery
|
$unlimitedQuery
|
||||||
@@ -236,20 +241,18 @@ class CatalogItem extends Model
|
|||||||
->whereNull('replaced_by_variant_id')
|
->whereNull('replaced_by_variant_id')
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
fn (Builder $inventoryQuery): Builder => $inventoryQuery
|
$availableInventory
|
||||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->orWhere(function (Builder $directItemQuery): void {
|
->orWhere(function (Builder $directItemQuery) use ($availableInventory): void {
|
||||||
$directItemQuery
|
$directItemQuery
|
||||||
->whereDoesntHave('variants')
|
->whereDoesntHave('variants')
|
||||||
->where(function (Builder $inventoryQuery): void {
|
->where(function (Builder $inventoryQuery) use ($availableInventory): void {
|
||||||
$inventoryQuery
|
$inventoryQuery
|
||||||
->whereNull('catalog_items.inventory_id')
|
->whereNull('catalog_items.inventory_id')
|
||||||
->orWhereHas(
|
->orWhereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
|
$availableInventory
|
||||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -264,9 +267,15 @@ class CatalogItem extends Model
|
|||||||
/** @return Collection<int, Variant> */
|
/** @return Collection<int, Variant> */
|
||||||
public function visibleVariants(?int $includedVariantId = null): Collection
|
public function visibleVariants(?int $includedVariantId = null): Collection
|
||||||
{
|
{
|
||||||
|
$this->variants
|
||||||
|
->filter(fn (Variant $variant): bool => $variant->exists)
|
||||||
|
->loadMissing('desfileEntryReservations');
|
||||||
|
|
||||||
return $this->variants
|
return $this->variants
|
||||||
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
|
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
|
||||||
->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
|
->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
|
||||||
|
&& (! $variant->relationLoaded('desfileEntryReservations')
|
||||||
|
|| $variant->desfileEntryReservations->isEmpty())
|
||||||
&& (($includedVariantId !== null && $variant->id === $includedVariantId)
|
&& (($includedVariantId !== null && $variant->id === $includedVariantId)
|
||||||
|| ($variant->isSellable() && (
|
|| ($variant->isSellable() && (
|
||||||
$this->inventory_policy === InventoryPolicy::Unlimited
|
$this->inventory_policy === InventoryPolicy::Unlimited
|
||||||
|
|||||||
@@ -2,16 +2,23 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
'sold_units',
|
'sold_units',
|
||||||
'refunded_units',
|
'refunded_units',
|
||||||
'reserved_stock',
|
'reserved_stock',
|
||||||
|
'entry_reserved_stock',
|
||||||
'real_stock',
|
'real_stock',
|
||||||
])]
|
])]
|
||||||
class Inventory extends Model
|
class Inventory extends Model
|
||||||
@@ -35,7 +42,9 @@ class Inventory extends Model
|
|||||||
'sold_units' => 'integer',
|
'sold_units' => 'integer',
|
||||||
'refunded_units' => 'integer',
|
'refunded_units' => 'integer',
|
||||||
'reserved_stock' => 'integer',
|
'reserved_stock' => 'integer',
|
||||||
|
'entry_reserved_stock' => 'integer',
|
||||||
'real_stock' => 'integer',
|
'real_stock' => 'integer',
|
||||||
|
'available_stock' => 'integer',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,51 +66,295 @@ class Inventory extends Model
|
|||||||
return $this->hasMany(StockReservationLine::class);
|
return $this->hasMany(StockReservationLine::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<InventoryMovement, $this> */
|
||||||
|
public function movements(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(InventoryMovement::class);
|
||||||
|
}
|
||||||
|
|
||||||
public function availableStock(): int
|
public function availableStock(): int
|
||||||
{
|
{
|
||||||
return max(0, $this->real_stock - $this->reserved_stock);
|
if (! array_key_exists('available_stock', $this->attributes)) {
|
||||||
|
return max(0, $this->real_stock - $this->reserved_stock - ($this->entry_reserved_stock ?? 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) $this->getAttribute('available_stock');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reserveEntry(int $amount, bool $tracksInventory): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::EntryStockReserved,
|
||||||
|
['entry_reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
|
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function releaseEntry(int $amount): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::EntryStockReleased,
|
||||||
|
['entry_reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
|
if ($amount < 1 || $inventory->entry_reserved_stock < $amount) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reserve(int $amount, bool $tracksInventory): void
|
public function reserve(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 0) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
InventoryMovementOperation::StockReserved,
|
||||||
}
|
['reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
if ($tracksInventory && $this->availableStock() < $amount) {
|
if ($amount < 0) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
||||||
}
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < $amount) {
|
||||||
$this->reserved_stock += $amount;
|
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
||||||
$this->save();
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function release(int $amount): void
|
public function release(int $amount): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
InventoryMovementOperation::StockReleased,
|
||||||
}
|
['reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
$this->reserved_stock -= $amount;
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
$this->save();
|
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buy(int $amount, bool $tracksInventory): void
|
public function buy(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount];
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) {
|
||||||
|
$counterDeltas['real_stock'] = -$amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tracksInventory && $this->real_stock < $amount) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
||||||
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < 0) {
|
||||||
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function adjustAvailableStock(
|
||||||
|
int $delta,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
if ($delta === 0) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tracksInventory) {
|
$operation = $delta > 0
|
||||||
$this->real_stock -= $amount;
|
? InventoryMovementOperation::StockIncreased
|
||||||
|
: InventoryMovementOperation::StockDecreased;
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
$operation,
|
||||||
|
['real_stock' => $delta],
|
||||||
|
function (self $inventory) use ($delta): void {
|
||||||
|
if ($inventory->real_stock + $delta < 0 || $inventory->availableStock() + $delta < 0) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_difference' => ['El ajuste dejaría el stock en un valor inválido.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
$idempotencyKey,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function refundStock(int $amount, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = ['refunded_units' => $amount];
|
||||||
|
if (! array_key_exists('available_stock', $this->attributes)) {
|
||||||
|
$counterDeltas['real_stock'] = $amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->reserved_stock -= $amount;
|
$this->mutate(
|
||||||
$this->sold_units += $amount;
|
InventoryMovementOperation::StockRefunded,
|
||||||
$this->save();
|
$counterDeltas,
|
||||||
|
function () use ($amount): void {
|
||||||
|
if ($amount < 1) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad devuelta debe ser positiva.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function commitDirectSale(int $amount, bool $tracksInventory = true): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
['sold_units' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
|
throw new \InvalidArgumentException('No hay suficiente stock para confirmar la compra.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::StockInitialized, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordTransferInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::InventoryTransferred, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $counterDeltas */
|
||||||
|
public function transferCounters(array $counterDeltas, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryTransferred,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($counterDeltas): void {
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
if ((int) $inventory->getAttribute($counter) + $delta < 0) {
|
||||||
|
throw new \LogicException("El traslado dejaría {$counter} en un valor negativo.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function recordCurrentState(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
?User $responsibleUser,
|
||||||
|
): void {
|
||||||
|
if (! Schema::hasTable('inventory_movements')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'real_stock' => $this->real_stock,
|
||||||
|
'sold_units' => $this->sold_units,
|
||||||
|
'reserved_stock' => $this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => $this->entry_reserved_stock,
|
||||||
|
'refunded_units' => $this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $this->availableStock(),
|
||||||
|
'available_stock_before' => 0,
|
||||||
|
'available_stock_after' => $this->availableStock(),
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function resetTransactionCounters(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'sold_units' => -$this->sold_units,
|
||||||
|
'reserved_stock' => -$this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$this->entry_reserved_stock,
|
||||||
|
'refunded_units' => -$this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryReset,
|
||||||
|
$counterDeltas,
|
||||||
|
static function (): void {},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, int> $counterDeltas
|
||||||
|
* @param callable(self): void $validate
|
||||||
|
*/
|
||||||
|
private function mutate(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
array $counterDeltas,
|
||||||
|
callable $validate,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
DB::transaction(function () use ($operation, $counterDeltas, $validate, $responsibleUser, $idempotencyKey): void {
|
||||||
|
/** @var self $inventory */
|
||||||
|
$inventory = self::query()->lockForUpdate()->findOrFail($this->getKey());
|
||||||
|
$this->setRawAttributes($inventory->getAttributes(), true);
|
||||||
|
|
||||||
|
$recordsMovements = Schema::hasTable('inventory_movements');
|
||||||
|
if ($recordsMovements && $idempotencyKey !== null) {
|
||||||
|
$existing = $this->movements()
|
||||||
|
->where('idempotency_key', $idempotencyKey)
|
||||||
|
->first();
|
||||||
|
if ($existing !== null) {
|
||||||
|
if ($existing->counter_deltas !== $counterDeltas) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_adjustment_id' => ['La operación ya fue utilizada con otro ajuste.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$validate($this);
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$availableBefore = $this->availableStock();
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
$this->setAttribute($counter, (int) $this->getAttribute($counter) + $delta);
|
||||||
|
}
|
||||||
|
$this->save();
|
||||||
|
$this->refresh();
|
||||||
|
|
||||||
|
$availableAfter = $this->availableStock();
|
||||||
|
if ($recordsMovements) {
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $availableAfter - $availableBefore,
|
||||||
|
'available_stock_before' => $availableBefore,
|
||||||
|
'available_stock_after' => $availableAfter,
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
'idempotency_key' => $idempotencyKey,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'inventory_id',
|
||||||
|
'operation',
|
||||||
|
'available_stock_delta',
|
||||||
|
'available_stock_before',
|
||||||
|
'available_stock_after',
|
||||||
|
'counter_deltas',
|
||||||
|
'responsible_user_id',
|
||||||
|
'idempotency_key',
|
||||||
|
])]
|
||||||
|
class InventoryMovement extends Model
|
||||||
|
{
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'operation' => InventoryMovementOperation::class,
|
||||||
|
'available_stock_delta' => 'integer',
|
||||||
|
'available_stock_before' => 'integer',
|
||||||
|
'available_stock_after' => 'integer',
|
||||||
|
'counter_deltas' => 'array',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Inventory, $this> */
|
||||||
|
public function inventory(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Inventory::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<User, $this> */
|
||||||
|
public function responsibleUser(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class, 'responsible_user_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -74,6 +75,12 @@ class Variant extends Model
|
|||||||
return $this->hasMany(Ticket::class, 'source_variant_id');
|
return $this->hasMany(Ticket::class, 'source_variant_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<EntryReservation, $this> */
|
||||||
|
public function desfileEntryReservations(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(EntryReservation::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Inventory, $this> */
|
/** @return BelongsTo<Inventory, $this> */
|
||||||
public function inventory(): BelongsTo
|
public function inventory(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
|||||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
|
use App\Domains\Commerce\Catalog\Services\CatalogItemAllowanceService;
|
||||||
use App\Shared\Enums\FieldType;
|
|
||||||
use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
|
use App\Domains\Ticketing\Ticket\Resources\ValidityTimeResource;
|
||||||
|
use App\Shared\Enums\FieldType;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -140,7 +140,7 @@ class CatalogItemDetailResource extends JsonResource
|
|||||||
'validity_time_id' => $option->validity_time_id,
|
'validity_time_id' => $option->validity_time_id,
|
||||||
'validity_time' => $option->validityTime === null
|
'validity_time' => $option->validityTime === null
|
||||||
? null
|
? null
|
||||||
: ValidityTimeResource::make($option->validityTime),
|
: ValidityTimeResource::make($option->validityTime, $this->tenant->timezone),
|
||||||
'metadata' => $option->metadata,
|
'metadata' => $option->metadata,
|
||||||
])
|
])
|
||||||
->values();
|
->values();
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ class CatalogInventoryService
|
|||||||
$selection->loadMissing('variants.inventory');
|
$selection->loadMissing('variants.inventory');
|
||||||
|
|
||||||
return $selection->variants
|
return $selection->variants
|
||||||
|
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $selection))
|
||||||
->filter(fn (Variant $variant): bool => $variant->isSellable())
|
->filter(fn (Variant $variant): bool => $variant->isSellable())
|
||||||
->unique(fn (Variant $variant): string => $variant->inventory_id === null
|
->unique(fn (Variant $variant): string => $variant->inventory_id === null
|
||||||
? 'object:'.spl_object_id($variant->inventory)
|
? 'object:'.spl_object_id($variant->inventory)
|
||||||
@@ -153,7 +154,7 @@ class CatalogInventoryService
|
|||||||
|
|
||||||
if ($operation === 'commit'
|
if ($operation === 'commit'
|
||||||
&& $requirement['tracks_inventory']
|
&& $requirement['tracks_inventory']
|
||||||
&& $inventory->real_stock < $requiredQuantity) {
|
&& $inventory->availableStock() < 0) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Services;
|
namespace App\Domains\Commerce\Catalog\Services;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
||||||
use App\Domains\Commerce\Catalog\Models\Attribute;
|
use App\Domains\Commerce\Catalog\Models\Attribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
@@ -11,8 +9,10 @@ use App\Domains\Commerce\Catalog\Models\Category;
|
|||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -286,9 +286,11 @@ class CatalogService
|
|||||||
int $perPage,
|
int $perPage,
|
||||||
int $page,
|
int $page,
|
||||||
): LengthAwarePaginator {
|
): LengthAwarePaginator {
|
||||||
|
$categoryIds = $this->categoryAndDescendantIds($tenant, $category);
|
||||||
|
|
||||||
return CatalogItem::query()
|
return CatalogItem::query()
|
||||||
->forTenantCatalog($tenant)
|
->forTenantCatalog($tenant)
|
||||||
->where('category_id', $category->id)
|
->whereIn('category_id', $categoryIds)
|
||||||
->whereAvailable()
|
->whereAvailable()
|
||||||
->with([
|
->with([
|
||||||
'attachments',
|
'attachments',
|
||||||
@@ -306,6 +308,34 @@ class CatalogService
|
|||||||
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<int, int> */
|
||||||
|
private function categoryAndDescendantIds(Tenant $tenant, Category $category): array
|
||||||
|
{
|
||||||
|
$childrenByParent = Category::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
|
->get(['id', 'categoria_id'])
|
||||||
|
->groupBy('categoria_id');
|
||||||
|
|
||||||
|
$categoryIds = [];
|
||||||
|
$pendingIds = [$category->id];
|
||||||
|
|
||||||
|
while ($pendingIds !== []) {
|
||||||
|
$categoryId = array_shift($pendingIds);
|
||||||
|
|
||||||
|
if (isset($categoryIds[$categoryId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$categoryIds[$categoryId] = $categoryId;
|
||||||
|
|
||||||
|
foreach ($childrenByParent->get($categoryId, collect()) as $child) {
|
||||||
|
$pendingIds[] = $child->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return array_values($categoryIds);
|
||||||
|
}
|
||||||
|
|
||||||
public function delete(CatalogItem $catalogItem): void
|
public function delete(CatalogItem $catalogItem): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($catalogItem): void {
|
DB::transaction(function () use ($catalogItem): void {
|
||||||
@@ -340,9 +370,12 @@ class CatalogService
|
|||||||
|
|
||||||
private function createInventory(int $realStock): Inventory
|
private function createInventory(int $realStock): Inventory
|
||||||
{
|
{
|
||||||
return Inventory::query()->create([
|
$inventory = Inventory::query()->create([
|
||||||
'real_stock' => $realStock,
|
'real_stock' => $realStock,
|
||||||
]);
|
]);
|
||||||
|
$inventory->recordInitialization();
|
||||||
|
|
||||||
|
return $inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ class StockReservationService
|
|||||||
$inventory = $inventories->get($line->inventory_id)
|
$inventory = $inventories->get($line->inventory_id)
|
||||||
?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
|
?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
|
||||||
if ($inventory->reserved_stock < $line->quantity
|
if ($inventory->reserved_stock < $line->quantity
|
||||||
|| ($line->tracks_inventory && $inventory->real_stock < $line->quantity)) {
|
|| ($line->tracks_inventory && $inventory->availableStock() < 0)) {
|
||||||
throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
|
throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use App\Domains\Commerce\Catalog\Models\Inventory;
|
|||||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||||
use App\Domains\Commerce\Catalog\Models\StockReservationLine;
|
use App\Domains\Commerce\Catalog\Models\StockReservationLine;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
@@ -190,15 +191,22 @@ class VariantReplacementService
|
|||||||
'sold_units' => $sourceInventory->sold_units,
|
'sold_units' => $sourceInventory->sold_units,
|
||||||
'refunded_units' => $sourceInventory->refunded_units,
|
'refunded_units' => $sourceInventory->refunded_units,
|
||||||
'reserved_stock' => $reservedStock,
|
'reserved_stock' => $reservedStock,
|
||||||
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'real_stock' => $sourceInventory->real_stock,
|
'real_stock' => $sourceInventory->real_stock,
|
||||||
]);
|
]);
|
||||||
|
$replacementInventory->recordTransferInitialization();
|
||||||
|
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
->whereKey($activeLines->modelKeys())
|
->whereKey($activeLines->modelKeys())
|
||||||
->update(['inventory_id' => $replacementInventory->getKey()]);
|
->update(['inventory_id' => $replacementInventory->getKey()]);
|
||||||
}
|
}
|
||||||
$sourceInventory->update(['reserved_stock' => 0]);
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
|
->update(['inventory_id' => $replacementInventory->id]);
|
||||||
|
$sourceInventory->transferCounters([
|
||||||
|
'reserved_stock' => -$sourceInventory->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock,
|
||||||
|
]);
|
||||||
|
|
||||||
return $replacementInventory;
|
return $replacementInventory;
|
||||||
}
|
}
|
||||||
@@ -232,23 +240,25 @@ class VariantReplacementService
|
|||||||
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$destinationInventory->update([
|
$transferredCounters = [
|
||||||
'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock,
|
'real_stock' => $sourceInventory->real_stock,
|
||||||
'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock,
|
'reserved_stock' => $sourceInventory->reserved_stock,
|
||||||
'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units,
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units,
|
'sold_units' => $sourceInventory->sold_units,
|
||||||
]);
|
'refunded_units' => $sourceInventory->refunded_units,
|
||||||
|
];
|
||||||
|
$destinationInventory->transferCounters($transferredCounters);
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
->whereKey($activeLines->modelKeys())
|
->whereKey($activeLines->modelKeys())
|
||||||
->update(['inventory_id' => $destinationInventory->getKey()]);
|
->update(['inventory_id' => $destinationInventory->getKey()]);
|
||||||
}
|
}
|
||||||
$sourceInventory->update([
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
'real_stock' => 0,
|
->update(['inventory_id' => $destinationInventory->id]);
|
||||||
'reserved_stock' => 0,
|
$sourceInventory->transferCounters(array_map(
|
||||||
'sold_units' => 0,
|
fn (int $value): int => -$value,
|
||||||
'refunded_units' => 0,
|
$transferredCounters,
|
||||||
]);
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return list<string> */
|
/** @return list<string> */
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Controllers;
|
namespace App\Domains\Commerce\Purchase\Controllers;
|
||||||
|
|
||||||
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
||||||
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
||||||
@@ -13,6 +12,7 @@ use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
|||||||
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -151,11 +151,14 @@ class PurchaseController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
$compra->refresh();
|
$compra->refresh();
|
||||||
|
$compra->loadMissing('event');
|
||||||
$totalAmount = (float) $compra->total;
|
$totalAmount = (float) $compra->total;
|
||||||
|
|
||||||
if ($method === 'transfer') {
|
if ($method === 'transfer') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$accountInfo = $telepagosService->getAccountInfo();
|
$accountInfo = $telepagosService->getAccountInfo();
|
||||||
@@ -191,7 +194,9 @@ class PurchaseController extends Controller
|
|||||||
|
|
||||||
if ($method === 'qr') {
|
if ($method === 'qr') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Models;
|
namespace App\Domains\Commerce\Purchase\Models;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Models\Cart;
|
use App\Domains\Commerce\Cart\Models\Cart;
|
||||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||||
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
|
||||||
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -21,6 +22,7 @@ use Illuminate\Support\Facades\DB;
|
|||||||
#[Fillable([
|
#[Fillable([
|
||||||
'cart_id',
|
'cart_id',
|
||||||
'stock_reservation_id',
|
'stock_reservation_id',
|
||||||
|
'event_id',
|
||||||
'tenant_codigo',
|
'tenant_codigo',
|
||||||
'user_id',
|
'user_id',
|
||||||
'status',
|
'status',
|
||||||
@@ -149,6 +151,7 @@ class Purchase extends Model
|
|||||||
return [
|
return [
|
||||||
'cart_id' => 'integer',
|
'cart_id' => 'integer',
|
||||||
'stock_reservation_id' => 'integer',
|
'stock_reservation_id' => 'integer',
|
||||||
|
'event_id' => 'integer',
|
||||||
'user_id' => 'integer',
|
'user_id' => 'integer',
|
||||||
'total' => 'decimal:2',
|
'total' => 'decimal:2',
|
||||||
];
|
];
|
||||||
@@ -162,6 +165,12 @@ class Purchase extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Event, $this> */
|
||||||
|
public function event(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return BelongsTo<User, $this>
|
* @return BelongsTo<User, $this>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Domains\Commerce\Purchase\Resources;
|
namespace App\Domains\Commerce\Purchase\Resources;
|
||||||
|
|
||||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||||
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
@@ -14,7 +15,11 @@ class PurchaseItemResource extends JsonResource
|
|||||||
public function toArray(Request $request): array
|
public function toArray(Request $request): array
|
||||||
{
|
{
|
||||||
$tenant = $request->route('tenant');
|
$tenant = $request->route('tenant');
|
||||||
$displayImage = ! $tenant instanceof Tenant || $tenant->display_cart_item_images;
|
$usesEventSummary = $tenant instanceof Tenant
|
||||||
|
&& $tenant->storefrontWebsiteType?->checkout_summary_type
|
||||||
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
|
$displayImage = ! $tenant instanceof Tenant
|
||||||
|
|| (! $usesEventSummary && $tenant->display_cart_item_images);
|
||||||
|
|
||||||
$imageUrl = $displayImage
|
$imageUrl = $displayImage
|
||||||
? $this->imageAttachment?->getTemporaryUrl(1440)
|
? $this->imageAttachment?->getTemporaryUrl(1440)
|
||||||
@@ -31,7 +36,7 @@ class PurchaseItemResource extends JsonResource
|
|||||||
'nombre' => $this->item_nombre,
|
'nombre' => $this->item_nombre,
|
||||||
'descripcion' => $this->descripcion,
|
'descripcion' => $this->descripcion,
|
||||||
'slug' => $this->slug,
|
'slug' => $this->slug,
|
||||||
'imagen' => $imageUrl,
|
'imagen' => $this->when(! $usesEventSummary, $imageUrl),
|
||||||
'attributes' => $this->variant_attributes ?? [],
|
'attributes' => $this->variant_attributes ?? [],
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ namespace App\Domains\Commerce\Purchase\Resources;
|
|||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosPaymentCandidate;
|
use App\Domains\Commerce\Purchase\Models\TelepagosPaymentCandidate;
|
||||||
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -27,6 +30,18 @@ class PurchaseResource extends JsonResource
|
|||||||
? (int) $this->resource->getAttribute('tickets_count')
|
? (int) $this->resource->getAttribute('tickets_count')
|
||||||
: null;
|
: null;
|
||||||
$paymentVerification = $this->resolvePaymentVerification();
|
$paymentVerification = $this->resolvePaymentVerification();
|
||||||
|
$tenant = $request->route('tenant');
|
||||||
|
$usesEventSummary = $tenant instanceof Tenant
|
||||||
|
&& $tenant->storefrontWebsiteType?->checkout_summary_type
|
||||||
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
|
/** @var Event|null $checkoutEvent */
|
||||||
|
$checkoutEvent = $usesEventSummary
|
||||||
|
? ($this->event ?? $items
|
||||||
|
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
||||||
|
->filter()
|
||||||
|
->unique('id')
|
||||||
|
->first())
|
||||||
|
: null;
|
||||||
|
|
||||||
$subtotal = $items->isNotEmpty()
|
$subtotal = $items->isNotEmpty()
|
||||||
? $items->reduce(
|
? $items->reduce(
|
||||||
@@ -47,6 +62,7 @@ class PurchaseResource extends JsonResource
|
|||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
'cart_id' => $this->cart_id,
|
'cart_id' => $this->cart_id,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
'user_id' => $this->user_id,
|
'user_id' => $this->user_id,
|
||||||
'created_at' => $this->created_at,
|
'created_at' => $this->created_at,
|
||||||
@@ -64,6 +80,13 @@ class PurchaseResource extends JsonResource
|
|||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'items_source' => $items->isNotEmpty() ? 'purchase' : null,
|
'items_source' => $items->isNotEmpty() ? 'purchase' : null,
|
||||||
'items' => PurchaseItemResource::collection($items),
|
'items' => PurchaseItemResource::collection($items),
|
||||||
|
'event' => $this->when($usesEventSummary, fn () => $checkoutEvent === null
|
||||||
|
? null
|
||||||
|
: [
|
||||||
|
'id' => $checkoutEvent->id,
|
||||||
|
'title' => $checkoutEvent->title,
|
||||||
|
'image' => $checkoutEvent->attachment?->getTemporaryUrl(1440),
|
||||||
|
]),
|
||||||
'tickets_count' => $this->when($ticketsCount !== null, $ticketsCount),
|
'tickets_count' => $this->when($ticketsCount !== null, $ticketsCount),
|
||||||
'has_generated_tickets' => $this->when($ticketsCount !== null, $ticketsCount > 0),
|
'has_generated_tickets' => $this->when($ticketsCount !== null, $ticketsCount > 0),
|
||||||
'payment_verification' => $this->when($paymentVerification !== null, $paymentVerification),
|
'payment_verification' => $this->when($paymentVerification !== null, $paymentVerification),
|
||||||
|
|||||||
@@ -3,12 +3,25 @@
|
|||||||
namespace App\Domains\Commerce\Purchase\Services\Checkout;
|
namespace App\Domains\Commerce\Purchase\Services\Checkout;
|
||||||
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
|
|
||||||
class PurchaseResponseLoader
|
class PurchaseResponseLoader
|
||||||
{
|
{
|
||||||
public function load(Purchase $purchase): Purchase
|
public function load(Purchase $purchase): Purchase
|
||||||
{
|
{
|
||||||
$relations = ['tenant', 'items.imageAttachment', 'stockReservation'];
|
$purchase->loadMissing('tenant.storefrontWebsiteType');
|
||||||
|
$usesEventSummary = $purchase->tenant?->storefrontWebsiteType?->checkout_summary_type
|
||||||
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
|
$relations = [
|
||||||
|
'tenant',
|
||||||
|
'event.attachment',
|
||||||
|
'items.sourceCatalogItem.event.attachment',
|
||||||
|
'stockReservation',
|
||||||
|
];
|
||||||
|
|
||||||
|
if (! $usesEventSummary) {
|
||||||
|
$relations[] = 'items.imageAttachment';
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$purchase->status === Purchase::STATUS_IN_REVIEW
|
$purchase->status === Purchase::STATUS_IN_REVIEW
|
||||||
|
|||||||
@@ -206,6 +206,7 @@ class StartCheckoutService
|
|||||||
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
||||||
),
|
),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -273,6 +274,7 @@ class StartCheckoutService
|
|||||||
$purchaseData,
|
$purchaseData,
|
||||||
$cart->getTotalAmount(),
|
$cart->getTotalAmount(),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -410,10 +412,12 @@ class StartCheckoutService
|
|||||||
array $purchaseData,
|
array $purchaseData,
|
||||||
float $total,
|
float $total,
|
||||||
?int $cartId,
|
?int $cartId,
|
||||||
|
?int $eventId,
|
||||||
): Purchase {
|
): Purchase {
|
||||||
return Purchase::query()->create([
|
return Purchase::query()->create([
|
||||||
...$purchaseData,
|
...$purchaseData,
|
||||||
'cart_id' => $cartId,
|
'cart_id' => $cartId,
|
||||||
|
'event_id' => $eventId,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
'user_id' => $userId,
|
'user_id' => $userId,
|
||||||
'status' => Purchase::STATUS_CREATED,
|
'status' => Purchase::STATUS_CREATED,
|
||||||
|
|||||||
@@ -8,12 +8,14 @@ use Illuminate\Database\Eloquent\Builder;
|
|||||||
|
|
||||||
class PurchaseRefundSummaryService
|
class PurchaseRefundSummaryService
|
||||||
{
|
{
|
||||||
public function totalForTenant(Tenant $tenant): string
|
public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
$total = TicketRefund::query()
|
$total = TicketRefund::query()
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'purchaseItem.purchase',
|
'purchaseItem.purchase',
|
||||||
fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
|
fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId))
|
||||||
)
|
)
|
||||||
->sum('amount');
|
->sum('amount');
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Services;
|
namespace App\Domains\Commerce\Purchase\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use Illuminate\Database\Query\Builder;
|
use Illuminate\Database\Query\Builder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -25,6 +26,9 @@ class TenantTransactionResetService
|
|||||||
'carts' => $scope['cart_ids']->count(),
|
'carts' => $scope['cart_ids']->count(),
|
||||||
'cart_items' => $scope['cart_item_ids']->count(),
|
'cart_items' => $scope['cart_item_ids']->count(),
|
||||||
'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
|
'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
|
||||||
|
'entry_reservations' => DB::table('desfile_entry_reservations')
|
||||||
|
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
||||||
|
DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->count(),
|
||||||
'stock_reservations' => $this->reservationQuery($scope)->count(),
|
'stock_reservations' => $this->reservationQuery($scope)->count(),
|
||||||
'purchase_changes' => DB::table('value_changes')
|
'purchase_changes' => DB::table('value_changes')
|
||||||
->where('tenant_code', $tenantCode)
|
->where('tenant_code', $tenantCode)
|
||||||
@@ -47,6 +51,10 @@ class TenantTransactionResetService
|
|||||||
$telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
|
$telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
|
||||||
$summary = [
|
$summary = [
|
||||||
'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
|
'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
|
||||||
|
'entry_reservations_deleted' => DB::table('desfile_entry_reservations')
|
||||||
|
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
||||||
|
DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->delete(),
|
||||||
|
'entry_reservation_batches_deleted' => DB::table('desfile_reservation_batches')->where('tenant_code', $tenantCode)->delete(),
|
||||||
'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
|
'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
|
||||||
'purchase_changes_deleted' => DB::table('value_changes')
|
'purchase_changes_deleted' => DB::table('value_changes')
|
||||||
->where('tenant_code', $tenantCode)
|
->where('tenant_code', $tenantCode)
|
||||||
@@ -62,14 +70,12 @@ class TenantTransactionResetService
|
|||||||
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
||||||
];
|
];
|
||||||
|
|
||||||
DB::table('inventories')
|
Inventory::query()
|
||||||
->whereIn('id', $scope['inventory_ids'])
|
->whereKey($scope['inventory_ids'])
|
||||||
->update([
|
->orderBy('id')
|
||||||
'real_stock' => DB::raw('real_stock + sold_units - refunded_units'),
|
->lockForUpdate()
|
||||||
'reserved_stock' => 0,
|
->get()
|
||||||
'sold_units' => 0,
|
->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters());
|
||||||
'refunded_units' => 0,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $summary;
|
return $summary;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -32,10 +32,10 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleResource::collection(
|
return SaleResource::collection(
|
||||||
$this->saleService->sales($tenant, $request->validated())
|
$this->saleService->sales($tenant, $request->validated(), $request->user()->event_id)
|
||||||
)->additional([
|
)->additional([
|
||||||
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
|
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id),
|
||||||
'refunded_total' => $this->saleService->refundedTotal($tenant),
|
'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleDetailResource($this->saleService->detail($tenant, $sale));
|
return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
||||||
@@ -51,7 +51,7 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleTicketResource::collection(
|
return SaleTicketResource::collection(
|
||||||
$this->saleService->tickets($tenant, $sale)
|
$this->saleService->tickets($tenant, $sale, $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,14 +59,14 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->confirm($tenant, $sale));
|
return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Request $request, int $sale): SaleResource
|
public function cancel(Request $request, int $sale): SaleResource
|
||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->cancel($tenant, $sale));
|
return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function modifications(
|
public function modifications(
|
||||||
@@ -76,6 +76,7 @@ class SaleController extends Controller
|
|||||||
$this->saleService->modifications(
|
$this->saleService->modifications(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -86,7 +87,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadSales(
|
return $this->salePdfService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -97,7 +98,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadModifications(
|
return $this->salePdfService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -108,7 +109,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadSales(
|
return $this->saleExcelService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -120,7 +121,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadModifications(
|
return $this->saleExcelService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Sale\Services;
|
namespace App\Domains\Commerce\Sale\Services;
|
||||||
|
|
||||||
use App\Shared\Logging\Models\ValueChange;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||||
@@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant;
|
|||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use App\Shared\Logging\Models\ValueChange;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -21,19 +21,18 @@ class AdminAppSaleService
|
|||||||
protected PurchaseRefundSummaryService $refundSummaryService,
|
protected PurchaseRefundSummaryService $refundSummaryService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function confirmedSalesTotal(Tenant $tenant): string
|
public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
$total = Purchase::query()
|
$total = $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->where('status', Purchase::STATUS_PAID)
|
->where('status', Purchase::STATUS_PAID)
|
||||||
->sum('total');
|
->sum('total');
|
||||||
|
|
||||||
return number_format((float) $total, 2, '.', '');
|
return number_format((float) $total, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refundedTotal(Tenant $tenant): string
|
public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
|
||||||
{
|
{
|
||||||
return $this->refundSummaryService->totalForTenant($tenant);
|
return $this->refundSummaryService->totalForTenant($tenant, $eventId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -47,43 +46,42 @@ class AdminAppSaleService
|
|||||||
* } $filters
|
* } $filters
|
||||||
* @return LengthAwarePaginator<Purchase>
|
* @return LengthAwarePaginator<Purchase>
|
||||||
*/
|
*/
|
||||||
public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters)
|
return $this->salesQuery($tenant, $filters, $eventId)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function detail(Tenant $tenant, int $saleId): Purchase
|
public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
return Purchase::query()
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->with('items')
|
->with('items')
|
||||||
->findOrFail($saleId);
|
->findOrFail($saleId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return Collection<int, Ticket> */
|
/** @return Collection<int, Ticket> */
|
||||||
public function tickets(Tenant $tenant, int $saleId): Collection
|
public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->findForTenant($tenant, $saleId)
|
return $this->findForTenant($tenant, $saleId, $eventId)
|
||||||
->tickets()
|
->tickets()
|
||||||
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
||||||
->orderBy('id')
|
->orderBy('id')
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function confirm(Tenant $tenant, int $saleId): Purchase
|
public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId);
|
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->confirmPaidPurchase($sale)
|
$this->checkoutService->confirmPaidPurchase($sale)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $saleId): Purchase
|
public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId);
|
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
||||||
@@ -94,18 +92,18 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
*/
|
*/
|
||||||
public function salesForExport(Tenant $tenant, array $filters = []): Collection
|
public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters)->get();
|
return $this->salesQuery($tenant, $filters, $eventId)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return LengthAwarePaginator<ValueChange>
|
* @return LengthAwarePaginator<ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters)
|
return $this->modificationsQuery($tenant, $filters, $eventId)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
@@ -114,13 +112,13 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, ValueChange>
|
* @return Collection<int, ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
|
public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters)->get();
|
return $this->modificationsQuery($tenant, $filters, $eventId)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $filters */
|
/** @param array<string, mixed> $filters */
|
||||||
protected function salesQuery(Tenant $tenant, array $filters): Builder
|
protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
$sortColumns = [
|
$sortColumns = [
|
||||||
'id' => 'id',
|
'id' => 'id',
|
||||||
@@ -137,8 +135,7 @@ class AdminAppSaleService
|
|||||||
? $requestedDirection
|
? $requestedDirection
|
||||||
: 'desc';
|
: 'desc';
|
||||||
|
|
||||||
return Purchase::query()
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -176,11 +173,18 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Builder<ValueChange>
|
* @return Builder<ValueChange>
|
||||||
*/
|
*/
|
||||||
protected function modificationsQuery(Tenant $tenant, array $filters): Builder
|
protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return ValueChange::query()
|
return ValueChange::query()
|
||||||
->where('tenant_code', $tenant->codigo)
|
->where('tenant_code', $tenant->codigo)
|
||||||
->where('trackable_type', (new Purchase)->getMorphClass())
|
->where('trackable_type', (new Purchase)->getMorphClass())
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph(
|
||||||
|
'trackable',
|
||||||
|
[Purchase::class],
|
||||||
|
fn (Builder $sales): Builder => $sales
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->where('event_id', $eventId),
|
||||||
|
))
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -221,11 +225,18 @@ class AdminAppSaleService
|
|||||||
->orderByDesc('id');
|
->orderByDesc('id');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function findForTenant(Tenant $tenant, int $saleId): Purchase
|
protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||||
|
{
|
||||||
|
return $this->purchasesQuery($tenant, $eventId)
|
||||||
|
->findOrFail($saleId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return Builder<Purchase> */
|
||||||
|
protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder
|
||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->findOrFail($saleId);
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function saleForResponse(Purchase $sale): Purchase
|
protected function saleForResponse(Purchase $sale): Purchase
|
||||||
|
|||||||
@@ -29,4 +29,8 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
|
|||||||
|
|
||||||
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
||||||
|
|
||||||
|
Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant.
|
||||||
|
|
||||||
|
El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`.
|
||||||
|
|
||||||
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
||||||
|
|||||||
47
app/Domains/Core/Address/Models/Address.php
Normal file
47
app/Domains/Core/Address/Models/Address.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
|
class Address extends Model
|
||||||
|
{
|
||||||
|
protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'latitude' => 'decimal:7',
|
||||||
|
'longitude' => 'decimal:7',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array{latitude: float, longitude: float}|null */
|
||||||
|
public function coordinates(): ?array
|
||||||
|
{
|
||||||
|
if ($this->latitude === null || $this->longitude === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Tenant, $this> */
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantAddress extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_addresses';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Address */
|
||||||
|
class AddressResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'address_text' => $this->address_text,
|
||||||
|
'latitude' => $this->latitude === null ? null : (float) $this->latitude,
|
||||||
|
'longitude' => $this->longitude === null ? null : (float) $this->longitude,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::collection($this->administratorService->list(
|
return AdministratorResource::collection($this->administratorService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,6 +29,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::make($this->administratorService->create(
|
return AdministratorResource::make($this->administratorService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,6 +39,7 @@ class AdminAppAdministratorController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$administrator,
|
$administrator,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class AdministratorResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ class AdministratorService
|
|||||||
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null): Collection
|
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->query($tenant)->with('role')
|
return $this->query($tenant, $eventId)->with('role')
|
||||||
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
||||||
$query->where('nombre_apellido', 'like', "%{$search}%")
|
$query->where('nombre_apellido', 'like', "%{$search}%")
|
||||||
->orWhere('dni', 'like', "%{$search}%")
|
->orWhere('dni', 'like', "%{$search}%")
|
||||||
@@ -31,14 +31,15 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data): User
|
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $data): User {
|
return DB::transaction(function () use ($tenant, $data, $eventId): User {
|
||||||
$administrator = User::query()->create([
|
$administrator = User::query()->create([
|
||||||
...$this->attributes($data),
|
...$this->attributes($data),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::AdminApp->value,
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
'event_id' => $eventId,
|
||||||
]);
|
]);
|
||||||
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
||||||
$administrator->email,
|
$administrator->email,
|
||||||
@@ -50,10 +51,10 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $administratorId, array $data): User
|
public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $administratorId, $data): User {
|
return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User {
|
||||||
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId);
|
||||||
$administrator->update($this->attributes($data));
|
$administrator->update($this->attributes($data));
|
||||||
|
|
||||||
return $administrator->load('role');
|
return $administrator->load('role');
|
||||||
@@ -66,11 +67,11 @@ class AdministratorService
|
|||||||
// Serialize deletions for this tenant, including requests already authenticated
|
// Serialize deletions for this tenant, including requests already authenticated
|
||||||
// when another administrator removes their account.
|
// when another administrator removes their account.
|
||||||
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
||||||
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId);
|
||||||
if ($administrator->is($actor)) {
|
if ($administrator->is($actor)) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
||||||
}
|
}
|
||||||
$activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
|
$activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get();
|
||||||
if ($activeAdministrators->count() <= 1) {
|
if ($activeAdministrators->count() <= 1) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
||||||
}
|
}
|
||||||
@@ -80,10 +81,11 @@ class AdministratorService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function query(Tenant $tenant): Builder
|
private function query(Tenant $tenant, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return User::query()->where('tenant_codigo', $tenant->codigo)
|
return User::query()->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::AdminApp->value);
|
->where('rol_codigo', RoleCode::AdminApp->value)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data
|
/** @param array<string, mixed> $data
|
||||||
|
|||||||
@@ -55,6 +55,8 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten
|
|||||||
|
|
||||||
## Verificación
|
## Verificación
|
||||||
|
|
||||||
|
Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant.
|
||||||
|
|
||||||
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
||||||
|
|
||||||
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
||||||
|
|||||||
@@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Auth\Models;
|
namespace App\Domains\Core\Auth\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Core\Authorization\Models\Role;
|
use App\Domains\Core\Authorization\Models\Role;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
||||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||||
use Database\Factories\UserFactory;
|
use Database\Factories\UserFactory;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
@@ -20,7 +21,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
|||||||
use Illuminate\Notifications\Notifiable;
|
use Illuminate\Notifications\Notifiable;
|
||||||
use Laravel\Sanctum\HasApiTokens;
|
use Laravel\Sanctum\HasApiTokens;
|
||||||
|
|
||||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])]
|
||||||
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
||||||
class User extends Authenticatable
|
class User extends Authenticatable
|
||||||
{
|
{
|
||||||
@@ -86,6 +87,12 @@ class User extends Authenticatable
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Event, $this> */
|
||||||
|
public function event(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsToMany<Category, $this> */
|
/** @return BelongsToMany<Category, $this> */
|
||||||
public function scanCategories(): BelongsToMany
|
public function scanCategories(): BelongsToMany
|
||||||
{
|
{
|
||||||
@@ -103,6 +110,7 @@ class User extends Authenticatable
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
'event_id' => 'integer',
|
||||||
'email_verified_at' => 'datetime',
|
'email_verified_at' => 'datetime',
|
||||||
'password' => 'hashed',
|
'password' => 'hashed',
|
||||||
'failed_login_attempts' => 'integer',
|
'failed_login_attempts' => 'integer',
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ class UserResource extends JsonResource
|
|||||||
'telefono' => $this->telefono,
|
'telefono' => $this->telefono,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
||||||
->map(fn ($category) => [
|
->map(fn ($category) => [
|
||||||
'id' => $category->id,
|
'id' => $category->id,
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ class AdminAppContextService
|
|||||||
{
|
{
|
||||||
$tenant = $user->tenant()
|
$tenant = $user->tenant()
|
||||||
->with([
|
->with([
|
||||||
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'phoneNumbers',
|
||||||
'menues' => fn ($query) => $query
|
'menues' => fn ($query) => $query
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'roles',
|
'roles',
|
||||||
|
|||||||
@@ -33,10 +33,14 @@ class TenantBootstrapService
|
|||||||
$tenant,
|
$tenant,
|
||||||
[
|
[
|
||||||
'eventDateChanges',
|
'eventDateChanges',
|
||||||
'menues' => fn ($query) => $query->whereHas(
|
'menues' => fn ($query) => $query
|
||||||
'roles',
|
->where(fn ($query) => $query
|
||||||
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
->where('menues.code', 'help.contact')
|
||||||
),
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
|
->whereHas(
|
||||||
|
'roles',
|
||||||
|
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
||||||
|
),
|
||||||
$tenant->storefront_website_type_code === 'onticket_multi_event'
|
$tenant->storefront_website_type_code === 'onticket_multi_event'
|
||||||
? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
|
? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Client\Models;
|
namespace App\Domains\Core\Client\Models;
|
||||||
|
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
@@ -22,6 +23,12 @@ class Client extends Model
|
|||||||
return $this->hasMany(Tenant::class);
|
return $this->hasMany(Tenant::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return HasMany<ClientIntegration, $this> */
|
/** @return HasMany<ClientIntegration, $this> */
|
||||||
public function integrations(): HasMany
|
public function integrations(): HasMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Menu extends Model
|
|||||||
'codigo'
|
'codigo'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ class TenantMenu extends Pivot
|
|||||||
'tenant_code',
|
'tenant_code',
|
||||||
'menu_code',
|
'menu_code',
|
||||||
'static_content',
|
'static_content',
|
||||||
|
'is_enabled',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'static_content' => 'array',
|
'static_content' => 'array',
|
||||||
|
'is_enabled' => 'boolean',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
|
||||||
|
class PhoneNumber extends Model
|
||||||
|
{
|
||||||
|
protected $attributes = ['country_code' => '+54', 'mobile_prefix' => '9'];
|
||||||
|
|
||||||
|
protected $fillable = ['label', 'country_code', 'mobile_prefix', 'area_code', 'local_number'];
|
||||||
|
|
||||||
|
public function getNumberAttribute(?string $legacyNumber): string
|
||||||
|
{
|
||||||
|
if ($this->local_number === null) {
|
||||||
|
return $legacyNumber ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->mobile_prefix && $this->area_code
|
||||||
|
? '('.$this->area_code.')'
|
||||||
|
: $this->area_code;
|
||||||
|
|
||||||
|
return implode(' ', array_filter([
|
||||||
|
$this->country_code,
|
||||||
|
$this->mobile_prefix,
|
||||||
|
$areaCode,
|
||||||
|
$this->local_number,
|
||||||
|
], fn ($part): bool => $part !== null && $part !== ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function dialableNumber(string $number): string
|
||||||
|
{
|
||||||
|
return preg_replace('/[^0-9+]/', '', $number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function telUrl(): string
|
||||||
|
{
|
||||||
|
if ($this->country_code === null || $this->local_number === null) {
|
||||||
|
return 'tel:'.self::dialableNumber($this->number);
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->area_code ?? '';
|
||||||
|
if ($this->country_code === '+54') {
|
||||||
|
$areaCode = ltrim($areaCode, '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'tel:'.self::dialableNumber(
|
||||||
|
$this->country_code.($this->mobile_prefix ?? '').$areaCode.$this->local_number
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_phone_numbers', 'phone_number_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantPhoneNumber extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_phone_numbers';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'phone_number_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumber(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(PhoneNumber::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class PhoneNumberResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'country_code' => $this->country_code,
|
||||||
|
'mobile_prefix' => $this->mobile_prefix,
|
||||||
|
'area_code' => $this->area_code,
|
||||||
|
'local_number' => $this->local_number,
|
||||||
|
'number' => $this->number,
|
||||||
|
'tel_url' => $this->resource->telUrl(),
|
||||||
|
'is_main' => $this->whenPivotLoaded('tenant_phone_numbers', fn () => (bool) $this->pivot->is_main),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,6 +26,7 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::collection($this->staffService->list(
|
return StaffResource::collection($this->staffService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,6 +35,7 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::make($this->staffService->create(
|
return StaffResource::make($this->staffService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,12 +45,13 @@ class AdminAppStaffController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
|
$request->user()->event_id,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function destroy(Request $request, int $staff): Response
|
public function destroy(Request $request, int $staff): Response
|
||||||
{
|
{
|
||||||
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
|
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id);
|
||||||
|
|
||||||
return response()->noContent();
|
return response()->noContent();
|
||||||
}
|
}
|
||||||
@@ -60,6 +63,7 @@ class AdminAppStaffController extends Controller
|
|||||||
$scanner = $this->staffService->find(
|
$scanner = $this->staffService->find(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
|
$request->user()->event_id,
|
||||||
);
|
);
|
||||||
|
|
||||||
return ScanAttemptResource::collection(
|
return ScanAttemptResource::collection(
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ class StaffResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Staff\Services;
|
namespace App\Domains\Core\Staff\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -22,9 +22,9 @@ class StaffService
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null): Collection
|
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant)
|
return $this->staffQuery($tenant, $eventId)
|
||||||
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
||||||
->when($search, function (Builder $query, string $search): void {
|
->when($search, function (Builder $query, string $search): void {
|
||||||
$query->where(function (Builder $query) use ($search): void {
|
$query->where(function (Builder $query) use ($search): void {
|
||||||
@@ -52,18 +52,19 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data): User
|
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
|
return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
|
||||||
$staff = User::query()->create([
|
$staff = User::query()->create([
|
||||||
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
||||||
'email' => mb_strtolower(trim((string) $data['email'])),
|
'email' => mb_strtolower(trim((string) $data['email'])),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::Scanner->value,
|
'rol_codigo' => RoleCode::Scanner->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
|
'event_id' => $eventId,
|
||||||
]);
|
]);
|
||||||
$staff->scanCategories()->sync($categoryIds);
|
$staff->scanCategories()->sync($categoryIds);
|
||||||
$this->resetPasswordAttemptService->createForScannerEmail(
|
$this->resetPasswordAttemptService->createForScannerEmail(
|
||||||
@@ -76,9 +77,9 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $staffId, array $data): User
|
public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId);
|
$staff = $this->find($tenant, $staffId, $eventId);
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
@@ -92,9 +93,9 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delete(Tenant $tenant, int $staffId): void
|
public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId);
|
$staff = $this->find($tenant, $staffId, $eventId);
|
||||||
|
|
||||||
DB::transaction(function () use ($staff): void {
|
DB::transaction(function () use ($staff): void {
|
||||||
$staff->tokens()->delete();
|
$staff->tokens()->delete();
|
||||||
@@ -102,16 +103,17 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, int $staffId): User
|
public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant)->findOrFail($staffId);
|
return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function staffQuery(Tenant $tenant): Builder
|
private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
return User::query()
|
return User::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::Scanner->value);
|
->where('rol_codigo', RoleCode::Scanner->value)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,3 +18,5 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
|
|||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
||||||
|
|
||||||
|
Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant.
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\BrandService;
|
||||||
|
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class BrandController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(
|
||||||
|
UpdateBrandRequest $request,
|
||||||
|
BrandService $brandService,
|
||||||
|
TenantInformationService $tenantInformationService,
|
||||||
|
): BrandResource {
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$brandService->update($tenant, $request->validated());
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant->fresh()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateContactRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\ContactResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\ContactService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class ContactController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, ContactService $service): ContactResource
|
||||||
|
{
|
||||||
|
return ContactResource::make($service->load($request->user()->tenant()->firstOrFail()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(UpdateContactRequest $request, ContactService $service): ContactResource
|
||||||
|
{
|
||||||
|
return ContactResource::make($service->update($request->user()->tenant()->firstOrFail(), $request->validated()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class HelpMenuController extends Controller
|
||||||
|
{
|
||||||
|
private const MENU_CODES = [
|
||||||
|
'help.faq',
|
||||||
|
'help.terms-and-conditions',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function index(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$menus = $tenant->menues()
|
||||||
|
->whereIn('menues.code', self::MENU_CODES)
|
||||||
|
->get()
|
||||||
|
->keyBy('code');
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => collect(self::MENU_CODES)->mapWithKeys(
|
||||||
|
fn (string $code): array => [$code => [
|
||||||
|
'code' => $code,
|
||||||
|
'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
|
||||||
|
'static_content' => $menus->get($code)?->pivot?->static_content
|
||||||
|
?? $this->emptyContent($code),
|
||||||
|
]]
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function toggle(
|
||||||
|
Request $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$isEnabled = ! $tenantMenu->pivot->is_enabled;
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateContent(
|
||||||
|
UpdateHelpMenuContentRequest $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$staticContent = $request->validated('static_content');
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function emptyContent(string $menuCode): array
|
||||||
|
{
|
||||||
|
return $menuCode === 'help.faq' ? [] : ['html' => ''];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,11 +3,8 @@
|
|||||||
namespace App\Domains\Core\Tenant\Controllers;
|
namespace App\Domains\Core\Tenant\Controllers;
|
||||||
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Core\Tenant\Requests\StoreTenantRequest;
|
|
||||||
use App\Domains\Core\Tenant\Requests\UpdateTenantRequest;
|
|
||||||
use App\Domains\Core\Tenant\Resources\TenantResource;
|
use App\Domains\Core\Tenant\Resources\TenantResource;
|
||||||
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
||||||
use App\Domains\Core\Tenant\Services\TenantService;
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
@@ -15,7 +12,6 @@ use Illuminate\Http\Response;
|
|||||||
class TenantController extends Controller
|
class TenantController extends Controller
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
protected TenantService $tenantService,
|
|
||||||
protected TenantInformationService $tenantInformationService,
|
protected TenantInformationService $tenantInformationService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -30,15 +26,6 @@ class TenantController extends Controller
|
|||||||
return TenantResource::collection($tenants)->response();
|
return TenantResource::collection($tenants)->response();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(StoreTenantRequest $request): JsonResponse
|
|
||||||
{
|
|
||||||
$tenant = $this->tenantService->create($request->validated());
|
|
||||||
|
|
||||||
return TenantResource::make(
|
|
||||||
$this->tenantInformationService->load($tenant)
|
|
||||||
)->response()->setStatusCode(201);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function show(Tenant $tenant): TenantResource
|
public function show(Tenant $tenant): TenantResource
|
||||||
{
|
{
|
||||||
return TenantResource::make(
|
return TenantResource::make(
|
||||||
@@ -46,15 +33,6 @@ class TenantController extends Controller
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function update(UpdateTenantRequest $request, Tenant $tenant): TenantResource
|
|
||||||
{
|
|
||||||
$tenant = $this->tenantService->update($tenant, $request->validated());
|
|
||||||
|
|
||||||
return TenantResource::make(
|
|
||||||
$this->tenantInformationService->load($tenant)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function destroy(Tenant $tenant): Response
|
public function destroy(Tenant $tenant): Response
|
||||||
{
|
{
|
||||||
$tenant->delete();
|
$tenant->delete();
|
||||||
|
|||||||
@@ -7,13 +7,21 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
#[Fillable(['codigo', 'nombre', 'header_type'])]
|
#[Fillable(['codigo', 'nombre', 'header_type', 'checkout_summary_type'])]
|
||||||
class StorefrontWebsiteType extends Model
|
class StorefrontWebsiteType extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
|
public const CHECKOUT_SUMMARY_DEFAULT = 'default';
|
||||||
|
|
||||||
|
public const CHECKOUT_SUMMARY_EVENT = 'event';
|
||||||
|
|
||||||
protected $table = 'storefront_website_types';
|
protected $table = 'storefront_website_types';
|
||||||
|
|
||||||
|
protected $attributes = [
|
||||||
|
'checkout_summary_type' => self::CHECKOUT_SUMMARY_DEFAULT,
|
||||||
|
];
|
||||||
|
|
||||||
/** @return HasMany<StorefrontWebsiteTypeExtra, $this> */
|
/** @return HasMany<StorefrontWebsiteTypeExtra, $this> */
|
||||||
public function extras(): HasMany
|
public function extras(): HasMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,32 +2,38 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Models;
|
namespace App\Domains\Core\Tenant\Models;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Address\Models\TenantAddress;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\PhoneNumber;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\TenantPhoneNumber;
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Ticketing\Event\Models\EventCategory;
|
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Menu\Models\TenantMenu;
|
use App\Domains\Core\Menu\Models\TenantMenu;
|
||||||
use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
|
use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventCategory;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
'client_id',
|
'client_id',
|
||||||
'codigo',
|
'codigo',
|
||||||
'nombre',
|
'nombre',
|
||||||
|
'timezone',
|
||||||
'dominio',
|
'dominio',
|
||||||
'base_path',
|
'base_path',
|
||||||
'site_title',
|
'site_title',
|
||||||
@@ -66,7 +72,10 @@ class Tenant extends Model
|
|||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
|
public const DEFAULT_TIMEZONE = 'America/Argentina/Buenos_Aires';
|
||||||
|
|
||||||
protected $attributes = [
|
protected $attributes = [
|
||||||
|
'timezone' => self::DEFAULT_TIMEZONE,
|
||||||
'base_path' => '/',
|
'base_path' => '/',
|
||||||
'search_product_layout' => ProductLayout::ColumnWithImage->value,
|
'search_product_layout' => ProductLayout::ColumnWithImage->value,
|
||||||
'search_group_layout' => GroupLayout::Paginated->value,
|
'search_group_layout' => GroupLayout::Paginated->value,
|
||||||
@@ -304,6 +313,39 @@ class Tenant extends Model
|
|||||||
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Address, $this> */
|
||||||
|
public function addresses(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasOneThrough<Address, TenantAddress, $this> */
|
||||||
|
public function mainAddress(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
|
||||||
|
->where('tenant_addresses.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumbers(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(PhoneNumber::class, 'tenant_phone_numbers', 'tenant_codigo', 'phone_number_id', 'codigo', 'id')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('is_main', 'desc')
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function mainPhoneNumber(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(PhoneNumber::class, TenantPhoneNumber::class, 'tenant_codigo', 'id', 'codigo', 'phone_number_id')
|
||||||
|
->where('tenant_phone_numbers.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
public function menues(): BelongsToMany
|
public function menues(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(
|
return $this->belongsToMany(
|
||||||
@@ -315,7 +357,7 @@ class Tenant extends Model
|
|||||||
'code'
|
'code'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use App\Shared\Rules\CroppedImageOrBase64Rule;
|
||||||
|
use App\Shared\Rules\ImageOrBase64Rule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateBrandRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$shopit = $this->user()->tenant()->firstOrFail()->storefront_website_type_code === 'shopit';
|
||||||
|
|
||||||
|
return [
|
||||||
|
'nombre' => ['required', 'string', 'max:255'],
|
||||||
|
'primary_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'footer_bg_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'header_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'footer_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'banner_images' => [$shopit ? 'present' : 'prohibited', 'array', 'max:10'],
|
||||||
|
'banner_images.*' => ['required', new CroppedImageOrBase64Rule],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class UpdateContactRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$tenantCode = $this->user()->tenant_codigo;
|
||||||
|
|
||||||
|
return [
|
||||||
|
'social_media' => ['present', 'array', 'max:30'],
|
||||||
|
'social_media.*' => ['array:code,url'],
|
||||||
|
'social_media.*.code' => ['required', 'string', 'distinct', Rule::exists('social_media', 'code')],
|
||||||
|
'social_media.*.url' => ['required', 'url:http,https', 'max:255'],
|
||||||
|
'addresses' => ['present', 'array', 'list', 'max:50'],
|
||||||
|
'addresses.*' => ['array:id,address_text,is_main'],
|
||||||
|
'addresses.*.id' => ['nullable', 'integer', 'distinct', Rule::exists('tenant_addresses', 'address_id')->where('tenant_codigo', $tenantCode)],
|
||||||
|
'addresses.*.address_text' => ['required', 'string', 'max:1000'],
|
||||||
|
'addresses.*.is_main' => ['sometimes', 'boolean'],
|
||||||
|
'phone_numbers' => ['present', 'array', 'list', 'max:50'],
|
||||||
|
'phone_numbers.*' => ['array:id,country_code,mobile_prefix,area_code,local_number,is_main'],
|
||||||
|
'phone_numbers.*.id' => ['nullable', 'integer', 'distinct', Rule::exists('tenant_phone_numbers', 'phone_number_id')->where('tenant_codigo', $tenantCode)],
|
||||||
|
'phone_numbers.*.country_code' => ['present', 'nullable', 'regex:/^\+[0-9]{1,4}$/'],
|
||||||
|
'phone_numbers.*.mobile_prefix' => ['present', 'nullable', 'regex:/^[0-9]{1,4}$/'],
|
||||||
|
'phone_numbers.*.area_code' => ['present', 'nullable', 'regex:/^[0-9]{1,8}$/'],
|
||||||
|
'phone_numbers.*.local_number' => ['required', 'string', 'max:50', 'regex:/^[0-9+() .-]+$/', 'regex:/[0-9]/'],
|
||||||
|
'phone_numbers.*.is_main' => ['sometimes', 'boolean'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function attributes(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'social_media' => 'redes sociales',
|
||||||
|
'social_media.*.code' => 'red social',
|
||||||
|
'social_media.*.url' => 'URL de la red social',
|
||||||
|
'addresses' => 'direcciones',
|
||||||
|
'addresses.*.id' => 'dirección',
|
||||||
|
'addresses.*.address_text' => 'dirección',
|
||||||
|
'addresses.*.is_main' => 'dirección principal',
|
||||||
|
'phone_numbers' => 'teléfonos',
|
||||||
|
'phone_numbers.*.id' => 'teléfono',
|
||||||
|
'phone_numbers.*.country_code' => 'código de país',
|
||||||
|
'phone_numbers.*.mobile_prefix' => 'prefijo móvil',
|
||||||
|
'phone_numbers.*.area_code' => 'código de área',
|
||||||
|
'phone_numbers.*.local_number' => 'número de teléfono',
|
||||||
|
'phone_numbers.*.is_main' => 'teléfono principal',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function messages(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'required' => 'Completá :attribute.',
|
||||||
|
'url' => 'La URL debe ser válida y comenzar con http:// o https://.',
|
||||||
|
'regex' => 'El formato de :attribute no es válido.',
|
||||||
|
'exists' => 'El valor de :attribute no está disponible para este comercio.',
|
||||||
|
'distinct' => 'Hay un valor duplicado en :attribute.',
|
||||||
|
'max.string' => 'El campo :attribute admite hasta :max caracteres.',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateHelpMenuContentRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return match ($this->route('menuCode')) {
|
||||||
|
'help.faq' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.*.pregunta' => ['required', 'string'],
|
||||||
|
'static_content.*.respuesta' => ['required', 'string'],
|
||||||
|
'static_content.*.is_active' => ['required', 'boolean'],
|
||||||
|
],
|
||||||
|
'help.terms-and-conditions' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.html' => ['present', 'nullable', 'string'],
|
||||||
|
],
|
||||||
|
default => [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Requests;
|
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
|
||||||
use App\Shared\Rules\ImageOrBase64Rule;
|
|
||||||
use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
|
|
||||||
use App\Domains\Core\Tenant\Services\WebsiteExtraService;
|
|
||||||
use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
|
|
||||||
use Closure;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
use Illuminate\Validation\Rule;
|
|
||||||
|
|
||||||
class StoreTenantRequest extends FormRequest
|
|
||||||
{
|
|
||||||
protected bool $hasInvalidDomain = false;
|
|
||||||
|
|
||||||
protected bool $hasInvalidBasePath = false;
|
|
||||||
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function prepareForValidation(): void
|
|
||||||
{
|
|
||||||
$rawDomain = $this->input('dominio');
|
|
||||||
$hasExplicitBasePath = $this->has('base_path');
|
|
||||||
$rawBasePath = $hasExplicitBasePath
|
|
||||||
? $this->input('base_path')
|
|
||||||
: TenantDomainNormalizer::pathFromDomain($rawDomain);
|
|
||||||
$normalizedDomain = TenantDomainNormalizer::normalize($rawDomain);
|
|
||||||
$normalizedBasePath = TenantDomainNormalizer::normalizePath($rawBasePath);
|
|
||||||
|
|
||||||
$this->hasInvalidDomain = TenantDomainNormalizer::hasValue($rawDomain)
|
|
||||||
&& $normalizedDomain === null;
|
|
||||||
$this->hasInvalidBasePath = ($hasExplicitBasePath && ! is_string($rawBasePath))
|
|
||||||
|| $normalizedBasePath === null;
|
|
||||||
|
|
||||||
$this->merge([
|
|
||||||
'dominio' => $normalizedDomain,
|
|
||||||
'base_path' => $normalizedBasePath,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<string, mixed>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
$logoRule = ['required', new ImageOrBase64Rule];
|
|
||||||
|
|
||||||
return array_merge([
|
|
||||||
'client_id' => ['sometimes', 'integer', Rule::exists('clients', 'id')],
|
|
||||||
'codigo' => ['required', 'string', 'max:255', Rule::unique('tenants', 'codigo')],
|
|
||||||
'nombre' => ['required', 'string', 'max:255'],
|
|
||||||
'dominio' => [
|
|
||||||
'bail',
|
|
||||||
function (string $attribute, mixed $value, Closure $fail): void {
|
|
||||||
if ($this->hasInvalidDomain) {
|
|
||||||
$fail("The {$attribute} field must contain a valid domain or URL.");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'required',
|
|
||||||
'string',
|
|
||||||
'max:255',
|
|
||||||
Rule::unique('tenants', 'dominio')
|
|
||||||
->where('base_path', $this->input('base_path')),
|
|
||||||
],
|
|
||||||
'base_path' => [
|
|
||||||
'bail',
|
|
||||||
function (string $attribute, mixed $value, Closure $fail): void {
|
|
||||||
if ($this->hasInvalidBasePath) {
|
|
||||||
$fail("The {$attribute} field must contain a valid URL path.");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'required',
|
|
||||||
'string',
|
|
||||||
'max:255',
|
|
||||||
Rule::unique('tenants', 'base_path')
|
|
||||||
->where('dominio', $this->input('dominio')),
|
|
||||||
],
|
|
||||||
'site_title' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'address' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'phone' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'primary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'secondary_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'danger_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'success_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'header_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'footer_bg_color' => ['required', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'header_logo' => $logoRule,
|
|
||||||
'footer_logo' => $logoRule,
|
|
||||||
'favicon' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'header_bg_image' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'footer_bg_image' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'social_media' => ['sometimes', 'array'],
|
|
||||||
'social_media.*.code' => [
|
|
||||||
'required',
|
|
||||||
'string',
|
|
||||||
'distinct',
|
|
||||||
Rule::exists('social_media', 'code'),
|
|
||||||
],
|
|
||||||
'social_media.*.url' => ['required', 'url', 'max:2048'],
|
|
||||||
'social_media.*.orden' => ['sometimes', 'integer', 'min:0', 'distinct'],
|
|
||||||
'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
|
|
||||||
'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
|
|
||||||
'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
|
|
||||||
'display_categories' => ['sometimes', 'boolean'],
|
|
||||||
'display_seach_bar' => ['sometimes', 'boolean'],
|
|
||||||
'display_cart' => ['sometimes', 'boolean'],
|
|
||||||
'cart_editing_policy' => ['sometimes', Rule::enum(CartEditingPolicy::class)],
|
|
||||||
'checkout_editing_policy' => [
|
|
||||||
'sometimes',
|
|
||||||
Rule::in([CartEditingPolicy::Disabled->value]),
|
|
||||||
],
|
|
||||||
'display_cart_item_images' => ['sometimes', 'boolean'],
|
|
||||||
'scanner_category_validation_enabled' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_refund' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_total_refund' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_partial_refund' => ['sometimes', 'boolean'],
|
|
||||||
'ticket_partial_refund_percentage' => [
|
|
||||||
'sometimes',
|
|
||||||
'numeric',
|
|
||||||
'decimal:0,2',
|
|
||||||
'min:0',
|
|
||||||
'max:99.99',
|
|
||||||
],
|
|
||||||
'storefront_website_type_code' => [
|
|
||||||
'required_with:extras',
|
|
||||||
'sometimes',
|
|
||||||
'string',
|
|
||||||
Rule::exists('storefront_website_types', 'codigo'),
|
|
||||||
],
|
|
||||||
'admin_website_type_code' => ['sometimes', 'nullable', 'string', Rule::exists('admin_website_types', 'codigo')],
|
|
||||||
], app(WebsiteExtraService::class)->requestRules($this->input('storefront_website_type_code')));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Requests;
|
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
|
||||||
use App\Shared\Rules\ImageOrBase64Rule;
|
|
||||||
use App\Domains\Core\Tenant\Enums\CartEditingPolicy;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Core\Tenant\Support\TenantDomainNormalizer;
|
|
||||||
use Closure;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
use Illuminate\Validation\Rule;
|
|
||||||
|
|
||||||
class UpdateTenantRequest extends FormRequest
|
|
||||||
{
|
|
||||||
protected bool $hasInvalidDomain = false;
|
|
||||||
|
|
||||||
protected bool $hasInvalidBasePath = false;
|
|
||||||
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function prepareForValidation(): void
|
|
||||||
{
|
|
||||||
if ($this->has('dominio')) {
|
|
||||||
$rawDomain = $this->input('dominio');
|
|
||||||
$normalizedDomain = TenantDomainNormalizer::normalize($rawDomain);
|
|
||||||
$embeddedBasePath = TenantDomainNormalizer::pathFromDomain($rawDomain);
|
|
||||||
|
|
||||||
$this->hasInvalidDomain = TenantDomainNormalizer::hasValue($rawDomain)
|
|
||||||
&& ($normalizedDomain === null || $embeddedBasePath === null);
|
|
||||||
|
|
||||||
$this->merge([
|
|
||||||
'dominio' => $normalizedDomain,
|
|
||||||
]);
|
|
||||||
|
|
||||||
if (! $this->has('base_path') && $embeddedBasePath !== null && $embeddedBasePath !== '/') {
|
|
||||||
$this->merge(['base_path' => $embeddedBasePath]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->has('base_path')) {
|
|
||||||
$rawBasePath = $this->input('base_path');
|
|
||||||
$normalizedBasePath = TenantDomainNormalizer::normalizePath($rawBasePath);
|
|
||||||
|
|
||||||
$this->hasInvalidBasePath = ! is_string($rawBasePath)
|
|
||||||
|| $normalizedBasePath === null;
|
|
||||||
|
|
||||||
$this->merge(['base_path' => $normalizedBasePath]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<string, mixed>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
/** @var Tenant|null $tenant */
|
|
||||||
$tenant = $this->route('tenant');
|
|
||||||
$domain = $this->input('dominio', $tenant?->dominio);
|
|
||||||
$basePath = $this->input('base_path', $tenant?->base_path ?? '/');
|
|
||||||
|
|
||||||
$logoRule = ['nullable', new ImageOrBase64Rule];
|
|
||||||
|
|
||||||
return [
|
|
||||||
'client_id' => ['sometimes', 'integer', Rule::exists('clients', 'id')],
|
|
||||||
'codigo' => [
|
|
||||||
'nullable',
|
|
||||||
'string',
|
|
||||||
'max:255',
|
|
||||||
Rule::unique('tenants', 'codigo')->ignore($tenant?->id),
|
|
||||||
],
|
|
||||||
'nombre' => ['nullable', 'string', 'max:255'],
|
|
||||||
'dominio' => [
|
|
||||||
'bail',
|
|
||||||
function (string $attribute, mixed $value, Closure $fail): void {
|
|
||||||
if ($this->hasInvalidDomain) {
|
|
||||||
$fail("The {$attribute} field must contain a valid domain or URL.");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'nullable',
|
|
||||||
'string',
|
|
||||||
'max:255',
|
|
||||||
Rule::unique('tenants', 'dominio')
|
|
||||||
->where('base_path', $basePath)
|
|
||||||
->ignore($tenant?->id),
|
|
||||||
],
|
|
||||||
'base_path' => [
|
|
||||||
'bail',
|
|
||||||
function (string $attribute, mixed $value, Closure $fail): void {
|
|
||||||
if ($this->hasInvalidBasePath) {
|
|
||||||
$fail("The {$attribute} field must contain a valid URL path.");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'nullable',
|
|
||||||
'string',
|
|
||||||
'max:255',
|
|
||||||
Rule::unique('tenants', 'base_path')
|
|
||||||
->where('dominio', $domain)
|
|
||||||
->ignore($tenant?->id),
|
|
||||||
],
|
|
||||||
'site_title' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'address' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'phone' => ['sometimes', 'nullable', 'string', 'max:255'],
|
|
||||||
'primary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'secondary_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'danger_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'success_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'header_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'footer_bg_color' => ['nullable', 'string', 'regex:/^#([a-fA-F0-9]{3,4}|[a-fA-F0-9]{6}|[a-fA-F0-9]{8})$/'],
|
|
||||||
'header_logo' => $logoRule,
|
|
||||||
'footer_logo' => $logoRule,
|
|
||||||
'favicon' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'header_bg_image' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'footer_bg_image' => ['sometimes', 'nullable', new ImageOrBase64Rule],
|
|
||||||
'social_media' => ['sometimes', 'array'],
|
|
||||||
'social_media.*.code' => [
|
|
||||||
'required',
|
|
||||||
'string',
|
|
||||||
'distinct',
|
|
||||||
Rule::exists('social_media', 'code'),
|
|
||||||
],
|
|
||||||
'social_media.*.url' => ['required', 'url', 'max:2048'],
|
|
||||||
'social_media.*.orden' => ['sometimes', 'integer', 'min:0', 'distinct'],
|
|
||||||
'search_product_layout' => ['sometimes', Rule::enum(ProductLayout::class)],
|
|
||||||
'search_group_layout' => ['sometimes', Rule::enum(GroupLayout::class)],
|
|
||||||
'search_items_per_page' => ['sometimes', 'integer', 'min:4', 'max:48'],
|
|
||||||
'display_categories' => ['sometimes', 'boolean'],
|
|
||||||
'display_seach_bar' => ['sometimes', 'boolean'],
|
|
||||||
'display_cart' => ['sometimes', 'boolean'],
|
|
||||||
'cart_editing_policy' => ['sometimes', Rule::enum(CartEditingPolicy::class)],
|
|
||||||
'checkout_editing_policy' => [
|
|
||||||
'sometimes',
|
|
||||||
Rule::in([CartEditingPolicy::Disabled->value]),
|
|
||||||
],
|
|
||||||
'display_cart_item_images' => ['sometimes', 'boolean'],
|
|
||||||
'scanner_category_validation_enabled' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_refund' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_total_refund' => ['sometimes', 'boolean'],
|
|
||||||
'allow_ticket_partial_refund' => ['sometimes', 'boolean'],
|
|
||||||
'ticket_partial_refund_percentage' => [
|
|
||||||
'sometimes',
|
|
||||||
'numeric',
|
|
||||||
'decimal:0,2',
|
|
||||||
'min:0',
|
|
||||||
'max:99.99',
|
|
||||||
],
|
|
||||||
'admin_website_type_code' => ['sometimes', 'nullable', 'string', Rule::exists('admin_website_types', 'codigo')],
|
|
||||||
'storefront_website_type_code' => [
|
|
||||||
'sometimes',
|
|
||||||
'nullable',
|
|
||||||
'string',
|
|
||||||
Rule::exists('storefront_website_types', 'codigo'),
|
|
||||||
function (string $attribute, mixed $value, Closure $fail) use ($tenant): void {
|
|
||||||
if ($tenant && $value !== $tenant->storefront_website_type_code && $tenant->websiteExtras()->exists()) {
|
|
||||||
$fail('The storefront website type cannot be changed while the tenant has extras.');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Models\AttachmentCrop;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Tenant */
|
||||||
|
class BrandResource extends JsonResource
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'nombre' => $this->nombre,
|
||||||
|
'primary_color' => $this->primary_color,
|
||||||
|
'header_bg_color' => $this->header_bg_color,
|
||||||
|
'footer_color' => $this->footerColor(),
|
||||||
|
'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
|
||||||
|
'header_logo_key' => $this->headerLogo?->key,
|
||||||
|
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
|
||||||
|
'footer_logo_key' => $this->footerLogo?->key,
|
||||||
|
'can_edit_carousel' => $this->canEditCarousel(),
|
||||||
|
'banner_images' => $this->bannerImages(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function footerColor(): string
|
||||||
|
{
|
||||||
|
$footerColor = strtolower(trim((string) $this->footer_bg_color));
|
||||||
|
$primaryColor = strtolower(trim((string) $this->primary_color));
|
||||||
|
|
||||||
|
if ($footerColor !== '' && $footerColor === $primaryColor) {
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_array($footerColor, ['#000', '#000000', 'black'], true)) {
|
||||||
|
return 'black';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($footerColor === '' || in_array($footerColor, ['#fff', '#ffffff', 'white'], true)) {
|
||||||
|
return 'white';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<int, array<string, mixed>> */
|
||||||
|
private function bannerImages(): array
|
||||||
|
{
|
||||||
|
if (! $this->canEditCarousel()) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->is_enabled && $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($extra === null) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$images = $extra->resolvedConfig();
|
||||||
|
|
||||||
|
if (! is_array($images)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return collect($images)
|
||||||
|
->filter(fn ($image) => $image instanceof Attachment)
|
||||||
|
->map(function (Attachment $image): array {
|
||||||
|
$desktopCrop = $image->cropVariants
|
||||||
|
->firstWhere('variant', AttachmentCrop::DESKTOP);
|
||||||
|
|
||||||
|
return [
|
||||||
|
'key' => $image->key,
|
||||||
|
'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
|
||||||
|
'original_url' => $image->getTemporaryUrl(1440),
|
||||||
|
'crop' => $desktopCrop === null ? null : [
|
||||||
|
'crop_horizontal' => $desktopCrop->crop_horizontal,
|
||||||
|
'crop_vertical' => $desktopCrop->crop_vertical,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
})
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function canEditCarousel(): bool
|
||||||
|
{
|
||||||
|
if ($this->storefront_website_type_code !== 'shopit') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
return $extra === null || $extra->is_enabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\PhoneNumber\Resources\PhoneNumberResource;
|
||||||
|
use App\Domains\Core\Tenant\Resources\TenantAddressResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class ContactResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'social_media' => $this->socialMedia->map(fn ($network) => [
|
||||||
|
'code' => $network->code,
|
||||||
|
'url' => $network->pivot->url,
|
||||||
|
])->values(),
|
||||||
|
'addresses' => TenantAddressResource::collection($this->addresses),
|
||||||
|
'phone_numbers' => PhoneNumberResource::collection($this->phoneNumbers),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TenantAddressResource extends AddressResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [...parent::toArray($request), 'is_main' => (bool) $this->pivot->is_main];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,10 @@
|
|||||||
namespace App\Domains\Core\Tenant\Resources;
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
|
use App\Domains\Core\PhoneNumber\Resources\PhoneNumberResource;
|
||||||
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
@@ -34,12 +37,17 @@ class TenantResource extends JsonResource
|
|||||||
'client_id' => $this->client_id,
|
'client_id' => $this->client_id,
|
||||||
'codigo' => $this->codigo,
|
'codigo' => $this->codigo,
|
||||||
'nombre' => $this->nombre,
|
'nombre' => $this->nombre,
|
||||||
|
'timezone' => $this->timezone,
|
||||||
'dominio' => $this->dominio,
|
'dominio' => $this->dominio,
|
||||||
'base_path' => $this->base_path,
|
'base_path' => $this->base_path,
|
||||||
'site_title' => $this->site_title ?? 'ShopitFront',
|
'site_title' => $this->site_title ?? 'ShopitFront',
|
||||||
'asset_url' => config('filesystems.disks.s3.url'),
|
'asset_url' => config('filesystems.disks.s3.url'),
|
||||||
'address' => $this->address,
|
'address' => $this->address,
|
||||||
|
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
|
||||||
|
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
|
||||||
'phone' => $this->phone,
|
'phone' => $this->phone,
|
||||||
|
'phone_numbers' => $this->whenLoaded('phoneNumbers', fn () => PhoneNumberResource::collection($this->phoneNumbers)),
|
||||||
|
'main_phone_number' => $this->whenLoaded('mainPhoneNumber', fn () => PhoneNumberResource::make($this->mainPhoneNumber)),
|
||||||
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
||||||
'primary_color' => $this->primary_color,
|
'primary_color' => $this->primary_color,
|
||||||
'secondary_color' => $this->secondary_color,
|
'secondary_color' => $this->secondary_color,
|
||||||
@@ -50,6 +58,8 @@ class TenantResource extends JsonResource
|
|||||||
'admin_website_type_code' => $this->admin_website_type_code,
|
'admin_website_type_code' => $this->admin_website_type_code,
|
||||||
'storefront_website_type_code' => $this->storefront_website_type_code,
|
'storefront_website_type_code' => $this->storefront_website_type_code,
|
||||||
'header_type' => $this->storefrontWebsiteType?->header_type ?? 'standard',
|
'header_type' => $this->storefrontWebsiteType?->header_type ?? 'standard',
|
||||||
|
'checkout_summary_type' => $this->storefrontWebsiteType?->checkout_summary_type
|
||||||
|
?? StorefrontWebsiteType::CHECKOUT_SUMMARY_DEFAULT,
|
||||||
'active_event_id' => $this->active_event_id,
|
'active_event_id' => $this->active_event_id,
|
||||||
'event' => $this->whenLoaded('activeEvent', fn () => $this->activeEvent === null
|
'event' => $this->whenLoaded('activeEvent', fn () => $this->activeEvent === null
|
||||||
? null : $this->formatEvent($this->activeEvent, $eventDateChanges)),
|
? null : $this->formatEvent($this->activeEvent, $eventDateChanges)),
|
||||||
@@ -95,6 +105,13 @@ class TenantResource extends JsonResource
|
|||||||
])
|
])
|
||||||
->values()
|
->values()
|
||||||
),
|
),
|
||||||
|
'tenant_social_media' => $this->whenLoaded('socialMedia', fn () => $this->socialMedia
|
||||||
|
->map(fn ($socialMedia) => [
|
||||||
|
'code' => $socialMedia->code,
|
||||||
|
'icon' => $socialMedia->icon,
|
||||||
|
'name' => $socialMedia->name,
|
||||||
|
'url' => $socialMedia->pivot->url,
|
||||||
|
])->values()),
|
||||||
'menues' => $this->whenLoaded(
|
'menues' => $this->whenLoaded(
|
||||||
'menues',
|
'menues',
|
||||||
fn () => $this->menuTree($this->menues)
|
fn () => $this->menuTree($this->menues)
|
||||||
@@ -123,6 +140,7 @@ class TenantResource extends JsonResource
|
|||||||
'subtitle' => $event->subtitle,
|
'subtitle' => $event->subtitle,
|
||||||
'description' => $event->description,
|
'description' => $event->description,
|
||||||
'location' => $event->location,
|
'location' => $event->location,
|
||||||
|
'address' => AddressResource::make($event->address),
|
||||||
'date_text' => $event->date_text,
|
'date_text' => $event->date_text,
|
||||||
'dates' => $event->dates
|
'dates' => $event->dates
|
||||||
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
||||||
@@ -222,7 +240,7 @@ class TenantResource extends JsonResource
|
|||||||
'route' => $menu->route,
|
'route' => $menu->route,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($menu->pivot?->static_content !== null) {
|
if ($menu->content_type === Menu::CONTENT_TYPE_STATIC && $menu->pivot?->static_content !== null) {
|
||||||
$formatted['static_content'] = $menu->pivot->static_content;
|
$formatted['static_content'] = $menu->pivot->static_content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Services;
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
@@ -96,12 +97,12 @@ class AdminWebsiteTypeService
|
|||||||
{
|
{
|
||||||
return Tenant::query()->where('favicon_id', $attachment->id)->exists()
|
return Tenant::query()->where('favicon_id', $attachment->id)->exists()
|
||||||
|| AdminWebsiteType::query()
|
|| AdminWebsiteType::query()
|
||||||
->where(function ($query) use ($attachment): void {
|
->where(function ($query) use ($attachment): void {
|
||||||
$query
|
$query
|
||||||
->where('site_logo', $attachment->id)
|
->where('site_logo', $attachment->id)
|
||||||
->orWhere('footer_logo', $attachment->id)
|
->orWhere('footer_logo', $attachment->id)
|
||||||
->orWhere('favicon_id', $attachment->id);
|
->orWhere('favicon_id', $attachment->id);
|
||||||
})
|
})
|
||||||
->exists();
|
->exists();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Enums\AttachmentType;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
|
class BrandService
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly AttachmentService $attachmentService,
|
||||||
|
private readonly WebsiteExtraService $websiteExtraService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function update(Tenant $tenant, array $data): void
|
||||||
|
{
|
||||||
|
$carousel = $tenant->storefront_website_type_code === 'shopit'
|
||||||
|
? $tenant->websiteExtras()->whereHas('websiteTypeExtra',
|
||||||
|
fn ($query) => $query->where('codigo', 'carousel'))->first()
|
||||||
|
: null;
|
||||||
|
$allowedBannerIds = is_array($carousel?->config) ? $carousel->config : [];
|
||||||
|
if ($carousel !== null && ! $carousel->is_enabled && ($data['banner_images'] ?? []) !== []) {
|
||||||
|
throw ValidationException::withMessages(['banner_images' => 'El carrusel está deshabilitado.']);
|
||||||
|
}
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach (['header_logo' => $tenant->header_logo_id, 'footer_logo' => $tenant->footer_logo_id] as $field => $id) {
|
||||||
|
$this->existingImage($data[$field], $id === null ? [] : [$id], $field);
|
||||||
|
}
|
||||||
|
foreach ($data['banner_images'] ?? [] as $index => $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $allowedBannerIds, "banner_images.{$index}");
|
||||||
|
if ($attachment !== null) {
|
||||||
|
if (isset($seen[$attachment->id])) {
|
||||||
|
throw ValidationException::withMessages(["banner_images.{$index}" => 'La imagen está repetida.']);
|
||||||
|
}
|
||||||
|
$seen[$attachment->id] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$created = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($tenant, $data, $carousel, &$created): void {
|
||||||
|
$header = $this->logo($data['header_logo'], $tenant->header_logo_id, $tenant, $created);
|
||||||
|
$footer = $this->logo($data['footer_logo'], $tenant->footer_logo_id, $tenant, $created);
|
||||||
|
|
||||||
|
$tenant->update([
|
||||||
|
'nombre' => trim($data['nombre']),
|
||||||
|
'primary_color' => $data['primary_color'],
|
||||||
|
'footer_bg_color' => $data['footer_bg_color'],
|
||||||
|
'header_logo_id' => $header?->id,
|
||||||
|
'footer_logo_id' => $footer?->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($tenant->storefront_website_type_code !== 'shopit'
|
||||||
|
|| ($carousel !== null && ! $carousel->is_enabled)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$definition = $this->websiteExtraService->definitionForTenant($tenant, 'carousel');
|
||||||
|
$ids = [];
|
||||||
|
$recrops = [];
|
||||||
|
foreach ($data['banner_images'] as $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $carousel?->config ?? [], 'banner_images');
|
||||||
|
$crops = $this->crops($item);
|
||||||
|
|
||||||
|
if ($attachment === null) {
|
||||||
|
$attachment = $crops === null
|
||||||
|
? $this->attachmentService->store($image, "tenants/{$tenant->codigo}/extras/carousel")
|
||||||
|
: $this->attachmentService->storeCroppedImageVariants(
|
||||||
|
$image, "tenants/{$tenant->codigo}/extras/carousel", $crops
|
||||||
|
);
|
||||||
|
$created[] = $attachment;
|
||||||
|
} elseif ($crops !== null) {
|
||||||
|
$recrops[] = [$attachment, $crops];
|
||||||
|
}
|
||||||
|
$ids[] = $attachment->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant->websiteExtras()->updateOrCreate(
|
||||||
|
['website_type_extra_id' => $definition->id],
|
||||||
|
['config' => $ids]
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($recrops as [$attachment, $crops]) {
|
||||||
|
$this->attachmentService->updateImageCropVariants($attachment, $crops);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
foreach ($created as $attachment) {
|
||||||
|
$paths = [$attachment->path];
|
||||||
|
foreach ($attachment->cropVariants as $crop) {
|
||||||
|
if ($crop->croppedAttachment !== null) {
|
||||||
|
$paths[] = $crop->croppedAttachment->path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Storage::disk('s3')->delete($paths);
|
||||||
|
}
|
||||||
|
throw $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, int> $allowedIds */
|
||||||
|
private function existingImage(mixed $value, array $allowedIds, string $field): ?Attachment
|
||||||
|
{
|
||||||
|
if (! is_string($value) || ! Str::isUuid($value)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = Attachment::query()->where('key', $value)->first();
|
||||||
|
if ($attachment === null || $attachment->type !== AttachmentType::Image
|
||||||
|
|| ! in_array($attachment->id, $allowedIds, true)) {
|
||||||
|
throw ValidationException::withMessages([$field => 'La imagen no pertenece a esta marca.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, Attachment> $created */
|
||||||
|
private function logo(mixed $value, ?int $currentId, Tenant $tenant, array &$created): ?Attachment
|
||||||
|
{
|
||||||
|
if ($value === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$existing = $this->existingImage($value, $currentId === null ? [] : [$currentId], 'logo');
|
||||||
|
if ($existing !== null) {
|
||||||
|
return $existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = $this->attachmentService->store($value, "tenants/{$tenant->codigo}/logos");
|
||||||
|
$created[] = $attachment;
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, array<string, mixed>>|null */
|
||||||
|
private function crops(mixed $item): ?array
|
||||||
|
{
|
||||||
|
if (! is_array($item)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($item['crop_horizontal'], $item['crop_vertical'])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$crop = [
|
||||||
|
'crop_horizontal' => $item['crop_horizontal'],
|
||||||
|
'crop_vertical' => $item['crop_vertical'],
|
||||||
|
];
|
||||||
|
|
||||||
|
return ['desktop' => $crop, 'mobile' => $crop];
|
||||||
|
}
|
||||||
|
}
|
||||||
73
app/Domains/Core/Tenant/Services/ContactService.php
Normal file
73
app/Domains/Core/Tenant/Services/ContactService.php
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\PhoneNumber;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
class ContactService
|
||||||
|
{
|
||||||
|
public function load(Tenant $tenant): Tenant
|
||||||
|
{
|
||||||
|
return $tenant->load([
|
||||||
|
'socialMedia',
|
||||||
|
'addresses' => fn ($query) => $query->reorder()->orderByPivot('is_main', 'desc')->orderByPivot('id'),
|
||||||
|
'phoneNumbers',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(Tenant $tenant, array $data): Tenant
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($tenant, $data): Tenant {
|
||||||
|
// Serialize contact writes, including changes to the principal links.
|
||||||
|
Tenant::query()->whereKey($tenant->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$social = [];
|
||||||
|
foreach ($data['social_media'] as $index => $item) {
|
||||||
|
$social[$item['code']] = ['url' => $item['url'], 'orden' => $index];
|
||||||
|
}
|
||||||
|
$tenant->socialMedia()->sync($social);
|
||||||
|
|
||||||
|
foreach (['addresses', 'phone_numbers'] as $collection) {
|
||||||
|
$relation = $collection === 'addresses' ? $tenant->addresses() : $tenant->phoneNumbers();
|
||||||
|
$existing = $relation->get()->keyBy('id');
|
||||||
|
$links = [];
|
||||||
|
foreach (array_values($data[$collection]) as $index => $item) {
|
||||||
|
$id = $item['id'] ?? null;
|
||||||
|
if ($id !== null && ! $existing->has($id)) {
|
||||||
|
throw ValidationException::withMessages(["{$collection}.{$index}.id" => 'El contacto no pertenece al comercio.']);
|
||||||
|
}
|
||||||
|
$record = $id === null
|
||||||
|
? ($collection === 'addresses' ? new Address : new PhoneNumber)
|
||||||
|
: $existing->get($id);
|
||||||
|
$attributes = collect($item)->except(['id', 'is_main'])->all();
|
||||||
|
$record->fill($attributes);
|
||||||
|
if (! $record->exists) {
|
||||||
|
$record->label = $collection === 'addresses' ? 'Dirección' : 'Teléfono';
|
||||||
|
}
|
||||||
|
if ($record->exists && $record->isDirty()) {
|
||||||
|
$shared = $record->tenants()->where('tenants.codigo', '!=', $tenant->codigo)->exists()
|
||||||
|
|| ($record instanceof Address && $record->events()->exists());
|
||||||
|
if ($shared) {
|
||||||
|
$record = $record->replicate();
|
||||||
|
}
|
||||||
|
// An edited street address must not retain coordinates for the old location.
|
||||||
|
if ($record instanceof Address && $record->isDirty('address_text')) {
|
||||||
|
$record->latitude = null;
|
||||||
|
$record->longitude = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$record->save();
|
||||||
|
$links[$record->id] = ['is_main' => $index === 0];
|
||||||
|
}
|
||||||
|
// Clear the previous principal before sync to respect the unique index.
|
||||||
|
$relation->newPivotStatement()->where('tenant_codigo', $tenant->codigo)->update(['is_main' => false]);
|
||||||
|
$relation->sync($links);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->load($tenant);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
class TenantAddressService
|
||||||
|
{
|
||||||
|
public function setMainAddress(Tenant $tenant, Address $address): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($tenant, $address): void {
|
||||||
|
// Serialize changes for this tenant, including when it has no principal address yet.
|
||||||
|
Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
|
||||||
|
$tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
|
||||||
|
|
||||||
|
DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
|
||||||
|
$tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
|
||||||
|
});
|
||||||
|
|
||||||
|
$tenant->unsetRelation('addresses');
|
||||||
|
$tenant->unsetRelation('mainAddress');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Services;
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Core\Tenant\Models\WebsiteExtra;
|
use App\Domains\Core\Tenant\Models\WebsiteExtra;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
|
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
@@ -16,10 +16,16 @@ class TenantInformationService
|
|||||||
'favicon',
|
'favicon',
|
||||||
'headerBackgroundImage',
|
'headerBackgroundImage',
|
||||||
'footerBackgroundImage',
|
'footerBackgroundImage',
|
||||||
|
'storefrontWebsiteType',
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'mainAddress',
|
||||||
|
'phoneNumbers',
|
||||||
|
'mainPhoneNumber',
|
||||||
'websiteExtras.websiteTypeExtra',
|
'websiteExtras.websiteTypeExtra',
|
||||||
'activeEvent.dates',
|
'activeEvent.dates',
|
||||||
'activeEvent.socialMedia',
|
'activeEvent.socialMedia',
|
||||||
|
'activeEvent.address',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
125
app/Domains/Core/Tenant/Services/TenantProvisioningService.php
Normal file
125
app/Domains/Core/Tenant/Services/TenantProvisioningService.php
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Internal provisioning used by migrations and seeders.
|
||||||
|
*
|
||||||
|
* General tenant writes are intentionally not exposed through the HTTP API.
|
||||||
|
*/
|
||||||
|
class TenantProvisioningService
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
protected AttachmentService $attachmentService,
|
||||||
|
protected WebsiteExtraService $websiteExtraService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function create(array $data): Tenant
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($data): Tenant {
|
||||||
|
$images = [
|
||||||
|
'header_logo' => $data['header_logo'] ?? null,
|
||||||
|
'footer_logo' => $data['footer_logo'] ?? null,
|
||||||
|
'favicon' => $data['favicon'] ?? null,
|
||||||
|
'header_bg_image' => $data['header_bg_image'] ?? null,
|
||||||
|
'footer_bg_image' => $data['footer_bg_image'] ?? null,
|
||||||
|
];
|
||||||
|
$socialMedia = $data['social_media'] ?? [];
|
||||||
|
$extras = $data['extras'] ?? [];
|
||||||
|
|
||||||
|
unset(
|
||||||
|
$data['header_logo'],
|
||||||
|
$data['footer_logo'],
|
||||||
|
$data['favicon'],
|
||||||
|
$data['header_bg_image'],
|
||||||
|
$data['footer_bg_image'],
|
||||||
|
$data['social_media'],
|
||||||
|
$data['extras'],
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($images as $key => $image) {
|
||||||
|
$data[$key.'_id'] = $this->storeTenantImage($image);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @var Tenant $tenant */
|
||||||
|
$tenant = Tenant::query()->create($data);
|
||||||
|
$this->syncSocialMedia($tenant, $socialMedia);
|
||||||
|
|
||||||
|
foreach ($extras as $code => $config) {
|
||||||
|
$this->websiteExtraService->updateForTenant($tenant, $code, $config);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $tenant;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function update(Tenant $tenant, array $data): Tenant
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($tenant, $data): Tenant {
|
||||||
|
$imageKeys = [
|
||||||
|
'header_logo',
|
||||||
|
'footer_logo',
|
||||||
|
'favicon',
|
||||||
|
'header_bg_image',
|
||||||
|
'footer_bg_image',
|
||||||
|
];
|
||||||
|
$hasSocialMedia = array_key_exists('social_media', $data);
|
||||||
|
$socialMedia = $data['social_media'] ?? [];
|
||||||
|
unset($data['social_media']);
|
||||||
|
|
||||||
|
foreach ($imageKeys as $key) {
|
||||||
|
if (! array_key_exists($key, $data)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$data[$key.'_id'] = $this->storeTenantImage($data[$key]);
|
||||||
|
unset($data[$key]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant->update($data);
|
||||||
|
|
||||||
|
if ($hasSocialMedia) {
|
||||||
|
$this->syncSocialMedia($tenant, $socialMedia);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $tenant->refresh();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, array{code: string, url: string, orden?: int}> $socialMedia */
|
||||||
|
private function syncSocialMedia(Tenant $tenant, array $socialMedia): void
|
||||||
|
{
|
||||||
|
$associations = [];
|
||||||
|
|
||||||
|
foreach (array_values($socialMedia) as $index => $item) {
|
||||||
|
$associations[$item['code']] = [
|
||||||
|
'url' => $item['url'],
|
||||||
|
'orden' => $item['orden'] ?? $index,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant->socialMedia()->sync($associations);
|
||||||
|
$tenant->unsetRelation('socialMedia');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function storeTenantImage(mixed $image): ?int
|
||||||
|
{
|
||||||
|
if (! $image) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = is_string($image) && Str::isUuid($image)
|
||||||
|
? Attachment::query()->where('key', $image)->first()
|
||||||
|
: $this->attachmentService->store($image, 'tenants');
|
||||||
|
|
||||||
|
return $attachment?->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,198 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Services;
|
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
|
|
||||||
class TenantService
|
|
||||||
{
|
|
||||||
public function __construct(
|
|
||||||
protected AttachmentService $attachmentService,
|
|
||||||
protected WebsiteExtraService $websiteExtraService,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new tenant and store its logos.
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $data
|
|
||||||
*/
|
|
||||||
public function create(array $data): Tenant
|
|
||||||
{
|
|
||||||
return DB::transaction(function () use ($data): Tenant {
|
|
||||||
$headerLogo = $data['header_logo'] ?? null;
|
|
||||||
$footerLogo = $data['footer_logo'] ?? null;
|
|
||||||
$favicon = $data['favicon'] ?? null;
|
|
||||||
$headerBackgroundImage = $data['header_bg_image'] ?? null;
|
|
||||||
$footerBackgroundImage = $data['footer_bg_image'] ?? null;
|
|
||||||
$socialMedia = $data['social_media'] ?? [];
|
|
||||||
$extras = $data['extras'] ?? [];
|
|
||||||
|
|
||||||
unset(
|
|
||||||
$data['header_logo'],
|
|
||||||
$data['footer_logo'],
|
|
||||||
$data['favicon'],
|
|
||||||
$data['header_bg_image'],
|
|
||||||
$data['footer_bg_image'],
|
|
||||||
$data['social_media'],
|
|
||||||
$data['extras'],
|
|
||||||
);
|
|
||||||
|
|
||||||
$headerAttachmentId = null;
|
|
||||||
if ($headerLogo) {
|
|
||||||
$attachment = Str::isUuid($headerLogo)
|
|
||||||
? Attachment::query()->where('key', $headerLogo)->first()
|
|
||||||
: $this->attachmentService->store($headerLogo, 'tenants');
|
|
||||||
|
|
||||||
if ($attachment) {
|
|
||||||
$headerAttachmentId = $attachment->id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$footerAttachmentId = null;
|
|
||||||
if ($footerLogo) {
|
|
||||||
$attachment = Str::isUuid($footerLogo)
|
|
||||||
? Attachment::query()->where('key', $footerLogo)->first()
|
|
||||||
: $this->attachmentService->store($footerLogo, 'tenants');
|
|
||||||
|
|
||||||
if ($attachment) {
|
|
||||||
$footerAttachmentId = $attachment->id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$data['header_logo_id'] = $headerAttachmentId;
|
|
||||||
$data['footer_logo_id'] = $footerAttachmentId;
|
|
||||||
$data['favicon_id'] = $this->storeTenantImage($favicon);
|
|
||||||
$data['header_bg_image_id'] = $this->storeTenantImage($headerBackgroundImage);
|
|
||||||
$data['footer_bg_image_id'] = $this->storeTenantImage($footerBackgroundImage);
|
|
||||||
|
|
||||||
/** @var Tenant $tenant */
|
|
||||||
$tenant = Tenant::query()->create($data);
|
|
||||||
$this->syncSocialMedia($tenant, $socialMedia);
|
|
||||||
$this->websiteExtraService->createForTenant($tenant, $extras);
|
|
||||||
|
|
||||||
return $tenant;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update an existing tenant and store new logos if uploaded.
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $data
|
|
||||||
*/
|
|
||||||
public function update(Tenant $tenant, array $data): Tenant
|
|
||||||
{
|
|
||||||
return DB::transaction(function () use ($tenant, $data): Tenant {
|
|
||||||
$hasHeaderLogoKey = array_key_exists('header_logo', $data);
|
|
||||||
$hasFooterLogoKey = array_key_exists('footer_logo', $data);
|
|
||||||
$hasFaviconKey = array_key_exists('favicon', $data);
|
|
||||||
$hasHeaderBackgroundImageKey = array_key_exists('header_bg_image', $data);
|
|
||||||
$hasFooterBackgroundImageKey = array_key_exists('footer_bg_image', $data);
|
|
||||||
$hasSocialMediaKey = array_key_exists('social_media', $data);
|
|
||||||
$headerLogo = $data['header_logo'] ?? null;
|
|
||||||
$footerLogo = $data['footer_logo'] ?? null;
|
|
||||||
$favicon = $data['favicon'] ?? null;
|
|
||||||
$headerBackgroundImage = $data['header_bg_image'] ?? null;
|
|
||||||
$footerBackgroundImage = $data['footer_bg_image'] ?? null;
|
|
||||||
$socialMedia = $data['social_media'] ?? [];
|
|
||||||
|
|
||||||
unset(
|
|
||||||
$data['header_logo'],
|
|
||||||
$data['footer_logo'],
|
|
||||||
$data['favicon'],
|
|
||||||
$data['header_bg_image'],
|
|
||||||
$data['footer_bg_image'],
|
|
||||||
$data['social_media']
|
|
||||||
);
|
|
||||||
|
|
||||||
$tenant->fill($data);
|
|
||||||
|
|
||||||
if ($hasHeaderLogoKey) {
|
|
||||||
if ($headerLogo) {
|
|
||||||
$attachment = Str::isUuid($headerLogo)
|
|
||||||
? Attachment::query()->where('key', $headerLogo)->first()
|
|
||||||
: $this->attachmentService->store($headerLogo, 'tenants');
|
|
||||||
|
|
||||||
if ($attachment) {
|
|
||||||
$tenant->header_logo_id = $attachment->id;
|
|
||||||
} else {
|
|
||||||
$tenant->header_logo_id = null;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$tenant->header_logo_id = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasFooterLogoKey) {
|
|
||||||
if ($footerLogo) {
|
|
||||||
$attachment = Str::isUuid($footerLogo)
|
|
||||||
? Attachment::query()->where('key', $footerLogo)->first()
|
|
||||||
: $this->attachmentService->store($footerLogo, 'tenants');
|
|
||||||
|
|
||||||
if ($attachment) {
|
|
||||||
$tenant->footer_logo_id = $attachment->id;
|
|
||||||
} else {
|
|
||||||
$tenant->footer_logo_id = null;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$tenant->footer_logo_id = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasFaviconKey) {
|
|
||||||
$tenant->favicon_id = $this->storeTenantImage($favicon);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasHeaderBackgroundImageKey) {
|
|
||||||
$tenant->header_bg_image_id = $this->storeTenantImage($headerBackgroundImage);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($hasFooterBackgroundImageKey) {
|
|
||||||
$tenant->footer_bg_image_id = $this->storeTenantImage($footerBackgroundImage);
|
|
||||||
}
|
|
||||||
|
|
||||||
$tenant->save();
|
|
||||||
|
|
||||||
if ($hasSocialMediaKey) {
|
|
||||||
$this->syncSocialMedia($tenant, $socialMedia);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $tenant;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param array<int, array{code: string, url: string, orden?: int}> $socialMedia
|
|
||||||
*/
|
|
||||||
private function syncSocialMedia(Tenant $tenant, array $socialMedia): void
|
|
||||||
{
|
|
||||||
$owner = $tenant->activeEvent ?? $tenant;
|
|
||||||
$associations = [];
|
|
||||||
|
|
||||||
foreach (array_values($socialMedia) as $index => $item) {
|
|
||||||
$associations[$item['code']] = [
|
|
||||||
'url' => $item['url'],
|
|
||||||
'orden' => $item['orden'] ?? $index,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
$owner->socialMedia()->sync($associations);
|
|
||||||
$owner->unsetRelation('socialMedia');
|
|
||||||
}
|
|
||||||
|
|
||||||
private function storeTenantImage(mixed $image): ?int
|
|
||||||
{
|
|
||||||
if (! $image) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
$attachment = is_string($image) && Str::isUuid($image)
|
|
||||||
? Attachment::query()->where('key', $image)->first()
|
|
||||||
: $this->attachmentService->store($image, 'tenants');
|
|
||||||
|
|
||||||
return $attachment?->id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,16 +2,14 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Services;
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteTypeExtra;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Core\Tenant\Models\WebsiteExtra;
|
||||||
use App\Shared\Attachable\Enums\AttachmentType;
|
use App\Shared\Attachable\Enums\AttachmentType;
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use App\Shared\Rules\CroppedImageOrBase64Rule;
|
use App\Shared\Rules\CroppedImageOrBase64Rule;
|
||||||
use App\Shared\Rules\ImageOrBase64Rule;
|
use App\Shared\Rules\ImageOrBase64Rule;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Core\Tenant\Models\WebsiteExtra;
|
|
||||||
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
|
||||||
use App\Domains\Core\Tenant\Models\StorefrontWebsiteTypeExtra;
|
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
@@ -21,109 +19,6 @@ class WebsiteExtraService
|
|||||||
{
|
{
|
||||||
public function __construct(protected AttachmentService $attachmentService) {}
|
public function __construct(protected AttachmentService $attachmentService) {}
|
||||||
|
|
||||||
/**
|
|
||||||
* Build the request rules declared by the selected website type.
|
|
||||||
*
|
|
||||||
* @return array<string, mixed>
|
|
||||||
*/
|
|
||||||
public function requestRules(?string $websiteTypeCode): array
|
|
||||||
{
|
|
||||||
if (! is_string($websiteTypeCode) || $websiteTypeCode === '') {
|
|
||||||
return [
|
|
||||||
'extras' => ['prohibited'],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
$definitions = $this->definitionsFor($websiteTypeCode);
|
|
||||||
$allowedCodes = $definitions->pluck('codigo')->all();
|
|
||||||
$hasRequiredExtras = $definitions->contains(
|
|
||||||
fn (StorefrontWebsiteTypeExtra $definition): bool => $definition->is_required
|
|
||||||
);
|
|
||||||
|
|
||||||
$rules = [
|
|
||||||
'extras' => [
|
|
||||||
$hasRequiredExtras ? 'required' : 'sometimes',
|
|
||||||
'array',
|
|
||||||
function (string $attribute, mixed $value, \Closure $fail) use ($allowedCodes): void {
|
|
||||||
if (! is_array($value)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$unknownCodes = array_diff(array_keys($value), $allowedCodes);
|
|
||||||
|
|
||||||
if ($unknownCodes !== []) {
|
|
||||||
$fail(
|
|
||||||
'The '.$attribute.' field contains extras not supported by the website type: '
|
|
||||||
.implode(', ', $unknownCodes).'.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
foreach ($definitions as $definition) {
|
|
||||||
$schemaRules = $definition->config_schema['request_rules'] ?? [];
|
|
||||||
$rootRules = $this->compileRules($schemaRules['$'] ?? []);
|
|
||||||
$rootRules = array_values(array_filter(
|
|
||||||
$rootRules,
|
|
||||||
fn (mixed $rule): bool => ! in_array($rule, ['required', 'sometimes'], true)
|
|
||||||
));
|
|
||||||
array_unshift($rootRules, $definition->is_required ? 'required' : 'sometimes');
|
|
||||||
|
|
||||||
$rules["extras.{$definition->codigo}"] = $rootRules;
|
|
||||||
|
|
||||||
foreach ($schemaRules as $path => $pathRules) {
|
|
||||||
if ($path === '$') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$rules[$this->requestAttribute($definition->codigo, $path)] = $this->compileRules($pathRules);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $rules;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Transform and persist each extra selected for a tenant.
|
|
||||||
*
|
|
||||||
* @param array<string, mixed> $extras
|
|
||||||
*/
|
|
||||||
public function createForTenant(Tenant $tenant, array $extras): void
|
|
||||||
{
|
|
||||||
if ($extras === []) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$definitions = $this->definitionsFor((string) $tenant->storefront_website_type_code)
|
|
||||||
->keyBy('codigo');
|
|
||||||
|
|
||||||
foreach ($extras as $name => $config) {
|
|
||||||
/** @var StorefrontWebsiteTypeExtra|null $definition */
|
|
||||||
$definition = $definitions->get($name);
|
|
||||||
|
|
||||||
if (! $definition) {
|
|
||||||
throw ValidationException::withMessages([
|
|
||||||
'extras' => ["The extra {$name} is not supported by the selected website type."],
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$requestRoot = "extras.{$definition->codigo}";
|
|
||||||
$transformedConfig = $this->applyTransforms(
|
|
||||||
$tenant,
|
|
||||||
$definition,
|
|
||||||
$config,
|
|
||||||
$requestRoot
|
|
||||||
);
|
|
||||||
$tenant->websiteExtras()->create([
|
|
||||||
'website_type_extra_id' => $definition->id,
|
|
||||||
'config' => $transformedConfig,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$tenant->unsetRelation('websiteExtras');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build request rules for one extra addressed by its stable code.
|
* Build request rules for one extra addressed by its stable code.
|
||||||
*
|
*
|
||||||
@@ -201,19 +96,6 @@ class WebsiteExtraService
|
|||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Collection<int, StorefrontWebsiteTypeExtra>
|
|
||||||
*/
|
|
||||||
private function definitionsFor(string $websiteTypeCode): Collection
|
|
||||||
{
|
|
||||||
$websiteType = StorefrontWebsiteType::query()
|
|
||||||
->where('codigo', $websiteTypeCode)
|
|
||||||
->with('extras')
|
|
||||||
->first();
|
|
||||||
|
|
||||||
return $websiteType?->extras ?? collect();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string|array<int, mixed> $rules
|
* @param string|array<int, mixed> $rules
|
||||||
* @return array<int, mixed>
|
* @return array<int, mixed>
|
||||||
@@ -232,11 +114,6 @@ class WebsiteExtraService
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function requestAttribute(string $extraCode, string $path): string
|
|
||||||
{
|
|
||||||
return $this->configAttribute("extras.{$extraCode}", $path);
|
|
||||||
}
|
|
||||||
|
|
||||||
private function configAttribute(string $root, string $path): string
|
private function configAttribute(string $root, string $path): string
|
||||||
{
|
{
|
||||||
if ($path === '$') {
|
if ($path === '$') {
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ Es la raíz del modelo multi-tenant. Gestiona organizaciones/sitios, tipos de we
|
|||||||
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
||||||
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
||||||
- `SocialMedia`: catálogo de redes sociales asociables.
|
- `SocialMedia`: catálogo de redes sociales asociables.
|
||||||
|
- `phoneNumbers` y `mainPhoneNumber`: teléfonos públicos del tenant, definidos en el dominio `Core/PhoneNumber` y vinculados por `tenant_phone_numbers`. Solo un vínculo por tenant puede ser principal.
|
||||||
|
|
||||||
## Servicios
|
## Servicios
|
||||||
|
|
||||||
- `TenantService`: crea y actualiza tenants, incluyendo sus recursos asociados.
|
|
||||||
- `TenantInformationService`: carga un tenant y las relaciones requeridas por cada contexto.
|
- `TenantInformationService`: carga un tenant y las relaciones requeridas por cada contexto.
|
||||||
- `AdminWebsiteTypeService`: crea o actualiza los tipos de admin y su marca.
|
- `AdminWebsiteTypeService`: crea o actualiza los tipos de admin y su marca.
|
||||||
- `WebsiteExtraService`: construye reglas dinámicas, crea, actualiza y habilita/deshabilita extras.
|
- `WebsiteExtraService`: construye reglas dinámicas, crea, actualiza y habilita/deshabilita extras.
|
||||||
@@ -25,9 +25,19 @@ El par `(dominio, base_path)` es único. Un mismo dominio puede alojar el tenant
|
|||||||
|
|
||||||
## Endpoints
|
## Endpoints
|
||||||
|
|
||||||
- Recurso REST público/administrativo `/tenants`.
|
- `GET /tenants`, `GET /tenants/{codigo}` y `DELETE /tenants/{codigo}`.
|
||||||
|
- La creación y actualización general de tenants se administran mediante seeders o base de datos; no se exponen por API.
|
||||||
- Bajo `/v1/adminapp/tenant/website-extras`, con autenticación y contexto de tenant: consulta general, detalle, actualización y activación/desactivación.
|
- Bajo `/v1/adminapp/tenant/website-extras`, con autenticación y contexto de tenant: consulta general, detalle, actualización y activación/desactivación.
|
||||||
|
- `GET /v1/adminapp/tenant/contact` y `PUT /v1/adminapp/tenant/contact`, con `auth:sanctum` y `adminapp.tenant`: consulta y reemplazo completo del contacto del comercio autenticado.
|
||||||
|
|
||||||
|
El PUT de contacto recibe `social_media` (`code`, `url`), `addresses` (`id` opcional para existentes, `address_text`) y `phone_numbers` (`id` opcional, `country_code`, `mobile_prefix`, `area_code`, `local_number`). Las tres colecciones son obligatorias; un array vacío elimina sus vínculos. El primer elemento enviado en cada lista de direcciones o teléfonos es siempre el principal: el backend calcula `is_main` por posición e ignora las marcas enviadas por clientes anteriores. GET y PUT devuelven el principal primero para conservarlo en el siguiente guardado. Los IDs existentes deben estar vinculados al comercio autenticado. Todos los cambios se realizan en una transacción, serializada por tenant, y la respuesta devuelve los registros persistidos y sus IDs.
|
||||||
|
|
||||||
|
Se conservan etiquetas y coordenadas de direcciones sin modificar; al cambiar el texto se limpian las coordenadas para evitar mostrar el mapa de una ubicación anterior. Las ediciones de registros compartidos crean una copia para el comercio, preservando otros comercios y eventos. Las bajas desvinculan registros sin borrar datos compartidos.
|
||||||
|
|
||||||
|
Contacto administra exclusivamente las redes del comercio. `TenantResource.tenant_social_media` siempre expone esas redes y alimenta Contacto y el footer públicos. `social_media` mantiene la selección histórica del evento activo; `event.social_media` sigue disponible para las vistas de evento. Guardar Contacto no modifica redes del evento.
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
||||||
|
|
||||||
|
Los resources exponen `phone_numbers` (incluye `is_main`) y `main_phone_number`, con `id`, `label`, `number` y `tel_url`. Contacto muestra la colección y el footer usa el principal. La migración copia primero `tenants.phone` como principal y luego el teléfono de `help.contact`, si es distinto; si no existe teléfono del tenant, el del menú pasa a ser principal. Los duplicados por formato se comparan dentro de cada tenant sin inferir país ni código de área. Los campos anteriores se conservan como datos legacy, pero la tienda consume las relaciones nuevas y el adminapp las edita mediante el endpoint de contacto.
|
||||||
|
|||||||
@@ -1,11 +1,21 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\ContactController;
|
||||||
|
use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
|
||||||
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
|
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant')
|
Route::prefix('v1/adminapp/tenant')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
|
Route::get('contact', [ContactController::class, 'show']);
|
||||||
|
Route::put('contact', [ContactController::class, 'update']);
|
||||||
|
Route::get('brand', [BrandController::class, 'show']);
|
||||||
|
Route::put('brand', [BrandController::class, 'update']);
|
||||||
|
Route::get('help-menus', [HelpMenuController::class, 'index']);
|
||||||
|
Route::patch('help-menus/{menuCode}/toggle', [HelpMenuController::class, 'toggle']);
|
||||||
|
Route::put('help-menus/{menuCode}/content', [HelpMenuController::class, 'updateContent']);
|
||||||
Route::get('website-extras', [WebsiteExtraController::class, 'show']);
|
Route::get('website-extras', [WebsiteExtraController::class, 'show']);
|
||||||
Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
|
Route::get('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'showExtra']);
|
||||||
Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);
|
Route::put('website-extras/{websiteExtraCode}', [WebsiteExtraController::class, 'update']);
|
||||||
|
|||||||
@@ -3,6 +3,6 @@
|
|||||||
use App\Domains\Core\Tenant\Controllers\TenantController;
|
use App\Domains\Core\Tenant\Controllers\TenantController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::apiResource('tenants', TenantController::class);
|
Route::apiResource('tenants', TenantController::class)->except(['store', 'update']);
|
||||||
|
|
||||||
require __DIR__.'/adminapp.php';
|
require __DIR__.'/adminapp.php';
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
|
class EntryReservationController extends Controller
|
||||||
|
{
|
||||||
|
public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return EntryReservationResource::collection(
|
||||||
|
$service->reservations($request->user(), $request->validated()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadPdf(
|
||||||
|
ExportEntryReservationsRequest $request,
|
||||||
|
EntryReservationService $service,
|
||||||
|
EntryReservationPdfService $pdf,
|
||||||
|
): Response {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
$service->reservationsForExport($user, $request->validated()),
|
||||||
|
$request->validated('timezone'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadExcel(
|
||||||
|
ExportEntryReservationsRequest $request,
|
||||||
|
EntryReservationService $service,
|
||||||
|
EntryReservationExcelService $excel,
|
||||||
|
): StreamedResponse {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $excel->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
$service->reservationsForExport($user, $request->validated()),
|
||||||
|
$request->validated('timezone'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadTicketPdf(
|
||||||
|
IndexEntryReservationsRequest $request,
|
||||||
|
int $reservation,
|
||||||
|
EntryReservationService $service,
|
||||||
|
TicketPdfService $pdf,
|
||||||
|
): Response {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
collect([$service->reservationTicket($user, $reservation)]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return EntryReservationResource::collection($service->reserve(
|
||||||
|
$request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function destroy(
|
||||||
|
IndexEntryReservationsRequest $request,
|
||||||
|
int $reservation,
|
||||||
|
EntryReservationService $service,
|
||||||
|
): Response {
|
||||||
|
$service->cancel($request->user(), $reservation);
|
||||||
|
|
||||||
|
return response()->noContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Enums;
|
||||||
|
|
||||||
|
enum EntryReservationPaymentType: string
|
||||||
|
{
|
||||||
|
case Free = 'sin_cargo';
|
||||||
|
case Other = 'otro_metodo';
|
||||||
|
|
||||||
|
public function label(): string
|
||||||
|
{
|
||||||
|
return match ($this) {
|
||||||
|
self::Free => 'Sin cargo',
|
||||||
|
self::Other => 'Otro método',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return list<array{value: string, label: string}> */
|
||||||
|
public static function options(): array
|
||||||
|
{
|
||||||
|
return array_map(
|
||||||
|
fn (self $type): array => [
|
||||||
|
'value' => $type->value,
|
||||||
|
'label' => $type->label(),
|
||||||
|
],
|
||||||
|
self::cases(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
54
app/Domains/Ticketing/Desfile/Models/EntryReservation.php
Normal file
54
app/Domains/Ticketing/Desfile/Models/EntryReservation.php
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'variant_id',
|
||||||
|
'ticket_id',
|
||||||
|
'inventory_id',
|
||||||
|
'batch_id',
|
||||||
|
'fecha_reserva',
|
||||||
|
'importe',
|
||||||
|
'tipo_pago',
|
||||||
|
])]
|
||||||
|
class EntryReservation extends Model
|
||||||
|
{
|
||||||
|
use SoftDeletes;
|
||||||
|
|
||||||
|
protected $table = 'desfile_entry_reservations';
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'variant_id' => 'integer',
|
||||||
|
'fecha_reserva' => 'datetime',
|
||||||
|
'importe' => 'decimal:2',
|
||||||
|
'tipo_pago' => EntryReservationPaymentType::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Variant, $this> */
|
||||||
|
public function variant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Variant::class)->withTrashed();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ticket(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Ticket::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function inventory(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Inventory::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Shared\Rules\ValidTimezone;
|
||||||
|
|
||||||
|
class ExportEntryReservationsRequest extends IndexEntryReservationsRequest
|
||||||
|
{
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
...parent::rules(),
|
||||||
|
'timezone' => ['required', 'string', new ValidTimezone],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class IndexEntryReservationsRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user()?->tenant_codigo === 'desfile_pura_tendencia';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'tipo_pago' => ['sometimes', 'nullable', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
'page' => ['sometimes', 'integer', 'min:1'],
|
||||||
|
'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class StoreEntryReservationsRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user()?->tenant_codigo === 'desfile_pura_tendencia';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'idempotency_key' => ['required', 'uuid'],
|
||||||
|
'rows' => ['required', 'array', 'min:1', 'max:100'],
|
||||||
|
'rows.*' => ['required', 'array:variant_id,tipo_pago'],
|
||||||
|
'rows.*.variant_id' => ['required', 'integer', 'min:1', 'distinct'],
|
||||||
|
'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class EntryReservationResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
$selection = $this->relationLoaded('variant')
|
||||||
|
? $this->variant->selectionOptions()
|
||||||
|
: collect();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'variant_id' => $this->variant_id,
|
||||||
|
'ticket_id' => $this->ticket_id,
|
||||||
|
'fecha_reserva' => $this->fecha_reserva->toIso8601String(),
|
||||||
|
'tipo_pago' => $this->tipo_pago->value,
|
||||||
|
'tipo_pago_label' => $this->tipo_pago->label(),
|
||||||
|
'importe' => $this->importe,
|
||||||
|
'entrada' => [
|
||||||
|
'tipo' => $this->selectionLabel($selection->get('tipo')),
|
||||||
|
'sector' => $this->selectionLabel($selection->get('sector')),
|
||||||
|
'fila' => $this->selectionLabel($selection->get('fila')),
|
||||||
|
'asiento' => $this->selectionLabel($selection->get('asiento')),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function selectionLabel(mixed $selection): ?string
|
||||||
|
{
|
||||||
|
if (! is_array($selection)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_is_list($selection)) {
|
||||||
|
$labels = collect($selection)->pluck('label')->filter()->implode(', ');
|
||||||
|
|
||||||
|
return $labels !== '' ? $labels : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isset($selection['label']) ? (string) $selection['label'] : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
|
class EntryReservationExcelService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly EntryReservationReportService $report) {}
|
||||||
|
|
||||||
|
/** @param Collection<int, EntryReservation> $reservations */
|
||||||
|
public function download(Tenant $tenant, Collection $reservations, string $timeZone): StreamedResponse
|
||||||
|
{
|
||||||
|
$generatedAt = now();
|
||||||
|
$rows = $this->report->rows($reservations);
|
||||||
|
$spreadsheet = new Spreadsheet;
|
||||||
|
$spreadsheet->getProperties()
|
||||||
|
->setCreator('Shopit')
|
||||||
|
->setTitle('Reservas de entradas')
|
||||||
|
->setSubject($tenant->nombre);
|
||||||
|
$sheet = $spreadsheet->getActiveSheet();
|
||||||
|
$sheet->setTitle('Reservas');
|
||||||
|
$sheet->fromArray([
|
||||||
|
'Tipo',
|
||||||
|
'Sector',
|
||||||
|
'Fila',
|
||||||
|
'Asiento',
|
||||||
|
'ID',
|
||||||
|
'Fecha',
|
||||||
|
'Importe',
|
||||||
|
'Pago',
|
||||||
|
], null, 'A1');
|
||||||
|
|
||||||
|
foreach ($rows as $index => $reservation) {
|
||||||
|
$row = $index + 2;
|
||||||
|
foreach (['A' => 'tipo', 'B' => 'sector', 'C' => 'fila', 'D' => 'asiento'] as $column => $key) {
|
||||||
|
$sheet->setCellValueExplicit("{$column}{$row}", $reservation[$key], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit(
|
||||||
|
"E{$row}",
|
||||||
|
$reservation['ticket_id'] === null ? '-' : (string) $reservation['ticket_id'],
|
||||||
|
DataType::TYPE_STRING,
|
||||||
|
);
|
||||||
|
$sheet->setCellValue(
|
||||||
|
"F{$row}",
|
||||||
|
Date::dateTimeToExcel($reservation['fecha_reserva']->copy()->timezone($timeZone)),
|
||||||
|
);
|
||||||
|
if ($reservation['importe'] !== null) {
|
||||||
|
$sheet->setCellValue("G{$row}", (float) $reservation['importe']);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit("H{$row}", $reservation['pago'], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
|
||||||
|
$lastRow = max(2, $rows->count() + 1);
|
||||||
|
$sheet->getStyle("F2:F{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm');
|
||||||
|
$sheet->getStyle("G2:G{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00');
|
||||||
|
$sheet->getStyle('A1:H1')->applyFromArray([
|
||||||
|
'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']],
|
||||||
|
'fill' => [
|
||||||
|
'fillType' => Fill::FILL_SOLID,
|
||||||
|
'startColor' => ['rgb' => '26382E'],
|
||||||
|
],
|
||||||
|
'alignment' => ['vertical' => Alignment::VERTICAL_CENTER],
|
||||||
|
]);
|
||||||
|
$sheet->getRowDimension(1)->setRowHeight(24);
|
||||||
|
$sheet->freezePane('A2');
|
||||||
|
$sheet->setAutoFilter("A1:H{$lastRow}");
|
||||||
|
foreach (['A' => 20, 'B' => 22, 'C' => 12, 'D' => 12, 'E' => 16, 'F' => 20, 'G' => 16, 'H' => 18] as $column => $width) {
|
||||||
|
$sheet->getColumnDimension($column)->setWidth($width);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = 'reservas_entradas_'.$tenant->codigo.'_'
|
||||||
|
.$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx';
|
||||||
|
|
||||||
|
return response()->streamDownload(function () use ($spreadsheet): void {
|
||||||
|
(new Xlsx($spreadsheet))->save('php://output');
|
||||||
|
$spreadsheet->disconnectWorksheets();
|
||||||
|
}, $filename, [
|
||||||
|
'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Barryvdh\DomPDF\Facade\Pdf;
|
||||||
|
use Barryvdh\DomPDF\PDF as DomPdf;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class EntryReservationPdfService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly EntryReservationReportService $report) {}
|
||||||
|
|
||||||
|
/** @param Collection<int, EntryReservation> $reservations */
|
||||||
|
public function download(Tenant $tenant, Collection $reservations, string $timeZone): Response
|
||||||
|
{
|
||||||
|
$generatedAt = now();
|
||||||
|
$rows = $this->report->rows($reservations);
|
||||||
|
$pdf = Pdf::loadView('pdf.adminapp.desfile-entry-reservations', [
|
||||||
|
'tenant' => $tenant,
|
||||||
|
'reservations' => $rows,
|
||||||
|
'generatedAt' => $generatedAt,
|
||||||
|
'timeZone' => $timeZone,
|
||||||
|
])->setPaper('a4', 'landscape');
|
||||||
|
|
||||||
|
$this->addPageNumbers($pdf);
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
'reservas_entradas_'.$tenant->codigo.'_'
|
||||||
|
.$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function addPageNumbers(DomPdf $pdf): void
|
||||||
|
{
|
||||||
|
$pdf->render();
|
||||||
|
$domPdf = $pdf->getDomPDF();
|
||||||
|
$font = $domPdf->getFontMetrics()->getFont('DejaVu Sans');
|
||||||
|
|
||||||
|
$domPdf->getCanvas()->page_text(
|
||||||
|
385,
|
||||||
|
575,
|
||||||
|
'Página {PAGE_NUM} de {PAGE_COUNT}',
|
||||||
|
$font,
|
||||||
|
7,
|
||||||
|
[0.48, 0.52, 0.49],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class EntryReservationReportService
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param Collection<int, EntryReservation> $reservations
|
||||||
|
* @return Collection<int, array<string, mixed>>
|
||||||
|
*/
|
||||||
|
public function rows(Collection $reservations): Collection
|
||||||
|
{
|
||||||
|
return $reservations->values()->map(function (EntryReservation $reservation): array {
|
||||||
|
$selection = $reservation->variant->selectionOptions();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'tipo' => $this->selectionLabel($selection->get('tipo')),
|
||||||
|
'sector' => $this->selectionLabel($selection->get('sector')),
|
||||||
|
'fila' => $this->selectionLabel($selection->get('fila')),
|
||||||
|
'asiento' => $this->selectionLabel($selection->get('asiento')),
|
||||||
|
'ticket_id' => $reservation->ticket_id,
|
||||||
|
'fecha_reserva' => $reservation->fecha_reserva,
|
||||||
|
'importe' => $reservation->importe,
|
||||||
|
'pago' => $reservation->tipo_pago->label(),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function selectionLabel(mixed $selection): string
|
||||||
|
{
|
||||||
|
if (! is_array($selection)) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_is_list($selection)) {
|
||||||
|
return collect($selection)->pluck('label')->filter()->implode(', ') ?: '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
return isset($selection['label']) ? (string) $selection['label'] : '-';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,240 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
class EntryReservationService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly TicketGeneratorService $tickets) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null, page?: int, per_page?: int} $filters
|
||||||
|
* @return LengthAwarePaginator<EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservations(User $user, array $filters = []): LengthAwarePaginator
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
return $this->reservationsQuery($user, $filters)
|
||||||
|
->paginate(
|
||||||
|
perPage: $filters['per_page'] ?? 15,
|
||||||
|
pageName: 'page',
|
||||||
|
page: $filters['page'] ?? 1,
|
||||||
|
)
|
||||||
|
->withQueryString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null} $filters
|
||||||
|
* @return Collection<int, EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservationsForExport(User $user, array $filters = []): Collection
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
return $this->reservationsQuery($user, $filters)->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reservationTicket(User $user, int $reservationId): Ticket
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
$reservation = EntryReservation::query()
|
||||||
|
->whereKey($reservationId)
|
||||||
|
->whereNotNull('ticket_id')
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->with(['ticket' => fn ($query) => $query->with([
|
||||||
|
...TicketValidityResolver::RELATIONS,
|
||||||
|
...TicketPresentationResolver::RELATIONS,
|
||||||
|
])])
|
||||||
|
->firstOrFail();
|
||||||
|
|
||||||
|
return $reservation->ticket;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(User $user, int $reservationId): void
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
DB::transaction(function () use ($user, $reservationId): void {
|
||||||
|
$reservation = EntryReservation::query()
|
||||||
|
->whereKey($reservationId)
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->lockForUpdate()
|
||||||
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ($reservation->ticket_id !== null) {
|
||||||
|
$ticket = Ticket::query()->lockForUpdate()->findOrFail($reservation->ticket_id);
|
||||||
|
|
||||||
|
if (! $ticket->can_cancel()) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'status' => 'El ticket debe estar activo para poder cancelar la reserva.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$ticket->markAsCancelled();
|
||||||
|
$ticket->save();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($reservation->inventory_id !== null) {
|
||||||
|
$inventory = Inventory::query()->lockForUpdate()->findOrFail($reservation->inventory_id);
|
||||||
|
$inventory->releaseEntry(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$reservation->delete();
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array{tipo_pago?: string|null} $filters */
|
||||||
|
private function reservationsQuery(User $user, array $filters = []): Builder
|
||||||
|
{
|
||||||
|
return EntryReservation::query()
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->when(
|
||||||
|
$filters['tipo_pago'] ?? null,
|
||||||
|
fn (Builder $query, string $paymentType): Builder => $query->where('tipo_pago', $paymentType),
|
||||||
|
)
|
||||||
|
->with([
|
||||||
|
'variant.catalogItem.itemAttributes.attribute.options',
|
||||||
|
'variant.definitions.itemAttribute.attribute.options',
|
||||||
|
'variant.eventDates',
|
||||||
|
'variant.eventDate',
|
||||||
|
])
|
||||||
|
->orderByDesc('fecha_reserva')
|
||||||
|
->orderByDesc('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<array{variant_id: int, tipo_pago: string}> $rows */
|
||||||
|
public function reserve(User $user, string $key, array $rows): Collection
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
$normalized = collect($rows)->map(fn (array $row): array => [
|
||||||
|
'variant_id' => (int) $row['variant_id'], 'tipo_pago' => $row['tipo_pago'],
|
||||||
|
])->sortBy('variant_id')->values()->all();
|
||||||
|
$hash = hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR));
|
||||||
|
|
||||||
|
return DB::transaction(function () use ($user, $key, $rows, $hash): Collection {
|
||||||
|
// Serialize retries by the same administrator, including the first insert.
|
||||||
|
User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$batch = DB::table('desfile_reservation_batches')
|
||||||
|
->where('user_id', $user->id)->where('idempotency_key', $key)->lockForUpdate()->first();
|
||||||
|
if ($batch !== null) {
|
||||||
|
abort_unless($batch->tenant_code === $user->tenant_codigo && hash_equals($batch->request_hash, $hash), 409,
|
||||||
|
'La clave de envío ya fue utilizada con otras entradas.');
|
||||||
|
|
||||||
|
return EntryReservation::query()->where('batch_id', $batch->id)->with('ticket')->orderBy('id')->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant = $user->tenant()->firstOrFail();
|
||||||
|
$entry = CatalogItem::query()->forTenantCatalog($tenant)->where('slug', 'entrada')
|
||||||
|
->lockForUpdate()->firstOrFail();
|
||||||
|
$ids = array_column($rows, 'variant_id');
|
||||||
|
$variants = $entry->variants()->whereKey($ids)->orderBy('id')->lockForUpdate()->get();
|
||||||
|
$inventories = Inventory::query()->whereKey($variants->pluck('inventory_id')->filter()->unique())
|
||||||
|
->orderBy('id')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$variants->load([
|
||||||
|
'eventDates', 'eventDate',
|
||||||
|
'desfileEntryReservations' => fn ($query) => $query->lockForUpdate(),
|
||||||
|
]);
|
||||||
|
foreach ($variants as $variant) {
|
||||||
|
$variant->setRelation('inventory', $inventories->get($variant->inventory_id));
|
||||||
|
}
|
||||||
|
$entry->setRelation('variants', $variants);
|
||||||
|
$available = $entry->visibleVariants()->keyBy('id');
|
||||||
|
$requirements = [];
|
||||||
|
$errors = [];
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available->get($row['variant_id']);
|
||||||
|
if ($variant === null || $variant->inventory === null) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = $this->entryLabel($variants->firstWhere('id', $row['variant_id']), $index).': la entrada ya no está disponible.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$requirements[$variant->inventory_id] = ($requirements[$variant->inventory_id] ?? 0) + 1;
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
$tracked = $entry->inventory_policy !== InventoryPolicy::Unlimited;
|
||||||
|
foreach ($requirements as $inventoryId => $quantity) {
|
||||||
|
if ($tracked && $inventories[$inventoryId]->availableStock() < $quantity) {
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available[$row['variant_id']];
|
||||||
|
if ($variant->inventory_id === $inventoryId) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = $this->entryLabel($variant, $index).': no hay stock suficiente para reservar las entradas seleccionadas.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
$batchId = DB::table('desfile_reservation_batches')->insertGetId([
|
||||||
|
'user_id' => $user->id, 'tenant_code' => $tenant->codigo,
|
||||||
|
'idempotency_key' => $key, 'request_hash' => $hash,
|
||||||
|
'created_at' => now(), 'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
foreach ($requirements as $inventoryId => $quantity) {
|
||||||
|
$inventories[$inventoryId]->reserveEntry($quantity, $tracked);
|
||||||
|
}
|
||||||
|
$reservations = collect();
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available[$row['variant_id']];
|
||||||
|
$payment = EntryReservationPaymentType::from($row['tipo_pago']);
|
||||||
|
try {
|
||||||
|
$ticket = $this->tickets->generate($entry, $user, 1, $variant->id)->sole();
|
||||||
|
} catch (TicketGenerationException $exception) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"rows.{$index}.variant_id" => $this->entryLabel($variant, $index).': no se pudo emitir el ticket. '.$exception->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$reservation = EntryReservation::query()->create([
|
||||||
|
'batch_id' => $batchId, 'ticket_id' => $ticket->id,
|
||||||
|
'variant_id' => $variant->id, 'inventory_id' => $variant->inventory_id,
|
||||||
|
'fecha_reserva' => now(), 'tipo_pago' => $payment,
|
||||||
|
'importe' => $payment === EntryReservationPaymentType::Free ? 0 : $variant->getPrice(),
|
||||||
|
]);
|
||||||
|
$reservations->push($reservation->setRelation('ticket', $ticket));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $reservations;
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function entryLabel(?Variant $variant, int $index): string
|
||||||
|
{
|
||||||
|
if ($variant === null) {
|
||||||
|
return 'Entrada '.($index + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$values = $variant->selectionValues();
|
||||||
|
|
||||||
|
return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento'])
|
||||||
|
->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar'))
|
||||||
|
->implode(', ');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Http\UploadedFile;
|
use Illuminate\Http\UploadedFile;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -254,7 +254,7 @@ class EntryService
|
|||||||
{
|
{
|
||||||
$inventory = $variant->inventory;
|
$inventory = $variant->inventory;
|
||||||
|
|
||||||
if (($inventory?->reserved_stock ?? 0) > 0 || ($inventory?->sold_units ?? 0) > 0) {
|
if (($inventory?->reserved_stock ?? 0) > 0 || ($inventory?->entry_reserved_stock ?? 0) > 0 || ($inventory?->sold_units ?? 0) > 0) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
$key => [
|
$key => [
|
||||||
'No se puede modificar ni eliminar un asiento con ventas o reservas.',
|
'No se puede modificar ni eliminar un asiento con ventas o reservas.',
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
@@ -393,14 +394,22 @@ class InvitationPurchaseProvisioner
|
|||||||
|
|
||||||
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
||||||
|
|
||||||
if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0) {
|
$available = $inventory?->available_stock
|
||||||
|
?? ($inventory === null ? 0 : $inventory->real_stock - $inventory->reserved_stock - ($inventory->entry_reserved_stock ?? 0));
|
||||||
|
if ($available < 1) {
|
||||||
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
||||||
}
|
}
|
||||||
|
|
||||||
DB::table('inventories')->where('id', $inventory->id)->update([
|
if (property_exists($inventory, 'available_stock')) {
|
||||||
'real_stock' => $inventory->real_stock - 1,
|
Inventory::query()->findOrFail($inventory->id)->commitDirectSale(1);
|
||||||
'sold_units' => $inventory->sold_units + 1,
|
} else {
|
||||||
]);
|
// This provisioner is also used by historical migrations that run
|
||||||
|
// before generated availability and the movement ledger exist.
|
||||||
|
DB::table('inventories')->where('id', $inventory->id)->update([
|
||||||
|
'real_stock' => $inventory->real_stock - 1,
|
||||||
|
'sold_units' => $inventory->sold_units + 1,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
||||||
if ($reservationId === null) {
|
if ($reservationId === null) {
|
||||||
|
|||||||
@@ -1,10 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Domains\Ticketing\Desfile\Controllers\EntryController;
|
use App\Domains\Ticketing\Desfile\Controllers\EntryController;
|
||||||
|
use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.index');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.pdf');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.excel');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
||||||
|
->whereNumber('reservation')
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
||||||
|
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.store');
|
||||||
|
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
||||||
|
->whereNumber('reservation')
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.destroy');
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant/desfile')
|
Route::prefix('v1/adminapp/tenant/desfile')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('entries', [EntryController::class, 'show'])
|
Route::get('entries', [EntryController::class, 'show'])
|
||||||
->name('adminapp.desfile.entries.show');
|
->name('adminapp.desfile.entries.show');
|
||||||
|
|||||||
@@ -2,9 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Models;
|
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\SocialMedia;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -13,14 +16,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
#[Fillable(['tenant_code', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
||||||
class Event extends Model
|
class Event extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Tenant, $this> */
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
@@ -29,6 +32,23 @@ class Event extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Client, $this> */
|
||||||
|
public function client(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Client::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function effectiveClient(): Client
|
||||||
|
{
|
||||||
|
return $this->client ?? $this->tenant->client;
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<EventCategory, $this> */
|
/** @return BelongsTo<EventCategory, $this> */
|
||||||
public function eventCategory(): BelongsTo
|
public function eventCategory(): BelongsTo
|
||||||
{
|
{
|
||||||
@@ -53,6 +73,12 @@ class Event extends Model
|
|||||||
return $this->hasMany(CatalogItem::class)->whereAvailable()->orderBy('group_order')->orderBy('id');
|
return $this->hasMany(CatalogItem::class)->whereAvailable()->orderBy('group_order')->orderBy('id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Ticket, $this> */
|
||||||
|
public function tickets(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Ticket::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsToMany<SocialMedia, $this> */
|
/** @return BelongsToMany<SocialMedia, $this> */
|
||||||
public function socialMedia(): BelongsToMany
|
public function socialMedia(): BelongsToMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
namespace App\Domains\Ticketing\Event\Models;
|
namespace App\Domains\Ticketing\Event\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Enums\EventDateStatus;
|
use App\Domains\Ticketing\Event\Enums\EventDateStatus;
|
||||||
use App\Domains\Ticketing\Event\Services\EffectiveEventDateResolver;
|
use App\Domains\Ticketing\Event\Services\EffectiveEventDateResolver;
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
|
use App\Domains\Ticketing\Event\Services\EventDateTextFormatter;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
|
use App\Domains\Ticketing\Ticket\Enums\ValidityTimeType;
|
||||||
use App\Domains\Ticketing\Ticket\Models\ValidityTime;
|
use App\Domains\Ticketing\Ticket\Models\ValidityTime;
|
||||||
use Carbon\CarbonInterface;
|
use Carbon\CarbonInterface;
|
||||||
@@ -131,12 +131,12 @@ class EventDate extends Model
|
|||||||
|
|
||||||
public function startsAt(): CarbonInterface
|
public function startsAt(): CarbonInterface
|
||||||
{
|
{
|
||||||
return Carbon::parse($this->date->format('Y-m-d').' '.$this->time_start);
|
return Carbon::parse($this->date->format('Y-m-d').' '.$this->time_start, $this->tenant->timezone);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function endsAt(): CarbonInterface
|
public function endsAt(): CarbonInterface
|
||||||
{
|
{
|
||||||
$endsAt = Carbon::parse($this->date->format('Y-m-d').' '.$this->time_end);
|
$endsAt = Carbon::parse($this->date->format('Y-m-d').' '.$this->time_end, $this->tenant->timezone);
|
||||||
|
|
||||||
return $endsAt->lessThanOrEqualTo($this->startsAt())
|
return $endsAt->lessThanOrEqualTo($this->startsAt())
|
||||||
? $endsAt->addDay()
|
? $endsAt->addDay()
|
||||||
@@ -184,8 +184,8 @@ class EventDate extends Model
|
|||||||
|
|
||||||
private function syncValidityTime(): void
|
private function syncValidityTime(): void
|
||||||
{
|
{
|
||||||
$startsAt = $this->startsAt();
|
$startsAt = $this->startsAt()->utc();
|
||||||
$expiresAt = $this->endsAt();
|
$expiresAt = $this->endsAt()->utc();
|
||||||
|
|
||||||
$attributes = [
|
$attributes = [
|
||||||
'type' => ValidityTimeType::FixedWindow,
|
'type' => ValidityTimeType::FixedWindow,
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Resources;
|
namespace App\Domains\Ticketing\Event\Resources;
|
||||||
|
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -17,9 +18,11 @@ class EventResource extends JsonResource
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
|
'slug' => $this->slug,
|
||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use Illuminate\Support\Carbon;
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -15,10 +15,12 @@ class PublicEventResource extends JsonResource
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
|
'slug' => $this->slug,
|
||||||
'event_category_id' => $this->event_category_id,
|
'event_category_id' => $this->event_category_id,
|
||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
@@ -29,10 +31,7 @@ class PublicEventResource extends JsonResource
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Carbon::parse(
|
return $first->startsAt()->toISOString();
|
||||||
$first->date->format('Y-m-d').' '.$first->time_start,
|
|
||||||
config('app.event_timezone'),
|
|
||||||
)->toISOString();
|
|
||||||
}),
|
}),
|
||||||
'dates' => $this->whenLoaded('dates', fn () => $this->dates->map(fn ($date): array => [
|
'dates' => $this->whenLoaded('dates', fn () => $this->dates->map(fn ($date): array => [
|
||||||
'id' => $date->id,
|
'id' => $date->id,
|
||||||
@@ -52,8 +51,7 @@ class PublicEventResource extends JsonResource
|
|||||||
'description' => $item->descripcion,
|
'description' => $item->descripcion,
|
||||||
'price' => $item->precio,
|
'price' => $item->precio,
|
||||||
'image' => $item->attachments->first()?->getTemporaryUrl(1440),
|
'image' => $item->attachments->first()?->getTemporaryUrl(1440),
|
||||||
'requires_selection' => $item->itemAttributes->contains(fn ($attribute): bool =>
|
'requires_selection' => $item->itemAttributes->contains(fn ($attribute): bool => $attribute->show_in_selector && $attribute->attribute?->codigo !== 'event_date'),
|
||||||
$attribute->show_in_selector && $attribute->attribute?->codigo !== 'event_date'),
|
|
||||||
'maximum_quantity' => $item->inventory_policy === InventoryPolicy::Unlimited
|
'maximum_quantity' => $item->inventory_policy === InventoryPolicy::Unlimited
|
||||||
? null
|
? null
|
||||||
: $item->availableStock(),
|
: $item->availableStock(),
|
||||||
|
|||||||
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
|
||||||
|
class EventAddressService
|
||||||
|
{
|
||||||
|
/** Called inside the event update transaction, after validating the legacy location fields. */
|
||||||
|
public function syncLocation(Event $event, bool $coordinatesProvided = false): void
|
||||||
|
{
|
||||||
|
$address = $event->address;
|
||||||
|
$coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
|
||||||
|
$values = [
|
||||||
|
'address_text' => $event->location,
|
||||||
|
'latitude' => $coordinates['latitude'] ?? null,
|
||||||
|
'longitude' => $coordinates['longitude'] ?? null,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Editing one event must not change the location of another event or a tenant.
|
||||||
|
if ($address === null || $address->tenants()->exists()
|
||||||
|
|| $address->events()->where('events.id', '!=', $event->id)->exists()) {
|
||||||
|
$address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
|
||||||
|
$event->address()->associate($address);
|
||||||
|
$event->save();
|
||||||
|
} else {
|
||||||
|
$address->update($values);
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->setRelation('address', $address);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Services;
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -32,11 +32,12 @@ class EventService
|
|||||||
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
||||||
private readonly VariantReplacementService $variantReplacementService,
|
private readonly VariantReplacementService $variantReplacementService,
|
||||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||||
|
private readonly EventAddressService $eventAddressService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function forTenant(Tenant $tenant): Event
|
public function forTenant(Tenant $tenant): Event
|
||||||
{
|
{
|
||||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
@@ -49,6 +50,7 @@ class EventService
|
|||||||
'location' => $data['location'],
|
'location' => $data['location'],
|
||||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||||
]);
|
]);
|
||||||
|
$this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
|
||||||
$tenant->update([
|
$tenant->update([
|
||||||
...array_intersect_key($data, array_flip([
|
...array_intersect_key($data, array_flip([
|
||||||
'allow_ticket_refund',
|
'allow_ticket_refund',
|
||||||
@@ -64,7 +66,7 @@ class EventService
|
|||||||
$this->syncLegacyContact($event, $data['contact']);
|
$this->syncLegacyContact($event, $data['contact']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $event->load(['dates.validityTime', 'socialMedia']);
|
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,12 @@ class PublicEventService
|
|||||||
$query->where(function ($query) use ($term): void {
|
$query->where(function ($query) use ($term): void {
|
||||||
$query->where('title', 'like', '%'.$term.'%')
|
$query->where('title', 'like', '%'.$term.'%')
|
||||||
->orWhere('subtitle', 'like', '%'.$term.'%')
|
->orWhere('subtitle', 'like', '%'.$term.'%')
|
||||||
->orWhere('location', 'like', '%'.$term.'%');
|
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
||||||
|
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, Event $event): Event
|
public function find(Tenant $tenant, Event $event): Event
|
||||||
@@ -38,6 +39,7 @@ class PublicEventService
|
|||||||
|
|
||||||
return $event->load([
|
return $event->load([
|
||||||
'attachment',
|
'attachment',
|
||||||
|
'address',
|
||||||
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
'catalogItems.attachments',
|
'catalogItems.attachments',
|
||||||
|
|||||||
@@ -13,6 +13,32 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
|
|||||||
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
||||||
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
||||||
|
|
||||||
|
`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
|
||||||
|
obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
|
||||||
|
eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
|
||||||
|
|
||||||
|
La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
|
||||||
|
`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
|
||||||
|
`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
|
||||||
|
el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
|
||||||
|
ubicación; no modifica los campos ni los timestamps originales, ni vincula la
|
||||||
|
dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
|
||||||
|
Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
|
||||||
|
copia y revierten las inserciones para evitar una migración parcial. Las migraciones
|
||||||
|
deben ejecutarse explícitamente por quien administra la base.
|
||||||
|
|
||||||
|
Las respuestas públicas, administrativas y el evento del bootstrap incluyen
|
||||||
|
`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
|
||||||
|
se serializan como números o `null`. Los campos anteriores de la respuesta conservan
|
||||||
|
sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
|
||||||
|
El guardado administrativo de
|
||||||
|
`location` y `exact_location` también actualiza `addresses`; si una dirección está
|
||||||
|
compartida con otro evento o con un tenant, se crea una copia para el evento editado.
|
||||||
|
El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
|
||||||
|
todas las direcciones en contacto, la principal en el footer y la propia del evento
|
||||||
|
en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
|
||||||
|
coordenadas.
|
||||||
|
|
||||||
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
||||||
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
||||||
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ use Illuminate\Support\Facades\Route;
|
|||||||
|
|
||||||
require __DIR__.'/adminapp.php';
|
require __DIR__.'/adminapp.php';
|
||||||
|
|
||||||
Route::prefix('tenants/{tenant:codigo}')->group(function (): void {
|
Route::prefix('tenants/{tenant:codigo}')->scopeBindings()->group(function (): void {
|
||||||
Route::get('events', [PublicEventController::class, 'index']);
|
Route::get('events', [PublicEventController::class, 'index']);
|
||||||
Route::get('events/{event}', [PublicEventController::class, 'show']);
|
Route::get('events/{event:slug}', [PublicEventController::class, 'show']);
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::middleware('auth:sanctum')->post(
|
Route::middleware('auth:sanctum')->post(
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class AccommodationController extends Controller
|
|||||||
$this->accommodationService->upsertMany(
|
$this->accommodationService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class EntryController extends Controller
|
|||||||
$entries = $this->entryService->upsertMany(
|
$entries = $this->entryService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('entries'),
|
$request->validated('entries'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
);
|
);
|
||||||
|
|
||||||
return EntryResource::collection($entries)
|
return EntryResource::collection($entries)
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class FoodController extends Controller
|
|||||||
$this->foodService->upsertMany(
|
$this->foodService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -39,6 +40,7 @@ class FoodController extends Controller
|
|||||||
$this->foodService->updateHistoricalStock(
|
$this->foodService->updateHistoricalStock(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class MerchandiseController extends Controller
|
|||||||
$items = $this->merchandiseService->upsertMany(
|
$items = $this->merchandiseService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('items'),
|
$request->validated('items'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
);
|
);
|
||||||
|
|
||||||
return MerchandiseResource::collection($items)
|
return MerchandiseResource::collection($items)
|
||||||
|
|||||||
@@ -16,9 +16,10 @@ class UpdateHistoricalFoodStockRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,stock'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,stock_difference'],
|
||||||
'variants.*.id' => ['required', 'integer', 'distinct'],
|
'variants.*.id' => ['required', 'integer', 'distinct'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock_difference' => ['required', 'integer'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
|
namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Validator;
|
||||||
|
|
||||||
class UpsertAccommodationVariantsRequest extends FormRequest
|
class UpsertAccommodationVariantsRequest extends FormRequest
|
||||||
{
|
{
|
||||||
@@ -16,12 +17,42 @@ class UpsertAccommodationVariantsRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,title,description,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,title,description,stock,stock_difference,price'],
|
||||||
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
||||||
'variants.*.title' => ['required', 'string', 'max:255'],
|
'variants.*.title' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'variants.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<int, callable> */
|
||||||
|
public function after(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
function (Validator $validator): void {
|
||||||
|
foreach ($this->input('variants', []) as $index => $variant) {
|
||||||
|
if (! is_array($variant)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
||||||
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,stock_difference,price'],
|
||||||
'entries.*.id' => [
|
'entries.*.id' => [
|
||||||
'sometimes',
|
'sometimes',
|
||||||
'nullable',
|
'nullable',
|
||||||
@@ -46,7 +47,8 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
fn ($query) => $query->where('tenant_code', $tenantCode)
|
fn ($query) => $query->where('tenant_code', $tenantCode)
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'entries.*.stock' => ['required', 'integer', 'min:0'],
|
'entries.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'entries.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -61,6 +63,20 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($entry['id']) && ! array_key_exists('stock_difference', $entry)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"entries.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una entrada.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($entry['id']) && ! array_key_exists('stock', $entry)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"entries.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una entrada.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$dateIds = $entry['event_date_ids'] ?? [];
|
$dateIds = $entry['event_date_ids'] ?? [];
|
||||||
|
|
||||||
if (! is_array($dateIds)) {
|
if (! is_array($dateIds)) {
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,stock_difference,price'],
|
||||||
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
||||||
'variants.*.event_date_id' => [
|
'variants.*.event_date_id' => [
|
||||||
'required',
|
'required',
|
||||||
@@ -32,7 +33,8 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
'variants.*.schedule' => ['required', 'string', 'max:255'],
|
'variants.*.schedule' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.service' => ['required', 'string', 'max:255'],
|
'variants.*.service' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'variants.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -49,6 +51,20 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$key = implode('|', [
|
$key = implode('|', [
|
||||||
$variant['event_date_id'] ?? '',
|
$variant['event_date_id'] ?? '',
|
||||||
mb_strtolower(trim((string) ($variant['schedule'] ?? ''))),
|
mb_strtolower(trim((string) ($variant['schedule'] ?? ''))),
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user