k

app/Modules/Treasury/Services/TreasuryService.php

@@ -177,16 +177,16 @@ final class TreasuryService
         }
 
         if ($treasury['code'] === 'SUB_SA') {
-            $where .= " AND pr.payment_type IN ('activity_subscription','hourly_booking','sports_registration')";
+            $where .= " AND pr.payment_type IN ('activity_subscription','hourly_booking','sports_registration','sa_form_fee','sa_subscription')";
         } elseif ($treasury['code'] === 'SUB_MEM') {
             $where .= " AND pr.payment_type IN ('form_fee','membership_fee','down_payment','addition_fee','annual_subscription','divorce_fee','death_fee','waiver_fee','separation_fee','fine','carnet_replacement','seasonal_fee')";
         }
 
         $search = trim($filters['search'] ?? '');
         if ($search !== '') {
-            $where .= ' AND (m.full_name_ar LIKE ? OR m.form_number LIKE ? OR pr.request_number LIKE ?)';
+            $where .= ' AND (m.full_name_ar LIKE ? OR m.form_number LIKE ? OR pr.request_number LIKE ? OR pr.description_ar LIKE ?)';
             $term = '%' . $search . '%';
-            $params = array_merge($params, [$term, $term, $term]);
+            $params = array_merge($params, [$term, $term, $term, $term]);
         }
 
         return $db->select(