A free open source IT asset/license management system
Small FMCS fixes
snipee2ba35ee80ae
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex 5ae39772a4..a00e072cb7 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -67,7 +67,12 @@ class AccessoryCheckoutController extends Controller$target = $this->determineCheckoutTarget();session()->put(['checkout_to_type' => $target]);- if ((Setting::getSettings()->full_multiple_companies_support == '1') && (! $target->companies()->where('companies.id', $accessory->company_id)->exists())) {+ if (+ Setting::getSettings()->full_multiple_companies_support == '1'+ && $accessory->company_id+ && $target instanceof User+ && ! $target->canReceiveFromCompany($accessory->company_id)+ ) {return redirect()->back()->with('error', trans('general.error_user_company'));}diff --git a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php b/app/Http/Controllers/Consumables/ConsumableCheckoutController.phpindex ea394671ac..fddd821c17 100644--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php@@ -97,7 +97,11 @@ class ConsumableCheckoutController extends Controllerreturn redirect()->route('consumables.checkout.show', $consumable)->with('error', trans('admin/consumables/message.checkout.user_does_not_exist'))->withInput();}- if ((Setting::getSettings()->full_multiple_companies_support == '1') && (! $user->companies()->where('companies.id', $consumable->company_id)->exists())) {+ if (+ Setting::getSettings()->full_multiple_companies_support == '1'+ && $consumable->company_id+ && ! $user->canReceiveFromCompany($consumable->company_id)+ ) {return redirect()->back()->with('error', trans('general.error_user_company'));}diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.phpindex bba007291e..f30acbf2a7 100644--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php@@ -104,7 +104,7 @@ class LicenseCheckoutController extends Controller}} elseif ($request->filled('assigned_to')) {$fmcsTarget = User::find($request->input('assigned_to'));- if ($fmcsTarget && ! $fmcsTarget->companies()->where('companies.id', $license->company_id)->exists()) {+ if ($fmcsTarget && $license->company_id && ! $fmcsTarget->canReceiveFromCompany($license->company_id)) {return redirect()->route('licenses.index')->with('error', trans('general.error_user_company'));}}diff --git a/tests/Feature/Accessories/Ui/CheckoutAccessoryTest.php b/tests/Feature/Accessories/Ui/CheckoutAccessoryTest.phpnew file mode 100644index 0000000000..7c41d3aa49--- /dev/null+++ b/tests/Feature/Accessories/Ui/CheckoutAccessoryTest.php@@ -0,0 +1,141 @@+<?php++namespace Tests\Feature\Accessories\Ui;++use App\Models\Accessory;+use App\Models\Asset;+use App\Models\Company;+use App\Models\Location;+use App\Models\User;+use Tests\TestCase;++class CheckoutAccessoryTest extends TestCase+{+ public function test_checkout_to_user_in_same_company_succeeds_with_fmcs_enabled()+ {+ [$companyA] = Company::factory()->count(1)->create();+ $accessory = Accessory::factory()->for($companyA)->create(['qty' => 5]);+ $user = User::factory()->for($companyA)->create();+ $user->companies()->sync([$companyA->id]);++ $this->settings->enableMultipleFullCompanySupport();++ $actor = User::factory()->superuser()->create();++ $this->actingAs($actor)+ ->post(route('accessories.checkout.store', $accessory), [+ 'checkout_to_type' => 'user',+ 'assigned_user' => $user->id,+ 'checkout_qty' => 1,+ 'redirect_option' => 'index',+ ])+ ->assertRedirect();++ $this->assertDatabaseHas('accessories_checkout', [+ 'accessory_id' => $accessory->id,+ 'assigned_to' => $user->id,+ ]);+ }++ public function test_checkout_to_user_in_different_company_is_blocked_with_fmcs_enabled()+ {+ [$companyA, $companyB] = Company::factory()->count(2)->create();+ $accessory = Accessory::factory()->for($companyA)->create(['qty' => 5]);+ $user = User::factory()->for($companyB)->create();+ $user->companies()->sync([$companyB->id]);++ $this->settings->enableMultipleFullCompanySupport();++ $actor = User::factory()->superuser()->create();++ $this->actingAs($actor)+ ->post(route('accessories.checkout.store', $accessory), [+ 'checkout_to_type' => 'user',+ 'assigned_user' => $user->id,+ 'checkout_qty' => 1,+ 'redirect_option' => 'index',+ ])+ ->assertRedirect();++ $this->assertDatabaseMissing('accessories_checkout', [+ 'accessory_id' => $accessory->id,+ 'assigned_to' => $user->id,+ ]);+ }++ public function test_checkout_to_user_succeeds_when_accessory_has_no_company_with_fmcs_enabled()+ {+ $accessory = Accessory::factory()->create(['qty' => 5, 'company_id' => null]);+ [$companyA] = Company::factory()->count(1)->create();+ $user = User::factory()->for($companyA)->create();+ $user->companies()->sync([$companyA->id]);++ $this->settings->enableMultipleFullCompanySupport();++ $actor = User::factory()->superuser()->create();++ $this->actingAs($actor)+ ->post(route('accessories.checkout.store', $accessory), [+ 'checkout_to_type' => 'user',+ 'assigned_user' => $user->id,+ 'checkout_qty' => 1,+ 'redirect_option' => 'index',+ ])+ ->assertRedirect();++ $this->assertDatabaseHas('accessories_checkout', [+ 'accessory_id' => $accessory->id,+ 'assigned_to' => $user->id,+ ]);+ }++ public function test_checkout_to_asset_does_not_throw_when_fmcs_enabled()+ {+ [$companyA] = Company::factory()->count(1)->create();+ $accessory = Accessory::factory()->for($companyA)->create(['qty' => 5]);+ $asset = Asset::factory()->for($companyA)->create();++ $this->settings->enableMultipleFullCompanySupport();++ $actor = User::factory()->superuser()->create();++ $this->actingAs($actor)+ ->post(route('accessories.checkout.store', $accessory), [+ 'checkout_to_type' => 'asset',+ 'assigned_asset' => $asset->id,+ 'checkout_qty' => 1,+ 'redirect_option' => 'index',+ ])+ ->assertRedirect();++ $this->assertDatabaseHas('accessories_checkout', [+ 'accessory_id' => $accessory->id,+ 'assigned_to' => $asset->id,+ ]);+ }++ public function test_checkout_to_location_does_not_throw_when_fmcs_enabled()+ {+ [$companyA] = Company::factory()->count(1)->create();+ $accessory = Accessory::factory()->for($companyA)->create(['qty' => 5]);+ $location = Location::factory()->create();++ $this->settings->enableMultipleFullCompanySupport();++ $actor = User::factory()->superuser()->create();++ $this->actingAs($actor)+ ->post(route('accessories.checkout.store', $accessory), [+ 'checkout_to_type' => 'location',+ 'assigned_location' => $location->id,+ 'checkout_qty' => 1,+ 'redirect_option' => 'index',+ ])+ ->assertRedirect();++ $this->assertDatabaseHas('accessories_checkout', [+ 'accessory_id' => $accessory->id,+ 'assigned_to' => $location->id,+ ]);+ }+}