admin/services_core
1
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

big update all menus

Browse Source
This commit is contained in:
Wian Drs
2026-08-07 09:16:13 +07:00
parent 75342dc7b7
commit e7575ba1c0
101 changed files with 3451 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Customer/CustomerController.php
+96 -1
View File
@@ -10,6 +10,8 @@ use App\Http\Requests\Customer\UpdateCustomerRequest;
use App\Http\Resources\Customer\CustomerResource;
use App\Services\Customer\CustomerService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Illuminate\Validation\ValidationException;
class CustomerController extends ApiController
{
@@ -32,6 +34,60 @@ class CustomerController extends ApiController
);
}
public function odpPorts(Request $request, int $node)
{
$data=$request->validate(['customer_id'=>['nullable','integer','exists:customers,id']]);
return $this->success($this->service->availableOdpPorts($node,$request->user(),$this->tenantId($request),$data['customer_id'] ?? null),'Port ODP tersedia berhasil diambil');
}
public function ocrKtp(Request $request)
{
$data = $request->validate([
'image' => ['required', 'image', 'mimes:jpeg,jpg,png,webp', 'max:5120'],
'tenant_id' => ['nullable', 'integer', 'exists:tenants,id'],
]);
$tenantId = $request->user()->isMasterAdmin()
? ($data['tenant_id'] ?? $request->attributes->get('tenant_id'))
: $request->attributes->get('tenant_id');
abort_unless($tenantId, 422, 'Tenant wajib dipilih sebelum menjalankan OCR.');
if (! $request->user()->isMasterAdmin()) {
abort_unless($request->user()->userTenants()->where('tenant_id', $tenantId)->exists(), 403);
}
$setting = \App\Models\TenantInstallationSetting::where('tenant_id', $tenantId)->first();
abort_unless($setting?->ktp_ocr_enabled, 422, 'OCR KTP belum diaktifkan untuk tenant ini.');
abort_unless($setting->ocr_provider && $setting->ocr_api_key, 422, 'Provider atau API key OCR belum dikonfigurasi.');
$file = $data['image'];
$mime = $file->getMimeType();
$base64 = base64_encode(file_get_contents($file->getRealPath()));
$prompt = 'Baca KTP Indonesia ini. Kembalikan hanya JSON valid tanpa markdown dengan field: nik, nama, alamat, rt_rw, kelurahan_desa, kecamatan, kabupaten_kota, provinsi. Gunakan null bila tidak terbaca.';
if ($setting->ocr_provider === 'openai') {
$response = Http::withToken($setting->ocr_api_key)->timeout(60)->post('https://api.openai.com/v1/chat/completions', [
'model' => 'gpt-4.1-mini',
'response_format' => ['type' => 'json_object'],
'messages' => [['role' => 'user', 'content' => [
['type' => 'text', 'text' => $prompt],
['type' => 'image_url', 'image_url' => ['url' => "data:{$mime};base64,{$base64}"]],
]]],
]);
$content = $response->successful() ? $response->json('choices.0.message.content') : null;
} else {
$response = Http::timeout(60)->post('https://generativelanguage.googleapis.com/v1beta/models/gemini-2.5-flash:generateContent?key='.urlencode($setting->ocr_api_key), [
'contents' => [['parts' => [['text' => $prompt], ['inline_data' => ['mime_type' => $mime, 'data' => $base64]]]]],
'generationConfig' => ['responseMimeType' => 'application/json'],
]);
$content = $response->successful() ? $response->json('candidates.0.content.parts.0.text') : null;
}
if (! $response->successful() || ! $content) {
throw ValidationException::withMessages(['image' => 'Provider AI gagal membaca KTP. Periksa API key, kuota, dan kualitas gambar.']);
}
$result = json_decode(trim(str_replace(['```json', '```'], '', $content)), true);
if (! is_array($result)) throw ValidationException::withMessages(['image' => 'Respons OCR tidak dapat diproses.']);
return $this->success($result, 'KTP berhasil dibaca');
}
public function store(StoreCustomerRequest $request)
{
return $this->created(
@@ -59,12 +115,41 @@ class CustomerController extends ApiController
);
}
public function prepareActivation(UpdateCustomerRequest $request, int $id)
{
$customer = $this->service->find($id);
$this->authorizeTenant($request, $customer->tenant_id);
$mode = \App\Models\TenantInstallationSetting::firstOrCreate(
['tenant_id' => $customer->tenant_id],
['activation_mode' => 'list_order']
)->activation_mode;
abort_unless($mode === 'list_order', 422, 'Tenant mengatur persiapan aktivasi melalui Ticket.');
$customer = $this->service->update($customer, $request->validated(), $request->user());
$customer = $this->service->ensureActivationCode($customer);
return $this->updated(
new CustomerResource($customer),
'Persiapan aktivasi berhasil disimpan'
);
}
public function updateRegistration(UpdateCustomerRequest $request, int $id)
{
$customer = $this->service->find($id);
$this->authorizeTenant($request, $customer->tenant_id);
return $this->updated(
new CustomerResource($this->service->update($customer, $request->validated(), $request->user())),
'Data registrasi berhasil disimpan'
);
}
public function activate(ActivateCustomerRequest $request, int $id)
{
$customer = $this->service->find($id);
$this->authorizeTenant($request, $customer->tenant_id);
return $this->updated(new CustomerResource($this->service->activate($customer, $request->validated())), 'Customer berhasil diaktifkan');
return $this->updated(new CustomerResource($this->service->activate($customer, $request->validated(), $request->user())), 'Customer berhasil diaktifkan');
}
public function deactivate(Request $request, int $id)
@@ -84,6 +169,16 @@ class CustomerController extends ApiController
return $this->deleted('Customer dipindahkan ke Sampah');
}
public function cancelOrder(Request $request, int $id)
{
$customer = $this->service->find($id);
$this->authorizeTenant($request, $customer->tenant_id);
abort_unless($customer->status === 'order', 422, 'Hanya customer dalam List Order yang dapat dihapus melalui aksi ini.');
$this->service->trash($customer);
return $this->deleted('List Order dipindahkan ke Sampah');
}
public function restore(Request $request, int $id)
{
$customer = $this->service->find($id, true);
app/Http/Controllers/Menu/MenuController.php
+8 -3
View File
@@ -22,7 +22,9 @@ class MenuController extends ApiController
if ($user->isMasterAdmin() || $user->is_platform_staff) {
$menus = MenuList::query()
->where('is_active', true)
->when($user->is_platform_staff && ! $user->isMasterAdmin(), fn ($q) => $q->whereIn('slug', ['role-applications', 'role-applications-tenants']))
->when($user->is_platform_staff && ! $user->isMasterAdmin(), fn ($q) => $q->whereIn('slug', [
'role-applications', 'role-applications-tenants', 'nas', 'nas-script-policies',
]))
->orderBy('sort_order')
->orderBy('id')
->get()
@@ -42,6 +44,7 @@ class MenuController extends ApiController
'can_update' => true,
'can_delete' => true,
'can_approve' => true,
'can_activate' => true,
'can_export' => true,
],
];
@@ -80,13 +83,14 @@ class MenuController extends ApiController
DB::raw('MAX(CASE WHEN mgm.can_update THEN 1 ELSE 0 END) as can_update'),
DB::raw('MAX(CASE WHEN mgm.can_delete THEN 1 ELSE 0 END) as can_delete'),
DB::raw('MAX(CASE WHEN mgm.can_approve THEN 1 ELSE 0 END) as can_approve'),
DB::raw('MAX(CASE WHEN mgm.can_activate THEN 1 ELSE 0 END) as can_activate'),
DB::raw('MAX(CASE WHEN mgm.can_export THEN 1 ELSE 0 END) as can_export')
)
->orderBy('m.sort_order')
->orderBy('m.id')
->get();
$menus = $menuRows->map(function ($row) {
$menus = $menuRows->map(function ($row) use ($tenantRole) {
return [
'id' => (int) $row->id,
'parent_id' => $row->parent_id ? (int) $row->parent_id : null,
@@ -102,6 +106,7 @@ class MenuController extends ApiController
'can_update' => (bool) $row->can_update,
'can_delete' => (bool) $row->can_delete,
'can_approve' => (bool) $row->can_approve,
'can_activate' => $tenantRole === 'tenant_owner' || (bool) $row->can_activate,
'can_export' => (bool) $row->can_export,
],
];
@@ -115,7 +120,7 @@ class MenuController extends ApiController
$tree = $this->removeRestrictedMenus($tree, $restrictedSlugs);
}
if (! $user->isMasterAdmin() && ! $user->is_platform_staff) {
$tree = $this->removeRestrictedMenus($tree, ['role-applications-tenants']);
$tree = $this->removeRestrictedMenus($tree, ['role-applications-tenants', 'nas-script-policies', 'nas-radius-infrastructure']);
}
if (! $user->isTenantOwner($tenantId)) {
$tree = $this->removeRestrictedMenus($tree, ['role-applications-staff']);
app/Http/Controllers/Nas/NasResourceController.php
+17 -1
View File
@@ -8,11 +8,15 @@ use App\Http\Requests\Nas\StoreNasResourceRequest;
use App\Http\Requests\Nas\UpdateNasResourceRequest;
use App\Http\Resources\Nas\NasResource;
use App\Services\Nas\NasResourceService;
use App\Services\Nas\MikrotikHealthService;
use Illuminate\Http\Request;
class NasResourceController extends ApiController
{
public function __construct(protected NasResourceService $service) {}
public function __construct(
protected NasResourceService $service,
protected MikrotikHealthService $mikrotikHealth,
) {}
public function index(IndexNasResourceRequest $request)
{
@@ -55,6 +59,18 @@ class NasResourceController extends ApiController
return $this->deleted('Data NAS berhasil dihapus');
}
public function testConnection(Request $request, int $id)
{
abort_unless($this->resource($request) === 'mikrotik', 404);
$mikrotik = $this->service->find('mikrotik', $id);
$this->authorizeTenant($request, $mikrotik->tenant_id);
return $this->success(
$this->mikrotikHealth->check($mikrotik),
'Koneksi RouterOS API berhasil'
);
}
private function resource(Request $request): string
{
return $request->route()->defaults['nas_resource'];
app/Http/Controllers/Nas/PackageProfileDeploymentController.php
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Http\Controllers\Nas;
use App\Http\Controllers\ApiController;
use App\Models\NasPackageProfile;
use App\Models\NasPackageProfileTarget;
use App\Services\Nas\PackageProfileDeploymentService;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use App\Models\NasScriptPolicy;
class PackageProfileDeploymentController extends ApiController
{
public function __construct(protected PackageProfileDeploymentService $service) {}
public function index(Request $request, NasPackageProfile $profile) { $this->authorizeProfile($request,$profile); return $this->success($this->service->targets($profile),'Target deployment berhasil diambil'); }
public function store(Request $request, NasPackageProfile $profile) { $this->authorizeProfile($request,$profile); $data=$request->validate(['nas_mikrotik_id'=>['required','integer','exists:nas_mikrotiks,id'],'external_profile_name'=>['required','string','max:255']]); return $this->created($this->service->saveTarget($profile,$data),'Target deployment berhasil disimpan'); }
public function sync(Request $request, NasPackageProfileTarget $target) { $this->authorizeProfile($request,$target->packageProfile); $data=$request->validate(['mode'=>['required',Rule::in(['create','update','adopt'])]]); return $this->updated($this->service->sync($target,$data['mode']),'Profile berhasil disinkronkan'); }
public function scriptOptions() { return $this->success(NasScriptPolicy::where('enabled',true)->with('latestVersion:id,nas_script_policy_id,version')->orderBy('service_type')->orderBy('event')->get(['id','code','name','service_type','event','current_version']),'Pilihan Script Policy berhasil diambil'); }
private function authorizeProfile(Request $request, NasPackageProfile $profile): void { abort_unless($request->user()->isMasterAdmin() || (int)$profile->tenant_id === (int)$request->attributes->get('tenant_id'),403); }
}
app/Http/Controllers/Nas/RadiusClusterController.php
+44
View File
@@ -0,0 +1,44 @@
<?php
namespace App\Http\Controllers\Nas;
use App\Http\Controllers\ApiController;
use App\Models\RadiusCluster;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
class RadiusClusterController extends ApiController
{
public function index(Request $request)
{
$this->authorizeMaster($request);
$data = $request->validate(['search'=>['nullable','string','max:255'],'status'=>['nullable',Rule::in(['planned','active','maintenance','inactive'])],'per_page'=>['nullable','integer','between:1,100']]);
$rows = RadiusCluster::query()->when($data['search'] ?? null, fn ($q,$search) => $q->where(fn ($x) => $x->where('name','ILIKE',"%{$search}%")->orWhere('code','ILIKE',"%{$search}%")->orWhere('region','ILIKE',"%{$search}%")))->when($data['status'] ?? null, fn ($q,$status) => $q->where('status',$status))->orderBy('name')->paginate($data['per_page'] ?? 10);
$rows->through(fn ($cluster) => $this->present($cluster));
return $this->success($rows, 'Cluster RADIUS berhasil diambil');
}
public function store(Request $request) { $this->authorizeMaster($request); return $this->created($this->present(RadiusCluster::create($this->validated($request))), 'Cluster RADIUS berhasil dibuat'); }
public function show(Request $request, RadiusCluster $radiusCluster) { $this->authorizeMaster($request); return $this->success($this->present($radiusCluster), 'Detail cluster RADIUS berhasil diambil'); }
public function update(Request $request, RadiusCluster $radiusCluster)
{
$this->authorizeMaster($request); $data=$this->validated($request,$radiusCluster);
if (blank($data['provisioning_api_token'] ?? null)) unset($data['provisioning_api_token']);
$radiusCluster->update($data); return $this->updated($this->present($radiusCluster->fresh()), 'Cluster RADIUS berhasil diperbarui');
}
public function destroy(Request $request, RadiusCluster $radiusCluster) { $this->authorizeMaster($request); $radiusCluster->delete(); return $this->deleted('Cluster RADIUS berhasil dihapus'); }
private function validated(Request $request, ?RadiusCluster $cluster=null): array
{
return $request->validate([
'code'=>['required','alpha_dash','max:80',Rule::unique('radius_clusters','code')->ignore($cluster)], 'name'=>['required','string','max:255'], 'region'=>['nullable','string','max:80'],
'auth_endpoints'=>['required','array','min:1','max:4'], 'auth_endpoints.*.host'=>['required','string','max:255'], 'auth_endpoints.*.port'=>['required','integer','between:1,65535'], 'auth_endpoints.*.priority'=>['required','integer','between:1,100'],
'accounting_endpoints'=>['required','array','min:1','max:4'], 'accounting_endpoints.*.host'=>['required','string','max:255'], 'accounting_endpoints.*.port'=>['required','integer','between:1,65535'], 'accounting_endpoints.*.priority'=>['required','integer','between:1,100'],
'coa_endpoints'=>['nullable','array','max:4'], 'coa_endpoints.*.host'=>['required','string','max:255'], 'coa_endpoints.*.port'=>['required','integer','between:1,65535'], 'coa_endpoints.*.priority'=>['required','integer','between:1,100'],
'provisioning_api_url'=>['nullable','url:http,https','max:2000'], 'provisioning_api_token'=>['nullable','string','max:4000'], 'healthcheck_url'=>['nullable','url:http,https','max:2000'],
'request_timeout'=>['required','integer','between:1,60'], 'retry_attempts'=>['required','integer','between:0,10'], 'status'=>['required',Rule::in(['planned','active','maintenance','inactive'])], 'notes'=>['nullable','string','max:5000'],
]);
}
private function present(RadiusCluster $cluster): array { $data=$cluster->attributesToArray(); unset($data['provisioning_api_token']); return [...$data,'has_provisioning_api_token'=>filled($cluster->getRawOriginal('provisioning_api_token'))]; }
private function authorizeMaster(Request $request): void { abort_unless($request->user()->isMasterAdmin(),403,'Infrastruktur RADIUS hanya dapat dikelola Master Admin.'); }
}
app/Http/Controllers/Nas/ScriptPolicyController.php
+18
View File
@@ -0,0 +1,18 @@
<?php
namespace App\Http\Controllers\Nas;
use App\Http\Controllers\ApiController;
use App\Models\NasScriptPolicy;
use App\Services\Nas\ScriptPolicyService;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
class ScriptPolicyController extends ApiController
{
public function __construct(protected ScriptPolicyService $service) {}
public function index(Request $request) { $this->authorizePlatform($request); $data=$request->validate(['search'=>['nullable','string','max:255'],'per_page'=>['nullable','integer','between:1,100']]); return $this->success($this->service->list($data),'Script Policy berhasil diambil'); }
public function store(Request $request) { $this->authorizePlatform($request); return $this->created($this->service->save($this->validated($request),$request->user()->id),'Script Policy berhasil dibuat'); }
public function update(Request $request, NasScriptPolicy $policy) { $this->authorizePlatform($request); return $this->updated($this->service->save($this->validated($request,$policy),$request->user()->id,$policy),'Versi Script Policy berhasil dibuat'); }
public function show(Request $request, NasScriptPolicy $policy) { $this->authorizePlatform($request); return $this->success($policy->load(['latestVersion','versions'=>fn($q)=>$q->latest('version')]),'Detail Script Policy berhasil diambil'); }
private function validated(Request $request, ?NasScriptPolicy $policy=null): array { return $request->validate(['code'=>['required','alpha_dash','max:100',Rule::unique('nas_script_policies','code')->ignore($policy)],'name'=>['required','string','max:255'],'service_type'=>['required',Rule::in(['ppp','hotspot'])],'event'=>['required',Rule::in(['on_up','on_down','on_login','on_logout'])],'script_template'=>['required','string','max:65535'],'change_notes'=>['nullable','string','max:1000'],'enabled'=>['nullable','boolean']]); }
private function authorizePlatform(Request $request): void { abort_unless($request->user()->isMasterAdmin() || $request->user()->is_platform_staff,403,'Script Policy hanya dapat dikelola staff platform.'); }
}
app/Http/Controllers/Nas/TenantNasSettingController.php
+59
View File
@@ -0,0 +1,59 @@
<?php
namespace App\Http\Controllers\Nas;
use App\Http\Controllers\ApiController;
use App\Models\Tenant;
use App\Models\TenantNasSetting;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use Illuminate\Validation\ValidationException;
class TenantNasSettingController extends ApiController
{
public function show(Request $request)
{
$tenant = $this->tenant($request);
$setting = TenantNasSetting::firstOrCreate(['tenant_id' => $tenant->id], ['backend_mode' => 'routeros_api']);
return $this->success($this->present($setting->load('radiusCluster:id,code,name,region,status')), 'Pengaturan backend NAS berhasil diambil');
}
public function update(Request $request)
{
$tenant = $this->tenant($request);
$setting = TenantNasSetting::firstOrCreate(['tenant_id' => $tenant->id], ['backend_mode' => 'routeros_api']);
$data = $request->validate([
'tenant_id' => ['nullable','integer','exists:tenants,id'],
'backend_mode' => ['required', Rule::in(['routeros_api','platform_radius','external_radius'])],
'radius_cluster_id' => ['nullable','integer','exists:radius_clusters,id'],
'external_radius_host' => ['nullable','string','max:255'],
'external_auth_port' => ['nullable','integer','between:1,65535'],
'external_accounting_port' => ['nullable','integer','between:1,65535'],
'external_coa_port' => ['nullable','integer','between:1,65535'],
'external_radius_secret' => ['nullable','string','max:1000'],
'external_provisioning_api_url' => ['nullable','url:http,https','max:2000'],
'external_provisioning_api_token' => ['nullable','string','max:2000'],
'accounting_enabled' => ['nullable','boolean'],
'coa_enabled' => ['nullable','boolean'],
]);
$usesExternal = $data['backend_mode'] === 'external_radius';
if ($usesExternal && empty($data['external_radius_host'])) throw ValidationException::withMessages(['external_radius_host'=>'Host RADIUS eksternal wajib diisi.']);
$data['hybrid_radius_source'] = null;
foreach (['external_radius_secret','external_provisioning_api_token'] as $secret) if (blank($data[$secret] ?? null)) unset($data[$secret]);
unset($data['tenant_id']);
$setting->update($data);
return $this->updated($this->present($setting->fresh()->load('radiusCluster:id,code,name,region,status')), 'Pengaturan backend NAS berhasil disimpan');
}
private function tenant(Request $request): Tenant
{
$id = $request->user()->isMasterAdmin() ? ($request->integer('tenant_id') ?: $request->attributes->get('tenant_id')) : $request->attributes->get('tenant_id');
abort_unless($id, 422, 'Tenant wajib dipilih.');
return Tenant::findOrFail($id);
}
private function present(TenantNasSetting $setting): array
{
return [...$setting->attributesToArray(), 'has_external_radius_secret'=>filled($setting->getRawOriginal('external_radius_secret')), 'has_external_provisioning_api_token'=>filled($setting->getRawOriginal('external_provisioning_api_token')), 'radius_cluster'=>$setting->radiusCluster];
}
}
app/Http/Controllers/Tenant/TenantController.php
+42
View File
@@ -10,6 +10,8 @@ use App\Http\Resources\Tenant\TenantResource;
use App\Models\Tenant;
use App\Services\Tenant\TenantService;
use Illuminate\Http\Request;
use App\Models\TenantInstallationSetting;
use Illuminate\Validation\Rule;
class TenantController extends ApiController
{
@@ -90,4 +92,44 @@ class TenantController extends ApiController
403
);
}
public function installationSetting(Request $request, Tenant $tenant)
{
$this->authorizeTenantAccess($request, $tenant);
$setting = TenantInstallationSetting::firstOrCreate(['tenant_id' => $tenant->id], ['activation_mode' => 'list_order']);
return $this->success([
...$setting->toArray(),
'tenant' => new TenantResource($tenant),
'ocr_api_key_configured' => filled($setting->ocr_api_key),
'can_manage_ocr' => $request->user()->isMasterAdmin(),
]);
}
public function updateInstallationSetting(Request $request, Tenant $tenant)
{
$this->authorizeTenantAccess($request, $tenant);
$rules = ['activation_mode' => ['required', Rule::in(['list_order', 'ticket'])]];
if ($request->user()->isMasterAdmin()) {
$rules += [
'ktp_ocr_enabled' => ['required', 'boolean'],
'ocr_provider' => ['nullable', 'required_if:ktp_ocr_enabled,true', Rule::in(['gemini', 'openai'])],
'ocr_api_key' => ['nullable', 'string', 'max:4096'],
'clear_ocr_api_key' => ['nullable', 'boolean'],
];
}
$data = $request->validate($rules);
$setting = TenantInstallationSetting::firstOrCreate(['tenant_id' => $tenant->id], ['activation_mode' => 'list_order']);
if ($request->user()->isMasterAdmin()) {
if (! empty($data['clear_ocr_api_key'])) $data['ocr_api_key'] = null;
elseif (blank($data['ocr_api_key'] ?? null)) unset($data['ocr_api_key']);
unset($data['clear_ocr_api_key']);
}
$setting->update($data);
return $this->updated([
...$setting->fresh()->toArray(),
'ocr_api_key_configured' => filled($setting->fresh()->ocr_api_key),
'can_manage_ocr' => $request->user()->isMasterAdmin(),
], 'Setting tenant berhasil disimpan');
}
}
app/Http/Controllers/Ticket/TicketController.php
+79 -6
View File
@@ -9,6 +9,11 @@ use App\Http\Requests\Ticket\UpdateTicketRequest;
use App\Http\Resources\Ticket\TicketResource;
use App\Models\Ticket;
use App\Services\Ticket\TicketService;
use App\Models\Customer;
use App\Models\TicketType;
use App\Models\User;
use App\Models\TicketMaterial;
use Illuminate\Http\Request;
class TicketController extends ApiController
{
@@ -19,7 +24,13 @@ class TicketController extends ApiController
public function index(IndexTicketRequest $request)
{
$filters = $request->validated();
$tickets = Ticket::query()
$tenantId = $request->attributes->get('tenant_id');
$sortBy = $filters['sort_by'] ?? 'created_at';
$sortDirection = $filters['sort_direction'] ?? 'desc';
$tickets = Ticket::query()->with(['ticketType:id,code,name,need_approval,require_photo,require_material','customer:id,customer_code,name','tenant:id,tenant_name','creator:id,name','assignments.user:id,name'])
->when(! $request->user()->isMasterAdmin(), fn ($query) => $query->where('tenant_id', $tenantId))
->when($request->user()->isMasterAdmin() && $tenantId, fn ($query) => $query->where('tenant_id', $tenantId))
->when(! empty($filters['assigned_to_me']), fn ($query) => $query->whereHas('assignments', fn ($assignment) => $assignment->where('user_id', $request->user()->id)))
->when(
! empty($filters['search']),
fn ($query) => $query->where(function ($searchQuery) use ($filters) {
@@ -44,7 +55,7 @@ class TicketController extends ApiController
! empty($filters['customer_id']),
fn ($query) => $query->where('customer_id', $filters['customer_id'])
)
->latest()
->orderBy($sortBy, $sortDirection)
->paginate($filters['per_page'] ?? 10);
return $this->successPaginated(
@@ -57,7 +68,7 @@ class TicketController extends ApiController
public function store(StoreTicketRequest $request)
{
$ticket = $this->service->create(
$request->validated()
$request->validated(), $request->user(), $request->attributes->get('tenant_id')
);
return $this->created(
@@ -66,10 +77,11 @@ class TicketController extends ApiController
);
}
public function show(Ticket $ticket)
public function show(Request $request, Ticket $ticket)
{
$this->authorizeTenant($request, $ticket);
return $this->success(
new TicketResource($ticket)
new TicketResource($ticket->load(['ticketType','customer','tenant','creator','assignments.user','logs','materials','attachments']))
);
}
@@ -77,6 +89,7 @@ class TicketController extends ApiController
UpdateTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTenant($request, $ticket);
$ticket = $this->service->update(
$ticket,
$request->validated()
@@ -88,12 +101,72 @@ class TicketController extends ApiController
);
}
public function destroy(Ticket $ticket)
public function destroy(Request $request, Ticket $ticket)
{
$this->authorizeTenant($request, $ticket);
$this->service->delete($ticket);
return $this->deleted(
'Ticket berhasil dibatalkan'
);
}
public function options(Request $request)
{
$tenantId = $request->attributes->get('tenant_id');
return $this->success([
'ticket_types' => TicketType::orderBy('name')->get(['id','code','name','need_approval','require_photo','require_material']),
'customers' => Customer::when(! $request->user()->isMasterAdmin() || $tenantId, fn ($q) => $q->where('tenant_id', $tenantId))->orderBy('name')->limit(500)->get(['id','customer_code','name','tenant_id']),
'technicians' => User::whereHas('userTenants', fn ($q) => $q->where('tenant_id', $tenantId))->orderBy('name')->get(['id','name','email']),
'installation_setting' => $tenantId
? \App\Models\TenantInstallationSetting::firstOrCreate(['tenant_id' => $tenantId], ['activation_mode' => 'list_order'])
: null,
'package_profiles'=>\App\Models\NasPackageProfile::where('tenant_id',$tenantId)->where('status','active')->orderBy('name')->get(['id','name']),
'nas_mikrotiks'=>\App\Models\NasMikrotik::where('tenant_id',$tenantId)->where('status','active')->orderBy('name')->get(['id','name']),
'billing_profiles'=>\App\Models\BillingProfile::where('tenant_id',$tenantId)->where('status','active')->orderBy('name')->get(['id','name']),
'topology_odps'=>\App\Models\TopologyNode::where('tenant_id',$tenantId)->whereHas('deviceType',fn($q)=>$q->whereRaw('UPPER(code) = ?',['ODP']))->orderBy('name')->get(['id','code','name']),
], 'Pilihan ticket berhasil diambil');
}
public function storeMaterial(Request $request, Ticket $ticket)
{
$this->authorizeTenant($request,$ticket);
$data=$request->validate(['technician_material_id'=>['nullable','required_without:technician_consumable_id','integer','exists:technician_materials,id'],'technician_consumable_id'=>['nullable','required_without:technician_material_id','integer','exists:technician_consumables,id'],'qty'=>['required','numeric','gt:0'],'notes'=>['nullable','string','max:1000']]);
abort_if(!empty($data['technician_material_id'])&&!empty($data['technician_consumable_id']),422,'Pilih satu material saja.');
$material=\Illuminate\Support\Facades\DB::transaction(function()use($data,$ticket,$request){
if(!empty($data['technician_material_id'])){$source=\App\Models\TechnicianMaterial::whereKey($data['technician_material_id'])->where('user_id',$request->user()->id)->where('status','assigned')->lockForUpdate()->firstOrFail();$qty=1;$source->update(['status'=>'used']);$name=$source->material_name;}
else{$source=\App\Models\TechnicianConsumable::whereKey($data['technician_consumable_id'])->where('user_id',$request->user()->id)->where('status','assigned')->lockForUpdate()->firstOrFail();$qty=(float)$data['qty'];abort_if((float)$source->qty_remaining<$qty,422,'Jumlah material yang dibawa tidak mencukupi.');$source->update(['qty_used'=>(float)$source->qty_used+$qty,'qty_remaining'=>(float)$source->qty_remaining-$qty]);$name=$source->material_name;}
\App\Models\MaterialMovement::create(['barcode_id'=>$source->barcode_id,'user_id'=>$request->user()->id,'from_user_id'=>$request->user()->id,'movement_type'=>'use','ticket_id'=>$ticket->id,'qty'=>$qty,'description'=>$data['notes']??null,'created_by'=>$request->user()->id,'created_at'=>now()]);
$warehouseBarcode=\App\Models\ItemBarcode::where('barcode',$source->barcode_id)->first();
if($warehouseBarcode)\App\Models\ItemMovement::create(['tenant_id'=>$ticket->tenant_id,'warehouse_item_id'=>$warehouseBarcode->warehouse_item_id,'item_barcode_id'=>$warehouseBarcode->id,'movement_type'=>'used_on_ticket','qty'=>$qty,'reference_type'=>'ticket','reference_id'=>$ticket->id,'from_user_id'=>$request->user()->id,'notes'=>$data['notes']??null,'created_by'=>$request->user()->id]);
return $ticket->materials()->create([...$data,'material_name'=>$name,'qty'=>$qty,'used_by'=>$request->user()->id,'created_at'=>now()]);
});
\App\Models\TicketLog::create(['ticket_id'=>$ticket->id,'user_id'=>$request->user()->id,'activity'=>'Material Digunakan','notes'=>$material->material_name.' x '.$material->qty,'created_at'=>now()]);
return $this->created($material->load('user:id,name'),'Material ticket berhasil ditambahkan');
}
public function materialOptions(Request $request, Ticket $ticket)
{
$this->authorizeTenant($request,$ticket);$userId=$request->user()->id;
return $this->success(['serialized'=>\App\Models\TechnicianMaterial::where('user_id',$userId)->where('status','assigned')->get(['id','barcode_id','material_name','serial_number']),'consumables'=>\App\Models\TechnicianConsumable::where('user_id',$userId)->where('status','assigned')->where('qty_remaining','>',0)->get(['id','barcode_id','material_name','unit','qty_remaining'])],'Material yang dibawa berhasil diambil');
}
public function installationPorts(Request $request,Ticket $ticket,int $node,\App\Services\Customer\CustomerService $customers){$this->authorizeTenant($request,$ticket);return $this->success($customers->availableOdpPorts($node,$request->user(),$ticket->tenant_id,$ticket->customer_id),'Port ODP berhasil diambil');}
public function destroyMaterial(Request $request, Ticket $ticket, TicketMaterial $material)
{
$this->authorizeTenant($request,$ticket);abort_unless((int)$material->ticket_id===(int)$ticket->id,404);
abort_if(in_array($ticket->status,['resolved','closed'],true),422,'Material ticket yang sudah selesai tidak dapat diubah.');
\Illuminate\Support\Facades\DB::transaction(function()use($request,$ticket,$material){
if($material->technician_material_id){$source=\App\Models\TechnicianMaterial::lockForUpdate()->find($material->technician_material_id);if($source)$source->update(['status'=>'assigned']);}
else{$source=\App\Models\TechnicianConsumable::lockForUpdate()->find($material->technician_consumable_id);if($source)$source->update(['qty_used'=>max(0,(float)$source->qty_used-(float)$material->qty),'qty_remaining'=>(float)$source->qty_remaining+(float)$material->qty,'status'=>'assigned']);}
if(isset($source)&&$source){\App\Models\MaterialMovement::create(['barcode_id'=>$source->barcode_id,'user_id'=>$request->user()->id,'to_user_id'=>$request->user()->id,'movement_type'=>'return','ticket_id'=>$ticket->id,'qty'=>$material->qty,'description'=>'Pembatalan pemakaian material pada ticket','created_by'=>$request->user()->id,'created_at'=>now()]);$warehouseBarcode=\App\Models\ItemBarcode::where('barcode',$source->barcode_id)->first();if($warehouseBarcode)\App\Models\ItemMovement::create(['tenant_id'=>$ticket->tenant_id,'warehouse_item_id'=>$warehouseBarcode->warehouse_item_id,'item_barcode_id'=>$warehouseBarcode->id,'movement_type'=>'ticket_usage_cancelled','qty'=>$material->qty,'reference_type'=>'ticket','reference_id'=>$ticket->id,'to_user_id'=>$request->user()->id,'notes'=>'Material dikembalikan ke saldo teknisi','created_by'=>$request->user()->id]);}
$material->delete();
});
return $this->deleted('Material ticket berhasil dihapus dan dikembalikan ke daftar bawaan user');
}
private function authorizeTenant(Request $request, Ticket $ticket): void
{
abort_unless($request->user()->isMasterAdmin() || (int) $ticket->tenant_id === (int) $request->attributes->get('tenant_id'), 403);
}
}
app/Http/Controllers/Ticket/TicketWorkflowController.php
+62 -3
View File
@@ -17,6 +17,8 @@ use App\Http\Requests\Ticket\CloseTicketRequest;
use App\Http\Requests\Ticket\CancelTicketRequest;
use App\Http\Requests\Ticket\EscalateTicketRequest;
use App\Http\Requests\Ticket\StartTicketRequest;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
class TicketWorkflowController extends ApiController
{
@@ -29,6 +31,7 @@ class TicketWorkflowController extends ApiController
*/
public function history(Ticket $ticket)
{
$this->authorizeTicket($ticket);
$data = $this->service->history($ticket);
return $this->success(
@@ -44,6 +47,7 @@ class TicketWorkflowController extends ApiController
AssignTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->assign(
$ticket,
$request->technicians,
@@ -64,6 +68,7 @@ class TicketWorkflowController extends ApiController
ReassignTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->reassign(
$ticket,
$request->technicians,
@@ -84,6 +89,7 @@ class TicketWorkflowController extends ApiController
ApproveTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->approve(
$ticket,
$request->notes,
@@ -103,6 +109,7 @@ class TicketWorkflowController extends ApiController
RejectTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->reject(
$ticket,
$request->reason,
@@ -122,6 +129,7 @@ class TicketWorkflowController extends ApiController
StartTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->start(
$ticket,
$request->validated(),
@@ -141,10 +149,12 @@ class TicketWorkflowController extends ApiController
PendingTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->pending(
$ticket,
$request->reason,
auth()->id() ?? 1
auth()->id() ?? 1,
$request->validated('stored_file_ids')
);
return $this->success(
@@ -158,6 +168,7 @@ class TicketWorkflowController extends ApiController
*/
public function resume(Ticket $ticket)
{
$this->authorizeTicket($ticket);
$ticket = $this->service->resume(
$ticket,
auth()->id() ?? 1
@@ -176,10 +187,12 @@ class TicketWorkflowController extends ApiController
ResolveTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->resolve(
$ticket,
$request->notes,
auth()->id() ?? 1
auth()->id() ?? 1,
$request->validated()
);
return $this->success(
@@ -195,6 +208,7 @@ class TicketWorkflowController extends ApiController
CloseTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->close(
$ticket,
$request->notes,
@@ -207,6 +221,42 @@ class TicketWorkflowController extends ApiController
);
}
public function verify(Request $request, Ticket $ticket)
{
$this->authorizeTicket($ticket);
abort_unless($ticket->status === 'resolved', 422, 'Hanya ticket selesai yang dapat diverifikasi.');
$data=$request->validate(['notes'=>['required','string','max:2000']]);
$ticket->update(['verified_by'=>$request->user()->id,'verified_at'=>now(),'verification_notes'=>$data['notes']]);
\App\Models\TicketLog::create(['ticket_id'=>$ticket->id,'user_id'=>$request->user()->id,'activity'=>'Verified','notes'=>$data['notes'],'created_at'=>now()]);
return $this->updated(new TicketResource($ticket->fresh()),'Ticket berhasil diverifikasi');
}
public function installationStep(Request $request, Ticket $ticket, \App\Services\Customer\CustomerService $customers)
{
$this->authorizeTicket($ticket);
abort_unless($ticket->source === 'new_installation' && $ticket->customer_id,422,'Ticket bukan pemasangan baru.');
abort_unless(in_array($ticket->status,['progress','pending'],true),422,'Pekerjaan harus dimulai terlebih dahulu.');
$step=$request->validate(['step'=>['required',Rule::in(['documentation','service','activation'])]])['step'];
$expected=$ticket->installation_step ?: 'documentation'; abort_unless($step===$expected,422,"Tahap yang harus dikerjakan adalah {$expected}.");
$customer=$customers->find($ticket->customer_id);
if($step==='documentation'){
$data=$request->validate(['stored_file_ids'=>['required','array','min:1'],'stored_file_ids.*'=>['integer','exists:stored_files,id'],'topology_id'=>['required','integer','exists:topology_nodes,id'],'topology_port_number'=>['required','integer','min:1']]);
$images=collect($data['stored_file_ids'])->map(fn($id)=>['stored_file_id'=>$id,'category'=>'installation','is_cover'=>false])->all();
$customers->update($customer,['tenant_id'=>$customer->tenant_id,'topology_id'=>$data['topology_id'],'topology_port_number'=>$data['topology_port_number'],'images'=>$images],$request->user());
foreach($data['stored_file_ids'] as $id)\App\Models\TicketAttachment::firstOrCreate(['ticket_id'=>$ticket->id,'stored_file_id'=>$id,'stage'=>'installation_documentation'],['uploaded_by'=>$request->user()->id]);
$next='service';
}elseif($step==='service'){
$data=$request->validate(['package_profile_id'=>['required','integer','exists:nas_package_profiles,id'],'nas_mikrotik_id'=>['required','integer','exists:nas_mikrotiks,id'],'billing_profile_id'=>['required','integer','exists:billing_profiles,id']]);
$customers->update($customer,['tenant_id'=>$customer->tenant_id,...$data],$request->user()); $next='activation';
}else{
$data=$request->validate(['package_profile_id'=>['required','integer'],'nas_mikrotik_id'=>['required','integer'],'billing_profile_id'=>['required','integer'],'external_username'=>['required','string','max:255'],'external_password'=>['required','string','min:4'],'serial_number'=>['nullable','string','max:120'],'mac_address'=>['nullable','regex:/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/']]);
$customers->activate($customer,['activation_source'=>'ticket',...$data],$request->user()); $next='completed';
}
$ticket->update(['installation_step'=>$next]);
\App\Models\TicketLog::create(['ticket_id'=>$ticket->id,'user_id'=>$request->user()->id,'activity'=>'Tahap Pemasangan Selesai','notes'=>$step.' → '.$next,'created_at'=>now()]);
return $this->updated(new TicketResource($ticket->fresh()->load(['customer','attachments'])),'Tahap pemasangan berhasil disimpan');
}
/**
* Cancel
*/
@@ -214,6 +264,7 @@ class TicketWorkflowController extends ApiController
CancelTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->cancel(
$ticket,
$request->reason,
@@ -233,6 +284,7 @@ class TicketWorkflowController extends ApiController
EscalateTicketRequest $request,
Ticket $ticket
) {
$this->authorizeTicket($ticket);
$ticket = $this->service->escalate(
$ticket,
$request->reason,
@@ -244,4 +296,11 @@ class TicketWorkflowController extends ApiController
'Ticket berhasil dieskalasi'
);
}
}
private function authorizeTicket(Ticket $ticket): void
{
$user = auth()->user();
$tenantId = request()->attributes->get('tenant_id');
abort_unless($user?->isMasterAdmin() || (int) $ticket->tenant_id === (int) $tenantId, 403);
}
}
app/Http/Controllers/Warehouse/WarehouseBatchController.php
+33
View File
@@ -0,0 +1,33 @@
<?php
namespace App\Http\Controllers\Warehouse;
use App\Http\Controllers\ApiController;use App\Models\{ItemBarcode,ItemCode,ItemMovement,ItemStockLog,WarehouseItem};use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;use Illuminate\Support\Str;use Illuminate\Validation\Rule;
class WarehouseBatchController extends ApiController
{
public function index(Request $r){$t=$r->attributes->get('tenant_id');$status=$r->input('status','active');$q=WarehouseItem::with(['warehouse:id,code,name','itemCode','barcodes'])->when(!$r->user()->isMasterAdmin()||$t,fn($x)=>$x->where('tenant_id',$t))->where('status',$status)->when($r->search,fn($x,$s)=>$x->where(fn($y)=>$y->where('item_number','ilike',"%$s%")->orWhereHas('itemCode',fn($z)=>$z->where('name','ilike',"%$s%")->orWhere('code','ilike',"%$s%"))))->orderByDesc('id')->paginate(min((int)$r->input('per_page',10),100));return $this->successPaginated($q,\Illuminate\Http\Resources\Json\JsonResource::class,'Daftar barang berhasil diambil');}
public function store(Request $r)
{
$t=$r->user()->isMasterAdmin()?($r->input('tenant_id')?:$r->attributes->get('tenant_id')):$r->attributes->get('tenant_id');
$d=$r->validate(['tenant_id'=>['nullable','integer','exists:tenants,id'],'warehouse_id'=>['required','integer','exists:warehouses,id'],'item_code_id'=>['required','integer','exists:item_codes,id'],'name'=>['required','string','max:255'],'quantity'=>['required','numeric','gt:0'],'package_count'=>['nullable','integer','min:1'],'received_at'=>['required','date'],'notes'=>['nullable','string']]);
$code=ItemCode::whereKey($d['item_code_id'])->where('tenant_id',$t)->firstOrFail();
abort_unless(\App\Models\Warehouse::whereKey($d['warehouse_id'])->where('tenant_id',$t)->exists(),422,'Gudang bukan milik tenant aktif.');
return DB::transaction(function()use($r,$d,$t,$code){
$base=$code->code.'-'.now()->format('dmy');
DB::select('SELECT pg_advisory_xact_lock(hashtext(?))',[$t.'|'.$base]);
$seq=WarehouseItem::where('tenant_id',$t)->where('item_number','like',$base.'%')->count()+1;
do{$number=$base.'-'.str_pad((string)$seq++,3,'0',STR_PAD_LEFT);}while(WarehouseItem::where('tenant_id',$t)->where('item_number',$number)->exists());
$item=WarehouseItem::create(['tenant_id'=>$t,'warehouse_id'=>$d['warehouse_id'],'item_code_id'=>$code->id,'item_number'=>$number,'status'=>'draft','sku'=>$code->code,'name'=>$d['name'],'tracking_type'=>$code->tracking_type==='serialized'?'serialized':'bulk','unit'=>$code->unit,'minimum_stock'=>$code->minimum_stock,'received_qty'=>$d['quantity'],'received_at'=>$d['received_at'],'notes'=>$d['notes']??null,'is_active'=>false]);
$count=$code->tracking_type==='serialized'?(int)$d['quantity']:max(1,(int)($d['package_count']??1));
abort_if($code->tracking_type==='serialized'&&(float)$d['quantity']!==floor((float)$d['quantity']),422,'Barang serialized harus berjumlah bilangan bulat.');
$remaining=(float)$d['quantity'];
for($i=1;$i<=$count;$i++){$qty=$code->tracking_type==='serialized'?1:($i===$count?$remaining:round((float)$d['quantity']/$count,2));$remaining-=$qty;ItemBarcode::create(['tenant_id'=>$t,'warehouse_item_id'=>$item->id,'package_number'=>$i,'barcode'=>$this->barcode($code->code,$t),'tracking_type'=>$code->tracking_type,'unit'=>$code->unit,'initial_qty'=>$qty,'remaining_qty'=>$qty,'status'=>'draft']);}
return $this->created($item->load(['warehouse','itemCode','barcodes']),'Barang draft dan barcode berhasil dibuat');
});
}
public function show(Request $r,WarehouseItem $item){$this->auth($r,$item);return $this->success($item->load(['warehouse','itemCode','barcodes','movements']),'Detail barang berhasil diambil');}
public function updateSerials(Request $r,WarehouseItem $item){$this->auth($r,$item);abort_unless($item->status==='draft',422,'Serial number hanya dapat diubah pada draft.');$d=$r->validate(['barcodes'=>['required','array','min:1'],'barcodes.*.id'=>['required','integer'],'barcodes.*.serial_number'=>['nullable','string','max:120']]);DB::transaction(function()use($d,$item){foreach($d['barcodes'] as $row){$barcode=$item->barcodes()->findOrFail($row['id']);$serial=$row['serial_number']?:null;if($serial&&ItemBarcode::where('tenant_id',$item->tenant_id)->where('serial_number',$serial)->whereKeyNot($barcode->id)->exists())abort(422,"Serial number {$serial} sudah digunakan.");$barcode->update(['serial_number'=>$serial]);}});return $this->updated($item->fresh()->load('barcodes'),'Serial number berhasil diperbarui');}
public function post(Request $r,WarehouseItem $item){$this->auth($r,$item);abort_unless($item->status==='draft',422,'Hanya barang draft yang dapat diposting.');$item->load(['itemCode','barcodes']);abort_if($item->barcodes->isEmpty(),422,'Barcode belum tersedia.');if($item->itemCode->need_serial_number)abort_if($item->barcodes->contains(fn($b)=>blank($b->serial_number)),422,'Semua serial number wajib diisi sebelum posting.');return DB::transaction(function()use($r,$item){$item->barcodes()->update(['status'=>'available']);$item->update(['status'=>'active','is_active'=>true,'posted_by'=>$r->user()->id,'posted_at'=>now()]);$move=ItemMovement::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'movement_type'=>'stock_posted','qty'=>$item->received_qty,'notes'=>'Draft diposting menjadi stok aktif','created_by'=>$r->user()->id]);ItemStockLog::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_movement_id'=>$move->id,'qty_before'=>0,'qty_change'=>$item->received_qty,'qty_after'=>$item->received_qty]);return $this->updated($item->fresh()->load(['warehouse','itemCode','barcodes']),'Barang berhasil diposting ke Daftar Barang');});}
public function destroy(Request $r,WarehouseItem $item){$this->auth($r,$item);abort_unless($item->status==='draft',422,'Hanya barang draft yang dapat dihapus.');$item->delete();return $this->deleted('Draft barang dan barcode berhasil dihapus');}
public function barcodeMovements(Request $r,WarehouseItem $item,ItemBarcode $barcode){$this->auth($r,$item);abort_unless((int)$barcode->warehouse_item_id===(int)$item->id,404);return $this->success(ItemMovement::where('item_barcode_id',$barcode->id)->latest()->get(),'Histori barcode berhasil diambil');}
private function barcode(string $code,int $tenant):string{do{$random='';$chars='ABCDEFGHJKLMNPQRSTUVWXYZ23456789';for($i=0;$i<6;$i++)$random.=$chars[random_int(0,strlen($chars)-1)];$value=$code.'-'.now()->format('dmy').'-'.$random;}while(ItemBarcode::where('barcode',$value)->exists());return $value;}
private function auth(Request $r,WarehouseItem $i){abort_unless($r->user()->isMasterAdmin()||(int)$i->tenant_id===(int)$r->attributes->get('tenant_id'),403);}
}
app/Http/Controllers/Warehouse/WarehouseController.php
+24
View File
@@ -0,0 +1,24 @@
<?php
namespace App\Http\Controllers\Warehouse;
use App\Http\Controllers\ApiController;use App\Models\{WarehouseItem,ItemBarcode,ItemCode,ItemMovement,ItemStockLog};use Illuminate\Http\Request;use Illuminate\Support\Facades\DB;use Illuminate\Validation\Rule;
class WarehouseController extends ApiController
{
public function index(Request $r){$t=$r->attributes->get('tenant_id');$q=WarehouseItem::with(['itemCode','barcodes'])->when(!$r->user()->isMasterAdmin()||$t,fn($x)=>$x->where('tenant_id',$t))->when($r->search,fn($x,$s)=>$x->whereHas('itemCode',fn($y)=>$y->where('name','ilike',"%$s%")->orWhere('code','ilike',"%$s%")))->orderBy($r->input('sort_by','id'),$r->input('sort_direction','desc'))->paginate(min((int)$r->input('per_page',10),100));return $this->successPaginated($q,\Illuminate\Http\Resources\Json\JsonResource::class,'Daftar barang berhasil diambil');}
public function store(Request $r){$d=$this->validateItem($r);$d['tenant_id']=$r->user()->isMasterAdmin()?($d['tenant_id']??$r->attributes->get('tenant_id')):$r->attributes->get('tenant_id');return $this->created(WarehouseItem::create($d),'Barang berhasil dibuat');}
public function update(Request $r,WarehouseItem $item){$this->auth($r,$item);$item->update($this->validateItem($r,$item));return $this->updated($item->fresh(),'Barang berhasil diperbarui');}
public function destroy(Request $r,WarehouseItem $item){$this->auth($r,$item);abort_if($item->barcodes()->where('remaining_qty','>',0)->exists(),422,'Barang yang masih memiliki stok tidak dapat dihapus.');$item->delete();return $this->deleted('Barang berhasil dihapus');}
public function receive(Request $r,WarehouseItem $item){$this->auth($r,$item);$item->loadMissing('itemCode');$type=$item->itemCode?->tracking_type??($item->tracking_type==='serialized'?'serialized':'quantity');$needSerial=(bool)($item->itemCode?->need_serial_number);$d=$r->validate(['barcode'=>['required','string','max:120','unique:item_barcodes,barcode'],'serial_number'=>[$needSerial?'required':'nullable','string','max:120'],'qty'=>['required','numeric','gt:0'],'notes'=>['nullable','string']]);if($type==='serialized')$d['qty']=1;return DB::transaction(function()use($r,$item,$d,$type){$before=(float)$item->barcodes()->sum('remaining_qty');$barcode=ItemBarcode::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'barcode'=>$d['barcode'],'tracking_type'=>$type,'unit'=>$item->itemCode?->unit??$item->unit,'serial_number'=>$d['serial_number']??null,'initial_qty'=>$d['qty'],'remaining_qty'=>$d['qty'],'status'=>'available']);$move=ItemMovement::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$barcode->id,'movement_type'=>'stock_in','qty'=>$d['qty'],'notes'=>$d['notes']??null,'created_by'=>$r->user()->id]);ItemStockLog::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$barcode->id,'item_movement_id'=>$move->id,'qty_before'=>$before,'qty_change'=>$d['qty'],'qty_after'=>$before+$d['qty'],'barcode_qty_before'=>0,'barcode_qty_change'=>$d['qty'],'barcode_qty_after'=>$d['qty']]);return $this->created($barcode,'Stok masuk berhasil dicatat');});}
public function options(Request $r){$t=$r->attributes->get('tenant_id');$users=\App\Models\UserTenant::with('user:id,name')->where('tenant_id',$t)->get()->pluck('user')->filter()->unique('id')->values();$codes=ItemCode::where('tenant_id',$t)->where('is_active',true)->orderBy('name')->get();return $this->success(['users'=>$users,'item_codes'=>$codes],'Pilihan gudang berhasil diambil');}
public function issue(Request $r,ItemBarcode $barcode){$item=$barcode->item;$this->auth($r,$item);$d=$r->validate(['user_id'=>['required','integer','exists:users,id'],'qty'=>['required','numeric','gt:0'],'notes'=>['nullable','string','max:1000']]);abort_unless(\App\Models\UserTenant::where('tenant_id',$item->tenant_id)->where('user_id',$d['user_id'])->exists(),422,'Penerima bukan user tenant ini.');return DB::transaction(function()use($r,$item,$barcode,$d){$locked=ItemBarcode::whereKey($barcode->id)->lockForUpdate()->firstOrFail();$barcodeBefore=(float)$locked->remaining_qty;$serialized=($locked->tracking_type??$item->tracking_type)==='serialized';$qty=$serialized?1:(float)$d['qty'];abort_if($barcodeBefore<$qty,422,'Stok barcode tidak mencukupi.');$before=(float)$item->barcodes()->sum('remaining_qty');if($serialized){abort_if(\App\Models\TechnicianMaterial::where('barcode_id',$locked->barcode)->exists(),422,'Barcode sudah pernah dikeluarkan.');\App\Models\TechnicianMaterial::create(['user_id'=>$d['user_id'],'barcode_id'=>$locked->barcode,'inventory_item_id'=>$item->id,'material_name'=>$item->name,'serial_number'=>$locked->serial_number,'status'=>'assigned','assigned_at'=>now(),'assigned_by'=>$r->user()->id]);}else{abort_if(\App\Models\TechnicianConsumable::where('barcode_id',$locked->barcode)->exists(),422,'Satu barcode quantity hanya dapat diserahkan kepada satu user sampai dikembalikan.');\App\Models\TechnicianConsumable::create(['user_id'=>$d['user_id'],'barcode_id'=>$locked->barcode,'inventory_item_id'=>$item->id,'material_name'=>$item->name,'unit'=>$locked->unit??$item->unit,'qty_received'=>$qty,'qty_used'=>0,'qty_remaining'=>$qty,'status'=>'assigned','assigned_at'=>now(),'assigned_by'=>$r->user()->id]);}$barcodeAfter=$barcodeBefore-$qty;$locked->update(['remaining_qty'=>$barcodeAfter,'status'=>$barcodeAfter>0?'available':'issued']);$move=ItemMovement::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$locked->id,'movement_type'=>'issue_to_technician','qty'=>$qty,'to_user_id'=>$d['user_id'],'notes'=>$d['notes']??null,'created_by'=>$r->user()->id]);ItemStockLog::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$locked->id,'item_movement_id'=>$move->id,'qty_before'=>$before,'qty_change'=>-$qty,'qty_after'=>$before-$qty,'barcode_qty_before'=>$barcodeBefore,'barcode_qty_change'=>-$qty,'barcode_qty_after'=>$barcodeAfter]);return $this->created($move,'Barang berhasil dikeluarkan kepada user');});}
public function movements(Request $r){$t=$r->attributes->get('tenant_id');return $this->successPaginated(ItemMovement::when(!$r->user()->isMasterAdmin()||$t,fn($q)=>$q->where('tenant_id',$t))->latest()->paginate(min((int)$r->input('per_page',20),100)),\Illuminate\Http\Resources\Json\JsonResource::class,'Pergerakan barang berhasil diambil');}
public function technicianInventory(Request $r){$t=$r->attributes->get('tenant_id');$userIds=\App\Models\UserTenant::where('tenant_id',$t)->pluck('user_id');$serialized=\App\Models\TechnicianMaterial::with('user:id,name')->whereIn('user_id',$userIds)->where('status','assigned')->get()->map(fn($x)=>['id'=>'s-'.$x->id,'user'=>$x->user?->name,'material_name'=>$x->material_name,'barcode'=>$x->barcode_id,'tracking_type'=>'serialized','qty'=>1,'unit'=>'pcs','status'=>$x->status,'assigned_at'=>$x->assigned_at]);$quantity=\App\Models\TechnicianConsumable::with('user:id,name')->whereIn('user_id',$userIds)->where('status','assigned')->where('qty_remaining','>',0)->get()->map(fn($x)=>['id'=>'q-'.$x->id,'user'=>$x->user?->name,'material_name'=>$x->material_name,'barcode'=>$x->barcode_id,'tracking_type'=>'quantity','qty'=>$x->qty_remaining,'unit'=>$x->unit,'status'=>$x->status,'assigned_at'=>$x->assigned_at]);$all=$serialized->concat($quantity)->sortByDesc('assigned_at')->values();$page=max(1,(int)$r->input('page',1));$per=min(max(1,(int)$r->input('per_page',10)),100);$p=new \Illuminate\Pagination\LengthAwarePaginator($all->forPage($page,$per)->values(),$all->count(),$per,$page,['path'=>$r->url(),'query'=>$r->query()]);return $this->successPaginated($p,\Illuminate\Http\Resources\Json\JsonResource::class,'Peralatan teknisi berhasil diambil');}
public function returnFromTechnician(Request $r){$d=$r->validate(['source_type'=>['required',Rule::in(['serialized','quantity'])],'source_id'=>['required','integer'],'qty'=>['required','numeric','gt:0'],'notes'=>['nullable','string','max:1000']]);$t=$r->attributes->get('tenant_id');return DB::transaction(function()use($r,$d,$t){$source=$d['source_type']==='serialized'?\App\Models\TechnicianMaterial::lockForUpdate()->findOrFail($d['source_id']):\App\Models\TechnicianConsumable::lockForUpdate()->findOrFail($d['source_id']);abort_unless(\App\Models\UserTenant::where('tenant_id',$t)->where('user_id',$source->user_id)->exists(),403);$barcode=ItemBarcode::where('barcode',$source->barcode_id)->lockForUpdate()->firstOrFail();$item=$barcode->item;$qty=$d['source_type']==='serialized'?1:(float)$d['qty'];if($d['source_type']==='serialized'){abort_unless($source->status==='assigned',422,'Barang sudah tidak berada pada teknisi.');$source->update(['status'=>'returned']);}else{abort_if((float)$source->qty_remaining<$qty,422,'Jumlah pengembalian melebihi sisa teknisi.');$remaining=(float)$source->qty_remaining-$qty;$source->update(['qty_remaining'=>$remaining,'status'=>$remaining>0?'assigned':'returned']);}$itemBefore=(float)$item->barcodes()->sum('remaining_qty');$barcodeBefore=(float)$barcode->remaining_qty;$barcodeAfter=$barcodeBefore+$qty;$barcode->update(['remaining_qty'=>$barcodeAfter,'status'=>'available']);$move=ItemMovement::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$barcode->id,'movement_type'=>'return_to_warehouse','qty'=>$qty,'from_user_id'=>$source->user_id,'notes'=>$d['notes']??null,'created_by'=>$r->user()->id]);ItemStockLog::create(['tenant_id'=>$item->tenant_id,'warehouse_item_id'=>$item->id,'item_barcode_id'=>$barcode->id,'item_movement_id'=>$move->id,'qty_before'=>$itemBefore,'qty_change'=>$qty,'qty_after'=>$itemBefore+$qty,'barcode_qty_before'=>$barcodeBefore,'barcode_qty_change'=>$qty,'barcode_qty_after'=>$barcodeAfter]);return $this->created($move,'Barang berhasil dikembalikan ke gudang');});}
public function codeIndex(Request $r){$t=$r->attributes->get('tenant_id');$q=ItemCode::when(!$r->user()->isMasterAdmin()||$t,fn($x)=>$x->where('tenant_id',$t))->when($r->search,fn($x,$s)=>$x->where(fn($y)=>$y->where('name','ilike',"%$s%")->orWhere('code','ilike',"%$s%")))->orderBy($r->input('sort_by','name'),$r->input('sort_direction','asc'))->paginate(min((int)$r->input('per_page',10),100));return $this->successPaginated($q,\Illuminate\Http\Resources\Json\JsonResource::class,'Kode barang berhasil diambil');}
public function codeStore(Request $r){$d=$this->validateCode($r);$d['tenant_id']=$r->user()->isMasterAdmin()?($d['tenant_id']??$r->attributes->get('tenant_id')):$r->attributes->get('tenant_id');$d['created_by']=$r->user()->id;return $this->created(ItemCode::create($d),'Kode barang berhasil dibuat');}
public function codeUpdate(Request $r,ItemCode $code){$this->authCode($r,$code);$code->update($this->validateCode($r,$code));return $this->updated($code->fresh(),'Kode barang berhasil diperbarui');}
public function codeDestroy(Request $r,ItemCode $code){$this->authCode($r,$code);abort_if($code->items()->exists(),422,'Kode barang yang sudah digunakan tidak dapat dihapus.');$code->delete();return $this->deleted('Kode barang berhasil dihapus');}
private function validateCode(Request $r,?ItemCode $code=null){$tenant=$r->input('tenant_id')?:$r->attributes->get('tenant_id');return $r->validate(['tenant_id'=>['nullable','integer','exists:tenants,id'],'code'=>['required','string','max:80',Rule::unique('item_codes')->where('tenant_id',$tenant)->ignore($code)],'name'=>['required','string','max:255'],'tracking_type'=>['required',Rule::in(['serialized','quantity'])],'need_serial_number'=>['boolean'],'unit'=>['required',Rule::in(['pcs','meter','lembar','roll','box','dus','set','unit'])],'minimum_stock'=>['nullable','numeric','min:0'],'description'=>['nullable','string'],'is_active'=>['boolean']]);}
private function validateItem(Request $r,?WarehouseItem $i=null){$tenant=$r->user()->isMasterAdmin()?($r->input('tenant_id')?:$r->attributes->get('tenant_id')):$r->attributes->get('tenant_id');$d=$r->validate(['tenant_id'=>['nullable','integer','exists:tenants,id'],'item_code_id'=>['required','integer','exists:item_codes,id',Rule::unique('warehouse_items')->where('tenant_id',$tenant)->ignore($i)],'is_active'=>['boolean']]);$code=ItemCode::findOrFail($d['item_code_id']);abort_unless((int)$code->tenant_id===(int)$tenant,422,'Kode barang bukan milik tenant aktif.');return [...$d,'sku'=>$code->code,'name'=>$code->name,'tracking_type'=>$code->tracking_type==='serialized'?'serialized':'bulk','unit'=>$code->unit,'minimum_stock'=>$code->minimum_stock];}
private function authCode(Request $r,ItemCode $code){abort_unless($r->user()->isMasterAdmin()||(int)$code->tenant_id===(int)$r->attributes->get('tenant_id'),403);}
private function auth(Request $r,WarehouseItem $i){abort_unless($r->user()->isMasterAdmin()||(int)$i->tenant_id===(int)$r->attributes->get('tenant_id'),403);}
}
app/Http/Controllers/Warehouse/WarehouseLocationController.php
+12
View File
@@ -0,0 +1,12 @@
<?php
namespace App\Http\Controllers\Warehouse;
use App\Http\Controllers\ApiController;use App\Models\Warehouse;use Illuminate\Http\Request;use Illuminate\Validation\Rule;
class WarehouseLocationController extends ApiController
{
public function index(Request $r){$t=$r->attributes->get('tenant_id');$q=Warehouse::withCount('items')->when(!$r->user()->isMasterAdmin()||$t,fn($x)=>$x->where('tenant_id',$t))->when($r->search,fn($x,$s)=>$x->where(fn($y)=>$y->where('name','ilike',"%$s%")->orWhere('code','ilike',"%$s%")))->orderBy('name')->paginate(min((int)$r->input('per_page',10),100));return $this->successPaginated($q,\Illuminate\Http\Resources\Json\JsonResource::class,'Daftar gudang berhasil diambil');}
public function store(Request $r){$d=$this->data($r);$d['tenant_id']=$r->user()->isMasterAdmin()?($d['tenant_id']??$r->attributes->get('tenant_id')):$r->attributes->get('tenant_id');$d['created_by']=$r->user()->id;return $this->created(Warehouse::create($d),'Gudang berhasil dibuat');}
public function update(Request $r,Warehouse $warehouse){$this->auth($r,$warehouse);$warehouse->update($this->data($r,$warehouse));return $this->updated($warehouse->fresh(),'Gudang berhasil diperbarui');}
public function destroy(Request $r,Warehouse $warehouse){$this->auth($r,$warehouse);abort_if($warehouse->items()->exists(),422,'Gudang yang sudah memiliki barang tidak dapat dihapus.');$warehouse->delete();return $this->deleted('Gudang berhasil dihapus');}
private function data(Request $r,?Warehouse $w=null){$t=$r->input('tenant_id')?:$r->attributes->get('tenant_id');return $r->validate(['tenant_id'=>['nullable','integer','exists:tenants,id'],'code'=>['required','string','max:50',Rule::unique('warehouses')->where('tenant_id',$t)->ignore($w)],'name'=>['required','string','max:255'],'address'=>['nullable','string'],'is_active'=>['boolean']]);}
private function auth(Request $r,Warehouse $w){abort_unless($r->user()->isMasterAdmin()||(int)$w->tenant_id===(int)$r->attributes->get('tenant_id'),403);}
}
app/Http/Requests/Customer/ActivateCustomerRequest.php
+7 -1
View File
@@ -3,6 +3,7 @@
namespace App\Http\Requests\Customer;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class ActivateCustomerRequest extends FormRequest
{
@@ -14,11 +15,16 @@ class ActivateCustomerRequest extends FormRequest
public function rules(): array
{
return [
'activation_source' => ['required', Rule::in(['list_order', 'ticket'])],
'package_profile_id' => ['required', 'integer', 'exists:nas_package_profiles,id'],
'nas_mikrotik_id' => ['required', 'integer', 'exists:nas_mikrotiks,id'],
'billing_profile_id' => ['required', 'integer', 'exists:billing_profiles,id'],
'topology_id' => ['nullable', 'integer', 'min:1'],
'external_username' => ['nullable', 'string', 'max:255'],
'external_username' => ['required', 'string', 'max:255'],
'external_password' => ['required', 'string', 'min:4', 'max:255'],
'mac_address' => ['nullable', 'regex:/^([0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}$/'],
'serial_number' => ['nullable', 'string', 'max:120'],
'assigned_ip' => ['nullable', 'ip'],
];
}
}
app/Http/Requests/Customer/StoreCustomerRequest.php
+3 -4
View File
@@ -17,7 +17,6 @@ class StoreCustomerRequest extends FormRequest
return [
'tenant_id' => ['nullable', 'integer', 'exists:tenants,id'],
'user_id' => ['nullable', 'integer', 'exists:users,id'],
'customer_code' => ['nullable', 'string', 'max:100'],
'name' => ['required', 'string', 'max:255'],
'identity_number' => ['nullable', 'string', 'max:100'],
'email' => ['nullable', 'email', 'max:255'],
@@ -32,10 +31,10 @@ class StoreCustomerRequest extends FormRequest
'package_profile_id' => ['nullable', 'integer', 'exists:nas_package_profiles,id'],
'nas_mikrotik_id' => ['nullable', 'integer', 'exists:nas_mikrotiks,id'],
'billing_profile_id' => ['nullable', 'integer', 'min:1'],
'topology_id' => ['nullable', 'integer', 'min:1'],
'external_username' => ['nullable', 'string', 'max:255'],
'topology_id' => ['nullable', 'integer', 'exists:topology_nodes,id'],
'topology_port_number' => ['nullable', 'required_with:topology_id', 'integer', 'min:1'],
'sales_user_id' => ['nullable', 'integer', 'exists:users,id'],
'source' => ['nullable', Rule::in(['manual', 'mikrotik', 'radius'])],
'order_stage' => ['nullable', Rule::in(['registration', 'data_completion', 'ready_activation', 'activation_failed'])],
'notes' => ['nullable', 'string'],
'images' => ['nullable', 'array', 'max:20'],
'images.*.stored_file_id' => ['required', 'integer', 'exists:stored_files,id'],
app/Http/Requests/MenuGroup/SyncMenuGroupMenusRequest.php
+1
View File
@@ -49,6 +49,7 @@ class SyncMenuGroupMenusRequest extends FormRequest
'nullable',
'boolean',
],
'menus.*.can_activate' => ['nullable','boolean'],
'menus.*.can_export' => [
'nullable',
'boolean',
app/Http/Requests/Nas/IndexNasResourceRequest.php
+1 -1
View File
@@ -18,7 +18,7 @@ class IndexNasResourceRequest extends FormRequest
'search' => ['nullable', 'string', 'max:255'],
'status' => ['nullable', Rule::in(['active', 'inactive'])],
'connection_type' => ['nullable', Rule::in(['api', 'radius'])],
'service_type' => ['nullable', Rule::in(['ppp', 'hotspot', 'radius'])],
'service_type' => ['nullable', Rule::in(['ppp', 'hotspot', 'static_ip', 'dynamic_ip'])],
'page' => ['nullable', 'integer', 'min:1'],
'per_page' => ['nullable', 'integer', 'min:1', 'max:100'],
'sort_by' => ['nullable', Rule::in(['id', 'name', 'host', 'connection_type', 'service_type', 'vendor', 'device_type', 'status', 'created_at'])],
app/Http/Requests/Nas/StoreNasResourceRequest.php
+64 -1
View File
@@ -17,17 +17,42 @@ class StoreNasResourceRequest extends FormRequest
return array_merge($this->commonRules(), match ($this->route()->defaults['nas_resource'] ?? null) {
'mikrotik' => [
'connection_type' => ['required', Rule::in(['api', 'radius'])],
'backend_mode_override' => ['required', Rule::in(['routeros_api','platform_radius','external_radius'])],
'host' => ['required', 'string', 'max:255'],
'nas_identifier' => ['nullable', 'string', 'max:255'],
'nas_ip_address' => ['nullable', 'ip'],
'radius_host' => ['nullable', 'string', 'max:255'],
'api_port' => ['nullable', 'integer', 'between:1,65535'],
'api_username' => ['nullable', 'string', 'max:255'],
'api_password' => ['nullable', 'string', 'max:1000'],
'radius_auth_port' => ['nullable', 'integer', 'between:1,65535'],
'radius_accounting_port' => ['nullable', 'integer', 'between:1,65535'],
'radius_coa_port' => ['nullable', 'integer', 'between:1,65535'],
'radius_secret' => ['nullable', 'string', 'max:1000'],
'timeout' => ['nullable', 'integer', 'between:1,300'],
],
'package-profile' => [
'service_type' => ['required', Rule::in(['ppp', 'hotspot', 'radius'])],
'service_type' => ['required', Rule::in(['ppp', 'hotspot', 'static_ip', 'dynamic_ip'])],
'profile_code' => ['required', 'alpha_dash', 'max:80'],
'usage_mode' => ['nullable', Rule::in(['one_time', 'periodic', 'recurring_member'])],
'validity_start' => ['nullable', Rule::in(['activation', 'first_login'])],
'validity_value' => ['nullable', 'integer', 'min:1'],
'validity_unit' => ['nullable', Rule::in(['minutes', 'hours', 'days', 'months'])],
'uptime_limit_seconds' => ['nullable', 'integer', 'min:0'],
'data_limit_bytes' => ['nullable', 'integer', 'min:0'],
'grace_period_minutes' => ['nullable', 'integer', 'min:0', 'max:10080'],
'mac_lock_required' => ['nullable', 'boolean'],
'ip_pool' => ['nullable', 'string', 'max:255'],
'subnet_cidr' => ['nullable', 'string', 'max:64'],
'gateway' => ['nullable', 'ip'],
'dns_servers' => ['nullable', 'array', 'max:4'],
'dns_servers.*' => ['required', 'ip'],
'vlan_id' => ['nullable', 'integer', 'between:1,4094'],
'service_parameters' => ['nullable', 'array'],
'scripts' => ['nullable', 'array'],
'scripts.*.policy_id' => ['required', 'integer', 'exists:nas_script_policies,id'],
'scripts.*.version_id' => ['nullable', 'integer', 'exists:nas_script_policy_versions,id'],
'scripts.*.event' => ['required', Rule::in(['on_up','on_down','on_login','on_logout'])],
'external_profile_name' => ['nullable', 'string', 'max:255'],
'download_kbps' => ['nullable', 'integer', 'min:0'],
'upload_kbps' => ['nullable', 'integer', 'min:0'],
@@ -72,4 +97,42 @@ class StoreNasResourceRequest extends FormRequest
'notes' => ['nullable', 'string'],
];
}
public function withValidator($validator): void
{
$resource = $this->route()->defaults['nas_resource'] ?? null;
if ($resource === 'mikrotik') {
$validator->after(function ($validator) {
$mode = $this->input('backend_mode_override');
if (! $this->input('api_username')) $validator->errors()->add('api_username', 'API Username wajib diisi untuk monitoring Mikrotik.');
if ($this->isMethod('post') && ! $this->input('api_password')) $validator->errors()->add('api_password', 'API Password wajib diisi.');
if ($mode !== 'routeros_api') {
if (! $this->input('nas_identifier')) $validator->errors()->add('nas_identifier', 'NAS Identifier wajib diisi untuk integrasi RADIUS.');
if (! $this->input('nas_ip_address')) $validator->errors()->add('nas_ip_address', 'IP NAS wajib diisi untuk integrasi RADIUS.');
if ($this->isMethod('post') && ! $this->input('radius_secret')) $validator->errors()->add('radius_secret', 'Shared secret khusus NAS wajib diisi.');
if ($mode === 'external_radius' && ! $this->input('radius_host')) $validator->errors()->add('radius_host', 'Host RADIUS Eksternal wajib diisi.');
}
});
return;
}
if ($resource !== 'package-profile') return;
$validator->after(function ($validator) {
$type = $this->input('service_type');
$mode = $this->input('usage_mode');
if ($type === 'hotspot' && ! in_array($mode, ['one_time', 'periodic', 'recurring_member'], true)) {
$validator->errors()->add('usage_mode', 'Mode pemakaian wajib dipilih untuk profile Hotspot.');
}
if ($type === 'hotspot' && in_array($mode, ['one_time', 'periodic', 'recurring_member'], true)
&& (! $this->input('validity_value') || ! $this->input('validity_unit'))) {
$validator->errors()->add('validity_value', 'Durasi dan satuan masa aktif wajib diisi untuk profile Hotspot.');
}
if (in_array($type, ['static_ip', 'dynamic_ip'], true)) {
if (! $this->boolean('mac_lock_required')) $validator->errors()->add('mac_lock_required', 'Penguncian MAC wajib aktif untuk profile IP Static/Dinamis.');
if (! $this->input('subnet_cidr')) $validator->errors()->add('subnet_cidr', 'Subnet CIDR wajib diisi.');
if (! $this->input('gateway')) $validator->errors()->add('gateway', 'Gateway wajib diisi.');
if ($type === 'dynamic_ip' && ! $this->input('ip_pool')) $validator->errors()->add('ip_pool', 'IP Pool wajib diisi untuk IP Dinamis.');
}
});
}
}
app/Http/Requests/Ticket/AssignTicketRequest.php
+2 -1
View File
@@ -24,7 +24,8 @@ class AssignTicketRequest extends FormRequest
{
return [
'technicians' => 'required|array|min:1',
'leader_id' => 'required|integer',
'technicians.*' => 'required|integer|exists:users,id',
'leader_id' => 'required|integer|in_array:technicians.*',
];
}
}
app/Http/Requests/Ticket/IndexTicketRequest.php
+3
View File
@@ -32,6 +32,9 @@ class IndexTicketRequest extends FormRequest
'page' => ['nullable', 'integer', 'min:1'],
/** Jumlah data per halaman, maksimal 100. */
'per_page' => ['nullable', 'integer', 'min:1', 'max:100'],
'sort_by' => ['nullable', Rule::in(['ticket_no', 'title', 'priority', 'status', 'created_at'])],
'sort_direction' => ['nullable', Rule::in(['asc', 'desc'])],
'assigned_to_me' => ['nullable', 'boolean'],
];
}
}
app/Http/Requests/Ticket/PendingTicketRequest.php
+3 -1
View File
@@ -23,7 +23,9 @@ class PendingTicketRequest extends FormRequest
public function rules(): array
{
return [
'reason' => 'required|string|max:1000'
'reason' => 'required|string|max:1000',
'stored_file_ids' => ['required','array','min:1'],
'stored_file_ids.*' => ['integer','exists:stored_files,id'],
];
}
}
app/Http/Requests/Ticket/ResolveTicketRequest.php
+3 -1
View File
@@ -23,7 +23,9 @@ class ResolveTicketRequest extends FormRequest
public function rules(): array
{
return [
'notes' => 'required|string|max:2000'
'notes' => 'required|string|max:2000',
'stored_file_ids' => ['required','array','min:1'],
'stored_file_ids.*' => ['integer','exists:stored_files,id'],
];
}
}
app/Http/Requests/Ticket/StartTicketRequest.php
+3 -1
View File
@@ -25,7 +25,9 @@ class StartTicketRequest extends FormRequest
return [
'latitude' => 'nullable|numeric',
'longitude' => 'nullable|numeric',
'notes' => 'nullable|string|max:1000'
'notes' => 'nullable|string|max:1000',
'stored_file_ids' => ['required','array','min:1'],
'stored_file_ids.*' => ['integer','exists:stored_files,id'],
];
}
}
app/Http/Requests/Ticket/StoreTicketRequest.php
+3 -2
View File
@@ -23,8 +23,9 @@ class StoreTicketRequest extends FormRequest
public function rules(): array
{
return [
'ticket_type_id' => 'required|integer',
'customer_id' => 'nullable|integer',
'tenant_id' => 'nullable|integer|exists:tenants,id',
'ticket_type_id' => 'required|integer|exists:ticket_types,id',
'customer_id' => 'nullable|integer|exists:customers,id',
'title' => 'required|string|max:255',
'description' => 'nullable|string',
'priority' => 'required|in:low,medium,high,critical'
app/Http/Resources/Nas/NasResource.php
+18
View File
@@ -10,6 +10,7 @@ class NasResource extends JsonResource
public function toArray(Request $request): array
{
$data = $this->resource->attributesToArray();
if ($this->resource instanceof \App\Models\NasMikrotik) $data['effective_backend_mode'] = $this->resource->effectiveBackendMode();
unset($data['api_password'], $data['radius_secret'], $data['community'], $data['auth_password'], $data['privacy_password'], $data['password']);
$data['tenant'] = $this->whenLoaded('tenant', fn () => [
@@ -17,6 +18,23 @@ class NasResource extends JsonResource
'tenant_code' => $this->tenant->tenant_code,
'tenant_name' => $this->tenant->tenant_name,
]);
$data['scripts'] = $this->whenLoaded('scripts', fn () => $this->scripts->map(fn ($policy) => [
'id' => $policy->id,
'code' => $policy->code,
'name' => $policy->name,
'service_type' => $policy->service_type,
'event' => $policy->event,
'current_version' => $policy->current_version,
'latest_version' => $policy->relationLoaded('latestVersion') && $policy->latestVersion ? [
'id' => $policy->latestVersion->id,
'version' => $policy->latestVersion->version,
] : null,
'pivot' => [
'event' => $policy->pivot->event,
'nas_script_policy_version_id' => $policy->pivot->nas_script_policy_version_id,
'enabled' => (bool) $policy->pivot->enabled,
],
]));
foreach ([
'api_password' => 'has_api_password',
app/Http/Resources/Ticket/TicketResource.php
+17
View File
@@ -23,9 +23,26 @@ class TicketResource extends JsonResource
'description' => $this->description,
'priority' => $this->priority,
'status' => $this->status,
'source' => $this->source,
'installation_step' => $this->installation_step,
'verified_by' => $this->verified_by,
'verified_at' => $this->verified_at,
'verification_notes' => $this->verification_notes,
'created_by' => $this->created_by,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
'tenant_id' => $this->tenant_id,
'sla_minutes' => $this->sla_minutes,
'assigned_at' => $this->assigned_at,
'resolved_at' => $this->resolved_at,
'closed_at' => $this->closed_at,
'ticket_type' => $this->whenLoaded('ticketType'),
'tenant' => $this->whenLoaded('tenant'),
'customer' => $this->whenLoaded('customer'),
'creator' => $this->whenLoaded('creator'),
'assignments' => $this->whenLoaded('assignments'),
'materials' => $this->whenLoaded('materials'),
'attachments' => $this->whenLoaded('attachments'),
];
}
}