Compare commits
64 Commits
tennant/on
...
f3e226130f
| Author | SHA1 | Date | |
|---|---|---|---|
| f3e226130f | |||
| 77dd0e2715 | |||
| 917f2dff09 | |||
| 6588d9f1a8 | |||
| 5d5ee7d2a5 | |||
| df19655144 | |||
| 0303803f75 | |||
| 94db48467e | |||
| 793e7be756 | |||
| 3b6d6bf28b | |||
| a9d9854e5e | |||
| 4bdd3effcc | |||
| 794acc4814 | |||
| d42896e956 | |||
| 0fe38df019 | |||
| a4bd9263a2 | |||
| 85cd1ad04f | |||
| 370834856b | |||
| ad054127aa | |||
| a05d15d17f | |||
| 717f02ce16 | |||
| 863e911120 | |||
| 6c56b338c1 | |||
| a40a2065a9 | |||
| 57677f55e6 | |||
| a8afd92f46 | |||
| 1df0d2e2ef | |||
| d3cac7a590 | |||
| df13a636ba | |||
| d85841742e | |||
| 0e3fdc5460 | |||
| 0dc2675dae | |||
| 28d1de072c | |||
| b09e8a4b96 | |||
| 7f754037bb | |||
| f29c5692b9 | |||
| 57d278336d | |||
| b309738222 | |||
| b3eb59983a | |||
| cf3f0ceb1b | |||
| 41c0902b83 | |||
| a2439bf43b | |||
| 8d5a12f212 | |||
| 92170b72f2 | |||
| c3def0678f | |||
| 74b72a7d4e | |||
| 16e2ca679c | |||
| 6b0efbc6ee | |||
| 2db83271fa | |||
| e259bba1d1 | |||
| b3cd9f5de5 | |||
| 64820fe12b | |||
| e72b6cfdde | |||
| 0e870776c4 | |||
| d8d8354070 | |||
| 5bb61fc74c | |||
| 9e9af70ba8 | |||
| 884da2c89a | |||
| 3671b95a83 | |||
| 5e78f2bb1e | |||
| 5296d595f1 | |||
| 9901d449e1 | |||
| 57605a56c4 | |||
| bd77727f58 |
@@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Enums;
|
||||||
|
|
||||||
|
enum InventoryMovementOperation: string
|
||||||
|
{
|
||||||
|
case StockInitialized = 'stock_initialized';
|
||||||
|
case StockIncreased = 'stock_increased';
|
||||||
|
case StockDecreased = 'stock_decreased';
|
||||||
|
case StockReserved = 'stock_reserved';
|
||||||
|
case StockReleased = 'stock_released';
|
||||||
|
case PurchaseCommitted = 'purchase_committed';
|
||||||
|
case StockRefunded = 'stock_refunded';
|
||||||
|
case EntryStockReserved = 'entry_stock_reserved';
|
||||||
|
case EntryStockReleased = 'entry_stock_released';
|
||||||
|
case InventoryReset = 'inventory_reset';
|
||||||
|
case InventoryTransferred = 'inventory_transferred';
|
||||||
|
}
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Enums\InventorySubject;
|
use App\Domains\Commerce\Catalog\Enums\InventorySubject;
|
||||||
@@ -10,6 +9,7 @@ use App\Domains\Commerce\Catalog\Services\CatalogInventoryService;
|
|||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
@@ -19,6 +19,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
|||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
'tenant_code',
|
'tenant_code',
|
||||||
@@ -213,10 +214,14 @@ class CatalogItem extends Model
|
|||||||
/** @param Builder<CatalogItem> $query */
|
/** @param Builder<CatalogItem> $query */
|
||||||
public function scopeWhereAvailable(Builder $query): Builder
|
public function scopeWhereAvailable(Builder $query): Builder
|
||||||
{
|
{
|
||||||
|
$availableInventory = static fn (Builder $inventoryQuery): Builder => Schema::hasColumn('inventories', 'available_stock')
|
||||||
|
? $inventoryQuery->where('inventories.available_stock', '>', 0)
|
||||||
|
: $inventoryQuery->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock');
|
||||||
|
|
||||||
return $query->where(function (Builder $query): void {
|
return $query->where(function (Builder $query): void {
|
||||||
$query->whereNull('catalog_items.sales_end_at')
|
$query->whereNull('catalog_items.sales_end_at')
|
||||||
->orWhere('catalog_items.sales_end_at', '>', now());
|
->orWhere('catalog_items.sales_end_at', '>', now());
|
||||||
})->where(function (Builder $query): void {
|
})->where(function (Builder $query) use ($availableInventory): void {
|
||||||
$query
|
$query
|
||||||
->where(function (Builder $unlimitedQuery): void {
|
->where(function (Builder $unlimitedQuery): void {
|
||||||
$unlimitedQuery
|
$unlimitedQuery
|
||||||
@@ -236,20 +241,18 @@ class CatalogItem extends Model
|
|||||||
->whereNull('replaced_by_variant_id')
|
->whereNull('replaced_by_variant_id')
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
fn (Builder $inventoryQuery): Builder => $inventoryQuery
|
$availableInventory
|
||||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
->orWhere(function (Builder $directItemQuery): void {
|
->orWhere(function (Builder $directItemQuery) use ($availableInventory): void {
|
||||||
$directItemQuery
|
$directItemQuery
|
||||||
->whereDoesntHave('variants')
|
->whereDoesntHave('variants')
|
||||||
->where(function (Builder $inventoryQuery): void {
|
->where(function (Builder $inventoryQuery) use ($availableInventory): void {
|
||||||
$inventoryQuery
|
$inventoryQuery
|
||||||
->whereNull('catalog_items.inventory_id')
|
->whereNull('catalog_items.inventory_id')
|
||||||
->orWhereHas(
|
->orWhereHas(
|
||||||
'inventory',
|
'inventory',
|
||||||
fn (Builder $availableInventoryQuery): Builder => $availableInventoryQuery
|
$availableInventory
|
||||||
->whereColumn('inventories.real_stock', '>', 'inventories.reserved_stock')
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -264,9 +267,15 @@ class CatalogItem extends Model
|
|||||||
/** @return Collection<int, Variant> */
|
/** @return Collection<int, Variant> */
|
||||||
public function visibleVariants(?int $includedVariantId = null): Collection
|
public function visibleVariants(?int $includedVariantId = null): Collection
|
||||||
{
|
{
|
||||||
|
$this->variants
|
||||||
|
->filter(fn (Variant $variant): bool => $variant->exists)
|
||||||
|
->loadMissing('desfileEntryReservations');
|
||||||
|
|
||||||
return $this->variants
|
return $this->variants
|
||||||
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
|
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $this))
|
||||||
->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
|
->filter(fn (Variant $variant): bool => $variant->hasOnlyActiveEventDates()
|
||||||
|
&& (! $variant->relationLoaded('desfileEntryReservations')
|
||||||
|
|| $variant->desfileEntryReservations->isEmpty())
|
||||||
&& (($includedVariantId !== null && $variant->id === $includedVariantId)
|
&& (($includedVariantId !== null && $variant->id === $includedVariantId)
|
||||||
|| ($variant->isSellable() && (
|
|| ($variant->isSellable() && (
|
||||||
$this->inventory_policy === InventoryPolicy::Unlimited
|
$this->inventory_policy === InventoryPolicy::Unlimited
|
||||||
|
|||||||
@@ -2,16 +2,23 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
'sold_units',
|
'sold_units',
|
||||||
'refunded_units',
|
'refunded_units',
|
||||||
'reserved_stock',
|
'reserved_stock',
|
||||||
|
'entry_reserved_stock',
|
||||||
'real_stock',
|
'real_stock',
|
||||||
])]
|
])]
|
||||||
class Inventory extends Model
|
class Inventory extends Model
|
||||||
@@ -35,7 +42,9 @@ class Inventory extends Model
|
|||||||
'sold_units' => 'integer',
|
'sold_units' => 'integer',
|
||||||
'refunded_units' => 'integer',
|
'refunded_units' => 'integer',
|
||||||
'reserved_stock' => 'integer',
|
'reserved_stock' => 'integer',
|
||||||
|
'entry_reserved_stock' => 'integer',
|
||||||
'real_stock' => 'integer',
|
'real_stock' => 'integer',
|
||||||
|
'available_stock' => 'integer',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,51 +66,295 @@ class Inventory extends Model
|
|||||||
return $this->hasMany(StockReservationLine::class);
|
return $this->hasMany(StockReservationLine::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<InventoryMovement, $this> */
|
||||||
|
public function movements(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(InventoryMovement::class);
|
||||||
|
}
|
||||||
|
|
||||||
public function availableStock(): int
|
public function availableStock(): int
|
||||||
{
|
{
|
||||||
return max(0, $this->real_stock - $this->reserved_stock);
|
if (! array_key_exists('available_stock', $this->attributes)) {
|
||||||
|
return max(0, $this->real_stock - $this->reserved_stock - ($this->entry_reserved_stock ?? 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) $this->getAttribute('available_stock');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reserveEntry(int $amount, bool $tracksInventory): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::EntryStockReserved,
|
||||||
|
['entry_reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
|
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function releaseEntry(int $amount): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::EntryStockReleased,
|
||||||
|
['entry_reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
|
if ($amount < 1 || $inventory->entry_reserved_stock < $amount) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reserve(int $amount, bool $tracksInventory): void
|
public function reserve(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
|
$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
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$this->mutate(
|
||||||
|
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
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $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 < $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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->reserved_stock -= $amount;
|
public function adjustAvailableStock(
|
||||||
$this->sold_units += $amount;
|
int $delta,
|
||||||
|
?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,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'inventory_id',
|
||||||
|
'operation',
|
||||||
|
'available_stock_delta',
|
||||||
|
'available_stock_before',
|
||||||
|
'available_stock_after',
|
||||||
|
'counter_deltas',
|
||||||
|
'responsible_user_id',
|
||||||
|
'idempotency_key',
|
||||||
|
])]
|
||||||
|
class InventoryMovement extends Model
|
||||||
|
{
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'operation' => InventoryMovementOperation::class,
|
||||||
|
'available_stock_delta' => 'integer',
|
||||||
|
'available_stock_before' => 'integer',
|
||||||
|
'available_stock_after' => 'integer',
|
||||||
|
'counter_deltas' => 'array',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Inventory, $this> */
|
||||||
|
public function inventory(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Inventory::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<User, $this> */
|
||||||
|
public function responsibleUser(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class, 'responsible_user_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Models;
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -74,6 +75,12 @@ class Variant extends Model
|
|||||||
return $this->hasMany(Ticket::class, 'source_variant_id');
|
return $this->hasMany(Ticket::class, 'source_variant_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<EntryReservation, $this> */
|
||||||
|
public function desfileEntryReservations(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(EntryReservation::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Inventory, $this> */
|
/** @return BelongsTo<Inventory, $this> */
|
||||||
public function inventory(): BelongsTo
|
public function inventory(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ class CatalogInventoryService
|
|||||||
$selection->loadMissing('variants.inventory');
|
$selection->loadMissing('variants.inventory');
|
||||||
|
|
||||||
return $selection->variants
|
return $selection->variants
|
||||||
|
->each(fn (Variant $variant) => $variant->setRelation('catalogItem', $selection))
|
||||||
->filter(fn (Variant $variant): bool => $variant->isSellable())
|
->filter(fn (Variant $variant): bool => $variant->isSellable())
|
||||||
->unique(fn (Variant $variant): string => $variant->inventory_id === null
|
->unique(fn (Variant $variant): string => $variant->inventory_id === null
|
||||||
? 'object:'.spl_object_id($variant->inventory)
|
? 'object:'.spl_object_id($variant->inventory)
|
||||||
@@ -153,7 +154,7 @@ class CatalogInventoryService
|
|||||||
|
|
||||||
if ($operation === 'commit'
|
if ($operation === 'commit'
|
||||||
&& $requirement['tracks_inventory']
|
&& $requirement['tracks_inventory']
|
||||||
&& $inventory->real_stock < $requiredQuantity) {
|
&& $inventory->availableStock() < 0) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Catalog\Services;
|
namespace App\Domains\Commerce\Catalog\Services;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
||||||
use App\Domains\Commerce\Catalog\Models\Attribute;
|
use App\Domains\Commerce\Catalog\Models\Attribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
@@ -11,8 +9,10 @@ use App\Domains\Commerce\Catalog\Models\Category;
|
|||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -286,9 +286,11 @@ class CatalogService
|
|||||||
int $perPage,
|
int $perPage,
|
||||||
int $page,
|
int $page,
|
||||||
): LengthAwarePaginator {
|
): LengthAwarePaginator {
|
||||||
|
$categoryIds = $this->categoryAndDescendantIds($tenant, $category);
|
||||||
|
|
||||||
return CatalogItem::query()
|
return CatalogItem::query()
|
||||||
->forTenantCatalog($tenant)
|
->forTenantCatalog($tenant)
|
||||||
->where('category_id', $category->id)
|
->whereIn('category_id', $categoryIds)
|
||||||
->whereAvailable()
|
->whereAvailable()
|
||||||
->with([
|
->with([
|
||||||
'attachments',
|
'attachments',
|
||||||
@@ -306,6 +308,34 @@ class CatalogService
|
|||||||
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<int, int> */
|
||||||
|
private function categoryAndDescendantIds(Tenant $tenant, Category $category): array
|
||||||
|
{
|
||||||
|
$childrenByParent = Category::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
|
->get(['id', 'categoria_id'])
|
||||||
|
->groupBy('categoria_id');
|
||||||
|
|
||||||
|
$categoryIds = [];
|
||||||
|
$pendingIds = [$category->id];
|
||||||
|
|
||||||
|
while ($pendingIds !== []) {
|
||||||
|
$categoryId = array_shift($pendingIds);
|
||||||
|
|
||||||
|
if (isset($categoryIds[$categoryId])) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$categoryIds[$categoryId] = $categoryId;
|
||||||
|
|
||||||
|
foreach ($childrenByParent->get($categoryId, collect()) as $child) {
|
||||||
|
$pendingIds[] = $child->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return array_values($categoryIds);
|
||||||
|
}
|
||||||
|
|
||||||
public function delete(CatalogItem $catalogItem): void
|
public function delete(CatalogItem $catalogItem): void
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($catalogItem): void {
|
DB::transaction(function () use ($catalogItem): void {
|
||||||
@@ -340,9 +370,12 @@ class CatalogService
|
|||||||
|
|
||||||
private function createInventory(int $realStock): Inventory
|
private function createInventory(int $realStock): Inventory
|
||||||
{
|
{
|
||||||
return Inventory::query()->create([
|
$inventory = Inventory::query()->create([
|
||||||
'real_stock' => $realStock,
|
'real_stock' => $realStock,
|
||||||
]);
|
]);
|
||||||
|
$inventory->recordInitialization();
|
||||||
|
|
||||||
|
return $inventory;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ class StockReservationService
|
|||||||
$inventory = $inventories->get($line->inventory_id)
|
$inventory = $inventories->get($line->inventory_id)
|
||||||
?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
|
?? throw new \InvalidArgumentException('No se encontró el inventario reservado.');
|
||||||
if ($inventory->reserved_stock < $line->quantity
|
if ($inventory->reserved_stock < $line->quantity
|
||||||
|| ($line->tracks_inventory && $inventory->real_stock < $line->quantity)) {
|
|| ($line->tracks_inventory && $inventory->availableStock() < 0)) {
|
||||||
throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
|
throw new \InvalidArgumentException('La reserva de stock no alcanza para confirmar la compra.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use App\Domains\Commerce\Catalog\Models\Inventory;
|
|||||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||||
use App\Domains\Commerce\Catalog\Models\StockReservationLine;
|
use App\Domains\Commerce\Catalog\Models\StockReservationLine;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
@@ -190,15 +191,22 @@ class VariantReplacementService
|
|||||||
'sold_units' => $sourceInventory->sold_units,
|
'sold_units' => $sourceInventory->sold_units,
|
||||||
'refunded_units' => $sourceInventory->refunded_units,
|
'refunded_units' => $sourceInventory->refunded_units,
|
||||||
'reserved_stock' => $reservedStock,
|
'reserved_stock' => $reservedStock,
|
||||||
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'real_stock' => $sourceInventory->real_stock,
|
'real_stock' => $sourceInventory->real_stock,
|
||||||
]);
|
]);
|
||||||
|
$replacementInventory->recordTransferInitialization();
|
||||||
|
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
->whereKey($activeLines->modelKeys())
|
->whereKey($activeLines->modelKeys())
|
||||||
->update(['inventory_id' => $replacementInventory->getKey()]);
|
->update(['inventory_id' => $replacementInventory->getKey()]);
|
||||||
}
|
}
|
||||||
$sourceInventory->update(['reserved_stock' => 0]);
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
|
->update(['inventory_id' => $replacementInventory->id]);
|
||||||
|
$sourceInventory->transferCounters([
|
||||||
|
'reserved_stock' => -$sourceInventory->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock,
|
||||||
|
]);
|
||||||
|
|
||||||
return $replacementInventory;
|
return $replacementInventory;
|
||||||
}
|
}
|
||||||
@@ -232,23 +240,25 @@ class VariantReplacementService
|
|||||||
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
throw new \LogicException('El inventario reservado de la variante es inconsistente.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$destinationInventory->update([
|
$transferredCounters = [
|
||||||
'real_stock' => $destinationInventory->real_stock + $sourceInventory->real_stock,
|
'real_stock' => $sourceInventory->real_stock,
|
||||||
'reserved_stock' => $destinationInventory->reserved_stock + $sourceInventory->reserved_stock,
|
'reserved_stock' => $sourceInventory->reserved_stock,
|
||||||
'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units,
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_units,
|
'sold_units' => $sourceInventory->sold_units,
|
||||||
]);
|
'refunded_units' => $sourceInventory->refunded_units,
|
||||||
|
];
|
||||||
|
$destinationInventory->transferCounters($transferredCounters);
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
->whereKey($activeLines->modelKeys())
|
->whereKey($activeLines->modelKeys())
|
||||||
->update(['inventory_id' => $destinationInventory->getKey()]);
|
->update(['inventory_id' => $destinationInventory->getKey()]);
|
||||||
}
|
}
|
||||||
$sourceInventory->update([
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
'real_stock' => 0,
|
->update(['inventory_id' => $destinationInventory->id]);
|
||||||
'reserved_stock' => 0,
|
$sourceInventory->transferCounters(array_map(
|
||||||
'sold_units' => 0,
|
fn (int $value): int => -$value,
|
||||||
'refunded_units' => 0,
|
$transferredCounters,
|
||||||
]);
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return list<string> */
|
/** @return list<string> */
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Controllers;
|
namespace App\Domains\Commerce\Purchase\Controllers;
|
||||||
|
|
||||||
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
||||||
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
||||||
@@ -13,6 +12,7 @@ use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
|||||||
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -151,11 +151,14 @@ class PurchaseController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
$compra->refresh();
|
$compra->refresh();
|
||||||
|
$compra->loadMissing('event');
|
||||||
$totalAmount = (float) $compra->total;
|
$totalAmount = (float) $compra->total;
|
||||||
|
|
||||||
if ($method === 'transfer') {
|
if ($method === 'transfer') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$accountInfo = $telepagosService->getAccountInfo();
|
$accountInfo = $telepagosService->getAccountInfo();
|
||||||
@@ -191,7 +194,9 @@ class PurchaseController extends Controller
|
|||||||
|
|
||||||
if ($method === 'qr') {
|
if ($method === 'qr') {
|
||||||
$telepagosService = new TelepagosIntegrationService;
|
$telepagosService = new TelepagosIntegrationService;
|
||||||
$telepagosService->forTenant($tenant->codigo);
|
$compra->event
|
||||||
|
? $telepagosService->forEvent($compra->event)
|
||||||
|
: $telepagosService->forTenant($tenant->codigo);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
||||||
|
|||||||
@@ -2,13 +2,14 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Models;
|
namespace App\Domains\Commerce\Purchase\Models;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Models\Cart;
|
use App\Domains\Commerce\Cart\Models\Cart;
|
||||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||||
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
|
||||||
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -21,6 +22,7 @@ use Illuminate\Support\Facades\DB;
|
|||||||
#[Fillable([
|
#[Fillable([
|
||||||
'cart_id',
|
'cart_id',
|
||||||
'stock_reservation_id',
|
'stock_reservation_id',
|
||||||
|
'event_id',
|
||||||
'tenant_codigo',
|
'tenant_codigo',
|
||||||
'user_id',
|
'user_id',
|
||||||
'status',
|
'status',
|
||||||
@@ -149,6 +151,7 @@ class Purchase extends Model
|
|||||||
return [
|
return [
|
||||||
'cart_id' => 'integer',
|
'cart_id' => 'integer',
|
||||||
'stock_reservation_id' => 'integer',
|
'stock_reservation_id' => 'integer',
|
||||||
|
'event_id' => 'integer',
|
||||||
'user_id' => 'integer',
|
'user_id' => 'integer',
|
||||||
'total' => 'decimal:2',
|
'total' => 'decimal:2',
|
||||||
];
|
];
|
||||||
@@ -162,6 +165,12 @@ class Purchase extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Event, $this> */
|
||||||
|
public function event(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return BelongsTo<User, $this>
|
* @return BelongsTo<User, $this>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ class PurchaseResource extends JsonResource
|
|||||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
/** @var Event|null $checkoutEvent */
|
/** @var Event|null $checkoutEvent */
|
||||||
$checkoutEvent = $usesEventSummary
|
$checkoutEvent = $usesEventSummary
|
||||||
? $items
|
? ($this->event ?? $items
|
||||||
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
||||||
->filter()
|
->filter()
|
||||||
->unique('id')
|
->unique('id')
|
||||||
->first()
|
->first())
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
$subtotal = $items->isNotEmpty()
|
$subtotal = $items->isNotEmpty()
|
||||||
@@ -62,6 +62,7 @@ class PurchaseResource extends JsonResource
|
|||||||
return [
|
return [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
'cart_id' => $this->cart_id,
|
'cart_id' => $this->cart_id,
|
||||||
|
'event_id' => $this->event_id,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
'user_id' => $this->user_id,
|
'user_id' => $this->user_id,
|
||||||
'created_at' => $this->created_at,
|
'created_at' => $this->created_at,
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ class PurchaseResponseLoader
|
|||||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||||
$relations = [
|
$relations = [
|
||||||
'tenant',
|
'tenant',
|
||||||
|
'event.attachment',
|
||||||
'items.sourceCatalogItem.event.attachment',
|
'items.sourceCatalogItem.event.attachment',
|
||||||
'stockReservation',
|
'stockReservation',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -206,6 +206,7 @@ class StartCheckoutService
|
|||||||
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
||||||
),
|
),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -273,6 +274,7 @@ class StartCheckoutService
|
|||||||
$purchaseData,
|
$purchaseData,
|
||||||
$cart->getTotalAmount(),
|
$cart->getTotalAmount(),
|
||||||
$cart->getKey(),
|
$cart->getKey(),
|
||||||
|
$cartItems->first()?->catalogItem?->event_id,
|
||||||
);
|
);
|
||||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||||
@@ -410,10 +412,12 @@ class StartCheckoutService
|
|||||||
array $purchaseData,
|
array $purchaseData,
|
||||||
float $total,
|
float $total,
|
||||||
?int $cartId,
|
?int $cartId,
|
||||||
|
?int $eventId,
|
||||||
): Purchase {
|
): Purchase {
|
||||||
return Purchase::query()->create([
|
return Purchase::query()->create([
|
||||||
...$purchaseData,
|
...$purchaseData,
|
||||||
'cart_id' => $cartId,
|
'cart_id' => $cartId,
|
||||||
|
'event_id' => $eventId,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
'user_id' => $userId,
|
'user_id' => $userId,
|
||||||
'status' => Purchase::STATUS_CREATED,
|
'status' => Purchase::STATUS_CREATED,
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Services;
|
namespace App\Domains\Commerce\Purchase\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use Illuminate\Database\Query\Builder;
|
use Illuminate\Database\Query\Builder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -25,6 +26,9 @@ class TenantTransactionResetService
|
|||||||
'carts' => $scope['cart_ids']->count(),
|
'carts' => $scope['cart_ids']->count(),
|
||||||
'cart_items' => $scope['cart_item_ids']->count(),
|
'cart_items' => $scope['cart_item_ids']->count(),
|
||||||
'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
|
'tickets' => DB::table('tickets')->where('tenant_code', $tenantCode)->count(),
|
||||||
|
'entry_reservations' => DB::table('desfile_entry_reservations')
|
||||||
|
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
||||||
|
DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->count(),
|
||||||
'stock_reservations' => $this->reservationQuery($scope)->count(),
|
'stock_reservations' => $this->reservationQuery($scope)->count(),
|
||||||
'purchase_changes' => DB::table('value_changes')
|
'purchase_changes' => DB::table('value_changes')
|
||||||
->where('tenant_code', $tenantCode)
|
->where('tenant_code', $tenantCode)
|
||||||
@@ -47,6 +51,10 @@ class TenantTransactionResetService
|
|||||||
$telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
|
$telepagosQr = DB::table('telepagos_qr')->whereIn('compra_id', $scope['purchase_ids'])->count();
|
||||||
$summary = [
|
$summary = [
|
||||||
'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
|
'stock_reservations_deleted' => $this->reservationQuery($scope)->delete(),
|
||||||
|
'entry_reservations_deleted' => DB::table('desfile_entry_reservations')
|
||||||
|
->whereIn('variant_id', DB::table('variantes')->whereIn('catalog_item_id',
|
||||||
|
DB::table('catalog_items')->where('tenant_code', $tenantCode)->select('id'))->select('id'))->delete(),
|
||||||
|
'entry_reservation_batches_deleted' => DB::table('desfile_reservation_batches')->where('tenant_code', $tenantCode)->delete(),
|
||||||
'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
|
'tickets_deleted' => DB::table('tickets')->where('tenant_code', $tenantCode)->delete(),
|
||||||
'purchase_changes_deleted' => DB::table('value_changes')
|
'purchase_changes_deleted' => DB::table('value_changes')
|
||||||
->where('tenant_code', $tenantCode)
|
->where('tenant_code', $tenantCode)
|
||||||
@@ -62,14 +70,12 @@ class TenantTransactionResetService
|
|||||||
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
'users_preserved' => DB::table('users')->where('tenant_codigo', $tenantCode)->count(),
|
||||||
];
|
];
|
||||||
|
|
||||||
DB::table('inventories')
|
Inventory::query()
|
||||||
->whereIn('id', $scope['inventory_ids'])
|
->whereKey($scope['inventory_ids'])
|
||||||
->update([
|
->orderBy('id')
|
||||||
'real_stock' => DB::raw('real_stock + sold_units - refunded_units'),
|
->lockForUpdate()
|
||||||
'reserved_stock' => 0,
|
->get()
|
||||||
'sold_units' => 0,
|
->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters());
|
||||||
'refunded_units' => 0,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $summary;
|
return $summary;
|
||||||
});
|
});
|
||||||
|
|||||||
47
app/Domains/Core/Address/Models/Address.php
Normal file
47
app/Domains/Core/Address/Models/Address.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
|
class Address extends Model
|
||||||
|
{
|
||||||
|
protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'latitude' => 'decimal:7',
|
||||||
|
'longitude' => 'decimal:7',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array{latitude: float, longitude: float}|null */
|
||||||
|
public function coordinates(): ?array
|
||||||
|
{
|
||||||
|
if ($this->latitude === null || $this->longitude === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Tenant, $this> */
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantAddress extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_addresses';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Address */
|
||||||
|
class AddressResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'address_text' => $this->address_text,
|
||||||
|
'latitude' => $this->latitude === null ? null : (float) $this->latitude,
|
||||||
|
'longitude' => $this->longitude === null ? null : (float) $this->longitude,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,6 +11,9 @@ class AdminAppContextService
|
|||||||
{
|
{
|
||||||
$tenant = $user->tenant()
|
$tenant = $user->tenant()
|
||||||
->with([
|
->with([
|
||||||
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'phoneNumbers',
|
||||||
'menues' => fn ($query) => $query
|
'menues' => fn ($query) => $query
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'roles',
|
'roles',
|
||||||
|
|||||||
@@ -33,7 +33,11 @@ class TenantBootstrapService
|
|||||||
$tenant,
|
$tenant,
|
||||||
[
|
[
|
||||||
'eventDateChanges',
|
'eventDateChanges',
|
||||||
'menues' => fn ($query) => $query->whereHas(
|
'menues' => fn ($query) => $query
|
||||||
|
->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)
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Client\Models;
|
namespace App\Domains\Core\Client\Models;
|
||||||
|
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
@@ -22,6 +23,12 @@ class Client extends Model
|
|||||||
return $this->hasMany(Tenant::class);
|
return $this->hasMany(Tenant::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return HasMany<ClientIntegration, $this> */
|
/** @return HasMany<ClientIntegration, $this> */
|
||||||
public function integrations(): HasMany
|
public function integrations(): HasMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Menu extends Model
|
|||||||
'codigo'
|
'codigo'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ class TenantMenu extends Pivot
|
|||||||
'tenant_code',
|
'tenant_code',
|
||||||
'menu_code',
|
'menu_code',
|
||||||
'static_content',
|
'static_content',
|
||||||
|
'is_enabled',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'static_content' => 'array',
|
'static_content' => 'array',
|
||||||
|
'is_enabled' => 'boolean',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
61
app/Domains/Core/PhoneNumber/Models/PhoneNumber.php
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
|
||||||
|
class PhoneNumber extends Model
|
||||||
|
{
|
||||||
|
protected $attributes = ['country_code' => '+54', 'mobile_prefix' => '9'];
|
||||||
|
|
||||||
|
protected $fillable = ['label', 'country_code', 'mobile_prefix', 'area_code', 'local_number'];
|
||||||
|
|
||||||
|
public function getNumberAttribute(?string $legacyNumber): string
|
||||||
|
{
|
||||||
|
if ($this->local_number === null) {
|
||||||
|
return $legacyNumber ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->mobile_prefix && $this->area_code
|
||||||
|
? '('.$this->area_code.')'
|
||||||
|
: $this->area_code;
|
||||||
|
|
||||||
|
return implode(' ', array_filter([
|
||||||
|
$this->country_code,
|
||||||
|
$this->mobile_prefix,
|
||||||
|
$areaCode,
|
||||||
|
$this->local_number,
|
||||||
|
], fn ($part): bool => $part !== null && $part !== ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function dialableNumber(string $number): string
|
||||||
|
{
|
||||||
|
return preg_replace('/[^0-9+]/', '', $number);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function telUrl(): string
|
||||||
|
{
|
||||||
|
if ($this->country_code === null || $this->local_number === null) {
|
||||||
|
return 'tel:'.self::dialableNumber($this->number);
|
||||||
|
}
|
||||||
|
|
||||||
|
$areaCode = $this->area_code ?? '';
|
||||||
|
if ($this->country_code === '+54') {
|
||||||
|
$areaCode = ltrim($areaCode, '0');
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'tel:'.self::dialableNumber(
|
||||||
|
$this->country_code.($this->mobile_prefix ?? '').$areaCode.$this->local_number
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_phone_numbers', 'phone_number_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
31
app/Domains/Core/PhoneNumber/Models/TenantPhoneNumber.php
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantPhoneNumber extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_phone_numbers';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'phone_number_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumber(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(PhoneNumber::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\PhoneNumber\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class PhoneNumberResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'country_code' => $this->country_code,
|
||||||
|
'mobile_prefix' => $this->mobile_prefix,
|
||||||
|
'area_code' => $this->area_code,
|
||||||
|
'local_number' => $this->local_number,
|
||||||
|
'number' => $this->number,
|
||||||
|
'tel_url' => $this->resource->telUrl(),
|
||||||
|
'is_main' => $this->whenPivotLoaded('tenant_phone_numbers', fn () => (bool) $this->pivot->is_main),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\BrandService;
|
||||||
|
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class BrandController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(
|
||||||
|
UpdateBrandRequest $request,
|
||||||
|
BrandService $brandService,
|
||||||
|
TenantInformationService $tenantInformationService,
|
||||||
|
): BrandResource {
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$brandService->update($tenant, $request->validated());
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant->fresh()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateHelpMenuContentRequest;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class HelpMenuController extends Controller
|
||||||
|
{
|
||||||
|
private const MENU_CODES = [
|
||||||
|
'help.faq',
|
||||||
|
'help.terms-and-conditions',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function index(Request $request): JsonResponse
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$menus = $tenant->menues()
|
||||||
|
->whereIn('menues.code', self::MENU_CODES)
|
||||||
|
->get()
|
||||||
|
->keyBy('code');
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => collect(self::MENU_CODES)->mapWithKeys(
|
||||||
|
fn (string $code): array => [$code => [
|
||||||
|
'code' => $code,
|
||||||
|
'is_enabled' => (bool) ($menus->get($code)?->pivot?->is_enabled ?? false),
|
||||||
|
'static_content' => $menus->get($code)?->pivot?->static_content
|
||||||
|
?? $this->emptyContent($code),
|
||||||
|
]]
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function toggle(
|
||||||
|
Request $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$isEnabled = ! $tenantMenu->pivot->is_enabled;
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => $isEnabled,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateContent(
|
||||||
|
UpdateHelpMenuContentRequest $request,
|
||||||
|
string $menuCode,
|
||||||
|
): JsonResponse {
|
||||||
|
abort_unless(in_array($menuCode, self::MENU_CODES, true), 404);
|
||||||
|
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$tenantMenu = $tenant->menues()
|
||||||
|
->where('menues.code', $menuCode)
|
||||||
|
->firstOrFail();
|
||||||
|
$staticContent = $request->validated('static_content');
|
||||||
|
|
||||||
|
$tenant->menues()->updateExistingPivot($menuCode, [
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
]);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'data' => [
|
||||||
|
'code' => $tenantMenu->code,
|
||||||
|
'is_enabled' => (bool) $tenantMenu->pivot->is_enabled,
|
||||||
|
'static_content' => $staticContent,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function emptyContent(string $menuCode): array
|
||||||
|
{
|
||||||
|
return $menuCode === 'help.faq' ? [] : ['html' => ''];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,10 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Address\Models\TenantAddress;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\PhoneNumber;
|
||||||
|
use App\Domains\Core\PhoneNumber\Models\TenantPhoneNumber;
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Menu\Models\TenantMenu;
|
use App\Domains\Core\Menu\Models\TenantMenu;
|
||||||
@@ -22,6 +26,7 @@ use Illuminate\Database\Eloquent\Model;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasOneThrough;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
#[Fillable([
|
#[Fillable([
|
||||||
@@ -308,6 +313,39 @@ class Tenant extends Model
|
|||||||
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Address, $this> */
|
||||||
|
public function addresses(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasOneThrough<Address, TenantAddress, $this> */
|
||||||
|
public function mainAddress(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
|
||||||
|
->where('tenant_addresses.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function phoneNumbers(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(PhoneNumber::class, 'tenant_phone_numbers', 'tenant_codigo', 'phone_number_id', 'codigo', 'id')
|
||||||
|
->using(TenantPhoneNumber::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('is_main', 'desc')
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function mainPhoneNumber(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(PhoneNumber::class, TenantPhoneNumber::class, 'tenant_codigo', 'id', 'codigo', 'phone_number_id')
|
||||||
|
->where('tenant_phone_numbers.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
public function menues(): BelongsToMany
|
public function menues(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(
|
return $this->belongsToMany(
|
||||||
@@ -319,7 +357,7 @@ class Tenant extends Model
|
|||||||
'code'
|
'code'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use App\Shared\Rules\CroppedImageOrBase64Rule;
|
||||||
|
use App\Shared\Rules\ImageOrBase64Rule;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateBrandRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
$shopit = $this->user()->tenant()->firstOrFail()->storefront_website_type_code === 'shopit';
|
||||||
|
|
||||||
|
return [
|
||||||
|
'nombre' => ['required', 'string', 'max:255'],
|
||||||
|
'primary_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'footer_bg_color' => ['required', 'regex:/^#[0-9a-fA-F]{6}$/'],
|
||||||
|
'header_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'footer_logo' => ['present', 'nullable', new ImageOrBase64Rule],
|
||||||
|
'banner_images' => [$shopit ? 'present' : 'prohibited', 'array', 'max:10'],
|
||||||
|
'banner_images.*' => ['required', new CroppedImageOrBase64Rule],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Requests\AdminApp;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
|
||||||
|
class UpdateHelpMenuContentRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return match ($this->route('menuCode')) {
|
||||||
|
'help.faq' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.*.pregunta' => ['required', 'string'],
|
||||||
|
'static_content.*.respuesta' => ['required', 'string'],
|
||||||
|
'static_content.*.is_active' => ['required', 'boolean'],
|
||||||
|
],
|
||||||
|
'help.terms-and-conditions' => [
|
||||||
|
'static_content' => ['required', 'array'],
|
||||||
|
'static_content.html' => ['present', 'nullable', 'string'],
|
||||||
|
],
|
||||||
|
default => [],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
104
app/Domains/Core/Tenant/Resources/AdminApp/BrandResource.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Models\AttachmentCrop;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Tenant */
|
||||||
|
class BrandResource extends JsonResource
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'nombre' => $this->nombre,
|
||||||
|
'primary_color' => $this->primary_color,
|
||||||
|
'header_bg_color' => $this->header_bg_color,
|
||||||
|
'footer_color' => $this->footerColor(),
|
||||||
|
'header_logo' => $this->headerLogo?->getTemporaryUrl(1440),
|
||||||
|
'header_logo_key' => $this->headerLogo?->key,
|
||||||
|
'footer_logo' => $this->footerLogo?->getTemporaryUrl(1440),
|
||||||
|
'footer_logo_key' => $this->footerLogo?->key,
|
||||||
|
'can_edit_carousel' => $this->canEditCarousel(),
|
||||||
|
'banner_images' => $this->bannerImages(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function footerColor(): string
|
||||||
|
{
|
||||||
|
$footerColor = strtolower(trim((string) $this->footer_bg_color));
|
||||||
|
$primaryColor = strtolower(trim((string) $this->primary_color));
|
||||||
|
|
||||||
|
if ($footerColor !== '' && $footerColor === $primaryColor) {
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_array($footerColor, ['#000', '#000000', 'black'], true)) {
|
||||||
|
return 'black';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($footerColor === '' || in_array($footerColor, ['#fff', '#ffffff', 'white'], true)) {
|
||||||
|
return 'white';
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'primary';
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<int, array<string, mixed>> */
|
||||||
|
private function bannerImages(): array
|
||||||
|
{
|
||||||
|
if (! $this->canEditCarousel()) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->is_enabled && $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
if ($extra === null) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$images = $extra->resolvedConfig();
|
||||||
|
|
||||||
|
if (! is_array($images)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
return collect($images)
|
||||||
|
->filter(fn ($image) => $image instanceof Attachment)
|
||||||
|
->map(function (Attachment $image): array {
|
||||||
|
$desktopCrop = $image->cropVariants
|
||||||
|
->firstWhere('variant', AttachmentCrop::DESKTOP);
|
||||||
|
|
||||||
|
return [
|
||||||
|
'key' => $image->key,
|
||||||
|
'url' => ($desktopCrop?->croppedAttachment ?? $image)->getTemporaryUrl(1440),
|
||||||
|
'original_url' => $image->getTemporaryUrl(1440),
|
||||||
|
'crop' => $desktopCrop === null ? null : [
|
||||||
|
'crop_horizontal' => $desktopCrop->crop_horizontal,
|
||||||
|
'crop_vertical' => $desktopCrop->crop_vertical,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
})
|
||||||
|
->values()
|
||||||
|
->all();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function canEditCarousel(): bool
|
||||||
|
{
|
||||||
|
if ($this->storefront_website_type_code !== 'shopit') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$extra = $this->websiteExtras->first(
|
||||||
|
fn ($extra) => $extra->websiteTypeExtra->codigo === 'carousel'
|
||||||
|
);
|
||||||
|
|
||||||
|
return $extra === null || $extra->is_enabled;
|
||||||
|
}
|
||||||
|
}
|
||||||
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
14
app/Domains/Core/Tenant/Resources/TenantAddressResource.php
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TenantAddressResource extends AddressResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [...parent::toArray($request), 'is_main' => (bool) $this->pivot->is_main];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,9 @@
|
|||||||
namespace App\Domains\Core\Tenant\Resources;
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
|
use App\Domains\Core\PhoneNumber\Resources\PhoneNumberResource;
|
||||||
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
@@ -41,7 +43,11 @@ class TenantResource extends JsonResource
|
|||||||
'site_title' => $this->site_title ?? 'ShopitFront',
|
'site_title' => $this->site_title ?? 'ShopitFront',
|
||||||
'asset_url' => config('filesystems.disks.s3.url'),
|
'asset_url' => config('filesystems.disks.s3.url'),
|
||||||
'address' => $this->address,
|
'address' => $this->address,
|
||||||
|
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
|
||||||
|
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
|
||||||
'phone' => $this->phone,
|
'phone' => $this->phone,
|
||||||
|
'phone_numbers' => $this->whenLoaded('phoneNumbers', fn () => PhoneNumberResource::collection($this->phoneNumbers)),
|
||||||
|
'main_phone_number' => $this->whenLoaded('mainPhoneNumber', fn () => PhoneNumberResource::make($this->mainPhoneNumber)),
|
||||||
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
||||||
'primary_color' => $this->primary_color,
|
'primary_color' => $this->primary_color,
|
||||||
'secondary_color' => $this->secondary_color,
|
'secondary_color' => $this->secondary_color,
|
||||||
@@ -127,6 +133,7 @@ class TenantResource extends JsonResource
|
|||||||
'subtitle' => $event->subtitle,
|
'subtitle' => $event->subtitle,
|
||||||
'description' => $event->description,
|
'description' => $event->description,
|
||||||
'location' => $event->location,
|
'location' => $event->location,
|
||||||
|
'address' => AddressResource::make($event->address),
|
||||||
'date_text' => $event->date_text,
|
'date_text' => $event->date_text,
|
||||||
'dates' => $event->dates
|
'dates' => $event->dates
|
||||||
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
->filter(fn (EventDate $date): bool => $date->rescheduled_to_event_date_id === null)
|
||||||
@@ -226,7 +233,7 @@ class TenantResource extends JsonResource
|
|||||||
'route' => $menu->route,
|
'route' => $menu->route,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($menu->pivot?->static_content !== null) {
|
if ($menu->content_type === Menu::CONTENT_TYPE_STATIC && $menu->pivot?->static_content !== null) {
|
||||||
$formatted['static_content'] = $menu->pivot->static_content;
|
$formatted['static_content'] = $menu->pivot->static_content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
165
app/Domains/Core/Tenant/Services/BrandService.php
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Enums\AttachmentType;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
|
class BrandService
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly AttachmentService $attachmentService,
|
||||||
|
private readonly WebsiteExtraService $websiteExtraService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $data */
|
||||||
|
public function update(Tenant $tenant, array $data): void
|
||||||
|
{
|
||||||
|
$carousel = $tenant->storefront_website_type_code === 'shopit'
|
||||||
|
? $tenant->websiteExtras()->whereHas('websiteTypeExtra',
|
||||||
|
fn ($query) => $query->where('codigo', 'carousel'))->first()
|
||||||
|
: null;
|
||||||
|
$allowedBannerIds = is_array($carousel?->config) ? $carousel->config : [];
|
||||||
|
if ($carousel !== null && ! $carousel->is_enabled && ($data['banner_images'] ?? []) !== []) {
|
||||||
|
throw ValidationException::withMessages(['banner_images' => 'El carrusel está deshabilitado.']);
|
||||||
|
}
|
||||||
|
$seen = [];
|
||||||
|
|
||||||
|
foreach (['header_logo' => $tenant->header_logo_id, 'footer_logo' => $tenant->footer_logo_id] as $field => $id) {
|
||||||
|
$this->existingImage($data[$field], $id === null ? [] : [$id], $field);
|
||||||
|
}
|
||||||
|
foreach ($data['banner_images'] ?? [] as $index => $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $allowedBannerIds, "banner_images.{$index}");
|
||||||
|
if ($attachment !== null) {
|
||||||
|
if (isset($seen[$attachment->id])) {
|
||||||
|
throw ValidationException::withMessages(["banner_images.{$index}" => 'La imagen está repetida.']);
|
||||||
|
}
|
||||||
|
$seen[$attachment->id] = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$created = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($tenant, $data, $carousel, &$created): void {
|
||||||
|
$header = $this->logo($data['header_logo'], $tenant->header_logo_id, $tenant, $created);
|
||||||
|
$footer = $this->logo($data['footer_logo'], $tenant->footer_logo_id, $tenant, $created);
|
||||||
|
|
||||||
|
$tenant->update([
|
||||||
|
'nombre' => trim($data['nombre']),
|
||||||
|
'primary_color' => $data['primary_color'],
|
||||||
|
'footer_bg_color' => $data['footer_bg_color'],
|
||||||
|
'header_logo_id' => $header?->id,
|
||||||
|
'footer_logo_id' => $footer?->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($tenant->storefront_website_type_code !== 'shopit'
|
||||||
|
|| ($carousel !== null && ! $carousel->is_enabled)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$definition = $this->websiteExtraService->definitionForTenant($tenant, 'carousel');
|
||||||
|
$ids = [];
|
||||||
|
$recrops = [];
|
||||||
|
foreach ($data['banner_images'] as $item) {
|
||||||
|
$image = is_array($item) ? $item['image'] : $item;
|
||||||
|
$attachment = $this->existingImage($image, $carousel?->config ?? [], 'banner_images');
|
||||||
|
$crops = $this->crops($item);
|
||||||
|
|
||||||
|
if ($attachment === null) {
|
||||||
|
$attachment = $crops === null
|
||||||
|
? $this->attachmentService->store($image, "tenants/{$tenant->codigo}/extras/carousel")
|
||||||
|
: $this->attachmentService->storeCroppedImageVariants(
|
||||||
|
$image, "tenants/{$tenant->codigo}/extras/carousel", $crops
|
||||||
|
);
|
||||||
|
$created[] = $attachment;
|
||||||
|
} elseif ($crops !== null) {
|
||||||
|
$recrops[] = [$attachment, $crops];
|
||||||
|
}
|
||||||
|
$ids[] = $attachment->id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant->websiteExtras()->updateOrCreate(
|
||||||
|
['website_type_extra_id' => $definition->id],
|
||||||
|
['config' => $ids]
|
||||||
|
);
|
||||||
|
|
||||||
|
foreach ($recrops as [$attachment, $crops]) {
|
||||||
|
$this->attachmentService->updateImageCropVariants($attachment, $crops);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Throwable $error) {
|
||||||
|
foreach ($created as $attachment) {
|
||||||
|
$paths = [$attachment->path];
|
||||||
|
foreach ($attachment->cropVariants as $crop) {
|
||||||
|
if ($crop->croppedAttachment !== null) {
|
||||||
|
$paths[] = $crop->croppedAttachment->path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Storage::disk('s3')->delete($paths);
|
||||||
|
}
|
||||||
|
throw $error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, int> $allowedIds */
|
||||||
|
private function existingImage(mixed $value, array $allowedIds, string $field): ?Attachment
|
||||||
|
{
|
||||||
|
if (! is_string($value) || ! Str::isUuid($value)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = Attachment::query()->where('key', $value)->first();
|
||||||
|
if ($attachment === null || $attachment->type !== AttachmentType::Image
|
||||||
|
|| ! in_array($attachment->id, $allowedIds, true)) {
|
||||||
|
throw ValidationException::withMessages([$field => 'La imagen no pertenece a esta marca.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<int, Attachment> $created */
|
||||||
|
private function logo(mixed $value, ?int $currentId, Tenant $tenant, array &$created): ?Attachment
|
||||||
|
{
|
||||||
|
if ($value === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$existing = $this->existingImage($value, $currentId === null ? [] : [$currentId], 'logo');
|
||||||
|
if ($existing !== null) {
|
||||||
|
return $existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment = $this->attachmentService->store($value, "tenants/{$tenant->codigo}/logos");
|
||||||
|
$created[] = $attachment;
|
||||||
|
|
||||||
|
return $attachment;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, array<string, mixed>>|null */
|
||||||
|
private function crops(mixed $item): ?array
|
||||||
|
{
|
||||||
|
if (! is_array($item)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($item['crop_horizontal'], $item['crop_vertical'])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$crop = [
|
||||||
|
'crop_horizontal' => $item['crop_horizontal'],
|
||||||
|
'crop_vertical' => $item['crop_vertical'],
|
||||||
|
];
|
||||||
|
|
||||||
|
return ['desktop' => $crop, 'mobile' => $crop];
|
||||||
|
}
|
||||||
|
}
|
||||||
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
26
app/Domains/Core/Tenant/Services/TenantAddressService.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
class TenantAddressService
|
||||||
|
{
|
||||||
|
public function setMainAddress(Tenant $tenant, Address $address): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($tenant, $address): void {
|
||||||
|
// Serialize changes for this tenant, including when it has no principal address yet.
|
||||||
|
Tenant::query()->where('codigo', $tenant->codigo)->lockForUpdate()->firstOrFail();
|
||||||
|
$tenant->addresses()->where('addresses.id', $address->id)->firstOrFail();
|
||||||
|
|
||||||
|
DB::table('tenant_addresses')->where('tenant_codigo', $tenant->codigo)
|
||||||
|
->where('is_main', true)->update(['is_main' => false, 'updated_at' => now()]);
|
||||||
|
$tenant->addresses()->updateExistingPivot($address->id, ['is_main' => true]);
|
||||||
|
});
|
||||||
|
|
||||||
|
$tenant->unsetRelation('addresses');
|
||||||
|
$tenant->unsetRelation('mainAddress');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,9 +18,14 @@ class TenantInformationService
|
|||||||
'footerBackgroundImage',
|
'footerBackgroundImage',
|
||||||
'storefrontWebsiteType',
|
'storefrontWebsiteType',
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'mainAddress',
|
||||||
|
'phoneNumbers',
|
||||||
|
'mainPhoneNumber',
|
||||||
'websiteExtras.websiteTypeExtra',
|
'websiteExtras.websiteTypeExtra',
|
||||||
'activeEvent.dates',
|
'activeEvent.dates',
|
||||||
'activeEvent.socialMedia',
|
'activeEvent.socialMedia',
|
||||||
|
'activeEvent.address',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ Es la raíz del modelo multi-tenant. Gestiona organizaciones/sitios, tipos de we
|
|||||||
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
- `StorefrontWebsiteTypeExtra`: definición de un extra y su configuración admitida.
|
||||||
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
- `WebsiteExtra`: valor resuelto y estado del extra para un tenant.
|
||||||
- `SocialMedia`: catálogo de redes sociales asociables.
|
- `SocialMedia`: catálogo de redes sociales asociables.
|
||||||
|
- `phoneNumbers` y `mainPhoneNumber`: teléfonos públicos del tenant, definidos en el dominio `Core/PhoneNumber` y vinculados por `tenant_phone_numbers`. Solo un vínculo por tenant puede ser principal.
|
||||||
|
|
||||||
## Servicios
|
## Servicios
|
||||||
|
|
||||||
@@ -31,3 +32,5 @@ El par `(dominio, base_path)` es único. Un mismo dominio puede alojar el tenant
|
|||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
Usa `Attachable` para logos y archivos. Es referenciado por casi todos los dominios para aislamiento. El `codigo` es clave de ruta y clave foránea heredada; no debe sustituirse por `id` sin una migración integral.
|
||||||
|
|
||||||
|
Los resources exponen `phone_numbers` (incluye `is_main`) y `main_phone_number`, con `id`, `label`, `number` y `tel_url`. Contacto muestra la colección y el footer usa el principal. La migración copia primero `tenants.phone` como principal y luego el teléfono de `help.contact`, si es distinto; si no existe teléfono del tenant, el del menú pasa a ser principal. Los duplicados por formato se comparan dentro de cada tenant sin inferir país ni código de área. Los campos anteriores se conservan como datos legacy, pero la tienda consume las relaciones nuevas. No hay endpoints de edición de teléfonos ni cambios del adminapp en esta etapa.
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
<?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']);
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Controllers;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\ExportEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\IndexEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Requests\StoreEntryReservationsRequest;
|
||||||
|
use App\Domains\Ticketing\Desfile\Resources\EntryReservationResource;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationExcelService;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationPdfService;
|
||||||
|
use App\Domains\Ticketing\Desfile\Services\EntryReservationService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
|
class EntryReservationController extends Controller
|
||||||
|
{
|
||||||
|
public function index(IndexEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return EntryReservationResource::collection(
|
||||||
|
$service->reservations($request->user(), $request->validated()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadPdf(
|
||||||
|
ExportEntryReservationsRequest $request,
|
||||||
|
EntryReservationService $service,
|
||||||
|
EntryReservationPdfService $pdf,
|
||||||
|
): Response {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
$service->reservationsForExport($user, $request->validated()),
|
||||||
|
$request->validated('timezone'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadExcel(
|
||||||
|
ExportEntryReservationsRequest $request,
|
||||||
|
EntryReservationService $service,
|
||||||
|
EntryReservationExcelService $excel,
|
||||||
|
): StreamedResponse {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $excel->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
$service->reservationsForExport($user, $request->validated()),
|
||||||
|
$request->validated('timezone'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function downloadTicketPdf(
|
||||||
|
IndexEntryReservationsRequest $request,
|
||||||
|
int $reservation,
|
||||||
|
EntryReservationService $service,
|
||||||
|
TicketPdfService $pdf,
|
||||||
|
): Response {
|
||||||
|
$user = $request->user();
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
$user->tenant()->firstOrFail(),
|
||||||
|
collect([$service->reservationTicket($user, $reservation)]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function store(StoreEntryReservationsRequest $request, EntryReservationService $service): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return EntryReservationResource::collection($service->reserve(
|
||||||
|
$request->user(), $request->validated('idempotency_key'), $request->validated('rows'),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function destroy(
|
||||||
|
IndexEntryReservationsRequest $request,
|
||||||
|
int $reservation,
|
||||||
|
EntryReservationService $service,
|
||||||
|
): Response {
|
||||||
|
$service->cancel($request->user(), $reservation);
|
||||||
|
|
||||||
|
return response()->noContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Enums;
|
||||||
|
|
||||||
|
enum EntryReservationPaymentType: string
|
||||||
|
{
|
||||||
|
case Free = 'sin_cargo';
|
||||||
|
case Other = 'otro_metodo';
|
||||||
|
|
||||||
|
public function label(): string
|
||||||
|
{
|
||||||
|
return match ($this) {
|
||||||
|
self::Free => 'Sin cargo',
|
||||||
|
self::Other => 'Otro método',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return list<array{value: string, label: string}> */
|
||||||
|
public static function options(): array
|
||||||
|
{
|
||||||
|
return array_map(
|
||||||
|
fn (self $type): array => [
|
||||||
|
'value' => $type->value,
|
||||||
|
'label' => $type->label(),
|
||||||
|
],
|
||||||
|
self::cases(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
54
app/Domains/Ticketing/Desfile/Models/EntryReservation.php
Normal file
54
app/Domains/Ticketing/Desfile/Models/EntryReservation.php
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'variant_id',
|
||||||
|
'ticket_id',
|
||||||
|
'inventory_id',
|
||||||
|
'batch_id',
|
||||||
|
'fecha_reserva',
|
||||||
|
'importe',
|
||||||
|
'tipo_pago',
|
||||||
|
])]
|
||||||
|
class EntryReservation extends Model
|
||||||
|
{
|
||||||
|
use SoftDeletes;
|
||||||
|
|
||||||
|
protected $table = 'desfile_entry_reservations';
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'variant_id' => 'integer',
|
||||||
|
'fecha_reserva' => 'datetime',
|
||||||
|
'importe' => 'decimal:2',
|
||||||
|
'tipo_pago' => EntryReservationPaymentType::class,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Variant, $this> */
|
||||||
|
public function variant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Variant::class)->withTrashed();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function ticket(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Ticket::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function inventory(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Inventory::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Shared\Rules\ValidTimezone;
|
||||||
|
|
||||||
|
class ExportEntryReservationsRequest extends IndexEntryReservationsRequest
|
||||||
|
{
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
...parent::rules(),
|
||||||
|
'timezone' => ['required', 'string', new ValidTimezone],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class IndexEntryReservationsRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user()?->tenant_codigo === 'desfile_pura_tendencia';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'tipo_pago' => ['sometimes', 'nullable', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
'page' => ['sometimes', 'integer', 'min:1'],
|
||||||
|
'per_page' => ['sometimes', 'integer', 'min:1', 'max:100'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Requests;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
|
class StoreEntryReservationsRequest extends FormRequest
|
||||||
|
{
|
||||||
|
public function authorize(): bool
|
||||||
|
{
|
||||||
|
return $this->user()?->tenant_codigo === 'desfile_pura_tendencia';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'idempotency_key' => ['required', 'uuid'],
|
||||||
|
'rows' => ['required', 'array', 'min:1', 'max:100'],
|
||||||
|
'rows.*' => ['required', 'array:variant_id,tipo_pago'],
|
||||||
|
'rows.*.variant_id' => ['required', 'integer', 'min:1', 'distinct'],
|
||||||
|
'rows.*.tipo_pago' => ['required', Rule::enum(EntryReservationPaymentType::class)],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class EntryReservationResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
$selection = $this->relationLoaded('variant')
|
||||||
|
? $this->variant->selectionOptions()
|
||||||
|
: collect();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'variant_id' => $this->variant_id,
|
||||||
|
'ticket_id' => $this->ticket_id,
|
||||||
|
'fecha_reserva' => $this->fecha_reserva->toIso8601String(),
|
||||||
|
'tipo_pago' => $this->tipo_pago->value,
|
||||||
|
'tipo_pago_label' => $this->tipo_pago->label(),
|
||||||
|
'importe' => $this->importe,
|
||||||
|
'entrada' => [
|
||||||
|
'tipo' => $this->selectionLabel($selection->get('tipo')),
|
||||||
|
'sector' => $this->selectionLabel($selection->get('sector')),
|
||||||
|
'fila' => $this->selectionLabel($selection->get('fila')),
|
||||||
|
'asiento' => $this->selectionLabel($selection->get('asiento')),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function selectionLabel(mixed $selection): ?string
|
||||||
|
{
|
||||||
|
if (! is_array($selection)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_is_list($selection)) {
|
||||||
|
$labels = collect($selection)->pluck('label')->filter()->implode(', ');
|
||||||
|
|
||||||
|
return $labels !== '' ? $labels : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return isset($selection['label']) ? (string) $selection['label'] : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Shared\Date;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Style\Alignment;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
||||||
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
|
||||||
|
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||||
|
|
||||||
|
class EntryReservationExcelService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly EntryReservationReportService $report) {}
|
||||||
|
|
||||||
|
/** @param Collection<int, EntryReservation> $reservations */
|
||||||
|
public function download(Tenant $tenant, Collection $reservations, string $timeZone): StreamedResponse
|
||||||
|
{
|
||||||
|
$generatedAt = now();
|
||||||
|
$rows = $this->report->rows($reservations);
|
||||||
|
$spreadsheet = new Spreadsheet;
|
||||||
|
$spreadsheet->getProperties()
|
||||||
|
->setCreator('Shopit')
|
||||||
|
->setTitle('Reservas de entradas')
|
||||||
|
->setSubject($tenant->nombre);
|
||||||
|
$sheet = $spreadsheet->getActiveSheet();
|
||||||
|
$sheet->setTitle('Reservas');
|
||||||
|
$sheet->fromArray([
|
||||||
|
'Tipo',
|
||||||
|
'Sector',
|
||||||
|
'Fila',
|
||||||
|
'Asiento',
|
||||||
|
'ID',
|
||||||
|
'Fecha',
|
||||||
|
'Importe',
|
||||||
|
'Pago',
|
||||||
|
], null, 'A1');
|
||||||
|
|
||||||
|
foreach ($rows as $index => $reservation) {
|
||||||
|
$row = $index + 2;
|
||||||
|
foreach (['A' => 'tipo', 'B' => 'sector', 'C' => 'fila', 'D' => 'asiento'] as $column => $key) {
|
||||||
|
$sheet->setCellValueExplicit("{$column}{$row}", $reservation[$key], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit(
|
||||||
|
"E{$row}",
|
||||||
|
$reservation['ticket_id'] === null ? '-' : (string) $reservation['ticket_id'],
|
||||||
|
DataType::TYPE_STRING,
|
||||||
|
);
|
||||||
|
$sheet->setCellValue(
|
||||||
|
"F{$row}",
|
||||||
|
Date::dateTimeToExcel($reservation['fecha_reserva']->copy()->timezone($timeZone)),
|
||||||
|
);
|
||||||
|
if ($reservation['importe'] !== null) {
|
||||||
|
$sheet->setCellValue("G{$row}", (float) $reservation['importe']);
|
||||||
|
}
|
||||||
|
$sheet->setCellValueExplicit("H{$row}", $reservation['pago'], DataType::TYPE_STRING);
|
||||||
|
}
|
||||||
|
|
||||||
|
$lastRow = max(2, $rows->count() + 1);
|
||||||
|
$sheet->getStyle("F2:F{$lastRow}")->getNumberFormat()->setFormatCode('dd/mm/yyyy hh:mm');
|
||||||
|
$sheet->getStyle("G2:G{$lastRow}")->getNumberFormat()->setFormatCode('$ #,##0.00');
|
||||||
|
$sheet->getStyle('A1:H1')->applyFromArray([
|
||||||
|
'font' => ['bold' => true, 'color' => ['rgb' => 'FFFFFF']],
|
||||||
|
'fill' => [
|
||||||
|
'fillType' => Fill::FILL_SOLID,
|
||||||
|
'startColor' => ['rgb' => '26382E'],
|
||||||
|
],
|
||||||
|
'alignment' => ['vertical' => Alignment::VERTICAL_CENTER],
|
||||||
|
]);
|
||||||
|
$sheet->getRowDimension(1)->setRowHeight(24);
|
||||||
|
$sheet->freezePane('A2');
|
||||||
|
$sheet->setAutoFilter("A1:H{$lastRow}");
|
||||||
|
foreach (['A' => 20, 'B' => 22, 'C' => 12, 'D' => 12, 'E' => 16, 'F' => 20, 'G' => 16, 'H' => 18] as $column => $width) {
|
||||||
|
$sheet->getColumnDimension($column)->setWidth($width);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = 'reservas_entradas_'.$tenant->codigo.'_'
|
||||||
|
.$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.xlsx';
|
||||||
|
|
||||||
|
return response()->streamDownload(function () use ($spreadsheet): void {
|
||||||
|
(new Xlsx($spreadsheet))->save('php://output');
|
||||||
|
$spreadsheet->disconnectWorksheets();
|
||||||
|
}, $filename, [
|
||||||
|
'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Barryvdh\DomPDF\Facade\Pdf;
|
||||||
|
use Barryvdh\DomPDF\PDF as DomPdf;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class EntryReservationPdfService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly EntryReservationReportService $report) {}
|
||||||
|
|
||||||
|
/** @param Collection<int, EntryReservation> $reservations */
|
||||||
|
public function download(Tenant $tenant, Collection $reservations, string $timeZone): Response
|
||||||
|
{
|
||||||
|
$generatedAt = now();
|
||||||
|
$rows = $this->report->rows($reservations);
|
||||||
|
$pdf = Pdf::loadView('pdf.adminapp.desfile-entry-reservations', [
|
||||||
|
'tenant' => $tenant,
|
||||||
|
'reservations' => $rows,
|
||||||
|
'generatedAt' => $generatedAt,
|
||||||
|
'timeZone' => $timeZone,
|
||||||
|
])->setPaper('a4', 'landscape');
|
||||||
|
|
||||||
|
$this->addPageNumbers($pdf);
|
||||||
|
|
||||||
|
return $pdf->download(
|
||||||
|
'reservas_entradas_'.$tenant->codigo.'_'
|
||||||
|
.$generatedAt->copy()->timezone($timeZone)->format('Ymd_His').'.pdf'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function addPageNumbers(DomPdf $pdf): void
|
||||||
|
{
|
||||||
|
$pdf->render();
|
||||||
|
$domPdf = $pdf->getDomPDF();
|
||||||
|
$font = $domPdf->getFontMetrics()->getFont('DejaVu Sans');
|
||||||
|
|
||||||
|
$domPdf->getCanvas()->page_text(
|
||||||
|
385,
|
||||||
|
575,
|
||||||
|
'Página {PAGE_NUM} de {PAGE_COUNT}',
|
||||||
|
$font,
|
||||||
|
7,
|
||||||
|
[0.48, 0.52, 0.49],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class EntryReservationReportService
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @param Collection<int, EntryReservation> $reservations
|
||||||
|
* @return Collection<int, array<string, mixed>>
|
||||||
|
*/
|
||||||
|
public function rows(Collection $reservations): Collection
|
||||||
|
{
|
||||||
|
return $reservations->values()->map(function (EntryReservation $reservation): array {
|
||||||
|
$selection = $reservation->variant->selectionOptions();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'tipo' => $this->selectionLabel($selection->get('tipo')),
|
||||||
|
'sector' => $this->selectionLabel($selection->get('sector')),
|
||||||
|
'fila' => $this->selectionLabel($selection->get('fila')),
|
||||||
|
'asiento' => $this->selectionLabel($selection->get('asiento')),
|
||||||
|
'ticket_id' => $reservation->ticket_id,
|
||||||
|
'fecha_reserva' => $reservation->fecha_reserva,
|
||||||
|
'importe' => $reservation->importe,
|
||||||
|
'pago' => $reservation->tipo_pago->label(),
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function selectionLabel(mixed $selection): string
|
||||||
|
{
|
||||||
|
if (! is_array($selection)) {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (array_is_list($selection)) {
|
||||||
|
return collect($selection)->pluck('label')->filter()->implode(', ') ?: '-';
|
||||||
|
}
|
||||||
|
|
||||||
|
return isset($selection['label']) ? (string) $selection['label'] : '-';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,240 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Ticketing\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||||
|
use App\Domains\Ticketing\Ticket\Exceptions\TicketGenerationException;
|
||||||
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketGeneratorService;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
|
||||||
|
class EntryReservationService
|
||||||
|
{
|
||||||
|
public function __construct(private readonly TicketGeneratorService $tickets) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null, page?: int, per_page?: int} $filters
|
||||||
|
* @return LengthAwarePaginator<EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservations(User $user, array $filters = []): LengthAwarePaginator
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
return $this->reservationsQuery($user, $filters)
|
||||||
|
->paginate(
|
||||||
|
perPage: $filters['per_page'] ?? 15,
|
||||||
|
pageName: 'page',
|
||||||
|
page: $filters['page'] ?? 1,
|
||||||
|
)
|
||||||
|
->withQueryString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array{tipo_pago?: string|null} $filters
|
||||||
|
* @return Collection<int, EntryReservation>
|
||||||
|
*/
|
||||||
|
public function reservationsForExport(User $user, array $filters = []): Collection
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
return $this->reservationsQuery($user, $filters)->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reservationTicket(User $user, int $reservationId): Ticket
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
$reservation = EntryReservation::query()
|
||||||
|
->whereKey($reservationId)
|
||||||
|
->whereNotNull('ticket_id')
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->with(['ticket' => fn ($query) => $query->with([
|
||||||
|
...TicketValidityResolver::RELATIONS,
|
||||||
|
...TicketPresentationResolver::RELATIONS,
|
||||||
|
])])
|
||||||
|
->firstOrFail();
|
||||||
|
|
||||||
|
return $reservation->ticket;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(User $user, int $reservationId): void
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
|
||||||
|
DB::transaction(function () use ($user, $reservationId): void {
|
||||||
|
$reservation = EntryReservation::query()
|
||||||
|
->whereKey($reservationId)
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->lockForUpdate()
|
||||||
|
->firstOrFail();
|
||||||
|
|
||||||
|
if ($reservation->ticket_id !== null) {
|
||||||
|
$ticket = Ticket::query()->lockForUpdate()->findOrFail($reservation->ticket_id);
|
||||||
|
|
||||||
|
if (! $ticket->can_cancel()) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'status' => 'El ticket debe estar activo para poder cancelar la reserva.',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$ticket->markAsCancelled();
|
||||||
|
$ticket->save();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($reservation->inventory_id !== null) {
|
||||||
|
$inventory = Inventory::query()->lockForUpdate()->findOrFail($reservation->inventory_id);
|
||||||
|
$inventory->releaseEntry(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$reservation->delete();
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array{tipo_pago?: string|null} $filters */
|
||||||
|
private function reservationsQuery(User $user, array $filters = []): Builder
|
||||||
|
{
|
||||||
|
return EntryReservation::query()
|
||||||
|
->whereHas('variant.catalogItem', fn (Builder $query): Builder => $query
|
||||||
|
->where('tenant_code', $user->tenant_codigo)
|
||||||
|
->where('slug', 'entrada'))
|
||||||
|
->when(
|
||||||
|
$filters['tipo_pago'] ?? null,
|
||||||
|
fn (Builder $query, string $paymentType): Builder => $query->where('tipo_pago', $paymentType),
|
||||||
|
)
|
||||||
|
->with([
|
||||||
|
'variant.catalogItem.itemAttributes.attribute.options',
|
||||||
|
'variant.definitions.itemAttribute.attribute.options',
|
||||||
|
'variant.eventDates',
|
||||||
|
'variant.eventDate',
|
||||||
|
])
|
||||||
|
->orderByDesc('fecha_reserva')
|
||||||
|
->orderByDesc('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<array{variant_id: int, tipo_pago: string}> $rows */
|
||||||
|
public function reserve(User $user, string $key, array $rows): Collection
|
||||||
|
{
|
||||||
|
abort_unless($user->tenant_codigo === 'desfile_pura_tendencia', 403);
|
||||||
|
$normalized = collect($rows)->map(fn (array $row): array => [
|
||||||
|
'variant_id' => (int) $row['variant_id'], 'tipo_pago' => $row['tipo_pago'],
|
||||||
|
])->sortBy('variant_id')->values()->all();
|
||||||
|
$hash = hash('sha256', json_encode($normalized, JSON_THROW_ON_ERROR));
|
||||||
|
|
||||||
|
return DB::transaction(function () use ($user, $key, $rows, $hash): Collection {
|
||||||
|
// Serialize retries by the same administrator, including the first insert.
|
||||||
|
User::query()->whereKey($user->id)->lockForUpdate()->firstOrFail();
|
||||||
|
$batch = DB::table('desfile_reservation_batches')
|
||||||
|
->where('user_id', $user->id)->where('idempotency_key', $key)->lockForUpdate()->first();
|
||||||
|
if ($batch !== null) {
|
||||||
|
abort_unless($batch->tenant_code === $user->tenant_codigo && hash_equals($batch->request_hash, $hash), 409,
|
||||||
|
'La clave de envío ya fue utilizada con otras entradas.');
|
||||||
|
|
||||||
|
return EntryReservation::query()->where('batch_id', $batch->id)->with('ticket')->orderBy('id')->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
$tenant = $user->tenant()->firstOrFail();
|
||||||
|
$entry = CatalogItem::query()->forTenantCatalog($tenant)->where('slug', 'entrada')
|
||||||
|
->lockForUpdate()->firstOrFail();
|
||||||
|
$ids = array_column($rows, 'variant_id');
|
||||||
|
$variants = $entry->variants()->whereKey($ids)->orderBy('id')->lockForUpdate()->get();
|
||||||
|
$inventories = Inventory::query()->whereKey($variants->pluck('inventory_id')->filter()->unique())
|
||||||
|
->orderBy('id')->lockForUpdate()->get()->keyBy('id');
|
||||||
|
$variants->load([
|
||||||
|
'eventDates', 'eventDate',
|
||||||
|
'desfileEntryReservations' => fn ($query) => $query->lockForUpdate(),
|
||||||
|
]);
|
||||||
|
foreach ($variants as $variant) {
|
||||||
|
$variant->setRelation('inventory', $inventories->get($variant->inventory_id));
|
||||||
|
}
|
||||||
|
$entry->setRelation('variants', $variants);
|
||||||
|
$available = $entry->visibleVariants()->keyBy('id');
|
||||||
|
$requirements = [];
|
||||||
|
$errors = [];
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available->get($row['variant_id']);
|
||||||
|
if ($variant === null || $variant->inventory === null) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = $this->entryLabel($variants->firstWhere('id', $row['variant_id']), $index).': la entrada ya no está disponible.';
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$requirements[$variant->inventory_id] = ($requirements[$variant->inventory_id] ?? 0) + 1;
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
$tracked = $entry->inventory_policy !== InventoryPolicy::Unlimited;
|
||||||
|
foreach ($requirements as $inventoryId => $quantity) {
|
||||||
|
if ($tracked && $inventories[$inventoryId]->availableStock() < $quantity) {
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available[$row['variant_id']];
|
||||||
|
if ($variant->inventory_id === $inventoryId) {
|
||||||
|
$errors["rows.{$index}.variant_id"] = $this->entryLabel($variant, $index).': no hay stock suficiente para reservar las entradas seleccionadas.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($errors !== []) {
|
||||||
|
throw ValidationException::withMessages($errors);
|
||||||
|
}
|
||||||
|
|
||||||
|
$batchId = DB::table('desfile_reservation_batches')->insertGetId([
|
||||||
|
'user_id' => $user->id, 'tenant_code' => $tenant->codigo,
|
||||||
|
'idempotency_key' => $key, 'request_hash' => $hash,
|
||||||
|
'created_at' => now(), 'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
foreach ($requirements as $inventoryId => $quantity) {
|
||||||
|
$inventories[$inventoryId]->reserveEntry($quantity, $tracked);
|
||||||
|
}
|
||||||
|
$reservations = collect();
|
||||||
|
foreach ($rows as $index => $row) {
|
||||||
|
$variant = $available[$row['variant_id']];
|
||||||
|
$payment = EntryReservationPaymentType::from($row['tipo_pago']);
|
||||||
|
try {
|
||||||
|
$ticket = $this->tickets->generate($entry, $user, 1, $variant->id)->sole();
|
||||||
|
} catch (TicketGenerationException $exception) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
"rows.{$index}.variant_id" => $this->entryLabel($variant, $index).': no se pudo emitir el ticket. '.$exception->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
$reservation = EntryReservation::query()->create([
|
||||||
|
'batch_id' => $batchId, 'ticket_id' => $ticket->id,
|
||||||
|
'variant_id' => $variant->id, 'inventory_id' => $variant->inventory_id,
|
||||||
|
'fecha_reserva' => now(), 'tipo_pago' => $payment,
|
||||||
|
'importe' => $payment === EntryReservationPaymentType::Free ? 0 : $variant->getPrice(),
|
||||||
|
]);
|
||||||
|
$reservations->push($reservation->setRelation('ticket', $ticket));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $reservations;
|
||||||
|
}, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function entryLabel(?Variant $variant, int $index): string
|
||||||
|
{
|
||||||
|
if ($variant === null) {
|
||||||
|
return 'Entrada '.($index + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$values = $variant->selectionValues();
|
||||||
|
|
||||||
|
return collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento'])
|
||||||
|
->map(fn (string $label, string $key): string => $label.': '.($values->get($key) ?? 'sin especificar'))
|
||||||
|
->implode(', ');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
use App\Shared\Attachable\Models\Attachment;
|
|
||||||
use App\Shared\Attachable\Services\AttachmentService;
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Shared\Attachable\Models\Attachment;
|
||||||
|
use App\Shared\Attachable\Services\AttachmentService;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Http\UploadedFile;
|
use Illuminate\Http\UploadedFile;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -254,7 +254,7 @@ class EntryService
|
|||||||
{
|
{
|
||||||
$inventory = $variant->inventory;
|
$inventory = $variant->inventory;
|
||||||
|
|
||||||
if (($inventory?->reserved_stock ?? 0) > 0 || ($inventory?->sold_units ?? 0) > 0) {
|
if (($inventory?->reserved_stock ?? 0) > 0 || ($inventory?->entry_reserved_stock ?? 0) > 0 || ($inventory?->sold_units ?? 0) > 0) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
$key => [
|
$key => [
|
||||||
'No se puede modificar ni eliminar un asiento con ventas o reservas.',
|
'No se puede modificar ni eliminar un asiento con ventas o reservas.',
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Desfile\Services;
|
namespace App\Domains\Ticketing\Desfile\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use DateTimeInterface;
|
use DateTimeInterface;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
@@ -393,14 +394,22 @@ class InvitationPurchaseProvisioner
|
|||||||
|
|
||||||
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
$inventory = DB::table('inventories')->where('id', $variant->inventory_id)->lockForUpdate()->first();
|
||||||
|
|
||||||
if ($inventory === null || $inventory->real_stock < 1 || $inventory->reserved_stock > 0) {
|
$available = $inventory?->available_stock
|
||||||
|
?? ($inventory === null ? 0 : $inventory->real_stock - $inventory->reserved_stock - ($inventory->entry_reserved_stock ?? 0));
|
||||||
|
if ($available < 1) {
|
||||||
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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,10 +1,32 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Domains\Ticketing\Desfile\Controllers\EntryController;
|
use App\Domains\Ticketing\Desfile\Controllers\EntryController;
|
||||||
|
use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.index');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.pdf');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.excel');
|
||||||
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
||||||
|
->whereNumber('reservation')
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
||||||
|
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.store');
|
||||||
|
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
||||||
|
->whereNumber('reservation')
|
||||||
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
|
->name('adminapp.desfile.entry-reservations.destroy');
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant/desfile')
|
Route::prefix('v1/adminapp/tenant/desfile')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('entries', [EntryController::class, 'show'])
|
Route::get('entries', [EntryController::class, 'show'])
|
||||||
->name('adminapp.desfile.entries.show');
|
->name('adminapp.desfile.entries.show');
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
namespace App\Domains\Ticketing\Event\Models;
|
namespace App\Domains\Ticketing\Event\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\SocialMedia;
|
use App\Domains\Core\Tenant\Models\SocialMedia;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
@@ -14,14 +16,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
#[Fillable(['tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
||||||
class Event extends Model
|
class Event extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Tenant, $this> */
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
@@ -30,6 +32,23 @@ class Event extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Client, $this> */
|
||||||
|
public function client(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Client::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function effectiveClient(): Client
|
||||||
|
{
|
||||||
|
return $this->client ?? $this->tenant->client;
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<EventCategory, $this> */
|
/** @return BelongsTo<EventCategory, $this> */
|
||||||
public function eventCategory(): BelongsTo
|
public function eventCategory(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Resources;
|
namespace App\Domains\Ticketing\Event\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -21,6 +22,7 @@ class EventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ class PublicEventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
|
||||||
|
class EventAddressService
|
||||||
|
{
|
||||||
|
/** Called inside the event update transaction, after validating the legacy location fields. */
|
||||||
|
public function syncLocation(Event $event, bool $coordinatesProvided = false): void
|
||||||
|
{
|
||||||
|
$address = $event->address;
|
||||||
|
$coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
|
||||||
|
$values = [
|
||||||
|
'address_text' => $event->location,
|
||||||
|
'latitude' => $coordinates['latitude'] ?? null,
|
||||||
|
'longitude' => $coordinates['longitude'] ?? null,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Editing one event must not change the location of another event or a tenant.
|
||||||
|
if ($address === null || $address->tenants()->exists()
|
||||||
|
|| $address->events()->where('events.id', '!=', $event->id)->exists()) {
|
||||||
|
$address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
|
||||||
|
$event->address()->associate($address);
|
||||||
|
$event->save();
|
||||||
|
} else {
|
||||||
|
$address->update($values);
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->setRelation('address', $address);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Services;
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -32,11 +32,12 @@ class EventService
|
|||||||
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
||||||
private readonly VariantReplacementService $variantReplacementService,
|
private readonly VariantReplacementService $variantReplacementService,
|
||||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||||
|
private readonly EventAddressService $eventAddressService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function forTenant(Tenant $tenant): Event
|
public function forTenant(Tenant $tenant): Event
|
||||||
{
|
{
|
||||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
@@ -49,6 +50,7 @@ class EventService
|
|||||||
'location' => $data['location'],
|
'location' => $data['location'],
|
||||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||||
]);
|
]);
|
||||||
|
$this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
|
||||||
$tenant->update([
|
$tenant->update([
|
||||||
...array_intersect_key($data, array_flip([
|
...array_intersect_key($data, array_flip([
|
||||||
'allow_ticket_refund',
|
'allow_ticket_refund',
|
||||||
@@ -64,7 +66,7 @@ class EventService
|
|||||||
$this->syncLegacyContact($event, $data['contact']);
|
$this->syncLegacyContact($event, $data['contact']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $event->load(['dates.validityTime', 'socialMedia']);
|
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,12 @@ class PublicEventService
|
|||||||
$query->where(function ($query) use ($term): void {
|
$query->where(function ($query) use ($term): void {
|
||||||
$query->where('title', 'like', '%'.$term.'%')
|
$query->where('title', 'like', '%'.$term.'%')
|
||||||
->orWhere('subtitle', 'like', '%'.$term.'%')
|
->orWhere('subtitle', 'like', '%'.$term.'%')
|
||||||
->orWhere('location', 'like', '%'.$term.'%');
|
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
||||||
|
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, Event $event): Event
|
public function find(Tenant $tenant, Event $event): Event
|
||||||
@@ -38,6 +39,7 @@ class PublicEventService
|
|||||||
|
|
||||||
return $event->load([
|
return $event->load([
|
||||||
'attachment',
|
'attachment',
|
||||||
|
'address',
|
||||||
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
'catalogItems.attachments',
|
'catalogItems.attachments',
|
||||||
|
|||||||
@@ -13,6 +13,32 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
|
|||||||
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
||||||
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
||||||
|
|
||||||
|
`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
|
||||||
|
obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
|
||||||
|
eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
|
||||||
|
|
||||||
|
La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
|
||||||
|
`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
|
||||||
|
`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
|
||||||
|
el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
|
||||||
|
ubicación; no modifica los campos ni los timestamps originales, ni vincula la
|
||||||
|
dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
|
||||||
|
Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
|
||||||
|
copia y revierten las inserciones para evitar una migración parcial. Las migraciones
|
||||||
|
deben ejecutarse explícitamente por quien administra la base.
|
||||||
|
|
||||||
|
Las respuestas públicas, administrativas y el evento del bootstrap incluyen
|
||||||
|
`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
|
||||||
|
se serializan como números o `null`. Los campos anteriores de la respuesta conservan
|
||||||
|
sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
|
||||||
|
El guardado administrativo de
|
||||||
|
`location` y `exact_location` también actualiza `addresses`; si una dirección está
|
||||||
|
compartida con otro evento o con un tenant, se crea una copia para el evento editado.
|
||||||
|
El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
|
||||||
|
todas las direcciones en contacto, la principal en el footer y la propia del evento
|
||||||
|
en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
|
||||||
|
coordenadas.
|
||||||
|
|
||||||
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
||||||
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
||||||
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class AccommodationController extends Controller
|
|||||||
$this->accommodationService->upsertMany(
|
$this->accommodationService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class EntryController extends Controller
|
|||||||
$entries = $this->entryService->upsertMany(
|
$entries = $this->entryService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('entries'),
|
$request->validated('entries'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
);
|
);
|
||||||
|
|
||||||
return EntryResource::collection($entries)
|
return EntryResource::collection($entries)
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class FoodController extends Controller
|
|||||||
$this->foodService->upsertMany(
|
$this->foodService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -39,6 +40,7 @@ class FoodController extends Controller
|
|||||||
$this->foodService->updateHistoricalStock(
|
$this->foodService->updateHistoricalStock(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated('variants'),
|
$request->validated('variants'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class MerchandiseController extends Controller
|
|||||||
$items = $this->merchandiseService->upsertMany(
|
$items = $this->merchandiseService->upsertMany(
|
||||||
$tenant,
|
$tenant,
|
||||||
$request->validated('items'),
|
$request->validated('items'),
|
||||||
|
$request->validated('stock_adjustment_id'),
|
||||||
);
|
);
|
||||||
|
|
||||||
return MerchandiseResource::collection($items)
|
return MerchandiseResource::collection($items)
|
||||||
|
|||||||
@@ -16,9 +16,10 @@ class UpdateHistoricalFoodStockRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,stock'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,stock_difference'],
|
||||||
'variants.*.id' => ['required', 'integer', 'distinct'],
|
'variants.*.id' => ['required', 'integer', 'distinct'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock_difference' => ['required', 'integer'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
|
namespace App\Domains\Ticketing\FiestaFutbolInfantil\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Validation\Validator;
|
||||||
|
|
||||||
class UpsertAccommodationVariantsRequest extends FormRequest
|
class UpsertAccommodationVariantsRequest extends FormRequest
|
||||||
{
|
{
|
||||||
@@ -16,12 +17,42 @@ class UpsertAccommodationVariantsRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,title,description,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,title,description,stock,stock_difference,price'],
|
||||||
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
||||||
'variants.*.title' => ['required', 'string', 'max:255'],
|
'variants.*.title' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'variants.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return array<int, callable> */
|
||||||
|
public function after(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
function (Validator $validator): void {
|
||||||
|
foreach ($this->input('variants', []) as $index => $variant) {
|
||||||
|
if (! is_array($variant)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
'entries' => ['required', 'array', 'min:1', 'max:100'],
|
||||||
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'entries.*' => ['required', 'array:id,title,description,event_date_ids,stock,stock_difference,price'],
|
||||||
'entries.*.id' => [
|
'entries.*.id' => [
|
||||||
'sometimes',
|
'sometimes',
|
||||||
'nullable',
|
'nullable',
|
||||||
@@ -46,7 +47,8 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
fn ($query) => $query->where('tenant_code', $tenantCode)
|
fn ($query) => $query->where('tenant_code', $tenantCode)
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
'entries.*.stock' => ['required', 'integer', 'min:0'],
|
'entries.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'entries.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'entries.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -61,6 +63,20 @@ class UpsertEntriesRequest extends FormRequest
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($entry['id']) && ! array_key_exists('stock_difference', $entry)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"entries.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una entrada.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($entry['id']) && ! array_key_exists('stock', $entry)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"entries.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una entrada.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$dateIds = $entry['event_date_ids'] ?? [];
|
$dateIds = $entry['event_date_ids'] ?? [];
|
||||||
|
|
||||||
if (! is_array($dateIds)) {
|
if (! is_array($dateIds)) {
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
'variants' => ['required', 'array', 'min:1', 'max:500'],
|
||||||
'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'variants.*' => ['required', 'array:id,event_date_id,schedule,service,description,stock,stock_difference,price'],
|
||||||
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
'variants.*.id' => ['sometimes', 'nullable', 'integer', 'distinct'],
|
||||||
'variants.*.event_date_id' => [
|
'variants.*.event_date_id' => [
|
||||||
'required',
|
'required',
|
||||||
@@ -32,7 +33,8 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
'variants.*.schedule' => ['required', 'string', 'max:255'],
|
'variants.*.schedule' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.service' => ['required', 'string', 'max:255'],
|
'variants.*.service' => ['required', 'string', 'max:255'],
|
||||||
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
'variants.*.description' => ['sometimes', 'nullable', 'string'],
|
||||||
'variants.*.stock' => ['required', 'integer', 'min:0'],
|
'variants.*.stock' => ['sometimes', 'integer', 'min:0'],
|
||||||
|
'variants.*.stock_difference' => ['sometimes', 'integer'],
|
||||||
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
'variants.*.price' => ['required', 'numeric', 'min:0', 'max:99999999.99'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -49,6 +51,20 @@ class UpsertFoodVariantsRequest extends FormRequest
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($variant['id']) && ! array_key_exists('stock_difference', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock_difference",
|
||||||
|
'La diferencia de stock es obligatoria al actualizar una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! isset($variant['id']) && ! array_key_exists('stock', $variant)) {
|
||||||
|
$validator->errors()->add(
|
||||||
|
"variants.{$index}.stock",
|
||||||
|
'El stock inicial es obligatorio al crear una variante.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
$key = implode('|', [
|
$key = implode('|', [
|
||||||
$variant['event_date_id'] ?? '',
|
$variant['event_date_id'] ?? '',
|
||||||
mb_strtolower(trim((string) ($variant['schedule'] ?? ''))),
|
mb_strtolower(trim((string) ($variant['schedule'] ?? ''))),
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ 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
|
||||||
{
|
{
|
||||||
@@ -39,12 +40,49 @@ 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'],
|
||||||
'items.*.variants.*' => ['required', 'array:id,color,size,stock,price'],
|
'stock_adjustment_id' => ['nullable', 'uuid'],
|
||||||
|
'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' => ['required', 'integer', 'min:0'],
|
'items.*.variants.*.stock' => ['sometimes', '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->real_stock,
|
'stock' => $variant->inventory->availableStock(),
|
||||||
'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->real_stock,
|
'stock' => $variant->inventory->availableStock(),
|
||||||
'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->real_stock,
|
'stock' => $variant->inventory->availableStock(),
|
||||||
'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->real_stock,
|
'stock' => $variant->inventory->availableStock(),
|
||||||
'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): CatalogItem
|
public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): 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);
|
$this->updateVariant($attribute, $variant, $itemAttribute, $data, $index, $stockAdjustmentId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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,
|
||||||
'stock' => (int) $variant['stock'],
|
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
||||||
])->all();
|
])->all();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,6 +212,7 @@ 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'],
|
||||||
@@ -230,20 +231,13 @@ 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
|
||||||
@@ -263,7 +257,10 @@ class AccommodationService
|
|||||||
'descripcion' => $data['description'],
|
'descripcion' => $data['description'],
|
||||||
'precio' => $data['price'],
|
'precio' => $data['price'],
|
||||||
]);
|
]);
|
||||||
$inventory->update(['real_stock' => $data['stock']]);
|
$inventory->adjustAvailableStock(
|
||||||
|
(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): Collection
|
public function upsertMany(Tenant $tenant, array $entries, ?string $stockAdjustmentId = null): Collection
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $entries): Collection {
|
return DB::transaction(function () use ($tenant, $entries, $stockAdjustmentId): 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, &$reservedSlugs): CatalogItem {
|
return collect($entries)->map(function (array $entry, int $index) use ($tenant, $category, $stockAdjustmentId, &$reservedSlugs): CatalogItem {
|
||||||
if (isset($entry['id'])) {
|
if (isset($entry['id'])) {
|
||||||
return $this->update($tenant, $category, $entry, $index);
|
return $this->update($tenant, $category, $entry, $index, $stockAdjustmentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
$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): CatalogItem
|
private function update(Tenant $tenant, Category $category, array $entry, int $index, ?string $stockAdjustmentId): CatalogItem
|
||||||
{
|
{
|
||||||
$catalogItem = CatalogItem::query()
|
$catalogItem = CatalogItem::query()
|
||||||
->whereKey($entry['id'])
|
->whereKey($entry['id'])
|
||||||
@@ -121,14 +121,6 @@ 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()
|
||||||
@@ -149,7 +141,10 @@ 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->update(['real_stock' => $entry['stock']]);
|
$inventory->adjustAvailableStock(
|
||||||
|
(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): CatalogItem
|
public function upsertMany(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): 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);
|
$this->updateVariant($variant, $itemAttributes, $data, $index, $stockAdjustmentId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,11 +113,11 @@ class FoodService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array<int, array{id: int, stock: int}> $variants
|
* @param array<int, array{id: int, stock_difference: int}> $variants
|
||||||
*/
|
*/
|
||||||
public function updateHistoricalStock(Tenant $tenant, array $variants): CatalogItem
|
public function updateHistoricalStock(Tenant $tenant, array $variants, ?string $stockAdjustmentId = null): CatalogItem
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $variants): CatalogItem {
|
return DB::transaction(function () use ($tenant, $variants, $stockAdjustmentId): CatalogItem {
|
||||||
$food = CatalogItem::query()
|
$food = CatalogItem::query()
|
||||||
->forTenantCatalog($tenant)
|
->forTenantCatalog($tenant)
|
||||||
->where('slug', 'comida')
|
->where('slug', 'comida')
|
||||||
@@ -142,17 +142,11 @@ class FoodService
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$stock = (int) $data['stock'];
|
|
||||||
$inventory = $this->inventoryForHistoricalStockUpdate($variant);
|
$inventory = $this->inventoryForHistoricalStockUpdate($variant);
|
||||||
if ($stock < $inventory->reserved_stock) {
|
$inventory->adjustAvailableStock(
|
||||||
throw ValidationException::withMessages([
|
(int) $data['stock_difference'],
|
||||||
"variants.{$index}.stock" => [
|
idempotencyKey: $stockAdjustmentId,
|
||||||
'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;
|
||||||
@@ -181,6 +175,7 @@ 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;
|
||||||
@@ -301,7 +296,7 @@ class FoodService
|
|||||||
'schedule' => $schedule->value,
|
'schedule' => $schedule->value,
|
||||||
'service' => $service->value,
|
'service' => $service->value,
|
||||||
'description' => (string) ($variant['description'] ?? ''),
|
'description' => (string) ($variant['description'] ?? ''),
|
||||||
'stock' => (int) $variant['stock'],
|
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
||||||
];
|
];
|
||||||
})->all();
|
})->all();
|
||||||
}
|
}
|
||||||
@@ -384,6 +379,7 @@ 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,
|
||||||
@@ -400,27 +396,23 @@ 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->update(['real_stock' => $data['stock']]);
|
$inventory->adjustAvailableStock(
|
||||||
|
(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): Collection
|
public function upsertMany(Tenant $tenant, array $items, ?string $stockAdjustmentId = null): Collection
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $items): Collection {
|
return DB::transaction(function () use ($tenant, $items, $stockAdjustmentId): 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,6 +57,7 @@ class MerchandiseService
|
|||||||
$tenant,
|
$tenant,
|
||||||
$attributes,
|
$attributes,
|
||||||
$category,
|
$category,
|
||||||
|
$stockAdjustmentId,
|
||||||
&$reservedSlugs,
|
&$reservedSlugs,
|
||||||
): CatalogItem {
|
): CatalogItem {
|
||||||
$item = isset($data['id'])
|
$item = isset($data['id'])
|
||||||
@@ -101,7 +102,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);
|
$this->updateVariant($variant, $itemAttributes, $variantData, $index, $variantIndex, $stockAdjustmentId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -244,7 +245,7 @@ class MerchandiseService
|
|||||||
...$variant,
|
...$variant,
|
||||||
'color' => $color->value,
|
'color' => $color->value,
|
||||||
'size' => $size->value,
|
'size' => $size->value,
|
||||||
'stock' => (int) $variant['stock'],
|
...(array_key_exists('stock', $variant) ? ['stock' => (int) $variant['stock']] : []),
|
||||||
];
|
];
|
||||||
})->all();
|
})->all();
|
||||||
}
|
}
|
||||||
@@ -342,6 +343,7 @@ 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'],
|
||||||
@@ -359,22 +361,18 @@ 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->update(['real_stock' => $data['stock']]);
|
$inventory->adjustAvailableStock(
|
||||||
|
(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', 'adminapp.fiesta-futbol-infantil.entradas');
|
$visibilityRoutes('entries', 'entries', 'onticket.adminapp.fiesta-futbol-infantil.entradas');
|
||||||
$visibilityRoutes('foods', 'foods', 'adminapp.fiesta-futbol-infantil.comida');
|
$visibilityRoutes('foods', 'foods', 'onticket.adminapp.fiesta-futbol-infantil.comida');
|
||||||
$visibilityRoutes('accommodations', 'accommodations', 'adminapp.fiesta-futbol-infantil.alojamientos');
|
$visibilityRoutes('accommodations', 'accommodations', 'onticket.adminapp.fiesta-futbol-infantil.alojamientos');
|
||||||
$visibilityRoutes('merchandise', 'merchandise', 'adminapp.fiesta-futbol-infantil.merchandising');
|
$visibilityRoutes('merchandise', 'merchandise', 'onticket.adminapp.fiesta-futbol-infantil.merchandising');
|
||||||
|
|
||||||
Route::get('entries', [EntryController::class, 'index'])
|
Route::get('entries', [EntryController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
->name('adminapp.fiesta-futbol-infantil.entries.index');
|
||||||
Route::post('entries', [EntryController::class, 'store'])
|
Route::post('entries', [EntryController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
->name('adminapp.fiesta-futbol-infantil.entries.store');
|
||||||
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
Route::delete('entries/{entry}', [EntryController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.entradas')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.entradas')
|
||||||
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
->name('adminapp.fiesta-futbol-infantil.entries.destroy');
|
||||||
Route::get('foods', [FoodController::class, 'index'])
|
Route::get('foods', [FoodController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
->name('adminapp.fiesta-futbol-infantil.foods.index');
|
||||||
Route::post('foods', [FoodController::class, 'store'])
|
Route::post('foods', [FoodController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
->name('adminapp.fiesta-futbol-infantil.foods.store');
|
||||||
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
Route::patch('foods/history-stock', [FoodController::class, 'updateHistoricalStock'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
->name('adminapp.fiesta-futbol-infantil.foods.history-stock.update');
|
||||||
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
Route::delete('foods/{food}', [FoodController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.comida')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.comida')
|
||||||
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
->name('adminapp.fiesta-futbol-infantil.foods.destroy');
|
||||||
Route::get('accommodations', [AccommodationController::class, 'index'])
|
Route::get('accommodations', [AccommodationController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.index');
|
||||||
Route::post('accommodations', [AccommodationController::class, 'store'])
|
Route::post('accommodations', [AccommodationController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.store');
|
||||||
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
Route::delete('accommodations/{accommodation}', [AccommodationController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.alojamientos')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.alojamientos')
|
||||||
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
->name('adminapp.fiesta-futbol-infantil.accommodations.destroy');
|
||||||
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
Route::get('merchandise', [MerchandiseController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.index');
|
||||||
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
Route::post('merchandise', [MerchandiseController::class, 'store'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.store');
|
||||||
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
Route::delete('merchandise/{merchandise}', [MerchandiseController::class, 'destroy'])
|
||||||
->middleware('tenant.menu:adminapp.fiesta-futbol-infantil.merchandising')
|
->middleware('tenant.menu:onticket.adminapp.fiesta-futbol-infantil.merchandising')
|
||||||
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
->name('adminapp.fiesta-futbol-infantil.merchandise.destroy');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ 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;
|
||||||
@@ -192,7 +193,9 @@ class Ticket extends Model
|
|||||||
|
|
||||||
public function can_refund(): bool
|
public function can_refund(): bool
|
||||||
{
|
{
|
||||||
return $this->is_active() && $this->allow_refund();
|
return $this->is_active()
|
||||||
|
&& $this->allow_refund()
|
||||||
|
&& ! $this->hasEntryReservation();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function canRefund(): bool
|
public function canRefund(): bool
|
||||||
@@ -235,6 +238,12 @@ class Ticket extends Model
|
|||||||
return $this->hasOne(TicketRefund::class);
|
return $this->hasOne(TicketRefund::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasOne<EntryReservation, $this> */
|
||||||
|
public function entryReservation(): HasOne
|
||||||
|
{
|
||||||
|
return $this->hasOne(EntryReservation::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<CatalogItem, $this> */
|
/** @return BelongsTo<CatalogItem, $this> */
|
||||||
public function sourceCatalogItem(): BelongsTo
|
public function sourceCatalogItem(): BelongsTo
|
||||||
{
|
{
|
||||||
@@ -247,6 +256,15 @@ class Ticket extends Model
|
|||||||
return $this->belongsTo(Variant::class, 'source_variant_id')->withTrashed();
|
return $this->belongsTo(Variant::class, 'source_variant_id')->withTrashed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function hasEntryReservation(): bool
|
||||||
|
{
|
||||||
|
if ($this->relationLoaded('entryReservation')) {
|
||||||
|
return $this->getRelation('entryReservation') instanceof EntryReservation;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->exists && $this->entryReservation()->exists();
|
||||||
|
}
|
||||||
|
|
||||||
public function isValid(): bool
|
public function isValid(): bool
|
||||||
{
|
{
|
||||||
if ($this->hasTerminalStatus() || $this->used_at !== null) {
|
if ($this->hasTerminalStatus() || $this->used_at !== null) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Domains\Ticketing\Ticket\Requests;
|
namespace App\Domains\Ticketing\Ticket\Requests;
|
||||||
|
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketAttributeService;
|
||||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
@@ -22,7 +23,7 @@ class AdminAppTicketIndexRequest extends FormRequest
|
|||||||
? []
|
? []
|
||||||
: app(AdminAppTicketColumnService::class)->sortableKeys($tenant);
|
: app(AdminAppTicketColumnService::class)->sortableKeys($tenant);
|
||||||
|
|
||||||
return [
|
$rules = [
|
||||||
'q' => ['sometimes', 'nullable', 'string', 'max:255'],
|
'q' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||||
'category' => ['sometimes', 'nullable', 'string', 'max:255'],
|
'category' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||||
'product' => ['sometimes', 'nullable', 'string', 'max:255'],
|
'product' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||||
@@ -39,5 +40,18 @@ class AdminAppTicketIndexRequest extends FormRequest
|
|||||||
'sort_by' => ['sometimes', 'nullable', 'string', Rule::in($sortableKeys)],
|
'sort_by' => ['sometimes', 'nullable', 'string', Rule::in($sortableKeys)],
|
||||||
'sort_direction' => ['sometimes', 'nullable', 'string', Rule::in(['asc', 'desc'])],
|
'sort_direction' => ['sometimes', 'nullable', 'string', Rule::in(['asc', 'desc'])],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if ($tenant !== null) {
|
||||||
|
foreach (app(AdminAppTicketAttributeService::class)->attributes($tenant) as $attribute) {
|
||||||
|
$rules[$attribute['code']] = [
|
||||||
|
'sometimes',
|
||||||
|
'nullable',
|
||||||
|
'string',
|
||||||
|
Rule::in(array_column($attribute['options'], 'value')),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $rules;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|
||||||
|
class AdminAppTicketAttributeService
|
||||||
|
{
|
||||||
|
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return list<array{
|
||||||
|
* code: string,
|
||||||
|
* label: string,
|
||||||
|
* options: list<array{value: string, label: string}>
|
||||||
|
* }>
|
||||||
|
*/
|
||||||
|
public function attributes(Tenant $tenant): array
|
||||||
|
{
|
||||||
|
if ($tenant->codigo !== self::DESFILE_PURA_TENDENCIA) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$items = CatalogItem::withTrashed()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
|
->where(function (Builder $query): void {
|
||||||
|
$query
|
||||||
|
->where(function (Builder $activeQuery): void {
|
||||||
|
$activeQuery
|
||||||
|
->whereNull('catalog_items.deleted_at')
|
||||||
|
->where('has_tickets', true);
|
||||||
|
})
|
||||||
|
->orWhereHas('sourceTickets');
|
||||||
|
})
|
||||||
|
->with([
|
||||||
|
'itemAttributes' => fn ($query) => $query->orderBy('sort_order')->orderBy('id'),
|
||||||
|
'itemAttributes.attribute.options',
|
||||||
|
'variants' => fn ($query) => $query
|
||||||
|
->withTrashed()
|
||||||
|
->where(fn (Builder $variantQuery): Builder => $variantQuery
|
||||||
|
->whereNull('variantes.deleted_at')
|
||||||
|
->orWhereHas('sourceTickets'))
|
||||||
|
->orderBy('id'),
|
||||||
|
'variants.definitions.itemAttribute.attribute.options',
|
||||||
|
])
|
||||||
|
->get();
|
||||||
|
|
||||||
|
$attributes = [];
|
||||||
|
|
||||||
|
foreach ($items as $item) {
|
||||||
|
foreach ($item->itemAttributes as $itemAttribute) {
|
||||||
|
$attribute = $itemAttribute->attribute;
|
||||||
|
if ($attribute === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$code = $attribute->codigo;
|
||||||
|
$attributes[$code] ??= [
|
||||||
|
'code' => $code,
|
||||||
|
'label' => $itemAttribute->ticket_label ?: $attribute->nombre,
|
||||||
|
'sort_order' => $itemAttribute->sort_order,
|
||||||
|
'options' => [],
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($item->variants as $variant) {
|
||||||
|
$definition = $variant->definitions->firstWhere('item_attribute_id', $itemAttribute->id);
|
||||||
|
if ($definition === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = (string) $definition->value;
|
||||||
|
$option = $attribute->options->firstWhere('value', $value);
|
||||||
|
$attributes[$code]['options'][$value] = [
|
||||||
|
'value' => $value,
|
||||||
|
'label' => (string) ($option?->label ?: $value),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uasort($attributes, fn (array $left, array $right): int => $left['sort_order'] <=> $right['sort_order']
|
||||||
|
?: $left['label'] <=> $right['label']);
|
||||||
|
|
||||||
|
return array_values(array_map(fn (array $attribute): array => [
|
||||||
|
'code' => $attribute['code'],
|
||||||
|
'label' => $attribute['label'],
|
||||||
|
'options' => array_values($attribute['options']),
|
||||||
|
], $attributes));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,9 +8,17 @@ class AdminAppTicketColumnService
|
|||||||
{
|
{
|
||||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||||
|
|
||||||
|
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||||
|
|
||||||
|
public function __construct(private readonly AdminAppTicketAttributeService $attributeService) {}
|
||||||
|
|
||||||
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string, excel_width: int}> */
|
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string, excel_width: int}> */
|
||||||
public function columns(Tenant $tenant): array
|
public function columns(Tenant $tenant): array
|
||||||
{
|
{
|
||||||
|
if ($tenant->codigo === self::DESFILE_PURA_TENDENCIA) {
|
||||||
|
return $this->desfileColumns($tenant);
|
||||||
|
}
|
||||||
|
|
||||||
$keys = $tenant->codigo === self::FIESTA_FUTBOL_INFANTIL
|
$keys = $tenant->codigo === self::FIESTA_FUTBOL_INFANTIL
|
||||||
? ['order_number', 'category', 'product', 'type', 'date', 'size', 'amount', 'client', 'id', 'status', 'scanned_by']
|
? ['order_number', 'category', 'product', 'type', 'date', 'size', 'amount', 'client', 'id', 'status', 'scanned_by']
|
||||||
: ['order_number', 'product', 'amount', 'client', 'id', 'status', 'scanned_by'];
|
: ['order_number', 'product', 'amount', 'client', 'id', 'status', 'scanned_by'];
|
||||||
@@ -45,6 +53,31 @@ class AdminAppTicketColumnService
|
|||||||
return $columns;
|
return $columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string, excel_width: int}> */
|
||||||
|
private function desfileColumns(Tenant $tenant): array
|
||||||
|
{
|
||||||
|
$attributeColumns = array_map(fn (array $attribute): array => [
|
||||||
|
'key' => $attribute['code'],
|
||||||
|
'label' => $attribute['label'],
|
||||||
|
'type' => 'text',
|
||||||
|
'sortable' => false,
|
||||||
|
'sort_param' => $attribute['code'],
|
||||||
|
'width' => '8%',
|
||||||
|
'excel_width' => 15,
|
||||||
|
], $this->attributeService->attributes($tenant));
|
||||||
|
|
||||||
|
return [
|
||||||
|
$this->definitions()['order_number'],
|
||||||
|
$this->definitions()['product'],
|
||||||
|
...$attributeColumns,
|
||||||
|
$this->definitions()['amount'],
|
||||||
|
$this->definitions()['client'],
|
||||||
|
$this->definitions()['id'],
|
||||||
|
$this->definitions()['status'],
|
||||||
|
$this->definitions()['scanned_by'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string}> */
|
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string}> */
|
||||||
public function publicColumns(Tenant $tenant): array
|
public function publicColumns(Tenant $tenant): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ class AdminAppTicketRowService
|
|||||||
{
|
{
|
||||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||||
|
|
||||||
|
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||||
|
|
||||||
private const CATEGORY_PRESENTATIONS = [
|
private const CATEGORY_PRESENTATIONS = [
|
||||||
'alojamientos' => ['category' => 'Camping', 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
'alojamientos' => ['category' => 'Camping', 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
||||||
'camping' => ['category' => null, 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
'camping' => ['category' => null, 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
||||||
@@ -25,31 +27,65 @@ class AdminAppTicketRowService
|
|||||||
{
|
{
|
||||||
$purchaseItem = $ticket->sourcePurchaseItem;
|
$purchaseItem = $ticket->sourcePurchaseItem;
|
||||||
$refund = $ticket->refund;
|
$refund = $ticket->refund;
|
||||||
|
$variantProperties = $this->variantProperties($ticket);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'source_purchase_item_id' => $ticket->source_purchase_item_id,
|
'source_purchase_item_id' => $ticket->source_purchase_item_id,
|
||||||
'order_number' => $purchaseItem?->compra_id,
|
'order_number' => $purchaseItem?->compra_id,
|
||||||
'product' => $purchaseItem?->item_nombre
|
'product' => $this->productName($ticket, $purchaseItem?->item_nombre, $variantProperties),
|
||||||
?? $ticket->sourceCatalogItem?->nombre
|
'amount' => $purchaseItem?->precio_unitario ?? $ticket->entryReservation?->importe,
|
||||||
?? $ticket->name,
|
|
||||||
'amount' => $purchaseItem?->precio_unitario,
|
|
||||||
'refund_type' => $refund?->type,
|
'refund_type' => $refund?->type,
|
||||||
'refund_type_label' => $refund?->typeLabel(),
|
'refund_type_label' => $refund?->typeLabel(),
|
||||||
'client' => $purchaseItem?->purchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
|
'client' => $purchaseItem?->purchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
|
||||||
'status' => $ticket->status,
|
'status' => $ticket->status,
|
||||||
'scanned_by' => $ticket->scannerUser?->nombre_apellido,
|
'scanned_by' => $ticket->scannerUser?->nombre_apellido,
|
||||||
'variant_properties' => $this->variantProperties($ticket),
|
'variant_properties' => $variantProperties,
|
||||||
'allow_refund' => $ticket->allow_refund(),
|
'allow_refund' => $ticket->allow_refund(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param list<array{code: string, label: string, values: list<array{value: string, label: string}>}> $properties
|
||||||
|
*/
|
||||||
|
private function productName(Ticket $ticket, ?string $snapshotName, array $properties): string
|
||||||
|
{
|
||||||
|
$baseName = $ticket->sourceCatalogItem?->nombre ?: $ticket->name;
|
||||||
|
|
||||||
|
if ($ticket->tenant_code !== self::DESFILE_PURA_TENDENCIA) {
|
||||||
|
return $snapshotName ?: $baseName;
|
||||||
|
}
|
||||||
|
|
||||||
|
$seatDescription = collect(['sector', 'fila', 'asiento'])
|
||||||
|
->map(function (string $code) use ($properties): ?string {
|
||||||
|
$property = collect($properties)->firstWhere('code', $code);
|
||||||
|
$values = collect($property['values'] ?? [])->pluck('label')->filter()->implode(', ');
|
||||||
|
|
||||||
|
return $property === null || $values === ''
|
||||||
|
? null
|
||||||
|
: $property['label'].' '.$values;
|
||||||
|
})
|
||||||
|
->filter()
|
||||||
|
->implode(', ');
|
||||||
|
|
||||||
|
return $seatDescription === '' ? ($snapshotName ?: $baseName) : "{$baseName} ({$seatDescription})";
|
||||||
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed>|null $details */
|
/** @param array<string, mixed>|null $details */
|
||||||
public function values(Ticket $ticket, ?array $details = null): array
|
public function values(Ticket $ticket, ?array $details = null): array
|
||||||
{
|
{
|
||||||
$details ??= $this->details($ticket);
|
$details ??= $this->details($ticket);
|
||||||
$presentation = $this->presentation($ticket, $details);
|
$presentation = $this->presentation($ticket, $details);
|
||||||
|
$attributeValues = collect($details['variant_properties'] ?? [])
|
||||||
|
->mapWithKeys(fn (array $property): array => [
|
||||||
|
$property['code'] => collect($property['values'] ?? [])
|
||||||
|
->pluck('label')
|
||||||
|
->filter()
|
||||||
|
->implode(', ') ?: '-',
|
||||||
|
])
|
||||||
|
->all();
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
...$attributeValues,
|
||||||
'order_number' => $details['order_number'],
|
'order_number' => $details['order_number'],
|
||||||
'category' => $presentation['category'],
|
'category' => $presentation['category'],
|
||||||
'product' => $presentation['product'],
|
'product' => $presentation['product'],
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Ticket\Services;
|
namespace App\Domains\Ticketing\Ticket\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||||
|
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\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Models\TicketRefund;
|
use App\Domains\Ticketing\Ticket\Models\TicketRefund;
|
||||||
@@ -27,11 +27,13 @@ class AdminAppTicketService
|
|||||||
'scannerUser',
|
'scannerUser',
|
||||||
'sourceCatalogItem.category',
|
'sourceCatalogItem.category',
|
||||||
'sourcePurchaseItem.purchase',
|
'sourcePurchaseItem.purchase',
|
||||||
|
'entryReservation',
|
||||||
'refund.createdBy',
|
'refund.createdBy',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly AdminAppTicketColumnService $columnService,
|
private readonly AdminAppTicketColumnService $columnService,
|
||||||
|
private readonly AdminAppTicketAttributeService $attributeService,
|
||||||
private readonly AdminAppTicketRowService $rowService,
|
private readonly AdminAppTicketRowService $rowService,
|
||||||
private readonly PurchaseRefundSummaryService $refundSummaryService,
|
private readonly PurchaseRefundSummaryService $refundSummaryService,
|
||||||
) {}
|
) {}
|
||||||
@@ -226,13 +228,13 @@ class AdminAppTicketService
|
|||||||
'amount' => number_format($refundAmount, 2, '.', ''),
|
'amount' => number_format($refundAmount, 2, '.', ''),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->restoreInventory($ticket, $purchaseItem);
|
$this->restoreInventory($ticket, $purchaseItem, $createdBy);
|
||||||
|
|
||||||
return $ticket->refresh()->load(self::RELATIONS);
|
return $ticket->refresh()->load(self::RELATIONS);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem): void
|
private function restoreInventory(Ticket $ticket, PurchaseItem $purchaseItem, ?User $createdBy): void
|
||||||
{
|
{
|
||||||
$catalogItem = $ticket->sourceCatalogItem;
|
$catalogItem = $ticket->sourceCatalogItem;
|
||||||
if ($catalogItem === null) {
|
if ($catalogItem === null) {
|
||||||
@@ -270,11 +272,7 @@ class AdminAppTicketService
|
|||||||
throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']);
|
throw ValidationException::withMessages(['ticket' => 'No se encontró el inventario del ticket.']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($catalogItem->inventory_policy === InventoryPolicy::Tracked) {
|
$inventory->refundStock(1, $createdBy);
|
||||||
$inventory->real_stock++;
|
|
||||||
}
|
|
||||||
$inventory->refunded_units++;
|
|
||||||
$inventory->save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float
|
private function refundedAmountForPurchaseItem(PurchaseItem $purchaseItem): float
|
||||||
@@ -347,6 +345,13 @@ class AdminAppTicketService
|
|||||||
|
|
||||||
$this->applyStatusFilter($query, $filters['status'] ?? null);
|
$this->applyStatusFilter($query, $filters['status'] ?? null);
|
||||||
|
|
||||||
|
foreach ($this->attributeService->attributes($tenant) as $attribute) {
|
||||||
|
$value = $filters[$attribute['code']] ?? null;
|
||||||
|
if ($value !== null && $value !== '') {
|
||||||
|
$this->whereVariantDefinition($query, $attribute['code'], (string) $value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -64,14 +65,9 @@ class BackfillRefundedUnitsService
|
|||||||
}, 'refunds.id', 'id');
|
}, 'refunds.id', 'id');
|
||||||
|
|
||||||
foreach ($counts as $inventoryId => $count) {
|
foreach ($counts as $inventoryId => $count) {
|
||||||
$updates = ['refunded_units' => DB::raw('refunded_units + '.$count['refunded'])];
|
$inventory = Inventory::query()->lockForUpdate()->find($inventoryId)
|
||||||
if (($count['stock'] ?? 0) > 0) {
|
?? throw new RuntimeException("No se encontró el inventario {$inventoryId} para reponerlo.");
|
||||||
$updates['real_stock'] = DB::raw('real_stock + '.$count['stock']);
|
$inventory->refundStock($count['refunded']);
|
||||||
}
|
|
||||||
|
|
||||||
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'));
|
||||||
@@ -82,7 +78,8 @@ 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' => array_sum(array_column($counts, 'stock')),
|
'real_stock_added' => 0,
|
||||||
|
'available_stock_added' => $refundedUnitsAdded,
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
|
|||||||
- `POST /tickets/pdf`.
|
- `POST /tickets/pdf`.
|
||||||
|
|
||||||
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
||||||
`adminapp.tickets`:
|
`onticket.adminapp.tickets`:
|
||||||
|
|
||||||
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
||||||
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
||||||
|
|||||||
@@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant')
|
|||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('tickets', [TicketController::class, 'index'])
|
Route::get('tickets', [TicketController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.index');
|
->name('adminapp.tickets.index');
|
||||||
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.cancel');
|
->name('adminapp.tickets.cancel');
|
||||||
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.calculate-refund');
|
->name('adminapp.tickets.calculate-refund');
|
||||||
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.refund');
|
->name('adminapp.tickets.refund');
|
||||||
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.pdf');
|
->name('adminapp.tickets.pdf');
|
||||||
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.excel');
|
->name('adminapp.tickets.excel');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ class EnsureTenantHasMenu
|
|||||||
$tenant = $request->user()?->tenant()->first();
|
$tenant = $request->user()?->tenant()->first();
|
||||||
$hasMenu = $tenant?->menues()
|
$hasMenu = $tenant?->menues()
|
||||||
->where('menues.code', $menuCode)
|
->where('menues.code', $menuCode)
|
||||||
|
->where(fn ($query) => $query
|
||||||
|
->where('menues.code', 'help.contact')
|
||||||
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
->exists() ?? false;
|
->exists() ?? false;
|
||||||
|
|
||||||
abort_unless($hasMenu, 404);
|
abort_unless($hasMenu, 404);
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Shared\Forms\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Shared\Forms\Resources\DesfileEntryReservationFormResource;
|
||||||
|
use App\Shared\Forms\Services\DesfileEntryReservationFormService;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class DesfileEntryReservationFormController extends Controller
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
private readonly DesfileEntryReservationFormService $formService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public function __invoke(Request $request): DesfileEntryReservationFormResource
|
||||||
|
{
|
||||||
|
return DesfileEntryReservationFormResource::make(
|
||||||
|
$this->formService->get($request->user()->tenant()->firstOrFail()),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Shared\Forms\Resources;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
class DesfileEntryReservationFormResource extends JsonResource
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'payment_types' => $this->resource['payment_types'],
|
||||||
|
'fields' => $this->resource['fields'],
|
||||||
|
'variants' => $this->resource['variants'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Shared\Forms\Services;
|
||||||
|
|
||||||
|
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\Desfile\Enums\EntryReservationPaymentType;
|
||||||
|
|
||||||
|
class DesfileEntryReservationFormService
|
||||||
|
{
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
public function get(Tenant $tenant): array
|
||||||
|
{
|
||||||
|
$entry = CatalogItem::query()->forTenantCatalog($tenant)->where('slug', 'entrada')
|
||||||
|
->with([
|
||||||
|
'variants' => fn ($query) => $query->orderBy('id'),
|
||||||
|
'variants.inventory',
|
||||||
|
'variants.definitions.itemAttribute.attribute',
|
||||||
|
'variants.eventDates',
|
||||||
|
'variants.eventDate',
|
||||||
|
])->first();
|
||||||
|
$variants = $entry?->visibleVariants()
|
||||||
|
->map(function (Variant $variant): array {
|
||||||
|
$values = $variant->selectionValues();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'id' => $variant->id,
|
||||||
|
'tipo' => (string) $values->get('tipo'),
|
||||||
|
'sector' => (string) $values->get('sector'),
|
||||||
|
'fila' => (string) $values->get('fila'),
|
||||||
|
'asiento' => (string) $values->get('asiento'),
|
||||||
|
'price' => $variant->getPrice(),
|
||||||
|
];
|
||||||
|
})->values() ?? collect();
|
||||||
|
|
||||||
|
return [
|
||||||
|
'payment_types' => EntryReservationPaymentType::options(),
|
||||||
|
'fields' => collect(['tipo' => 'Tipo', 'sector' => 'Sector', 'fila' => 'Fila', 'asiento' => 'Asiento'])
|
||||||
|
->map(fn (string $label, string $key): array => [
|
||||||
|
'key' => $key,
|
||||||
|
'label' => $label,
|
||||||
|
'options' => $variants->pluck($key)->unique()->sort(SORT_NATURAL)->values()
|
||||||
|
->map(fn (string $value): array => ['value' => $value, 'label' => $value])->all(),
|
||||||
|
])->values()->all(),
|
||||||
|
'variants' => $variants->all(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,15 +4,19 @@ namespace App\Shared\Forms\Services;
|
|||||||
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
|
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketAttributeService;
|
||||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
||||||
|
|
||||||
class TicketFilterFormService
|
class TicketFilterFormService
|
||||||
{
|
{
|
||||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||||
|
|
||||||
|
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly TicketFormService $ticketFormService,
|
private readonly TicketFormService $ticketFormService,
|
||||||
private readonly AdminAppTicketColumnService $columnService,
|
private readonly AdminAppTicketColumnService $columnService,
|
||||||
|
private readonly AdminAppTicketAttributeService $attributeService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
/** @return array<string, mixed> */
|
/** @return array<string, mixed> */
|
||||||
@@ -27,6 +31,13 @@ class TicketFilterFormService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($tenant->codigo === self::DESFILE_PURA_TENDENCIA) {
|
||||||
|
$fields = [
|
||||||
|
...$this->desfileFields($tenant),
|
||||||
|
...$this->commonFields(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'code' => 'tickets_filter',
|
'code' => 'tickets_filter',
|
||||||
'action' => '/api/v1/adminapp/tenant/tickets',
|
'action' => '/api/v1/adminapp/tenant/tickets',
|
||||||
@@ -36,6 +47,21 @@ class TicketFilterFormService
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return list<array<string, mixed>> */
|
||||||
|
private function desfileFields(Tenant $tenant): array
|
||||||
|
{
|
||||||
|
return array_map(fn (array $attribute): array => [
|
||||||
|
'name' => $attribute['code'],
|
||||||
|
'query_param' => $attribute['code'],
|
||||||
|
'label' => $attribute['label'],
|
||||||
|
'type' => 'select',
|
||||||
|
'required' => false,
|
||||||
|
'default' => null,
|
||||||
|
'placeholder' => $attribute['label'],
|
||||||
|
'options' => $attribute['options'],
|
||||||
|
], $this->attributeService->attributes($tenant));
|
||||||
|
}
|
||||||
|
|
||||||
/** @return list<array<string, mixed>> */
|
/** @return list<array<string, mixed>> */
|
||||||
private function fiestaFutbolInfantilFields(Tenant $tenant): array
|
private function fiestaFutbolInfantilFields(Tenant $tenant): array
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Shared\Forms\Controllers\AdminApp\DesfileEntryReservationFormController;
|
||||||
use App\Shared\Forms\Controllers\AdminApp\EntryFormController;
|
use App\Shared\Forms\Controllers\AdminApp\EntryFormController;
|
||||||
use App\Shared\Forms\Controllers\AdminApp\EventFormController;
|
use App\Shared\Forms\Controllers\AdminApp\EventFormController;
|
||||||
use App\Shared\Forms\Controllers\AdminApp\FoodFormController;
|
use App\Shared\Forms\Controllers\AdminApp\FoodFormController;
|
||||||
@@ -14,10 +15,15 @@ Route::prefix('v1/adminapp/forms')
|
|||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('event', EventFormController::class);
|
Route::get('event', EventFormController::class);
|
||||||
|
Route::get(
|
||||||
|
'desfile/entry-reservation',
|
||||||
|
DesfileEntryReservationFormController::class
|
||||||
|
)->middleware('tenant.menu:onticket.adminapp.desfile.reservas')
|
||||||
|
->name('adminapp.forms.desfile.entry-reservation');
|
||||||
Route::get('sale', SaleFormController::class);
|
Route::get('sale', SaleFormController::class);
|
||||||
Route::get('staff', StaffFormController::class);
|
Route::get('staff', StaffFormController::class);
|
||||||
Route::get('tickets-filter', TicketFilterFormController::class)
|
Route::get('tickets-filter', TicketFilterFormController::class)
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.forms.tickets-filter');
|
->name('adminapp.forms.tickets-filter');
|
||||||
Route::get(
|
Route::get(
|
||||||
'fiesta-futbol-infantil/ticket',
|
'fiesta-futbol-infantil/ticket',
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use App\Shared\Integration\Models\Integration;
|
use App\Shared\Integration\Models\Integration;
|
||||||
use App\Shared\Integration\Models\IntegrationInstance;
|
use App\Shared\Integration\Models\IntegrationInstance;
|
||||||
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Client\PendingRequest;
|
use Illuminate\Http\Client\PendingRequest;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
@@ -86,6 +87,17 @@ abstract class BaseIntegrationService
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
$event->loadMissing(['client', 'tenant.client']);
|
||||||
|
$this->tenant = $event->tenant;
|
||||||
|
$this->tenantCode = $event->tenant_code;
|
||||||
|
$this->clientContext = $event->effectiveClient();
|
||||||
|
$this->loadIntegration();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the integration definition and its effective instance configuration.
|
* Load the integration definition and its effective instance configuration.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
||||||
use Illuminate\Contracts\Mail\Mailer;
|
use Illuminate\Contracts\Mail\Mailer;
|
||||||
@@ -39,14 +40,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function forTenant(string $tenantCode): self
|
public function forTenant(string $tenantCode): self
|
||||||
{
|
{
|
||||||
parent::forTenant($tenantCode);
|
parent::forTenant($tenantCode);
|
||||||
|
$this->configureMailer();
|
||||||
if ($this->integrationInstance) {
|
|
||||||
$this->mailer = $this->resolveMailer();
|
|
||||||
$this->usesInstanceMailer = true;
|
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@@ -55,16 +49,30 @@ class MailService extends BaseIntegrationService
|
|||||||
{
|
{
|
||||||
parent::forClient($client);
|
parent::forClient($client);
|
||||||
$this->tenant = $this->clientContext?->tenants()->first();
|
$this->tenant = $this->clientContext?->tenants()->first();
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
parent::forEvent($event);
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function configureMailer(): void
|
||||||
|
{
|
||||||
if ($this->integrationInstance) {
|
if ($this->integrationInstance) {
|
||||||
$this->mailer = $this->resolveMailer();
|
$this->mailer = $this->resolveMailer();
|
||||||
$this->usesInstanceMailer = true;
|
$this->usesInstanceMailer = true;
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
return;
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
$this->mailer = $this->mailFactory->mailer();
|
||||||
|
$this->usesInstanceMailer = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHeaders(): array
|
public function getHeaders(): array
|
||||||
@@ -83,7 +91,7 @@ class MailService extends BaseIntegrationService
|
|||||||
array $attachments = [],
|
array $attachments = [],
|
||||||
): void {
|
): void {
|
||||||
if (! $this->mailer || ! $this->tenant) {
|
if (! $this->mailer || ! $this->tenant) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$brand ??= $this->tenant;
|
$brand ??= $this->tenant;
|
||||||
@@ -160,7 +168,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function onSetup(): void
|
public function onSetup(): void
|
||||||
{
|
{
|
||||||
if (! $this->mailer || ! $this->clientContext) {
|
if (! $this->mailer || ! $this->clientContext) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
|
|||||||
public function getToken(): string
|
public function getToken(): string
|
||||||
{
|
{
|
||||||
if (! $this->integrationInstance) {
|
if (! $this->integrationInstance) {
|
||||||
throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
|
throw new Exception('Client integration is not loaded. Call forTenant(), forClient(), or forEvent() first.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -75,9 +75,30 @@ class TelepagosWebhookService
|
|||||||
|
|
||||||
$dni = substr($cuit, 2, -1);
|
$dni = substr($cuit, 2, -1);
|
||||||
|
|
||||||
$tenantCodes = $client->tenants()->pluck('codigo');
|
|
||||||
$eligiblePurchases = Purchase::query()
|
$eligiblePurchases = Purchase::query()
|
||||||
->whereIn('tenant_codigo', $tenantCodes)
|
->where(function (Builder $purchases) use ($client): void {
|
||||||
|
$purchases
|
||||||
|
->whereHas('event', function (Builder $events) use ($client): void {
|
||||||
|
$events
|
||||||
|
->where('client_id', $client->id)
|
||||||
|
->orWhere(function (Builder $fallback) use ($client): void {
|
||||||
|
$fallback
|
||||||
|
->whereNull('client_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
->orWhere(function (Builder $legacy) use ($client): void {
|
||||||
|
$legacy
|
||||||
|
->whereNull('event_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
->whereIn('status', [
|
->whereIn('status', [
|
||||||
Purchase::STATUS_CREATED,
|
Purchase::STATUS_CREATED,
|
||||||
Purchase::STATUS_PENDING_PAYMENT,
|
Purchase::STATUS_PENDING_PAYMENT,
|
||||||
@@ -170,7 +191,7 @@ class TelepagosWebhookService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
|
if (! $this->purchaseBelongsToClient($compra, $client)) {
|
||||||
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
||||||
'client_code' => $client->code,
|
'client_code' => $client->code,
|
||||||
'cashin_id' => $cashinId,
|
'cashin_id' => $cashinId,
|
||||||
@@ -244,6 +265,16 @@ class TelepagosWebhookService
|
|||||||
return number_format((float) $amount, 2, '.', '');
|
return number_format((float) $amount, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function purchaseBelongsToClient(Purchase $purchase, Client $client): bool
|
||||||
|
{
|
||||||
|
$purchase->loadMissing(['event.client', 'event.tenant.client', 'tenant.client']);
|
||||||
|
|
||||||
|
$effectiveClient = $purchase->event?->effectiveClient()
|
||||||
|
?? $purchase->tenant?->client;
|
||||||
|
|
||||||
|
return $effectiveClient?->is($client) ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Builder<Purchase> $eligiblePurchases
|
* @param Builder<Purchase> $eligiblePurchases
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
namespace App\Shared\Notification\Services;
|
namespace App\Shared\Notification\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Shared\Integration\Services\MailService;
|
|
||||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use App\Shared\Integration\Services\MailService;
|
||||||
|
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
@@ -158,7 +158,7 @@ class NotificationMailService
|
|||||||
$context = ['purchase_id' => $purchaseId];
|
$context = ['purchase_id' => $purchaseId];
|
||||||
|
|
||||||
$purchase = Purchase::query()
|
$purchase = Purchase::query()
|
||||||
->with(['tenant', 'user', 'items'])
|
->with(['event', 'tenant', 'user', 'items'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
|
|
||||||
if ($purchase === null) {
|
if ($purchase === null) {
|
||||||
@@ -197,8 +197,7 @@ class NotificationMailService
|
|||||||
'mime' => 'application/pdf',
|
'mime' => 'application/pdf',
|
||||||
]];
|
]];
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($purchase->tenant_codigo)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Compra confirmada - Compra #{$purchase->getKey()}",
|
"Compra confirmada - Compra #{$purchase->getKey()}",
|
||||||
@@ -286,7 +285,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$previousDate,
|
$previousDate,
|
||||||
@@ -295,8 +293,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -387,7 +384,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$date,
|
$date,
|
||||||
@@ -396,8 +392,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -421,10 +416,17 @@ class NotificationMailService
|
|||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenantCode)
|
->where('tenant_codigo', $tenantCode)
|
||||||
->with(['tenant', 'user'])
|
->with(['event', 'tenant', 'user'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function mailForPurchase(Purchase $purchase): MailService
|
||||||
|
{
|
||||||
|
return $purchase->event
|
||||||
|
? $this->mailService->forEvent($purchase->event)
|
||||||
|
: $this->mailService->forTenant($purchase->tenant_codigo);
|
||||||
|
}
|
||||||
|
|
||||||
private function recipientFor(Purchase $purchase): string
|
private function recipientFor(Purchase $purchase): string
|
||||||
{
|
{
|
||||||
return (string) ($purchase->email ?: $purchase->user?->email);
|
return (string) ($purchase->email ?: $purchase->user?->email);
|
||||||
|
|||||||
2691
database/data/mutual_smep_catalog_v1.json
Normal file
2691
database/data/mutual_smep_catalog_v1.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -41,7 +41,7 @@ return new class extends Migration
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sourcePath = public_path('images/website_types/'.self::FILENAME);
|
$sourcePath = public_path('images/website_types/onticket/'.self::FILENAME);
|
||||||
|
|
||||||
if (! is_file($sourcePath)) {
|
if (! is_file($sourcePath)) {
|
||||||
throw new RuntimeException("Favicon not found at path: {$sourcePath}");
|
throw new RuntimeException("Favicon not found at path: {$sourcePath}");
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user