Compare commits
8 Commits
homo
...
feature/sh
| Author | SHA1 | Date | |
|---|---|---|---|
| a4bd9263a2 | |||
| 85cd1ad04f | |||
| 370834856b | |||
| ad054127aa | |||
| a05d15d17f | |||
| 717f02ce16 | |||
| 863e911120 | |||
| 6c56b338c1 |
@@ -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(
|
||||||
|
InventoryMovementOperation::EntryStockReserved,
|
||||||
|
['entry_reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
throw new \InvalidArgumentException('No hay stock disponible para la reserva de entradas.');
|
||||||
}
|
}
|
||||||
$this->entry_reserved_stock += $amount;
|
},
|
||||||
$this->save();
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function releaseEntry(int $amount): void
|
public function releaseEntry(int $amount): void
|
||||||
{
|
{
|
||||||
if ($amount < 1 || $this->entry_reserved_stock < $amount) {
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::EntryStockReleased,
|
||||||
|
['entry_reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
|
if ($amount < 1 || $inventory->entry_reserved_stock < $amount) {
|
||||||
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
throw new \InvalidArgumentException('La cantidad de entradas reservadas no es válida.');
|
||||||
}
|
}
|
||||||
|
},
|
||||||
$this->entry_reserved_stock -= $amount;
|
);
|
||||||
$this->save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reserve(int $amount, bool $tracksInventory): void
|
public function reserve(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::StockReserved,
|
||||||
|
['reserved_stock' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
if ($amount < 0) {
|
if ($amount < 0) {
|
||||||
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
throw new \InvalidArgumentException('La cantidad a reservar debe ser positiva.');
|
||||||
}
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < $amount) {
|
||||||
if ($tracksInventory && $this->availableStock() < $amount) {
|
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
throw new \InvalidArgumentException('No hay suficiente stock disponible para reservar.');
|
||||||
}
|
}
|
||||||
|
},
|
||||||
$this->reserved_stock += $amount;
|
);
|
||||||
$this->save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function release(int $amount): void
|
public function release(int $amount): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::StockReleased,
|
||||||
|
['reserved_stock' => -$amount],
|
||||||
|
function (self $inventory) use ($amount): void {
|
||||||
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
throw new \InvalidArgumentException('La cantidad reservada no es válida.');
|
||||||
}
|
}
|
||||||
|
},
|
||||||
$this->reserved_stock -= $amount;
|
);
|
||||||
$this->save();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function buy(int $amount, bool $tracksInventory): void
|
public function buy(int $amount, bool $tracksInventory): void
|
||||||
{
|
{
|
||||||
if ($amount < 0 || $this->reserved_stock < $amount) {
|
$counterDeltas = ['reserved_stock' => -$amount, 'sold_units' => $amount];
|
||||||
|
if (! array_key_exists('available_stock', $this->attributes) && $tracksInventory) {
|
||||||
|
$counterDeltas['real_stock'] = -$amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 0 || $inventory->reserved_stock < $amount) {
|
||||||
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
throw new \InvalidArgumentException('La cantidad reservada no alcanza para confirmar la compra.');
|
||||||
}
|
}
|
||||||
|
if ($tracksInventory && $inventory->availableStock() < 0) {
|
||||||
if ($tracksInventory && $this->real_stock - $this->entry_reserved_stock < $amount) {
|
|
||||||
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
throw new \InvalidArgumentException('No hay suficiente stock real para confirmar la compra.');
|
||||||
}
|
}
|
||||||
|
},
|
||||||
if ($tracksInventory) {
|
);
|
||||||
$this->real_stock -= $amount;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->reserved_stock -= $amount;
|
public function adjustAvailableStock(
|
||||||
$this->sold_units += $amount;
|
int $delta,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
if ($delta === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$operation = $delta > 0
|
||||||
|
? InventoryMovementOperation::StockIncreased
|
||||||
|
: InventoryMovementOperation::StockDecreased;
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
$operation,
|
||||||
|
['real_stock' => $delta],
|
||||||
|
function (self $inventory) use ($delta): void {
|
||||||
|
if ($inventory->real_stock + $delta < 0 || $inventory->availableStock() + $delta < 0) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_difference' => ['El ajuste dejaría el stock en un valor inválido.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
$idempotencyKey,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function refundStock(int $amount, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = ['refunded_units' => $amount];
|
||||||
|
if (! array_key_exists('available_stock', $this->attributes)) {
|
||||||
|
$counterDeltas['real_stock'] = $amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::StockRefunded,
|
||||||
|
$counterDeltas,
|
||||||
|
function () use ($amount): void {
|
||||||
|
if ($amount < 1) {
|
||||||
|
throw new \InvalidArgumentException('La cantidad devuelta debe ser positiva.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function commitDirectSale(int $amount, bool $tracksInventory = true): void
|
||||||
|
{
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::PurchaseCommitted,
|
||||||
|
['sold_units' => $amount],
|
||||||
|
function (self $inventory) use ($amount, $tracksInventory): void {
|
||||||
|
if ($amount < 1 || ($tracksInventory && $inventory->availableStock() < $amount)) {
|
||||||
|
throw new \InvalidArgumentException('No hay suficiente stock para confirmar la compra.');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::StockInitialized, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function recordTransferInitialization(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->recordCurrentState(InventoryMovementOperation::InventoryTransferred, $responsibleUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param array<string, int> $counterDeltas */
|
||||||
|
public function transferCounters(array $counterDeltas, ?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryTransferred,
|
||||||
|
$counterDeltas,
|
||||||
|
function (self $inventory) use ($counterDeltas): void {
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
if ((int) $inventory->getAttribute($counter) + $delta < 0) {
|
||||||
|
throw new \LogicException("El traslado dejaría {$counter} en un valor negativo.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function recordCurrentState(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
?User $responsibleUser,
|
||||||
|
): void {
|
||||||
|
if (! Schema::hasTable('inventory_movements')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'real_stock' => $this->real_stock,
|
||||||
|
'sold_units' => $this->sold_units,
|
||||||
|
'reserved_stock' => $this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => $this->entry_reserved_stock,
|
||||||
|
'refunded_units' => $this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $this->availableStock(),
|
||||||
|
'available_stock_before' => 0,
|
||||||
|
'available_stock_after' => $this->availableStock(),
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function resetTransactionCounters(?User $responsibleUser = null): void
|
||||||
|
{
|
||||||
|
$this->refresh();
|
||||||
|
$counterDeltas = array_filter([
|
||||||
|
'sold_units' => -$this->sold_units,
|
||||||
|
'reserved_stock' => -$this->reserved_stock,
|
||||||
|
'entry_reserved_stock' => -$this->entry_reserved_stock,
|
||||||
|
'refunded_units' => -$this->refunded_units,
|
||||||
|
], fn (int $delta): bool => $delta !== 0);
|
||||||
|
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->mutate(
|
||||||
|
InventoryMovementOperation::InventoryReset,
|
||||||
|
$counterDeltas,
|
||||||
|
static function (): void {},
|
||||||
|
$responsibleUser,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, int> $counterDeltas
|
||||||
|
* @param callable(self): void $validate
|
||||||
|
*/
|
||||||
|
private function mutate(
|
||||||
|
InventoryMovementOperation $operation,
|
||||||
|
array $counterDeltas,
|
||||||
|
callable $validate,
|
||||||
|
?User $responsibleUser = null,
|
||||||
|
?string $idempotencyKey = null,
|
||||||
|
): void {
|
||||||
|
DB::transaction(function () use ($operation, $counterDeltas, $validate, $responsibleUser, $idempotencyKey): void {
|
||||||
|
/** @var self $inventory */
|
||||||
|
$inventory = self::query()->lockForUpdate()->findOrFail($this->getKey());
|
||||||
|
$this->setRawAttributes($inventory->getAttributes(), true);
|
||||||
|
|
||||||
|
$recordsMovements = Schema::hasTable('inventory_movements');
|
||||||
|
if ($recordsMovements && $idempotencyKey !== null) {
|
||||||
|
$existing = $this->movements()
|
||||||
|
->where('idempotency_key', $idempotencyKey)
|
||||||
|
->first();
|
||||||
|
if ($existing !== null) {
|
||||||
|
if ($existing->counter_deltas !== $counterDeltas) {
|
||||||
|
throw ValidationException::withMessages([
|
||||||
|
'stock_adjustment_id' => ['La operación ya fue utilizada con otro ajuste.'],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$validate($this);
|
||||||
|
$counterDeltas = array_filter($counterDeltas, fn (int $delta): bool => $delta !== 0);
|
||||||
|
if ($counterDeltas === []) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$availableBefore = $this->availableStock();
|
||||||
|
foreach ($counterDeltas as $counter => $delta) {
|
||||||
|
$this->setAttribute($counter, (int) $this->getAttribute($counter) + $delta);
|
||||||
|
}
|
||||||
$this->save();
|
$this->save();
|
||||||
|
$this->refresh();
|
||||||
|
|
||||||
|
$availableAfter = $this->availableStock();
|
||||||
|
if ($recordsMovements) {
|
||||||
|
$this->movements()->create([
|
||||||
|
'operation' => $operation,
|
||||||
|
'available_stock_delta' => $availableAfter - $availableBefore,
|
||||||
|
'available_stock_before' => $availableBefore,
|
||||||
|
'available_stock_after' => $availableAfter,
|
||||||
|
'counter_deltas' => $counterDeltas,
|
||||||
|
'responsible_user_id' => $responsibleUser?->getKey() ?? Auth::id(),
|
||||||
|
'idempotency_key' => $idempotencyKey,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
app/Domains/Commerce/Catalog/Models/InventoryMovement.php
Normal file
@@ -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.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,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,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;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -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.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (property_exists($inventory, 'available_stock')) {
|
||||||
|
Inventory::query()->findOrFail($inventory->id)->commitDirectSale(1);
|
||||||
|
} else {
|
||||||
|
// This provisioner is also used by historical migrations that run
|
||||||
|
// before generated availability and the movement ledger exist.
|
||||||
DB::table('inventories')->where('id', $inventory->id)->update([
|
DB::table('inventories')->where('id', $inventory->id)->update([
|
||||||
'real_stock' => $inventory->real_stock - 1,
|
'real_stock' => $inventory->real_stock - 1,
|
||||||
'sold_units' => $inventory->sold_units + 1,
|
'sold_units' => $inventory->sold_units + 1,
|
||||||
]);
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
$reservationId = DB::table('compras')->where('id', $purchaseId)->value('stock_reservation_id');
|
||||||
if ($reservationId === null) {
|
if ($reservationId === null) {
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -228,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) {
|
||||||
@@ -272,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
|
||||||
|
|||||||
@@ -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,
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -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,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,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);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -40,7 +40,7 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
|
|
||||||
public function run(): void
|
public function run(): void
|
||||||
{
|
{
|
||||||
$shopIt = $this->websiteTypeService->updateOrCreate(
|
$this->websiteTypeService->updateOrCreate(
|
||||||
['codigo' => 'shopit'],
|
['codigo' => 'shopit'],
|
||||||
[
|
[
|
||||||
'nombre' => 'ShopIt',
|
'nombre' => 'ShopIt',
|
||||||
@@ -48,9 +48,10 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
'scanner_domain' => 'scanner.localhost',
|
'scanner_domain' => 'scanner.localhost',
|
||||||
'site_title' => 'ShopIt',
|
'site_title' => 'ShopIt',
|
||||||
...self::PRESENTATION,
|
...self::PRESENTATION,
|
||||||
'site_logo' => $this->onTicketLogo(),
|
'primary_color' => '#2FD3AC',
|
||||||
'footer_logo' => $this->onTicketFooterLogo(),
|
'site_logo' => $this->shopItLogo(),
|
||||||
'favicon' => $this->onTicketFavicon(),
|
'footer_logo' => $this->shopItFooterLogo(),
|
||||||
|
'favicon' => $this->shopItFavicon(),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -83,7 +84,7 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
...self::PRESENTATION,
|
...self::PRESENTATION,
|
||||||
'site_logo' => $this->onTicketLogo(),
|
'site_logo' => $this->onTicketLogo(),
|
||||||
'footer_logo' => $this->onTicketFooterLogo(),
|
'footer_logo' => $this->onTicketFooterLogo(),
|
||||||
'favicon' => $shopIt->favicon()->firstOrFail()->key,
|
'favicon' => $this->onTicketFavicon(),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -204,7 +205,7 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
|
|
||||||
private function onTicketLogo(): UploadedFile
|
private function onTicketLogo(): UploadedFile
|
||||||
{
|
{
|
||||||
$path = public_path('images/website_types/onticket_logo.png');
|
$path = public_path('images/website_types/onticket/onticket_logo.png');
|
||||||
|
|
||||||
if (! file_exists($path)) {
|
if (! file_exists($path)) {
|
||||||
throw new RuntimeException("OnTicket logo not found at path: {$path}");
|
throw new RuntimeException("OnTicket logo not found at path: {$path}");
|
||||||
@@ -221,7 +222,7 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
|
|
||||||
private function onTicketFooterLogo(): UploadedFile
|
private function onTicketFooterLogo(): UploadedFile
|
||||||
{
|
{
|
||||||
$path = public_path('images/website_types/onticket_footer_logo.png');
|
$path = public_path('images/website_types/onticket/onticket_footer_logo.png');
|
||||||
|
|
||||||
if (! file_exists($path)) {
|
if (! file_exists($path)) {
|
||||||
throw new RuntimeException("OnTicket footer logo not found at path: {$path}");
|
throw new RuntimeException("OnTicket footer logo not found at path: {$path}");
|
||||||
@@ -238,7 +239,7 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
|
|
||||||
private function onTicketFavicon(): UploadedFile
|
private function onTicketFavicon(): UploadedFile
|
||||||
{
|
{
|
||||||
$path = public_path('images/website_types/onticket_favicon.svg');
|
$path = public_path('images/website_types/onticket/onticket_favicon.svg');
|
||||||
|
|
||||||
if (! file_exists($path)) {
|
if (! file_exists($path)) {
|
||||||
throw new RuntimeException("OnTicket favicon not found at path: {$path}");
|
throw new RuntimeException("OnTicket favicon not found at path: {$path}");
|
||||||
@@ -252,4 +253,30 @@ class WebsiteTypeSeeder extends Seeder
|
|||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function shopItLogo(): UploadedFile
|
||||||
|
{
|
||||||
|
return $this->uploadedImage('shopit', 'shopit_logo.png', 'image/png');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function shopItFooterLogo(): UploadedFile
|
||||||
|
{
|
||||||
|
return $this->uploadedImage('shopit', 'shopit_footer_logo.png', 'image/png');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function shopItFavicon(): UploadedFile
|
||||||
|
{
|
||||||
|
return $this->uploadedImage('shopit', 'shopit-favicon.svg', 'image/svg+xml');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function uploadedImage(string $websiteType, string $filename, string $mimeType): UploadedFile
|
||||||
|
{
|
||||||
|
$path = public_path("images/website_types/{$websiteType}/{$filename}");
|
||||||
|
|
||||||
|
if (! file_exists($path)) {
|
||||||
|
throw new RuntimeException("Website type image not found at path: {$path}");
|
||||||
|
}
|
||||||
|
|
||||||
|
return new UploadedFile($path, $filename, $mimeType, null, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 422 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
10
public/images/website_types/shopit/shopit-favicon.svg
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<svg width="41" height="41" viewBox="0 0 41 41" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:se="http://svg-edit.googlecode.com" se:swatches="W3siaWQiOiJCMDBEREFFMy0zMjUwLTRERDgtOEU0RS0zMDYxREJGNUE3QTMiLCJuYW1lIjoiIzVCNUI1QiIsImhleCI6IiM1QjVCNUIifSx7ImlkIjoiRjI4QjU4NTYtNUM2OC00QkY4LTk3MDMtOTk5NDJCOTgzNTVBIiwibmFtZSI6IiMyRkQzQUMiLCJoZXgiOiIjMkZEM0FDIn1d">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<g><se:title>Layer 1</se:title><path d="m16.32,27.13c2.29,0 3.13,-0.37 3.73,-0.76c0.65,-0.42 1.17,-1.06 1.24,-1.97c0.06,-0.76 -0.29,-1.4 -0.81,-1.78c-0.7,-0.5 -2.05,-0.81 -3.21,-1.05c-1.13,-0.24 -2.14,-0.6 -3.03,-1.22c-1.06,-0.73 -1.61,-1.47 -1.96,-2.52c-0.45,-1.32 -0.36,-3.12 -0.11,-4.02c0.43,-1.54 1.35,-2.86 2.59,-3.84001c1.6,-1.26 3.58,-2.01999 6.46,-2.17999c0.3,-0.02 0.71,-0.04 1.21,-0.04c0,0 0.16,0 0.21,0h13.3c-3.68,-4.71 -9.41,-7.75 -15.85,-7.75c-11.1,0 -20.09,9 -20.09,20.09c0,2.47 0.45,4.84 1.27,7.03h15.06l-0.01,0.01z" fill="#2FD3AC" id="svg_7"/><path d="m23.11,12.59c-0.65,0 -1.64,0.03 -1.95,0.07c-1.3,0.17 -2.25,0.55 -2.82,1.31c-0.3199,0.43 -0.48,0.99 -0.29,1.66c0.31,1.07 2.1501,1.44 3.4001,1.7c1.49,0.31 2.5599,0.57 3.5899,1.08c1.06,0.53 2.03,1.41 2.51,2.43c0.46,0.98 0.6001,1.96 0.5201,3.08c-0.11,1.56 -0.4701,2.72 -0.9901,3.69c-0.49,0.91 -1.32,1.87 -2.03,2.44c-0.74,0.59 -1.81,1.38 -3.15,1.83c-1.35,0.45 -3.1399,0.63 -5.2999,0.63h-12.30005c3.68,4.68 9.39005,7.68 15.80005,7.68c11.1,0 20.0899,-9 20.0899,-20.09c0,-2.65 -0.5199,-5.18 -1.4499,-7.5h-15.6201l-0.01,-0.01z" fill="#5B5B5B" id="svg_8"/></g></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
BIN
public/images/website_types/shopit/shopit_footer_logo.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
public/images/website_types/shopit/shopit_logo.png
Normal file
|
After Width: | Height: | Size: 2.8 KiB |
@@ -97,6 +97,8 @@ class AccommodationControllerTest extends TestCase
|
|||||||
|
|
||||||
$updated = $this->variantPayload('Casa Rodante Premium', 'Con electricidad', 15, 50000);
|
$updated = $this->variantPayload('Casa Rodante Premium', 'Con electricidad', 15, 50000);
|
||||||
$updated['id'] = $variantId;
|
$updated['id'] = $variantId;
|
||||||
|
unset($updated['stock']);
|
||||||
|
$updated['stock_difference'] = -5;
|
||||||
|
|
||||||
$this->postJson('/api/v1/adminapp/tenant/accommodations', [
|
$this->postJson('/api/v1/adminapp/tenant/accommodations', [
|
||||||
'variants' => [
|
'variants' => [
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ class EntryControllerTest extends TestCase
|
|||||||
'title' => 'Abono actualizado',
|
'title' => 'Abono actualizado',
|
||||||
'description' => 'Ahora incluye ambas fechas',
|
'description' => 'Ahora incluye ambas fechas',
|
||||||
'event_date_ids' => [$firstDate->id, $secondDate->id],
|
'event_date_ids' => [$firstDate->id, $secondDate->id],
|
||||||
'stock' => 20,
|
'stock_difference' => 10,
|
||||||
'price' => 250,
|
'price' => 250,
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
@@ -268,7 +268,7 @@ class EntryControllerTest extends TestCase
|
|||||||
'id' => $entryId,
|
'id' => $entryId,
|
||||||
'title' => 'Abono editado',
|
'title' => 'Abono editado',
|
||||||
'event_date_ids' => [$date->id, $otherDate->id],
|
'event_date_ids' => [$date->id, $otherDate->id],
|
||||||
'stock' => 30,
|
'stock_difference' => 10,
|
||||||
'price' => 200,
|
'price' => 200,
|
||||||
]],
|
]],
|
||||||
])->assertOk()
|
])->assertOk()
|
||||||
@@ -329,7 +329,7 @@ class EntryControllerTest extends TestCase
|
|||||||
'title' => 'Entrada inválida',
|
'title' => 'Entrada inválida',
|
||||||
'description' => null,
|
'description' => null,
|
||||||
'event_date_ids' => [$foreignDate->id],
|
'event_date_ids' => [$foreignDate->id],
|
||||||
'stock' => 10,
|
'stock_difference' => 0,
|
||||||
'price' => 100,
|
'price' => 100,
|
||||||
]],
|
]],
|
||||||
])
|
])
|
||||||
@@ -371,7 +371,7 @@ class EntryControllerTest extends TestCase
|
|||||||
'title' => 'Entrada inválida',
|
'title' => 'Entrada inválida',
|
||||||
'description' => null,
|
'description' => null,
|
||||||
'event_date_ids' => [$eventDate->id],
|
'event_date_ids' => [$eventDate->id],
|
||||||
'stock' => 10,
|
'stock_difference' => 0,
|
||||||
'price' => 100,
|
'price' => 100,
|
||||||
]],
|
]],
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -124,6 +124,8 @@ class FoodControllerTest extends TestCase
|
|||||||
|
|
||||||
$updated = $this->variantPayload($secondDate->id, 'Cena', 'Vianda', 80, 8500);
|
$updated = $this->variantPayload($secondDate->id, 'Cena', 'Vianda', 80, 8500);
|
||||||
$updated['id'] = $variantId;
|
$updated['id'] = $variantId;
|
||||||
|
unset($updated['stock']);
|
||||||
|
$updated['stock_difference'] = -20;
|
||||||
$updated['description'] = 'Cena para llevar';
|
$updated['description'] = 'Cena para llevar';
|
||||||
|
|
||||||
$this->postJson('/api/v1/adminapp/tenant/foods', [
|
$this->postJson('/api/v1/adminapp/tenant/foods', [
|
||||||
@@ -240,7 +242,7 @@ class FoodControllerTest extends TestCase
|
|||||||
Inventory::query()->whereKey($replacementInventoryId)->delete();
|
Inventory::query()->whereKey($replacementInventoryId)->delete();
|
||||||
|
|
||||||
$updated = $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [
|
$updated = $this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [
|
||||||
'variants' => [['id' => $historicalVariantId, 'stock' => 45]],
|
'variants' => [['id' => $historicalVariantId, 'stock_difference' => -55]],
|
||||||
])
|
])
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonPath('data.history.0.variants.0.id', $historicalVariantId)
|
->assertJsonPath('data.history.0.variants.0.id', $historicalVariantId)
|
||||||
@@ -258,7 +260,7 @@ class FoodControllerTest extends TestCase
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
$this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [
|
$this->patchJson('/api/v1/adminapp/tenant/foods/history-stock', [
|
||||||
'variants' => [['id' => $activeVariantId, 'stock' => 20]],
|
'variants' => [['id' => $activeVariantId, 'stock_difference' => -60]],
|
||||||
])
|
])
|
||||||
->assertUnprocessable()
|
->assertUnprocessable()
|
||||||
->assertJsonValidationErrors(['variants.0.id']);
|
->assertJsonValidationErrors(['variants.0.id']);
|
||||||
|
|||||||
@@ -112,6 +112,8 @@ class MerchandiseControllerTest extends TestCase
|
|||||||
|
|
||||||
$updatedVariant = $this->variantPayload('Blanco', 'M', 80, 12500);
|
$updatedVariant = $this->variantPayload('Blanco', 'M', 80, 12500);
|
||||||
$updatedVariant['id'] = $variantId;
|
$updatedVariant['id'] = $variantId;
|
||||||
|
unset($updatedVariant['stock']);
|
||||||
|
$updatedVariant['stock_difference'] = -20;
|
||||||
$updatedItem = $this->itemPayload('Camiseta oficial', 2, [
|
$updatedItem = $this->itemPayload('Camiseta oficial', 2, [
|
||||||
$updatedVariant,
|
$updatedVariant,
|
||||||
$this->variantPayload('Verde', 'L', 60, 15000),
|
$this->variantPayload('Verde', 'L', 60, 15000),
|
||||||
@@ -234,6 +236,8 @@ class MerchandiseControllerTest extends TestCase
|
|||||||
$secondItemVariantId = $created->json('data.1.variants.0.id');
|
$secondItemVariantId = $created->json('data.1.variants.0.id');
|
||||||
$foreignVariant = $this->variantPayload('Azul Marino', 'XL', 20, 30000);
|
$foreignVariant = $this->variantPayload('Azul Marino', 'XL', 20, 30000);
|
||||||
$foreignVariant['id'] = $secondItemVariantId;
|
$foreignVariant['id'] = $secondItemVariantId;
|
||||||
|
unset($foreignVariant['stock']);
|
||||||
|
$foreignVariant['stock_difference'] = 0;
|
||||||
$firstItem = $this->itemPayload('Camiseta', 3, [$foreignVariant]);
|
$firstItem = $this->itemPayload('Camiseta', 3, [$foreignVariant]);
|
||||||
$firstItem['id'] = $firstItemId;
|
$firstItem['id'] = $firstItemId;
|
||||||
|
|
||||||
|
|||||||
139
tests/Feature/Migrations/InventoryStockMovementMigrationTest.php
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature\Migrations;
|
||||||
|
|
||||||
|
use App\Domains\Commerce\Catalog\Enums\InventoryMovementOperation;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||||
|
use App\Domains\Commerce\Catalog\Models\InventoryMovement;
|
||||||
|
use App\Domains\Core\Auth\Models\User;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
class InventoryStockMovementMigrationTest extends TestCase
|
||||||
|
{
|
||||||
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
Schema::create('users', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->softDeletes();
|
||||||
|
});
|
||||||
|
Schema::create('inventories', function (Blueprint $table): void {
|
||||||
|
$table->id();
|
||||||
|
$table->unsignedBigInteger('sold_units')->default(0);
|
||||||
|
$table->unsignedInteger('reserved_stock')->default(0);
|
||||||
|
$table->unsignedInteger('real_stock')->default(0);
|
||||||
|
$table->unsignedBigInteger('refunded_units')->default(0);
|
||||||
|
$table->unsignedInteger('entry_reserved_stock')->default(0);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function tearDown(): void
|
||||||
|
{
|
||||||
|
Schema::disableForeignKeyConstraints();
|
||||||
|
Schema::dropIfExists('inventory_movements');
|
||||||
|
Schema::dropIfExists('inventories');
|
||||||
|
Schema::dropIfExists('users');
|
||||||
|
Schema::enableForeignKeyConstraints();
|
||||||
|
|
||||||
|
parent::tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_migration_and_rollback_preserve_the_available_balance(): void
|
||||||
|
{
|
||||||
|
DB::table('inventories')->insert([
|
||||||
|
'id' => 17,
|
||||||
|
'real_stock' => 10,
|
||||||
|
'sold_units' => 3,
|
||||||
|
'refunded_units' => 1,
|
||||||
|
'reserved_stock' => 2,
|
||||||
|
'entry_reserved_stock' => 1,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$stockMigration = $this->stockMigration();
|
||||||
|
$movementMigration = $this->movementMigration();
|
||||||
|
$stockMigration->up();
|
||||||
|
$movementMigration->up();
|
||||||
|
|
||||||
|
$inventory = Inventory::findOrFail(17);
|
||||||
|
$this->assertSame(12, $inventory->real_stock);
|
||||||
|
$this->assertSame(7, $inventory->availableStock());
|
||||||
|
$this->assertTrue(Schema::hasTable('inventory_movements'));
|
||||||
|
|
||||||
|
$inventory->adjustAvailableStock(2);
|
||||||
|
$this->assertSame(9, $inventory->availableStock());
|
||||||
|
|
||||||
|
$movementMigration->down();
|
||||||
|
$stockMigration->down();
|
||||||
|
|
||||||
|
$this->assertFalse(Schema::hasColumn('inventories', 'available_stock'));
|
||||||
|
$this->assertFalse(Schema::hasTable('inventory_movements'));
|
||||||
|
$this->assertSame(12, Inventory::findOrFail(17)->real_stock);
|
||||||
|
$this->assertSame(9, Inventory::findOrFail(17)->availableStock());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_movements_capture_counters_actor_and_idempotency(): void
|
||||||
|
{
|
||||||
|
$this->stockMigration()->up();
|
||||||
|
$this->movementMigration()->up();
|
||||||
|
DB::table('users')->insert(['id' => 5]);
|
||||||
|
$user = User::query()->findOrFail(5);
|
||||||
|
|
||||||
|
$inventory = Inventory::query()->create(['real_stock' => 10]);
|
||||||
|
$inventory->recordInitialization($user);
|
||||||
|
$inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4');
|
||||||
|
$inventory->adjustAvailableStock(3, $user, '955d2afb-1e36-46df-a9db-d9ee31ed5eb4');
|
||||||
|
$inventory->reserve(2, true);
|
||||||
|
$inventory->buy(2, true);
|
||||||
|
$inventory->refundStock(1, $user);
|
||||||
|
|
||||||
|
$this->assertSame(12, $inventory->availableStock());
|
||||||
|
$this->assertCount(5, $inventory->movements()->get());
|
||||||
|
|
||||||
|
$adjustment = InventoryMovement::query()
|
||||||
|
->where('operation', InventoryMovementOperation::StockIncreased->value)
|
||||||
|
->firstOrFail();
|
||||||
|
$this->assertSame(3, $adjustment->available_stock_delta);
|
||||||
|
$this->assertSame(10, $adjustment->available_stock_before);
|
||||||
|
$this->assertSame(13, $adjustment->available_stock_after);
|
||||||
|
$this->assertSame(['real_stock' => 3], $adjustment->counter_deltas);
|
||||||
|
$this->assertSame(5, $adjustment->responsible_user_id);
|
||||||
|
|
||||||
|
$purchase = InventoryMovement::query()
|
||||||
|
->where('operation', InventoryMovementOperation::PurchaseCommitted->value)
|
||||||
|
->firstOrFail();
|
||||||
|
$this->assertSame(0, $purchase->available_stock_delta);
|
||||||
|
$this->assertSame(['reserved_stock' => -2, 'sold_units' => 2], $purchase->counter_deltas);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_migration_rejects_an_inventory_with_negative_available_stock(): void
|
||||||
|
{
|
||||||
|
DB::table('inventories')->insert([
|
||||||
|
'id' => 23,
|
||||||
|
'real_stock' => 1,
|
||||||
|
'reserved_stock' => 2,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->expectException(\RuntimeException::class);
|
||||||
|
$this->expectExceptionMessage(
|
||||||
|
'stock disponible actual es negativo. Inventarios detectados (máximo 20): '
|
||||||
|
.'id=23 [real=1, vendidas=0, reintegradas=0, reservadas=2, reservas_entradas=0, resultado=-1]'
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->stockMigration()->up();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function stockMigration(): Migration
|
||||||
|
{
|
||||||
|
return require database_path('migrations/2026_09_25_000000_generate_available_inventory_stock.php');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function movementMigration(): Migration
|
||||||
|
{
|
||||||
|
return require database_path('migrations/2026_09_25_010000_create_inventory_movements_table.php');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -34,7 +34,7 @@ class SetWebsiteTypeFaviconTest extends TestCase
|
|||||||
$this->assertSame(1, DB::table('attachments')->where('filename', 'onticket_favicon.svg')->count());
|
$this->assertSame(1, DB::table('attachments')->where('filename', 'onticket_favicon.svg')->count());
|
||||||
Storage::disk('s3')->assertExists($attachment->path);
|
Storage::disk('s3')->assertExists($attachment->path);
|
||||||
$this->assertSame(
|
$this->assertSame(
|
||||||
file_get_contents(public_path('images/website_types/onticket_favicon.svg')),
|
file_get_contents(public_path('images/website_types/onticket/onticket_favicon.svg')),
|
||||||
Storage::disk('s3')->get($attachment->path),
|
Storage::disk('s3')->get($attachment->path),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class WebsiteTypeSeederTest extends TestCase
|
|||||||
|
|
||||||
$this->assertSame(2, AdminWebsiteType::query()->count());
|
$this->assertSame(2, AdminWebsiteType::query()->count());
|
||||||
$this->assertSame(3, StorefrontWebsiteType::query()->count());
|
$this->assertSame(3, StorefrontWebsiteType::query()->count());
|
||||||
$this->assertSame(5, Attachment::query()->count());
|
$this->assertSame(6, Attachment::query()->count());
|
||||||
|
|
||||||
$expectedPresentation = [
|
$expectedPresentation = [
|
||||||
'primary_color' => '#FF7006',
|
'primary_color' => '#FF7006',
|
||||||
@@ -45,12 +45,15 @@ class WebsiteTypeSeederTest extends TestCase
|
|||||||
$this->assertSame('ShopIt', $shopIt->nombre);
|
$this->assertSame('ShopIt', $shopIt->nombre);
|
||||||
$this->assertSame('localhost', $shopIt->dominio);
|
$this->assertSame('localhost', $shopIt->dominio);
|
||||||
$this->assertSame('scanner.localhost', $shopIt->scanner_domain);
|
$this->assertSame('scanner.localhost', $shopIt->scanner_domain);
|
||||||
$this->assertSame($expectedPresentation, $shopIt->only(array_keys($expectedPresentation)));
|
$this->assertSame(
|
||||||
$this->assertSame('onticket_logo.png', $shopIt->siteLogo->filename);
|
[...$expectedPresentation, 'primary_color' => '#2FD3AC'],
|
||||||
|
$shopIt->only(array_keys($expectedPresentation)),
|
||||||
|
);
|
||||||
|
$this->assertSame('shopit_logo.png', $shopIt->siteLogo->filename);
|
||||||
Storage::disk('s3')->assertExists($shopIt->siteLogo->path);
|
Storage::disk('s3')->assertExists($shopIt->siteLogo->path);
|
||||||
$this->assertSame('onticket_footer_logo.png', $shopIt->footerLogo->filename);
|
$this->assertSame('shopit_footer_logo.png', $shopIt->footerLogo->filename);
|
||||||
Storage::disk('s3')->assertExists($shopIt->footerLogo->path);
|
Storage::disk('s3')->assertExists($shopIt->footerLogo->path);
|
||||||
$this->assertSame('onticket_favicon.svg', $shopIt->favicon->filename);
|
$this->assertSame('shopit-favicon.svg', $shopIt->favicon->filename);
|
||||||
Storage::disk('s3')->assertExists($shopIt->favicon->path);
|
Storage::disk('s3')->assertExists($shopIt->favicon->path);
|
||||||
$shopItStorefront = StorefrontWebsiteType::query()->where('codigo', 'shopit')->with('extras')->sole();
|
$shopItStorefront = StorefrontWebsiteType::query()->where('codigo', 'shopit')->with('extras')->sole();
|
||||||
$this->assertSame('standard', $shopItStorefront->header_type);
|
$this->assertSame('standard', $shopItStorefront->header_type);
|
||||||
@@ -84,7 +87,7 @@ class WebsiteTypeSeederTest extends TestCase
|
|||||||
Storage::disk('s3')->assertExists($onTicket->footerLogo->path);
|
Storage::disk('s3')->assertExists($onTicket->footerLogo->path);
|
||||||
$this->assertNotSame($shopIt->site_logo, $onTicket->site_logo);
|
$this->assertNotSame($shopIt->site_logo, $onTicket->site_logo);
|
||||||
$this->assertNotSame($shopIt->footer_logo, $onTicket->footer_logo);
|
$this->assertNotSame($shopIt->footer_logo, $onTicket->footer_logo);
|
||||||
$this->assertSame($shopIt->favicon_id, $onTicket->favicon_id);
|
$this->assertNotSame($shopIt->favicon_id, $onTicket->favicon_id);
|
||||||
$this->assertSame('onticket_favicon.svg', $onTicket->favicon->filename);
|
$this->assertSame('onticket_favicon.svg', $onTicket->favicon->filename);
|
||||||
$onTicketStorefront = StorefrontWebsiteType::query()->where('codigo', 'onticket')->with('extras')->sole();
|
$onTicketStorefront = StorefrontWebsiteType::query()->where('codigo', 'onticket')->with('extras')->sole();
|
||||||
$this->assertSame('standard', $onTicketStorefront->header_type);
|
$this->assertSame('standard', $onTicketStorefront->header_type);
|
||||||
|
|||||||