Compare commits
25 Commits
8d5a12f212
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 {
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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,14 @@ 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'])]
|
||||
class Event extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected function casts(): array
|
||||
{
|
||||
return ['published_at' => 'datetime', 'exact_location' => 'array'];
|
||||
return ['client_id' => 'integer', 'published_at' => 'datetime', 'exact_location' => 'array'];
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Tenant, $this> */
|
||||
@@ -30,6 +31,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
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
@@ -192,7 +193,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 +238,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 +256,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,12 +2,12 @@
|
||||
|
||||
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\Ticket\Models\Ticket;
|
||||
use App\Domains\Ticketing\Ticket\Models\TicketRefund;
|
||||
@@ -27,11 +27,13 @@ class AdminAppTicketService
|
||||
'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,
|
||||
) {}
|
||||
@@ -347,6 +349,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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
};
|
||||
@@ -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ó.'
|
||||
|
||||
@@ -298,8 +298,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 +418,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 |
|
Before Width: | Height: | Size: 88 KiB After Width: | Height: | Size: 49 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 148 KiB After Width: | Height: | Size: 95 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 7.8 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 12 KiB |