Merge branch 'feature/event_scoped_admin' into dev
This commit is contained in:
@@ -82,7 +82,7 @@ Bajo `/tenants/{tenant:codigo}`, protegidos por `auth:sanctum`:
|
||||
- `POST /tickets/pdf`.
|
||||
|
||||
Bajo `/v1/adminapp/tenant`, protegido por `auth:sanctum`, `adminapp.tenant` y el menú
|
||||
`onticket.adminapp.tickets`:
|
||||
`adminapp.tickets`:
|
||||
|
||||
- `GET /tickets`, paginado y con búsqueda opcional mediante `q`. La respuesta incluye
|
||||
`scanned_tickets` y `total_tickets` para el tenant autenticado.
|
||||
|
||||
@@ -7,24 +7,24 @@ Route::prefix('v1/adminapp/tenant')
|
||||
->middleware(['auth:sanctum', 'adminapp.tenant'])
|
||||
->group(function (): void {
|
||||
Route::get('tickets', [TicketController::class, 'index'])
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.index');
|
||||
Route::post('tickets/{ticket}/cancel', [TicketController::class, 'cancel'])
|
||||
->whereNumber('ticket')
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.cancel');
|
||||
Route::get('tickets/{ticket}/refund', [TicketController::class, 'calculateRefund'])
|
||||
->whereNumber('ticket')
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.calculate-refund');
|
||||
Route::post('tickets/{ticket}/refund', [TicketController::class, 'refund'])
|
||||
->whereNumber('ticket')
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.refund');
|
||||
Route::get('tickets/pdf', [TicketController::class, 'downloadPdf'])
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.pdf');
|
||||
Route::get('tickets/excel', [TicketController::class, 'downloadExcel'])
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.tickets.excel');
|
||||
});
|
||||
|
||||
@@ -23,7 +23,7 @@ Route::prefix('v1/adminapp/forms')
|
||||
Route::get('sale', SaleFormController::class);
|
||||
Route::get('staff', StaffFormController::class);
|
||||
Route::get('tickets-filter', TicketFilterFormController::class)
|
||||
->middleware('tenant.menu:onticket.adminapp.tickets')
|
||||
->middleware('tenant.menu:adminapp.tickets')
|
||||
->name('adminapp.forms.tickets-filter');
|
||||
Route::get(
|
||||
'fiesta-futbol-infantil/ticket',
|
||||
|
||||
@@ -18,9 +18,9 @@ class TicketMenuAccessTest extends TestCase
|
||||
public static function menuAssignments(): array
|
||||
{
|
||||
return [
|
||||
'OnTicket' => ['onticket.adminapp.tickets', 'current', true],
|
||||
'old code' => ['adminapp.tickets', 'current', false],
|
||||
'another tenant' => ['onticket.adminapp.tickets', 'other', false],
|
||||
'new code' => ['onticket.adminapp.tickets', 'current', false],
|
||||
'old code' => ['adminapp.tickets', 'current', true],
|
||||
'another tenant' => ['adminapp.tickets', 'other', false],
|
||||
'unrelated menu' => ['adminapp.ventas', 'current', false],
|
||||
];
|
||||
}
|
||||
@@ -53,7 +53,7 @@ class TicketMenuAccessTest extends TestCase
|
||||
}
|
||||
|
||||
try {
|
||||
$response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'onticket.adminapp.tickets');
|
||||
$response = (new EnsureTenantHasMenu)->handle($request, fn () => response('allowed'), 'adminapp.tickets');
|
||||
$this->assertSame('allowed', $response->getContent());
|
||||
} catch (HttpException $exception) {
|
||||
$this->assertSame(404, $exception->getStatusCode());
|
||||
@@ -70,7 +70,7 @@ class TicketMenuAccessTest extends TestCase
|
||||
] as $name) {
|
||||
$route = Route::getRoutes()->getByName($name);
|
||||
$this->assertNotNull($route);
|
||||
$this->assertContains('tenant.menu:onticket.adminapp.tickets', $route->gatherMiddleware());
|
||||
$this->assertContains('tenant.menu:adminapp.tickets', $route->gatherMiddleware());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,8 +91,8 @@ class AdminAppTicketEventScopeTest extends TestCase
|
||||
});
|
||||
|
||||
DB::table('tenants')->insert(['codigo' => 'onticket']);
|
||||
DB::table('menues')->insert(['code' => 'onticket.adminapp.tickets']);
|
||||
DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'onticket.adminapp.tickets']);
|
||||
DB::table('menues')->insert(['code' => 'adminapp.tickets']);
|
||||
DB::table('tenants_menues')->insert(['tenant_code' => 'onticket', 'menu_code' => 'adminapp.tickets']);
|
||||
foreach ([1 => ['onticket', 10], 2 => ['onticket', 20], 3 => ['onticket', null], 4 => ['other', 10]] as $id => [$tenant, $event]) {
|
||||
DB::table('tickets')->insert([
|
||||
'id' => $id, 'tenant_code' => $tenant, 'event_id' => $event,
|
||||
|
||||
Reference in New Issue
Block a user