tbianchini/shopit-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(tickets): show numeric id and remove date column

Browse Source
This commit is contained in:
ncoronel
2026-09-01 11:53:47 -03:00
parent 58b15f3026
commit 80b8707771
6 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Domains/Ticket/Services/AdminAppTicketColumnService.php
View File

@@ -12,8 +12,8 @@ class AdminAppTicketColumnService
public function columns(Tenant $tenant): array
{
$keys = $tenant->codigo === self::FIESTA_FUTBOL_INFANTIL
? ['order_number', 'category', 'product', 'type', 'amount', 'client', 'ticket', 'date', 'status', 'scanned_by']
: ['order_number', 'product', 'amount', 'client', 'ticket', 'date', 'status', 'scanned_by'];
? ['order_number', 'category', 'product', 'type', 'amount', 'client', 'id', 'status', 'scanned_by']
: ['order_number', 'product', 'amount', 'client', 'id', 'status', 'scanned_by'];
$columns = array_map(fn (string $key): array => $this->definitions()[$key], $keys);
@@ -31,8 +31,7 @@ class AdminAppTicketColumnService
'product' => '15%',
'amount' => '10%',
'client' => '15%',
'ticket' => '19%',
'date' => '11%',
'id' => '8%',
'status' => '8%',
'scanned_by' => '11%',
];
@@ -75,8 +74,7 @@ class AdminAppTicketColumnService
'type' => $this->column('type', 'Tipo', 'text', '8%', 18),
'amount' => $this->column('amount', 'Importe', 'currency', '9%', 15),
'client' => $this->column('client', 'Cliente', 'text', '13%', 30),
'ticket' => $this->column('ticket', 'ID', 'text', '14.5%', 39),
'date' => $this->column('date', 'Fecha', 'date', '9.5%', 20),
'id' => $this->column('id', 'ID', 'text', '7%', 12),
'status' => $this->column('status', 'Estado', 'status', '7%', 13),
'scanned_by' => $this->column('scanned_by', 'Escaneado por', 'text', '9%', 28),
];

8
app/Domains/Ticket/Services/AdminAppTicketRowService.php
View File

@@ -5,8 +5,6 @@ namespace App\Domains\Ticket\Services;
use App\Domains\Catalog\Models\ItemAttribute;
use App\Domains\Purchase\Models\PurchaseItem;
use App\Domains\Ticket\Models\Ticket;
use Carbon\Carbon;
use Carbon\CarbonInterface;
use Illuminate\Support\Collection;
class AdminAppTicketRowService
@@ -35,7 +33,6 @@ class AdminAppTicketRowService
?? $ticket->name,
'amount' => $purchaseItem?->precio_unitario,
'client' => $ticket->sourcePurchase?->nombre_apellido ?? $ticket->user?->nombre_apellido,
'date' => $ticket->sourcePurchase?->created_at,
'status' => $ticket->status,
'scanned_by' => $ticket->scannerUser?->nombre_apellido,
'variant_properties' => $this->variantProperties($ticket),
@@ -55,8 +52,7 @@ class AdminAppTicketRowService
'type' => $presentation['type'],
'amount' => $details['amount'] === null ? null : (float) $details['amount'],
'client' => $details['client'] ?? 'Sin nombre',
'ticket' => $ticket->ticket,
'date' => $details['date'],
'id' => $ticket->id,
'status' => $details['status'],
'scanned_by' => $details['scanned_by'] ?? '-',
];
@@ -98,8 +94,6 @@ class AdminAppTicketRowService
return match ($type) {
'order_number' => '#'.$value,
'currency' => '$'.number_format((float) $value, 2, ',', '.'),
'date' => ($value instanceof CarbonInterface ? $value : Carbon::parse((string) $value))
->copy()->timezone($timeZone)->format('d/m/Y H:i'),
'status' => match ((string) $value) {
Ticket::STATUS_USED => 'Usado',
Ticket::STATUS_EXPIRED => 'Vencido',

6
app/Domains/Ticket/Services/AdminAppTicketService.php
View File

@@ -3,7 +3,6 @@
namespace App\Domains\Ticket\Services;
use App\Domains\Auth\Models\User;
use App\Domains\Purchase\Models\Purchase;
use App\Domains\Purchase\Models\PurchaseItem;
use App\Domains\Tenant\Models\Tenant;
use App\Domains\Ticket\Models\Ticket;
@@ -208,10 +207,7 @@ class AdminAppTicketService
$sortExpression = match ($sortBy) {
'order_number' => 'tickets.source_purchase_id',
'ticket' => 'tickets.ticket',
'date' => Purchase::query()
->select('created_at')
->whereColumn('compras.id', 'tickets.source_purchase_id'),
'id' => 'tickets.id',
'amount' => $this->purchaseItemSortQuery('precio_unitario'),
'scanned_by' => User::query()
->select('nombre_apellido')