Compare commits
34 Commits
8d5a12f212
...
feature/ev
| Author | SHA1 | Date | |
|---|---|---|---|
| 09faa22920 | |||
| bebf6a7ed5 | |||
| 86ca57a3ad | |||
| e64393812c | |||
| 655364bfec | |||
| 55c28f33ef | |||
| 5a0ce08adb | |||
| a770d435eb | |||
| 44bf67bd12 | |||
| 6e1f0d731c | |||
| 82c18e9e91 | |||
| dfad6fb4b0 | |||
| 3f9b773367 | |||
| 7996d53e12 | |||
| a40a2065a9 | |||
| 57677f55e6 | |||
| a8afd92f46 | |||
| 1df0d2e2ef | |||
| d3cac7a590 | |||
| df13a636ba | |||
| d85841742e | |||
| 0e3fdc5460 | |||
| 0dc2675dae | |||
| 28d1de072c | |||
| b09e8a4b96 | |||
| 7f754037bb | |||
| f29c5692b9 | |||
| 57d278336d | |||
| b309738222 | |||
| b3eb59983a | |||
| cf3f0ceb1b | |||
| 41c0902b83 | |||
| a2439bf43b | |||
| bd77727f58 |
@@ -2,8 +2,6 @@
|
||||
|
||||
namespace App\Domains\Commerce\Catalog\Services;
|
||||
|
||||
use App\Shared\Attachable\Models\Attachment;
|
||||
use App\Shared\Attachable\Services\AttachmentService;
|
||||
use App\Domains\Commerce\Catalog\Enums\CatalogItemType;
|
||||
use App\Domains\Commerce\Catalog\Models\Attribute;
|
||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||
@@ -11,8 +9,10 @@ use App\Domains\Commerce\Catalog\Models\Category;
|
||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||
use App\Domains\Commerce\Catalog\Models\ItemAttribute;
|
||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||
use App\Shared\Attachable\Models\Attachment;
|
||||
use App\Shared\Attachable\Services\AttachmentService;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -286,9 +286,11 @@ class CatalogService
|
||||
int $perPage,
|
||||
int $page,
|
||||
): LengthAwarePaginator {
|
||||
$categoryIds = $this->categoryAndDescendantIds($tenant, $category);
|
||||
|
||||
return CatalogItem::query()
|
||||
->forTenantCatalog($tenant)
|
||||
->where('category_id', $category->id)
|
||||
->whereIn('category_id', $categoryIds)
|
||||
->whereAvailable()
|
||||
->with([
|
||||
'attachments',
|
||||
@@ -306,6 +308,34 @@ class CatalogService
|
||||
->paginate(perPage: $perPage, pageName: 'page', page: $page);
|
||||
}
|
||||
|
||||
/** @return array<int, int> */
|
||||
private function categoryAndDescendantIds(Tenant $tenant, Category $category): array
|
||||
{
|
||||
$childrenByParent = Category::query()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->get(['id', 'categoria_id'])
|
||||
->groupBy('categoria_id');
|
||||
|
||||
$categoryIds = [];
|
||||
$pendingIds = [$category->id];
|
||||
|
||||
while ($pendingIds !== []) {
|
||||
$categoryId = array_shift($pendingIds);
|
||||
|
||||
if (isset($categoryIds[$categoryId])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$categoryIds[$categoryId] = $categoryId;
|
||||
|
||||
foreach ($childrenByParent->get($categoryId, collect()) as $child) {
|
||||
$pendingIds[] = $child->id;
|
||||
}
|
||||
}
|
||||
|
||||
return array_values($categoryIds);
|
||||
}
|
||||
|
||||
public function delete(CatalogItem $catalogItem): void
|
||||
{
|
||||
DB::transaction(function () use ($catalogItem): void {
|
||||
|
||||
@@ -34,3 +34,8 @@ Bajo `/v1/adminapp/tenant/featured-groups`, con `auth:sanctum` y `adminapp.tenan
|
||||
## Dependencias y reglas
|
||||
|
||||
Usa `Attachable` para imágenes/archivos, `Tenant` para aislamiento y `Ticket`/`Event` para vigencia y fechas. `Cart` y `Purchase` consumen sus precios, variantes e inventario. Los cambios de stock deben pasar por `CatalogInventoryService` para conservar reservas y disponibilidad.
|
||||
|
||||
## Menús deprecados
|
||||
|
||||
Los menús `adminapp.combos` y `adminapp.categories` están retirados; las
|
||||
categorías del catálogo y sus datos comerciales no se eliminan.
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Domains\Commerce\Purchase\Controllers;
|
||||
|
||||
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||
use App\Domains\Commerce\Purchase\Requests\PaymentIntentRequest;
|
||||
use App\Domains\Commerce\Purchase\Requests\StartCheckoutRequest;
|
||||
@@ -13,6 +12,7 @@ use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||
use App\Domains\Commerce\Purchase\Services\PurchaseStateGuard;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Shared\Integration\Services\TelepagosIntegrationService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -151,11 +151,14 @@ class PurchaseController extends Controller
|
||||
}
|
||||
|
||||
$compra->refresh();
|
||||
$compra->loadMissing('event');
|
||||
$totalAmount = (float) $compra->total;
|
||||
|
||||
if ($method === 'transfer') {
|
||||
$telepagosService = new TelepagosIntegrationService;
|
||||
$telepagosService->forTenant($tenant->codigo);
|
||||
$compra->event
|
||||
? $telepagosService->forEvent($compra->event)
|
||||
: $telepagosService->forTenant($tenant->codigo);
|
||||
|
||||
try {
|
||||
$accountInfo = $telepagosService->getAccountInfo();
|
||||
@@ -191,7 +194,9 @@ class PurchaseController extends Controller
|
||||
|
||||
if ($method === 'qr') {
|
||||
$telepagosService = new TelepagosIntegrationService;
|
||||
$telepagosService->forTenant($tenant->codigo);
|
||||
$compra->event
|
||||
? $telepagosService->forEvent($compra->event)
|
||||
: $telepagosService->forTenant($tenant->codigo);
|
||||
|
||||
try {
|
||||
Log::channel('telepagos')->info('Generating Telepagos QR.', [
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
namespace App\Domains\Commerce\Purchase\Models;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Commerce\Cart\Models\Cart;
|
||||
use App\Domains\Commerce\Catalog\Models\StockReservation;
|
||||
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
||||
use App\Domains\Commerce\Purchase\Events\PurchasePaid;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Shared\Logging\Models\Concerns\LogsValueChanges;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
@@ -21,6 +22,7 @@ use Illuminate\Support\Facades\DB;
|
||||
#[Fillable([
|
||||
'cart_id',
|
||||
'stock_reservation_id',
|
||||
'event_id',
|
||||
'tenant_codigo',
|
||||
'user_id',
|
||||
'status',
|
||||
@@ -149,6 +151,7 @@ class Purchase extends Model
|
||||
return [
|
||||
'cart_id' => 'integer',
|
||||
'stock_reservation_id' => 'integer',
|
||||
'event_id' => 'integer',
|
||||
'user_id' => 'integer',
|
||||
'total' => 'decimal:2',
|
||||
];
|
||||
@@ -162,6 +165,12 @@ class Purchase extends Model
|
||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Event, $this> */
|
||||
public function event(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Event::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return BelongsTo<User, $this>
|
||||
*/
|
||||
|
||||
@@ -36,11 +36,11 @@ class PurchaseResource extends JsonResource
|
||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||
/** @var Event|null $checkoutEvent */
|
||||
$checkoutEvent = $usesEventSummary
|
||||
? $items
|
||||
? ($this->event ?? $items
|
||||
->map(fn (PurchaseItem $item) => $item->sourceCatalogItem?->event)
|
||||
->filter()
|
||||
->unique('id')
|
||||
->first()
|
||||
->first())
|
||||
: null;
|
||||
|
||||
$subtotal = $items->isNotEmpty()
|
||||
@@ -62,6 +62,7 @@ class PurchaseResource extends JsonResource
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'cart_id' => $this->cart_id,
|
||||
'event_id' => $this->event_id,
|
||||
'tenant_codigo' => $this->tenant_codigo,
|
||||
'user_id' => $this->user_id,
|
||||
'created_at' => $this->created_at,
|
||||
|
||||
@@ -14,6 +14,7 @@ class PurchaseResponseLoader
|
||||
=== StorefrontWebsiteType::CHECKOUT_SUMMARY_EVENT;
|
||||
$relations = [
|
||||
'tenant',
|
||||
'event.attachment',
|
||||
'items.sourceCatalogItem.event.attachment',
|
||||
'stockReservation',
|
||||
];
|
||||
|
||||
@@ -206,6 +206,7 @@ class StartCheckoutService
|
||||
fn (array $line): float => $line['selection']->getPrice() * $line['quantity'],
|
||||
),
|
||||
$cart->getKey(),
|
||||
$cartItems->first()?->catalogItem?->event_id,
|
||||
);
|
||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||
@@ -273,6 +274,7 @@ class StartCheckoutService
|
||||
$purchaseData,
|
||||
$cart->getTotalAmount(),
|
||||
$cart->getKey(),
|
||||
$cartItems->first()?->catalogItem?->event_id,
|
||||
);
|
||||
$cart->update(['current_purchase_id' => $purchase->getKey()]);
|
||||
$this->reservations->attachToPurchase($cart, $purchase, $this->checkoutExpiration());
|
||||
@@ -410,10 +412,12 @@ class StartCheckoutService
|
||||
array $purchaseData,
|
||||
float $total,
|
||||
?int $cartId,
|
||||
?int $eventId,
|
||||
): Purchase {
|
||||
return Purchase::query()->create([
|
||||
...$purchaseData,
|
||||
'cart_id' => $cartId,
|
||||
'event_id' => $eventId,
|
||||
'tenant_codigo' => $tenant->codigo,
|
||||
'user_id' => $userId,
|
||||
'status' => Purchase::STATUS_CREATED,
|
||||
|
||||
@@ -8,12 +8,13 @@ use Illuminate\Database\Eloquent\Builder;
|
||||
|
||||
class PurchaseRefundSummaryService
|
||||
{
|
||||
public function totalForTenant(Tenant $tenant): string
|
||||
public function totalForTenant(Tenant $tenant, ?int $eventId = null): string
|
||||
{
|
||||
$total = TicketRefund::query()
|
||||
->whereHas(
|
||||
'purchaseItem.purchase',
|
||||
fn (Builder $query): Builder => $query->where('tenant_codigo', $tenant->codigo)
|
||||
->when($eventId !== null, fn (Builder $purchase) => $purchase->where('event_id', $eventId))
|
||||
)
|
||||
->sum('amount');
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ use App\Domains\Commerce\Sale\Resources\AdminApp\SaleTicketResource;
|
||||
use App\Domains\Commerce\Sale\Services\AdminAppSaleExcelService;
|
||||
use App\Domains\Commerce\Sale\Services\AdminAppSalePdfService;
|
||||
use App\Domains\Commerce\Sale\Services\AdminAppSaleService;
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||
@@ -27,15 +28,20 @@ class SaleController extends Controller
|
||||
protected AdminAppSaleExcelService $saleExcelService,
|
||||
) {}
|
||||
|
||||
private function eventId(Request $request): ?int
|
||||
{
|
||||
return app(EventScopeService::class)->eventId($request->user());
|
||||
}
|
||||
|
||||
public function index(AdminAppSaleIndexRequest $request): AnonymousResourceCollection
|
||||
{
|
||||
$tenant = $request->user()->tenant()->firstOrFail();
|
||||
|
||||
return SaleResource::collection(
|
||||
$this->saleService->sales($tenant, $request->validated())
|
||||
$this->saleService->sales($tenant, $request->validated(), $this->eventId($request))
|
||||
)->additional([
|
||||
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant),
|
||||
'refunded_total' => $this->saleService->refundedTotal($tenant),
|
||||
'confirmed_sales_total' => $this->saleService->confirmedSalesTotal($tenant, $this->eventId($request)),
|
||||
'refunded_total' => $this->saleService->refundedTotal($tenant, $this->eventId($request)),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -43,7 +49,7 @@ class SaleController extends Controller
|
||||
{
|
||||
$tenant = $request->user()->tenant()->firstOrFail();
|
||||
|
||||
return new SaleDetailResource($this->saleService->detail($tenant, $sale));
|
||||
return new SaleDetailResource($this->saleService->detail($tenant, $sale, $this->eventId($request)));
|
||||
}
|
||||
|
||||
public function tickets(Request $request, int $sale): AnonymousResourceCollection
|
||||
@@ -51,7 +57,7 @@ class SaleController extends Controller
|
||||
$tenant = $request->user()->tenant()->firstOrFail();
|
||||
|
||||
return SaleTicketResource::collection(
|
||||
$this->saleService->tickets($tenant, $sale)
|
||||
$this->saleService->tickets($tenant, $sale, $this->eventId($request))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -59,14 +65,14 @@ class SaleController extends Controller
|
||||
{
|
||||
$tenant = $request->user()->tenant()->firstOrFail();
|
||||
|
||||
return new SaleResource($this->saleService->confirm($tenant, $sale));
|
||||
return new SaleResource($this->saleService->confirm($tenant, $sale, $this->eventId($request)));
|
||||
}
|
||||
|
||||
public function cancel(Request $request, int $sale): SaleResource
|
||||
{
|
||||
$tenant = $request->user()->tenant()->firstOrFail();
|
||||
|
||||
return new SaleResource($this->saleService->cancel($tenant, $sale));
|
||||
return new SaleResource($this->saleService->cancel($tenant, $sale, $this->eventId($request)));
|
||||
}
|
||||
|
||||
public function modifications(
|
||||
@@ -76,6 +82,7 @@ class SaleController extends Controller
|
||||
$this->saleService->modifications(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$request->validated(),
|
||||
$this->eventId($request),
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -86,7 +93,7 @@ class SaleController extends Controller
|
||||
|
||||
return $this->salePdfService->downloadSales(
|
||||
$tenant,
|
||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
||||
$this->saleService->salesForExport($tenant, $request->validated(), $this->eventId($request)),
|
||||
$request->validated('timezone'),
|
||||
);
|
||||
}
|
||||
@@ -97,7 +104,7 @@ class SaleController extends Controller
|
||||
|
||||
return $this->salePdfService->downloadModifications(
|
||||
$tenant,
|
||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
||||
$this->saleService->modificationsForExport($tenant, $request->validated(), $this->eventId($request)),
|
||||
$request->validated('timezone'),
|
||||
);
|
||||
}
|
||||
@@ -108,7 +115,7 @@ class SaleController extends Controller
|
||||
|
||||
return $this->saleExcelService->downloadSales(
|
||||
$tenant,
|
||||
$this->saleService->salesForExport($tenant, $request->validated()),
|
||||
$this->saleService->salesForExport($tenant, $request->validated(), $this->eventId($request)),
|
||||
$request->validated('timezone'),
|
||||
);
|
||||
}
|
||||
@@ -120,7 +127,7 @@ class SaleController extends Controller
|
||||
|
||||
return $this->saleExcelService->downloadModifications(
|
||||
$tenant,
|
||||
$this->saleService->modificationsForExport($tenant, $request->validated()),
|
||||
$this->saleService->modificationsForExport($tenant, $request->validated(), $this->eventId($request)),
|
||||
$request->validated('timezone'),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Domains\Commerce\Sale\Services;
|
||||
|
||||
use App\Shared\Logging\Models\ValueChange;
|
||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||
@@ -10,6 +9,7 @@ use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||
use App\Shared\Logging\Models\ValueChange;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Pagination\LengthAwarePaginator;
|
||||
use Illuminate\Support\Collection;
|
||||
@@ -21,19 +21,20 @@ class AdminAppSaleService
|
||||
protected PurchaseRefundSummaryService $refundSummaryService,
|
||||
) {}
|
||||
|
||||
public function confirmedSalesTotal(Tenant $tenant): string
|
||||
public function confirmedSalesTotal(Tenant $tenant, ?int $eventId = null): string
|
||||
{
|
||||
$total = Purchase::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||
->where('status', Purchase::STATUS_PAID)
|
||||
->sum('total');
|
||||
|
||||
return number_format((float) $total, 2, '.', '');
|
||||
}
|
||||
|
||||
public function refundedTotal(Tenant $tenant): string
|
||||
public function refundedTotal(Tenant $tenant, ?int $eventId = null): string
|
||||
{
|
||||
return $this->refundSummaryService->totalForTenant($tenant);
|
||||
return $this->refundSummaryService->totalForTenant($tenant, $eventId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -47,43 +48,44 @@ class AdminAppSaleService
|
||||
* } $filters
|
||||
* @return LengthAwarePaginator<Purchase>
|
||||
*/
|
||||
public function sales(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
||||
public function sales(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||
{
|
||||
return $this->salesQuery($tenant, $filters)
|
||||
return $this->salesQuery($tenant, $filters, $eventId)
|
||||
->paginateFromRequest()
|
||||
->withQueryString();
|
||||
}
|
||||
|
||||
public function detail(Tenant $tenant, int $saleId): Purchase
|
||||
public function detail(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||
{
|
||||
return Purchase::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||
->with('items')
|
||||
->findOrFail($saleId);
|
||||
}
|
||||
|
||||
/** @return Collection<int, Ticket> */
|
||||
public function tickets(Tenant $tenant, int $saleId): Collection
|
||||
public function tickets(Tenant $tenant, int $saleId, ?int $eventId = null): Collection
|
||||
{
|
||||
return $this->findForTenant($tenant, $saleId)
|
||||
return $this->findForTenant($tenant, $saleId, $eventId)
|
||||
->tickets()
|
||||
->with([...TicketValidityResolver::RELATIONS, ...TicketPresentationResolver::RELATIONS, 'refund'])
|
||||
->orderBy('id')
|
||||
->get();
|
||||
}
|
||||
|
||||
public function confirm(Tenant $tenant, int $saleId): Purchase
|
||||
public function confirm(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||
{
|
||||
$sale = $this->findForTenant($tenant, $saleId);
|
||||
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||
|
||||
return $this->saleForResponse(
|
||||
$this->checkoutService->confirmPaidPurchase($sale)
|
||||
);
|
||||
}
|
||||
|
||||
public function cancel(Tenant $tenant, int $saleId): Purchase
|
||||
public function cancel(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||
{
|
||||
$sale = $this->findForTenant($tenant, $saleId);
|
||||
$sale = $this->findForTenant($tenant, $saleId, $eventId);
|
||||
|
||||
return $this->saleForResponse(
|
||||
$this->checkoutService->cancelPurchaseFromAdmin($sale)
|
||||
@@ -94,18 +96,18 @@ class AdminAppSaleService
|
||||
* @param array<string, mixed> $filters
|
||||
* @return Collection<int, Purchase>
|
||||
*/
|
||||
public function salesForExport(Tenant $tenant, array $filters = []): Collection
|
||||
public function salesForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||
{
|
||||
return $this->salesQuery($tenant, $filters)->get();
|
||||
return $this->salesQuery($tenant, $filters, $eventId)->get();
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $filters
|
||||
* @return LengthAwarePaginator<ValueChange>
|
||||
*/
|
||||
public function modifications(Tenant $tenant, array $filters = []): LengthAwarePaginator
|
||||
public function modifications(Tenant $tenant, array $filters = [], ?int $eventId = null): LengthAwarePaginator
|
||||
{
|
||||
return $this->modificationsQuery($tenant, $filters)
|
||||
return $this->modificationsQuery($tenant, $filters, $eventId)
|
||||
->paginateFromRequest()
|
||||
->withQueryString();
|
||||
}
|
||||
@@ -114,13 +116,13 @@ class AdminAppSaleService
|
||||
* @param array<string, mixed> $filters
|
||||
* @return Collection<int, ValueChange>
|
||||
*/
|
||||
public function modificationsForExport(Tenant $tenant, array $filters = []): Collection
|
||||
public function modificationsForExport(Tenant $tenant, array $filters = [], ?int $eventId = null): Collection
|
||||
{
|
||||
return $this->modificationsQuery($tenant, $filters)->get();
|
||||
return $this->modificationsQuery($tenant, $filters, $eventId)->get();
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $filters */
|
||||
protected function salesQuery(Tenant $tenant, array $filters): Builder
|
||||
protected function salesQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||
{
|
||||
$sortColumns = [
|
||||
'id' => 'id',
|
||||
@@ -139,6 +141,7 @@ class AdminAppSaleService
|
||||
|
||||
return Purchase::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||
$term = trim($search);
|
||||
|
||||
@@ -176,11 +179,14 @@ class AdminAppSaleService
|
||||
* @param array<string, mixed> $filters
|
||||
* @return Builder<ValueChange>
|
||||
*/
|
||||
protected function modificationsQuery(Tenant $tenant, array $filters): Builder
|
||||
protected function modificationsQuery(Tenant $tenant, array $filters, ?int $eventId = null): Builder
|
||||
{
|
||||
return ValueChange::query()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->where('trackable_type', (new Purchase)->getMorphClass())
|
||||
->when($eventId !== null, fn (Builder $query) => $query->whereHasMorph(
|
||||
'trackable', [Purchase::class],
|
||||
fn (Builder $sales) => $sales->where('event_id', $eventId)))
|
||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||
$term = trim($search);
|
||||
|
||||
@@ -221,10 +227,11 @@ class AdminAppSaleService
|
||||
->orderByDesc('id');
|
||||
}
|
||||
|
||||
protected function findForTenant(Tenant $tenant, int $saleId): Purchase
|
||||
protected function findForTenant(Tenant $tenant, int $saleId, ?int $eventId = null): Purchase
|
||||
{
|
||||
return Purchase::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId))
|
||||
->findOrFail($saleId);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,3 +30,10 @@ Consume compras de `Purchase`, datos del tenant y entradas de `Logging`. No es d
|
||||
La consulta paginada y la colección de exportación deben aplicar los mismos filtros para evitar diferencias entre pantalla, PDF y Excel.
|
||||
|
||||
El historial comparte con ventas los filtros de búsqueda, ID, fecha de venta y estado. En el historial, el estado se evalúa sobre `ValueChange.new_value`: representa el resultado de esa modificación y no el estado actual de la venta.
|
||||
|
||||
## Alcance por evento
|
||||
|
||||
Las rutas usan `adminapp.tenant:event`. Para admins de evento, listados, totales,
|
||||
detalles, tickets de compras, confirmación, cancelación, historial y exportaciones
|
||||
se filtran por `user.event_id` además del tenant. Las compras pertenecen a un
|
||||
único evento. Un admin de tenant conserva acceso a sus compras de todos los eventos.
|
||||
|
||||
@@ -4,7 +4,7 @@ use App\Domains\Commerce\Sale\Controllers\AdminApp\SaleController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::prefix('v1/adminapp/tenant')
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant:event'])
|
||||
->group(function (): void {
|
||||
Route::get('sales', [SaleController::class, 'index']);
|
||||
Route::get('sales/pdf', [SaleController::class, 'downloadPdf']);
|
||||
|
||||
9
app/Domains/Core/Auth/Enums/AdminScope.php
Normal file
@@ -0,0 +1,9 @@
|
||||
<?php
|
||||
|
||||
namespace App\Domains\Core\Auth\Enums;
|
||||
|
||||
enum AdminScope: string
|
||||
{
|
||||
case Tenant = 'tenant';
|
||||
case Event = 'event';
|
||||
}
|
||||
@@ -2,11 +2,13 @@
|
||||
|
||||
namespace App\Domains\Core\Auth\Models;
|
||||
|
||||
use App\Domains\Commerce\Catalog\Models\Category;
|
||||
use App\Domains\Core\Auth\Enums\AdminScope;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use App\Domains\Core\Authorization\Models\Role;
|
||||
use App\Domains\Commerce\Catalog\Models\Category;
|
||||
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Event\Models\EventDateChangeView;
|
||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||
use Database\Factories\UserFactory;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
@@ -20,7 +22,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||
use Illuminate\Notifications\Notifiable;
|
||||
use Laravel\Sanctum\HasApiTokens;
|
||||
|
||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo'])]
|
||||
#[Fillable(['nombre_apellido', 'email', 'password', 'dni', 'telefono', 'google_id', 'rol_codigo', 'tenant_codigo', 'admin_scope', 'event_id'])]
|
||||
#[Hidden(['password', 'remember_token', 'active_email', 'active_google_id'])]
|
||||
class User extends Authenticatable
|
||||
{
|
||||
@@ -29,6 +31,7 @@ class User extends Authenticatable
|
||||
|
||||
protected $attributes = [
|
||||
'rol_codigo' => RoleCode::User->value,
|
||||
'admin_scope' => AdminScope::Tenant->value,
|
||||
];
|
||||
|
||||
protected static function newFactory(): UserFactory
|
||||
@@ -86,6 +89,19 @@ class User extends Authenticatable
|
||||
return $this->belongsTo(Tenant::class, 'tenant_codigo', 'codigo');
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Event, $this> */
|
||||
public function event(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Event::class);
|
||||
}
|
||||
|
||||
public function isTenantAdministrator(): bool
|
||||
{
|
||||
return $this->rol_codigo === RoleCode::AdminApp->value
|
||||
&& $this->admin_scope === AdminScope::Tenant->value
|
||||
&& $this->event_id === null;
|
||||
}
|
||||
|
||||
/** @return BelongsToMany<Category, $this> */
|
||||
public function scanCategories(): BelongsToMany
|
||||
{
|
||||
@@ -103,6 +119,7 @@ class User extends Authenticatable
|
||||
protected function casts(): array
|
||||
{
|
||||
return [
|
||||
'event_id' => 'integer',
|
||||
'email_verified_at' => 'datetime',
|
||||
'password' => 'hashed',
|
||||
'failed_login_attempts' => 'integer',
|
||||
|
||||
@@ -20,6 +20,11 @@ class AdminAppMeResource extends JsonResource
|
||||
return [
|
||||
'user' => UserResource::make($this->resource),
|
||||
'tenant' => TenantResource::make($this->tenant),
|
||||
'event' => $this->whenLoaded('event', fn () => $this->event === null ? null : [
|
||||
'id' => $this->event->id,
|
||||
'title' => $this->event->title,
|
||||
'tenant_code' => $this->event->tenant_code,
|
||||
]),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,9 @@ class ScannerMeResource extends JsonResource
|
||||
return [
|
||||
'user' => UserResource::make($this->resource),
|
||||
'tenant' => TenantResource::make($this->tenant),
|
||||
'event' => $this->whenLoaded('event', fn () => $this->event === null ? null : [
|
||||
'id' => $this->event->id, 'title' => $this->event->title,
|
||||
]),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Domains\Core\Auth\Resources;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
@@ -24,6 +25,8 @@ class UserResource extends JsonResource
|
||||
'telefono' => $this->telefono,
|
||||
'rol_codigo' => $this->rol_codigo,
|
||||
'tenant_codigo' => $this->tenant_codigo,
|
||||
'admin_scope' => $this->when($this->rol_codigo === RoleCode::AdminApp->value, $this->admin_scope),
|
||||
'event_id' => $this->when(in_array($this->rol_codigo, [RoleCode::AdminApp->value, RoleCode::Scanner->value], true), $this->event_id),
|
||||
'categories' => $this->whenLoaded('scanCategories', fn () => $this->scanCategories
|
||||
->map(fn ($category) => [
|
||||
'id' => $category->id,
|
||||
|
||||
27
app/Domains/Core/Auth/Services/AdminAppAccessService.php
Normal file
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Domains\Core\Auth\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Enums\AdminScope;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
|
||||
class AdminAppAccessService
|
||||
{
|
||||
public function hasValidScope(User $user): bool
|
||||
{
|
||||
if ($user->rol_codigo !== RoleCode::AdminApp->value
|
||||
|| ! $user->tenant_codigo
|
||||
|| ! $user->tenant()->exists()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($user->isTenantAdministrator()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return $user->admin_scope === AdminScope::Event->value
|
||||
&& $user->event_id !== null
|
||||
&& $user->event()->where('tenant_code', $user->tenant_codigo)->exists();
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ class AdminAppContextService
|
||||
->firstOrFail();
|
||||
|
||||
$user->setRelation('tenant', $tenant);
|
||||
$user->load('event');
|
||||
|
||||
return $user;
|
||||
}
|
||||
|
||||
24
app/Domains/Core/Auth/Services/EventScopeService.php
Normal file
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace App\Domains\Core\Auth\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Enums\AdminScope;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
|
||||
class EventScopeService
|
||||
{
|
||||
public function eventId(User $user): ?int
|
||||
{
|
||||
if ($user->admin_scope === AdminScope::Event->value || $user->event_id !== null) {
|
||||
if ($user->event_id === null
|
||||
|| ! $user->event()->where('tenant_code', $user->tenant_codigo)->exists()) {
|
||||
throw new AuthorizationException;
|
||||
}
|
||||
|
||||
return $user->event_id;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ use App\Domains\Core\Authorization\Enums\PermissionCode;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||
use Carbon\CarbonImmutable;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@@ -19,6 +20,7 @@ class PasswordLoginService
|
||||
{
|
||||
public function __construct(
|
||||
private readonly ResetPasswordAttemptService $resetPasswordAttemptService,
|
||||
private readonly AdminAppAccessService $adminAppAccessService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
@@ -196,6 +198,26 @@ class PasswordLoginService
|
||||
];
|
||||
}
|
||||
|
||||
if ($requiredRole === RoleCode::AdminApp && ! $this->adminAppAccessService->hasValidScope($user)) {
|
||||
$this->recordAttempt(
|
||||
$user, $normalizedEmail, $attemptTenantCode,
|
||||
LoginAttempt::OUTCOME_INVALID_CREDENTIALS, $ipAddress, $userAgent,
|
||||
);
|
||||
|
||||
return ['outcome' => LoginAttempt::OUTCOME_INVALID_CREDENTIALS, 'user' => $user, 'locked_until' => null];
|
||||
}
|
||||
|
||||
if ($requiredRole === RoleCode::Scanner) {
|
||||
try {
|
||||
app(EventScopeService::class)->eventId($user);
|
||||
} catch (AuthorizationException) {
|
||||
$this->recordAttempt($user, $normalizedEmail, $attemptTenantCode,
|
||||
LoginAttempt::OUTCOME_INVALID_CREDENTIALS, $ipAddress, $userAgent);
|
||||
|
||||
return ['outcome' => LoginAttempt::OUTCOME_INVALID_CREDENTIALS, 'user' => $user, 'locked_until' => null];
|
||||
}
|
||||
}
|
||||
|
||||
$user->forceFill([
|
||||
'failed_login_attempts' => 0,
|
||||
'last_failed_login_at' => null,
|
||||
|
||||
@@ -18,6 +18,7 @@ class ScannerContextService
|
||||
->firstOrFail();
|
||||
|
||||
$user->setRelation('tenant', $tenant);
|
||||
$user->load('event');
|
||||
|
||||
if ($tenant->requiresScannerCategoryValidation()) {
|
||||
$categories = $user->scanCategories()
|
||||
|
||||
@@ -17,6 +17,6 @@ Route::prefix('v1/adminapp')->group(function (): void {
|
||||
Route::post('password/reset', ResetPasswordController::class)
|
||||
->defaults('reset_role', 'adminapp')
|
||||
->middleware('throttle:5,1');
|
||||
Route::middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
Route::middleware(['auth:sanctum', 'adminapp.tenant:context'])
|
||||
->get('me', AdminAppMeController::class);
|
||||
});
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
|
||||
namespace App\Domains\Core\Client\Models;
|
||||
|
||||
use App\Shared\Integration\Models\ClientIntegration;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Shared\Integration\Models\ClientIntegration;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
@@ -22,6 +23,12 @@ class Client extends Model
|
||||
return $this->hasMany(Tenant::class);
|
||||
}
|
||||
|
||||
/** @return HasMany<Event, $this> */
|
||||
public function events(): HasMany
|
||||
{
|
||||
return $this->hasMany(Event::class);
|
||||
}
|
||||
|
||||
/** @return HasMany<ClientIntegration, $this> */
|
||||
public function integrations(): HasMany
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Domains\Core\Staff\Controllers;
|
||||
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Domains\Core\Staff\Requests\StoreStaffRequest;
|
||||
use App\Domains\Core\Staff\Requests\UpdateStaffRequest;
|
||||
use App\Domains\Core\Staff\Resources\StaffResource;
|
||||
@@ -21,11 +22,17 @@ class AdminAppStaffController extends Controller
|
||||
private readonly ScannerTicketService $scannerTicketService,
|
||||
) {}
|
||||
|
||||
private function eventId(Request $request): ?int
|
||||
{
|
||||
return app(EventScopeService::class)->eventId($request->user());
|
||||
}
|
||||
|
||||
public function index(Request $request): AnonymousResourceCollection
|
||||
{
|
||||
return StaffResource::collection($this->staffService->list(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$request->string('search')->trim()->toString() ?: null,
|
||||
$this->eventId($request),
|
||||
));
|
||||
}
|
||||
|
||||
@@ -34,6 +41,7 @@ class AdminAppStaffController extends Controller
|
||||
return StaffResource::make($this->staffService->create(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$request->validated(),
|
||||
$this->eventId($request),
|
||||
));
|
||||
}
|
||||
|
||||
@@ -43,12 +51,13 @@ class AdminAppStaffController extends Controller
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$staff,
|
||||
$request->validated(),
|
||||
$this->eventId($request),
|
||||
));
|
||||
}
|
||||
|
||||
public function destroy(Request $request, int $staff): Response
|
||||
{
|
||||
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff);
|
||||
$this->staffService->delete($request->user()->tenant()->firstOrFail(), $staff, $this->eventId($request));
|
||||
|
||||
return response()->noContent();
|
||||
}
|
||||
@@ -60,6 +69,7 @@ class AdminAppStaffController extends Controller
|
||||
$scanner = $this->staffService->find(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$staff,
|
||||
$this->eventId($request),
|
||||
);
|
||||
|
||||
return ScanAttemptResource::collection(
|
||||
|
||||
@@ -14,6 +14,7 @@ class StaffResource extends JsonResource
|
||||
{
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'event_id' => $this->event_id,
|
||||
'nombre_apellido' => $this->nombre_apellido,
|
||||
'dni' => $this->dni,
|
||||
'email' => $this->email,
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
|
||||
namespace App\Domains\Core\Staff\Services;
|
||||
|
||||
use App\Domains\Commerce\Catalog\Models\Category;
|
||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Auth\Services\ResetPasswordAttemptService;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use App\Domains\Commerce\Catalog\Models\Category;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Support\Arr;
|
||||
@@ -22,9 +23,9 @@ class StaffService
|
||||
) {}
|
||||
|
||||
/** @return Collection<int, User> */
|
||||
public function list(Tenant $tenant, ?string $search = null): Collection
|
||||
public function list(Tenant $tenant, ?string $search = null, ?int $eventId = null): Collection
|
||||
{
|
||||
return $this->staffQuery($tenant)
|
||||
return $this->staffQuery($tenant, $eventId)
|
||||
->with(['role', 'scanCategories' => fn ($query) => $query->orderBy('nombre')])
|
||||
->when($search, function (Builder $query, string $search): void {
|
||||
$query->where(function (Builder $query) use ($search): void {
|
||||
@@ -38,7 +39,7 @@ class StaffService
|
||||
}
|
||||
|
||||
/** @return Collection<int, Category> */
|
||||
private function assignableCategories(Tenant $tenant): Collection
|
||||
private function assignableCategories(Tenant $tenant, ?int $eventId = null): Collection
|
||||
{
|
||||
return Category::query()
|
||||
->whereNull('categoria_id')
|
||||
@@ -47,23 +48,30 @@ class StaffService
|
||||
->orWhereHas('catalogItems', fn (Builder $items) => $items
|
||||
->where('tenant_code', $tenant->codigo));
|
||||
})
|
||||
->when($eventId !== null, fn (Builder $query) => $query->whereHas(
|
||||
'catalogItems', fn (Builder $items) => $items->where('tenant_code', $tenant->codigo)->where('event_id', $eventId)))
|
||||
->orderBy('nombre')
|
||||
->get();
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $data */
|
||||
public function create(Tenant $tenant, array $data): User
|
||||
public function create(Tenant $tenant, array $data, ?int $eventId = null): User
|
||||
{
|
||||
$eventId ??= $tenant->active_event_id;
|
||||
Event::query()
|
||||
->where('tenant_code', $tenant->codigo)->findOrFail($eventId);
|
||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds, $eventId);
|
||||
|
||||
return DB::transaction(function () use ($tenant, $data, $categoryIds): User {
|
||||
return DB::transaction(function () use ($tenant, $data, $categoryIds, $eventId): User {
|
||||
$staff = User::query()->create([
|
||||
...Arr::only($data, ['nombre_apellido', 'dni', 'email']),
|
||||
'email' => mb_strtolower(trim((string) $data['email'])),
|
||||
'password' => Str::random(64),
|
||||
'rol_codigo' => RoleCode::Scanner->value,
|
||||
'tenant_codigo' => $tenant->codigo,
|
||||
'event_id' => $eventId,
|
||||
'admin_scope' => $eventId === null ? 'tenant' : 'event',
|
||||
]);
|
||||
$staff->scanCategories()->sync($categoryIds);
|
||||
$this->resetPasswordAttemptService->createForScannerEmail(
|
||||
@@ -76,11 +84,11 @@ class StaffService
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $data */
|
||||
public function update(Tenant $tenant, int $staffId, array $data): User
|
||||
public function update(Tenant $tenant, int $staffId, array $data, ?int $eventId = null): User
|
||||
{
|
||||
$staff = $this->find($tenant, $staffId);
|
||||
$staff = $this->find($tenant, $staffId, $eventId);
|
||||
$categoryIds = $this->categoryIdsFor($tenant, $data);
|
||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds);
|
||||
$this->assertCategoriesBelongToTenant($tenant, $categoryIds, $eventId);
|
||||
|
||||
return DB::transaction(function () use ($staff, $data, $categoryIds): User {
|
||||
$attributes = Arr::only($data, ['nombre_apellido', 'dni', 'email']);
|
||||
@@ -92,9 +100,9 @@ class StaffService
|
||||
});
|
||||
}
|
||||
|
||||
public function delete(Tenant $tenant, int $staffId): void
|
||||
public function delete(Tenant $tenant, int $staffId, ?int $eventId = null): void
|
||||
{
|
||||
$staff = $this->find($tenant, $staffId);
|
||||
$staff = $this->find($tenant, $staffId, $eventId);
|
||||
|
||||
DB::transaction(function () use ($staff): void {
|
||||
$staff->tokens()->delete();
|
||||
@@ -102,23 +110,24 @@ class StaffService
|
||||
});
|
||||
}
|
||||
|
||||
public function find(Tenant $tenant, int $staffId): User
|
||||
public function find(Tenant $tenant, int $staffId, ?int $eventId = null): User
|
||||
{
|
||||
return $this->staffQuery($tenant)->findOrFail($staffId);
|
||||
return $this->staffQuery($tenant, $eventId)->findOrFail($staffId);
|
||||
}
|
||||
|
||||
private function staffQuery(Tenant $tenant): Builder
|
||||
private function staffQuery(Tenant $tenant, ?int $eventId = null): Builder
|
||||
{
|
||||
return User::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->where('rol_codigo', RoleCode::Scanner->value);
|
||||
->where('rol_codigo', RoleCode::Scanner->value)
|
||||
->when($eventId !== null, fn (Builder $query) => $query->where('event_id', $eventId));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $data
|
||||
* @return array<int, int>
|
||||
*/
|
||||
private function categoryIdsFor(Tenant $tenant, array $data): array
|
||||
private function categoryIdsFor(Tenant $tenant, array $data, ?int $eventId = null): array
|
||||
{
|
||||
if (! $tenant->requiresScannerCategoryValidation()) {
|
||||
return [];
|
||||
@@ -128,9 +137,9 @@ class StaffService
|
||||
}
|
||||
|
||||
/** @param array<int, int> $categoryIds */
|
||||
private function assertCategoriesBelongToTenant(Tenant $tenant, array $categoryIds): void
|
||||
private function assertCategoriesBelongToTenant(Tenant $tenant, array $categoryIds, ?int $eventId = null): void
|
||||
{
|
||||
$validIds = $this->assignableCategories($tenant)
|
||||
$validIds = $this->assignableCategories($tenant, $eventId)
|
||||
->whereIn('id', $categoryIds)
|
||||
->pluck('id');
|
||||
|
||||
|
||||
@@ -18,3 +18,13 @@ Recurso REST `/v1/adminapp/tenant/staff`, excepto detalle individual, protegido
|
||||
## Dependencias y reglas
|
||||
|
||||
Usa `Auth/User` como entidad de personal, `Authorization` para su rol, `Catalog/Category` para asignaciones y `Tenant` para aislamiento. Toda búsqueda, edición o borrado debe comprobar que el usuario pertenece al tenant autenticado.
|
||||
|
||||
## Alcance por evento
|
||||
|
||||
Los endpoints de Staff y su formulario aceptan `adminapp.tenant:event`. Un admin
|
||||
de evento lista, edita, elimina y consulta el historial solo de scanners de su
|
||||
evento. El backend asigna el evento al crear un scanner y no acepta cambios de
|
||||
asignación desde el formulario. Las categorías autorizables se limitan a las
|
||||
usadas por productos del evento. Los scanners aplican además su evento en
|
||||
lectura de tickets, escaneo e historial. Los intentos registran `event_id` para
|
||||
conservar el aislamiento aunque cambie la asignación del scanner.
|
||||
|
||||
@@ -4,7 +4,7 @@ use App\Domains\Core\Staff\Controllers\AdminAppStaffController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::prefix('v1/adminapp/tenant')
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant:event'])
|
||||
->group(function (): void {
|
||||
Route::get('staff/{staff}/scan-attempts', [AdminAppStaffController::class, 'scanAttempts']);
|
||||
Route::apiResource('staff', AdminAppStaffController::class)->except('show');
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Domains\Ticketing\Event\Controllers\AdminApp;
|
||||
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||
use App\Domains\Ticketing\Event\Requests\RescheduleEventDateRequest;
|
||||
use App\Domains\Ticketing\Event\Requests\StoreEventDateRequest;
|
||||
@@ -19,7 +20,8 @@ class EventController extends Controller
|
||||
public function show(Request $request): EventResource
|
||||
{
|
||||
return EventResource::make(
|
||||
$this->eventService->forTenant($request->user()->tenant()->firstOrFail())
|
||||
$this->eventService->forTenant($request->user()->tenant()->firstOrFail(),
|
||||
app(EventScopeService::class)->eventId($request->user()))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -28,7 +30,8 @@ class EventController extends Controller
|
||||
return EventResource::make(
|
||||
$this->eventService->updateForTenant(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$request->validated()
|
||||
$request->validated(),
|
||||
app(EventScopeService::class)->eventId($request->user())
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -39,6 +42,7 @@ class EventController extends Controller
|
||||
$this->eventService->createDateForTenant(
|
||||
$request->user()->tenant()->firstOrFail(),
|
||||
$request->validated(),
|
||||
app(EventScopeService::class)->eventId($request->user()),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Domains\Ticketing\Event\Models;
|
||||
|
||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use App\Domains\Core\Tenant\Models\SocialMedia;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
@@ -14,14 +15,27 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
#[Fillable(['tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id'])]
|
||||
#[Fillable(['client_id', 'tenant_code', 'slug', 'event_category_id', 'title', 'subtitle', 'description', 'location', 'exact_location', 'date_text', 'published_at', 'attachment_id', 'allow_ticket_refund', 'allow_ticket_total_refund', 'allow_ticket_partial_refund', 'ticket_partial_refund_percentage'])]
|
||||
class Event extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected function casts(): array
|
||||
{
|
||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
||||
return ['allow_ticket_refund' => 'boolean', 'allow_ticket_total_refund' => 'boolean',
|
||||
'allow_ticket_partial_refund' => 'boolean', 'ticket_partial_refund_percentage' => 'decimal:2', 'client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||
}
|
||||
|
||||
public function allow_refund(): bool
|
||||
{
|
||||
return (bool) $this->allow_ticket_refund
|
||||
&& ((bool) $this->allow_ticket_total_refund || $this->allow_partial_refund());
|
||||
}
|
||||
|
||||
public function allow_partial_refund(): bool
|
||||
{
|
||||
return (bool) $this->allow_ticket_refund && (bool) $this->allow_ticket_partial_refund
|
||||
&& (float) $this->ticket_partial_refund_percentage > 0;
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Tenant, $this> */
|
||||
@@ -30,6 +44,17 @@ class Event extends Model
|
||||
return $this->belongsTo(Tenant::class, 'tenant_code', 'codigo');
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Client, $this> */
|
||||
public function client(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Client::class);
|
||||
}
|
||||
|
||||
public function effectiveClient(): Client
|
||||
{
|
||||
return $this->client ?? $this->tenant->client;
|
||||
}
|
||||
|
||||
/** @return BelongsTo<EventCategory, $this> */
|
||||
public function eventCategory(): BelongsTo
|
||||
{
|
||||
|
||||
@@ -26,10 +26,10 @@ class EventResource extends JsonResource
|
||||
'date_text' => $this->date_text,
|
||||
'published_at' => $this->published_at?->toIso8601String(),
|
||||
'attachment_id' => $this->attachment_id,
|
||||
'allow_ticket_refund' => $this->tenant->allow_ticket_refund,
|
||||
'allow_ticket_total_refund' => $this->tenant->allow_ticket_total_refund,
|
||||
'allow_ticket_partial_refund' => $this->tenant->allow_ticket_partial_refund,
|
||||
'ticket_partial_refund_percentage' => $this->tenant->ticket_partial_refund_percentage,
|
||||
'allow_ticket_refund' => $this->allow_ticket_refund,
|
||||
'allow_ticket_total_refund' => $this->allow_ticket_total_refund,
|
||||
'allow_ticket_partial_refund' => $this->allow_ticket_partial_refund,
|
||||
'ticket_partial_refund_percentage' => $this->ticket_partial_refund_percentage,
|
||||
'dates' => EventDateResource::collection(
|
||||
app(EventDateGroupingService::class)->group($this->dates)
|
||||
),
|
||||
|
||||
@@ -2,18 +2,19 @@
|
||||
|
||||
namespace App\Domains\Ticketing\Event\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Commerce\Cart\Services\InvalidateEventDateCartsService;
|
||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Commerce\Catalog\Services\StockReservationService;
|
||||
use App\Domains\Commerce\Catalog\Services\VariantReplacementService;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Enums\EventDateChangeType;
|
||||
use App\Domains\Ticketing\Event\Events\EventDateRescheduled;
|
||||
use App\Domains\Ticketing\Event\Events\EventDateSuspended;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Event\Models\EventDate;
|
||||
use App\Domains\Ticketing\Event\Models\EventDateChange;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -34,22 +35,22 @@ class EventService
|
||||
private readonly InvalidateEventDateCartsService $invalidateEventDateCarts,
|
||||
) {}
|
||||
|
||||
public function forTenant(Tenant $tenant): Event
|
||||
public function forTenant(Tenant $tenant, ?int $eventId = null): Event
|
||||
{
|
||||
return $tenant->activeEvent->load(['dates.validityTime', 'socialMedia']);
|
||||
return $this->resolveEvent($tenant, $eventId)->load(['dates.validityTime', 'socialMedia']);
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $data */
|
||||
public function updateForTenant(Tenant $tenant, array $data): Event
|
||||
public function updateForTenant(Tenant $tenant, array $data, ?int $eventId = null): Event
|
||||
{
|
||||
return DB::transaction(function () use ($tenant, $data): Event {
|
||||
$event = $tenant->activeEvent;
|
||||
return DB::transaction(function () use ($tenant, $data, $eventId): Event {
|
||||
$event = $this->resolveEvent($tenant, $eventId);
|
||||
$event->update([
|
||||
'title' => $data['title'],
|
||||
'location' => $data['location'],
|
||||
...array_intersect_key($data, ['attachment_id' => true, 'exact_location' => true]),
|
||||
]);
|
||||
$tenant->update([
|
||||
$event->update([
|
||||
...array_intersect_key($data, array_flip([
|
||||
'allow_ticket_refund',
|
||||
'allow_ticket_total_refund',
|
||||
@@ -69,10 +70,10 @@ class EventService
|
||||
}
|
||||
|
||||
/** @param array{date: string, start_time: string, end_time: string} $data */
|
||||
public function createDateForTenant(Tenant $tenant, array $data): EventDate
|
||||
public function createDateForTenant(Tenant $tenant, array $data, ?int $eventId = null): EventDate
|
||||
{
|
||||
return DB::transaction(function () use ($tenant, $data): EventDate {
|
||||
$event = $tenant->activeEvent;
|
||||
return DB::transaction(function () use ($tenant, $data, $eventId): EventDate {
|
||||
$event = $this->resolveEvent($tenant, $eventId);
|
||||
$attributes = $this->dateAttributes($data);
|
||||
|
||||
if ($event->dates()->where($attributes)->exists()) {
|
||||
@@ -93,7 +94,7 @@ class EventService
|
||||
?User $createdBy = null,
|
||||
): EventDate {
|
||||
return DB::transaction(function () use ($tenant, $eventDate, $data, $createdBy): EventDate {
|
||||
$source = $this->lockedDateForTenant($tenant, $eventDate);
|
||||
$source = $this->lockedDateForTenant($tenant, $eventDate, $createdBy);
|
||||
|
||||
if ($source->suspended_at !== null) {
|
||||
throw ValidationException::withMessages([
|
||||
@@ -172,7 +173,7 @@ class EventService
|
||||
?User $createdBy = null,
|
||||
): EventDate {
|
||||
return DB::transaction(function () use ($tenant, $eventDate, $createdBy): EventDate {
|
||||
$date = $this->lockedDateForTenant($tenant, $eventDate);
|
||||
$date = $this->lockedDateForTenant($tenant, $eventDate, $createdBy);
|
||||
|
||||
if ($date->rescheduled_to_event_date_id !== null) {
|
||||
throw ValidationException::withMessages([
|
||||
@@ -216,10 +217,18 @@ class EventService
|
||||
});
|
||||
}
|
||||
|
||||
private function lockedDateForTenant(Tenant $tenant, EventDate $eventDate): EventDate
|
||||
private function resolveEvent(Tenant $tenant, ?int $eventId): Event
|
||||
{
|
||||
return Event::query()->where('tenant_code', $tenant->codigo)
|
||||
->findOrFail($eventId ?? $tenant->active_event_id);
|
||||
}
|
||||
|
||||
private function lockedDateForTenant(Tenant $tenant, EventDate $eventDate, ?User $actor = null): EventDate
|
||||
{
|
||||
return $tenant->eventDates()
|
||||
->whereKey($eventDate->getKey())
|
||||
->when($actor !== null && ! $actor->isTenantAdministrator(),
|
||||
fn ($query) => $query->where('event_id', app(EventScopeService::class)->eventId($actor)))
|
||||
->lockForUpdate()
|
||||
->firstOrFail();
|
||||
}
|
||||
|
||||
@@ -37,10 +37,10 @@ se guardan en el evento. Sin evento activo se conservan las redes propias del te
|
||||
|
||||
## API
|
||||
|
||||
Los endpoints de AdminApp usan `auth:sanctum` y `adminapp.tenant`:
|
||||
Los endpoints de AdminApp usan `auth:sanctum` y `adminapp.tenant:event`:
|
||||
|
||||
- `GET/PUT /v1/adminapp/tenant/event`: acceso al evento seleccionado para el
|
||||
storefront de evento único.
|
||||
- `GET/PUT /v1/adminapp/tenant/event`: acceso al evento asociado al usuario con scope de evento;
|
||||
para admins de tenant se conserva el evento activo.
|
||||
- `POST /v1/adminapp/tenant/event-dates`: crea una fecha para ese evento.
|
||||
- `POST /v1/adminapp/tenant/event-dates/{eventDate}/reschedule` y
|
||||
`POST /v1/adminapp/tenant/event-dates/{eventDate}/suspend`: cambios de fecha.
|
||||
@@ -53,3 +53,8 @@ una lista de eventos ni existe todavía una pantalla para gestionarlos.
|
||||
Las fechas se vinculan con variantes de `Catalog`, que a su vez pueden generar
|
||||
tickets. Los avisos por suspensión y reprogramación se construyen dinámicamente
|
||||
después de excluir los cambios que el usuario ya vio tres veces.
|
||||
|
||||
La configuración de devoluciones se persiste en `events`, se entrega en
|
||||
`EventResource` y se aplica al evento de cada ticket. La migración inicial copia
|
||||
los valores anteriores del tenant a sus eventos. Las fechas se autorizan por
|
||||
tenant y por evento antes de cualquier suspensión o reprogramación.
|
||||
|
||||
@@ -4,7 +4,7 @@ use App\Domains\Ticketing\Event\Controllers\AdminApp\EventController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::prefix('v1/adminapp/tenant')
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant:event'])
|
||||
->group(function (): void {
|
||||
Route::get('event', [EventController::class, 'show']);
|
||||
Route::put('event', [EventController::class, 'update']);
|
||||
|
||||
@@ -11,6 +11,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
#[Fillable([
|
||||
'tenant_code',
|
||||
'event_id',
|
||||
'scanner_user_id',
|
||||
'ticket_id',
|
||||
'data',
|
||||
@@ -43,6 +44,7 @@ class ScanAttempt extends Model
|
||||
{
|
||||
return [
|
||||
'scanner_user_id' => 'integer',
|
||||
'event_id' => 'integer',
|
||||
'ticket_id' => 'integer',
|
||||
'result' => ScanAttemptResult::class,
|
||||
'created_at' => 'datetime',
|
||||
|
||||
@@ -7,6 +7,7 @@ use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Desfile\Models\EntryReservation;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Ticket\Services\ResolvedTicketValidity;
|
||||
use App\Domains\Ticketing\Ticket\Services\ResolvedValidityGroup;
|
||||
@@ -147,7 +148,9 @@ class Ticket extends Model
|
||||
|
||||
public function allow_refund(): bool
|
||||
{
|
||||
return $this->tenant?->allow_refund() ?? false;
|
||||
return $this->event_id === null
|
||||
? ($this->tenant?->allow_refund() ?? false)
|
||||
: ($this->event?->allow_refund() ?? false);
|
||||
}
|
||||
|
||||
public function allowRefund(): bool
|
||||
@@ -192,7 +195,9 @@ class Ticket extends Model
|
||||
|
||||
public function can_refund(): bool
|
||||
{
|
||||
return $this->is_active() && $this->allow_refund();
|
||||
return $this->is_active()
|
||||
&& $this->allow_refund()
|
||||
&& ! $this->hasEntryReservation();
|
||||
}
|
||||
|
||||
public function canRefund(): bool
|
||||
@@ -235,6 +240,12 @@ class Ticket extends Model
|
||||
return $this->hasOne(TicketRefund::class);
|
||||
}
|
||||
|
||||
/** @return HasOne<EntryReservation, $this> */
|
||||
public function entryReservation(): HasOne
|
||||
{
|
||||
return $this->hasOne(EntryReservation::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<CatalogItem, $this> */
|
||||
public function sourceCatalogItem(): BelongsTo
|
||||
{
|
||||
@@ -247,6 +258,15 @@ class Ticket extends Model
|
||||
return $this->belongsTo(Variant::class, 'source_variant_id')->withTrashed();
|
||||
}
|
||||
|
||||
private function hasEntryReservation(): bool
|
||||
{
|
||||
if ($this->relationLoaded('entryReservation')) {
|
||||
return $this->getRelation('entryReservation') instanceof EntryReservation;
|
||||
}
|
||||
|
||||
return $this->exists && $this->entryReservation()->exists();
|
||||
}
|
||||
|
||||
public function isValid(): bool
|
||||
{
|
||||
if ($this->hasTerminalStatus() || $this->used_at !== null) {
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Domains\Ticketing\Ticket\Requests;
|
||||
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketAttributeService;
|
||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
@@ -22,7 +23,7 @@ class AdminAppTicketIndexRequest extends FormRequest
|
||||
? []
|
||||
: app(AdminAppTicketColumnService::class)->sortableKeys($tenant);
|
||||
|
||||
return [
|
||||
$rules = [
|
||||
'q' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||
'category' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||
'product' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||
@@ -39,5 +40,18 @@ class AdminAppTicketIndexRequest extends FormRequest
|
||||
'sort_by' => ['sometimes', 'nullable', 'string', Rule::in($sortableKeys)],
|
||||
'sort_direction' => ['sometimes', 'nullable', 'string', Rule::in(['asc', 'desc'])],
|
||||
];
|
||||
|
||||
if ($tenant !== null) {
|
||||
foreach (app(AdminAppTicketAttributeService::class)->attributes($tenant) as $attribute) {
|
||||
$rules[$attribute['code']] = [
|
||||
'sometimes',
|
||||
'nullable',
|
||||
'string',
|
||||
Rule::in(array_column($attribute['options'], 'value')),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ class ScanAttemptResource extends JsonResource
|
||||
ScanAttemptResult::Processing => 'Error',
|
||||
ScanAttemptResult::Accepted => 'Verificado',
|
||||
ScanAttemptResult::InvalidQr => 'QR no pertenece al evento',
|
||||
ScanAttemptResult::TicketNotFound => 'Error',
|
||||
ScanAttemptResult::TicketNotFound => 'QR no pertenece al evento',
|
||||
ScanAttemptResult::CategoryForbidden => 'Error',
|
||||
ScanAttemptResult::AlreadyScanned => 'Usado',
|
||||
ScanAttemptResult::Expired => 'Vencido',
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
<?php
|
||||
|
||||
namespace App\Domains\Ticketing\Ticket\Services;
|
||||
|
||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
|
||||
class AdminAppTicketAttributeService
|
||||
{
|
||||
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||
|
||||
/**
|
||||
* @return list<array{
|
||||
* code: string,
|
||||
* label: string,
|
||||
* options: list<array{value: string, label: string}>
|
||||
* }>
|
||||
*/
|
||||
public function attributes(Tenant $tenant): array
|
||||
{
|
||||
if ($tenant->codigo !== self::DESFILE_PURA_TENDENCIA) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$items = CatalogItem::withTrashed()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->where(function (Builder $query): void {
|
||||
$query
|
||||
->where(function (Builder $activeQuery): void {
|
||||
$activeQuery
|
||||
->whereNull('catalog_items.deleted_at')
|
||||
->where('has_tickets', true);
|
||||
})
|
||||
->orWhereHas('sourceTickets');
|
||||
})
|
||||
->with([
|
||||
'itemAttributes' => fn ($query) => $query->orderBy('sort_order')->orderBy('id'),
|
||||
'itemAttributes.attribute.options',
|
||||
'variants' => fn ($query) => $query
|
||||
->withTrashed()
|
||||
->where(fn (Builder $variantQuery): Builder => $variantQuery
|
||||
->whereNull('variantes.deleted_at')
|
||||
->orWhereHas('sourceTickets'))
|
||||
->orderBy('id'),
|
||||
'variants.definitions.itemAttribute.attribute.options',
|
||||
])
|
||||
->get();
|
||||
|
||||
$attributes = [];
|
||||
|
||||
foreach ($items as $item) {
|
||||
foreach ($item->itemAttributes as $itemAttribute) {
|
||||
$attribute = $itemAttribute->attribute;
|
||||
if ($attribute === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$code = $attribute->codigo;
|
||||
$attributes[$code] ??= [
|
||||
'code' => $code,
|
||||
'label' => $itemAttribute->ticket_label ?: $attribute->nombre,
|
||||
'sort_order' => $itemAttribute->sort_order,
|
||||
'options' => [],
|
||||
];
|
||||
|
||||
foreach ($item->variants as $variant) {
|
||||
$definition = $variant->definitions->firstWhere('item_attribute_id', $itemAttribute->id);
|
||||
if ($definition === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$value = (string) $definition->value;
|
||||
$option = $attribute->options->firstWhere('value', $value);
|
||||
$attributes[$code]['options'][$value] = [
|
||||
'value' => $value,
|
||||
'label' => (string) ($option?->label ?: $value),
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uasort($attributes, fn (array $left, array $right): int => $left['sort_order'] <=> $right['sort_order']
|
||||
?: $left['label'] <=> $right['label']);
|
||||
|
||||
return array_values(array_map(fn (array $attribute): array => [
|
||||
'code' => $attribute['code'],
|
||||
'label' => $attribute['label'],
|
||||
'options' => array_values($attribute['options']),
|
||||
], $attributes));
|
||||
}
|
||||
}
|
||||
@@ -8,9 +8,17 @@ class AdminAppTicketColumnService
|
||||
{
|
||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||
|
||||
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||
|
||||
public function __construct(private readonly AdminAppTicketAttributeService $attributeService) {}
|
||||
|
||||
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string, excel_width: int}> */
|
||||
public function columns(Tenant $tenant): array
|
||||
{
|
||||
if ($tenant->codigo === self::DESFILE_PURA_TENDENCIA) {
|
||||
return $this->desfileColumns($tenant);
|
||||
}
|
||||
|
||||
$keys = $tenant->codigo === self::FIESTA_FUTBOL_INFANTIL
|
||||
? ['order_number', 'category', 'product', 'type', 'date', 'size', 'amount', 'client', 'id', 'status', 'scanned_by']
|
||||
: ['order_number', 'product', 'amount', 'client', 'id', 'status', 'scanned_by'];
|
||||
@@ -45,6 +53,31 @@ class AdminAppTicketColumnService
|
||||
return $columns;
|
||||
}
|
||||
|
||||
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string, excel_width: int}> */
|
||||
private function desfileColumns(Tenant $tenant): array
|
||||
{
|
||||
$attributeColumns = array_map(fn (array $attribute): array => [
|
||||
'key' => $attribute['code'],
|
||||
'label' => $attribute['label'],
|
||||
'type' => 'text',
|
||||
'sortable' => false,
|
||||
'sort_param' => $attribute['code'],
|
||||
'width' => '8%',
|
||||
'excel_width' => 15,
|
||||
], $this->attributeService->attributes($tenant));
|
||||
|
||||
return [
|
||||
$this->definitions()['order_number'],
|
||||
$this->definitions()['product'],
|
||||
...$attributeColumns,
|
||||
$this->definitions()['amount'],
|
||||
$this->definitions()['client'],
|
||||
$this->definitions()['id'],
|
||||
$this->definitions()['status'],
|
||||
$this->definitions()['scanned_by'],
|
||||
];
|
||||
}
|
||||
|
||||
/** @return list<array{key: string, label: string, type: string, sortable: bool, sort_param: string, width: string}> */
|
||||
public function publicColumns(Tenant $tenant): array
|
||||
{
|
||||
|
||||
@@ -11,6 +11,8 @@ class AdminAppTicketRowService
|
||||
{
|
||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||
|
||||
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||
|
||||
private const CATEGORY_PRESENTATIONS = [
|
||||
'alojamientos' => ['category' => 'Camping', 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
||||
'camping' => ['category' => null, 'product' => 'tipo_alojamiento', 'type' => null, 'size' => null],
|
||||
@@ -25,31 +27,65 @@ class AdminAppTicketRowService
|
||||
{
|
||||
$purchaseItem = $ticket->sourcePurchaseItem;
|
||||
$refund = $ticket->refund;
|
||||
$variantProperties = $this->variantProperties($ticket);
|
||||
|
||||
return [
|
||||
'source_purchase_item_id' => $ticket->source_purchase_item_id,
|
||||
'order_number' => $purchaseItem?->compra_id,
|
||||
'product' => $purchaseItem?->item_nombre
|
||||
?? $ticket->sourceCatalogItem?->nombre
|
||||
?? $ticket->name,
|
||||
'amount' => $purchaseItem?->precio_unitario,
|
||||
'product' => $this->productName($ticket, $purchaseItem?->item_nombre, $variantProperties),
|
||||
'amount' => $purchaseItem?->precio_unitario ?? $ticket->entryReservation?->importe,
|
||||
'refund_type' => $refund?->type,
|
||||
'refund_type_label' => $refund?->typeLabel(),
|
||||
'client' => $purchaseItem?->purchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
|
||||
'status' => $ticket->status,
|
||||
'scanned_by' => $ticket->scannerUser?->nombre_apellido,
|
||||
'variant_properties' => $this->variantProperties($ticket),
|
||||
'variant_properties' => $variantProperties,
|
||||
'allow_refund' => $ticket->allow_refund(),
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param list<array{code: string, label: string, values: list<array{value: string, label: string}>}> $properties
|
||||
*/
|
||||
private function productName(Ticket $ticket, ?string $snapshotName, array $properties): string
|
||||
{
|
||||
$baseName = $ticket->sourceCatalogItem?->nombre ?: $ticket->name;
|
||||
|
||||
if ($ticket->tenant_code !== self::DESFILE_PURA_TENDENCIA) {
|
||||
return $snapshotName ?: $baseName;
|
||||
}
|
||||
|
||||
$seatDescription = collect(['sector', 'fila', 'asiento'])
|
||||
->map(function (string $code) use ($properties): ?string {
|
||||
$property = collect($properties)->firstWhere('code', $code);
|
||||
$values = collect($property['values'] ?? [])->pluck('label')->filter()->implode(', ');
|
||||
|
||||
return $property === null || $values === ''
|
||||
? null
|
||||
: $property['label'].' '.$values;
|
||||
})
|
||||
->filter()
|
||||
->implode(', ');
|
||||
|
||||
return $seatDescription === '' ? ($snapshotName ?: $baseName) : "{$baseName} ({$seatDescription})";
|
||||
}
|
||||
|
||||
/** @param array<string, mixed>|null $details */
|
||||
public function values(Ticket $ticket, ?array $details = null): array
|
||||
{
|
||||
$details ??= $this->details($ticket);
|
||||
$presentation = $this->presentation($ticket, $details);
|
||||
$attributeValues = collect($details['variant_properties'] ?? [])
|
||||
->mapWithKeys(fn (array $property): array => [
|
||||
$property['code'] => collect($property['values'] ?? [])
|
||||
->pluck('label')
|
||||
->filter()
|
||||
->implode(', ') ?: '-',
|
||||
])
|
||||
->all();
|
||||
|
||||
return [
|
||||
...$attributeValues,
|
||||
'order_number' => $details['order_number'],
|
||||
'category' => $presentation['category'],
|
||||
'product' => $presentation['product'],
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
|
||||
namespace App\Domains\Ticketing\Ticket\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||
use App\Domains\Commerce\Catalog\Models\Inventory;
|
||||
use App\Domains\Commerce\Catalog\Models\Variant;
|
||||
use App\Domains\Commerce\Purchase\Models\PurchaseItem;
|
||||
use App\Domains\Commerce\Purchase\Services\PurchaseRefundSummaryService;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Models\TicketRefund;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
@@ -23,15 +24,18 @@ class AdminAppTicketService
|
||||
...TicketValidityResolver::RELATIONS,
|
||||
...TicketPresentationResolver::RELATIONS,
|
||||
'tenant',
|
||||
'event',
|
||||
'user',
|
||||
'scannerUser',
|
||||
'sourceCatalogItem.category',
|
||||
'sourcePurchaseItem.purchase',
|
||||
'entryReservation',
|
||||
'refund.createdBy',
|
||||
];
|
||||
|
||||
public function __construct(
|
||||
private readonly AdminAppTicketColumnService $columnService,
|
||||
private readonly AdminAppTicketAttributeService $attributeService,
|
||||
private readonly AdminAppTicketRowService $rowService,
|
||||
private readonly PurchaseRefundSummaryService $refundSummaryService,
|
||||
) {}
|
||||
@@ -143,19 +147,20 @@ class AdminAppTicketService
|
||||
]);
|
||||
}
|
||||
|
||||
$configuration = $ticket->event_id === null ? $tenant : $ticket->event;
|
||||
$unitPrice = (float) $purchaseItem->precio_unitario;
|
||||
$itemTotal = (float) $purchaseItem->total;
|
||||
$itemRefundedAmount = $this->refundedAmountForPurchaseItem($purchaseItem);
|
||||
$remainingItemAmount = max(0.0, round($itemTotal - $itemRefundedAmount, 2));
|
||||
|
||||
$total = null;
|
||||
if ($tenant->allow_refund() && $tenant->allow_ticket_total_refund && $unitPrice <= $remainingItemAmount) {
|
||||
if ($configuration->allow_refund() && $configuration->allow_ticket_total_refund && $unitPrice <= $remainingItemAmount) {
|
||||
$total = number_format($unitPrice, 2, '.', '');
|
||||
}
|
||||
|
||||
$partial = null;
|
||||
if ($tenant->allow_refund() && $tenant->allow_partial_refund()) {
|
||||
$partialAmount = $this->refundAmount($purchaseItem, $tenant, 'partial');
|
||||
if ($configuration->allow_refund() && $configuration->allow_partial_refund()) {
|
||||
$partialAmount = $this->refundAmount($purchaseItem, $configuration, 'partial');
|
||||
if ($partialAmount <= $remainingItemAmount) {
|
||||
$partial = number_format($partialAmount, 2, '.', '');
|
||||
}
|
||||
@@ -173,14 +178,15 @@ class AdminAppTicketService
|
||||
string $refundType,
|
||||
?User $createdBy = null,
|
||||
): Ticket {
|
||||
$this->ensureRefundIsAllowed($tenant, $refundType);
|
||||
|
||||
return DB::transaction(function () use ($tenant, $ticketId, $refundType, $createdBy): Ticket {
|
||||
$ticket = Ticket::query()
|
||||
->where('tenant_code', $tenant->codigo)
|
||||
->lockForUpdate()
|
||||
->findOrFail($ticketId);
|
||||
|
||||
$configuration = $ticket->event_id === null ? $tenant : $ticket->event;
|
||||
$this->ensureRefundIsAllowed($configuration, $refundType);
|
||||
|
||||
if (! $ticket->can_refund()) {
|
||||
if ($ticket->status !== Ticket::STATUS_ACTIVE) {
|
||||
throw ValidationException::withMessages([
|
||||
@@ -203,7 +209,7 @@ class AdminAppTicketService
|
||||
]);
|
||||
}
|
||||
|
||||
$refundAmount = $this->refundAmount($purchaseItem, $tenant, $refundType);
|
||||
$refundAmount = $this->refundAmount($purchaseItem, $configuration, $refundType);
|
||||
$refundedAmount = round(
|
||||
$this->refundedAmountForPurchaseItem($purchaseItem) + $refundAmount,
|
||||
2,
|
||||
@@ -284,7 +290,7 @@ class AdminAppTicketService
|
||||
->sum('amount'), 2);
|
||||
}
|
||||
|
||||
private function ensureRefundIsAllowed(Tenant $tenant, string $refundType): void
|
||||
private function ensureRefundIsAllowed(Tenant|Event $tenant, string $refundType): void
|
||||
{
|
||||
$isAllowed = match ($refundType) {
|
||||
TicketRefund::TYPE_PARTIAL => $tenant->allow_refund() && $tenant->allow_partial_refund(),
|
||||
@@ -298,7 +304,7 @@ class AdminAppTicketService
|
||||
}
|
||||
}
|
||||
|
||||
private function refundAmount(PurchaseItem $purchaseItem, Tenant $tenant, string $refundType): float
|
||||
private function refundAmount(PurchaseItem $purchaseItem, Tenant|Event $tenant, string $refundType): float
|
||||
{
|
||||
$ticketAmount = (float) $purchaseItem->precio_unitario;
|
||||
|
||||
@@ -347,6 +353,13 @@ class AdminAppTicketService
|
||||
|
||||
$this->applyStatusFilter($query, $filters['status'] ?? null);
|
||||
|
||||
foreach ($this->attributeService->attributes($tenant) as $attribute) {
|
||||
$value = $filters[$attribute['code']] ?? null;
|
||||
if ($value !== null && $value !== '') {
|
||||
$this->whereVariantDefinition($query, $attribute['code'], (string) $value);
|
||||
}
|
||||
}
|
||||
|
||||
return $query;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Domains\Ticketing\Ticket\Services;
|
||||
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Domains\Ticketing\Ticket\Enums\ScanAttemptResult;
|
||||
use App\Domains\Ticketing\Ticket\Models\ScanAttempt;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
@@ -27,6 +28,7 @@ class ScannerTicketService
|
||||
->with('ticket.sourceCatalogItem.category')
|
||||
->where('tenant_code', $scanner->tenant_codigo)
|
||||
->where('scanner_user_id', $scanner->getKey())
|
||||
->when($this->eventId($scanner) !== null, fn (Builder $query) => $query->where('event_id', $this->eventId($scanner)))
|
||||
->when($search !== '', function (Builder $query) use ($search): void {
|
||||
$attemptedAtDate = $this->parseSearchDate($search);
|
||||
|
||||
@@ -60,6 +62,7 @@ class ScannerTicketService
|
||||
->with('ticket.sourceCatalogItem.category')
|
||||
->where('tenant_code', $scanner->tenant_codigo)
|
||||
->where('scanner_user_id', $scanner->getKey())
|
||||
->when($this->eventId($scanner) !== null, fn (Builder $query) => $query->where('event_id', $this->eventId($scanner)))
|
||||
->when($search !== '', function (Builder $query) use ($search): void {
|
||||
$attemptedAtDate = $this->parseSearchDate($search);
|
||||
$attemptedAtDayMonth = $this->parseSearchDayMonth($search);
|
||||
@@ -106,6 +109,7 @@ class ScannerTicketService
|
||||
->with('ticket')
|
||||
->where('tenant_code', $scanner->tenant_codigo)
|
||||
->where('scanner_user_id', $scanner->getKey())
|
||||
->when($this->eventId($scanner) !== null, fn (Builder $query) => $query->where('event_id', $this->eventId($scanner)))
|
||||
->findOrFail($scanAttemptId);
|
||||
|
||||
$scanAttempt->ticket?->loadMissing($this->relations());
|
||||
@@ -113,6 +117,11 @@ class ScannerTicketService
|
||||
return $scanAttempt;
|
||||
}
|
||||
|
||||
private function eventId(User $scanner): ?int
|
||||
{
|
||||
return app(EventScopeService::class)->eventId($scanner);
|
||||
}
|
||||
|
||||
private function parseSearchDate(string $search): ?string
|
||||
{
|
||||
if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $search, $matches) === 1) {
|
||||
@@ -154,7 +163,8 @@ class ScannerTicketService
|
||||
{
|
||||
$query = $this->baseQuery()
|
||||
->where('tenant_code', $scanner->tenant_codigo)
|
||||
->where('ticket', $ticketUuid);
|
||||
->where('ticket', $ticketUuid)
|
||||
->when($this->eventId($scanner) !== null, fn (Builder $query) => $query->where('event_id', $this->eventId($scanner)));
|
||||
|
||||
if ($this->requiresCategoryValidation($scanner)) {
|
||||
$categoryIds = $this->scannerCategoryIds($scanner);
|
||||
@@ -178,6 +188,7 @@ class ScannerTicketService
|
||||
$scanAttempt = ScanAttempt::query()->create([
|
||||
'tenant_code' => $scanner->tenant_codigo,
|
||||
'scanner_user_id' => $scanner->getKey(),
|
||||
'event_id' => $this->eventId($scanner),
|
||||
'data' => $this->serializeScannedData($scannedData),
|
||||
'result' => ScanAttemptResult::Processing,
|
||||
]);
|
||||
@@ -200,6 +211,7 @@ class ScannerTicketService
|
||||
$ticket = $this->baseQuery()
|
||||
->where('tenant_code', $scanner->tenant_codigo)
|
||||
->where('ticket', $scannedData)
|
||||
->when($this->eventId($scanner) !== null, fn (Builder $query) => $query->where('event_id', $this->eventId($scanner)))
|
||||
->lockForUpdate()
|
||||
->firstOrFail();
|
||||
$ticketId = (int) $ticket->getKey();
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Domains\Core\Auth\Services\AdminAppAccessService;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use Closure;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
@@ -10,10 +11,12 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
class EnsureAdminAppTenant
|
||||
{
|
||||
public function __construct(private readonly AdminAppAccessService $accessService) {}
|
||||
|
||||
/**
|
||||
* Ensure the authenticated user is an AdminApp user bound to a tenant.
|
||||
*/
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
public function handle(Request $request, Closure $next, string $access = 'tenant'): Response
|
||||
{
|
||||
$user = $request->user();
|
||||
|
||||
@@ -21,6 +24,9 @@ class EnsureAdminAppTenant
|
||||
! $user
|
||||
|| $user->rol_codigo !== RoleCode::AdminApp->value
|
||||
|| ! $user->tenant_codigo
|
||||
|| ! $this->accessService->hasValidScope($user)
|
||||
// Only routes implementing event authorization may accept event administrators.
|
||||
|| (! in_array($access, ['context', 'event'], true) && ! $user->isTenantAdministrator())
|
||||
) {
|
||||
throw new AuthorizationException;
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Domains\Core\Authorization\Enums\PermissionCode;
|
||||
use App\Domains\Core\Authorization\Enums\RoleCode;
|
||||
use Closure;
|
||||
@@ -27,6 +28,8 @@ class EnsureScannerTenant
|
||||
throw new AuthorizationException;
|
||||
}
|
||||
|
||||
app(EventScopeService::class)->eventId($user);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Shared\Forms\Controllers\AdminApp;
|
||||
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Shared\Forms\Resources\EventFormResource;
|
||||
use App\Shared\Forms\Services\EventFormService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class EventFormController extends Controller
|
||||
@@ -15,7 +16,8 @@ class EventFormController extends Controller
|
||||
{
|
||||
return EventFormResource::make(
|
||||
$this->eventFormService->get(
|
||||
$request->user('sanctum')->tenant()->firstOrFail()
|
||||
$request->user('sanctum')->tenant()->firstOrFail(),
|
||||
app(EventScopeService::class)->eventId($request->user())
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Shared\Forms\Controllers\AdminApp;
|
||||
|
||||
use App\Domains\Core\Auth\Services\EventScopeService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Shared\Forms\Resources\StaffFormResource;
|
||||
use App\Shared\Forms\Services\StaffFormService;
|
||||
use App\Http\Controllers\Controller;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class StaffFormController extends Controller
|
||||
@@ -15,7 +16,8 @@ class StaffFormController extends Controller
|
||||
{
|
||||
return StaffFormResource::make(
|
||||
$this->staffFormService->get(
|
||||
$request->user('sanctum')->tenant()->firstOrFail()
|
||||
$request->user('sanctum')->tenant()->firstOrFail(),
|
||||
app(EventScopeService::class)->eventId($request->user())
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,14 +4,17 @@ namespace App\Shared\Forms\Services;
|
||||
|
||||
use App\Domains\Core\Tenant\Models\SocialMedia;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
|
||||
class EventFormService
|
||||
{
|
||||
/** @return array{social_media: Collection<int, SocialMedia>} */
|
||||
public function get(Tenant $tenant): array
|
||||
public function get(Tenant $tenant, ?int $eventId = null): array
|
||||
{
|
||||
$event = $tenant->activeEvent;
|
||||
$event = $eventId === null ? $tenant->activeEvent
|
||||
: Event::query()
|
||||
->where('tenant_code', $tenant->codigo)->findOrFail($eventId);
|
||||
$urls = $event?->socialMedia()
|
||||
->pluck('event_social_media.url', 'social_media.code') ?? collect();
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Collection;
|
||||
class StaffFormService
|
||||
{
|
||||
/** @return array{categories: Collection<int, Category>} */
|
||||
public function get(Tenant $tenant): array
|
||||
public function get(Tenant $tenant, ?int $eventId = null): array
|
||||
{
|
||||
return [
|
||||
'categories' => Category::query()
|
||||
@@ -20,6 +20,8 @@ class StaffFormService
|
||||
->orWhereHas('catalogItems', fn (Builder $items) => $items
|
||||
->where('tenant_code', $tenant->codigo));
|
||||
})
|
||||
->when($eventId !== null, fn (Builder $query) => $query->whereHas(
|
||||
'catalogItems', fn (Builder $items) => $items->where('tenant_code', $tenant->codigo)->where('event_id', $eventId)))
|
||||
->orderBy('nombre')
|
||||
->get(),
|
||||
];
|
||||
|
||||
@@ -4,15 +4,19 @@ namespace App\Shared\Forms\Services;
|
||||
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketAttributeService;
|
||||
use App\Domains\Ticketing\Ticket\Services\AdminAppTicketColumnService;
|
||||
|
||||
class TicketFilterFormService
|
||||
{
|
||||
private const FIESTA_FUTBOL_INFANTIL = 'fiesta_futbol_infantil';
|
||||
|
||||
private const DESFILE_PURA_TENDENCIA = 'desfile_pura_tendencia';
|
||||
|
||||
public function __construct(
|
||||
private readonly TicketFormService $ticketFormService,
|
||||
private readonly AdminAppTicketColumnService $columnService,
|
||||
private readonly AdminAppTicketAttributeService $attributeService,
|
||||
) {}
|
||||
|
||||
/** @return array<string, mixed> */
|
||||
@@ -27,6 +31,13 @@ class TicketFilterFormService
|
||||
];
|
||||
}
|
||||
|
||||
if ($tenant->codigo === self::DESFILE_PURA_TENDENCIA) {
|
||||
$fields = [
|
||||
...$this->desfileFields($tenant),
|
||||
...$this->commonFields(),
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'code' => 'tickets_filter',
|
||||
'action' => '/api/v1/adminapp/tenant/tickets',
|
||||
@@ -36,6 +47,21 @@ class TicketFilterFormService
|
||||
];
|
||||
}
|
||||
|
||||
/** @return list<array<string, mixed>> */
|
||||
private function desfileFields(Tenant $tenant): array
|
||||
{
|
||||
return array_map(fn (array $attribute): array => [
|
||||
'name' => $attribute['code'],
|
||||
'query_param' => $attribute['code'],
|
||||
'label' => $attribute['label'],
|
||||
'type' => 'select',
|
||||
'required' => false,
|
||||
'default' => null,
|
||||
'placeholder' => $attribute['label'],
|
||||
'options' => $attribute['options'],
|
||||
], $this->attributeService->attributes($tenant));
|
||||
}
|
||||
|
||||
/** @return list<array<string, mixed>> */
|
||||
private function fiestaFutbolInfantilFields(Tenant $tenant): array
|
||||
{
|
||||
|
||||
@@ -12,33 +12,33 @@ use App\Shared\Forms\Controllers\AdminApp\TicketFormController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::prefix('v1/adminapp/forms')
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant:event'])
|
||||
->group(function (): void {
|
||||
Route::get('event', EventFormController::class);
|
||||
Route::get(
|
||||
'desfile/entry-reservation',
|
||||
DesfileEntryReservationFormController::class
|
||||
)->middleware('tenant.menu:adminapp.desfile.reservas')
|
||||
)->middleware('adminapp.tenant')->middleware('tenant.menu:adminapp.desfile.reservas')
|
||||
->name('adminapp.forms.desfile.entry-reservation');
|
||||
Route::get('sale', SaleFormController::class);
|
||||
Route::get('staff', StaffFormController::class);
|
||||
Route::get('tickets-filter', TicketFilterFormController::class)
|
||||
Route::get('tickets-filter', TicketFilterFormController::class)->middleware('adminapp.tenant')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.forms.tickets-filter');
|
||||
Route::get(
|
||||
'fiesta-futbol-infantil/ticket',
|
||||
TicketFormController::class
|
||||
);
|
||||
)->middleware('adminapp.tenant');
|
||||
Route::get(
|
||||
'fiesta-futbol-infantil/entry',
|
||||
EntryFormController::class
|
||||
);
|
||||
)->middleware('adminapp.tenant');
|
||||
Route::get(
|
||||
'fiesta-futbol-infantil/merchandise',
|
||||
MerchandiseFormController::class
|
||||
);
|
||||
)->middleware('adminapp.tenant');
|
||||
Route::get(
|
||||
'fiesta-futbol-infantil/food',
|
||||
FoodFormController::class
|
||||
);
|
||||
)->middleware('adminapp.tenant');
|
||||
});
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
namespace App\Shared\Integration\Services;
|
||||
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
||||
use App\Shared\Integration\Models\ClientIntegration;
|
||||
use App\Shared\Integration\Models\Integration;
|
||||
use App\Shared\Integration\Models\IntegrationInstance;
|
||||
use App\Shared\Integration\Models\AdminWebsiteTypeIntegration;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use Exception;
|
||||
use Illuminate\Http\Client\PendingRequest;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
@@ -86,6 +87,17 @@ abstract class BaseIntegrationService
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function forEvent(Event $event): self
|
||||
{
|
||||
$event->loadMissing(['client', 'tenant.client']);
|
||||
$this->tenant = $event->tenant;
|
||||
$this->tenantCode = $event->tenant_code;
|
||||
$this->clientContext = $event->effectiveClient();
|
||||
$this->loadIntegration();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load the integration definition and its effective instance configuration.
|
||||
*
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
namespace App\Shared\Integration\Services;
|
||||
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Core\Tenant\Models\AdminWebsiteType;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use Exception;
|
||||
use Illuminate\Contracts\Mail\Factory as MailFactory;
|
||||
use Illuminate\Contracts\Mail\Mailer;
|
||||
@@ -39,14 +40,7 @@ class MailService extends BaseIntegrationService
|
||||
public function forTenant(string $tenantCode): self
|
||||
{
|
||||
parent::forTenant($tenantCode);
|
||||
|
||||
if ($this->integrationInstance) {
|
||||
$this->mailer = $this->resolveMailer();
|
||||
$this->usesInstanceMailer = true;
|
||||
} else {
|
||||
$this->mailer = $this->mailFactory->mailer();
|
||||
$this->usesInstanceMailer = false;
|
||||
}
|
||||
$this->configureMailer();
|
||||
|
||||
return $this;
|
||||
}
|
||||
@@ -55,16 +49,30 @@ class MailService extends BaseIntegrationService
|
||||
{
|
||||
parent::forClient($client);
|
||||
$this->tenant = $this->clientContext?->tenants()->first();
|
||||
$this->configureMailer();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function forEvent(Event $event): self
|
||||
{
|
||||
parent::forEvent($event);
|
||||
$this->configureMailer();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
private function configureMailer(): void
|
||||
{
|
||||
if ($this->integrationInstance) {
|
||||
$this->mailer = $this->resolveMailer();
|
||||
$this->usesInstanceMailer = true;
|
||||
} else {
|
||||
$this->mailer = $this->mailFactory->mailer();
|
||||
$this->usesInstanceMailer = false;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
return $this;
|
||||
$this->mailer = $this->mailFactory->mailer();
|
||||
$this->usesInstanceMailer = false;
|
||||
}
|
||||
|
||||
public function getHeaders(): array
|
||||
@@ -83,7 +91,7 @@ class MailService extends BaseIntegrationService
|
||||
array $attachments = [],
|
||||
): void {
|
||||
if (! $this->mailer || ! $this->tenant) {
|
||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
||||
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||
}
|
||||
|
||||
$brand ??= $this->tenant;
|
||||
@@ -160,7 +168,7 @@ class MailService extends BaseIntegrationService
|
||||
public function onSetup(): void
|
||||
{
|
||||
if (! $this->mailer || ! $this->clientContext) {
|
||||
throw new Exception('MailService no está configurado. Llamá a forTenant() o forClient() primero.');
|
||||
throw new Exception('MailService no está configurado. Llamá a forTenant(), forClient() o forEvent() primero.');
|
||||
}
|
||||
|
||||
$recipient = $this->getIntegrationSetting('MAIL_FROM_ADDRESS');
|
||||
|
||||
@@ -46,7 +46,7 @@ class TelepagosIntegrationService extends BaseIntegrationService
|
||||
public function getToken(): string
|
||||
{
|
||||
if (! $this->integrationInstance) {
|
||||
throw new Exception('Client integration is not loaded. Call forTenant() or forClient() first.');
|
||||
throw new Exception('Client integration is not loaded. Call forTenant(), forClient(), or forEvent() first.');
|
||||
}
|
||||
|
||||
$cacheKey = $this->integrationInstance->tokenCacheKey();
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
namespace App\Shared\Integration\Services;
|
||||
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||
use App\Domains\Commerce\Purchase\Models\TelepagosPayment;
|
||||
use App\Domains\Commerce\Purchase\Models\TelepagosQr;
|
||||
use App\Domains\Commerce\Purchase\Services\CheckoutService;
|
||||
use App\Domains\Commerce\Purchase\Services\DniDistanceService;
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use Exception;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
@@ -75,9 +75,30 @@ class TelepagosWebhookService
|
||||
|
||||
$dni = substr($cuit, 2, -1);
|
||||
|
||||
$tenantCodes = $client->tenants()->pluck('codigo');
|
||||
$eligiblePurchases = Purchase::query()
|
||||
->whereIn('tenant_codigo', $tenantCodes)
|
||||
->where(function (Builder $purchases) use ($client): void {
|
||||
$purchases
|
||||
->whereHas('event', function (Builder $events) use ($client): void {
|
||||
$events
|
||||
->where('client_id', $client->id)
|
||||
->orWhere(function (Builder $fallback) use ($client): void {
|
||||
$fallback
|
||||
->whereNull('client_id')
|
||||
->whereHas(
|
||||
'tenant',
|
||||
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||
);
|
||||
});
|
||||
})
|
||||
->orWhere(function (Builder $legacy) use ($client): void {
|
||||
$legacy
|
||||
->whereNull('event_id')
|
||||
->whereHas(
|
||||
'tenant',
|
||||
fn (Builder $tenants): Builder => $tenants->where('client_id', $client->id),
|
||||
);
|
||||
});
|
||||
})
|
||||
->whereIn('status', [
|
||||
Purchase::STATUS_CREATED,
|
||||
Purchase::STATUS_PENDING_PAYMENT,
|
||||
@@ -170,7 +191,7 @@ class TelepagosWebhookService
|
||||
return;
|
||||
}
|
||||
|
||||
if (! $client->tenants()->where('codigo', $compra->tenant_codigo)->exists()) {
|
||||
if (! $this->purchaseBelongsToClient($compra, $client)) {
|
||||
Log::channel('telepagos')->warning('Telepagos webhook: Purchase does not belong to client.', [
|
||||
'client_code' => $client->code,
|
||||
'cashin_id' => $cashinId,
|
||||
@@ -244,6 +265,16 @@ class TelepagosWebhookService
|
||||
return number_format((float) $amount, 2, '.', '');
|
||||
}
|
||||
|
||||
private function purchaseBelongsToClient(Purchase $purchase, Client $client): bool
|
||||
{
|
||||
$purchase->loadMissing(['event.client', 'event.tenant.client', 'tenant.client']);
|
||||
|
||||
$effectiveClient = $purchase->event?->effectiveClient()
|
||||
?? $purchase->tenant?->client;
|
||||
|
||||
return $effectiveClient?->is($client) ?? false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Builder<Purchase> $eligiblePurchases
|
||||
* @return Collection<int, Purchase>
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
namespace App\Shared\Notification\Services;
|
||||
|
||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||
use App\Domains\Core\Auth\Models\ResetPasswordAttempt;
|
||||
use App\Domains\Core\Auth\Models\User;
|
||||
use App\Shared\Integration\Services\MailService;
|
||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||
use App\Domains\Commerce\Purchase\Models\Purchase;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Services\TicketPdfService;
|
||||
use App\Domains\Ticketing\Ticket\Services\TicketPresentationResolver;
|
||||
use App\Domains\Ticketing\Ticket\Services\TicketValidityResolver;
|
||||
use App\Shared\Integration\Services\MailService;
|
||||
use App\Shared\Notification\Events\PasswordResetRequested;
|
||||
use Closure;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
@@ -158,7 +158,7 @@ class NotificationMailService
|
||||
$context = ['purchase_id' => $purchaseId];
|
||||
|
||||
$purchase = Purchase::query()
|
||||
->with(['tenant', 'user', 'items'])
|
||||
->with(['event', 'tenant', 'user', 'items'])
|
||||
->find($purchaseId);
|
||||
|
||||
if ($purchase === null) {
|
||||
@@ -197,8 +197,7 @@ class NotificationMailService
|
||||
'mime' => 'application/pdf',
|
||||
]];
|
||||
|
||||
$this->mailService
|
||||
->forTenant($purchase->tenant_codigo)
|
||||
$this->mailForPurchase($purchase)
|
||||
->send(
|
||||
$recipient,
|
||||
"Compra confirmada - Compra #{$purchase->getKey()}",
|
||||
@@ -286,7 +285,6 @@ class NotificationMailService
|
||||
$context,
|
||||
$recipient,
|
||||
function () use (
|
||||
$tenantCode,
|
||||
$purchase,
|
||||
$recipient,
|
||||
$previousDate,
|
||||
@@ -295,8 +293,7 @@ class NotificationMailService
|
||||
): array {
|
||||
$brand = $purchase->tenant;
|
||||
|
||||
$this->mailService
|
||||
->forTenant($tenantCode)
|
||||
$this->mailForPurchase($purchase)
|
||||
->send(
|
||||
$recipient,
|
||||
"Tu evento fue reprogramado - N° de Orden #{$purchase->getKey()}",
|
||||
@@ -387,7 +384,6 @@ class NotificationMailService
|
||||
$context,
|
||||
$recipient,
|
||||
function () use (
|
||||
$tenantCode,
|
||||
$purchase,
|
||||
$recipient,
|
||||
$date,
|
||||
@@ -396,8 +392,7 @@ class NotificationMailService
|
||||
): array {
|
||||
$brand = $purchase->tenant;
|
||||
|
||||
$this->mailService
|
||||
->forTenant($tenantCode)
|
||||
$this->mailForPurchase($purchase)
|
||||
->send(
|
||||
$recipient,
|
||||
"Una fecha de tu evento fue suspendida - N° de Orden #{$purchase->getKey()}",
|
||||
@@ -421,10 +416,17 @@ class NotificationMailService
|
||||
{
|
||||
return Purchase::query()
|
||||
->where('tenant_codigo', $tenantCode)
|
||||
->with(['tenant', 'user'])
|
||||
->with(['event', 'tenant', 'user'])
|
||||
->find($purchaseId);
|
||||
}
|
||||
|
||||
private function mailForPurchase(Purchase $purchase): MailService
|
||||
{
|
||||
return $purchase->event
|
||||
? $this->mailService->forEvent($purchase->event)
|
||||
: $this->mailService->forTenant($purchase->tenant_codigo);
|
||||
}
|
||||
|
||||
private function recipientFor(Purchase $purchase): string
|
||||
{
|
||||
return (string) ($purchase->email ?: $purchase->user?->email);
|
||||
|
||||
@@ -11,7 +11,9 @@ return new class extends Migration
|
||||
|
||||
private const MANIFEST = 'data/mutual_smep_catalog_v1.json';
|
||||
|
||||
private const STORAGE_PREFIX = 'tenants/mutual_smep/catalog-v1/';
|
||||
private const STORAGE_PREFIX = 'tenants/mutual_smep/catalog-v2/';
|
||||
|
||||
private const LEGACY_STORAGE_PREFIX = 'tenants/mutual_smep/catalog-v1/';
|
||||
|
||||
private const BRAND_MARKER = 'Provisioned by Mutual SMEP catalog migration v1.';
|
||||
|
||||
@@ -27,6 +29,8 @@ return new class extends Migration
|
||||
|
||||
private const HIGHLIGHTED_GROUP_CODE = 'productos-destacados-smep';
|
||||
|
||||
private const CATEGORY_FEATURED_ITEM_LIMIT = 6;
|
||||
|
||||
/** @var list<string> */
|
||||
private const HIGHLIGHTED_PRODUCT_SLUGS = [
|
||||
'acolchado-kavanagh-simil-plumon-reversible',
|
||||
@@ -178,7 +182,9 @@ return new class extends Migration
|
||||
->values();
|
||||
$storedPaths = DB::table('attachments')
|
||||
->whereIn('id', $attachmentIds)
|
||||
->where(fn ($query) => $query
|
||||
->where('path', 'like', self::STORAGE_PREFIX.'%')
|
||||
->orWhere('path', 'like', self::LEGACY_STORAGE_PREFIX.'%'))
|
||||
->pluck('path')
|
||||
->all();
|
||||
|
||||
@@ -360,6 +366,7 @@ return new class extends Migration
|
||||
->where('categorias.categoria_id', $categoryId)
|
||||
->orderBy('catalog_items.group_order')
|
||||
->orderBy('catalog_items.id')
|
||||
->limit(self::CATEGORY_FEATURED_ITEM_LIMIT)
|
||||
->pluck('catalog_items.id');
|
||||
|
||||
foreach ($catalogItemIds as $itemOrder => $catalogItemId) {
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
private const TENANT_CODE = 'mutual_smep';
|
||||
|
||||
private const ITEM_LIMIT = 6;
|
||||
|
||||
/** @var array<string, string> */
|
||||
private const GROUPS = [
|
||||
'smep-dormitorio-y-blanco' => 'Dormitorio y Blanco',
|
||||
'smep-electrodomesticos' => 'Electrodomésticos',
|
||||
'smep-climatizacion' => 'Climatización',
|
||||
'smep-tecnologia' => 'Tecnología',
|
||||
'smep-bicicletas-y-aire-libre' => 'Bicicletas y Aire Libre',
|
||||
'smep-bazar' => 'Bazar',
|
||||
];
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
foreach (array_keys(self::GROUPS) as $code) {
|
||||
$groupId = DB::table('featured_groups')
|
||||
->where('tenant_code', self::TENANT_CODE)
|
||||
->where('code', $code)
|
||||
->value('id');
|
||||
|
||||
if ($groupId === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$keptItemIds = DB::table('featured_items')
|
||||
->where('featured_group_id', $groupId)
|
||||
->orderBy('order')
|
||||
->orderBy('id')
|
||||
->limit(self::ITEM_LIMIT)
|
||||
->pluck('id');
|
||||
|
||||
DB::table('featured_items')
|
||||
->where('featured_group_id', $groupId)
|
||||
->when(
|
||||
$keptItemIds->isNotEmpty(),
|
||||
fn ($query) => $query->whereNotIn('id', $keptItemIds),
|
||||
)
|
||||
->delete();
|
||||
}
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
foreach (self::GROUPS as $code => $parentCategoryName) {
|
||||
$groupId = DB::table('featured_groups')
|
||||
->where('tenant_code', self::TENANT_CODE)
|
||||
->where('code', $code)
|
||||
->value('id');
|
||||
$parentCategoryId = DB::table('categorias')
|
||||
->where('tenant_code', self::TENANT_CODE)
|
||||
->whereNull('categoria_id')
|
||||
->where('nombre', $parentCategoryName)
|
||||
->value('id');
|
||||
|
||||
if ($groupId === null || $parentCategoryId === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$catalogItemIds = DB::table('catalog_items')
|
||||
->join('categorias', 'categorias.id', '=', 'catalog_items.category_id')
|
||||
->where('catalog_items.tenant_code', self::TENANT_CODE)
|
||||
->where('categorias.tenant_code', self::TENANT_CODE)
|
||||
->where('categorias.categoria_id', $parentCategoryId)
|
||||
->orderBy('catalog_items.group_order')
|
||||
->orderBy('catalog_items.id')
|
||||
->pluck('catalog_items.id');
|
||||
|
||||
DB::table('featured_items')->where('featured_group_id', $groupId)->delete();
|
||||
|
||||
foreach ($catalogItemIds as $order => $catalogItemId) {
|
||||
DB::table('featured_items')->insert([
|
||||
'featured_group_id' => $groupId,
|
||||
'catalog_item_id' => $catalogItemId,
|
||||
'order' => $order + 1,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,112 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
private const TENANT_CODE = 'mutual_smep';
|
||||
|
||||
private const LEGACY_PREFIX = 'tenants/mutual_smep/catalog-v1/';
|
||||
|
||||
private const OPTIMIZED_PREFIX = 'tenants/mutual_smep/catalog-v2/';
|
||||
|
||||
private const LOCAL_PREFIX = 'images/tennants/mutual_smep/catalog/';
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
$attachments = $this->attachments(self::LEGACY_PREFIX);
|
||||
$uploadedPaths = [];
|
||||
|
||||
try {
|
||||
foreach ($attachments as $attachment) {
|
||||
$relativePath = Str::after($attachment->path, self::LEGACY_PREFIX);
|
||||
$localPath = public_path(self::LOCAL_PREFIX.$relativePath);
|
||||
|
||||
if (! is_file($localPath)) {
|
||||
throw new RuntimeException("Optimized catalog image not found: {$localPath}");
|
||||
}
|
||||
|
||||
$contents = file_get_contents($localPath);
|
||||
if ($contents === false) {
|
||||
throw new RuntimeException("Optimized catalog image could not be read: {$localPath}");
|
||||
}
|
||||
|
||||
$optimizedPath = self::OPTIMIZED_PREFIX.$relativePath;
|
||||
if (! Storage::disk('s3')->put($optimizedPath, $contents)) {
|
||||
throw new RuntimeException("Optimized catalog image could not be stored: {$optimizedPath}");
|
||||
}
|
||||
|
||||
$uploadedPaths[] = $optimizedPath;
|
||||
$attachment->optimized_path = $optimizedPath;
|
||||
$attachment->optimized_size = strlen($contents);
|
||||
}
|
||||
|
||||
DB::transaction(function () use ($attachments): void {
|
||||
foreach ($attachments as $attachment) {
|
||||
DB::table('attachments')->where('id', $attachment->id)->update([
|
||||
'path' => $attachment->optimized_path,
|
||||
'size' => $attachment->optimized_size,
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
}
|
||||
});
|
||||
} catch (Throwable $throwable) {
|
||||
Storage::disk('s3')->delete($uploadedPaths);
|
||||
|
||||
throw $throwable;
|
||||
}
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
$attachments = $this->attachments(self::OPTIMIZED_PREFIX)
|
||||
->filter(function (object $attachment): bool {
|
||||
$relativePath = Str::after($attachment->path, self::OPTIMIZED_PREFIX);
|
||||
$legacyPath = self::LEGACY_PREFIX.$relativePath;
|
||||
|
||||
if (! Storage::disk('s3')->exists($legacyPath)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$attachment->legacy_path = $legacyPath;
|
||||
$attachment->legacy_size = Storage::disk('s3')->size($legacyPath);
|
||||
|
||||
return true;
|
||||
})
|
||||
->values();
|
||||
|
||||
DB::transaction(function () use ($attachments): void {
|
||||
foreach ($attachments as $attachment) {
|
||||
DB::table('attachments')->where('id', $attachment->id)->update([
|
||||
'path' => $attachment->legacy_path,
|
||||
'size' => $attachment->legacy_size,
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
Storage::disk('s3')->delete($attachments->pluck('path')->all());
|
||||
}
|
||||
|
||||
private function attachments(string $prefix): Collection
|
||||
{
|
||||
return DB::table('attachments')
|
||||
->join(
|
||||
'catalog_items_attachments',
|
||||
'catalog_items_attachments.attachment_id',
|
||||
'=',
|
||||
'attachments.id',
|
||||
)
|
||||
->join('catalog_items', 'catalog_items.id', '=', 'catalog_items_attachments.catalog_item_id')
|
||||
->where('catalog_items.tenant_code', self::TENANT_CODE)
|
||||
->where('attachments.path', 'like', $prefix.'%')
|
||||
->select('attachments.id', 'attachments.path', 'attachments.size')
|
||||
->distinct()
|
||||
->orderBy('attachments.id')
|
||||
->get();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
private const MENU_CODE = 'adminapp.tickets';
|
||||
|
||||
private const TENANT_CODE = 'desfile_pura_tendencia';
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
if (
|
||||
! DB::table('menues')->where('code', self::MENU_CODE)->exists()
|
||||
|| ! DB::table('tenants')->where('codigo', self::TENANT_CODE)->exists()
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
$now = now();
|
||||
|
||||
DB::table('tenants_menues')->updateOrInsert(
|
||||
[
|
||||
'tenant_code' => self::TENANT_CODE,
|
||||
'menu_code' => self::MENU_CODE,
|
||||
],
|
||||
[
|
||||
'static_content' => null,
|
||||
'created_at' => $now,
|
||||
'updated_at' => $now,
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
DB::table('tenants_menues')
|
||||
->where('tenant_code', self::TENANT_CODE)
|
||||
->where('menu_code', self::MENU_CODE)
|
||||
->delete();
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('events', function (Blueprint $table): void {
|
||||
$table->foreignId('client_id')
|
||||
->nullable()
|
||||
->after('id')
|
||||
->constrained('clients')
|
||||
->restrictOnDelete();
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('events', function (Blueprint $table): void {
|
||||
$table->dropConstrainedForeignId('client_id');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('compras', function (Blueprint $table): void {
|
||||
$table->foreignId('event_id')
|
||||
->nullable()
|
||||
->after('tenant_codigo')
|
||||
->constrained('events')
|
||||
->nullOnDelete();
|
||||
});
|
||||
|
||||
DB::table('compras')
|
||||
->orderBy('id')
|
||||
->each(function (object $purchase): void {
|
||||
$eventIds = DB::table('compra_items')
|
||||
->join('catalog_items', 'catalog_items.id', '=', 'compra_items.source_catalog_item_id')
|
||||
->where('compra_items.compra_id', $purchase->id)
|
||||
->whereNotNull('catalog_items.event_id')
|
||||
->distinct()
|
||||
->pluck('catalog_items.event_id');
|
||||
|
||||
if ($eventIds->count() === 1) {
|
||||
DB::table('compras')
|
||||
->where('id', $purchase->id)
|
||||
->update(['event_id' => $eventIds->first()]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('compras', function (Blueprint $table): void {
|
||||
$table->dropConstrainedForeignId('event_id');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
private const EVENT_TITLE = '26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas';
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
$clientId = DB::table('clients')
|
||||
->where('code', 'pyme_rural')
|
||||
->value('id');
|
||||
|
||||
if ($clientId === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DB::table('events')
|
||||
->where('tenant_code', 'onticket')
|
||||
->where('title', self::EVENT_TITLE)
|
||||
->update(['client_id' => $clientId]);
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
$clientId = DB::table('clients')
|
||||
->where('code', 'pyme_rural')
|
||||
->value('id');
|
||||
|
||||
if ($clientId === null) {
|
||||
return;
|
||||
}
|
||||
|
||||
DB::table('events')
|
||||
->where('tenant_code', 'onticket')
|
||||
->where('title', self::EVENT_TITLE)
|
||||
->where('client_id', $clientId)
|
||||
->update(['client_id' => null]);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table): void {
|
||||
// Existing administrators keep their tenant-wide access.
|
||||
$table->string('admin_scope', 20)->default('tenant');
|
||||
$table->foreignId('event_id')->nullable()->constrained('events')->nullOnDelete();
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table): void {
|
||||
$table->dropConstrainedForeignId('event_id');
|
||||
$table->dropColumn('admin_scope');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
DB::transaction(function (): void {
|
||||
DB::table('tenants')
|
||||
->join('events', 'events.id', '=', 'tenants.active_event_id')
|
||||
->whereColumn('events.tenant_code', 'tenants.codigo')
|
||||
->select('tenants.codigo', 'tenants.active_event_id')
|
||||
->get()
|
||||
->each(function (object $tenant): void {
|
||||
DB::table('users')
|
||||
->whereIn('rol_codigo', ['adminapp', 'scanner'])
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->where('admin_scope', 'tenant')
|
||||
->whereNull('event_id')
|
||||
->whereNull('deleted_at')
|
||||
->update([
|
||||
'admin_scope' => 'event',
|
||||
'event_id' => $tenant->active_event_id,
|
||||
'updated_at' => now(),
|
||||
]);
|
||||
});
|
||||
|
||||
// Missing or mismatched active events must not leave legacy staff with tenant-wide access.
|
||||
DB::table('users')
|
||||
->whereIn('rol_codigo', ['adminapp', 'scanner'])
|
||||
->where('admin_scope', 'tenant')
|
||||
->whereNull('event_id')
|
||||
->whereNull('deleted_at')
|
||||
->update(['admin_scope' => 'event', 'updated_at' => now()]);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
// Do not broaden permissions or overwrite subsequent assignments on rollback.
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('events', function (Blueprint $table): void {
|
||||
$table->boolean('allow_ticket_refund')->default(false);
|
||||
$table->boolean('allow_ticket_total_refund')->default(false);
|
||||
$table->boolean('allow_ticket_partial_refund')->default(false);
|
||||
$table->decimal('ticket_partial_refund_percentage', 5, 2)->default(0);
|
||||
});
|
||||
DB::table('tenants')->select([
|
||||
'codigo', 'allow_ticket_refund', 'allow_ticket_total_refund',
|
||||
'allow_ticket_partial_refund', 'ticket_partial_refund_percentage',
|
||||
])->get()->each(function (object $tenant): void {
|
||||
DB::table('events')->where('tenant_code', $tenant->codigo)->update([
|
||||
'allow_ticket_refund' => $tenant->allow_ticket_refund,
|
||||
'allow_ticket_total_refund' => $tenant->allow_ticket_total_refund,
|
||||
'allow_ticket_partial_refund' => $tenant->allow_ticket_partial_refund,
|
||||
'ticket_partial_refund_percentage' => $tenant->ticket_partial_refund_percentage ?? 0,
|
||||
]);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('events', fn (Blueprint $table) => $table->dropColumn([
|
||||
'allow_ticket_refund', 'allow_ticket_total_refund',
|
||||
'allow_ticket_partial_refund', 'ticket_partial_refund_percentage',
|
||||
]));
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,22 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
DB::transaction(function (): void {
|
||||
$codes = ['adminapp.combos', 'adminapp.categories'];
|
||||
DB::table('roles_menues')->whereIn('menu_codigo', $codes)->delete();
|
||||
DB::table('tenants_menues')->whereIn('menu_code', $codes)->delete();
|
||||
DB::table('menues')->whereIn('code', $codes)->delete();
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
// Deprecated menus must not be restored by rollback.
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('scan_attempts', function (Blueprint $table): void {
|
||||
$table->foreignId('event_id')->nullable()->constrained('events')->nullOnDelete();
|
||||
$table->index(['scanner_user_id', 'event_id']);
|
||||
});
|
||||
DB::table('scan_attempts')->update([
|
||||
'event_id' => DB::raw('(SELECT tickets.event_id FROM tickets WHERE tickets.id = scan_attempts.ticket_id)'),
|
||||
]);
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('scan_attempts', function (Blueprint $table): void {
|
||||
$table->dropIndex(['scanner_user_id', 'event_id']);
|
||||
$table->dropConstrainedForeignId('event_id');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
const CATALOG_IMAGE_MAX_DIMENSION = 960;
|
||||
const CATALOG_IMAGE_WEBP_QUALITY = 76;
|
||||
|
||||
$sourceRoot = 'C:\\Users\\ncoronel\\Documents\\catalogo_smep_limpio';
|
||||
$projectRoot = dirname(__DIR__, 2);
|
||||
$assetRoot = $projectRoot.'/public/images/tennants/mutual_smep/catalog';
|
||||
@@ -153,7 +156,7 @@ function compressCatalogImage(string $source, string $destination): void
|
||||
|
||||
$width = imagesx($sourceImage);
|
||||
$height = imagesy($sourceImage);
|
||||
$scale = min(1, 1200 / max($width, $height));
|
||||
$scale = min(1, CATALOG_IMAGE_MAX_DIMENSION / max($width, $height));
|
||||
$targetWidth = max(1, (int) round($width * $scale));
|
||||
$targetHeight = max(1, (int) round($height * $scale));
|
||||
$targetImage = imagecreatetruecolor($targetWidth, $targetHeight);
|
||||
@@ -181,7 +184,7 @@ function compressCatalogImage(string $source, string $destination): void
|
||||
throw new RuntimeException("Unable to create directory: {$destinationDirectory}");
|
||||
}
|
||||
|
||||
if (! imagewebp($targetImage, $destination, 82)) {
|
||||
if (! imagewebp($targetImage, $destination, CATALOG_IMAGE_WEBP_QUALITY)) {
|
||||
throw new RuntimeException("Unable to write WebP image: {$destination}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ use App\Domains\Commerce\Catalog\Enums\InventoryPolicy;
|
||||
use App\Domains\Commerce\Catalog\Models\Attribute;
|
||||
use App\Domains\Commerce\Catalog\Models\CatalogItem;
|
||||
use App\Domains\Commerce\Catalog\Services\CatalogService;
|
||||
use App\Domains\Core\Client\Models\Client;
|
||||
use App\Domains\Core\Tenant\Models\Tenant;
|
||||
use App\Domains\Ticketing\Event\Models\Event;
|
||||
use App\Shared\Attachable\Services\AttachmentService;
|
||||
@@ -35,6 +36,12 @@ class FiestaTradicionArrufoSeeder extends Seeder
|
||||
throw new RuntimeException("Tenant 'onticket' no encontrado.");
|
||||
}
|
||||
|
||||
$client = Client::query()->where('code', 'pyme_rural')->first();
|
||||
|
||||
if ($client === null) {
|
||||
throw new RuntimeException("Client 'pyme_rural' no encontrado.");
|
||||
}
|
||||
|
||||
Attribute::query()->firstOrCreate(
|
||||
['tenant_codigo' => $tenant->codigo, 'codigo' => 'event_date'],
|
||||
['nombre' => 'Fecha', 'type' => FieldType::EventDate, 'is_required' => true],
|
||||
@@ -45,6 +52,7 @@ class FiestaTradicionArrufoSeeder extends Seeder
|
||||
['published_at' => now()],
|
||||
);
|
||||
$event->update([
|
||||
'client_id' => $client->id,
|
||||
'subtitle' => 'Una noche para celebrar nuestras raíces y mantener viva la tradición gaucha.',
|
||||
'description' => 'La 26.º Fiesta de la Tradición y 4.º Encuentro de Agrupaciones Gauchas reunirá a agrupaciones, artesanos, pilcheros y público en general para compartir una jornada dedicada a nuestras costumbres y cultura.'
|
||||
."\n\n".'Un encuentro para disfrutar de la tradición, la identidad gaucha y el espíritu de camaradería, en el Predio de Doma del Club Unión Deportiva Arrufó.'
|
||||
|
||||
@@ -70,18 +70,6 @@ class MenuSeeder extends Seeder
|
||||
'parent_menu_code' => 'main.adminapp',
|
||||
'route' => '/admin/catalog',
|
||||
],
|
||||
[
|
||||
'code' => 'adminapp.combos',
|
||||
'label' => 'Combos',
|
||||
'parent_menu_code' => 'main.adminapp',
|
||||
'route' => '/admin/combos',
|
||||
],
|
||||
[
|
||||
'code' => 'adminapp.categories',
|
||||
'label' => 'Categorías',
|
||||
'parent_menu_code' => 'main.adminapp',
|
||||
'route' => '/admin/categories',
|
||||
],
|
||||
[
|
||||
'code' => 'adminapp.ventas',
|
||||
'label' => 'Ventas',
|
||||
@@ -242,6 +230,8 @@ class MenuSeeder extends Seeder
|
||||
->whereIn('code', [
|
||||
'admin.event',
|
||||
'admin.catalog',
|
||||
'adminapp.combos',
|
||||
'adminapp.categories',
|
||||
'admin.combos',
|
||||
'admin.categories',
|
||||
'admin.ventas',
|
||||
@@ -298,8 +288,10 @@ class MenuSeeder extends Seeder
|
||||
'fiesta_futbol_infantil',
|
||||
'mutual_smep',
|
||||
];
|
||||
$fiestaCategoryMenuCodes = [
|
||||
$ticketAdminMenuCodes = [
|
||||
'adminapp.tickets',
|
||||
];
|
||||
$fiestaCategoryMenuCodes = [
|
||||
'adminapp.fiesta-futbol-infantil.entradas',
|
||||
'adminapp.fiesta-futbol-infantil.alojamientos',
|
||||
'adminapp.fiesta-futbol-infantil.merchandising',
|
||||
@@ -416,6 +408,10 @@ class MenuSeeder extends Seeder
|
||||
$menuCodes = array_diff($menuCodes, $helpMenuCodes);
|
||||
}
|
||||
|
||||
if (! in_array($tenant->codigo, ['fiesta_futbol_infantil', 'desfile_pura_tendencia'], true)) {
|
||||
$menuCodes = array_diff($menuCodes, $ticketAdminMenuCodes);
|
||||
}
|
||||
|
||||
if ($tenant->codigo !== 'fiesta_futbol_infantil') {
|
||||
$menuCodes = array_diff($menuCodes, $fiestaCategoryMenuCodes);
|
||||
} else {
|
||||
|
||||
@@ -133,7 +133,7 @@ Para facilitar futuras incorporaciones, también quedaron preparadas opciones ha
|
||||
|
||||
### Imágenes optimizadas
|
||||
|
||||
Se incorporaron **511 imágenes de productos**. Fueron optimizadas para reducir su peso aproximado de 30 MB a 14,3 MB, sin modificar el contenido de las fotografías. Esto ayuda a que la tienda cargue más rápido y consuma menos datos móviles.
|
||||
Se incorporaron **511 imágenes de productos**. Fueron optimizadas para reducir su peso aproximado de 30 MB a 9,2 MB, sin modificar el contenido de las fotografías. Esto ayuda a que la tienda cargue más rápido y consuma menos datos móviles.
|
||||
|
||||
### Existencias iniciales
|
||||
|
||||
@@ -177,14 +177,14 @@ También se crearon seis filas adicionales, una por cada categoría principal:
|
||||
|
||||
| Sección | Productos incluidos |
|
||||
|---|---:|
|
||||
| Dormitorio y Blanco | 24 |
|
||||
| Electrodomésticos | 53 |
|
||||
| Climatización | 16 |
|
||||
| Tecnología | 36 |
|
||||
| Bicicletas y Aire Libre | 10 |
|
||||
| Dormitorio y Blanco | 6 |
|
||||
| Electrodomésticos | 6 |
|
||||
| Climatización | 6 |
|
||||
| Tecnología | 6 |
|
||||
| Bicicletas y Aire Libre | 6 |
|
||||
| Bazar | 3 |
|
||||
|
||||
Los **142 productos** aparecen dentro de la sección que les corresponde. Algunos también se repiten en “Productos destacados” de manera intencional, porque esa primera fila funciona como vidriera y no como una categoría adicional.
|
||||
Estas filas funcionan como una vidriera breve: muestran una selección de cada rubro sin sobrecargar la portada. Los **142 productos** continúan disponibles mediante las categorías, subcategorías y el buscador. Algunos artículos también se repiten en “Productos destacados” de manera intencional.
|
||||
|
||||
## 7. Principales mejoras para los clientes
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 45 KiB |
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 50 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 161 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 105 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 53 KiB |
|
Before Width: | Height: | Size: 107 KiB After Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 58 KiB |