Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
AravindRam-Ranium authored and github-actions[bot] committed Feb 2, 2024
1 parent 6e44bd5 commit e022739
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
16 changes: 7 additions & 9 deletions src/Livewire/ConsentOptionRequset.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Auth;
use Visualbuilder\FilamentUserConsent\Models\ConsentOption;
use Illuminate\Support\Facades\Validator;

class ConsentOptionRequset extends SimplePage
{
Expand All @@ -36,14 +35,13 @@ public function mount(): void
{
if (Auth::guard('admin')->check()) {
$this->user = Auth::guard('admin')->user();
} else if (Auth::guard('enduser')->check()) {
} elseif (Auth::guard('enduser')->check()) {
$this->user = Auth::guard('enduser')->user();
} else if (Auth::guard('practitioner')->check()) {
} elseif (Auth::guard('practitioner')->check()) {
$this->user = Auth::guard('practitioner')->user();
}


if (!$this->user) {
if (! $this->user) {
abort(403, 'Only authenticated users can set consent options');
}

Expand Down Expand Up @@ -103,8 +101,8 @@ public function infolist(Infolist $infolist): Infolist
ViewEntry::make('acceptConsent')
->label('')
->view('vendor.user-consent.infolists.components.consent-option-checkbox'),
TextEntry::make('updated_at')->label('Last Updated')
])->columns(2)
TextEntry::make('updated_at')->label('Last Updated'),
])->columns(2),
]),
])
->columns(2)
Expand Down Expand Up @@ -133,7 +131,7 @@ public function acceptConsent()
{
$validateMandatoryConsents = $this->user->requiredOutstandingConsentsValidate($this->acceptConsents);

if (!$validateMandatoryConsents) {
if (! $validateMandatoryConsents) {
Notification::make()
->title('Please confirm.!')
->body('Please accept all required consent options.')
Expand All @@ -149,7 +147,7 @@ public function acceptConsent()
$consentOption,
[
'accepted' => in_array($consentOption->id, $this->acceptConsents),
'key' => $consentOption->key
'key' => $consentOption->key,
]
);
// event(new ConsentUpdated($consentOption, $request->consent_option[ $consentOption->id ]));
Expand Down
9 changes: 5 additions & 4 deletions src/Traits/HasConsent.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,24 @@ public function outstandingConsentValidators()
}

/**
* @param array $acceptedConsents
* @return bool
* @param array $acceptedConsents
*/
public function requiredOutstandingConsentsValidate($acceptedConsents): bool
{
$acceptedConsents = array_map('intval', $acceptedConsents);
$requiredConsents = [];
$isValid = true;
foreach ($this->outstandingConsents() as $key => $consent) {
if($consent->is_mandatory) {
if ($consent->is_mandatory) {
$requiredConsents[] = $consent->id;
if(!in_array($consent->id, $acceptedConsents)) {
if (! in_array($consent->id, $acceptedConsents)) {
$isValid = false;

break;
}
}
}

return $isValid;
}

Expand Down

0 comments on commit e022739

Please sign in to comment.