Compare commits
17 Commits
6588d9f1a8
...
feature/ev
| Author | SHA1 | Date | |
|---|---|---|---|
| 45e92602ed | |||
| f10237eb1f | |||
| ab5bc43760 | |||
| 47b2e8e030 | |||
| 856b9a6706 | |||
| 3ddff7e0ee | |||
| 22de61c8c0 | |||
| 2d11263adc | |||
| c975b5d51d | |||
| c7afb70196 | |||
| 31955f862d | |||
| bb4495c6cc | |||
| 6e1f0d731c | |||
| 82c18e9e91 | |||
| dfad6fb4b0 | |||
| 3f9b773367 | |||
| 7996d53e12 |
@@ -1,18 +0,0 @@
|
|||||||
<?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';
|
|
||||||
}
|
|
||||||
@@ -8,6 +8,7 @@ use App\Domains\Commerce\Catalog\Enums\InventorySubject;
|
|||||||
use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
|
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\EntryReservation;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
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;
|
||||||
@@ -19,7 +20,6 @@ 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',
|
||||||
@@ -148,6 +148,12 @@ class CatalogItem extends Model
|
|||||||
return $this->hasMany(Ticket::class, 'source_catalog_item_id');
|
return $this->hasMany(Ticket::class, 'source_catalog_item_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<EntryReservation, $this> */
|
||||||
|
public function entryReservations(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(EntryReservation::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsToMany<Attribute, $this> */
|
/** @return BelongsToMany<Attribute, $this> */
|
||||||
public function attributes(): BelongsToMany
|
public function attributes(): BelongsToMany
|
||||||
{
|
{
|
||||||
@@ -214,14 +220,10 @@ 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) use ($availableInventory): void {
|
})->where(function (Builder $query): void {
|
||||||
$query
|
$query
|
||||||
->where(function (Builder $unlimitedQuery): void {
|
->where(function (Builder $unlimitedQuery): void {
|
||||||
$unlimitedQuery
|
$unlimitedQuery
|
||||||
@@ -241,18 +243,20 @@ class CatalogItem extends Model
|
|||||||
->whereNull('replaced_by_variant_id')
|
->whereNull('replaced_by_variant_id')
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
$availableInventory
|
fn (Builder $inventoryQuery): Builder => $inventoryQuery
|
||||||
|
->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock')
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->orWhere(function (Builder $directItemQuery) use ($availableInventory): void {
|
->orWhere(function (Builder $directItemQuery): void {
|
||||||
$directItemQuery
|
$directItemQuery
|
||||||
->whereDoesntHave('variants')
|
->whereDoesntHave('variants')
|
||||||
->where(function (Builder $inventoryQuery) use ($availableInventory): void {
|
->where(function (Builder $inventoryQuery): void {
|
||||||
$inventoryQuery
|
$inventoryQuery
|
||||||
->whereNull('catalog_items.inventory_id')
|
->whereNull('catalog_items.inventory_id')
|
||||||
->orWhereHas(
|
->orWhereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
$availableInventory
|
fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
|
||||||
|
->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock')
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -269,13 +273,13 @@ class CatalogItem extends Model
|
|||||||
{
|
{
|
||||||
$this->variants
|
$this->variants
|
||||||
->filter(fn (Variant $variant): bool => $variant->exists)
|
->filter(fn (Variant $variant): bool => $variant->exists)
|
||||||
->loadMissing('desfileEntryReservations');
|
->loadMissing('entryReservations');
|
||||||
|
|
||||||
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->relationLoaded('entryReservations')
|
||||||
|| $variant->desfileEntryReservations->isEmpty())
|
|| $variant->entryReservations->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,17 +2,11 @@
|
|||||||
|
|
||||||
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',
|
||||||
@@ -44,7 +38,6 @@ class Inventory extends Model
|
|||||||
'reserved_stock' => 'integer',
|
'reserved_stock' => 'integer',
|
||||||
'entry_reserved_stock' => 'integer',
|
'entry_reserved_stock' => 'integer',
|
||||||
'real_stock' => 'integer',
|
'real_stock' => 'integer',
|
||||||
'available_stock' => 'integer',
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,295 +59,70 @@ 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
|
||||||
{
|
{
|
||||||
if (! array_key_exists('available_stock', $this->attributes)) {
|
return max(0, $this->real_stock - $this->reserved_stock - $this->entry_reserved_stock);
|
||||||
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
|
public function reserveEntry(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
$this->mutate(
|
if ($amount < 1 || ($tracksInventory && $this->availableStock() < $amount)) {
|
||||||
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.');
|
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
||||||
}
|
}
|
||||||
},
|
$this->entry_reserved_stock += $amount;
|
||||||
);
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function releaseEntry(int $amount): void
|
public function releaseEntry(int $amount): void
|
||||||
{
|
{
|
||||||
$this->mutate(
|
if ($amount < 1 || $this->entry_reserved_stock < $amount) {
|
||||||
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.');
|
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
||||||
}
|
}
|
||||||
},
|
|
||||||
);
|
$this->entry_reserved_stock -= $amount;
|
||||||
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reserve(int $amount, bool $tracksInventory): void
|
public function reserve(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
$this->mutate(
|
|
||||||
InventoryMovementOperation::StockReserved,
|
|
||||||
['reserved_stock' => $amount],
|
|
||||||
function (self $inventory) use ($amount, $tracksInventory): void {
|
|
||||||
if ($amount < 0) {
|
if ($amount < 0) {
|
||||||
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
||||||
}
|
}
|
||||||
if ($tracksInventory && $inventory->availableStock() < $amount) {
|
|
||||||
|
if ($tracksInventory && $this->availableStock() < $amount) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
||||||
}
|
}
|
||||||
},
|
|
||||||
);
|
$this->reserved_stock += $amount;
|
||||||
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function release(int $amount): void
|
public function release(int $amount): void
|
||||||
{
|
{
|
||||||
$this->mutate(
|
if ($amount < 0 || $this->reserved_stock < $amount) {
|
||||||
InventoryMovementOperation::StockReleased,
|
|
||||||
['reserved_stock' => -$amount],
|
|
||||||
function (self $inventory) use ($amount): void {
|
|
||||||
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
||||||
}
|
}
|
||||||
},
|
|
||||||
);
|
$this->reserved_stock -= $amount;
|
||||||
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buy(int $amount, bool $tracksInventory): void
|
public function buy(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
$counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount];
|
if ($amount < 0 || $this->reserved_stock < $amount) {
|
||||||
if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) {
|
|
||||||
$counterDeltas['real_stock'] = -$amount;
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->mutate(
|
|
||||||
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.');
|
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
||||||
}
|
}
|
||||||
if ($tracksInventory && $inventory->availableStock() < 0) {
|
|
||||||
|
if ($tracksInventory && $this->real_stock - $this->entry_reserved_stock < $amount) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
}
|
}
|
||||||
},
|
|
||||||
);
|
if ($tracksInventory) {
|
||||||
|
$this->real_stock -= $amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function adjustAvailableStock(
|
$this->reserved_stock -= $amount;
|
||||||
int $delta,
|
$this->sold_units += $amount;
|
||||||
?User $responsibleUser = null,
|
|
||||||
?string $idempotencyKey = null,
|
|
||||||
): void {
|
|
||||||
if ($delta === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$operation = $delta > 0
|
|
||||||
? 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->mutate(
|
|
||||||
InventoryMovementOperation::StockRefunded,
|
|
||||||
$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->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,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
<?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,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
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\EntryReservation;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
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;
|
||||||
@@ -76,7 +76,7 @@ class Variant extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @return HasMany<EntryReservation, $this> */
|
/** @return HasMany<EntryReservation, $this> */
|
||||||
public function desfileEntryReservations(): HasMany
|
public function entryReservations(): HasMany
|
||||||
{
|
{
|
||||||
return $this->hasMany(EntryReservation::class);
|
return $this->hasMany(EntryReservation::class);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ 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)
|
||||||
@@ -154,7 +153,7 @@ class CatalogInventoryService
|
|||||||
|
|
||||||
if ($operation === 'commit'
|
if ($operation === 'commit'
|
||||||
&& $requirement['tracks_inventory']
|
&& $requirement['tracks_inventory']
|
||||||
&& $inventory->availableStock() < 0) {
|
&& $inventory->real_stock - $inventory->entry_reserved_stock < $requiredQuantity) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,12 +370,9 @@ class CatalogService
|
|||||||
|
|
||||||
private function createInventory(int $realStock): Inventory
|
private function createInventory(int $realStock): Inventory
|
||||||
{
|
{
|
||||||
$inventory = Inventory::query()->create([
|
return 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->availableStock() < 0)) {
|
|| ($line->tracks_inventory && $inventory->real_stock - $inventory->entry_reserved_stock < $line->quantity)) {
|
||||||
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,8 +7,8 @@ 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 App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class VariantReplacementService
|
class VariantReplacementService
|
||||||
@@ -194,7 +194,6 @@ class VariantReplacementService
|
|||||||
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
'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()
|
||||||
@@ -203,10 +202,7 @@ class VariantReplacementService
|
|||||||
}
|
}
|
||||||
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
->update(['inventory_id' => $replacementInventory->id]);
|
->update(['inventory_id' => $replacementInventory->id]);
|
||||||
$sourceInventory->transferCounters([
|
$sourceInventory->update(['reserved_stock' => 0, 'entry_reserved_stock' => 0]);
|
||||||
'reserved_stock' => -$sourceInventory->reserved_stock,
|
|
||||||
'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $replacementInventory;
|
return $replacementInventory;
|
||||||
}
|
}
|
||||||
@@ -240,14 +236,13 @@ class VariantReplacementService
|
|||||||
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$transferredCounters = [
|
$destinationInventory->update([
|
||||||
'real_stock' => $sourceInventory->real_stock,
|
'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock,
|
||||||
'reserved_stock' => $sourceInventory->reserved_stock,
|
'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock,
|
||||||
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
'entry_reserved_stock' => $destinationInventory->entry_reserved_stock + $sourceInventory->entry_reserved_stock,
|
||||||
'sold_units' => $sourceInventory->sold_units,
|
'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units,
|
||||||
'refunded_units' => $sourceInventory->refunded_units,
|
'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units,
|
||||||
];
|
]);
|
||||||
$destinationInventory->transferCounters($transferredCounters);
|
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
->whereKey($activeLines->modelKeys())
|
->whereKey($activeLines->modelKeys())
|
||||||
@@ -255,10 +250,13 @@ class VariantReplacementService
|
|||||||
}
|
}
|
||||||
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
->update(['inventory_id' => $destinationInventory->id]);
|
->update(['inventory_id' => $destinationInventory->id]);
|
||||||
$sourceInventory->transferCounters(array_map(
|
$sourceInventory->update([
|
||||||
fn (int $value): int => -$value,
|
'real_stock' => 0,
|
||||||
$transferredCounters,
|
'reserved_stock' => 0,
|
||||||
));
|
'entry_reserved_stock' => 0,
|
||||||
|
'sold_units' => 0,
|
||||||
|
'refunded_units' => 0,
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return list<string> */
|
/** @return list<string> */
|
||||||
|
|||||||
@@ -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,7 +2,6 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -26,9 +25,8 @@ 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')
|
'entry_reservations' => DB::table('entry_reservations')
|
||||||
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->count(),
|
||||||
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)
|
||||||
@@ -51,10 +49,9 @@ 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')
|
'entry_reservations_deleted' => DB::table('entry_reservations')
|
||||||
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
->whereIn('catalog_item_id', DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->delete(),
|
||||||
DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->delete(),
|
'entry_reservation_batches_deleted' => DB::table('reservation_batches')->where('tenant_code', $tenantCode)->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)
|
||||||
@@ -70,12 +67,15 @@ class TenantTransactionResetService
|
|||||||
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
||||||
];
|
];
|
||||||
|
|
||||||
Inventory::query()
|
DB::table('inventories')
|
||||||
->whereKey($scope['inventory_ids'])
|
->whereIn('id', $scope['inventory_ids'])
|
||||||
->orderBy('id')
|
->update([
|
||||||
->lockForUpdate()
|
'real_stock' => DB::raw('real_stock + sold_units - refunded_units'),
|
||||||
->get()
|
'reserved_stock' => 0,
|
||||||
->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters());
|
'entry_reserved_stock' => 0,
|
||||||
|
'sold_units' => 0,
|
||||||
|
'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.
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
<?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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
<?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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?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,
|
||||||
|
|||||||
@@ -33,11 +33,7 @@ class TenantBootstrapService
|
|||||||
$tenant,
|
$tenant,
|
||||||
[
|
[
|
||||||
'eventDateChanges',
|
'eventDateChanges',
|
||||||
'menues' => fn ($query) => $query
|
'menues' => fn ($query) => $query->whereHas(
|
||||||
->where(fn ($query) => $query
|
|
||||||
->where('menues.code', 'help.contact')
|
|
||||||
->orWhere('tenants_menues.is_enabled', true))
|
|
||||||
->whereHas(
|
|
||||||
'roles',
|
'roles',
|
||||||
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Menu extends Model
|
|||||||
'codigo'
|
'codigo'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content', 'is_enabled')
|
->withPivot('static_content')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,14 +16,12 @@ 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',
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
<?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()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
|
||||||
|
|
||||||
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use Illuminate\Http\JsonResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class HelpMenuController extends Controller
|
|
||||||
{
|
|
||||||
private const MENU_CODES = [
|
|
||||||
'help.faq',
|
|
||||||
'help.terms-and-conditions',
|
|
||||||
];
|
|
||||||
|
|
||||||
public function index(Request $request): JsonResponse
|
|
||||||
{
|
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
|
||||||
$menus = $tenant->menues()
|
|
||||||
->whereIn('menues.code', self::MENU_CODES)
|
|
||||||
->get()
|
|
||||||
->keyBy('code');
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'data' => collect(self::MENU_CODES)->mapWithKeys(
|
|
||||||
fn (string $code): array => [$code => [
|
|
||||||
'code' => $code,
|
|
||||||
'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
|
|
||||||
'static_content' => $menus->get($code)?->pivot?->static_content
|
|
||||||
?? $this->emptyContent($code),
|
|
||||||
]]
|
|
||||||
),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function toggle(
|
|
||||||
Request $request,
|
|
||||||
string $menuCode,
|
|
||||||
): JsonResponse {
|
|
||||||
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
|
||||||
|
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
|
||||||
$tenantMenu = $tenant->menues()
|
|
||||||
->where('menues.code', $menuCode)
|
|
||||||
->firstOrFail();
|
|
||||||
$isEnabled = ! $tenantMenu->pivot->is_enabled;
|
|
||||||
|
|
||||||
$tenant->menues()->updateExistingPivot($menuCode, [
|
|
||||||
'is_enabled' => $isEnabled,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'data' => [
|
|
||||||
'code' => $tenantMenu->code,
|
|
||||||
'is_enabled' => $isEnabled,
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function updateContent(
|
|
||||||
UpdateHelpMenuContentRequest $request,
|
|
||||||
string $menuCode,
|
|
||||||
): JsonResponse {
|
|
||||||
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
|
||||||
|
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
|
||||||
$tenantMenu = $tenant->menues()
|
|
||||||
->where('menues.code', $menuCode)
|
|
||||||
->firstOrFail();
|
|
||||||
$staticContent = $request->validated('static_content');
|
|
||||||
|
|
||||||
$tenant->menues()->updateExistingPivot($menuCode, [
|
|
||||||
'static_content' => $staticContent,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return response()->json([
|
|
||||||
'data' => [
|
|
||||||
'code' => $tenantMenu->code,
|
|
||||||
'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
|
|
||||||
'static_content' => $staticContent,
|
|
||||||
],
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
private function emptyContent(string $menuCode): array
|
|
||||||
{
|
|
||||||
return $menuCode === 'help.faq' ? [] : ['html' => ''];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,8 +6,6 @@ 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\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Menu\Models\TenantMenu;
|
use App\Domains\Core\Menu\Models\TenantMenu;
|
||||||
@@ -24,7 +22,6 @@ 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([
|
||||||
@@ -311,23 +308,6 @@ 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 menues(): BelongsToMany
|
public function menues(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(
|
return $this->belongsToMany(
|
||||||
@@ -339,7 +319,7 @@ class Tenant extends Model
|
|||||||
'code'
|
'code'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content', 'is_enabled')
|
->withPivot('static_content')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
<?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],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<?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,104 +0,0 @@
|
|||||||
<?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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<?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,6 @@
|
|||||||
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\Tenant\Models\StorefrontWebsiteType;
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
@@ -42,8 +41,6 @@ class TenantResource extends JsonResource
|
|||||||
'site_title' => $this->site_title ?? 'ShopitFront',
|
'site_title' => $this->site_title ?? 'ShopitFront',
|
||||||
'asset_url' => config('filesystems.disks.s3.url'),
|
'asset_url' => config('filesystems.disks.s3.url'),
|
||||||
'address' => $this->address,
|
'address' => $this->address,
|
||||||
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
|
|
||||||
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
|
|
||||||
'phone' => $this->phone,
|
'phone' => $this->phone,
|
||||||
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
||||||
'primary_color' => $this->primary_color,
|
'primary_color' => $this->primary_color,
|
||||||
@@ -130,7 +127,6 @@ 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)
|
||||||
|
|||||||
@@ -1,165 +0,0 @@
|
|||||||
<?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];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Domains\Core\Tenant\Services;
|
|
||||||
|
|
||||||
use App\Domains\Core\Address\Models\Address;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
|
|
||||||
class TenantAddressService
|
|
||||||
{
|
|
||||||
public function setMainAddress(Tenant $tenant, Address $address): void
|
|
||||||
{
|
|
||||||
DB::transaction(function () use ($tenant, $address): void {
|
|
||||||
// Serialize changes for this tenant, including when it has no principal address yet.
|
|
||||||
Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
|
|
||||||
$tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
|
|
||||||
|
|
||||||
DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
|
|
||||||
$tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
|
|
||||||
});
|
|
||||||
|
|
||||||
$tenant->unsetRelation('addresses');
|
|
||||||
$tenant->unsetRelation('mainAddress');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,12 +18,9 @@ class TenantInformationService
|
|||||||
'footerBackgroundImage',
|
'footerBackgroundImage',
|
||||||
'storefrontWebsiteType',
|
'storefrontWebsiteType',
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
'addresses',
|
|
||||||
'mainAddress',
|
|
||||||
'websiteExtras.websiteTypeExtra',
|
'websiteExtras.websiteTypeExtra',
|
||||||
'activeEvent.dates',
|
'activeEvent.dates',
|
||||||
'activeEvent.socialMedia',
|
'activeEvent.socialMedia',
|
||||||
'activeEvent.address',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,18 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Domains\Core\Tenant\Controllers\AdminApp\BrandController;
|
|
||||||
use App\Domains\Core\Tenant\Controllers\AdminApp\HelpMenuController;
|
|
||||||
use App\Domains\Core\Tenant\Controllers\AdminApp\WebsiteExtraController;
|
use 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('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']);
|
||||||
|
|||||||
@@ -6,18 +6,18 @@ use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest;
|
|||||||
use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest;
|
use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest;
|
||||||
use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest;
|
use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest;
|
||||||
use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource;
|
use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\DesfileEntryReservationService;
|
||||||
use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService;
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService;
|
||||||
use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService;
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService;
|
||||||
use App\Domains\Ticketing\Desfile\Services\EntryReservationService;
|
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
class EntryReservationController extends Controller
|
class DesfileEntryReservationController extends Controller
|
||||||
{
|
{
|
||||||
public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
public function index(IndexEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection
|
||||||
{
|
{
|
||||||
return EntryReservationResource::collection(
|
return EntryReservationResource::collection(
|
||||||
$service->reservations($request->user(), $request->validated()),
|
$service->reservations($request->user(), $request->validated()),
|
||||||
@@ -26,7 +26,7 @@ class EntryReservationController extends Controller
|
|||||||
|
|
||||||
public function downloadPdf(
|
public function downloadPdf(
|
||||||
ExportEntryReservationsRequest $request,
|
ExportEntryReservationsRequest $request,
|
||||||
EntryReservationService $service,
|
DesfileEntryReservationService $service,
|
||||||
EntryReservationPdfService $pdf,
|
EntryReservationPdfService $pdf,
|
||||||
): Response {
|
): Response {
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
@@ -40,7 +40,7 @@ class EntryReservationController extends Controller
|
|||||||
|
|
||||||
public function downloadExcel(
|
public function downloadExcel(
|
||||||
ExportEntryReservationsRequest $request,
|
ExportEntryReservationsRequest $request,
|
||||||
EntryReservationService $service,
|
DesfileEntryReservationService $service,
|
||||||
EntryReservationExcelService $excel,
|
EntryReservationExcelService $excel,
|
||||||
): StreamedResponse {
|
): StreamedResponse {
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
@@ -55,7 +55,7 @@ class EntryReservationController extends Controller
|
|||||||
public function downloadTicketPdf(
|
public function downloadTicketPdf(
|
||||||
IndexEntryReservationsRequest $request,
|
IndexEntryReservationsRequest $request,
|
||||||
int $reservation,
|
int $reservation,
|
||||||
EntryReservationService $service,
|
DesfileEntryReservationService $service,
|
||||||
TicketPdfService $pdf,
|
TicketPdfService $pdf,
|
||||||
): Response {
|
): Response {
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
@@ -66,7 +66,7 @@ class EntryReservationController extends Controller
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
public function store(StoreEntryReservationsRequest $request, DesfileEntryReservationService $service): AnonymousResourceCollection
|
||||||
{
|
{
|
||||||
return EntryReservationResource::collection($service->reserve(
|
return EntryReservationResource::collection($service->reserve(
|
||||||
$request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
|
$request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
|
||||||
@@ -76,7 +76,7 @@ class EntryReservationController extends Controller
|
|||||||
public function destroy(
|
public function destroy(
|
||||||
IndexEntryReservationsRequest $request,
|
IndexEntryReservationsRequest $request,
|
||||||
int $reservation,
|
int $reservation,
|
||||||
EntryReservationService $service,
|
DesfileEntryReservationService $service,
|
||||||
): Response {
|
): Response {
|
||||||
$service->cancel($request->user(), $reservation);
|
$service->cancel($request->user(), $reservation);
|
||||||
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
<?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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Requests;
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Requests;
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class EntryReservationResource extends JsonResource
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
|
'catalog_item_id' => $this->catalog_item_id,
|
||||||
'variant_id' => $this->variant_id,
|
'variant_id' => $this->variant_id,
|
||||||
'ticket_id' => $this->ticket_id,
|
'ticket_id' => $this->ticket_id,
|
||||||
'fecha_reserva' => $this->fecha_reserva->toIso8601String(),
|
'fecha_reserva' => $this->fecha_reserva->toIso8601String(),
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\EntryReservationPolicy;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
class DesfileEntryReservationPolicy implements EntryReservationPolicy
|
||||||
|
{
|
||||||
|
public function validate(array $selections): void
|
||||||
|
{
|
||||||
|
$errors = [];
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach ($selections as $index => $selection) {
|
||||||
|
$variant = $selection['variant'];
|
||||||
|
if ($variant === null || $selection['inventory'] === null
|
||||||
|
|| isset($seen[$variant->id])
|
||||||
|
|| $variant->entryReservations()->lockForUpdate()->get()->isNotEmpty()) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = 'La entrada ya no está disponible.';
|
||||||
|
}
|
||||||
|
if ($variant !== null) {
|
||||||
|
$seen[$variant->id] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\EntryReservationService as TicketEntryReservationService;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
/** Adapts the Desfile API and seat rules to the catalog-based reservation workflow. */
|
||||||
|
class DesfileEntryReservationService
|
||||||
|
{
|
||||||
|
private const SELECTION_RELATIONS = [
|
||||||
|
'variant.catalogItem.itemAttributes.attribute.options',
|
||||||
|
'variant.definitions.itemAttribute.attribute.options',
|
||||||
|
'variant.eventDates',
|
||||||
|
'variant.eventDate',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
private readonly TicketEntryReservationService $reservations,
|
||||||
|
private readonly DesfileEntryReservationPolicy $policy,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null, page?: int, per_page?: int} $filters
|
||||||
|
* @return LengthAwarePaginator<EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservations(User $user, array $filters = []): LengthAwarePaginator
|
||||||
|
{
|
||||||
|
$result = $this->reservations->reservations($user, [
|
||||||
|
...$filters, 'catalog_item_id' => $this->entryId($user),
|
||||||
|
]);
|
||||||
|
$result->getCollection()->loadMissing(self::SELECTION_RELATIONS);
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null} $filters
|
||||||
|
* @return Collection<int, EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservationsForExport(User $user, array $filters = []): Collection
|
||||||
|
{
|
||||||
|
return $this->reservations->reservationsForExport($user, [
|
||||||
|
...$filters, 'catalog_item_id' => $this->entryId($user),
|
||||||
|
])->loadMissing(self::SELECTION_RELATIONS);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reservationTicket(User $user, int $reservationId): Ticket
|
||||||
|
{
|
||||||
|
return $this->reservations->reservationTicket($user, $reservationId, $this->entryId($user));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(User $user, int $reservationId): void
|
||||||
|
{
|
||||||
|
$this->reservations->cancel($user, $reservationId, $this->entryId($user));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<array{variant_id: int, tipo_pago: string}> $rows */
|
||||||
|
public function reserve(User $user, string $key, array $rows): Collection
|
||||||
|
{
|
||||||
|
$this->authorize($user);
|
||||||
|
$entry = CatalogItem::query()->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada')->firstOrFail();
|
||||||
|
$catalogRows = array_map(fn (array $row): array => [
|
||||||
|
...$row, 'catalog_item_id' => $entry->id,
|
||||||
|
], $rows);
|
||||||
|
|
||||||
|
try {
|
||||||
|
return $this->reservations->reserve($user, $key, $catalogRows, $this->policy)
|
||||||
|
->loadMissing(self::SELECTION_RELATIONS);
|
||||||
|
} catch (ValidationException $exception) {
|
||||||
|
// Keep the row fields used by the form and describe the selected seat.
|
||||||
|
$variants = $entry->variants()->whereKey(array_column($rows, 'variant_id'))
|
||||||
|
->with(['definitions.itemAttribute.attribute.options'])->get()->keyBy('id');
|
||||||
|
$errors = [];
|
||||||
|
foreach ($exception->errors() as $field => $messages) {
|
||||||
|
if (preg_match('/^rows\.(\d+)\.variant_id$/', $field, $match)) {
|
||||||
|
$index = (int) $match[1];
|
||||||
|
$label = $this->entryLabel($variants->get($rows[$index]['variant_id'] ?? null), $index);
|
||||||
|
$messages = array_map(fn (string $message): string => $label.': '.$message, $messages);
|
||||||
|
}
|
||||||
|
$errors[$field] = $messages;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function authorize(User $user): void
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function entryId(User $user): int
|
||||||
|
{
|
||||||
|
$this->authorize($user);
|
||||||
|
|
||||||
|
// Historical reservations remain accessible when the active event changes.
|
||||||
|
// A missing entry must not remove the catalog filter from the generic query.
|
||||||
|
return CatalogItem::query()->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada')->value('id') ?? -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
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(', ');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||||
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
use Barryvdh\DomPDF\Facade\Pdf;
|
use Barryvdh\DomPDF\Facade\Pdf;
|
||||||
use Barryvdh\DomPDF\PDF as DomPdf;
|
use Barryvdh\DomPDF\PDF as DomPdf;
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class EntryReservationReportService
|
class EntryReservationReportService
|
||||||
|
|||||||
@@ -1,240 +0,0 @@
|
|||||||
<?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,7 +2,6 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -394,22 +393,14 @@ class InvitationPurchaseProvisioner
|
|||||||
|
|
||||||
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
||||||
|
|
||||||
$available = $inventory?->available_stock
|
if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0 || ($inventory->entry_reserved_stock ?? 0) > 0) {
|
||||||
?? ($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.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (property_exists($inventory, 'available_stock')) {
|
|
||||||
Inventory::query()->findOrFail($inventory->id)->commitDirectSale(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([
|
DB::table('inventories')->where('id', $inventory->id)->update([
|
||||||
'real_stock' => $inventory->real_stock - 1,
|
'real_stock' => $inventory->real_stock - 1,
|
||||||
'sold_units' => $inventory->sold_units + 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,32 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Controllers\DesfileEntryReservationController;
|
||||||
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'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [DesfileEntryReservationController::class, 'index'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.index');
|
->name('adminapp.desfile.entry-reservations.index');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [DesfileEntryReservationController::class, 'downloadPdf'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.pdf');
|
->name('adminapp.desfile.entry-reservations.pdf');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [DesfileEntryReservationController::class, 'downloadExcel'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.excel');
|
->name('adminapp.desfile.entry-reservations.excel');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [DesfileEntryReservationController::class, 'downloadTicketPdf'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
||||||
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [DesfileEntryReservationController::class, 'store'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.store');
|
->name('adminapp.desfile.entry-reservations.store');
|
||||||
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [DesfileEntryReservationController::class, 'destroy'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.destroy');
|
->name('adminapp.desfile.entry-reservations.destroy');
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant/desfile')
|
Route::prefix('v1/adminapp/tenant/desfile')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('entries', [EntryController::class, 'show'])
|
Route::get('entries', [EntryController::class, 'show'])
|
||||||
->name('adminapp.desfile.entries.show');
|
->name('adminapp.desfile.entries.show');
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
namespace App\Domains\Ticketing\Event\Models;
|
namespace App\Domains\Ticketing\Event\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Core\Address\Models\Address;
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\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;
|
||||||
@@ -16,14 +15,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(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', '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 ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
return ['client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Tenant, $this> */
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
@@ -38,12 +37,6 @@ class Event extends Model
|
|||||||
return $this->belongsTo(Client::class);
|
return $this->belongsTo(Client::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Address, $this> */
|
|
||||||
public function address(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Address::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function effectiveClient(): Client
|
public function effectiveClient(): Client
|
||||||
{
|
{
|
||||||
return $this->client ?? $this->tenant->client;
|
return $this->client ?? $this->tenant->client;
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Resources;
|
namespace App\Domains\Ticketing\Event\Resources;
|
||||||
|
|
||||||
use App\Domains\Core\Address\Resources\AddressResource;
|
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -22,7 +21,6 @@ class EventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
'address' => AddressResource::make($this->address),
|
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ namespace App\Domains\Ticketing\Event\Resources;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Core\Address\Resources\AddressResource;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -20,7 +19,6 @@ class PublicEventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
'address' => AddressResource::make($this->address),
|
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
<?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,12 +32,11 @@ 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', 'address']);
|
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
@@ -50,7 +49,6 @@ 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',
|
||||||
@@ -66,7 +64,7 @@ class EventService
|
|||||||
$this->syncLegacyContact($event, $data['contact']);
|
$this->syncLegacyContact($event, $data['contact']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
return $event->load(['dates.validityTime', 'socialMedia']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,12 +23,11 @@ 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.'%')
|
||||||
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
->orWhere('location', 'like', '%'.$term.'%');
|
||||||
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
return $query->with('attachment')->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
|
||||||
@@ -39,7 +38,6 @@ 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,32 +13,6 @@ 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
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class AccommodationController extends Controller
|
|||||||
$this->accommodationService->upsertMany(
|
$this->accommodationService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
$request->validated('stock_adjustment_id'),
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ 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,7 +29,6 @@ class FoodController extends Controller
|
|||||||
$this->foodService->upsertMany(
|
$this->foodService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
$request->validated('stock_adjustment_id'),
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -40,7 +39,6 @@ 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,7 +28,6 @@ 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,10 +16,9 @@ class UpdateHistoricalFoodStockRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'stock_adjustment_id' => ['nullable', 'uuid'],
|
'variants.*' => ['required', 'array:id,stock'],
|
||||||
'variants.*' => ['required', 'array:id,stock_difference'],
|
|
||||||
'variants.*.id' => ['required', 'integer', 'distinct'],
|
'variants.*.id' => ['required', 'integer', 'distinct'],
|
||||||
'variants.*.stock_difference' => ['required', 'integer'],
|
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
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
|
||||||
{
|
{
|
||||||
@@ -17,42 +16,12 @@ class UpsertAccommodationVariantsRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'stock_adjustment_id' => ['nullable', 'uuid'],
|
'variants.*' => ['required', 'array:id,title,description,stock,price'],
|
||||||
'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' => ['sometimes', 'integer', 'min:0'],
|
'variants.*.stock' => ['required', '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,8 +20,7 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
||||||
'stock_adjustment_id' => ['nullable', 'uuid'],
|
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,price'],
|
||||||
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,stock_difference,price'],
|
|
||||||
'entries.*.id' => [
|
'entries.*.id' => [
|
||||||
'sometimes',
|
'sometimes',
|
||||||
'nullable',
|
'nullable',
|
||||||
@@ -47,8 +46,7 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
fn ($query) => $query->where('tenant_code', $tenantCode)
|
fn ($query) => $query->where('tenant_code', $tenantCode)
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'entries.*.stock' => ['sometimes', 'integer', 'min:0'],
|
'entries.*.stock' => ['required', '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'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -63,20 +61,6 @@ 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,8 +20,7 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'stock_adjustment_id' => ['nullable', 'uuid'],
|
'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,price'],
|
||||||
'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',
|
||||||
@@ -33,8 +32,7 @@ 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' => ['sometimes', 'integer', 'min:0'],
|
'variants.*.stock' => ['required', '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'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -51,20 +49,6 @@ 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'] ?? ''))),
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
|
|||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Illuminate\Validation\Validator;
|
|
||||||
|
|
||||||
class UpsertMerchandiseRequest extends FormRequest
|
class UpsertMerchandiseRequest extends FormRequest
|
||||||
{
|
{
|
||||||
@@ -40,49 +39,12 @@ class UpsertMerchandiseRequest extends FormRequest
|
|||||||
'items.*.description' => ['sometimes', 'nullable', 'string'],
|
'items.*.description' => ['sometimes', 'nullable', 'string'],
|
||||||
'items.*.max_units_per_user' => ['required', 'integer', 'min:1'],
|
'items.*.max_units_per_user' => ['required', 'integer', 'min:1'],
|
||||||
'items.*.variants' => ['required', 'array', 'min:1', 'max:500'],
|
'items.*.variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'stock_adjustment_id' => ['nullable', 'uuid'],
|
'items.*.variants.*' => ['required', 'array:id,color,size,stock,price'],
|
||||||
'items.*.variants.*' => ['required', 'array:id,color,size,stock,stock_difference,price'],
|
|
||||||
'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
'items.*.variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
||||||
'items.*.variants.*.color' => ['required', 'string', 'max:255'],
|
'items.*.variants.*.color' => ['required', 'string', 'max:255'],
|
||||||
'items.*.variants.*.size' => ['required', 'string', 'max:255'],
|
'items.*.variants.*.size' => ['required', 'string', 'max:255'],
|
||||||
'items.*.variants.*.stock' => ['sometimes', 'integer', 'min:0'],
|
'items.*.variants.*.stock' => ['required', 'integer', 'min:0'],
|
||||||
'items.*.variants.*.stock_difference' => ['sometimes', 'integer'],
|
|
||||||
'items.*.variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'items.*.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('items', []) as $itemIndex => $item) {
|
|
||||||
if (! is_array($item)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($item['variants'] ?? [] as $variantIndex => $variant) {
|
|
||||||
if (! is_array($variant)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$prefix = "items.{$itemIndex}.variants.{$variantIndex}";
|
|
||||||
if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) {
|
|
||||||
$validator->errors()->add(
|
|
||||||
"{$prefix}.stock_difference",
|
|
||||||
'La diferencia de stock es obligatoria al actualizar una variante.',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) {
|
|
||||||
$validator->errors()->add(
|
|
||||||
"{$prefix}.stock",
|
|
||||||
'El stock inicial es obligatorio al crear una variante.',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class AccommodationResource extends JsonResource
|
|||||||
'title' => $options->get($value)?->label ?? $value,
|
'title' => $options->get($value)?->label ?? $value,
|
||||||
'value' => $value,
|
'value' => $value,
|
||||||
'description' => $variant->descripcion,
|
'description' => $variant->descripcion,
|
||||||
'stock' => $variant->inventory->availableStock(),
|
'stock' => $variant->inventory->real_stock,
|
||||||
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
||||||
];
|
];
|
||||||
})->values(),
|
})->values(),
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class EntryResource extends JsonResource
|
|||||||
'title' => $this->nombre,
|
'title' => $this->nombre,
|
||||||
'description' => $this->descripcion,
|
'description' => $this->descripcion,
|
||||||
'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
|
'event_date_ids' => $variant->selectedEventDates()->pluck('id')->values(),
|
||||||
'stock' => $variant->inventory->availableStock(),
|
'stock' => $variant->inventory->real_stock,
|
||||||
'price' => $this->precio,
|
'price' => $this->precio,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class FoodResource extends JsonResource
|
|||||||
'schedule' => $values->get('horario'),
|
'schedule' => $values->get('horario'),
|
||||||
'service' => $values->get('servicio'),
|
'service' => $values->get('servicio'),
|
||||||
'description' => $variant->descripcion,
|
'description' => $variant->descripcion,
|
||||||
'stock' => $variant->inventory->availableStock(),
|
'stock' => $variant->inventory->real_stock,
|
||||||
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class MerchandiseResource extends JsonResource
|
|||||||
'color_value' => $colorValue,
|
'color_value' => $colorValue,
|
||||||
'size' => $sizeOptions->get($sizeValue)?->label ?? $sizeValue,
|
'size' => $sizeOptions->get($sizeValue)?->label ?? $sizeValue,
|
||||||
'size_value' => $sizeValue,
|
'size_value' => $sizeValue,
|
||||||
'stock' => $variant->inventory->availableStock(),
|
'stock' => $variant->inventory->real_stock,
|
||||||
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
'price' => number_format($variant->getPrice(), 2, '.', ''),
|
||||||
];
|
];
|
||||||
})->values(),
|
})->values(),
|
||||||
|
|||||||
@@ -39,9 +39,9 @@ class AccommodationService
|
|||||||
/**
|
/**
|
||||||
* @param array<int, array<string, mixed>> $variants
|
* @param array<int, array<string, mixed>> $variants
|
||||||
*/
|
*/
|
||||||
public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
public function upsertMany(Tenant $tenant, array $variants): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
||||||
$attribute = $this->attribute($tenant);
|
$attribute = $this->attribute($tenant);
|
||||||
$accommodation = $this->accommodation($tenant, $variants);
|
$accommodation = $this->accommodation($tenant, $variants);
|
||||||
$itemAttribute = $accommodation->itemAttributes()->firstOrCreate(
|
$itemAttribute = $accommodation->itemAttributes()->firstOrCreate(
|
||||||
@@ -70,7 +70,7 @@ class AccommodationService
|
|||||||
if ($variant === null) {
|
if ($variant === null) {
|
||||||
$this->createVariant($attribute, $accommodation, $itemAttribute, $data);
|
$this->createVariant($attribute, $accommodation, $itemAttribute, $data);
|
||||||
} else {
|
} else {
|
||||||
$this->updateVariant($attribute, $variant, $itemAttribute, $data, $index, $stockAdjustmentId);
|
$this->updateVariant($attribute, $variant, $itemAttribute, $data, $index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,7 +169,7 @@ class AccommodationService
|
|||||||
'title' => trim($variant['title']),
|
'title' => trim($variant['title']),
|
||||||
'value' => $this->valueCode($variant['title']),
|
'value' => $this->valueCode($variant['title']),
|
||||||
'description' => $variant['description'] ?? null,
|
'description' => $variant['description'] ?? null,
|
||||||
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
'stock' => (int) $variant['stock'],
|
||||||
])->all();
|
])->all();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,7 +212,6 @@ class AccommodationService
|
|||||||
$this->createOption($attribute, $data['value'], $data['title']);
|
$this->createOption($attribute, $data['value'], $data['title']);
|
||||||
|
|
||||||
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
||||||
$inventory->recordInitialization();
|
|
||||||
$variant = $accommodation->variants()->create([
|
$variant = $accommodation->variants()->create([
|
||||||
'inventory_id' => $inventory->id,
|
'inventory_id' => $inventory->id,
|
||||||
'descripcion' => $data['description'],
|
'descripcion' => $data['description'],
|
||||||
@@ -231,13 +230,20 @@ class AccommodationService
|
|||||||
ItemAttribute $itemAttribute,
|
ItemAttribute $itemAttribute,
|
||||||
array $data,
|
array $data,
|
||||||
int $index,
|
int $index,
|
||||||
?string $stockAdjustmentId,
|
|
||||||
): void {
|
): void {
|
||||||
$inventory = Inventory::query()
|
$inventory = Inventory::query()
|
||||||
->whereKey($variant->inventory_id)
|
->whereKey($variant->inventory_id)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ($data['stock'] < $inventory->reserved_stock) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"variants.{$index}.stock" => [
|
||||||
|
'El stock no puede ser menor que la cantidad actualmente reservada.',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$definition = $variant->definitions
|
$definition = $variant->definitions
|
||||||
->firstWhere('item_attribute_id', $itemAttribute->id);
|
->firstWhere('item_attribute_id', $itemAttribute->id);
|
||||||
$option = $definition === null
|
$option = $definition === null
|
||||||
@@ -257,10 +263,7 @@ class AccommodationService
|
|||||||
'descripcion' => $data['description'],
|
'descripcion' => $data['description'],
|
||||||
'precio' => $data['price'],
|
'precio' => $data['price'],
|
||||||
]);
|
]);
|
||||||
$inventory->adjustAvailableStock(
|
$inventory->update(['real_stock' => $data['stock']]);
|
||||||
(int) $data['stock_difference'],
|
|
||||||
idempotencyKey: $stockAdjustmentId,
|
|
||||||
);
|
|
||||||
$variant->definitions()->updateOrCreate(
|
$variant->definitions()->updateOrCreate(
|
||||||
['item_attribute_id' => $itemAttribute->id],
|
['item_attribute_id' => $itemAttribute->id],
|
||||||
['value' => $data['value']],
|
['value' => $data['value']],
|
||||||
|
|||||||
@@ -43,18 +43,18 @@ class EntryService
|
|||||||
* @param array<int, array<string, mixed>> $entries
|
* @param array<int, array<string, mixed>> $entries
|
||||||
* @return Collection<int, CatalogItem>
|
* @return Collection<int, CatalogItem>
|
||||||
*/
|
*/
|
||||||
public function upsertMany(Tenant $tenant, array $entries, ?string $stockAdjustmentId = null): Collection
|
public function upsertMany(Tenant $tenant, array $entries): Collection
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $entries, $stockAdjustmentId): Collection {
|
return DB::transaction(function () use ($tenant, $entries): Collection {
|
||||||
$reservedSlugs = [];
|
$reservedSlugs = [];
|
||||||
$category = Category::query()->firstOrCreate([
|
$category = Category::query()->firstOrCreate([
|
||||||
'tenant_code' => $tenant->codigo,
|
'tenant_code' => $tenant->codigo,
|
||||||
'nombre' => 'Entradas',
|
'nombre' => 'Entradas',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, $stockAdjustmentId, &$reservedSlugs): CatalogItem {
|
return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, &$reservedSlugs): CatalogItem {
|
||||||
if (isset($entry['id'])) {
|
if (isset($entry['id'])) {
|
||||||
return $this->update($tenant, $category, $entry, $index, $stockAdjustmentId);
|
return $this->update($tenant, $category, $entry, $index);
|
||||||
}
|
}
|
||||||
|
|
||||||
$slug = $this->uniqueSlug($tenant, $entry['title'], $reservedSlugs);
|
$slug = $this->uniqueSlug($tenant, $entry['title'], $reservedSlugs);
|
||||||
@@ -92,7 +92,7 @@ class EntryService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $entry */
|
/** @param array<string, mixed> $entry */
|
||||||
private function update(Tenant $tenant, Category $category, array $entry, int $index, ?string $stockAdjustmentId): CatalogItem
|
private function update(Tenant $tenant, Category $category, array $entry, int $index): CatalogItem
|
||||||
{
|
{
|
||||||
$catalogItem = CatalogItem::query()
|
$catalogItem = CatalogItem::query()
|
||||||
->whereKey($entry['id'])
|
->whereKey($entry['id'])
|
||||||
@@ -121,6 +121,14 @@ class EntryService
|
|||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ((int) $entry['stock'] < $inventory->reserved_stock) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"entries.{$index}.stock" => [
|
||||||
|
'El stock no puede ser menor que la cantidad actualmente reservada.',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$eventDateIds = collect($entry['event_date_ids'])
|
$eventDateIds = collect($entry['event_date_ids'])
|
||||||
->map(fn ($id): int => (int) $id)
|
->map(fn ($id): int => (int) $id)
|
||||||
->unique()
|
->unique()
|
||||||
@@ -141,10 +149,7 @@ class EntryService
|
|||||||
$catalogItem->itemAttributes()
|
$catalogItem->itemAttributes()
|
||||||
->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date'))
|
->whereHas('attribute', fn ($query) => $query->where('codigo', 'event_date'))
|
||||||
->update(['allow_multi_select' => true]);
|
->update(['allow_multi_select' => true]);
|
||||||
$inventory->adjustAvailableStock(
|
$inventory->update(['real_stock' => $entry['stock']]);
|
||||||
(int) $entry['stock_difference'],
|
|
||||||
idempotencyKey: $stockAdjustmentId,
|
|
||||||
);
|
|
||||||
|
|
||||||
return $catalogItem->load([
|
return $catalogItem->load([
|
||||||
'variants.inventory',
|
'variants.inventory',
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ 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\Commerce\Catalog\Services\CatalogService;
|
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
||||||
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\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Validation\ValidationException;
|
use Illuminate\Validation\ValidationException;
|
||||||
@@ -50,9 +50,9 @@ class FoodService
|
|||||||
/**
|
/**
|
||||||
* @param array<int, array<string, mixed>> $variants
|
* @param array<int, array<string, mixed>> $variants
|
||||||
*/
|
*/
|
||||||
public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
public function upsertMany(Tenant $tenant, array $variants): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
||||||
$attributes = $this->attributes($tenant);
|
$attributes = $this->attributes($tenant);
|
||||||
$food = $this->food($tenant, $variants);
|
$food = $this->food($tenant, $variants);
|
||||||
$itemAttributes = $this->itemAttributes($food, $attributes);
|
$itemAttributes = $this->itemAttributes($food, $attributes);
|
||||||
@@ -85,7 +85,7 @@ class FoodService
|
|||||||
if ($variant === null) {
|
if ($variant === null) {
|
||||||
$this->createVariant($food, $itemAttributes, $data);
|
$this->createVariant($food, $itemAttributes, $data);
|
||||||
} else {
|
} else {
|
||||||
$this->updateVariant($variant, $itemAttributes, $data, $index, $stockAdjustmentId);
|
$this->updateVariant($variant, $itemAttributes, $data, $index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,11 +113,11 @@ class FoodService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array<int, array{id: int, stock_difference: int}> $variants
|
* @param array<int, array{id: int, stock: int}> $variants
|
||||||
*/
|
*/
|
||||||
public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
public function updateHistoricalStock(Tenant $tenant, array $variants): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
||||||
$food = CatalogItem::query()
|
$food = CatalogItem::query()
|
||||||
->forTenantCatalog($tenant)
|
->forTenantCatalog($tenant)
|
||||||
->where('slug', 'comida')
|
->where('slug', 'comida')
|
||||||
@@ -142,11 +142,17 @@ class FoodService
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$stock = (int) $data['stock'];
|
||||||
$inventory = $this->inventoryForHistoricalStockUpdate($variant);
|
$inventory = $this->inventoryForHistoricalStockUpdate($variant);
|
||||||
$inventory->adjustAvailableStock(
|
if ($stock < $inventory->reserved_stock) {
|
||||||
(int) $data['stock_difference'],
|
throw ValidationException::withMessages([
|
||||||
idempotencyKey: $stockAdjustmentId,
|
"variants.{$index}.stock" => [
|
||||||
);
|
'El stock no puede ser menor que la cantidad actualmente reservada.',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$inventory->update(['real_stock' => $stock]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->current($tenant) ?? $food;
|
return $this->current($tenant) ?? $food;
|
||||||
@@ -175,7 +181,6 @@ class FoodService
|
|||||||
'reserved_stock' => 0,
|
'reserved_stock' => 0,
|
||||||
'real_stock' => $inventory->real_stock,
|
'real_stock' => $inventory->real_stock,
|
||||||
]);
|
]);
|
||||||
$historicalInventory->recordTransferInitialization();
|
|
||||||
$variant->update(['inventory_id' => $historicalInventory->getKey()]);
|
$variant->update(['inventory_id' => $historicalInventory->getKey()]);
|
||||||
|
|
||||||
return $historicalInventory;
|
return $historicalInventory;
|
||||||
@@ -296,7 +301,7 @@ class FoodService
|
|||||||
'schedule' => $schedule->value,
|
'schedule' => $schedule->value,
|
||||||
'service' => $service->value,
|
'service' => $service->value,
|
||||||
'description' => (string) ($variant['description'] ?? ''),
|
'description' => (string) ($variant['description'] ?? ''),
|
||||||
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
'stock' => (int) $variant['stock'],
|
||||||
];
|
];
|
||||||
})->all();
|
})->all();
|
||||||
}
|
}
|
||||||
@@ -379,7 +384,6 @@ class FoodService
|
|||||||
private function createVariant(CatalogItem $food, Collection $itemAttributes, array $data): void
|
private function createVariant(CatalogItem $food, Collection $itemAttributes, array $data): void
|
||||||
{
|
{
|
||||||
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
||||||
$inventory->recordInitialization();
|
|
||||||
$variant = $food->variants()->create([
|
$variant = $food->variants()->create([
|
||||||
'event_date_id' => $data['event_date_id'],
|
'event_date_id' => $data['event_date_id'],
|
||||||
'inventory_id' => $inventory->id,
|
'inventory_id' => $inventory->id,
|
||||||
@@ -396,23 +400,27 @@ class FoodService
|
|||||||
Collection $itemAttributes,
|
Collection $itemAttributes,
|
||||||
array $data,
|
array $data,
|
||||||
int $index,
|
int $index,
|
||||||
?string $stockAdjustmentId,
|
|
||||||
): void {
|
): void {
|
||||||
$inventory = Inventory::query()
|
$inventory = Inventory::query()
|
||||||
->whereKey($variant->inventory_id)
|
->whereKey($variant->inventory_id)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ($data['stock'] < $inventory->reserved_stock) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"variants.{$index}.stock" => [
|
||||||
|
'El stock no puede ser menor que la cantidad actualmente reservada.',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$variant->update([
|
$variant->update([
|
||||||
'event_date_id' => $data['event_date_id'],
|
'event_date_id' => $data['event_date_id'],
|
||||||
'descripcion' => $data['description'],
|
'descripcion' => $data['description'],
|
||||||
'precio' => $data['price'],
|
'precio' => $data['price'],
|
||||||
]);
|
]);
|
||||||
$variant->eventDates()->sync([$data['event_date_id']]);
|
$variant->eventDates()->sync([$data['event_date_id']]);
|
||||||
$inventory->adjustAvailableStock(
|
$inventory->update(['real_stock' => $data['stock']]);
|
||||||
(int) $data['stock_difference'],
|
|
||||||
idempotencyKey: $stockAdjustmentId,
|
|
||||||
);
|
|
||||||
$this->syncDefinitions($variant, $itemAttributes, $data);
|
$this->syncDefinitions($variant, $itemAttributes, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,9 +43,9 @@ class MerchandiseService
|
|||||||
* @param array<int, array<string, mixed>> $items
|
* @param array<int, array<string, mixed>> $items
|
||||||
* @return Collection<int, CatalogItem>
|
* @return Collection<int, CatalogItem>
|
||||||
*/
|
*/
|
||||||
public function upsertMany(Tenant $tenant, array $items, ?string $stockAdjustmentId = null): Collection
|
public function upsertMany(Tenant $tenant, array $items): Collection
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $items, $stockAdjustmentId): Collection {
|
return DB::transaction(function () use ($tenant, $items): Collection {
|
||||||
$attributes = $this->attributes($tenant);
|
$attributes = $this->attributes($tenant);
|
||||||
$category = Category::query()->firstOrCreate([
|
$category = Category::query()->firstOrCreate([
|
||||||
'tenant_code' => $tenant->codigo,
|
'tenant_code' => $tenant->codigo,
|
||||||
@@ -57,7 +57,6 @@ class MerchandiseService
|
|||||||
$tenant,
|
$tenant,
|
||||||
$attributes,
|
$attributes,
|
||||||
$category,
|
$category,
|
||||||
$stockAdjustmentId,
|
|
||||||
&$reservedSlugs,
|
&$reservedSlugs,
|
||||||
): CatalogItem {
|
): CatalogItem {
|
||||||
$item = isset($data['id'])
|
$item = isset($data['id'])
|
||||||
@@ -102,7 +101,7 @@ class MerchandiseService
|
|||||||
if ($variant === null) {
|
if ($variant === null) {
|
||||||
$this->createVariant($item, $itemAttributes, $variantData);
|
$this->createVariant($item, $itemAttributes, $variantData);
|
||||||
} else {
|
} else {
|
||||||
$this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex, $stockAdjustmentId);
|
$this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,7 +244,7 @@ class MerchandiseService
|
|||||||
...$variant,
|
...$variant,
|
||||||
'color' => $color->value,
|
'color' => $color->value,
|
||||||
'size' => $size->value,
|
'size' => $size->value,
|
||||||
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
'stock' => (int) $variant['stock'],
|
||||||
];
|
];
|
||||||
})->all();
|
})->all();
|
||||||
}
|
}
|
||||||
@@ -343,7 +342,6 @@ class MerchandiseService
|
|||||||
array $data,
|
array $data,
|
||||||
): void {
|
): void {
|
||||||
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
$inventory = Inventory::query()->create(['real_stock' => $data['stock']]);
|
||||||
$inventory->recordInitialization();
|
|
||||||
$variant = $item->variants()->create([
|
$variant = $item->variants()->create([
|
||||||
'inventory_id' => $inventory->id,
|
'inventory_id' => $inventory->id,
|
||||||
'precio' => $data['price'],
|
'precio' => $data['price'],
|
||||||
@@ -361,18 +359,22 @@ class MerchandiseService
|
|||||||
array $data,
|
array $data,
|
||||||
int $itemIndex,
|
int $itemIndex,
|
||||||
int $variantIndex,
|
int $variantIndex,
|
||||||
?string $stockAdjustmentId,
|
|
||||||
): void {
|
): void {
|
||||||
$inventory = Inventory::query()
|
$inventory = Inventory::query()
|
||||||
->whereKey($variant->inventory_id)
|
->whereKey($variant->inventory_id)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ($data['stock'] < $inventory->reserved_stock) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"items.{$itemIndex}.variants.{$variantIndex}.stock" => [
|
||||||
|
'El stock no puede ser menor que la cantidad actualmente reservada.',
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$variant->update(['precio' => $data['price']]);
|
$variant->update(['precio' => $data['price']]);
|
||||||
$inventory->adjustAvailableStock(
|
$inventory->update(['real_stock' => $data['stock']]);
|
||||||
(int) $data['stock_difference'],
|
|
||||||
idempotencyKey: $stockAdjustmentId,
|
|
||||||
);
|
|
||||||
$this->syncDefinitions($variant, $itemAttributes, $data);
|
$this->syncDefinitions($variant, $itemAttributes, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,48 +19,48 @@ Route::prefix('v1/adminapp/tenant')
|
|||||||
->middleware("tenant.menu:{$menuCode}");
|
->middleware("tenant.menu:{$menuCode}");
|
||||||
};
|
};
|
||||||
|
|
||||||
$visibilityRoutes('entries', 'entries', 'onticket.adminapp.fiesta-futbol-infantil.entradas');
|
$visibilityRoutes('entries', 'entries', 'adminapp.fiesta-futbol-infantil.entradas');
|
||||||
$visibilityRoutes('foods', 'foods', 'onticket.adminapp.fiesta-futbol-infantil.comida');
|
$visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
|
||||||
$visibilityRoutes('accommodations', 'accommodations', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos');
|
$visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
|
||||||
$visibilityRoutes('merchandise', 'merchandise', 'onticket.adminapp.fiesta-futbol-infantil.merchandising');
|
$visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
|
||||||
|
|
||||||
Route::get('entries', [EntryController::class, 'index'])
|
Route::get('entries', [EntryController::class, 'index'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
||||||
Route::post('entries', [EntryController::class, 'store'])
|
Route::post('entries', [EntryController::class, 'store'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
||||||
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
||||||
Route::get('foods', [FoodController::class, 'index'])
|
Route::get('foods', [FoodController::class, 'index'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
||||||
Route::post('foods', [FoodController::class, 'store'])
|
Route::post('foods', [FoodController::class, 'store'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
||||||
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
||||||
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
||||||
Route::get('accommodations', [AccommodationController::class, 'index'])
|
Route::get('accommodations', [AccommodationController::class, 'index'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
||||||
Route::post('accommodations', [AccommodationController::class, 'store'])
|
Route::post('accommodations', [AccommodationController::class, 'store'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
||||||
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
||||||
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
||||||
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
||||||
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Ticket\Requests\ExportEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Ticket\Requests\IndexEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Ticket\Requests\StoreEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Ticket\Resources\EntryReservationFormResource;
|
||||||
|
use App\Domains\Ticketing\Ticket\Resources\EntryReservationResource;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\EntryReservationExcelService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\EntryReservationFormService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\EntryReservationPdfService;
|
||||||
|
use App\Domains\Ticketing\Ticket\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 form(IndexEntryReservationsRequest $request, EntryReservationFormService $service): EntryReservationFormResource
|
||||||
|
{
|
||||||
|
return new EntryReservationFormResource($service->get(
|
||||||
|
$request->user()->tenant()->firstOrFail(), $request->user()->event_id,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,7 +29,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketCollection(
|
return new AdminAppTicketCollection(
|
||||||
$this->ticketService->search($tenant, $request->validated())
|
$this->ticketService->search($tenant, $request->validated(), $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ class TicketController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket));
|
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
||||||
@@ -45,7 +45,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketRefundCalculationResource(
|
return new AdminAppTicketRefundCalculationResource(
|
||||||
$this->ticketService->calculateRefund($tenant, $ticket)
|
$this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketPdfService->download(
|
return $this->ticketPdfService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketExcelService->download(
|
return $this->ticketExcelService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Enums;
|
namespace App\Domains\Ticketing\Ticket\Enums;
|
||||||
|
|
||||||
enum EntryReservationPaymentType: string
|
enum EntryReservationPaymentType: string
|
||||||
{
|
{
|
||||||
87
app/Domains/Ticketing/Ticket/Models/EntryReservation.php
Normal file
87
app/Domains/Ticketing/Ticket/Models/EntryReservation.php
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'catalog_item_id',
|
||||||
|
'variant_id',
|
||||||
|
'ticket_id',
|
||||||
|
'inventory_id',
|
||||||
|
'batch_id',
|
||||||
|
'fecha_reserva',
|
||||||
|
'importe',
|
||||||
|
'tipo_pago',
|
||||||
|
])]
|
||||||
|
class EntryReservation extends Model
|
||||||
|
{
|
||||||
|
use SoftDeletes;
|
||||||
|
|
||||||
|
protected $table = 'entry_reservations';
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'catalog_item_id' => 'integer',
|
||||||
|
'variant_id' => 'integer',
|
||||||
|
'fecha_reserva' => 'datetime',
|
||||||
|
'importe' => 'decimal:2',
|
||||||
|
'tipo_pago' => EntryReservationPaymentType::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static function booted(): void
|
||||||
|
{
|
||||||
|
static::saving(function (self $reservation): void {
|
||||||
|
if ($reservation->variant_id === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$variant = Variant::withTrashed()->findOrFail($reservation->variant_id);
|
||||||
|
// Existing variant-based callers can keep creating reservations as before.
|
||||||
|
$reservation->catalog_item_id ??= $variant->catalog_item_id;
|
||||||
|
if ($reservation->catalog_item_id !== $variant->catalog_item_id) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'variant_id' => 'La variante no pertenece al ítem del catálogo seleccionado.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<CatalogItem, $this> */
|
||||||
|
public function catalogItem(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(CatalogItem::class)->withTrashed();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<ReservationBatch, $this> */
|
||||||
|
public function batch(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(ReservationBatch::class, 'batch_id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @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);
|
||||||
|
}
|
||||||
|
}
|
||||||
37
app/Domains/Ticketing/Ticket/Models/ReservationBatch.php
Normal file
37
app/Domains/Ticketing/Ticket/Models/ReservationBatch.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
|
#[Fillable(['user_id', 'tenant_code', 'idempotency_key', 'request_hash'])]
|
||||||
|
class ReservationBatch extends Model
|
||||||
|
{
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['user_id' => 'integer'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<User, $this> */
|
||||||
|
public function user(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class)->withTrashed();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<EntryReservation, $this> */
|
||||||
|
public function reservations(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(EntryReservation::class, 'batch_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,6 @@ use App\Domains\Commerce\Catalog\Models\Variant;
|
|||||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
|
use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
|
||||||
use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;
|
use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\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,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class IndexEntryReservationsRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user()?->tenant_codigo === 'onticket';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'catalog_item_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
|
||||||
|
'variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
|
||||||
|
'tipo_pago' => ['sometimes', 'nullable', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
'page' => ['sometimes', 'integer', 'min:1'],
|
||||||
|
'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class StoreEntryReservationsRequest extends IndexEntryReservationsRequest
|
||||||
|
{
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'idempotency_key' => ['required', 'uuid'],
|
||||||
|
'rows' => ['required', 'array', 'list', 'min:1', 'max:100'],
|
||||||
|
'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'],
|
||||||
|
'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'],
|
||||||
|
'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
|
||||||
|
'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class EntryReservationFormResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return $this->resource;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class EntryReservationResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'catalog_item_id' => $this->catalog_item_id,
|
||||||
|
'variant_id' => $this->variant_id,
|
||||||
|
'catalog_item' => ['id' => $this->catalog_item_id, 'name' => $this->catalogItem?->nombre],
|
||||||
|
'variant' => $this->variant === null ? null : [
|
||||||
|
'id' => $this->variant_id,
|
||||||
|
'label' => $this->variant->getSelectionLabel(),
|
||||||
|
],
|
||||||
|
'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,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,9 +41,9 @@ class AdminAppTicketService
|
|||||||
/**
|
/**
|
||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
*/
|
*/
|
||||||
public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult
|
public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters);
|
$query = $this->baseQuery($tenant, $filters, $eventId);
|
||||||
$countQuery = clone $query;
|
$countQuery = clone $query;
|
||||||
|
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
@@ -77,7 +77,7 @@ class AdminAppTicketService
|
|||||||
tickets: $tickets,
|
tickets: $tickets,
|
||||||
scannedTickets: $scannedTickets,
|
scannedTickets: $scannedTickets,
|
||||||
totalTickets: $totalTickets,
|
totalTickets: $totalTickets,
|
||||||
refundedTotal: $this->refundSummaryService->totalForTenant($tenant),
|
refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,9 +85,9 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
* @return Collection<int, Ticket>
|
* @return Collection<int, Ticket>
|
||||||
*/
|
*/
|
||||||
public function ticketsForExport(Tenant $tenant, array $filters = []): Collection
|
public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters);
|
$query = $this->baseQuery($tenant, $filters, $eventId);
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
$tickets = $query
|
$tickets = $query
|
||||||
->with(self::RELATIONS)
|
->with(self::RELATIONS)
|
||||||
@@ -97,11 +97,10 @@ class AdminAppTicketService
|
|||||||
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $ticketId): Ticket
|
public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $ticketId): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket {
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
@@ -124,10 +123,9 @@ class AdminAppTicketService
|
|||||||
* partial: string|null,
|
* partial: string|null,
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
public function calculateRefund(Tenant $tenant, int $ticketId): array
|
public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array
|
||||||
{
|
{
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
@@ -175,14 +173,13 @@ class AdminAppTicketService
|
|||||||
string $refundType,
|
string $refundType,
|
||||||
?User $createdBy = null,
|
?User $createdBy = null,
|
||||||
): Ticket {
|
): Ticket {
|
||||||
$this->ensureRefundIsAllowed($tenant, $refundType);
|
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
||||||
$ticket = Ticket::query()
|
$ticket = $this->ticketsQuery($tenant, $createdBy?->event_id)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
|
$this->ensureRefundIsAllowed($tenant, $refundType);
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
@@ -228,13 +225,13 @@ class AdminAppTicketService
|
|||||||
'amount' => number_format($refundAmount, 2, '.', ''),
|
'amount' => number_format($refundAmount, 2, '.', ''),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->restoreInventory($ticket, $purchaseItem, $createdBy);
|
$this->restoreInventory($ticket, $purchaseItem);
|
||||||
|
|
||||||
return $ticket->refresh()->load(self::RELATIONS);
|
return $ticket->refresh()->load(self::RELATIONS);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem, ?User $createdBy): void
|
private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem): void
|
||||||
{
|
{
|
||||||
$catalogItem = $ticket->sourceCatalogItem;
|
$catalogItem = $ticket->sourceCatalogItem;
|
||||||
if ($catalogItem === null) {
|
if ($catalogItem === null) {
|
||||||
@@ -272,7 +269,11 @@ class AdminAppTicketService
|
|||||||
throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']);
|
throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$inventory->refundStock(1, $createdBy);
|
if ($catalogItem->inventory_policy === InventoryPolicy::Tracked) {
|
||||||
|
$inventory->real_stock++;
|
||||||
|
}
|
||||||
|
$inventory->refunded_units++;
|
||||||
|
$inventory->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float
|
private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float
|
||||||
@@ -310,12 +311,11 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
||||||
* @return Builder<Ticket>
|
* @return Builder<Ticket>
|
||||||
*/
|
*/
|
||||||
private function baseQuery(Tenant $tenant, array $filters): Builder
|
private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||||
{
|
{
|
||||||
$search = trim((string) ($filters['q'] ?? ''));
|
$search = trim((string) ($filters['q'] ?? ''));
|
||||||
|
|
||||||
$query = Ticket::query()
|
$query = $this->ticketsQuery($tenant, $eventId)
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->when($search !== '', function (Builder $query) use ($search): void {
|
->when($search !== '', function (Builder $query) use ($search): void {
|
||||||
$this->applySearchFilter($query, $search);
|
$this->applySearchFilter($query, $search);
|
||||||
})
|
})
|
||||||
@@ -355,6 +355,14 @@ class AdminAppTicketService
|
|||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return Builder<Ticket> */
|
||||||
|
private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder
|
||||||
|
{
|
||||||
|
return Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
|
->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId));
|
||||||
|
}
|
||||||
|
|
||||||
/** @param Builder<Ticket> $query */
|
/** @param Builder<Ticket> $query */
|
||||||
private function applySearchFilter(Builder $query, string $search): void
|
private function applySearchFilter(Builder $query, string $search): void
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Ticket\Services;
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use RuntimeException;
|
use RuntimeException;
|
||||||
@@ -65,9 +64,14 @@ class BackfillRefundedUnitsService
|
|||||||
}, 'refunds.id', 'id');
|
}, 'refunds.id', 'id');
|
||||||
|
|
||||||
foreach ($counts as $inventoryId => $count) {
|
foreach ($counts as $inventoryId => $count) {
|
||||||
$inventory = Inventory::query()->lockForUpdate()->find($inventoryId)
|
$updates = ['refunded_units' => DB::raw('refunded_units + '.$count['refunded'])];
|
||||||
?? throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo.");
|
if (($count['stock'] ?? 0) > 0) {
|
||||||
$inventory->refundStock($count['refunded']);
|
$updates['real_stock'] = DB::raw('real_stock + '.$count['stock']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (DB::table('inventories')->where('id', $inventoryId)->update($updates) !== 1) {
|
||||||
|
throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$refundedUnitsAdded = array_sum(array_column($counts, 'refunded'));
|
$refundedUnitsAdded = array_sum(array_column($counts, 'refunded'));
|
||||||
@@ -78,8 +82,7 @@ class BackfillRefundedUnitsService
|
|||||||
'bundles_skipped' => $bundlesSkipped,
|
'bundles_skipped' => $bundlesSkipped,
|
||||||
'inventories_updated' => count($counts),
|
'inventories_updated' => count($counts),
|
||||||
'refunded_units_added' => $refundedUnitsAdded,
|
'refunded_units_added' => $refundedUnitsAdded,
|
||||||
'real_stock_added' => 0,
|
'real_stock_added' => array_sum(array_column($counts, 'stock')),
|
||||||
'available_stock_added' => $refundedUnitsAdded,
|
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Ticket\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 tickets')
|
||||||
|
->setSubject($tenant->nombre);
|
||||||
|
$sheet = $spreadsheet->getActiveSheet();
|
||||||
|
$sheet->setTitle('Reservas');
|
||||||
|
$sheet->fromArray([
|
||||||
|
'Ítem',
|
||||||
|
'Variante',
|
||||||
|
'ID',
|
||||||
|
'Fecha',
|
||||||
|
'Importe',
|
||||||
|
'Pago',
|
||||||
|
], null, 'A1');
|
||||||
|
|
||||||
|
foreach ($rows as $index => $reservation) {
|
||||||
|
$row = $index + 2;
|
||||||
|
foreach (['A' => 'item', 'B' => 'variant'] as $column => $key) {
|
||||||
|
$sheet->setCellValueExplicit("{$column}{$row}", $reservation[$key], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit(
|
||||||
|
"C{$row}",
|
||||||
|
$reservation['ticket_id'] === null ? '-' : (string) $reservation['ticket_id'],
|
||||||
|
DataType::TYPE_STRING,
|
||||||
|
);
|
||||||
|
$sheet->setCellValue(
|
||||||
|
"D{$row}",
|
||||||
|
Date::dateTimeToExcel($reservation['fecha_reserva']->copy()->timezone($timeZone)),
|
||||||
|
);
|
||||||
|
if ($reservation['importe'] !== null) {
|
||||||
|
$sheet->setCellValue("E{$row}", (float) $reservation['importe']);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit("F{$row}", $reservation['pago'], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
|
||||||
|
$lastRow = max(2, $rows->count() + 1);
|
||||||
|
$sheet->getStyle("D2:D{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm');
|
||||||
|
$sheet->getStyle("E2:E{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00');
|
||||||
|
$sheet->getStyle('A1:F1')->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:F{$lastRow}");
|
||||||
|
foreach (['A' => 30, 'B' => 60, 'C' => 16, 'D' => 20, 'E' => 16, 'F' => 18] as $column => $width) {
|
||||||
|
$sheet->getColumnDimension($column)->setWidth($width);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = 'reservas_tickets_'.$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,65 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Ticket\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|
||||||
|
class EntryReservationFormService
|
||||||
|
{
|
||||||
|
public function get(Tenant $tenant, ?int $eventId = null): array
|
||||||
|
{
|
||||||
|
$items = CatalogItem::query()->where('tenant_code', $tenant->codigo)->where('has_tickets', true)
|
||||||
|
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||||
|
->with([
|
||||||
|
'inventory', 'itemAttributes.attribute.options',
|
||||||
|
'variants' => fn ($query) => $query->orderBy('id'),
|
||||||
|
'variants.inventory', 'variants.definitions.itemAttribute.attribute.options',
|
||||||
|
'variants.eventDates', 'variants.eventDate',
|
||||||
|
])->orderBy('nombre')->orderBy('id')->get();
|
||||||
|
|
||||||
|
$filterItems = $items->map(fn (CatalogItem $item): array => [
|
||||||
|
'id' => $item->id, 'name' => $item->nombre,
|
||||||
|
'variants' => $item->variants->map(function (Variant $variant) use ($item): array {
|
||||||
|
$variant->setRelation('catalogItem', $item);
|
||||||
|
|
||||||
|
return ['id' => $variant->id, 'label' => $variant->getSelectionLabel()];
|
||||||
|
})->values()->all(),
|
||||||
|
])->values()->all();
|
||||||
|
|
||||||
|
$reservationEventId = $eventId ?? $tenant->active_event_id;
|
||||||
|
$available = $items->filter(fn (CatalogItem $item): bool => ! $item->isBundle()
|
||||||
|
&& $item->isSaleOpen()
|
||||||
|
&& ($reservationEventId === null || $item->event_id === $reservationEventId))
|
||||||
|
->map(function (CatalogItem $item): ?array {
|
||||||
|
$tracked = $item->inventory_policy !== InventoryPolicy::Unlimited;
|
||||||
|
$requiresVariant = $item->variants->isNotEmpty();
|
||||||
|
$variants = $item->variants->filter(function (Variant $variant) use ($item, $tracked): bool {
|
||||||
|
$variant->setRelation('catalogItem', $item);
|
||||||
|
|
||||||
|
return $variant->isSellable()
|
||||||
|
&& (! $tracked || ($variant->inventory?->availableStock() ?? 0) > 0);
|
||||||
|
})->map(fn (Variant $variant): array => [
|
||||||
|
'id' => $variant->id, 'label' => $variant->getSelectionLabel(),
|
||||||
|
'price' => $variant->getPrice(),
|
||||||
|
'available_stock' => $tracked ? $variant->inventory->availableStock() : null,
|
||||||
|
])->values()->all();
|
||||||
|
if (($requiresVariant && $variants === [])
|
||||||
|
|| (! $requiresVariant && $tracked && ($item->inventory?->availableStock() ?? 0) <= 0)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $item->id, 'name' => $item->nombre, 'price' => $item->getPrice(),
|
||||||
|
'requires_variant' => $requiresVariant, 'variants' => $variants,
|
||||||
|
'available_stock' => $tracked ? $item->inventory?->availableStock() : null,
|
||||||
|
];
|
||||||
|
})->filter()->values()->all();
|
||||||
|
|
||||||
|
return ['payment_types' => EntryReservationPaymentType::options(), 'items' => $available, 'filter_items' => $filterItems];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Ticket\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.entry-reservations', [
|
||||||
|
'tenant' => $tenant,
|
||||||
|
'reservations' => $rows,
|
||||||
|
'generatedAt' => $generatedAt,
|
||||||
|
'timeZone' => $timeZone,
|
||||||
|
])->setPaper('a4', 'landscape');
|
||||||
|
|
||||||
|
$this->addPageNumbers($pdf);
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
'reservas_tickets_'.$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,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
interface EntryReservationPolicy
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Validate additional rules after selections are resolved and locked, before
|
||||||
|
* stock or tickets change. Idempotent replays do not run this validation.
|
||||||
|
*
|
||||||
|
* @param array<int, array{item: CatalogItem, variant: Variant|null, inventory: Inventory|null}> $selections
|
||||||
|
*
|
||||||
|
* @throws ValidationException
|
||||||
|
*/
|
||||||
|
public function validate(array $selections): void;
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class EntryReservationReportService
|
||||||
|
{
|
||||||
|
public function rows(Collection $reservations): Collection
|
||||||
|
{
|
||||||
|
return $reservations->values()->map(fn (EntryReservation $reservation): array => [
|
||||||
|
'item' => $reservation->catalogItem?->nombre ?? '-',
|
||||||
|
'variant' => $reservation->variant?->getSelectionLabel() ?? 'Sin variante',
|
||||||
|
'ticket_id' => $reservation->ticket_id,
|
||||||
|
'fecha_reserva' => $reservation->fecha_reserva,
|
||||||
|
'importe' => $reservation->importe,
|
||||||
|
'pago' => $reservation->tipo_pago->label(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,313 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\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\Ticket\Enums\EntryReservationPaymentType;
|
||||||
|
use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\EntryReservation;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\ReservationBatch;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
/** Application workflow for one ticket per selected catalog item / variant. */
|
||||||
|
class EntryReservationService
|
||||||
|
{
|
||||||
|
private const SELECTION_RELATIONS = [
|
||||||
|
'catalogItem',
|
||||||
|
'variant.catalogItem.itemAttributes.attribute.options',
|
||||||
|
'variant.definitions.itemAttribute.attribute.options',
|
||||||
|
'variant.eventDates',
|
||||||
|
'variant.eventDate',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function __construct(private readonly TicketGeneratorService $tickets) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{catalog_item_id?: int, variant_id?: int, tipo_pago?: string|null, page?: int, per_page?: int} $filters
|
||||||
|
* @return LengthAwarePaginator<EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservations(User $user, array $filters = []): LengthAwarePaginator
|
||||||
|
{
|
||||||
|
return $this->reservationsQuery($user, $filters)
|
||||||
|
->paginate(perPage: $filters['per_page'] ?? 15, page: $filters['page'] ?? 1)
|
||||||
|
->withQueryString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{catalog_item_id?: int, variant_id?: int, tipo_pago?: string|null} $filters
|
||||||
|
* @return Collection<int, EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservationsForExport(User $user, array $filters = []): Collection
|
||||||
|
{
|
||||||
|
return $this->reservationsQuery($user, $filters)->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reservationTicket(User $user, int $reservationId, ?int $catalogItemId = null): Ticket
|
||||||
|
{
|
||||||
|
$reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId])
|
||||||
|
->whereKey($reservationId)->whereNotNull('ticket_id')
|
||||||
|
->with(['ticket' => fn ($query) => $query->with([
|
||||||
|
...TicketValidityResolver::RELATIONS,
|
||||||
|
...TicketPresentationResolver::RELATIONS,
|
||||||
|
])])->firstOrFail();
|
||||||
|
|
||||||
|
return $reservation->ticket;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(User $user, int $reservationId, ?int $catalogItemId = null): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($user, $reservationId, $catalogItemId): void {
|
||||||
|
$reservation = $this->reservationsQuery($user, ['catalog_item_id' => $catalogItemId])
|
||||||
|
->whereKey($reservationId)->lockForUpdate()->firstOrFail();
|
||||||
|
|
||||||
|
if ($reservation->ticket_id !== null) {
|
||||||
|
$ticket = Ticket::query()->whereKey($reservation->ticket_id)->lockForUpdate()->firstOrFail();
|
||||||
|
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()->whereKey($reservation->inventory_id)->lockForUpdate()->firstOrFail();
|
||||||
|
$inventory->releaseEntry(1);
|
||||||
|
}
|
||||||
|
$reservation->delete();
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Each row reserves one unit. Prices and inventory are resolved on the server.
|
||||||
|
*
|
||||||
|
* @param list<array{catalog_item_id: int, variant_id?: int|null, tipo_pago: string}> $rows
|
||||||
|
* @return Collection<int, EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reserve(User $user, string $key, array $rows, ?EntryReservationPolicy $policy = null): Collection
|
||||||
|
{
|
||||||
|
$validated = Validator::make(['idempotency_key' => $key, 'rows' => $rows], [
|
||||||
|
'idempotency_key' => ['required', 'uuid'],
|
||||||
|
'rows' => ['required', 'array', 'list', 'min:1', 'max:100'],
|
||||||
|
'rows.*' => ['required', 'array:catalog_item_id,variant_id,tipo_pago'],
|
||||||
|
'rows.*.catalog_item_id' => ['required', 'integer', 'min:1'],
|
||||||
|
'rows.*.variant_id' => ['sometimes', 'nullable', 'integer', 'min:1'],
|
||||||
|
'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
])->validate();
|
||||||
|
$rows = array_map(fn (array $row): array => [
|
||||||
|
'catalog_item_id' => (int) $row['catalog_item_id'],
|
||||||
|
'variant_id' => isset($row['variant_id']) ? (int) $row['variant_id'] : null,
|
||||||
|
'tipo_pago' => $row['tipo_pago'],
|
||||||
|
], $validated['rows']);
|
||||||
|
$hash = $this->requestHash($rows);
|
||||||
|
|
||||||
|
return DB::transaction(function () use ($user, $key, $rows, $hash, $policy): Collection {
|
||||||
|
User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$tenant = $user->tenant()->firstOrFail();
|
||||||
|
$batch = ReservationBatch::query()->where('user_id', $user->id)
|
||||||
|
->where('idempotency_key', $key)->lockForUpdate()->first();
|
||||||
|
if ($batch !== null) {
|
||||||
|
abort_unless($batch->tenant_code === $tenant->codigo && $this->matchesBatch($batch, $rows, $hash),
|
||||||
|
409, 'La clave de envío ya fue utilizada con otra selección.');
|
||||||
|
|
||||||
|
// A scope change must not expose any part of a previously submitted batch.
|
||||||
|
if ($user->event_id !== null) {
|
||||||
|
abort_if($batch->reservations()->withTrashed()
|
||||||
|
->whereDoesntHave('catalogItem', fn (Builder $query) => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('event_id', $user->event_id))
|
||||||
|
->exists(), 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $batch->reservations()->with([...self::SELECTION_RELATIONS, 'ticket'])->orderBy('id')->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
$eventId = $user->event_id ?? $tenant->active_event_id;
|
||||||
|
$items = CatalogItem::query()->where('tenant_code', $tenant->codigo)
|
||||||
|
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||||
|
->whereKey(array_column($rows, 'catalog_item_id'))->orderBy('id')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$variants = Variant::query()->whereIn('catalog_item_id', $items->keys())
|
||||||
|
->whereKey(array_filter(array_column($rows, 'variant_id')))
|
||||||
|
->orderBy('id')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$variants->load(['eventDates', 'eventDate']);
|
||||||
|
$inventoryIds = $items->pluck('inventory_id')->merge($variants->pluck('inventory_id'))->filter()->unique();
|
||||||
|
$inventories = Inventory::query()->whereKey($inventoryIds)->orderBy('id')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$selections = [];
|
||||||
|
$requirements = [];
|
||||||
|
$errors = [];
|
||||||
|
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$item = $items->get($row['catalog_item_id']);
|
||||||
|
$variant = $row['variant_id'] !== null ? $variants->get($row['variant_id']) : null;
|
||||||
|
$field = $this->selectionField($row, $index);
|
||||||
|
if ($item === null || ! $item->has_tickets || ! $item->isSaleOpen()) {
|
||||||
|
$errors[$field] = 'El ítem no está disponible para reservar tickets en este catálogo.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ($item->isBundle()) {
|
||||||
|
$errors[$field] = 'Seleccioná el ítem que emite el ticket; los paquetes requieren reservar sus componentes.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ($row['variant_id'] !== null) {
|
||||||
|
if ($variant === null || $variant->catalog_item_id !== $item->id) {
|
||||||
|
$errors[$field] = 'La variante no pertenece al ítem del catálogo seleccionado.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$variant->setRelation('catalogItem', $item);
|
||||||
|
if (! $variant->isSellable()) {
|
||||||
|
$errors[$field] = 'La variante ya no está disponible.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} elseif ($item->variants()->exists()) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = 'Seleccioná una variante del ítem del catálogo.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$selection = $variant ?? $item;
|
||||||
|
$inventory = $inventories->get($selection->inventory_id);
|
||||||
|
$tracked = $item->inventory_policy !== InventoryPolicy::Unlimited;
|
||||||
|
if ($inventory === null && ($selection->inventory_id !== null || $tracked)) {
|
||||||
|
$errors[$field] = 'La selección no tiene un inventario disponible.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$selection->setRelation('inventory', $inventory);
|
||||||
|
$selections[$index] = ['item' => $item, 'variant' => $variant, 'inventory' => $inventory];
|
||||||
|
if ($inventory !== null) {
|
||||||
|
$requirement = $requirements[$inventory->id] ?? ['quantity' => 0, 'tracked' => false];
|
||||||
|
$requirements[$inventory->id] = [
|
||||||
|
'quantity' => $requirement['quantity'] + 1,
|
||||||
|
'tracked' => $requirement['tracked'] || $tracked,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
$policy?->validate($selections);
|
||||||
|
|
||||||
|
foreach ($requirements as $inventoryId => $requirement) {
|
||||||
|
if ($requirement['tracked'] && $inventories[$inventoryId]->availableStock() < $requirement['quantity']) {
|
||||||
|
foreach ($selections as $index => $selection) {
|
||||||
|
if ($selection['inventory']?->id === $inventoryId) {
|
||||||
|
$errors[$this->selectionField($rows[$index], $index)] = 'No hay stock suficiente para reservar la selección.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
$batch = ReservationBatch::query()->create([
|
||||||
|
'user_id' => $user->id, 'tenant_code' => $tenant->codigo,
|
||||||
|
'idempotency_key' => $key, 'request_hash' => $hash,
|
||||||
|
]);
|
||||||
|
foreach ($requirements as $inventoryId => $requirement) {
|
||||||
|
$inventories[$inventoryId]->reserveEntry($requirement['quantity'], $requirement['tracked']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$reservations = new Collection;
|
||||||
|
foreach ($selections as $index => $selection) {
|
||||||
|
$item = $selection['item'];
|
||||||
|
$variant = $selection['variant'];
|
||||||
|
try {
|
||||||
|
$ticket = $this->tickets->generate($item, $user, 1, $variant?->id)->sole();
|
||||||
|
} catch (TicketGenerationException $exception) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
$this->selectionField($rows[$index], $index) => 'No se pudo emitir el ticket. '.$exception->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$payment = EntryReservationPaymentType::from($rows[$index]['tipo_pago']);
|
||||||
|
$reservation = EntryReservation::query()->create([
|
||||||
|
'batch_id' => $batch->id, 'ticket_id' => $ticket->id,
|
||||||
|
'catalog_item_id' => $variant?->catalog_item_id ?? $item->id,
|
||||||
|
'variant_id' => $variant?->id, 'inventory_id' => $selection['inventory']?->id,
|
||||||
|
'fecha_reserva' => now(), 'tipo_pago' => $payment,
|
||||||
|
'importe' => $payment === EntryReservationPaymentType::Free ? 0 : ($variant ?? $item)->getPrice(),
|
||||||
|
]);
|
||||||
|
$reservations->push($reservation->setRelation('ticket', $ticket)
|
||||||
|
->setRelation('catalogItem', $item)->setRelation('variant', $variant));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $reservations->loadMissing(self::SELECTION_RELATIONS);
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $filters */
|
||||||
|
private function reservationsQuery(User $user, array $filters = []): Builder
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo !== null && $user->tenant_codigo !== '', 403);
|
||||||
|
|
||||||
|
return EntryReservation::query()
|
||||||
|
->whereHas('catalogItem', fn (Builder $query) => $query->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->when($user->event_id !== null, fn (Builder $query) => $query->where('event_id', $user->event_id)))
|
||||||
|
->when($filters['catalog_item_id'] ?? null, fn (Builder $query, int $id) => $query->where('catalog_item_id', $id))
|
||||||
|
->when($filters['variant_id'] ?? null, fn (Builder $query, int $id) => $query->where('variant_id', $id))
|
||||||
|
->when($filters['tipo_pago'] ?? null, fn (Builder $query, string $type) => $query->where('tipo_pago', $type))
|
||||||
|
->with(self::SELECTION_RELATIONS)
|
||||||
|
->orderByDesc('fecha_reserva')->orderByDesc('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array{variant_id: int|null} $row */
|
||||||
|
private function selectionField(array $row, int $index): string
|
||||||
|
{
|
||||||
|
return "rows.{$index}.".($row['variant_id'] !== null ? 'variant_id' : 'catalog_item_id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<array{catalog_item_id: int, variant_id: int|null, tipo_pago: string}> $rows */
|
||||||
|
private function requestHash(array $rows): string
|
||||||
|
{
|
||||||
|
$normalized = collect($rows)->sortBy([
|
||||||
|
['catalog_item_id', 'asc'], ['variant_id', 'asc'], ['tipo_pago', 'asc'],
|
||||||
|
])->values()->all();
|
||||||
|
|
||||||
|
return hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<array{catalog_item_id: int, variant_id: int|null, tipo_pago: string}> $rows */
|
||||||
|
private function matchesBatch(ReservationBatch $batch, array $rows, string $hash): bool
|
||||||
|
{
|
||||||
|
if (hash_equals($batch->request_hash, $hash)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (collect($rows)->contains(fn (array $row) => $row['variant_id'] === null)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Older batches fingerprinted variant and payment only. Check the persisted
|
||||||
|
// catalog IDs too, so compatibility cannot replay a different catalog item.
|
||||||
|
$legacyRows = collect($rows)->map(fn (array $row) => [
|
||||||
|
'variant_id' => $row['variant_id'], 'tipo_pago' => $row['tipo_pago'],
|
||||||
|
])->sortBy('variant_id')->values()->all();
|
||||||
|
$legacyHash = hash('sha256', json_encode($legacyRows, JSON_THROW_ON_ERROR));
|
||||||
|
if (! hash_equals($batch->request_hash, $legacyHash)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$storedRows = $batch->reservations()->withTrashed()->get()->map(fn (EntryReservation $reservation) => [
|
||||||
|
'catalog_item_id' => $reservation->catalog_item_id,
|
||||||
|
'variant_id' => $reservation->variant_id,
|
||||||
|
'tipo_pago' => $reservation->tipo_pago->value,
|
||||||
|
])->all();
|
||||||
|
|
||||||
|
return hash_equals($this->requestHash($storedRows), $hash);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -82,13 +82,17 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
|
|||||||
- `POST /tickets/pdf`.
|
- `POST /tickets/pdf`.
|
||||||
|
|
||||||
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
||||||
`onticket.adminapp.tickets`:
|
`adminapp.tickets`:
|
||||||
|
|
||||||
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
||||||
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
||||||
|
|
||||||
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
||||||
|
|
||||||
|
Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant.
|
||||||
|
|
||||||
|
La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente.
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user