diff --git a/app/Views/billing/Patient_Profile_Opd_V.php b/app/Views/billing/Patient_Profile_Opd_V.php index 6c28fda..8bd807c 100644 --- a/app/Views/billing/Patient_Profile_Opd_V.php +++ b/app/Views/billing/Patient_Profile_Opd_V.php @@ -17,8 +17,9 @@ if ($patientAbhaAddress === '' && preg_match('/abha_address\s*:\s*([A-Za-z0-9._- } $abhaVerifiedStatus = strtoupper(trim((string) ($patient->abha_verified_status ?? ''))); $abhaKycVerified = (int) ($patient->abha_kyc_verified ?? 0) === 1; -$abhaMobileVerified = (int) ($patient->abha_mobile_verified ?? 0) === 1; -$abhaIsVerified = $abhaVerifiedStatus === 'VERIFIED' || ($abhaKycVerified && $abhaMobileVerified); +$abhaIsVerified = in_array($abhaVerifiedStatus, ['VERIFIED', 'ACTIVE', 'LINKED', '1', 'YES', 'Y', 'TRUE'], true) + || strtoupper(trim((string) ($patient->abha_verification_type ?? ''))) === 'VERIFIED' + || ($abhaKycVerified && $abhaMobileVerified); $hasAbhaIdentity = $patientAbhaAddress !== '' || $patientAbhaId !== '' || $abhaIsVerified; $totalOpdVisits = (int) ($totalOpdVisits ?? 0); $lastVisitDateRaw = trim((string) ($lastVisitDate ?? '')); diff --git a/app/Views/billing/Person_Edit_V.php b/app/Views/billing/Person_Edit_V.php index bcca1b1..87aee09 100644 --- a/app/Views/billing/Person_Edit_V.php +++ b/app/Views/billing/Person_Edit_V.php @@ -17,8 +17,10 @@ $abhaKycVerified = (int) ($data[0]->abha_kyc_verified ?? 0) === 1; $abhaMobileVerified = (int) ($data[0]->abha_mobile_verified ?? 0) === 1; $abhaLinkedAt = trim((string) ($data[0]->abdm_linked_at ?? '')); - $abhaPhotoAvailable = trim((string) ($data[0]->abha_profile_photo_base64 ?? '')) !== ''; - $abhaVerifiedLocked = $patientAbhaId !== '' && strtoupper($abhaVerifiedStatus) === 'VERIFIED'; + $isAbhaVerified = in_array(strtoupper($abhaVerifiedStatus), ['VERIFIED', 'ACTIVE', 'LINKED', '1', 'YES', 'Y', 'TRUE'], true) + || strtoupper($abhaVerificationType) === 'VERIFIED' + || ($abhaKycVerified && $abhaMobileVerified); + $abhaVerifiedLocked = $patientAbhaId !== '' && $isAbhaVerified; $canEditNameAnytime = is_object($user) && method_exists($user, 'can') ? $user->can('billing.patient.edit-name-anytime') : false; $isAdmin = is_object($user) && method_exists($user, 'inGroup') ? $user->inGroup('admin') : false; $abhaLockNotice = $abhaVerifiedLocked ? 'ABHA verified: name, gender, ABHA ID, and date of birth are locked.' : ''; diff --git a/app/Views/billing/Person_profile_V.php b/app/Views/billing/Person_profile_V.php index a428861..df3a749 100644 --- a/app/Views/billing/Person_profile_V.php +++ b/app/Views/billing/Person_profile_V.php @@ -57,7 +57,11 @@ $abhaMobileVerified = (int) ($data[0]->abha_mobile_verified ?? 0) === 1; $abhaLinkedAt = trim((string) ($data[0]->abdm_linked_at ?? '')); $abhaPhotoAvailable = trim((string) ($data[0]->abha_profile_photo_base64 ?? '')) !== ''; - $isAbhaLinkedAndVerified = $patientAbhaId !== '' && in_array(strtoupper($abhaVerifiedStatus), ['VERIFIED', 'LINKED'], true); + $hasExistingAbha = ($patientAbhaId !== '' || $abhaAddress !== '' || $abhaLinkedAt !== ''); + $isAbhaStatusVerified = in_array(strtoupper($abhaVerifiedStatus), ['VERIFIED', 'LINKED', 'ACTIVE', '1', 'YES', 'Y', 'TRUE'], true) + || strtoupper($abhaVerificationType) === 'VERIFIED' + || ($abhaKycVerified && $abhaMobileVerified); + $isAbhaLinkedAndVerified = $hasExistingAbha && ($isAbhaStatusVerified || $abhaLinkedAt !== ''); ?> user(); @@ -141,7 +145,7 @@