Merge pull request #15445 from Godmartinz/eula_confusion

Fixed priority for category eula vs default eula

app/Models/Asset.php

@@ -950,11 +950,12 @@ class Asset extends Depreciable
     {
 
         if (($this->model) && ($this->model->category)) {
-            if ($this->model->category->eula_text) {
+            if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) {
                 return Helper::parseEscapedMarkedown($this->model->category->eula_text);
-            } elseif ($this->model->category->use_default_eula == '1') {
+            } elseif ($this->model->category->use_default_eula === 1) {
                 return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text);
             } else {
+
                 return false;
             }
         }

tests/Support/Settings.php

@@ -121,6 +121,10 @@ class Settings
             'ldap_basedn' => 'CN=Users,DC=ad,DC=example,Dc=com'
         ]);
     }
+    public function setEula($text = 'Default EULA text')
+    {
+        return $this->update(['default_eula_text' => $text]);
+    }
 
     /**
      * @param array $attributes Attributes to modify in the application's settings.

tests/Unit/NotificationTest.php

@@ -33,4 +33,28 @@ class NotificationTest extends TestCase
         $asset->checkOut($user, $admin->id);
         Notification::assertSentTo($user, CheckoutAssetNotification::class);
     }
+    public function testDefaultEulaIsSentWhenSetInCategory()
+    {
+        Notification::fake();
+
+        $this->settings->setEula('My Custom EULA Text');
+
+        $user = User::factory()->create();
+
+        $category = Category::factory()->create([
+            'use_default_eula' => 1,
+            'eula_text' => 'EULA Text that should not be used',
+        ]);
+
+        $model = AssetModel::factory()->for($category)->create();
+        $asset = Asset::factory()->for($model, 'model')->create();
+
+        $asset->checkOut($user, User::factory()->superuser()->create()->id);
+
+        Notification::assertSentTo($user, CheckoutAssetNotification::class, function ($notification) {
+            $content = $notification->toMail()->render();
+
+            return str_contains($content, 'My Custom EULA Text') && !str_contains($content, 'EULA Text that should not be used');
+        });
+    }
 }