feat(sales): filter and serialize admin statuses
This commit is contained in:
@@ -20,7 +20,7 @@ class AdminAppSaleIndexRequest extends FormRequest
|
||||
'q' => ['sometimes', 'nullable', 'string', 'max:255'],
|
||||
'id' => ['sometimes', 'nullable', 'integer', 'min:1'],
|
||||
'sale_date' => ['sometimes', 'nullable', 'date_format:Y-m-d'],
|
||||
'status' => ['sometimes', 'nullable', 'string', Rule::in(Purchase::statuses())],
|
||||
'status' => ['sometimes', 'nullable', 'string', Rule::in(Purchase::adminStatusCodes())],
|
||||
'sort_by' => ['sometimes', 'string', 'in:id,date,customer_name,quantity,status,total'],
|
||||
'sort_direction' => ['sometimes', 'string', 'in:asc,desc'],
|
||||
'page' => ['sometimes', 'integer', 'min:1'],
|
||||
|
||||
@@ -23,6 +23,12 @@ class SaleModificationResource extends JsonResource
|
||||
'attribute' => $this->attribute,
|
||||
'old_value' => $this->old_value,
|
||||
'new_value' => $this->new_value,
|
||||
'admin_status' => is_string($this->new_value)
|
||||
? Purchase::adminStatusFor($this->new_value)
|
||||
: null,
|
||||
'status_label' => is_string($this->new_value)
|
||||
? Purchase::adminStatusNameFor($this->new_value)
|
||||
: null,
|
||||
'changed_at' => $this->changed_at->utc()->toIso8601String(),
|
||||
'date' => $this->changed_at->format('Y-m-d'),
|
||||
'time' => $this->changed_at->format('H:i:s'),
|
||||
@@ -31,6 +37,8 @@ class SaleModificationResource extends JsonResource
|
||||
'id' => $sale->id,
|
||||
'customer_name' => $sale->nombre_apellido,
|
||||
'status' => $sale->status,
|
||||
'admin_status' => Purchase::adminStatusFor($sale->status),
|
||||
'status_label' => Purchase::adminStatusNameFor($sale->status),
|
||||
] : null,
|
||||
'modified_by' => $user ? [
|
||||
'id' => $user->id,
|
||||
|
||||
@@ -20,6 +20,8 @@ class SaleResource extends JsonResource
|
||||
'customer_name' => $this->nombre_apellido,
|
||||
'quantity' => (int) ($this->quantity ?? 0),
|
||||
'status' => $this->status,
|
||||
'admin_status' => Purchase::adminStatusFor($this->status),
|
||||
'status_label' => Purchase::adminStatusNameFor($this->status),
|
||||
'total' => number_format((float) $this->total, 2, '.', ''),
|
||||
'tickets_count' => $ticketsCount,
|
||||
'has_generated_tickets' => $ticketsCount > 0,
|
||||
|
||||
@@ -126,7 +126,6 @@ class AdminAppSaleService
|
||||
|
||||
return Purchase::query()
|
||||
->where('tenant_codigo', $tenant->codigo)
|
||||
->where('status', '!=', Purchase::STATUS_SUPERSEDED)
|
||||
->when($filters['q'] ?? null, function (Builder $query, string $search): void {
|
||||
$term = trim($search);
|
||||
|
||||
@@ -144,12 +143,10 @@ class AdminAppSaleService
|
||||
)
|
||||
->when(
|
||||
$filters['status'] ?? null,
|
||||
fn (Builder $query, string $status): Builder => $status === Purchase::STATUS_PENDING_PAYMENT
|
||||
? $query->whereIn('status', [
|
||||
Purchase::STATUS_PENDING_PAYMENT,
|
||||
Purchase::STATUS_IN_REVIEW,
|
||||
])
|
||||
: $query->where('status', $status)
|
||||
fn (Builder $query, string $status): Builder => $query->whereIn(
|
||||
'status',
|
||||
Purchase::realStatusesForAdminStatus($status),
|
||||
)
|
||||
)
|
||||
->select('compras.*')
|
||||
->selectRaw(
|
||||
|
||||
Reference in New Issue
Block a user