Compare commits

...

4 Commits

13 changed files with 295 additions and 64 deletions

View File

@@ -6,27 +6,18 @@ use App\Domains\Purchase\Models\Purchase;
class SaleFormService
{
/** @return array{statuses: list<array{code: string, name: string}>} */
/** @return array{statuses: list<array{value: string, label: string, real_statuses: list<string>}>} */
public function get(): array
{
$names = [
Purchase::STATUS_CREATED => 'Creada',
Purchase::STATUS_PENDING_PAYMENT => 'Esperando pago',
Purchase::STATUS_IN_REVIEW => 'En revisión',
Purchase::STATUS_PAID => 'Confirmada',
Purchase::STATUS_CANCELLED => 'Cancelada',
Purchase::STATUS_REJECTED => 'Rechazada',
Purchase::STATUS_EXPIRED => 'Vencida',
Purchase::STATUS_SUPERSEDED => 'Reemplazada',
];
return [
'statuses' => array_map(
fn (string $status): array => [
'code' => $status,
'name' => $names[$status],
fn (string $code, array $definition): array => [
'value' => $code,
'label' => $definition['name'],
'real_statuses' => $definition['statuses'],
],
Purchase::statuses(),
array_keys(Purchase::adminStatuses()),
array_values(Purchase::adminStatuses()),
),
];
}

View File

@@ -52,6 +52,14 @@ class Purchase extends Model
public const STATUS_SUPERSEDED = 'superseded';
public const ADMIN_STATUS_INCOMPLETE = 'incomplete';
public const ADMIN_STATUS_AWAITING_PAYMENT = 'awaiting_payment';
public const ADMIN_STATUS_CONFIRMED = 'confirmed';
public const ADMIN_STATUS_CANCELLED = 'cancelled';
/** @return list<string> */
public static function statuses(): array
{
@@ -67,6 +75,68 @@ class Purchase extends Model
];
}
/**
* @return array<string, array{name: string, statuses: list<string>}>
*/
public static function adminStatuses(): array
{
return [
self::ADMIN_STATUS_INCOMPLETE => [
'name' => 'Por completar datos',
'statuses' => [self::STATUS_CREATED],
],
self::ADMIN_STATUS_AWAITING_PAYMENT => [
'name' => 'Esperando pago',
'statuses' => [self::STATUS_PENDING_PAYMENT, self::STATUS_IN_REVIEW],
],
self::ADMIN_STATUS_CONFIRMED => [
'name' => 'Confirmado',
'statuses' => [self::STATUS_PAID],
],
self::ADMIN_STATUS_CANCELLED => [
'name' => 'Anulado',
'statuses' => [
self::STATUS_CANCELLED,
self::STATUS_REJECTED,
self::STATUS_EXPIRED,
self::STATUS_SUPERSEDED,
],
],
];
}
/** @return list<string> */
public static function adminStatusCodes(): array
{
return array_keys(self::adminStatuses());
}
/** @return list<string> */
public static function realStatusesForAdminStatus(string $adminStatus): array
{
return self::adminStatuses()[$adminStatus]['statuses'] ?? [];
}
public static function adminStatusFor(string $realStatus): ?string
{
foreach (self::adminStatuses() as $adminStatus => $definition) {
if (in_array($realStatus, $definition['statuses'], true)) {
return $adminStatus;
}
}
return null;
}
public static function adminStatusNameFor(string $realStatus): ?string
{
$adminStatus = self::adminStatusFor($realStatus);
return $adminStatus === null
? null
: self::adminStatuses()[$adminStatus]['name'];
}
protected $table = 'compras';
/** @var array<int, string> */

View File

@@ -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'],

View File

@@ -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,

View File

@@ -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,

View File

@@ -201,11 +201,6 @@ class AdminAppSaleExcelService
private function saleStatus(string $status): string
{
return match ($status) {
Purchase::STATUS_PAID => 'Confirmado',
Purchase::STATUS_CREATED => 'Por completar datos',
Purchase::STATUS_PENDING_PAYMENT, Purchase::STATUS_IN_REVIEW => 'Esperando pago',
default => 'Anulado',
};
return Purchase::adminStatusNameFor($status) ?? $status;
}
}

