From e85bfd85e11c1d4b190ccb61643c7eb8b4c4e307 Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Thu, 2 Jul 2026 09:40:25 +0530
Subject: [PATCH] OPD template: split opd fee into amount and description
 placeholders

---
 app/Controllers/Opd.php                    | 11 +++++++----
 app/Views/billing/opd_template_builder.php |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php
index 6dfb523..1d19c09 100644
--- a/app/Controllers/Opd.php
+++ b/app/Controllers/Opd.php
@@ -120,7 +120,7 @@ class Opd extends BaseController
             // Patient
             'pName', 'pRelative', 'age_sex', 'phoneno', 'p_address',
             'uhid_no', 'opd_sr_no', 'opd_no', 'opd_date', 'exp_date',
-            'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date',
+            'opd_fee_amount', 'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date',
             // General Examination (raw values)
             'bp', 'bp_diastolic', 'pulse', 'temp', 'spo2', 'rr_min',
             'height', 'weight', 'waist',
@@ -2543,7 +2543,9 @@ class Opd extends BaseController
 
         $specName = trim((string) ($doctor->SpecName ?? $opd->doc_spec ?? ''));
         $doctorShortDescription = trim((string) ($doctor->doc_sign ?? $opd->doc_sign ?? ''));
-        $opdFeeDesc = trim((string) (($opd->opd_fee_amount ?? '') . ' ' . ($opd->opd_fee_desc ?? '')));
+        $opdFeeAmount = trim((string) ($opd->opd_fee_amount ?? ''));
+        $opdFeeDescription = trim((string) ($opd->opd_fee_desc ?? ''));
+        $opdFeeDisplay = trim($opdFeeAmount . ' ' . $opdFeeDescription);
         $totalNoVisit = $this->resolveTotalOpdVisitCountForPrint($opd);
         $lastVisitDate = '';
         $lastVisitText = '';
@@ -3022,7 +3024,7 @@ class Opd extends BaseController
             . '</td>'
             . '<td width="33.3%" valign="top">'
             . '<b>DEPARTMENT :</b><br>' . esc($specName) . '<br>'
-            . esc($opdFeeDesc) . '<br>'
+            . esc($opdFeeDisplay) . '<br>'
             . '<b>No. of Visit</b> : ' . esc($totalNoVisit) . '<br>'
             . esc($lastVisitText) . '<br>'
             . 'Book Time : ' . esc($bookTime)
@@ -3054,7 +3056,8 @@ class Opd extends BaseController
             'SpecName' => $specName,
             'short_description' => $doctorShortDescription,
             'doctor_short_description' => $doctorShortDescription,
-            'opd_fee_desc' => $opdFeeDesc,
+            'opd_fee_amount' => $opdFeeAmount,
+            'opd_fee_desc' => $opdFeeDescription,
             'total_no_visit' => $totalNoVisit,
             'last_opdvisit_date' => $lastVisitDate,
             'str_opd_book_date' => $bookTime,
diff --git a/app/Views/billing/opd_template_builder.php b/app/Views/billing/opd_template_builder.php
index cc640ec..6fd6aa8 100644
--- a/app/Views/billing/opd_template_builder.php
+++ b/app/Views/billing/opd_template_builder.php
@@ -39,7 +39,7 @@ $patientSet = [
 ];
 
 $opdMasterSet = [
-    'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', 'opd_fee_desc',
+    'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', 'opd_fee_amount', 'opd_fee_desc',
     'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date',
     'doctor_name', 'doctor_full_name', 'doctor_title',
     'doctor_reg_no', 'doctor_registration',