Compare commits
15 Commits
dev
...
6588d9f1a8
| Author | SHA1 | Date | |
|---|---|---|---|
| 6588d9f1a8 | |||
| 5d5ee7d2a5 | |||
| df19655144 | |||
| 0303803f75 | |||
| 94db48467e | |||
| 793e7be756 | |||
| 3b6d6bf28b | |||
| a9d9854e5e | |||
| 4bdd3effcc | |||
| 794acc4814 | |||
| d42896e956 | |||
| 0fe38df019 | |||
| a4bd9263a2 | |||
| 85cd1ad04f | |||
| 370834856b |
@@ -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';
|
||||||
|
}
|
||||||
@@ -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
|
||||||
->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_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
|
||||||
->whereRaw('inventories.real_stock > inventories.reserved_stock + inventories.entry_reserved_stock')
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -2,11 +2,17 @@
|
|||||||
|
|
||||||
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',
|
||||||
@@ -38,6 +44,7 @@ class Inventory extends Model
|
|||||||
'reserved_stock' => 'integer',
|
'reserved_stock' => 'integer',
|
||||||
'entry_reserved_stock' => 'integer',
|
'entry_reserved_stock' => 'integer',
|
||||||
'real_stock' => 'integer',
|
'real_stock' => 'integer',
|
||||||
|
'available_stock' => 'integer',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,70 +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 - $this->entry_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
|
public function reserveEntry(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 1 || ($tracksInventory && $this->availableStock() < $amount)) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
InventoryMovementOperation::EntryStockReserved,
|
||||||
}
|
['entry_reserved_stock' => $amount],
|
||||||
$this->entry_reserved_stock += $amount;
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
$this->save();
|
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
|
public function releaseEntry(int $amount): void
|
||||||
{
|
{
|
||||||
if ($amount < 1 || $this->entry_reserved_stock < $amount) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
InventoryMovementOperation::EntryStockReleased,
|
||||||
}
|
['entry_reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
$this->entry_reserved_stock -= $amount;
|
if ($amount < 1 || $inventory->entry_reserved_stock < $amount) {
|
||||||
$this->save();
|
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reserve(int $amount, bool $tracksInventory): void
|
public function reserve(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 0) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
InventoryMovementOperation::StockReserved,
|
||||||
}
|
['reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
if ($tracksInventory && $this->availableStock() < $amount) {
|
if ($amount < 0) {
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
||||||
}
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < $amount) {
|
||||||
$this->reserved_stock += $amount;
|
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
||||||
$this->save();
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function release(int $amount): void
|
public function release(int $amount): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
InventoryMovementOperation::StockReleased,
|
||||||
}
|
['reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
$this->reserved_stock -= $amount;
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
$this->save();
|
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buy(int $amount, bool $tracksInventory): void
|
public function buy(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount];
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) {
|
||||||
|
$counterDeltas['real_stock'] = -$amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tracksInventory && $this->real_stock - $this->entry_reserved_stock < $amount) {
|
$this->mutate(
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
||||||
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < 0) {
|
||||||
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function adjustAvailableStock(
|
||||||
|
int $delta,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
if ($delta === 0) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($tracksInventory) {
|
$operation = $delta > 0
|
||||||
$this->real_stock -= $amount;
|
? InventoryMovementOperation::StockIncreased
|
||||||
|
: InventoryMovementOperation::StockDecreased;
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
$operation,
|
||||||
|
['real_stock' => $delta],
|
||||||
|
function (self $inventory) use ($delta): void {
|
||||||
|
if ($inventory->real_stock + $delta < 0 || $inventory->availableStock() + $delta < 0) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_difference' => ['El ajuste dejaría el stock en un valor inválido.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
$idempotencyKey,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function refundStock(int $amount, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = ['refunded_units' => $amount];
|
||||||
|
if (! array_key_exists('available_stock', $this->attributes)) {
|
||||||
|
$counterDeltas['real_stock'] = $amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->reserved_stock -= $amount;
|
$this->mutate(
|
||||||
$this->sold_units += $amount;
|
InventoryMovementOperation::StockRefunded,
|
||||||
$this->save();
|
$counterDeltas,
|
||||||
|
function () use ($amount): void {
|
||||||
|
if ($amount < 1) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad devuelta debe ser positiva.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function commitDirectSale(int $amount, bool $tracksInventory = true): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
['sold_units' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
|
throw new \InvalidArgumentException('No hay suficiente stock para confirmar la compra.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::StockInitialized, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordTransferInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::InventoryTransferred, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $counterDeltas */
|
||||||
|
public function transferCounters(array $counterDeltas, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryTransferred,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($counterDeltas): void {
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
if ((int) $inventory->getAttribute($counter) + $delta < 0) {
|
||||||
|
throw new \LogicException("El traslado dejaría {$counter} en un valor negativo.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function recordCurrentState(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
?User $responsibleUser,
|
||||||
|
): void {
|
||||||
|
if (! Schema::hasTable('inventory_movements')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'real_stock' => $this->real_stock,
|
||||||
|
'sold_units' => $this->sold_units,
|
||||||
|
'reserved_stock' => $this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => $this->entry_reserved_stock,
|
||||||
|
'refunded_units' => $this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $this->availableStock(),
|
||||||
|
'available_stock_before' => 0,
|
||||||
|
'available_stock_after' => $this->availableStock(),
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function resetTransactionCounters(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'sold_units' => -$this->sold_units,
|
||||||
|
'reserved_stock' => -$this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$this->entry_reserved_stock,
|
||||||
|
'refunded_units' => -$this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryReset,
|
||||||
|
$counterDeltas,
|
||||||
|
static function (): void {},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, int> $counterDeltas
|
||||||
|
* @param callable(self): void $validate
|
||||||
|
*/
|
||||||
|
private function mutate(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
array $counterDeltas,
|
||||||
|
callable $validate,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
DB::transaction(function () use ($operation, $counterDeltas, $validate, $responsibleUser, $idempotencyKey): void {
|
||||||
|
/** @var self $inventory */
|
||||||
|
$inventory = self::query()->lockForUpdate()->findOrFail($this->getKey());
|
||||||
|
$this->setRawAttributes($inventory->getAttributes(), true);
|
||||||
|
|
||||||
|
$recordsMovements = Schema::hasTable('inventory_movements');
|
||||||
|
if ($recordsMovements && $idempotencyKey !== null) {
|
||||||
|
$existing = $this->movements()
|
||||||
|
->where('idempotency_key', $idempotencyKey)
|
||||||
|
->first();
|
||||||
|
if ($existing !== null) {
|
||||||
|
if ($existing->counter_deltas !== $counterDeltas) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_adjustment_id' => ['La operación ya fue utilizada con otro ajuste.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$validate($this);
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$availableBefore = $this->availableStock();
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
$this->setAttribute($counter, (int) $this->getAttribute($counter) + $delta);
|
||||||
|
}
|
||||||
|
$this->save();
|
||||||
|
$this->refresh();
|
||||||
|
|
||||||
|
$availableAfter = $this->availableStock();
|
||||||
|
if ($recordsMovements) {
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $availableAfter - $availableBefore,
|
||||||
|
'available_stock_before' => $availableBefore,
|
||||||
|
'available_stock_after' => $availableAfter,
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
'idempotency_key' => $idempotencyKey,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Commerce\Catalog\Models;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
|
#[Fillable([
|
||||||
|
'inventory_id',
|
||||||
|
'operation',
|
||||||
|
'available_stock_delta',
|
||||||
|
'available_stock_before',
|
||||||
|
'available_stock_after',
|
||||||
|
'counter_deltas',
|
||||||
|
'responsible_user_id',
|
||||||
|
'idempotency_key',
|
||||||
|
])]
|
||||||
|
class InventoryMovement extends Model
|
||||||
|
{
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'operation' => InventoryMovementOperation::class,
|
||||||
|
'available_stock_delta' => 'integer',
|
||||||
|
'available_stock_before' => 'integer',
|
||||||
|
'available_stock_after' => 'integer',
|
||||||
|
'counter_deltas' => 'array',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Inventory, $this> */
|
||||||
|
public function inventory(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Inventory::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<User, $this> */
|
||||||
|
public function responsibleUser(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(User::class, 'responsible_user_id');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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 - $inventory->entry_reserved_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 - $inventory->entry_reserved_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.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ class VariantReplacementService
|
|||||||
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'real_stock' => $sourceInventory->real_stock,
|
'real_stock' => $sourceInventory->real_stock,
|
||||||
]);
|
]);
|
||||||
|
$replacementInventory->recordTransferInitialization();
|
||||||
|
|
||||||
if ($activeLines->isNotEmpty()) {
|
if ($activeLines->isNotEmpty()) {
|
||||||
StockReservationLine::query()
|
StockReservationLine::query()
|
||||||
@@ -202,7 +203,10 @@ class VariantReplacementService
|
|||||||
}
|
}
|
||||||
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
->update(['inventory_id' => $replacementInventory->id]);
|
->update(['inventory_id' => $replacementInventory->id]);
|
||||||
$sourceInventory->update(['reserved_stock' => 0, 'entry_reserved_stock' => 0]);
|
$sourceInventory->transferCounters([
|
||||||
|
'reserved_stock' => -$sourceInventory->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$sourceInventory->entry_reserved_stock,
|
||||||
|
]);
|
||||||
|
|
||||||
return $replacementInventory;
|
return $replacementInventory;
|
||||||
}
|
}
|
||||||
@@ -236,13 +240,14 @@ 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,
|
||||||
'entry_reserved_stock' => $destinationInventory->entry_reserved_stock + $sourceInventory->entry_reserved_stock,
|
'entry_reserved_stock' => $sourceInventory->entry_reserved_stock,
|
||||||
'sold_units' => $destinationInventory->sold_units + $sourceInventory->sold_units,
|
'sold_units' => $sourceInventory->sold_units,
|
||||||
'refunded_units' => $destinationInventory->refunded_units + $sourceInventory->refunded_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())
|
||||||
@@ -250,13 +255,10 @@ class VariantReplacementService
|
|||||||
}
|
}
|
||||||
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
EntryReservation::query()->where('inventory_id', $sourceInventory->id)
|
||||||
->update(['inventory_id' => $destinationInventory->id]);
|
->update(['inventory_id' => $destinationInventory->id]);
|
||||||
$sourceInventory->update([
|
$sourceInventory->transferCounters(array_map(
|
||||||
'real_stock' => 0,
|
fn (int $value): int => -$value,
|
||||||
'reserved_stock' => 0,
|
$transferredCounters,
|
||||||
'entry_reserved_stock' => 0,
|
));
|
||||||
'sold_units' => 0,
|
|
||||||
'refunded_units' => 0,
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @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,
|
||||||
|
|||||||
@@ -8,14 +8,12 @@ use Illuminate\Database\Eloquent\Builder;
|
|||||||
|
|
||||||
class PurchaseRefundSummaryService
|
class PurchaseRefundSummaryService
|
||||||
{
|
{
|
||||||
public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
|
public function totalForTenant(Tenant $tenant): string
|
||||||
{
|
{
|
||||||
$total = TicketRefund::query()
|
$total = TicketRefund::query()
|
||||||
->whereHas(
|
->whereHas(
|
||||||
'purchaseItem.purchase',
|
'purchaseItem.purchase',
|
||||||
fn (Builder $query): Builder => $query
|
fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId))
|
|
||||||
)
|
)
|
||||||
->sum('amount');
|
->sum('amount');
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Purchase\Services;
|
namespace App\Domains\Commerce\Purchase\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use Illuminate\Database\Query\Builder;
|
use Illuminate\Database\Query\Builder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -69,15 +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()
|
||||||
'entry_reserved_stock' => 0,
|
->each(fn (Inventory $inventory) => $inventory->resetTransactionCounters());
|
||||||
'sold_units' => 0,
|
|
||||||
'refunded_units' => 0,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $summary;
|
return $summary;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -32,10 +32,10 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleResource::collection(
|
return SaleResource::collection(
|
||||||
$this->saleService->sales($tenant, $request->validated(), $request->user()->event_id)
|
$this->saleService->sales($tenant, $request->validated())
|
||||||
)->additional([
|
)->additional([
|
||||||
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $request->user()->event_id),
|
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
|
||||||
'refunded_total' => $this->saleService->refundedTotal($tenant, $request->user()->event_id),
|
'refunded_total' => $this->saleService->refundedTotal($tenant),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleDetailResource($this->saleService->detail($tenant, $sale, $request->user()->event_id));
|
return new SaleDetailResource($this->saleService->detail($tenant, $sale));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
||||||
@@ -51,7 +51,7 @@ class SaleController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return SaleTicketResource::collection(
|
return SaleTicketResource::collection(
|
||||||
$this->saleService->tickets($tenant, $sale, $request->user()->event_id)
|
$this->saleService->tickets($tenant, $sale)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,14 +59,14 @@ class SaleController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->confirm($tenant, $sale, $request->user()->event_id));
|
return new SaleResource($this->saleService->confirm($tenant, $sale));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Request $request, int $sale): SaleResource
|
public function cancel(Request $request, int $sale): SaleResource
|
||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new SaleResource($this->saleService->cancel($tenant, $sale, $request->user()->event_id));
|
return new SaleResource($this->saleService->cancel($tenant, $sale));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function modifications(
|
public function modifications(
|
||||||
@@ -76,7 +76,6 @@ class SaleController extends Controller
|
|||||||
$this->saleService->modifications(
|
$this->saleService->modifications(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
$request->user()->event_id,
|
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -87,7 +86,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadSales(
|
return $this->salePdfService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->saleService->salesForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -98,7 +97,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->salePdfService->downloadModifications(
|
return $this->salePdfService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -109,7 +108,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadSales(
|
return $this->saleExcelService->downloadSales(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->salesForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->saleService->salesForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -121,7 +120,7 @@ class SaleController extends Controller
|
|||||||
|
|
||||||
return $this->saleExcelService->downloadModifications(
|
return $this->saleExcelService->downloadModifications(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->saleService->modificationsForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Commerce\Sale\Services;
|
namespace App\Domains\Commerce\Sale\Services;
|
||||||
|
|
||||||
|
use App\Shared\Logging\Models\ValueChange;
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||||
@@ -9,7 +10,6 @@ use App\Domains\Core\Tenant\Models\Tenant;
|
|||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
use App\Shared\Logging\Models\ValueChange;
|
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -21,18 +21,19 @@ class AdminAppSaleService
|
|||||||
protected PurchaseRefundSummaryService $refundSummaryService,
|
protected PurchaseRefundSummaryService $refundSummaryService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
|
public function confirmedSalesTotal(Tenant $tenant): string
|
||||||
{
|
{
|
||||||
$total = $this->purchasesQuery($tenant, $eventId)
|
$total = Purchase::query()
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('status', Purchase::STATUS_PAID)
|
->where('status', Purchase::STATUS_PAID)
|
||||||
->sum('total');
|
->sum('total');
|
||||||
|
|
||||||
return number_format((float) $total, 2, '.', '');
|
return number_format((float) $total, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
|
public function refundedTotal(Tenant $tenant): string
|
||||||
{
|
{
|
||||||
return $this->refundSummaryService->totalForTenant($tenant, $eventId);
|
return $this->refundSummaryService->totalForTenant($tenant);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -46,42 +47,43 @@ class AdminAppSaleService
|
|||||||
* } $filters
|
* } $filters
|
||||||
* @return LengthAwarePaginator<Purchase>
|
* @return LengthAwarePaginator<Purchase>
|
||||||
*/
|
*/
|
||||||
public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters, $eventId)
|
return $this->salesQuery($tenant, $filters)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
public function detail(Tenant $tenant, int $saleId): Purchase
|
||||||
{
|
{
|
||||||
return $this->purchasesQuery($tenant, $eventId)
|
return Purchase::query()
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->with('items')
|
->with('items')
|
||||||
->findOrFail($saleId);
|
->findOrFail($saleId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return Collection<int, Ticket> */
|
/** @return Collection<int, Ticket> */
|
||||||
public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
|
public function tickets(Tenant $tenant, int $saleId): Collection
|
||||||
{
|
{
|
||||||
return $this->findForTenant($tenant, $saleId, $eventId)
|
return $this->findForTenant($tenant, $saleId)
|
||||||
->tickets()
|
->tickets()
|
||||||
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
||||||
->orderBy('id')
|
->orderBy('id')
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
public function confirm(Tenant $tenant, int $saleId): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
$sale = $this->findForTenant($tenant, $saleId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->confirmPaidPurchase($sale)
|
$this->checkoutService->confirmPaidPurchase($sale)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
public function cancel(Tenant $tenant, int $saleId): Purchase
|
||||||
{
|
{
|
||||||
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
$sale = $this->findForTenant($tenant, $saleId);
|
||||||
|
|
||||||
return $this->saleForResponse(
|
return $this->saleForResponse(
|
||||||
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
||||||
@@ -92,18 +94,18 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
*/
|
*/
|
||||||
public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
public function salesForExport(Tenant $tenant, array $filters = []): Collection
|
||||||
{
|
{
|
||||||
return $this->salesQuery($tenant, $filters, $eventId)->get();
|
return $this->salesQuery($tenant, $filters)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return LengthAwarePaginator<ValueChange>
|
* @return LengthAwarePaginator<ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters, $eventId)
|
return $this->modificationsQuery($tenant, $filters)
|
||||||
->paginateFromRequest()
|
->paginateFromRequest()
|
||||||
->withQueryString();
|
->withQueryString();
|
||||||
}
|
}
|
||||||
@@ -112,13 +114,13 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Collection<int, ValueChange>
|
* @return Collection<int, ValueChange>
|
||||||
*/
|
*/
|
||||||
public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
|
||||||
{
|
{
|
||||||
return $this->modificationsQuery($tenant, $filters, $eventId)->get();
|
return $this->modificationsQuery($tenant, $filters)->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $filters */
|
/** @param array<string, mixed> $filters */
|
||||||
protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
protected function salesQuery(Tenant $tenant, array $filters): Builder
|
||||||
{
|
{
|
||||||
$sortColumns = [
|
$sortColumns = [
|
||||||
'id' => 'id',
|
'id' => 'id',
|
||||||
@@ -135,7 +137,8 @@ class AdminAppSaleService
|
|||||||
? $requestedDirection
|
? $requestedDirection
|
||||||
: 'desc';
|
: 'desc';
|
||||||
|
|
||||||
return $this->purchasesQuery($tenant, $eventId)
|
return Purchase::query()
|
||||||
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -173,18 +176,11 @@ class AdminAppSaleService
|
|||||||
* @param array<string, mixed> $filters
|
* @param array<string, mixed> $filters
|
||||||
* @return Builder<ValueChange>
|
* @return Builder<ValueChange>
|
||||||
*/
|
*/
|
||||||
protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
protected function modificationsQuery(Tenant $tenant, array $filters): Builder
|
||||||
{
|
{
|
||||||
return ValueChange::query()
|
return ValueChange::query()
|
||||||
->where('tenant_code', $tenant->codigo)
|
->where('tenant_code', $tenant->codigo)
|
||||||
->where('trackable_type', (new Purchase)->getMorphClass())
|
->where('trackable_type', (new Purchase)->getMorphClass())
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->whereHasMorph(
|
|
||||||
'trackable',
|
|
||||||
[Purchase::class],
|
|
||||||
fn (Builder $sales): Builder => $sales
|
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
|
||||||
->where('event_id', $eventId),
|
|
||||||
))
|
|
||||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||||
$term = trim($search);
|
$term = trim($search);
|
||||||
|
|
||||||
@@ -225,18 +221,11 @@ class AdminAppSaleService
|
|||||||
->orderByDesc('id');
|
->orderByDesc('id');
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
protected function findForTenant(Tenant $tenant, int $saleId): Purchase
|
||||||
{
|
|
||||||
return $this->purchasesQuery($tenant, $eventId)
|
|
||||||
->findOrFail($saleId);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @return Builder<Purchase> */
|
|
||||||
protected function purchasesQuery(Tenant $tenant, ?int $eventId): Builder
|
|
||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
->findOrFail($saleId);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function saleForResponse(Purchase $sale): Purchase
|
protected function saleForResponse(Purchase $sale): Purchase
|
||||||
|
|||||||
@@ -29,8 +29,4 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
|
|||||||
|
|
||||||
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
||||||
|
|
||||||
Cuando el usuario autenticado tiene `event_id`, el controlador lo pasa al servicio como alcance obligatorio para ventas, totales, historial y exportaciones. El alcance se combina con el tenant y no se obtiene de los filtros enviados por el cliente. Los administradores sin `event_id` conservan el alcance del tenant.
|
|
||||||
|
|
||||||
El detalle, los tickets de una venta, la confirmación y la cancelación buscan la compra dentro del mismo alcance. Una venta de otro evento o sin evento devuelve 404 para un administrador con `event_id`, antes de ejecutar cualquier acción en `CheckoutService`.
|
|
||||||
|
|
||||||
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
||||||
|
|||||||
47
app/Domains/Core/Address/Models/Address.php
Normal file
47
app/Domains/Core/Address/Models/Address.php
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
|
class Address extends Model
|
||||||
|
{
|
||||||
|
protected $fillable = ['label', 'address_text', 'latitude', 'longitude'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'latitude' => 'decimal:7',
|
||||||
|
'longitude' => 'decimal:7',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array{latitude: float, longitude: float}|null */
|
||||||
|
public function coordinates(): ?array
|
||||||
|
{
|
||||||
|
if ($this->latitude === null || $this->longitude === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ['latitude' => (float) $this->latitude, 'longitude' => (float) $this->longitude];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Tenant, $this> */
|
||||||
|
public function tenants(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Tenant::class, 'tenant_addresses', 'address_id', 'tenant_codigo', 'id', 'codigo')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps();
|
||||||
|
}
|
||||||
|
}
|
||||||
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
33
app/Domains/Core/Address/Models/TenantAddress.php
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Models;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
use Illuminate\Database\Eloquent\Relations\Pivot;
|
||||||
|
|
||||||
|
class TenantAddress extends Pivot
|
||||||
|
{
|
||||||
|
protected $table = 'tenant_addresses';
|
||||||
|
|
||||||
|
public $incrementing = true;
|
||||||
|
|
||||||
|
protected $fillable = ['tenant_codigo', 'address_id', 'is_main'];
|
||||||
|
|
||||||
|
protected function casts(): array
|
||||||
|
{
|
||||||
|
return ['is_main' => 'boolean'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
|
public function tenant(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
22
app/Domains/Core/Address/Resources/AddressResource.php
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Address\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/** @mixin Address */
|
||||||
|
class AddressResource extends JsonResource
|
||||||
|
{
|
||||||
|
public function toArray(Request $request): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'id' => $this->id,
|
||||||
|
'label' => $this->label,
|
||||||
|
'address_text' => $this->address_text,
|
||||||
|
'latitude' => $this->latitude === null ? null : (float) $this->latitude,
|
||||||
|
'longitude' => $this->longitude === null ? null : (float) $this->longitude,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,6 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::collection($this->administratorService->list(
|
return AdministratorResource::collection($this->administratorService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +28,6 @@ class AdminAppAdministratorController extends Controller
|
|||||||
return AdministratorResource::make($this->administratorService->create(
|
return AdministratorResource::make($this->administratorService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,7 +37,6 @@ class AdminAppAdministratorController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$administrator,
|
$administrator,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ class AdministratorResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
'event_id' => $this->event_id,
|
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ class AdministratorService
|
|||||||
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
public function __construct(private readonly ResetPasswordAttemptService $resetPasswordAttemptService) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
public function list(Tenant $tenant, ?string $search = null): Collection
|
||||||
{
|
{
|
||||||
return $this->query($tenant, $eventId)->with('role')
|
return $this->query($tenant)->with('role')
|
||||||
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
->when($search, fn (Builder $query, string $search) => $query->where(function (Builder $query) use ($search): void {
|
||||||
$query->where('nombre_apellido', 'like', "%{$search}%")
|
$query->where('nombre_apellido', 'like', "%{$search}%")
|
||||||
->orWhere('dni', 'like', "%{$search}%")
|
->orWhere('dni', 'like', "%{$search}%")
|
||||||
@@ -31,15 +31,14 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
public function create(Tenant $tenant, array $data): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $data, $eventId): User {
|
return DB::transaction(function () use ($tenant, $data): User {
|
||||||
$administrator = User::query()->create([
|
$administrator = User::query()->create([
|
||||||
...$this->attributes($data),
|
...$this->attributes($data),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::AdminApp->value,
|
'rol_codigo' => RoleCode::AdminApp->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
'event_id' => $eventId,
|
|
||||||
]);
|
]);
|
||||||
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
$this->resetPasswordAttemptService->createForAdminAppEmail(
|
||||||
$administrator->email,
|
$administrator->email,
|
||||||
@@ -51,10 +50,10 @@ class AdministratorService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $administratorId, array $data, ?int $eventId = null): User
|
public function update(Tenant $tenant, int $administratorId, array $data): User
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $administratorId, $data, $eventId): User {
|
return DB::transaction(function () use ($tenant, $administratorId, $data): User {
|
||||||
$administrator = $this->query($tenant, $eventId)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
||||||
$administrator->update($this->attributes($data));
|
$administrator->update($this->attributes($data));
|
||||||
|
|
||||||
return $administrator->load('role');
|
return $administrator->load('role');
|
||||||
@@ -67,11 +66,11 @@ class AdministratorService
|
|||||||
// Serialize deletions for this tenant, including requests already authenticated
|
// Serialize deletions for this tenant, including requests already authenticated
|
||||||
// when another administrator removes their account.
|
// when another administrator removes their account.
|
||||||
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
Tenant::query()->whereKey($tenant->getKey())->lockForUpdate()->firstOrFail();
|
||||||
$administrator = $this->query($tenant, $actor->event_id)->lockForUpdate()->findOrFail($administratorId);
|
$administrator = $this->query($tenant)->lockForUpdate()->findOrFail($administratorId);
|
||||||
if ($administrator->is($actor)) {
|
if ($administrator->is($actor)) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
throw ValidationException::withMessages(['administrator' => 'No podés eliminar tu propio usuario.']);
|
||||||
}
|
}
|
||||||
$activeAdministrators = $this->query($tenant, $actor->event_id)->lockForUpdate()->get();
|
$activeAdministrators = $this->query($tenant)->lockForUpdate()->get();
|
||||||
if ($activeAdministrators->count() <= 1) {
|
if ($activeAdministrators->count() <= 1) {
|
||||||
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
throw ValidationException::withMessages(['administrator' => 'El tenant debe conservar al menos un administrador.']);
|
||||||
}
|
}
|
||||||
@@ -81,11 +80,10 @@ class AdministratorService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function query(Tenant $tenant, ?int $eventId = null): Builder
|
private function query(Tenant $tenant): Builder
|
||||||
{
|
{
|
||||||
return User::query()->where('tenant_codigo', $tenant->codigo)
|
return User::query()->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::AdminApp->value)
|
->where('rol_codigo', RoleCode::AdminApp->value);
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data
|
/** @param array<string, mixed> $data
|
||||||
|
|||||||
@@ -55,8 +55,6 @@ No agrega tablas ni migraciones. No modifica el CRUD de escáneres ni el fronten
|
|||||||
|
|
||||||
## Verificación
|
## Verificación
|
||||||
|
|
||||||
Cuando el actor tiene `event_id`, los nuevos administradores heredan su evento y el listado, la búsqueda, la edición y la baja se limitan a ese evento dentro del tenant. La comprobación de administradores activos también usa ese alcance. El evento se toma del usuario autenticado, no del cuerpo de la solicitud; sin `event_id` se conserva el comportamiento por tenant.
|
|
||||||
|
|
||||||
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
`php artisan test tests/Feature/Administrator/AdministratorControllerTest.php`
|
||||||
|
|
||||||
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
Las pruebas cubren CRUD, normalización y unicidad del email, establecimiento de
|
||||||
|
|||||||
@@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Auth\Models;
|
namespace App\Domains\Core\Auth\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
use App\Domains\Core\Authorization\Models\Role;
|
use App\Domains\Core\Authorization\Models\Role;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||||
use Database\Factories\UserFactory;
|
use Database\Factories\UserFactory;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
@@ -21,7 +20,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
|||||||
use Illuminate\Notifications\Notifiable;
|
use Illuminate\Notifications\Notifiable;
|
||||||
use Laravel\Sanctum\HasApiTokens;
|
use Laravel\Sanctum\HasApiTokens;
|
||||||
|
|
||||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'event_id'])]
|
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
||||||
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
||||||
class User extends Authenticatable
|
class User extends Authenticatable
|
||||||
{
|
{
|
||||||
@@ -87,12 +86,6 @@ class User extends Authenticatable
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Event, $this> */
|
|
||||||
public function event(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Event::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @return BelongsToMany<Category, $this> */
|
/** @return BelongsToMany<Category, $this> */
|
||||||
public function scanCategories(): BelongsToMany
|
public function scanCategories(): BelongsToMany
|
||||||
{
|
{
|
||||||
@@ -110,7 +103,6 @@ class User extends Authenticatable
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'event_id' => 'integer',
|
|
||||||
'email_verified_at' => 'datetime',
|
'email_verified_at' => 'datetime',
|
||||||
'password' => 'hashed',
|
'password' => 'hashed',
|
||||||
'failed_login_attempts' => 'integer',
|
'failed_login_attempts' => 'integer',
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ class UserResource extends JsonResource
|
|||||||
'telefono' => $this->telefono,
|
'telefono' => $this->telefono,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
'tenant_codigo' => $this->tenant_codigo,
|
'tenant_codigo' => $this->tenant_codigo,
|
||||||
'event_id' => $this->event_id,
|
|
||||||
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
||||||
->map(fn ($category) => [
|
->map(fn ($category) => [
|
||||||
'id' => $category->id,
|
'id' => $category->id,
|
||||||
|
|||||||
@@ -33,10 +33,14 @@ class TenantBootstrapService
|
|||||||
$tenant,
|
$tenant,
|
||||||
[
|
[
|
||||||
'eventDateChanges',
|
'eventDateChanges',
|
||||||
'menues' => fn ($query) => $query->whereHas(
|
'menues' => fn ($query) => $query
|
||||||
'roles',
|
->where(fn ($query) => $query
|
||||||
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
->where('menues.code', 'help.contact')
|
||||||
),
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
|
->whereHas(
|
||||||
|
'roles',
|
||||||
|
fn ($query) => $query->where('codigo', RoleCode::User->value)
|
||||||
|
),
|
||||||
$tenant->storefront_website_type_code === 'onticket_multi_event'
|
$tenant->storefront_website_type_code === 'onticket_multi_event'
|
||||||
? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
|
? 'eventCategories' : 'categories' => fn ($query) => $query->orderBy('nombre'),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Client\Models;
|
namespace App\Domains\Core\Client\Models;
|
||||||
|
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
@@ -22,6 +23,12 @@ class Client extends Model
|
|||||||
return $this->hasMany(Tenant::class);
|
return $this->hasMany(Tenant::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return HasMany<Event, $this> */
|
||||||
|
public function events(): HasMany
|
||||||
|
{
|
||||||
|
return $this->hasMany(Event::class);
|
||||||
|
}
|
||||||
|
|
||||||
/** @return HasMany<ClientIntegration, $this> */
|
/** @return HasMany<ClientIntegration, $this> */
|
||||||
public function integrations(): HasMany
|
public function integrations(): HasMany
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Menu extends Model
|
|||||||
'codigo'
|
'codigo'
|
||||||
)
|
)
|
||||||
->using(TenantMenu::class)
|
->using(TenantMenu::class)
|
||||||
->withPivot('static_content')
|
->withPivot('static_content', 'is_enabled')
|
||||||
->withTimestamps();
|
->withTimestamps();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,14 @@ class TenantMenu extends Pivot
|
|||||||
'tenant_code',
|
'tenant_code',
|
||||||
'menu_code',
|
'menu_code',
|
||||||
'static_content',
|
'static_content',
|
||||||
|
'is_enabled',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'static_content' => 'array',
|
'static_content' => 'array',
|
||||||
|
'is_enabled' => 'boolean',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::collection($this->staffService->list(
|
return StaffResource::collection($this->staffService->list(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->string('search')->trim()->toString() ?: null,
|
$request->string('search')->trim()->toString() ?: null,
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,7 +34,6 @@ class AdminAppStaffController extends Controller
|
|||||||
return StaffResource::make($this->staffService->create(
|
return StaffResource::make($this->staffService->create(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,13 +43,12 @@ class AdminAppStaffController extends Controller
|
|||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
$request->validated(),
|
$request->validated(),
|
||||||
$request->user()->event_id,
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function destroy(Request $request, int $staff): Response
|
public function destroy(Request $request, int $staff): Response
|
||||||
{
|
{
|
||||||
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $request->user()->event_id);
|
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
|
||||||
|
|
||||||
return response()->noContent();
|
return response()->noContent();
|
||||||
}
|
}
|
||||||
@@ -63,7 +60,6 @@ class AdminAppStaffController extends Controller
|
|||||||
$scanner = $this->staffService->find(
|
$scanner = $this->staffService->find(
|
||||||
$request->user()->tenant()->firstOrFail(),
|
$request->user()->tenant()->firstOrFail(),
|
||||||
$staff,
|
$staff,
|
||||||
$request->user()->event_id,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
return ScanAttemptResource::collection(
|
return ScanAttemptResource::collection(
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ class StaffResource extends JsonResource
|
|||||||
'dni' => $this->dni,
|
'dni' => $this->dni,
|
||||||
'email' => $this->email,
|
'email' => $this->email,
|
||||||
'rol_codigo' => $this->rol_codigo,
|
'rol_codigo' => $this->rol_codigo,
|
||||||
'event_id' => $this->event_id,
|
|
||||||
'role' => $this->whenLoaded('role', fn () => [
|
'role' => $this->whenLoaded('role', fn () => [
|
||||||
'codigo' => $this->role?->codigo,
|
'codigo' => $this->role?->codigo,
|
||||||
'nombre' => $this->role?->nombre,
|
'nombre' => $this->role?->nombre,
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Domains\Core\Staff\Services;
|
namespace App\Domains\Core\Staff\Services;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
||||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -22,9 +22,9 @@ class StaffService
|
|||||||
) {}
|
) {}
|
||||||
|
|
||||||
/** @return Collection<int, User> */
|
/** @return Collection<int, User> */
|
||||||
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
public function list(Tenant $tenant, ?string $search = null): Collection
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant, $eventId)
|
return $this->staffQuery($tenant)
|
||||||
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
||||||
->when($search, function (Builder $query, string $search): void {
|
->when($search, function (Builder $query, string $search): void {
|
||||||
$query->where(function (Builder $query) use ($search): void {
|
$query->where(function (Builder $query) use ($search): void {
|
||||||
@@ -52,19 +52,18 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
public function create(Tenant $tenant, array $data): User
|
||||||
{
|
{
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
|
return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
|
||||||
$staff = User::query()->create([
|
$staff = User::query()->create([
|
||||||
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
||||||
'email' => mb_strtolower(trim((string) $data['email'])),
|
'email' => mb_strtolower(trim((string) $data['email'])),
|
||||||
'password' => Str::random(64),
|
'password' => Str::random(64),
|
||||||
'rol_codigo' => RoleCode::Scanner->value,
|
'rol_codigo' => RoleCode::Scanner->value,
|
||||||
'tenant_codigo' => $tenant->codigo,
|
'tenant_codigo' => $tenant->codigo,
|
||||||
'event_id' => $eventId,
|
|
||||||
]);
|
]);
|
||||||
$staff->scanCategories()->sync($categoryIds);
|
$staff->scanCategories()->sync($categoryIds);
|
||||||
$this->resetPasswordAttemptService->createForScannerEmail(
|
$this->resetPasswordAttemptService->createForScannerEmail(
|
||||||
@@ -77,9 +76,9 @@ class StaffService
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
|
public function update(Tenant $tenant, int $staffId, array $data): User
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId, $eventId);
|
$staff = $this->find($tenant, $staffId);
|
||||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||||
|
|
||||||
@@ -93,9 +92,9 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
|
public function delete(Tenant $tenant, int $staffId): void
|
||||||
{
|
{
|
||||||
$staff = $this->find($tenant, $staffId, $eventId);
|
$staff = $this->find($tenant, $staffId);
|
||||||
|
|
||||||
DB::transaction(function () use ($staff): void {
|
DB::transaction(function () use ($staff): void {
|
||||||
$staff->tokens()->delete();
|
$staff->tokens()->delete();
|
||||||
@@ -103,17 +102,16 @@ class StaffService
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
|
public function find(Tenant $tenant, int $staffId): User
|
||||||
{
|
{
|
||||||
return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
|
return $this->staffQuery($tenant)->findOrFail($staffId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
|
private function staffQuery(Tenant $tenant): Builder
|
||||||
{
|
{
|
||||||
return User::query()
|
return User::query()
|
||||||
->where('tenant_codigo', $tenant->codigo)
|
->where('tenant_codigo', $tenant->codigo)
|
||||||
->where('rol_codigo', RoleCode::Scanner->value)
|
->where('rol_codigo', RoleCode::Scanner->value);
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->where('event_id', $eventId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,5 +18,3 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
|
|||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
||||||
|
|
||||||
Si el administrador autenticado tiene `event_id`, el alta de scanners hereda ese valor y las búsquedas, ediciones, bajas y consultas de intentos de escaneo se limitan a personal del mismo evento. El cliente no puede elegir ni cambiar el evento. Sin `event_id`, se mantiene el alcance por tenant.
|
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Core\Tenant\Controllers\AdminApp;
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Requests\AdminApp\UpdateBrandRequest;
|
||||||
|
use App\Domains\Core\Tenant\Resources\AdminApp\BrandResource;
|
||||||
|
use App\Domains\Core\Tenant\Services\BrandService;
|
||||||
|
use App\Domains\Core\Tenant\Services\TenantInformationService;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class BrandController extends Controller
|
||||||
|
{
|
||||||
|
public function show(Request $request, TenantInformationService $tenantInformationService): BrandResource
|
||||||
|
{
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function update(
|
||||||
|
UpdateBrandRequest $request,
|
||||||
|
BrandService $brandService,
|
||||||
|
TenantInformationService $tenantInformationService,
|
||||||
|
): BrandResource {
|
||||||
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
$brandService->update($tenant, $request->validated());
|
||||||
|
|
||||||
|
return BrandResource::make($tenantInformationService->load($tenant->fresh()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,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,8 @@ use App\Domains\Commerce\Catalog\Enums\GroupLayout;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
use App\Domains\Commerce\Catalog\Enums\ProductLayout;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Address\Models\TenantAddress;
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Menu\Models\TenantMenu;
|
use App\Domains\Core\Menu\Models\TenantMenu;
|
||||||
@@ -22,6 +24,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 +311,23 @@ class Tenant extends Model
|
|||||||
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
return $this->hasMany(WebsiteExtra::class, 'website_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsToMany<Address, $this> */
|
||||||
|
public function addresses(): BelongsToMany
|
||||||
|
{
|
||||||
|
return $this->belongsToMany(Address::class, 'tenant_addresses', 'tenant_codigo', 'address_id', 'codigo', 'id')
|
||||||
|
->using(TenantAddress::class)
|
||||||
|
->withPivot(['id', 'is_main'])
|
||||||
|
->withTimestamps()
|
||||||
|
->orderByPivot('id');
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return HasOneThrough<Address, TenantAddress, $this> */
|
||||||
|
public function mainAddress(): HasOneThrough
|
||||||
|
{
|
||||||
|
return $this->hasOneThrough(Address::class, TenantAddress::class, 'tenant_codigo', 'id', 'codigo', 'address_id')
|
||||||
|
->where('tenant_addresses.is_main', true);
|
||||||
|
}
|
||||||
|
|
||||||
public function menues(): BelongsToMany
|
public function menues(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(
|
return $this->belongsToMany(
|
||||||
@@ -319,7 +339,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,6 +3,7 @@
|
|||||||
namespace App\Domains\Core\Tenant\Resources;
|
namespace App\Domains\Core\Tenant\Resources;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\Category;
|
use App\Domains\Commerce\Catalog\Models\Category;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Core\Menu\Models\Menu;
|
use App\Domains\Core\Menu\Models\Menu;
|
||||||
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
use App\Domains\Core\Tenant\Models\StorefrontWebsiteType;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
@@ -41,6 +42,8 @@ class TenantResource extends JsonResource
|
|||||||
'site_title' => $this->site_title ?? 'ShopitFront',
|
'site_title' => $this->site_title ?? 'ShopitFront',
|
||||||
'asset_url' => config('filesystems.disks.s3.url'),
|
'asset_url' => config('filesystems.disks.s3.url'),
|
||||||
'address' => $this->address,
|
'address' => $this->address,
|
||||||
|
'addresses' => $this->whenLoaded('addresses', fn () => TenantAddressResource::collection($this->addresses)),
|
||||||
|
'main_address' => $this->whenLoaded('mainAddress', fn () => AddressResource::make($this->mainAddress)),
|
||||||
'phone' => $this->phone,
|
'phone' => $this->phone,
|
||||||
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
'favicon' => $this->favicon?->getTemporaryUrl(1440),
|
||||||
'primary_color' => $this->primary_color,
|
'primary_color' => $this->primary_color,
|
||||||
@@ -127,6 +130,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)
|
||||||
|
|||||||
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,12 @@ class TenantInformationService
|
|||||||
'footerBackgroundImage',
|
'footerBackgroundImage',
|
||||||
'storefrontWebsiteType',
|
'storefrontWebsiteType',
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
|
'addresses',
|
||||||
|
'mainAddress',
|
||||||
'websiteExtras.websiteTypeExtra',
|
'websiteExtras.websiteTypeExtra',
|
||||||
'activeEvent.dates',
|
'activeEvent.dates',
|
||||||
'activeEvent.socialMedia',
|
'activeEvent.socialMedia',
|
||||||
|
'activeEvent.address',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,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']);
|
||||||
|
|||||||
@@ -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 || ($inventory->entry_reserved_stock ?? 0) > 0) {
|
$available = $inventory?->available_stock
|
||||||
|
?? ($inventory === null ? 0 : $inventory->real_stock - $inventory->reserved_stock - ($inventory->entry_reserved_stock ?? 0));
|
||||||
|
if ($available < 1) {
|
||||||
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
throw new RuntimeException("El asiento {$variant->descripcion} ya no está disponible.");
|
||||||
}
|
}
|
||||||
|
|
||||||
DB::table('inventories')->where('id', $inventory->id)->update([
|
if (property_exists($inventory, 'available_stock')) {
|
||||||
'real_stock' => $inventory->real_stock - 1,
|
Inventory::query()->findOrFail($inventory->id)->commitDirectSale(1);
|
||||||
'sold_units' => $inventory->sold_units + 1,
|
} else {
|
||||||
]);
|
// This provisioner is also used by historical migrations that run
|
||||||
|
// before generated availability and the movement ledger exist.
|
||||||
|
DB::table('inventories')->where('id', $inventory->id)->update([
|
||||||
|
'real_stock' => $inventory->real_stock - 1,
|
||||||
|
'sold_units' => $inventory->sold_units + 1,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
||||||
if ($reservationId === null) {
|
if ($reservationId === null) {
|
||||||
|
|||||||
@@ -5,28 +5,28 @@ use App\Domains\Ticketing\Desfile\Controllers\EntryReservationController;
|
|||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'index'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.index');
|
->name('adminapp.desfile.entry-reservations.index');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/pdf', [EntryReservationController::class, 'downloadPdf'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.pdf');
|
->name('adminapp.desfile.entry-reservations.pdf');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/excel', [EntryReservationController::class, 'downloadExcel'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.excel');
|
->name('adminapp.desfile.entry-reservations.excel');
|
||||||
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
Route::get('v1/adminapp/tenant/desfile/entry-reservations/{reservation}/ticket/pdf', [EntryReservationController::class, 'downloadTicketPdf'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
->name('adminapp.desfile.entry-reservations.ticket.pdf');
|
||||||
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
Route::post('v1/adminapp/tenant/desfile/entry-reservations', [EntryReservationController::class, 'store'])
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.store');
|
->name('adminapp.desfile.entry-reservations.store');
|
||||||
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
Route::delete('v1/adminapp/tenant/desfile/entry-reservations/{reservation}', [EntryReservationController::class, 'destroy'])
|
||||||
->whereNumber('reservation')
|
->whereNumber('reservation')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.reservas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.reservas'])
|
||||||
->name('adminapp.desfile.entry-reservations.destroy');
|
->name('adminapp.desfile.entry-reservations.destroy');
|
||||||
|
|
||||||
Route::prefix('v1/adminapp/tenant/desfile')
|
Route::prefix('v1/adminapp/tenant/desfile')
|
||||||
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:adminapp.desfile.entradas'])
|
->middleware(['auth:sanctum', 'adminapp.tenant', 'tenant.menu:onticket.adminapp.desfile.entradas'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('entries', [EntryController::class, 'show'])
|
Route::get('entries', [EntryController::class, 'show'])
|
||||||
->name('adminapp.desfile.entries.show');
|
->name('adminapp.desfile.entries.show');
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
namespace App\Domains\Ticketing\Event\Models;
|
namespace App\Domains\Ticketing\Event\Models;
|
||||||
|
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\SocialMedia;
|
use App\Domains\Core\Tenant\Models\SocialMedia;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
@@ -14,14 +16,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
#[Fillable(['tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'address_id', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
||||||
class Event extends Model
|
class Event extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
return ['client_id' => 'integer', 'address_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<Tenant, $this> */
|
/** @return BelongsTo<Tenant, $this> */
|
||||||
@@ -30,6 +32,23 @@ class Event extends Model
|
|||||||
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Client, $this> */
|
||||||
|
public function client(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Client::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return BelongsTo<Address, $this> */
|
||||||
|
public function address(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Address::class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function effectiveClient(): Client
|
||||||
|
{
|
||||||
|
return $this->client ?? $this->tenant->client;
|
||||||
|
}
|
||||||
|
|
||||||
/** @return BelongsTo<EventCategory, $this> */
|
/** @return BelongsTo<EventCategory, $this> */
|
||||||
public function eventCategory(): BelongsTo
|
public function eventCategory(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Resources;
|
namespace App\Domains\Ticketing\Event\Resources;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
use App\Domains\Ticketing\Event\Services\EventDateGroupingService;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -21,6 +22,7 @@ class EventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Domains\Ticketing\Event\Resources;
|
|||||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
|
use App\Domains\Core\Address\Resources\AddressResource;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
@@ -19,6 +20,7 @@ class PublicEventResource extends JsonResource
|
|||||||
'title' => $this->title,
|
'title' => $this->title,
|
||||||
'subtitle' => $this->subtitle,
|
'subtitle' => $this->subtitle,
|
||||||
'description' => $this->description,
|
'description' => $this->description,
|
||||||
|
'address' => AddressResource::make($this->address),
|
||||||
'location' => $this->location,
|
'location' => $this->location,
|
||||||
'exact_location' => $this->exact_location,
|
'exact_location' => $this->exact_location,
|
||||||
'date_text' => $this->date_text,
|
'date_text' => $this->date_text,
|
||||||
|
|||||||
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
37
app/Domains/Ticketing/Event/Services/EventAddressService.php
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
|
use App\Domains\Core\Address\Models\Address;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
|
||||||
|
class EventAddressService
|
||||||
|
{
|
||||||
|
/** Called inside the event update transaction, after validating the legacy location fields. */
|
||||||
|
public function syncLocation(Event $event, bool $coordinatesProvided = false): void
|
||||||
|
{
|
||||||
|
$address = $event->address;
|
||||||
|
$coordinates = $coordinatesProvided || $address === null ? $event->exact_location : $address->coordinates();
|
||||||
|
$values = [
|
||||||
|
'address_text' => $event->location,
|
||||||
|
'latitude' => $coordinates['latitude'] ?? null,
|
||||||
|
'longitude' => $coordinates['longitude'] ?? null,
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($address !== null && ! (clone $address)->fill($values)->isDirty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Editing one event must not change the location of another event or a tenant.
|
||||||
|
if ($address === null || $address->tenants()->exists()
|
||||||
|
|| $address->events()->where('events.id', '!=', $event->id)->exists()) {
|
||||||
|
$address = Address::create(['label' => $address?->label ?? 'Ubicación del evento', ...$values]);
|
||||||
|
$event->address()->associate($address);
|
||||||
|
$event->save();
|
||||||
|
} else {
|
||||||
|
$address->update($values);
|
||||||
|
}
|
||||||
|
|
||||||
|
$event->setRelation('address', $address);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Domains\Ticketing\Event\Services;
|
namespace App\Domains\Ticketing\Event\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Auth\Models\User;
|
|
||||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||||
use App\Domains\Ticketing\Event\Models\Event;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
@@ -32,11 +32,12 @@ class EventService
|
|||||||
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
private readonly AffectedEventDatePurchaseResolver $affectedPurchaseResolver,
|
||||||
private readonly VariantReplacementService $variantReplacementService,
|
private readonly VariantReplacementService $variantReplacementService,
|
||||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||||
|
private readonly EventAddressService $eventAddressService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function forTenant(Tenant $tenant): Event
|
public function forTenant(Tenant $tenant): Event
|
||||||
{
|
{
|
||||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param array<string, mixed> $data */
|
/** @param array<string, mixed> $data */
|
||||||
@@ -49,6 +50,7 @@ class EventService
|
|||||||
'location' => $data['location'],
|
'location' => $data['location'],
|
||||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||||
]);
|
]);
|
||||||
|
$this->eventAddressService->syncLocation($event, array_key_exists('exact_location', $data));
|
||||||
$tenant->update([
|
$tenant->update([
|
||||||
...array_intersect_key($data, array_flip([
|
...array_intersect_key($data, array_flip([
|
||||||
'allow_ticket_refund',
|
'allow_ticket_refund',
|
||||||
@@ -64,7 +66,7 @@ class EventService
|
|||||||
$this->syncLegacyContact($event, $data['contact']);
|
$this->syncLegacyContact($event, $data['contact']);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $event->load(['dates.validityTime', 'socialMedia']);
|
return $event->load(['dates.validityTime', 'socialMedia', 'address']);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,12 @@ class PublicEventService
|
|||||||
$query->where(function ($query) use ($term): void {
|
$query->where(function ($query) use ($term): void {
|
||||||
$query->where('title', 'like', '%'.$term.'%')
|
$query->where('title', 'like', '%'.$term.'%')
|
||||||
->orWhere('subtitle', 'like', '%'.$term.'%')
|
->orWhere('subtitle', 'like', '%'.$term.'%')
|
||||||
->orWhere('location', 'like', '%'.$term.'%');
|
->orWhereHas('address', fn ($query) => $query->where('address_text', 'like', '%'.$term.'%'))
|
||||||
|
->orWhere(fn ($query) => $query->whereNull('address_id')->where('location', 'like', '%'.$term.'%'));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->with('attachment')->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
return $query->with(['attachment', 'address'])->orderByDesc('published_at')->orderByDesc('id')->paginate(15, ['*'], 'page', $page);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function find(Tenant $tenant, Event $event): Event
|
public function find(Tenant $tenant, Event $event): Event
|
||||||
@@ -38,6 +39,7 @@ class PublicEventService
|
|||||||
|
|
||||||
return $event->load([
|
return $event->load([
|
||||||
'attachment',
|
'attachment',
|
||||||
|
'address',
|
||||||
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
'dates' => fn ($query) => $query->whereNull('rescheduled_to_event_date_id')->whereNull('suspended_at'),
|
||||||
'socialMedia',
|
'socialMedia',
|
||||||
'catalogItems.attachments',
|
'catalogItems.attachments',
|
||||||
|
|||||||
@@ -13,6 +13,32 @@ mediante `event_id`. El catálogo `social_media` define las plataformas;
|
|||||||
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
`exact_location` guarda opcionalmente un objeto JSON con `latitude` (-90 a 90)
|
||||||
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
y `longitude` (-180 a 180). `location` sigue siendo la dirección legible.
|
||||||
|
|
||||||
|
`events.address_id` es una referencia opcional a `addresses.id`: `Event::address()`
|
||||||
|
obtiene su dirección y `Address::events()` permite reutilizar una dirección en varios
|
||||||
|
eventos. Al borrar una dirección, el vínculo queda en `NULL` y se conserva el evento.
|
||||||
|
|
||||||
|
La migración `2026_09_30_000200_add_address_id_to_events` agrega el vínculo.
|
||||||
|
`2026_09_30_000300_copy_event_locations_to_addresses` copia `location` a
|
||||||
|
`address_text` y las coordenadas de `exact_location` a `latitude` y `longitude`, con
|
||||||
|
el label `Ubicación del evento`. Solo copia eventos sin `address_id` y con texto de
|
||||||
|
ubicación; no modifica los campos ni los timestamps originales, ni vincula la
|
||||||
|
dirección al tenant. Si faltan texto y coordenadas, el vínculo queda en `NULL`.
|
||||||
|
Los datos inválidos, incluidas coordenadas sin texto de dirección, detienen la
|
||||||
|
copia y revierten las inserciones para evitar una migración parcial. Las migraciones
|
||||||
|
deben ejecutarse explícitamente por quien administra la base.
|
||||||
|
|
||||||
|
Las respuestas públicas, administrativas y el evento del bootstrap incluyen
|
||||||
|
`address` con `id`, `label`, `address_text`, `latitude` y `longitude`. Las coordenadas
|
||||||
|
se serializan como números o `null`. Los campos anteriores de la respuesta conservan
|
||||||
|
sus valores originales; el frontend lee la ubicación y coordenadas desde `address`.
|
||||||
|
El guardado administrativo de
|
||||||
|
`location` y `exact_location` también actualiza `addresses`; si una dirección está
|
||||||
|
compartida con otro evento o con un tenant, se crea una copia para el evento editado.
|
||||||
|
El tenant devuelve `addresses` con `is_main` y `main_address`. El storefront usa
|
||||||
|
todas las direcciones en contacto, la principal en el footer y la propia del evento
|
||||||
|
en sus tarjetas, cabecera y mapa. Solo se agregan al mapa las direcciones con ambas
|
||||||
|
coordenadas.
|
||||||
|
|
||||||
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
La migración `2026_09_18_000500_restore_events` crea un evento por cada tenant que
|
||||||
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
tenía datos de evento o fechas, y migra las fechas y redes correspondientes.
|
||||||
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
`2026_09_18_000600_associate_active_event_social_media` copia al evento activo las
|
||||||
|
|||||||
@@ -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');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketCollection(
|
return new AdminAppTicketCollection(
|
||||||
$this->ticketService->search($tenant, $request->validated(), $request->user()->event_id)
|
$this->ticketService->search($tenant, $request->validated())
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ class TicketController extends Controller
|
|||||||
{
|
{
|
||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket, $request->user()->event_id));
|
return new AdminAppTicketResource($this->ticketService->cancel($tenant, $ticket));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
public function calculateRefund(Request $request, int $ticket): AdminAppTicketRefundCalculationResource
|
||||||
@@ -45,7 +45,7 @@ class TicketController extends Controller
|
|||||||
$tenant = $request->user()->tenant()->firstOrFail();
|
$tenant = $request->user()->tenant()->firstOrFail();
|
||||||
|
|
||||||
return new AdminAppTicketRefundCalculationResource(
|
return new AdminAppTicketRefundCalculationResource(
|
||||||
$this->ticketService->calculateRefund($tenant, $ticket, $request->user()->event_id)
|
$this->ticketService->calculateRefund($tenant, $ticket)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketPdfService->download(
|
return $this->ticketPdfService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ class TicketController extends Controller
|
|||||||
|
|
||||||
return $this->ticketExcelService->download(
|
return $this->ticketExcelService->download(
|
||||||
$tenant,
|
$tenant,
|
||||||
$this->ticketService->ticketsForExport($tenant, $request->validated(), $request->user()->event_id),
|
$this->ticketService->ticketsForExport($tenant, $request->validated()),
|
||||||
$request->validated('timezone'),
|
$request->validated('timezone'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,9 +41,9 @@ class AdminAppTicketService
|
|||||||
/**
|
/**
|
||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
*/
|
*/
|
||||||
public function search(Tenant $tenant, array $filters = [], ?int $eventId = null): AdminAppTicketResult
|
public function search(Tenant $tenant, array $filters = []): AdminAppTicketResult
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters, $eventId);
|
$query = $this->baseQuery($tenant, $filters);
|
||||||
$countQuery = clone $query;
|
$countQuery = clone $query;
|
||||||
|
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
@@ -77,7 +77,7 @@ class AdminAppTicketService
|
|||||||
tickets: $tickets,
|
tickets: $tickets,
|
||||||
scannedTickets: $scannedTickets,
|
scannedTickets: $scannedTickets,
|
||||||
totalTickets: $totalTickets,
|
totalTickets: $totalTickets,
|
||||||
refundedTotal: $this->refundSummaryService->totalForTenant($tenant, $eventId),
|
refundedTotal: $this->refundSummaryService->totalForTenant($tenant),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,9 +85,9 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, sort_by?: string|null, sort_direction?: string|null} $filters
|
||||||
* @return Collection<int, Ticket>
|
* @return Collection<int, Ticket>
|
||||||
*/
|
*/
|
||||||
public function ticketsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
public function ticketsForExport(Tenant $tenant, array $filters = []): Collection
|
||||||
{
|
{
|
||||||
$query = $this->baseQuery($tenant, $filters, $eventId);
|
$query = $this->baseQuery($tenant, $filters);
|
||||||
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
$databaseSorted = $this->applyDatabaseSort($query, $tenant, $filters);
|
||||||
$tickets = $query
|
$tickets = $query
|
||||||
->with(self::RELATIONS)
|
->with(self::RELATIONS)
|
||||||
@@ -97,10 +97,11 @@ class AdminAppTicketService
|
|||||||
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
return $databaseSorted ? $tickets : $this->sortTickets($tickets, $tenant, $filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function cancel(Tenant $tenant, int $ticketId, ?int $eventId = null): Ticket
|
public function cancel(Tenant $tenant, int $ticketId): Ticket
|
||||||
{
|
{
|
||||||
return DB::transaction(function () use ($tenant, $ticketId, $eventId): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId): Ticket {
|
||||||
$ticket = $this->ticketsQuery($tenant, $eventId)
|
$ticket = Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
@@ -123,9 +124,10 @@ class AdminAppTicketService
|
|||||||
* partial: string|null,
|
* partial: string|null,
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
public function calculateRefund(Tenant $tenant, int $ticketId, ?int $eventId = null): array
|
public function calculateRefund(Tenant $tenant, int $ticketId): array
|
||||||
{
|
{
|
||||||
$ticket = $this->ticketsQuery($tenant, $eventId)
|
$ticket = Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
@@ -173,13 +175,14 @@ class AdminAppTicketService
|
|||||||
string $refundType,
|
string $refundType,
|
||||||
?User $createdBy = null,
|
?User $createdBy = null,
|
||||||
): Ticket {
|
): Ticket {
|
||||||
|
$this->ensureRefundIsAllowed($tenant, $refundType);
|
||||||
|
|
||||||
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
||||||
$ticket = $this->ticketsQuery($tenant, $createdBy?->event_id)
|
$ticket = Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
->lockForUpdate()
|
->lockForUpdate()
|
||||||
->findOrFail($ticketId);
|
->findOrFail($ticketId);
|
||||||
|
|
||||||
$this->ensureRefundIsAllowed($tenant, $refundType);
|
|
||||||
|
|
||||||
if (! $ticket->can_refund()) {
|
if (! $ticket->can_refund()) {
|
||||||
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
||||||
throw ValidationException::withMessages([
|
throw ValidationException::withMessages([
|
||||||
@@ -225,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) {
|
||||||
@@ -269,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
|
||||||
@@ -311,11 +310,12 @@ class AdminAppTicketService
|
|||||||
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
* @param array{q?: string|null, category?: string|null, product?: string|null, type?: string|null, date?: string|null, size?: string|null, status?: string|null, page?: int, per_page?: int} $filters
|
||||||
* @return Builder<Ticket>
|
* @return Builder<Ticket>
|
||||||
*/
|
*/
|
||||||
private function baseQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
private function baseQuery(Tenant $tenant, array $filters): Builder
|
||||||
{
|
{
|
||||||
$search = trim((string) ($filters['q'] ?? ''));
|
$search = trim((string) ($filters['q'] ?? ''));
|
||||||
|
|
||||||
$query = $this->ticketsQuery($tenant, $eventId)
|
$query = Ticket::query()
|
||||||
|
->where('tenant_code', $tenant->codigo)
|
||||||
->when($search !== '', function (Builder $query) use ($search): void {
|
->when($search !== '', function (Builder $query) use ($search): void {
|
||||||
$this->applySearchFilter($query, $search);
|
$this->applySearchFilter($query, $search);
|
||||||
})
|
})
|
||||||
@@ -355,14 +355,6 @@ class AdminAppTicketService
|
|||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return Builder<Ticket> */
|
|
||||||
private function ticketsQuery(Tenant $tenant, ?int $eventId): Builder
|
|
||||||
{
|
|
||||||
return Ticket::query()
|
|
||||||
->where('tenant_code', $tenant->codigo)
|
|
||||||
->when($eventId !== null, fn (Builder $query): Builder => $query->where('tickets.event_id', $eventId));
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @param Builder<Ticket> $query */
|
/** @param Builder<Ticket> $query */
|
||||||
private function applySearchFilter(Builder $query, string $search): void
|
private function applySearchFilter(Builder $query, string $search): void
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,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,17 +82,13 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
|
|||||||
- `POST /tickets/pdf`.
|
- `POST /tickets/pdf`.
|
||||||
|
|
||||||
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
||||||
`adminapp.tickets`:
|
`onticket.adminapp.tickets`:
|
||||||
|
|
||||||
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
||||||
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
||||||
|
|
||||||
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
`TicketPdfService` genera la descarga y `TicketResource`/`ValidityTimeResource` definen las respuestas.
|
||||||
|
|
||||||
Si el administrador autenticado tiene `event_id`, las consultas de Tickets y sus exportaciones se limitan a `tickets.event_id` dentro del tenant. Los contadores usan el mismo alcance y el total reembolsado se limita a las compras del evento. Sin `event_id`, se conserva el alcance por tenant.
|
|
||||||
|
|
||||||
La cancelación, el cálculo de reembolso y el reembolso buscan el ticket dentro de ese alcance antes de validar o ejecutar la operación. Un ticket de otro evento o sin evento devuelve 404 para un administrador con evento asignado. El alcance se obtiene del usuario autenticado, no de los parámetros del cliente.
|
|
||||||
|
|
||||||
## Dependencias y reglas
|
## Dependencias y reglas
|
||||||
|
|
||||||
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
Depende de `Purchase`, `Catalog`, `Tenant` y `Auth`. La generación debe ser idempotente ante reintentos del evento. `TicketNotAvailableException` y `TicketGenerationException` separan indisponibilidad de errores de generación.
|
||||||
|
|||||||
@@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant')
|
|||||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||||
->group(function (): void {
|
->group(function (): void {
|
||||||
Route::get('tickets', [TicketController::class, 'index'])
|
Route::get('tickets', [TicketController::class, 'index'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.index');
|
->name('adminapp.tickets.index');
|
||||||
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.cancel');
|
->name('adminapp.tickets.cancel');
|
||||||
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.calculate-refund');
|
->name('adminapp.tickets.calculate-refund');
|
||||||
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
||||||
->whereNumber('ticket')
|
->whereNumber('ticket')
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.refund');
|
->name('adminapp.tickets.refund');
|
||||||
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.pdf');
|
->name('adminapp.tickets.pdf');
|
||||||
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.tickets.excel');
|
->name('adminapp.tickets.excel');
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ class EnsureTenantHasMenu
|
|||||||
$tenant = $request->user()?->tenant()->first();
|
$tenant = $request->user()?->tenant()->first();
|
||||||
$hasMenu = $tenant?->menues()
|
$hasMenu = $tenant?->menues()
|
||||||
->where('menues.code', $menuCode)
|
->where('menues.code', $menuCode)
|
||||||
|
->where(fn ($query) => $query
|
||||||
|
->where('menues.code', 'help.contact')
|
||||||
|
->orWhere('tenants_menues.is_enabled', true))
|
||||||
->exists() ?? false;
|
->exists() ?? false;
|
||||||
|
|
||||||
abort_unless($hasMenu, 404);
|
abort_unless($hasMenu, 404);
|
||||||
|
|||||||
@@ -18,12 +18,12 @@ Route::prefix('v1/adminapp/forms')
|
|||||||
Route::get(
|
Route::get(
|
||||||
'desfile/entry-reservation',
|
'desfile/entry-reservation',
|
||||||
DesfileEntryReservationFormController::class
|
DesfileEntryReservationFormController::class
|
||||||
)->middleware('tenant.menu:adminapp.desfile.reservas')
|
)->middleware('tenant.menu:onticket.adminapp.desfile.reservas')
|
||||||
->name('adminapp.forms.desfile.entry-reservation');
|
->name('adminapp.forms.desfile.entry-reservation');
|
||||||
Route::get('sale', SaleFormController::class);
|
Route::get('sale', SaleFormController::class);
|
||||||
Route::get('staff', StaffFormController::class);
|
Route::get('staff', StaffFormController::class);
|
||||||
Route::get('tickets-filter', TicketFilterFormController::class)
|
Route::get('tickets-filter', TicketFilterFormController::class)
|
||||||
->middleware('tenant.menu:adminapp.tickets')
|
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||||
->name('adminapp.forms.tickets-filter');
|
->name('adminapp.forms.tickets-filter');
|
||||||
Route::get(
|
Route::get(
|
||||||
'fiesta-futbol-infantil/ticket',
|
'fiesta-futbol-infantil/ticket',
|
||||||
|
|||||||
@@ -3,11 +3,12 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
|
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
||||||
use App\Shared\Integration\Models\ClientIntegration;
|
use App\Shared\Integration\Models\ClientIntegration;
|
||||||
use App\Shared\Integration\Models\Integration;
|
use App\Shared\Integration\Models\Integration;
|
||||||
use App\Shared\Integration\Models\IntegrationInstance;
|
use App\Shared\Integration\Models\IntegrationInstance;
|
||||||
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Http\Client\PendingRequest;
|
use Illuminate\Http\Client\PendingRequest;
|
||||||
use Illuminate\Support\Facades\Http;
|
use Illuminate\Support\Facades\Http;
|
||||||
@@ -86,6 +87,17 @@ abstract class BaseIntegrationService
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
$event->loadMissing(['client', 'tenant.client']);
|
||||||
|
$this->tenant = $event->tenant;
|
||||||
|
$this->tenantCode = $event->tenant_code;
|
||||||
|
$this->clientContext = $event->effectiveClient();
|
||||||
|
$this->loadIntegration();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the integration definition and its effective instance configuration.
|
* Load the integration definition and its effective instance configuration.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
|
||||||
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
|
use App\Domains\Ticketing\Event\Models\Event;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
||||||
use Illuminate\Contracts\Mail\Mailer;
|
use Illuminate\Contracts\Mail\Mailer;
|
||||||
@@ -39,14 +40,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function forTenant(string $tenantCode): self
|
public function forTenant(string $tenantCode): self
|
||||||
{
|
{
|
||||||
parent::forTenant($tenantCode);
|
parent::forTenant($tenantCode);
|
||||||
|
$this->configureMailer();
|
||||||
if ($this->integrationInstance) {
|
|
||||||
$this->mailer = $this->resolveMailer();
|
|
||||||
$this->usesInstanceMailer = true;
|
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
@@ -55,16 +49,30 @@ class MailService extends BaseIntegrationService
|
|||||||
{
|
{
|
||||||
parent::forClient($client);
|
parent::forClient($client);
|
||||||
$this->tenant = $this->clientContext?->tenants()->first();
|
$this->tenant = $this->clientContext?->tenants()->first();
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function forEvent(Event $event): self
|
||||||
|
{
|
||||||
|
parent::forEvent($event);
|
||||||
|
$this->configureMailer();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function configureMailer(): void
|
||||||
|
{
|
||||||
if ($this->integrationInstance) {
|
if ($this->integrationInstance) {
|
||||||
$this->mailer = $this->resolveMailer();
|
$this->mailer = $this->resolveMailer();
|
||||||
$this->usesInstanceMailer = true;
|
$this->usesInstanceMailer = true;
|
||||||
} else {
|
|
||||||
$this->mailer = $this->mailFactory->mailer();
|
return;
|
||||||
$this->usesInstanceMailer = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
$this->mailer = $this->mailFactory->mailer();
|
||||||
|
$this->usesInstanceMailer = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHeaders(): array
|
public function getHeaders(): array
|
||||||
@@ -83,7 +91,7 @@ class MailService extends BaseIntegrationService
|
|||||||
array $attachments = [],
|
array $attachments = [],
|
||||||
): void {
|
): void {
|
||||||
if (! $this->mailer || ! $this->tenant) {
|
if (! $this->mailer || ! $this->tenant) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$brand ??= $this->tenant;
|
$brand ??= $this->tenant;
|
||||||
@@ -160,7 +168,7 @@ class MailService extends BaseIntegrationService
|
|||||||
public function onSetup(): void
|
public function onSetup(): void
|
||||||
{
|
{
|
||||||
if (! $this->mailer || ! $this->clientContext) {
|
if (! $this->mailer || ! $this->clientContext) {
|
||||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
|
|||||||
public function getToken(): string
|
public function getToken(): string
|
||||||
{
|
{
|
||||||
if (! $this->integrationInstance) {
|
if (! $this->integrationInstance) {
|
||||||
throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
|
throw new Exception('Client integration is not loaded. Call forTenant(), forClient(), or forEvent() first.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Shared\Integration\Services;
|
namespace App\Shared\Integration\Services;
|
||||||
|
|
||||||
use App\Domains\Core\Client\Models\Client;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
||||||
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
||||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||||
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
||||||
|
use App\Domains\Core\Client\Models\Client;
|
||||||
use Exception;
|
use Exception;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
@@ -75,9 +75,30 @@ class TelepagosWebhookService
|
|||||||
|
|
||||||
$dni = substr($cuit, 2, -1);
|
$dni = substr($cuit, 2, -1);
|
||||||
|
|
||||||
$tenantCodes = $client->tenants()->pluck('codigo');
|
|
||||||
$eligiblePurchases = Purchase::query()
|
$eligiblePurchases = Purchase::query()
|
||||||
->whereIn('tenant_codigo', $tenantCodes)
|
->where(function (Builder $purchases) use ($client): void {
|
||||||
|
$purchases
|
||||||
|
->whereHas('event', function (Builder $events) use ($client): void {
|
||||||
|
$events
|
||||||
|
->where('client_id', $client->id)
|
||||||
|
->orWhere(function (Builder $fallback) use ($client): void {
|
||||||
|
$fallback
|
||||||
|
->whereNull('client_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
|
->orWhere(function (Builder $legacy) use ($client): void {
|
||||||
|
$legacy
|
||||||
|
->whereNull('event_id')
|
||||||
|
->whereHas(
|
||||||
|
'tenant',
|
||||||
|
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
})
|
||||||
->whereIn('status', [
|
->whereIn('status', [
|
||||||
Purchase::STATUS_CREATED,
|
Purchase::STATUS_CREATED,
|
||||||
Purchase::STATUS_PENDING_PAYMENT,
|
Purchase::STATUS_PENDING_PAYMENT,
|
||||||
@@ -170,7 +191,7 @@ class TelepagosWebhookService
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
|
if (! $this->purchaseBelongsToClient($compra, $client)) {
|
||||||
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
||||||
'client_code' => $client->code,
|
'client_code' => $client->code,
|
||||||
'cashin_id' => $cashinId,
|
'cashin_id' => $cashinId,
|
||||||
@@ -244,6 +265,16 @@ class TelepagosWebhookService
|
|||||||
return number_format((float) $amount, 2, '.', '');
|
return number_format((float) $amount, 2, '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function purchaseBelongsToClient(Purchase $purchase, Client $client): bool
|
||||||
|
{
|
||||||
|
$purchase->loadMissing(['event.client', 'event.tenant.client', 'tenant.client']);
|
||||||
|
|
||||||
|
$effectiveClient = $purchase->event?->effectiveClient()
|
||||||
|
?? $purchase->tenant?->client;
|
||||||
|
|
||||||
|
return $effectiveClient?->is($client) ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Builder<Purchase> $eligiblePurchases
|
* @param Builder<Purchase> $eligiblePurchases
|
||||||
* @return Collection<int, Purchase>
|
* @return Collection<int, Purchase>
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
namespace App\Shared\Notification\Services;
|
namespace App\Shared\Notification\Services;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||||
use App\Domains\Core\Auth\Models\User;
|
use App\Domains\Core\Auth\Models\User;
|
||||||
use App\Shared\Integration\Services\MailService;
|
|
||||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
|
||||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
|
||||||
use App\Domains\Core\Tenant\Models\Tenant;
|
use App\Domains\Core\Tenant\Models\Tenant;
|
||||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||||
|
use App\Shared\Integration\Services\MailService;
|
||||||
|
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
@@ -158,7 +158,7 @@ class NotificationMailService
|
|||||||
$context = ['purchase_id' => $purchaseId];
|
$context = ['purchase_id' => $purchaseId];
|
||||||
|
|
||||||
$purchase = Purchase::query()
|
$purchase = Purchase::query()
|
||||||
->with(['tenant', 'user', 'items'])
|
->with(['event', 'tenant', 'user', 'items'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
|
|
||||||
if ($purchase === null) {
|
if ($purchase === null) {
|
||||||
@@ -197,8 +197,7 @@ class NotificationMailService
|
|||||||
'mime' => 'application/pdf',
|
'mime' => 'application/pdf',
|
||||||
]];
|
]];
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($purchase->tenant_codigo)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Compra confirmada - Compra #{$purchase->getKey()}",
|
"Compra confirmada - Compra #{$purchase->getKey()}",
|
||||||
@@ -286,7 +285,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$previousDate,
|
$previousDate,
|
||||||
@@ -295,8 +293,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -387,7 +384,6 @@ class NotificationMailService
|
|||||||
$context,
|
$context,
|
||||||
$recipient,
|
$recipient,
|
||||||
function () use (
|
function () use (
|
||||||
$tenantCode,
|
|
||||||
$purchase,
|
$purchase,
|
||||||
$recipient,
|
$recipient,
|
||||||
$date,
|
$date,
|
||||||
@@ -396,8 +392,7 @@ class NotificationMailService
|
|||||||
): array {
|
): array {
|
||||||
$brand = $purchase->tenant;
|
$brand = $purchase->tenant;
|
||||||
|
|
||||||
$this->mailService
|
$this->mailForPurchase($purchase)
|
||||||
->forTenant($tenantCode)
|
|
||||||
->send(
|
->send(
|
||||||
$recipient,
|
$recipient,
|
||||||
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
||||||
@@ -421,10 +416,17 @@ class NotificationMailService
|
|||||||
{
|
{
|
||||||
return Purchase::query()
|
return Purchase::query()
|
||||||
->where('tenant_codigo', $tenantCode)
|
->where('tenant_codigo', $tenantCode)
|
||||||
->with(['tenant', 'user'])
|
->with(['event', 'tenant', 'user'])
|
||||||
->find($purchaseId);
|
->find($purchaseId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function mailForPurchase(Purchase $purchase): MailService
|
||||||
|
{
|
||||||
|
return $purchase->event
|
||||||
|
? $this->mailService->forEvent($purchase->event)
|
||||||
|
: $this->mailService->forTenant($purchase->tenant_codigo);
|
||||||
|
}
|
||||||
|
|
||||||
private function recipientFor(Purchase $purchase): string
|
private function recipientFor(Purchase $purchase): string
|
||||||
{
|
{
|
||||||
return (string) ($purchase->email ?: $purchase->user?->email);
|
return (string) ($purchase->email ?: $purchase->user?->email);
|
||||||
|
|||||||
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}");
|
||||||
|
|||||||
@@ -0,0 +1,326 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const CLIENT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const EXCLUDED_MENU_CODES = [
|
||||||
|
'account.tickets',
|
||||||
|
'adminapp.tickets',
|
||||||
|
'adminapp.fiesta-futbol-infantil.entradas',
|
||||||
|
'adminapp.fiesta-futbol-infantil.alojamientos',
|
||||||
|
'adminapp.fiesta-futbol-infantil.merchandising',
|
||||||
|
'adminapp.fiesta-futbol-infantil.comida',
|
||||||
|
'adminapp.desfile.entradas',
|
||||||
|
'event.index',
|
||||||
|
'event.category',
|
||||||
|
'event.detail',
|
||||||
|
];
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
|
private array $storedPaths = [];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
! DB::table('admin_website_types')->where('codigo', 'shopit')->exists()
|
||||||
|
|| ! DB::table('storefront_website_types')->where('codigo', 'shopit')->exists()
|
||||||
|
) {
|
||||||
|
// Fresh installations provision website-type reference data separately.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
$clientId = $this->clientId();
|
||||||
|
$headerLogoId = $this->storeImage(
|
||||||
|
'images/tennants/mutual_smep/mutual_smep_header.png',
|
||||||
|
'mutual_smep_header.png',
|
||||||
|
);
|
||||||
|
$footerLogoId = $this->storeImage(
|
||||||
|
'images/tennants/mutual_smep/mutual_smep_footer.png',
|
||||||
|
'mutual_smep_footer.png',
|
||||||
|
);
|
||||||
|
$faviconId = $this->storeImage(
|
||||||
|
'images/tennants/mutual_smep/mutual_smep_favicon.png',
|
||||||
|
'mutual_smep_favicon.png',
|
||||||
|
);
|
||||||
|
$now = now();
|
||||||
|
|
||||||
|
DB::table('tenants')->insert([
|
||||||
|
'client_id' => $clientId,
|
||||||
|
'codigo' => self::TENANT_CODE,
|
||||||
|
'nombre' => 'Mutual SMEP',
|
||||||
|
'timezone' => 'America/Argentina/Buenos_Aires',
|
||||||
|
'dominio' => 'mutual-smep.localhost',
|
||||||
|
'base_path' => '/',
|
||||||
|
'site_title' => 'Tienda Mutual SMEP',
|
||||||
|
'address' => 'San Lorenzo 1543, Rosario, Santa Fe',
|
||||||
|
'phone' => '+54 9 341 247-4530',
|
||||||
|
'primary_color' => '#4A7FF5',
|
||||||
|
'secondary_color' => '#0051A4',
|
||||||
|
'danger_color' => '#FF8888',
|
||||||
|
'success_color' => '#198754',
|
||||||
|
'header_bg_color' => '#FFFFFF',
|
||||||
|
'footer_bg_color' => '#0051A4',
|
||||||
|
'header_logo_id' => $headerLogoId,
|
||||||
|
'footer_logo_id' => $footerLogoId,
|
||||||
|
'favicon_id' => $faviconId,
|
||||||
|
'admin_website_type_code' => 'shopit',
|
||||||
|
'storefront_website_type_code' => 'shopit',
|
||||||
|
'display_categories' => true,
|
||||||
|
'display_seach_bar' => true,
|
||||||
|
'display_cart' => true,
|
||||||
|
'cart_editing_policy' => 'quantity_and_remove',
|
||||||
|
'checkout_editing_policy' => 'disabled',
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assignSocialMedia($now);
|
||||||
|
$this->assignMenus($now);
|
||||||
|
});
|
||||||
|
} catch (Throwable $throwable) {
|
||||||
|
Storage::disk('s3')->delete($this->storedPaths);
|
||||||
|
|
||||||
|
throw $throwable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$tenant = DB::table('tenants')
|
||||||
|
->where('codigo', self::TENANT_CODE)
|
||||||
|
->first(['id', 'client_id', 'header_logo_id', 'footer_logo_id', 'favicon_id']);
|
||||||
|
|
||||||
|
if ($tenant === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachmentIds = collect([
|
||||||
|
$tenant->header_logo_id,
|
||||||
|
$tenant->footer_logo_id,
|
||||||
|
$tenant->favicon_id,
|
||||||
|
])->filter()->unique()->values();
|
||||||
|
$storedPaths = DB::table('attachments')
|
||||||
|
->whereIn('id', $attachmentIds)
|
||||||
|
->pluck('path')
|
||||||
|
->all();
|
||||||
|
|
||||||
|
DB::transaction(function () use ($tenant, $attachmentIds): void {
|
||||||
|
DB::table('tenant_social_media')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->delete();
|
||||||
|
DB::table('tenants_menues')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->delete();
|
||||||
|
DB::table('tenants')
|
||||||
|
->where('id', $tenant->id)
|
||||||
|
->delete();
|
||||||
|
DB::table('attachments')
|
||||||
|
->whereIn('id', $attachmentIds)
|
||||||
|
->delete();
|
||||||
|
|
||||||
|
$clientHasTenants = DB::table('tenants')
|
||||||
|
->where('client_id', $tenant->client_id)
|
||||||
|
->exists();
|
||||||
|
|
||||||
|
if (! $clientHasTenants) {
|
||||||
|
DB::table('clients')
|
||||||
|
->where('id', $tenant->client_id)
|
||||||
|
->where('code', self::CLIENT_CODE)
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Storage::disk('s3')->delete($storedPaths);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function clientId(): int
|
||||||
|
{
|
||||||
|
$clientId = DB::table('clients')->where('code', self::CLIENT_CODE)->value('id');
|
||||||
|
|
||||||
|
if ($clientId !== null) {
|
||||||
|
DB::table('clients')->where('id', $clientId)->update([
|
||||||
|
'name' => 'Mutual SMEP',
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return (int) $clientId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) DB::table('clients')->insertGetId([
|
||||||
|
'code' => self::CLIENT_CODE,
|
||||||
|
'name' => 'Mutual SMEP',
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assignSocialMedia(DateTimeInterface $now): void
|
||||||
|
{
|
||||||
|
$socialMedia = [
|
||||||
|
[
|
||||||
|
'code' => 'instagram',
|
||||||
|
'icon' => 'fa-brands fa-instagram',
|
||||||
|
'name' => 'Instagram',
|
||||||
|
'url' => 'https://www.instagram.com/mutualsmep/',
|
||||||
|
'orden' => 0,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'facebook',
|
||||||
|
'icon' => 'fa-brands fa-facebook',
|
||||||
|
'name' => 'Facebook',
|
||||||
|
'url' => 'https://www.facebook.com/smeprosario',
|
||||||
|
'orden' => 1,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'code' => 'whatsapp',
|
||||||
|
'icon' => 'fa-brands fa-whatsapp',
|
||||||
|
'name' => 'WhatsApp',
|
||||||
|
'url' => 'https://wa.me/5493412474530',
|
||||||
|
'orden' => 2,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
foreach ($socialMedia as $network) {
|
||||||
|
DB::table('social_media')->insertOrIgnore([
|
||||||
|
'code' => $network['code'],
|
||||||
|
'icon' => $network['icon'],
|
||||||
|
'name' => $network['name'],
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
|
||||||
|
DB::table('tenant_social_media')->insertOrIgnore([
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'social_media_code' => $network['code'],
|
||||||
|
'url' => $network['url'],
|
||||||
|
'orden' => $network['orden'],
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assignMenus(DateTimeInterface $now): void
|
||||||
|
{
|
||||||
|
DB::table('menues')
|
||||||
|
->whereNotIn('code', self::EXCLUDED_MENU_CODES)
|
||||||
|
->pluck('code')
|
||||||
|
->each(function (string $menuCode) use ($now): void {
|
||||||
|
$staticContent = match ($menuCode) {
|
||||||
|
'help.faq' => $this->frequentlyAskedQuestions(),
|
||||||
|
'help.contact' => $this->contactContent(),
|
||||||
|
default => null,
|
||||||
|
};
|
||||||
|
|
||||||
|
DB::table('tenants_menues')->updateOrInsert(
|
||||||
|
[
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'menu_code' => $menuCode,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'static_content' => $staticContent === null
|
||||||
|
? null
|
||||||
|
: json_encode($staticContent, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
|
||||||
|
'created_at' => $now,
|
||||||
|
'updated_at' => $now,
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return list<array{pregunta: string, respuesta: string, is_active: bool}> */
|
||||||
|
private function frequentlyAskedQuestions(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
[
|
||||||
|
'pregunta' => '¿Hay algún límite de compra?',
|
||||||
|
'respuesta' => 'La cantidad disponible depende del stock de cada producto.',
|
||||||
|
'is_active' => true,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'pregunta' => '¿Cuáles son los medios de pago disponibles?',
|
||||||
|
'respuesta' => 'Podés consultar y seleccionar los medios de pago habilitados al finalizar tu compra.',
|
||||||
|
'is_active' => false,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'pregunta' => '¿Cómo puedo recibir asesoramiento antes de comprar?',
|
||||||
|
'respuesta' => 'Podés comunicarte con Mutual SMEP por WhatsApp al +54 9 341 247-4530.',
|
||||||
|
'is_active' => false,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
private function contactContent(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'whatsapp' => [
|
||||||
|
'whatsapp_url' => 'https://wa.me/5493412474530',
|
||||||
|
'whatsapp_label' => 'Chateá con Mutual SMEP',
|
||||||
|
],
|
||||||
|
'phone' => '+54 9 341 247-4530',
|
||||||
|
'locations' => [
|
||||||
|
'rosario' => [
|
||||||
|
'label' => 'Rosario',
|
||||||
|
'addresses' => [
|
||||||
|
[
|
||||||
|
'label' => 'Mutual SMEP',
|
||||||
|
'address' => 'San Lorenzo 1543, Rosario, Santa Fe',
|
||||||
|
'coordinates' => [-32.9431184, -60.6437991],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private function storeImage(string $relativePath, string $filename): int
|
||||||
|
{
|
||||||
|
$sourcePath = public_path($relativePath);
|
||||||
|
|
||||||
|
if (! is_file($sourcePath)) {
|
||||||
|
throw new RuntimeException("Image not found at path: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = file_get_contents($sourcePath);
|
||||||
|
|
||||||
|
if ($contents === false) {
|
||||||
|
throw new RuntimeException("Could not read image at path: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$key = (string) Str::uuid();
|
||||||
|
$storedPath = 'tenants/'.self::TENANT_CODE."/{$key}.png";
|
||||||
|
|
||||||
|
if (! Storage::disk('s3')->put($storedPath, $contents)) {
|
||||||
|
throw new RuntimeException("Could not store image at path: {$storedPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->storedPaths[] = $storedPath;
|
||||||
|
|
||||||
|
return DB::table('attachments')->insertGetId([
|
||||||
|
'key' => $key,
|
||||||
|
'path' => $storedPath,
|
||||||
|
'filename' => $filename,
|
||||||
|
'type' => 'image',
|
||||||
|
'mime_type' => 'image/png',
|
||||||
|
'extension' => 'png',
|
||||||
|
'size' => strlen($contents),
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
/** @var array<string, list<string>> */
|
||||||
|
private const CATEGORIES = [
|
||||||
|
'Dormitorio y Blanco' => [
|
||||||
|
'Colchones',
|
||||||
|
'Bases y Sommiers',
|
||||||
|
'Acolchados y Edredones',
|
||||||
|
'Frazadas y Mantas',
|
||||||
|
'Infantil y Cuna',
|
||||||
|
],
|
||||||
|
'Electrodomésticos' => [
|
||||||
|
'Heladeras',
|
||||||
|
'Lavarropas y Secarropas',
|
||||||
|
'Cocinas',
|
||||||
|
'Microondas',
|
||||||
|
'Hornos Eléctricos',
|
||||||
|
'Calefones y Termotanques',
|
||||||
|
'Purificadores y Extractores de Cocina',
|
||||||
|
'Preparación de Alimentos',
|
||||||
|
'Café y Desayuno',
|
||||||
|
'Freidoras y Cocción',
|
||||||
|
'Cuidado Personal',
|
||||||
|
'Limpieza y Planchado',
|
||||||
|
],
|
||||||
|
'Climatización' => [
|
||||||
|
'Aires Acondicionados',
|
||||||
|
'Calefactores a Gas con Salida',
|
||||||
|
'Calefactores a Gas sin Salida',
|
||||||
|
'Calefacción Eléctrica',
|
||||||
|
],
|
||||||
|
'Tecnología' => [
|
||||||
|
'Celulares',
|
||||||
|
'Notebooks',
|
||||||
|
'Smart TV',
|
||||||
|
'Audio',
|
||||||
|
'Accesorios de Computación',
|
||||||
|
'Soportes para TV',
|
||||||
|
],
|
||||||
|
'Bicicletas y Aire Libre' => [
|
||||||
|
'Bicicletas Infantiles',
|
||||||
|
'Bicicletas para Adultos',
|
||||||
|
'Piletas',
|
||||||
|
],
|
||||||
|
'Bazar' => [
|
||||||
|
'Termos',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (! DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
foreach (self::CATEGORIES as $parentName => $subcategoryNames) {
|
||||||
|
$parentId = $this->upsertCategory($parentName, null);
|
||||||
|
|
||||||
|
foreach ($subcategoryNames as $subcategoryName) {
|
||||||
|
$this->upsertCategory($subcategoryName, $parentId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
foreach (self::CATEGORIES as $parentName => $subcategoryNames) {
|
||||||
|
$parentId = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('nombre', $parentName)
|
||||||
|
->whereNull('categoria_id')
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($parentId === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$subcategoryIds = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categoria_id', $parentId)
|
||||||
|
->whereIn('nombre', $subcategoryNames)
|
||||||
|
->pluck('id');
|
||||||
|
|
||||||
|
foreach ($subcategoryIds as $subcategoryId) {
|
||||||
|
$hasChildren = DB::table('categorias')
|
||||||
|
->where('categoria_id', $subcategoryId)
|
||||||
|
->exists();
|
||||||
|
|
||||||
|
if (! $hasChildren) {
|
||||||
|
DB::table('categorias')->where('id', $subcategoryId)->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$hasChildren = DB::table('categorias')
|
||||||
|
->where('categoria_id', $parentId)
|
||||||
|
->exists();
|
||||||
|
|
||||||
|
if (! $hasChildren) {
|
||||||
|
DB::table('categorias')->where('id', $parentId)->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function upsertCategory(string $name, ?int $parentId): int
|
||||||
|
{
|
||||||
|
$categoryId = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('nombre', $name)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($categoryId !== null) {
|
||||||
|
DB::table('categorias')->where('id', $categoryId)->update([
|
||||||
|
'categoria_id' => $parentId,
|
||||||
|
'is_enabled' => true,
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return (int) $categoryId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) DB::table('categorias')->insertGetId([
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'categoria_id' => $parentId,
|
||||||
|
'nombre' => $name,
|
||||||
|
'is_enabled' => true,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
/** @var list<array<string, mixed>> */
|
||||||
|
private const ATTRIBUTES = [
|
||||||
|
[
|
||||||
|
'codigo' => 'color',
|
||||||
|
'nombre' => 'Color',
|
||||||
|
'metadata_schema' => [
|
||||||
|
'hex' => ['type' => 'string'],
|
||||||
|
],
|
||||||
|
'options' => [
|
||||||
|
['value' => 'Negro', 'label' => 'Negro', 'metadata' => ['hex' => '#000000']],
|
||||||
|
['value' => 'Blanco', 'label' => 'Blanco', 'metadata' => ['hex' => '#FFFFFF']],
|
||||||
|
['value' => 'Gris', 'label' => 'Gris', 'metadata' => ['hex' => '#808080']],
|
||||||
|
['value' => 'Plata', 'label' => 'Plata', 'metadata' => ['hex' => '#C0C0C0']],
|
||||||
|
['value' => 'Azul', 'label' => 'Azul', 'metadata' => ['hex' => '#0000FF']],
|
||||||
|
['value' => 'Rojo', 'label' => 'Rojo', 'metadata' => ['hex' => '#DC3545']],
|
||||||
|
['value' => 'Rosa', 'label' => 'Rosa', 'metadata' => ['hex' => '#FFC0CB']],
|
||||||
|
['value' => 'Multicolor', 'label' => 'Multicolor'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'codigo' => 'medida_cama',
|
||||||
|
'nombre' => 'Medida',
|
||||||
|
'options' => [
|
||||||
|
['value' => 'Cuna', 'label' => 'Cuna'],
|
||||||
|
['value' => '1 Plaza', 'label' => '1 Plaza'],
|
||||||
|
['value' => '1 1/2 Plazas', 'label' => '1 1/2 Plazas'],
|
||||||
|
['value' => '2 Plazas', 'label' => '2 Plazas'],
|
||||||
|
['value' => '2 1/2 Plazas', 'label' => '2 1/2 Plazas'],
|
||||||
|
['value' => 'Queen', 'label' => 'Queen'],
|
||||||
|
['value' => 'King', 'label' => 'King'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'codigo' => 'almacenamiento',
|
||||||
|
'nombre' => 'Almacenamiento',
|
||||||
|
'options' => [
|
||||||
|
['value' => '128 GB', 'label' => '128 GB'],
|
||||||
|
['value' => '256 GB', 'label' => '256 GB'],
|
||||||
|
['value' => '512 GB', 'label' => '512 GB'],
|
||||||
|
['value' => '1 TB', 'label' => '1 TB'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'codigo' => 'memoria_ram',
|
||||||
|
'nombre' => 'Memoria RAM',
|
||||||
|
'options' => [
|
||||||
|
['value' => '4 GB', 'label' => '4 GB'],
|
||||||
|
['value' => '8 GB', 'label' => '8 GB'],
|
||||||
|
['value' => '16 GB', 'label' => '16 GB'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'codigo' => 'rodado',
|
||||||
|
'nombre' => 'Rodado',
|
||||||
|
'options' => [
|
||||||
|
['value' => '16', 'label' => '16'],
|
||||||
|
['value' => '26', 'label' => '26'],
|
||||||
|
['value' => '29', 'label' => '29'],
|
||||||
|
],
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (! DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::transaction(function (): void {
|
||||||
|
foreach (self::ATTRIBUTES as $definition) {
|
||||||
|
$attributeId = $this->upsertAttribute($definition);
|
||||||
|
|
||||||
|
DB::table('attribute_options')->where('attribute_id', $attributeId)->delete();
|
||||||
|
|
||||||
|
foreach ($definition['options'] as $index => $option) {
|
||||||
|
DB::table('attribute_options')->insert([
|
||||||
|
'attribute_id' => $attributeId,
|
||||||
|
'value' => $option['value'],
|
||||||
|
'label' => $option['label'],
|
||||||
|
'sort_order' => $index + 1,
|
||||||
|
'metadata' => isset($option['metadata'])
|
||||||
|
? json_encode($option['metadata'], JSON_THROW_ON_ERROR)
|
||||||
|
: null,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::table('attribute')
|
||||||
|
->where('tenant_codigo', self::TENANT_CODE)
|
||||||
|
->whereIn('codigo', array_column(self::ATTRIBUTES, 'codigo'))
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, mixed> $definition */
|
||||||
|
private function upsertAttribute(array $definition): int
|
||||||
|
{
|
||||||
|
$attributeId = DB::table('attribute')
|
||||||
|
->where('tenant_codigo', self::TENANT_CODE)
|
||||||
|
->where('codigo', $definition['codigo'])
|
||||||
|
->value('id');
|
||||||
|
$values = [
|
||||||
|
'nombre' => $definition['nombre'],
|
||||||
|
'is_required' => false,
|
||||||
|
'metadata_schema' => isset($definition['metadata_schema'])
|
||||||
|
? json_encode($definition['metadata_schema'], JSON_THROW_ON_ERROR)
|
||||||
|
: null,
|
||||||
|
'type' => 'select',
|
||||||
|
'updated_at' => now(),
|
||||||
|
];
|
||||||
|
|
||||||
|
if ($attributeId !== null) {
|
||||||
|
DB::table('attribute')->where('id', $attributeId)->update($values);
|
||||||
|
|
||||||
|
return (int) $attributeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (int) DB::table('attribute')->insertGetId([
|
||||||
|
'tenant_codigo' => self::TENANT_CODE,
|
||||||
|
'codigo' => $definition['codigo'],
|
||||||
|
...$values,
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,462 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const MANIFEST = 'data/mutual_smep_catalog_v1.json';
|
||||||
|
|
||||||
|
private const STORAGE_PREFIX = 'tenants/mutual_smep/catalog-v2/';
|
||||||
|
|
||||||
|
private const LEGACY_STORAGE_PREFIX = 'tenants/mutual_smep/catalog-v1/';
|
||||||
|
|
||||||
|
private const BRAND_MARKER = 'Provisioned by Mutual SMEP catalog migration v1.';
|
||||||
|
|
||||||
|
/** @var list<array{code: string, category: string}> */
|
||||||
|
private const FEATURED_GROUPS = [
|
||||||
|
['code' => 'smep-dormitorio-y-blanco', 'category' => 'Dormitorio y Blanco'],
|
||||||
|
['code' => 'smep-electrodomesticos', 'category' => 'Electrodomésticos'],
|
||||||
|
['code' => 'smep-climatizacion', 'category' => 'Climatización'],
|
||||||
|
['code' => 'smep-tecnologia', 'category' => 'Tecnología'],
|
||||||
|
['code' => 'smep-bicicletas-y-aire-libre', 'category' => 'Bicicletas y Aire Libre'],
|
||||||
|
['code' => 'smep-bazar', 'category' => 'Bazar'],
|
||||||
|
];
|
||||||
|
|
||||||
|
private const HIGHLIGHTED_GROUP_CODE = 'productos-destacados-smep';
|
||||||
|
|
||||||
|
private const CATEGORY_FEATURED_ITEM_LIMIT = 6;
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
|
private const HIGHLIGHTED_PRODUCT_SLUGS = [
|
||||||
|
'acolchado-kavanagh-simil-plumon-reversible',
|
||||||
|
'acolchado-sense-duo-bitono-corderito',
|
||||||
|
'colchon-inducol-constanza',
|
||||||
|
'edredon-lisboa-jean-cartier',
|
||||||
|
'frazada-kavanagh-premium-soft',
|
||||||
|
'kit-edredon-alaska-corderito',
|
||||||
|
'motorola-g15',
|
||||||
|
'smart-tv-noblex-50-dr50-x8500-google-tv',
|
||||||
|
'heladera-gafa-hgf-368afp-330-lt-color-plata',
|
||||||
|
'cafetera-express-atma-ceat-5418p-1-litro',
|
||||||
|
'split-3300-w-tcl-taca-3300fcsa-frio-calor',
|
||||||
|
'bicicleta-venzo-loki-r29-fd-21-v-shimano',
|
||||||
|
'termo-stanley-1-l-adventure-go-to-con-tapon',
|
||||||
|
];
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
|
private array $storedPaths = [];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (! DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()) {
|
||||||
|
throw new RuntimeException("Tenant '".self::TENANT_CODE."' not found.");
|
||||||
|
}
|
||||||
|
|
||||||
|
$manifest = $this->manifest();
|
||||||
|
$slugs = array_column($manifest['items'], 'slug');
|
||||||
|
$existingSlug = DB::table('catalog_items')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereIn('slug', $slugs)
|
||||||
|
->value('slug');
|
||||||
|
|
||||||
|
if ($existingSlug !== null) {
|
||||||
|
throw new RuntimeException("Catalog item '{$existingSlug}' already exists for Mutual SMEP.");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($manifest): void {
|
||||||
|
$brandIds = [];
|
||||||
|
$categoryIds = [];
|
||||||
|
$attributeIds = [];
|
||||||
|
|
||||||
|
foreach ($manifest['items'] as $order => $item) {
|
||||||
|
$brandId = $this->brandId($item['brand'], $brandIds);
|
||||||
|
$categoryId = $this->categoryId(
|
||||||
|
$item['parent_category'],
|
||||||
|
$item['category'],
|
||||||
|
$categoryIds,
|
||||||
|
);
|
||||||
|
$hasVariants = $item['variants'] !== [];
|
||||||
|
$inventoryId = $hasVariants
|
||||||
|
? null
|
||||||
|
: $this->createInventory((int) $item['stock']);
|
||||||
|
$catalogItemId = DB::table('catalog_items')->insertGetId([
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'category_id' => $categoryId,
|
||||||
|
'brand_id' => $brandId,
|
||||||
|
'inventory_id' => $inventoryId,
|
||||||
|
'type' => 'standard',
|
||||||
|
'slug' => $item['slug'],
|
||||||
|
'nombre' => $item['name'],
|
||||||
|
'group_order' => $order + 1,
|
||||||
|
'descripcion' => $item['description'],
|
||||||
|
'precio' => $item['price'],
|
||||||
|
'inventory_policy' => 'tracked',
|
||||||
|
'inventory_subject' => 'product',
|
||||||
|
'has_tickets' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->attachImages($catalogItemId, null, $item['images']);
|
||||||
|
|
||||||
|
if (! $hasVariants) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$itemAttributeIds = [];
|
||||||
|
foreach ($item['attribute_codes'] as $attributeOrder => $attributeCode) {
|
||||||
|
$attributeId = $this->attributeId($attributeCode, $attributeIds);
|
||||||
|
$itemAttributeIds[$attributeCode] = DB::table('item_attributes')->insertGetId([
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'attribute_id' => $attributeId,
|
||||||
|
'allow_multi_select' => false,
|
||||||
|
'sort_order' => $attributeOrder + 1,
|
||||||
|
'show_in_selector' => true,
|
||||||
|
'ticket_label' => null,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($item['variants'] as $variant) {
|
||||||
|
$variantId = DB::table('variantes')->insertGetId([
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'inventory_id' => $this->createInventory((int) $variant['stock']),
|
||||||
|
'descripcion' => $variant['description'],
|
||||||
|
'precio' => $variant['price'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
foreach ($variant['values'] as $attributeCode => $value) {
|
||||||
|
$itemAttributeId = $itemAttributeIds[$attributeCode] ?? null;
|
||||||
|
|
||||||
|
if ($itemAttributeId === null) {
|
||||||
|
throw new RuntimeException(
|
||||||
|
"Attribute '{$attributeCode}' is not assigned to '{$item['slug']}'."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('variant_values')->insert([
|
||||||
|
'variant_id' => $variantId,
|
||||||
|
'item_attribute_id' => $itemAttributeId,
|
||||||
|
'value' => $value,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->attachImages($catalogItemId, $variantId, $variant['images']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->createFeaturedGroups();
|
||||||
|
});
|
||||||
|
} catch (Throwable $throwable) {
|
||||||
|
Storage::disk('s3')->delete($this->storedPaths);
|
||||||
|
|
||||||
|
throw $throwable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$manifest = $this->manifest();
|
||||||
|
$catalogItemIds = DB::table('catalog_items')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereIn('slug', array_column($manifest['items'], 'slug'))
|
||||||
|
->pluck('id');
|
||||||
|
$variantInventoryIds = DB::table('variantes')
|
||||||
|
->whereIn('catalog_item_id', $catalogItemIds)
|
||||||
|
->pluck('inventory_id');
|
||||||
|
$itemInventoryIds = DB::table('catalog_items')
|
||||||
|
->whereIn('id', $catalogItemIds)
|
||||||
|
->whereNotNull('inventory_id')
|
||||||
|
->pluck('inventory_id');
|
||||||
|
$attachmentIds = DB::table('catalog_items_attachments')
|
||||||
|
->whereIn('catalog_item_id', $catalogItemIds)
|
||||||
|
->pluck('attachment_id')
|
||||||
|
->unique()
|
||||||
|
->values();
|
||||||
|
$storedPaths = DB::table('attachments')
|
||||||
|
->whereIn('id', $attachmentIds)
|
||||||
|
->where(fn ($query) => $query
|
||||||
|
->where('path', 'like', self::STORAGE_PREFIX.'%')
|
||||||
|
->orWhere('path', 'like', self::LEGACY_STORAGE_PREFIX.'%'))
|
||||||
|
->pluck('path')
|
||||||
|
->all();
|
||||||
|
|
||||||
|
DB::transaction(function () use (
|
||||||
|
$catalogItemIds,
|
||||||
|
$variantInventoryIds,
|
||||||
|
$itemInventoryIds,
|
||||||
|
$attachmentIds,
|
||||||
|
): void {
|
||||||
|
DB::table('featured_groups')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereIn('code', [
|
||||||
|
self::HIGHLIGHTED_GROUP_CODE,
|
||||||
|
...array_column(self::FEATURED_GROUPS, 'code'),
|
||||||
|
])
|
||||||
|
->delete();
|
||||||
|
DB::table('catalog_items')->whereIn('id', $catalogItemIds)->delete();
|
||||||
|
DB::table('inventories')
|
||||||
|
->whereIn('id', $variantInventoryIds->merge($itemInventoryIds)->unique())
|
||||||
|
->delete();
|
||||||
|
DB::table('attachments')->whereIn('id', $attachmentIds)->delete();
|
||||||
|
DB::table('brands')
|
||||||
|
->where('tenant_codigo', self::TENANT_CODE)
|
||||||
|
->where('descripcion', self::BRAND_MARKER)
|
||||||
|
->whereNotExists(fn ($query) => $query
|
||||||
|
->selectRaw('1')
|
||||||
|
->from('catalog_items')
|
||||||
|
->whereColumn('catalog_items.brand_id', 'brands.id'))
|
||||||
|
->delete();
|
||||||
|
});
|
||||||
|
|
||||||
|
Storage::disk('s3')->delete($storedPaths);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @return array<string, mixed> */
|
||||||
|
private function manifest(): array
|
||||||
|
{
|
||||||
|
$path = database_path(self::MANIFEST);
|
||||||
|
|
||||||
|
if (! is_file($path)) {
|
||||||
|
throw new RuntimeException("Mutual SMEP catalog manifest not found: {$path}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$manifest = json_decode(
|
||||||
|
(string) file_get_contents($path),
|
||||||
|
true,
|
||||||
|
flags: JSON_THROW_ON_ERROR,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (
|
||||||
|
($manifest['version'] ?? null) !== 1
|
||||||
|
|| ($manifest['tenant_code'] ?? null) !== self::TENANT_CODE
|
||||||
|
|| count($manifest['items'] ?? []) !== 142
|
||||||
|
|| ($manifest['image_count'] ?? null) !== 511
|
||||||
|
) {
|
||||||
|
throw new RuntimeException('Mutual SMEP catalog manifest is invalid.');
|
||||||
|
}
|
||||||
|
|
||||||
|
return $manifest;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $cache */
|
||||||
|
private function brandId(?string $name, array &$cache): ?int
|
||||||
|
{
|
||||||
|
if ($name === null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($cache[$name])) {
|
||||||
|
return $cache[$name];
|
||||||
|
}
|
||||||
|
|
||||||
|
$brandId = DB::table('brands')
|
||||||
|
->where('tenant_codigo', self::TENANT_CODE)
|
||||||
|
->where('nombre', $name)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($brandId === null) {
|
||||||
|
$brandId = DB::table('brands')->insertGetId([
|
||||||
|
'tenant_codigo' => self::TENANT_CODE,
|
||||||
|
'nombre' => $name,
|
||||||
|
'descripcion' => self::BRAND_MARKER,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $cache[$name] = (int) $brandId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $cache */
|
||||||
|
private function categoryId(string $parentName, string $name, array &$cache): int
|
||||||
|
{
|
||||||
|
$key = "{$parentName}|{$name}";
|
||||||
|
|
||||||
|
if (isset($cache[$key])) {
|
||||||
|
return $cache[$key];
|
||||||
|
}
|
||||||
|
|
||||||
|
$parentId = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('nombre', $parentName)
|
||||||
|
->whereNull('categoria_id')
|
||||||
|
->value('id');
|
||||||
|
$categoryId = $parentId === null
|
||||||
|
? null
|
||||||
|
: DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categoria_id', $parentId)
|
||||||
|
->where('nombre', $name)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($categoryId === null) {
|
||||||
|
throw new RuntimeException("Category '{$parentName} > {$name}' not found for Mutual SMEP.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return $cache[$key] = (int) $categoryId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $cache */
|
||||||
|
private function attributeId(string $code, array &$cache): int
|
||||||
|
{
|
||||||
|
if (isset($cache[$code])) {
|
||||||
|
return $cache[$code];
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributeId = DB::table('attribute')
|
||||||
|
->where('tenant_codigo', self::TENANT_CODE)
|
||||||
|
->where('codigo', $code)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($attributeId === null) {
|
||||||
|
throw new RuntimeException("Attribute '{$code}' not found for Mutual SMEP.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return $cache[$code] = (int) $attributeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createInventory(int $stock): int
|
||||||
|
{
|
||||||
|
return (int) DB::table('inventories')->insertGetId([
|
||||||
|
'sold_units' => 0,
|
||||||
|
'refunded_units' => 0,
|
||||||
|
'reserved_stock' => 0,
|
||||||
|
'real_stock' => $stock,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createFeaturedGroups(): void
|
||||||
|
{
|
||||||
|
$this->createHighlightedGroup();
|
||||||
|
|
||||||
|
foreach (self::FEATURED_GROUPS as $order => $group) {
|
||||||
|
$categoryId = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereNull('categoria_id')
|
||||||
|
->where('nombre', $group['category'])
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($categoryId === null) {
|
||||||
|
throw new RuntimeException("Parent category '{$group['category']}' not found for Mutual SMEP.");
|
||||||
|
}
|
||||||
|
|
||||||
|
$featuredGroupId = DB::table('featured_groups')->insertGetId([
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'code' => $group['code'],
|
||||||
|
'source_type' => 'manual',
|
||||||
|
'category_id' => $categoryId,
|
||||||
|
'product_layout' => 'column_with_image',
|
||||||
|
'group_layout' => 'carousel',
|
||||||
|
'group_name' => $group['category'],
|
||||||
|
'group_order' => $order + 2,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$catalogItemIds = DB::table('catalog_items')
|
||||||
|
->join('categorias', 'categorias.id', '=', 'catalog_items.category_id')
|
||||||
|
->where('catalog_items.tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categorias.tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categorias.categoria_id', $categoryId)
|
||||||
|
->orderBy('catalog_items.group_order')
|
||||||
|
->orderBy('catalog_items.id')
|
||||||
|
->limit(self::CATEGORY_FEATURED_ITEM_LIMIT)
|
||||||
|
->pluck('catalog_items.id');
|
||||||
|
|
||||||
|
foreach ($catalogItemIds as $itemOrder => $catalogItemId) {
|
||||||
|
DB::table('featured_items')->insert([
|
||||||
|
'featured_group_id' => $featuredGroupId,
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'order' => $itemOrder + 1,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function createHighlightedGroup(): void
|
||||||
|
{
|
||||||
|
$featuredGroupId = DB::table('featured_groups')->insertGetId([
|
||||||
|
'tenant_code' => self::TENANT_CODE,
|
||||||
|
'code' => self::HIGHLIGHTED_GROUP_CODE,
|
||||||
|
'source_type' => 'manual',
|
||||||
|
'category_id' => null,
|
||||||
|
'product_layout' => 'column_with_image',
|
||||||
|
'group_layout' => 'carousel',
|
||||||
|
'group_name' => 'Productos destacados',
|
||||||
|
'group_order' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$catalogItemIds = DB::table('catalog_items')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereIn('slug', self::HIGHLIGHTED_PRODUCT_SLUGS)
|
||||||
|
->pluck('id', 'slug');
|
||||||
|
|
||||||
|
foreach (self::HIGHLIGHTED_PRODUCT_SLUGS as $order => $slug) {
|
||||||
|
$catalogItemId = $catalogItemIds->get($slug);
|
||||||
|
|
||||||
|
if ($catalogItemId === null) {
|
||||||
|
throw new RuntimeException("Highlighted product '{$slug}' not found for Mutual SMEP.");
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('featured_items')->insert([
|
||||||
|
'featured_group_id' => $featuredGroupId,
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'order' => $order + 1,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param list<string> $images */
|
||||||
|
private function attachImages(int $catalogItemId, ?int $variantId, array $images): void
|
||||||
|
{
|
||||||
|
foreach ($images as $order => $relativePath) {
|
||||||
|
$sourcePath = public_path($relativePath);
|
||||||
|
|
||||||
|
if (! is_file($sourcePath)) {
|
||||||
|
throw new RuntimeException("Catalog image not found: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = file_get_contents($sourcePath);
|
||||||
|
if ($contents === false) {
|
||||||
|
throw new RuntimeException("Catalog image could not be read: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$catalogRelativePath = Str::after(
|
||||||
|
str_replace('\\', '/', $relativePath),
|
||||||
|
'images/tennants/mutual_smep/catalog/',
|
||||||
|
);
|
||||||
|
$storedPath = self::STORAGE_PREFIX.$catalogRelativePath;
|
||||||
|
|
||||||
|
if (! Storage::disk('s3')->put($storedPath, $contents)) {
|
||||||
|
throw new RuntimeException("Catalog image could not be stored: {$storedPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->storedPaths[] = $storedPath;
|
||||||
|
$attachmentId = DB::table('attachments')->insertGetId([
|
||||||
|
'key' => (string) Str::uuid(),
|
||||||
|
'path' => $storedPath,
|
||||||
|
'filename' => basename($relativePath),
|
||||||
|
'type' => 'image',
|
||||||
|
'mime_type' => 'image/webp',
|
||||||
|
'extension' => 'webp',
|
||||||
|
'size' => strlen($contents),
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
DB::table('catalog_items_attachments')->insert([
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'variant_id' => $variantId,
|
||||||
|
'attachment_id' => $attachmentId,
|
||||||
|
'orden' => $order,
|
||||||
|
'is_enabled' => true,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const EXTRA_CODE = 'carousel';
|
||||||
|
|
||||||
|
private const IMAGE_DIRECTORY = 'images/tennants/mutual_smep/carousel';
|
||||||
|
|
||||||
|
private const STORAGE_PREFIX = 'tenants/mutual_smep/extras/carousel-v1/';
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
|
private const IMAGES = [
|
||||||
|
'01-tecnologia.webp',
|
||||||
|
'02-hogar.webp',
|
||||||
|
'03-vida-activa.webp',
|
||||||
|
'04-descanso.webp',
|
||||||
|
];
|
||||||
|
|
||||||
|
/** @var list<string> */
|
||||||
|
private array $storedPaths = [];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$tenant = DB::table('tenants')
|
||||||
|
->where('codigo', self::TENANT_CODE)
|
||||||
|
->first(['codigo', 'storefront_website_type_code']);
|
||||||
|
|
||||||
|
if ($tenant === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$extraId = DB::table('storefront_website_type_extras')
|
||||||
|
->where('storefront_website_type_code', $tenant->storefront_website_type_code)
|
||||||
|
->where('codigo', self::EXTRA_CODE)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($extraId === null || DB::table('websites_extras')->where([
|
||||||
|
'website_code' => self::TENANT_CODE,
|
||||||
|
'website_type_extra_id' => $extraId,
|
||||||
|
])->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
DB::transaction(function () use ($extraId): void {
|
||||||
|
$attachmentIds = [];
|
||||||
|
|
||||||
|
foreach (self::IMAGES as $filename) {
|
||||||
|
$attachmentIds[] = $this->storeImage($filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('websites_extras')->insert([
|
||||||
|
'website_code' => self::TENANT_CODE,
|
||||||
|
'website_type_extra_id' => $extraId,
|
||||||
|
'config' => json_encode($attachmentIds, JSON_THROW_ON_ERROR),
|
||||||
|
'is_enabled' => true,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
} catch (Throwable $throwable) {
|
||||||
|
Storage::disk('s3')->delete($this->storedPaths);
|
||||||
|
|
||||||
|
throw $throwable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$attachments = DB::table('attachments')
|
||||||
|
->where('path', 'like', self::STORAGE_PREFIX.'%')
|
||||||
|
->get(['id', 'path']);
|
||||||
|
|
||||||
|
if ($attachments->isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachmentIds = $attachments->pluck('id')->map(fn ($id): int => (int) $id)->all();
|
||||||
|
$extraId = DB::table('storefront_website_type_extras')
|
||||||
|
->where('storefront_website_type_code', 'shopit')
|
||||||
|
->where('codigo', self::EXTRA_CODE)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
DB::transaction(function () use ($attachmentIds, $extraId): void {
|
||||||
|
if ($extraId !== null) {
|
||||||
|
DB::table('websites_extras')
|
||||||
|
->where('website_code', self::TENANT_CODE)
|
||||||
|
->where('website_type_extra_id', $extraId)
|
||||||
|
->where('config', json_encode($attachmentIds, JSON_THROW_ON_ERROR))
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('attachments')->whereIn('id', $attachmentIds)->delete();
|
||||||
|
});
|
||||||
|
|
||||||
|
Storage::disk('s3')->delete($attachments->pluck('path')->all());
|
||||||
|
}
|
||||||
|
|
||||||
|
private function storeImage(string $filename): int
|
||||||
|
{
|
||||||
|
$sourcePath = public_path(self::IMAGE_DIRECTORY."/{$filename}");
|
||||||
|
|
||||||
|
if (! is_file($sourcePath)) {
|
||||||
|
throw new RuntimeException("Carousel image not found: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = file_get_contents($sourcePath);
|
||||||
|
|
||||||
|
if ($contents === false) {
|
||||||
|
throw new RuntimeException("Carousel image could not be read: {$sourcePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$storedPath = self::STORAGE_PREFIX.$filename;
|
||||||
|
|
||||||
|
if (! Storage::disk('s3')->put($storedPath, $contents)) {
|
||||||
|
throw new RuntimeException("Carousel image could not be stored: {$storedPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->storedPaths[] = $storedPath;
|
||||||
|
|
||||||
|
return (int) DB::table('attachments')->insertGetId([
|
||||||
|
'key' => (string) Str::uuid(),
|
||||||
|
'path' => $storedPath,
|
||||||
|
'filename' => $filename,
|
||||||
|
'type' => 'image',
|
||||||
|
'mime_type' => 'image/webp',
|
||||||
|
'extension' => 'webp',
|
||||||
|
'size' => strlen($contents),
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const ITEM_LIMIT = 6;
|
||||||
|
|
||||||
|
/** @var array<string, string> */
|
||||||
|
private const GROUPS = [
|
||||||
|
'smep-dormitorio-y-blanco' => 'Dormitorio y Blanco',
|
||||||
|
'smep-electrodomesticos' => 'Electrodomésticos',
|
||||||
|
'smep-climatizacion' => 'Climatización',
|
||||||
|
'smep-tecnologia' => 'Tecnología',
|
||||||
|
'smep-bicicletas-y-aire-libre' => 'Bicicletas y Aire Libre',
|
||||||
|
'smep-bazar' => 'Bazar',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
foreach (array_keys(self::GROUPS) as $code) {
|
||||||
|
$groupId = DB::table('featured_groups')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('code', $code)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($groupId === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$keptItemIds = DB::table('featured_items')
|
||||||
|
->where('featured_group_id', $groupId)
|
||||||
|
->orderBy('order')
|
||||||
|
->orderBy('id')
|
||||||
|
->limit(self::ITEM_LIMIT)
|
||||||
|
->pluck('id');
|
||||||
|
|
||||||
|
DB::table('featured_items')
|
||||||
|
->where('featured_group_id', $groupId)
|
||||||
|
->when(
|
||||||
|
$keptItemIds->isNotEmpty(),
|
||||||
|
fn ($query) => $query->whereNotIn('id', $keptItemIds),
|
||||||
|
)
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
foreach (self::GROUPS as $code => $parentCategoryName) {
|
||||||
|
$groupId = DB::table('featured_groups')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->where('code', $code)
|
||||||
|
->value('id');
|
||||||
|
$parentCategoryId = DB::table('categorias')
|
||||||
|
->where('tenant_code', self::TENANT_CODE)
|
||||||
|
->whereNull('categoria_id')
|
||||||
|
->where('nombre', $parentCategoryName)
|
||||||
|
->value('id');
|
||||||
|
|
||||||
|
if ($groupId === null || $parentCategoryId === null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$catalogItemIds = DB::table('catalog_items')
|
||||||
|
->join('categorias', 'categorias.id', '=', 'catalog_items.category_id')
|
||||||
|
->where('catalog_items.tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categorias.tenant_code', self::TENANT_CODE)
|
||||||
|
->where('categorias.categoria_id', $parentCategoryId)
|
||||||
|
->orderBy('catalog_items.group_order')
|
||||||
|
->orderBy('catalog_items.id')
|
||||||
|
->pluck('catalog_items.id');
|
||||||
|
|
||||||
|
DB::table('featured_items')->where('featured_group_id', $groupId)->delete();
|
||||||
|
|
||||||
|
foreach ($catalogItemIds as $order => $catalogItemId) {
|
||||||
|
DB::table('featured_items')->insert([
|
||||||
|
'featured_group_id' => $groupId,
|
||||||
|
'catalog_item_id' => $catalogItemId,
|
||||||
|
'order' => $order + 1,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
private const TENANT_CODE = 'mutual_smep';
|
||||||
|
|
||||||
|
private const LEGACY_PREFIX = 'tenants/mutual_smep/catalog-v1/';
|
||||||
|
|
||||||
|
private const OPTIMIZED_PREFIX = 'tenants/mutual_smep/catalog-v2/';
|
||||||
|
|
||||||
|
private const LOCAL_PREFIX = 'images/tennants/mutual_smep/catalog/';
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$attachments = $this->attachments(self::LEGACY_PREFIX);
|
||||||
|
$uploadedPaths = [];
|
||||||
|
|
||||||
|
try {
|
||||||
|
foreach ($attachments as $attachment) {
|
||||||
|
$relativePath = Str::after($attachment->path, self::LEGACY_PREFIX);
|
||||||
|
$localPath = public_path(self::LOCAL_PREFIX.$relativePath);
|
||||||
|
|
||||||
|
if (! is_file($localPath)) {
|
||||||
|
throw new RuntimeException("Optimized catalog image not found: {$localPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$contents = file_get_contents($localPath);
|
||||||
|
if ($contents === false) {
|
||||||
|
throw new RuntimeException("Optimized catalog image could not be read: {$localPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$optimizedPath = self::OPTIMIZED_PREFIX.$relativePath;
|
||||||
|
if (! Storage::disk('s3')->put($optimizedPath, $contents)) {
|
||||||
|
throw new RuntimeException("Optimized catalog image could not be stored: {$optimizedPath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$uploadedPaths[] = $optimizedPath;
|
||||||
|
$attachment->optimized_path = $optimizedPath;
|
||||||
|
$attachment->optimized_size = strlen($contents);
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::transaction(function () use ($attachments): void {
|
||||||
|
foreach ($attachments as $attachment) {
|
||||||
|
DB::table('attachments')->where('id', $attachment->id)->update([
|
||||||
|
'path' => $attachment->optimized_path,
|
||||||
|
'size' => $attachment->optimized_size,
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Throwable $throwable) {
|
||||||
|
Storage::disk('s3')->delete($uploadedPaths);
|
||||||
|
|
||||||
|
throw $throwable;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$attachments = $this->attachments(self::OPTIMIZED_PREFIX)
|
||||||
|
->filter(function (object $attachment): bool {
|
||||||
|
$relativePath = Str::after($attachment->path, self::OPTIMIZED_PREFIX);
|
||||||
|
$legacyPath = self::LEGACY_PREFIX.$relativePath;
|
||||||
|
|
||||||
|
if (! Storage::disk('s3')->exists($legacyPath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$attachment->legacy_path = $legacyPath;
|
||||||
|
$attachment->legacy_size = Storage::disk('s3')->size($legacyPath);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
->values();
|
||||||
|
|
||||||
|
DB::transaction(function () use ($attachments): void {
|
||||||
|
foreach ($attachments as $attachment) {
|
||||||
|
DB::table('attachments')->where('id', $attachment->id)->update([
|
||||||
|
'path' => $attachment->legacy_path,
|
||||||
|
'size' => $attachment->legacy_size,
|
||||||
|
'updated_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Storage::disk('s3')->delete($attachments->pluck('path')->all());
|
||||||
|
}
|
||||||
|
|
||||||
|
private function attachments(string $prefix): Collection
|
||||||
|
{
|
||||||
|
return DB::table('attachments')
|
||||||
|
->join(
|
||||||
|
'catalog_items_attachments',
|
||||||
|
'catalog_items_attachments.attachment_id',
|
||||||
|
'=',
|
||||||
|
'attachments.id',
|
||||||
|
)
|
||||||
|
->join('catalog_items', 'catalog_items.id', '=', 'catalog_items_attachments.catalog_item_id')
|
||||||
|
->where('catalog_items.tenant_code', self::TENANT_CODE)
|
||||||
|
->where('attachments.path', 'like', $prefix.'%')
|
||||||
|
->select('attachments.id', 'attachments.path', 'attachments.size')
|
||||||
|
->distinct()
|
||||||
|
->orderBy('attachments.id')
|
||||||
|
->get();
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public $withinTransaction = false;
|
||||||
|
|
||||||
|
private const FORMULA = 'CAST(real_stock AS SIGNED) - CAST(sold_units AS SIGNED) - CAST(reserved_stock AS SIGNED) - CAST(entry_reserved_stock AS SIGNED) + CAST(refunded_units AS SIGNED)';
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
$conversion = 'CAST(real_stock AS SIGNED) + CAST(sold_units AS SIGNED) - CAST(refunded_units AS SIGNED)';
|
||||||
|
$this->assertNonNegative($conversion, 'la conversión produciría un stock real negativo');
|
||||||
|
$this->assertNonNegative(
|
||||||
|
"({$conversion}) - CAST(sold_units AS SIGNED) - CAST(reserved_stock AS SIGNED) - CAST(entry_reserved_stock AS SIGNED) + CAST(refunded_units AS SIGNED)",
|
||||||
|
'el stock disponible actual es negativo',
|
||||||
|
);
|
||||||
|
|
||||||
|
if (DB::getDriverName() === 'sqlite') {
|
||||||
|
Schema::table('inventories', function (Blueprint $table): void {
|
||||||
|
$table->bigInteger('available_stock')->virtualAs(self::FORMULA);
|
||||||
|
});
|
||||||
|
DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]);
|
||||||
|
} else {
|
||||||
|
Schema::table('inventories', function (Blueprint $table): void {
|
||||||
|
$table->unsignedBigInteger('real_stock')->default(0)->change();
|
||||||
|
$table->bigInteger('available_stock')->storedAs(self::FORMULA);
|
||||||
|
});
|
||||||
|
DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
$conversion = 'CAST(real_stock AS SIGNED) - CAST(sold_units AS SIGNED) + CAST(refunded_units AS SIGNED)';
|
||||||
|
$this->assertNonNegative($conversion, 'el rollback produciría un stock real negativo');
|
||||||
|
|
||||||
|
if (DB::getDriverName() === 'sqlite') {
|
||||||
|
DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]);
|
||||||
|
Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock'));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('inventories')->update(['real_stock' => DB::raw($conversion)]);
|
||||||
|
Schema::table('inventories', fn (Blueprint $table) => $table->dropColumn('available_stock'));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertNonNegative(string $expression, string $reason): void
|
||||||
|
{
|
||||||
|
$invalidInventories = DB::table('inventories')
|
||||||
|
->select([
|
||||||
|
'id',
|
||||||
|
'real_stock',
|
||||||
|
'sold_units',
|
||||||
|
'refunded_units',
|
||||||
|
'reserved_stock',
|
||||||
|
'entry_reserved_stock',
|
||||||
|
])
|
||||||
|
->selectRaw("({$expression}) as calculated_stock")
|
||||||
|
->whereRaw("({$expression}) < 0")
|
||||||
|
->orderBy('id')
|
||||||
|
->limit(20)
|
||||||
|
->get();
|
||||||
|
|
||||||
|
if ($invalidInventories->isNotEmpty()) {
|
||||||
|
$details = $invalidInventories
|
||||||
|
->map(static fn (object $inventory): string => sprintf(
|
||||||
|
'id=%d [real=%d, vendidas=%d, reintegradas=%d, reservadas=%d, reservas_entradas=%d, resultado=%d]',
|
||||||
|
$inventory->id,
|
||||||
|
$inventory->real_stock,
|
||||||
|
$inventory->sold_units,
|
||||||
|
$inventory->refunded_units,
|
||||||
|
$inventory->reserved_stock,
|
||||||
|
$inventory->entry_reserved_stock,
|
||||||
|
$inventory->calculated_stock,
|
||||||
|
))
|
||||||
|
->implode('; ');
|
||||||
|
|
||||||
|
throw new RuntimeException(
|
||||||
|
"Hay inventarios inconsistentes: {$reason}. Inventarios detectados (máximo 20): {$details}."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::create('inventory_movements', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->foreignId('inventory_id')->constrained('inventories')->restrictOnDelete();
|
||||||
|
$table->string('operation', 40);
|
||||||
|
$table->bigInteger('available_stock_delta');
|
||||||
|
$table->bigInteger('available_stock_before');
|
||||||
|
$table->bigInteger('available_stock_after');
|
||||||
|
$table->json('counter_deltas');
|
||||||
|
$table->foreignId('responsible_user_id')->nullable()->constrained('users')->restrictOnDelete();
|
||||||
|
$table->uuid('idempotency_key')->nullable();
|
||||||
|
$table->timestamps();
|
||||||
|
|
||||||
|
$table->unique(['inventory_id', 'idempotency_key']);
|
||||||
|
$table->index(['inventory_id', 'created_at']);
|
||||||
|
$table->index(['operation', 'created_at']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::dropIfExists('inventory_movements');
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('client_id')
|
||||||
|
->nullable()
|
||||||
|
->after('id')
|
||||||
|
->constrained('clients')
|
||||||
|
->restrictOnDelete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('events', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('client_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||||
|
use App\Domains\Core\Tenant\Services\AdminWebsiteTypeService;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Http\UploadedFile;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (app()->environment('testing')) {
|
||||||
|
Storage::fake('s3');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! AdminWebsiteType::query()->where('codigo', 'shopit')->exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
app(AdminWebsiteTypeService::class)->updateOrCreate(
|
||||||
|
['codigo' => 'shopit'],
|
||||||
|
[
|
||||||
|
'primary_color' => '#2FD3AC',
|
||||||
|
'site_logo' => $this->uploadedImage('shopit_logo.png', 'image/png'),
|
||||||
|
'footer_logo' => $this->uploadedImage('shopit_footer_logo.png', 'image/png'),
|
||||||
|
'favicon' => $this->uploadedImage('shopit-favicon.svg', 'image/svg+xml'),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// Brand assets are operational data and are intentionally preserved.
|
||||||
|
}
|
||||||
|
|
||||||
|
private function uploadedImage(string $filename, string $mimeType): UploadedFile
|
||||||
|
{
|
||||||
|
$path = public_path("images/website_types/shopit/{$filename}");
|
||||||
|
|
||||||
|
if (! is_file($path)) {
|
||||||
|
throw new RuntimeException("ShopIt image not found at path: {$path}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return new UploadedFile($path, $filename, $mimeType, null, true);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('compras', function (Blueprint $table): void {
|
||||||
|
$table->foreignId('event_id')
|
||||||
|
->nullable()
|
||||||
|
->after('tenant_codigo')
|
||||||
|
->constrained('events')
|
||||||
|
->nullOnDelete();
|
||||||
|
});
|
||||||
|
|
||||||
|
DB::table('compras')
|
||||||
|
->orderBy('id')
|
||||||
|
->each(function (object $purchase): void {
|
||||||
|
$eventIds = DB::table('compra_items')
|
||||||
|
->join('catalog_items', 'catalog_items.id', '=', 'compra_items.source_catalog_item_id')
|
||||||
|
->where('compra_items.compra_id', $purchase->id)
|
||||||
|
->whereNotNull('catalog_items.event_id')
|
||||||
|
->distinct()
|
||||||
|
->pluck('catalog_items.event_id');
|
||||||
|
|
||||||
|
if ($eventIds->count() === 1) {
|
||||||
|
DB::table('compras')
|
||||||
|
->where('id', $purchase->id)
|
||||||
|
->update(['event_id' => $eventIds->first()]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('compras', function (Blueprint $table): void {
|
||||||
|
$table->dropConstrainedForeignId('event_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user