View File

@@ -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(

View File

@@ -47,11 +47,7 @@
<td>{{ $sale->created_at?->copy()->timezone($timeZone)->format('d/m/Y H:i') ?? '-' }}</td>
<td>{{ $sale->nombre_apellido ?: 'Sin nombre' }}</td>
<td class="center">{{ (int) ($sale->quantity ?? 0) }}</td>
<td>{{ match ($sale->status) {
'paid' => 'Confirmado',
'created', 'pending_payment' => 'Esperando pago',
default => 'Anulado',
} }}</td>
<td>{{ \App\Domains\Purchase\Models\Purchase::adminStatusNameFor($sale->status) ?? $sale->status }}</td>
<td class="number">${{ number_format((float) $sale->total, 2, ',', '.') }}</td>
<td class="center">{{ (int) ($sale->tickets_count ?? 0) }}</td>
</tr>

View File

@@ -2,6 +2,8 @@
namespace Tests\Feature\Forms;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Auth\Models\User;
use App\Domains\Authorization\Enums\RoleCode;
use App\Domains\Purchase\Models\Purchase;
@@ -34,12 +36,7 @@ class AdminAppSaleFormControllerTest extends TestCase
public function test_an_adminapp_user_can_get_the_sale_form(): void
{
$tenant = Tenant::query()->create([
'codigo' => 'acme',
'nombre' => 'Acme',
'dominio' => 'acme.test',
'website_type_code' => 'onticket',
]);
$tenant = $this->createTenant('acme');
Sanctum::actingAs(User::factory()->create([
'rol_codigo' => RoleCode::AdminApp->value,
'tenant_codigo' => $tenant->codigo,
@@ -47,13 +44,15 @@ class AdminAppSaleFormControllerTest extends TestCase
$this->getJson('/api/v1/adminapp/forms/sale')
->assertOk()
->assertJsonCount(count(Purchase::statuses()), 'data.statuses')
->assertJsonPath('data.statuses.0.code', Purchase::STATUS_CREATED)
->assertJsonPath('data.statuses.0.name', 'Creada')
->assertJsonPath('data.statuses.1.code', Purchase::STATUS_PENDING_PAYMENT)
->assertJsonPath('data.statuses.2.code', Purchase::STATUS_IN_REVIEW)
->assertJsonPath('data.statuses.3.code', Purchase::STATUS_PAID)
->assertJsonPath('data.statuses.6.code', Purchase::STATUS_EXPIRED);
->assertJsonCount(count(Purchase::adminStatusCodes()), 'data.statuses')
->assertJsonPath('data.statuses.0.value', Purchase::ADMIN_STATUS_INCOMPLETE)
->assertJsonPath('data.statuses.0.label', 'Por completar datos')
->assertJsonPath('data.statuses.0.real_statuses.0', Purchase::STATUS_CREATED)
->assertJsonPath('data.statuses.1.value', Purchase::ADMIN_STATUS_AWAITING_PAYMENT)
->assertJsonPath('data.statuses.1.real_statuses.0', Purchase::STATUS_PENDING_PAYMENT)
->assertJsonPath('data.statuses.1.real_statuses.1', Purchase::STATUS_IN_REVIEW)
->assertJsonPath('data.statuses.2.value', Purchase::ADMIN_STATUS_CONFIRMED)
->assertJsonPath('data.statuses.3.value', Purchase::ADMIN_STATUS_CANCELLED);
}
public function test_a_customer_cannot_get_the_sale_form(): void
@@ -65,4 +64,34 @@ class AdminAppSaleFormControllerTest extends TestCase
$this->getJson('/api/v1/adminapp/forms/sale')->assertForbidden();
}
private function createTenant(string $code): Tenant
{
$headerLogo = $this->createAttachment("{$code}-header");
$footerLogo = $this->createAttachment("{$code}-footer");
return Tenant::query()->create([
'codigo' => $code,
'nombre' => ucfirst($code),
'dominio' => "{$code}.test",
'primary_color' => '#000000',
'secondary_color' => '#ffffff',
'danger_color' => '#dc3545',
'header_bg_color' => '#ffffff',
'footer_bg_color' => '#000000',
'header_logo_id' => $headerLogo->id,
'footer_logo_id' => $footerLogo->id,
'website_type_code' => 'onticket',
]);
}
private function createAttachment(string $name): Attachment
{
return Attachment::query()->create([
'path' => "test/{$name}.png",
'filename' => "{$name}.png",
'type' => AttachmentType::Image,
'mime_type' => 'image/png',
]);
}
}

View File

@@ -2,6 +2,8 @@
namespace Tests\Feature\Sale;
use App\Domains\Attachable\Enums\AttachmentType;
use App\Domains\Attachable\Models\Attachment;
use App\Domains\Auth\Models\User;
use App\Domains\Authorization\Enums\RoleCode;
use App\Domains\Cart\Models\Cart;
@@ -64,6 +66,7 @@ class AdminAppSaleControllerTest extends TestCase
PurchaseItem::query()->create([
'compra_id' => $createdPurchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 3,
'precio_unitario' => '10000.00',
@@ -88,6 +91,7 @@ class AdminAppSaleControllerTest extends TestCase
PurchaseItem::query()->create([
'compra_id' => $pendingPurchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 4,
'precio_unitario' => '10000.00',
@@ -102,6 +106,7 @@ class AdminAppSaleControllerTest extends TestCase
PurchaseItem::query()->create([
'compra_id' => $paidPurchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 2,
'precio_unitario' => '10000.00',
@@ -116,6 +121,7 @@ class AdminAppSaleControllerTest extends TestCase
PurchaseItem::query()->create([
'compra_id' => $supersededPurchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 5,
'precio_unitario' => '10000.00',
@@ -124,17 +130,25 @@ class AdminAppSaleControllerTest extends TestCase
$this->getJson('/api/v1/adminapp/tenant/sales?sort_by=id&sort_direction=asc')
->assertOk()
->assertJsonCount(3, 'data')
->assertJsonCount(4, 'data')
->assertJsonPath('data.0.id', $createdPurchase->id)
->assertJsonPath('data.0.quantity', 3)
->assertJsonPath('data.0.admin_status', Purchase::ADMIN_STATUS_INCOMPLETE)
->assertJsonPath('data.0.status_label', 'Por completar datos')
->assertJsonPath('data.1.id', $pendingPurchase->id)
->assertJsonPath('data.1.quantity', 4)
->assertJsonPath('data.1.admin_status', Purchase::ADMIN_STATUS_AWAITING_PAYMENT)
->assertJsonPath('data.1.status_label', 'Esperando pago')
->assertJsonPath('data.2.id', $paidPurchase->id)
->assertJsonPath('data.2.quantity', 2);
->assertJsonPath('data.2.quantity', 2)
->assertJsonPath('data.2.admin_status', Purchase::ADMIN_STATUS_CONFIRMED)
->assertJsonPath('data.2.status_label', 'Confirmado')
->assertJsonPath('data.3.id', $supersededPurchase->id)
->assertJsonPath('data.3.admin_status', Purchase::ADMIN_STATUS_CANCELLED)
->assertJsonPath('data.3.status_label', 'Anulado');
$this->getJson('/api/v1/adminapp/tenant/sales?status='.Purchase::STATUS_SUPERSEDED)
->assertOk()
->assertJsonCount(0, 'data');
->assertUnprocessable();
}
public function test_authentication_is_required_to_read_a_sale_detail(): void
@@ -142,7 +156,7 @@ class AdminAppSaleControllerTest extends TestCase
$this->getJson('/api/v1/adminapp/tenant/sales/1')->assertUnauthorized();
}
public function test_pending_payment_filter_also_returns_purchases_in_review(): void
public function test_awaiting_payment_filter_returns_every_mapped_real_status(): void
{
$tenant = $this->createTenant('acme');
Sanctum::actingAs($this->createAdminAppUser($tenant));
@@ -160,13 +174,41 @@ class AdminAppSaleControllerTest extends TestCase
'status' => Purchase::STATUS_PAID,
]);
$this->getJson('/api/v1/adminapp/tenant/sales?status=pending_payment&sort_by=id&sort_direction=asc')
$this->getJson('/api/v1/adminapp/tenant/sales?status=awaiting_payment&sort_by=id&sort_direction=asc')
->assertOk()
->assertJsonCount(2, 'data')
->assertJsonPath('data.0.id', $pendingPurchase->id)
->assertJsonPath('data.1.id', $reviewPurchase->id);
}
public function test_cancelled_filter_returns_every_visible_mapped_real_status(): void
{
$tenant = $this->createTenant('acme');
Sanctum::actingAs($this->createAdminAppUser($tenant));
foreach ([
Purchase::STATUS_CANCELLED,
Purchase::STATUS_REJECTED,
Purchase::STATUS_EXPIRED,
Purchase::STATUS_SUPERSEDED,
] as $status) {
Purchase::query()->create([
'tenant_codigo' => $tenant->codigo,
'status' => $status,
]);
}
Purchase::query()->create([
'tenant_codigo' => $tenant->codigo,
'status' => Purchase::STATUS_PAID,
]);
$this->getJson('/api/v1/adminapp/tenant/sales?status=cancelled')
->assertOk()
->assertJsonCount(4, 'data')
->assertJsonPath('data.0.admin_status', Purchase::ADMIN_STATUS_CANCELLED)
->assertJsonPath('data.0.status_label', 'Anulado');
}
public function test_an_adminapp_user_can_read_a_sale_detail_from_its_tenant(): void
{
$tenant = $this->createTenant('acme');
@@ -233,6 +275,7 @@ class AdminAppSaleControllerTest extends TestCase
$purchaseItem = PurchaseItem::query()->create([
'compra_id' => $purchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 2,
'precio_unitario' => '12500.00',
@@ -479,6 +522,7 @@ class AdminAppSaleControllerTest extends TestCase
PurchaseItem::query()->create([
'compra_id' => $purchase->id,
'source_catalog_item_id' => $catalogItem->id,
'nombre' => $catalogItem->nombre,
'item_nombre' => $catalogItem->nombre,
'cantidad' => 2,
'precio_unitario' => '10000.00',
@@ -574,14 +618,34 @@ class AdminAppSaleControllerTest extends TestCase
private function createTenant(string $code): Tenant
{
$headerLogo = $this->createAttachment("{$code}-header");
$footerLogo = $this->createAttachment("{$code}-footer");
return Tenant::query()->create([
'codigo' => $code,
'nombre' => ucfirst($code),
'dominio' => "{$code}.test",
'primary_color' => '#000000',
'secondary_color' => '#ffffff',
'danger_color' => '#dc3545',
'header_bg_color' => '#ffffff',
'footer_bg_color' => '#000000',
'header_logo_id' => $headerLogo->id,
'footer_logo_id' => $footerLogo->id,
'website_type_code' => 'onticket',
]);
}
private function createAttachment(string $name): Attachment
{
return Attachment::query()->create([
'path' => "test/{$name}.png",
'filename' => "{$name}.png",
'type' => AttachmentType::Image,
'mime_type' => 'image/png',
]);
}
private function createAdminAppUser(Tenant $tenant): User
{
return User::factory()->create([

View File

@@ -8,20 +8,27 @@ use PHPUnit\Framework\TestCase;
class SaleFormServiceTest extends TestCase
{
public function test_it_returns_every_purchase_status_as_a_form_option(): void
public function test_it_returns_admin_statuses_with_their_real_statuses(): void
{
$form = (new SaleFormService)->get();
$this->assertSame(Purchase::statuses(), array_column($form['statuses'], 'code'));
$this->assertSame(Purchase::adminStatusCodes(), array_column($form['statuses'], 'value'));
$this->assertSame([
'Creada',
'Por completar datos',
'Esperando pago',
'En revisión',
'Confirmada',
'Cancelada',
'Rechazada',
'Vencida',
'Reemplazada',
], array_column($form['statuses'], 'name'));
'Confirmado',
'Anulado',
], array_column($form['statuses'], 'label'));
$this->assertSame([
[Purchase::STATUS_CREATED],
[Purchase::STATUS_PENDING_PAYMENT, Purchase::STATUS_IN_REVIEW],
[Purchase::STATUS_PAID],
[
Purchase::STATUS_CANCELLED,
Purchase::STATUS_REJECTED,
Purchase::STATUS_EXPIRED,
Purchase::STATUS_SUPERSEDED,
],
], array_column($form['statuses'], 'real_statuses'));
}
}

View File

@@ -0,0 +1,69 @@
<?php
namespace Tests\Unit\Purchase;
use App\Domains\Purchase\Models\Purchase;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
class PurchaseAdminStatusTest extends TestCase
{
#[DataProvider('statusMappings')]
public function test_it_maps_real_statuses_to_admin_statuses(
string $realStatus,
string $adminStatus,
string $adminStatusName,
): void {
$this->assertSame($adminStatus, Purchase::adminStatusFor($realStatus));
$this->assertSame($adminStatusName, Purchase::adminStatusNameFor($realStatus));
$this->assertContains(
$realStatus,
Purchase::realStatusesForAdminStatus($adminStatus),
);
}
/** @return iterable<string, array{string, string, string}> */
public static function statusMappings(): iterable
{
yield 'created' => [
Purchase::STATUS_CREATED,
Purchase::ADMIN_STATUS_INCOMPLETE,
'Por completar datos',
];
yield 'pending payment' => [
Purchase::STATUS_PENDING_PAYMENT,
Purchase::ADMIN_STATUS_AWAITING_PAYMENT,
'Esperando pago',
];
yield 'in review' => [
Purchase::STATUS_IN_REVIEW,
Purchase::ADMIN_STATUS_AWAITING_PAYMENT,
'Esperando pago',
];
yield 'paid' => [
Purchase::STATUS_PAID,
Purchase::ADMIN_STATUS_CONFIRMED,
'Confirmado',
];
yield 'cancelled' => [
Purchase::STATUS_CANCELLED,
Purchase::ADMIN_STATUS_CANCELLED,
'Anulado',
];
yield 'rejected' => [
Purchase::STATUS_REJECTED,
Purchase::ADMIN_STATUS_CANCELLED,
'Anulado',
];
yield 'expired' => [
Purchase::STATUS_EXPIRED,
Purchase::ADMIN_STATUS_CANCELLED,
'Anulado',
];
yield 'superseded' => [
Purchase::STATUS_SUPERSEDED,
Purchase::ADMIN_STATUS_CANCELLED,
'Anulado',
];
}
}

View File

@@ -3,6 +3,7 @@
namespace Tests\Unit\Sale;
use App\Domains\Logging\Models\ValueChange;
use App\Domains\Purchase\Models\Purchase;
use App\Domains\Sale\Resources\AdminApp\SaleModificationResource;
use Carbon\CarbonImmutable;
use Illuminate\Http\Request;
@@ -29,5 +30,7 @@ class SaleModificationResourceTest extends TestCase
$this->assertSame('2026-08-24T17:53:00+00:00', $data['changed_at']);
$this->assertSame('2026-08-24', $data['date']);
$this->assertSame('17:53:00', $data['time']);
$this->assertSame(Purchase::ADMIN_STATUS_CANCELLED, $data['admin_status']);
$this->assertSame('Anulado', $data['status_label']);
}
}