validations & save consent options

visualbuilder · Feb 20, 2024 · 4c3afba · 4c3afba
1 parent e9f2fa1
commit 4c3afba
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 4 deletions.
diff --git a/database/migrations/create_consentables_table.php.stub b/database/migrations/create_consentables_table.php.stub
@@ -20,6 +20,7 @@ return new class extends Migration
                 $table->string('consentable_type');
                 $table->string('key')->default(NULL)->nullable();
                 $table->boolean('accepted')->default(0);
+                $table->json('fields')->nullable();
                 $table->timestamps();
             });
         }

diff --git a/src/Infolists/Components/ConsentAcceptForm.php b/src/Infolists/Components/ConsentAcceptForm.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Visualbuilder\FilamentUserConsent\Infolists\Components;
+
+use Filament\Infolists\Components\Entry;
+
+class ConsentAcceptForm extends Entry
+{
+    protected string $view = 'user-consent::infolists.components.consent-accept-form';
+
+    public $errorBag = [];
+
+    protected $rules = [
+        'name' => 'required|min:6',
+        'email' => 'required|email',
+    ];
+
+    public function updated($propertyName)
+    {
+        $this->validateOnly($propertyName);
+    }
+
+    public function submit()
+    {
+        $validatedData = $this->validate();
+
+    }
+}
diff --git a/src/Livewire/ConsentOptionRequest.php b/src/Livewire/ConsentOptionRequest.php
@@ -20,6 +20,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\HtmlString;
+use Visualbuilder\FilamentUserConsent\Infolists\Components\ConsentAcceptForm;
 use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
 use Visualbuilder\FilamentUserConsent\Notifications\ConsentsUpdatedNotification;
 
@@ -100,6 +101,7 @@ public function infolist(Infolist $infolist): Infolist
                                     ViewEntry::make('acceptConsent')
                                         ->label('')
                                         ->view('user-consent::infolists.components.consent-option-checkbox'),
+                                    // ConsentAcceptForm::make('Agreement Info'),
                                     TextEntry::make('updated_at')
                                         ->label('')
                                         ->alignEnd()
@@ -146,9 +148,25 @@ public function previousConsents($key)
 
     public function validateConsents($action)
     {
-        $validateMandatoryConsents = $this->user->requiredOutstandingConsentsValidate($this->acceptConsents);
+        $conentIds = [];
+        $errorBags = [];
+        foreach($this->acceptConsents as $key => $value) {            
+            if((bool)$value['accepted']) {
+                $conentIds[] = $key;
+            }
+            $consentOption = ConsentOption::find($key);
+            if((bool)$consentOption->additional_info) {
+                foreach ($consentOption->fields as $field) {
+                    if((bool)$field['required'] &&  (!isset($value[$field['name']]) || $value[$field['name']] == "")) {
+                        $errorBags[$key][$field['name']] = $field['name']." field is required";
+                    }
+                }
+            }
+        }
+
+        $validateMandatoryConsents = $this->user->requiredOutstandingConsentsValidate($conentIds);
 
-        if (! $validateMandatoryConsents) {
+        if (! $validateMandatoryConsents || count($errorBags) > 0) {
             Notification::make()
                 ->title('Please confirm.!')
                 ->body('Please accept all required consent options.')
@@ -161,14 +179,22 @@ public function validateConsents($action)
 
     public function acceptConsent()
     {
+        $conentIds = [];
+        foreach($this->acceptConsents as $key => $value) {            
+            if((bool)$value['accepted']) {
+                $conentIds[] = $key;
+            }
+        }
+
         $outstandingConsents = $this->user->outstandingConsents();
         foreach ($outstandingConsents as $consentOption) {
             $this->user->consents()
                 ->save(
                     $consentOption,
                     [
-                        'accepted' => in_array($consentOption->id, $this->acceptConsents),
+                        'accepted' => in_array($consentOption->id, $conentIds),
                         'key' => $consentOption->key,
+                        'fields' => (bool)$consentOption->additional_info ? $this->acceptConsents[$consentOption->id] : []
                     ]
                 );
         }

diff --git a/src/Resources/ConsentOptionResource.php b/src/Resources/ConsentOptionResource.php
@@ -98,7 +98,9 @@ public static function form(Form $form): Form
                 Section::make('Additional Info')->schema([
                     Repeater::make('fields')->label('')
                     ->schema([
-                        Forms\Components\TextInput::make('name')->required(),
+                        Forms\Components\TextInput::make('name')
+                        ->regex('/^[a-z_]+$/')
+                        ->required(),
                         Forms\Components\Select::make('type')
                             ->options([
                                 'text' => 'Text Input',