Commit 8d2002a1 authored by Fares's avatar Fares

fix(cashier): add foreign/sports membership fees to treasury queue filter

The SUB_MEM treasury queue was filtering payment_type with an allowlist
that didn't include foreign_membership_fee or sports_membership_fee.
Requests were created successfully but never appeared in the cashier
queue. Also added proper Arabic labels and filter dropdown options.
Co-Authored-By: 's avatarClaude Opus 4.6 <noreply@anthropic.com>
parent 690639de
...@@ -346,6 +346,8 @@ final class PaymentRequestService ...@@ -346,6 +346,8 @@ final class PaymentRequestService
'sports_registration' => 'تسجيل رياضي', 'sports_registration' => 'تسجيل رياضي',
'activity_subscription' => 'اشتراك نشاط', 'activity_subscription' => 'اشتراك نشاط',
'seasonal_fee' => 'رسوم عضوية موسمية', 'seasonal_fee' => 'رسوم عضوية موسمية',
'foreign_membership_fee' => 'رسوم عضوية أجنبية',
'sports_membership_fee' => 'رسوم عضوية رياضية',
default => $type, default => $type,
}; };
} }
......
...@@ -68,6 +68,9 @@ ...@@ -68,6 +68,9 @@
<option value="separation_fee" <?= ($filters['payment_type'] ?? '') === 'separation_fee' ? 'selected' : '' ?>>رسوم فصل</option> <option value="separation_fee" <?= ($filters['payment_type'] ?? '') === 'separation_fee' ? 'selected' : '' ?>>رسوم فصل</option>
<option value="addition_fee" <?= ($filters['payment_type'] ?? '') === 'addition_fee' ? 'selected' : '' ?>>رسوم إضافة</option> <option value="addition_fee" <?= ($filters['payment_type'] ?? '') === 'addition_fee' ? 'selected' : '' ?>>رسوم إضافة</option>
<option value="annual_subscription" <?= ($filters['payment_type'] ?? '') === 'annual_subscription' ? 'selected' : '' ?>>اشتراك سنوي</option> <option value="annual_subscription" <?= ($filters['payment_type'] ?? '') === 'annual_subscription' ? 'selected' : '' ?>>اشتراك سنوي</option>
<option value="foreign_membership_fee" <?= ($filters['payment_type'] ?? '') === 'foreign_membership_fee' ? 'selected' : '' ?>>رسوم عضوية أجنبية</option>
<option value="sports_membership_fee" <?= ($filters['payment_type'] ?? '') === 'sports_membership_fee' ? 'selected' : '' ?>>رسوم عضوية رياضية</option>
<option value="seasonal_fee" <?= ($filters['payment_type'] ?? '') === 'seasonal_fee' ? 'selected' : '' ?>>رسوم عضوية موسمية</option>
<option value="fine" <?= ($filters['payment_type'] ?? '') === 'fine' ? 'selected' : '' ?>>غرامة</option> <option value="fine" <?= ($filters['payment_type'] ?? '') === 'fine' ? 'selected' : '' ?>>غرامة</option>
</select> </select>
</div> </div>
......
...@@ -179,7 +179,7 @@ final class TreasuryService ...@@ -179,7 +179,7 @@ final class TreasuryService
if ($treasury['code'] === 'SUB_SA') { if ($treasury['code'] === 'SUB_SA') {
$where .= " AND pr.payment_type IN ('activity_subscription','hourly_booking','sports_registration','sa_form_fee','sa_subscription','sports_subscription')"; $where .= " AND pr.payment_type IN ('activity_subscription','hourly_booking','sports_registration','sa_form_fee','sa_subscription','sports_subscription')";
} elseif ($treasury['code'] === 'SUB_MEM') { } 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')"; $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','foreign_membership_fee','sports_membership_fee')";
} }
$search = trim($filters['search'] ?? ''); $search = trim($filters['search'] ?? '');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment