commit melhorias compras1
tests / ci (push) Waiting to run

This commit is contained in:
2026-11-21 21:04:40 +02:00
parent 976271f948
commit 12dd6df28a
108 changed files with 4391 additions and 408 deletions
+18 -18
View File
@@ -21,17 +21,17 @@ class CompanyController extends Controller
{
public function setup(Request $request): Response|RedirectResponse
{
return $request->user()->tenant_id ? to_route('dashboard') : Inertia::render('company/setup');
return $this->staffIdentity($request)->tenant_id ? to_route('dashboard') : Inertia::render('company/setup');
}
public function store(Request $request, RequisitionWorkflow $workflow): RedirectResponse
{
abort_if($request->user()->tenant_id !== null, 403);
abort_if($this->staffIdentity($request)->tenant_id !== null, 403);
$data = $request->validate(['name' => 'required|string|max:150', 'department' => 'required|string|max:100',
'second_name' => 'required|string|max:100', 'second_email' => 'required|email|max:255|unique:users,email', 'second_password' => 'required|string|min:12|confirmed',
'first_limit' => ['required', 'string', 'regex:/^\d{1,12}(\.\d{1,2})?$/D'], 'second_limit' => ['required', 'string', 'regex:/^\d{1,12}(\.\d{1,2})?$/D'], 'includes_tax' => 'required|boolean']);
DB::transaction(function () use ($request, $data, $workflow) {
$user = User::query()->lockForUpdate()->findOrFail($request->user()->id);
$user = User::query()->lockForUpdate()->findOrFail($this->staffIdentity($request)->id);
abort_if($user->tenant_id !== null, 403);
$tenant = Tenant::query()->create(['name' => $data['name'], ...OrganizationConfiguration::rules($data)]);
$department = Department::query()->create(['tenant_id' => $tenant->id, 'name' => $data['department']]);
@@ -49,15 +49,15 @@ class CompanyController extends Controller
public function index(Request $request): Response|RedirectResponse
{
$this->admin($request);
if (app(OrganizationAccess::class)->active($request->user()->tenant_id)) {
if (app(OrganizationAccess::class)->active($this->staffIdentity($request)->tenant_id)) {
return to_route('organization.parameters');
}
return Inertia::render('company/index', [
'company' => Tenant::query()->findOrFail($request->user()->tenant_id),
'company' => Tenant::query()->findOrFail($this->staffIdentity($request)->tenant_id),
'departments' => Department::query()->orderBy('name')->get(),
'costCenters' => CostCenter::query()->orderBy('code')->get(),
'users' => User::query()->where('tenant_id', $request->user()->tenant_id)->orderBy('name')->get(['id', 'name', 'email', 'department_id', 'purchasing_role']),
'users' => User::query()->where('tenant_id', $this->staffIdentity($request)->tenant_id)->orderBy('name')->get(['id', 'name', 'email', 'department_id', 'purchasing_role']),
'roles' => collect(PurchasingRole::cases())->reject(fn (PurchasingRole $role) => $role === PurchasingRole::Configured)->values()->map(fn (PurchasingRole $role) => ['value' => $role->value, 'label' => $role->label()]),
]);
}
@@ -65,10 +65,10 @@ class CompanyController extends Controller
public function department(Request $request, RequisitionWorkflow $workflow): RedirectResponse
{
$this->admin($request);
$data = $request->validate(['name' => ['required', 'string', 'max:100', Rule::unique('departments')->where('tenant_id', $request->user()->tenant_id)]]);
$data = $request->validate(['name' => ['required', 'string', 'max:100', Rule::unique('departments')->where('tenant_id', $this->staffIdentity($request)->tenant_id)]]);
DB::transaction(function () use ($request, $data, $workflow) {
$department = Department::query()->create(['tenant_id' => $request->user()->tenant_id, ...$data]);
$workflow->audit($request->user(), 'department.created', null, null, $department->toArray());
$department = Department::query()->create(['tenant_id' => $this->staffIdentity($request)->tenant_id, ...$data]);
$workflow->audit($this->staffIdentity($request), 'department.created', null, null, $department->toArray());
});
return back();
@@ -78,13 +78,13 @@ class CompanyController extends Controller
{
$this->admin($request);
$data = $request->validate([
'department_id' => ['required', Rule::exists('departments', 'id')->where('tenant_id', $request->user()->tenant_id)],
'code' => ['required', 'string', 'max:30', Rule::unique('cost_centers')->where('tenant_id', $request->user()->tenant_id)],
'department_id' => ['required', Rule::exists('departments', 'id')->where('tenant_id', $this->staffIdentity($request)->tenant_id)],
'code' => ['required', 'string', 'max:30', Rule::unique('cost_centers')->where('tenant_id', $this->staffIdentity($request)->tenant_id)],
'name' => 'required|string|max:100',
]);
DB::transaction(function () use ($request, $data, $workflow) {
$center = CostCenter::query()->create(['tenant_id' => $request->user()->tenant_id, ...$data]);
$workflow->audit($request->user(), 'cost_center.created', null, null, $center->toArray());
$center = CostCenter::query()->create(['tenant_id' => $this->staffIdentity($request)->tenant_id, ...$data]);
$workflow->audit($this->staffIdentity($request), 'cost_center.created', null, null, $center->toArray());
});
return back();
@@ -93,17 +93,17 @@ class CompanyController extends Controller
public function user(Request $request, RequisitionWorkflow $workflow): RedirectResponse
{
$this->admin($request);
abort_if(app(OrganizationAccess::class)->active($request->user()->tenant_id), 409, 'Crie utilizadores e atribua perfis na parametrização.');
abort_if(app(OrganizationAccess::class)->active($this->staffIdentity($request)->tenant_id), 409, 'Crie utilizadores e atribua perfis na parametrização.');
$data = $request->validate([
'name' => 'required|string|max:100', 'email' => 'required|email|max:255|unique:users',
'password' => 'required|string|min:12|confirmed',
'department_id' => ['required', Rule::exists('departments', 'id')->where('tenant_id', $request->user()->tenant_id)],
'department_id' => ['required', Rule::exists('departments', 'id')->where('tenant_id', $this->staffIdentity($request)->tenant_id)],
'purchasing_role' => ['required', Rule::enum(PurchasingRole::class)],
]);
DB::transaction(function () use ($request, $data, $workflow) {
$user = new User;
$user->forceFill($data + ['tenant_id' => $request->user()->tenant_id])->save();
$workflow->audit($request->user(), 'user.created', null, null, $user->only(['id', 'name', 'email', 'department_id', 'purchasing_role']));
$user->forceFill($data + ['tenant_id' => $this->staffIdentity($request)->tenant_id])->save();
$workflow->audit($this->staffIdentity($request), 'user.created', null, null, $user->only(['id', 'name', 'email', 'department_id', 'purchasing_role']));
});
return back();
@@ -111,6 +111,6 @@ class CompanyController extends Controller
private function admin(Request $request): void
{
app(OrganizationConfiguration::class)->administrator($request->user());
app(OrganizationConfiguration::class)->administrator($this->staffIdentity($request));
}
}