Skip to content

C
Clubphp
Commit 784c7ee8 authored by Mahmoud Aglan's avatar Mahmoud Aglan
Browse files
Options

fix(membership): display completeness and logic fixes across Death/Waiver/Transfers/Subscriptions 

- Death show: display deceased person's actual name (not just membership owner),
  show original membership creation/activation dates, new member acquisition date,
  and subscription status after completion. Fix index status labels.
- Death subscriptions: dedup-safe createNewSubscriptions prevents double-demand
  when subscription rows already exist (marks existing pending rows as paid).
- Waiver index: add target member column, fix missing status labels (fee_paid/rejected),
  add date column. Show view: add payment request tracking display.
- Transfers: allow males under 25 to be selected for child separation if employed+graduated
  (previously blocked by both frontend JS and backend age gate). Add marriage date
  validation to reject dates before membership creation date.
- Subscriptions: call refreshForMember on member-subscriptions page load to auto-fill
  missing subscription rows for active dependents in current FY.
Co-Authored-By: 's avatarClaude Opus 4.6 <noreply@anthropic.com>
parent de0b8968
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 101 deletions
app/Modules/Death/Controllers/DeathController.php
View file @ 784c7ee8
......@@ -294,7 +294,7 @@ class DeathController extends Controller
{
$db = App::getInstance()->db();
$case = $db->selectOne(
"SELECT dc.*, m.full_name_ar as member_name, m.membership_number, m.membership_value as member_membership_value
"SELECT dc.*, m.full_name_ar as member_name, m.membership_number, m.membership_value as member_membership_value, m.created_at as membership_created_at, m.activated_at as membership_activated_at
FROM death_cases dc JOIN members m ON m.id = dc.member_id WHERE dc.id = ?",
[(int) $id]
);
......@@ -307,6 +307,17 @@ class DeathController extends Controller
$newMember = null;
$paymentRequest = null;
$boardApprover = null;
$deceasedName = null;
if ($case['deceased_type'] === 'spouse' && !empty($case['spouse_id'])) {
$deceasedRow = $db->selectOne("SELECT full_name_ar FROM spouses WHERE id = ?", [(int) $case['spouse_id']]);
$deceasedName = $deceasedRow['full_name_ar'] ?? null;
} elseif ($case['deceased_type'] === 'child' && !empty($case['child_id'])) {
$deceasedRow = $db->selectOne("SELECT full_name_ar FROM children WHERE id = ?", [(int) $case['child_id']]);
$deceasedName = $deceasedRow['full_name_ar'] ?? null;
} elseif ($case['deceased_type'] === 'primary_member') {
$deceasedName = $case['member_name'];
}
if ($case['primary_spouse_id']) {
$primarySpouse = $db->selectOne("SELECT * FROM spouses WHERE id = ?", [(int) $case['primary_spouse_id']]);
......@@ -324,7 +335,7 @@ class DeathController extends Controller
$secondaryIds
);
if ($case['transferred_to_member_id']) {
$newMember = $db->selectOne("SELECT id, full_name_ar, membership_number, status FROM members WHERE id = ?", [(int) $case['transferred_to_member_id']]);
$newMember = $db->selectOne("SELECT id, full_name_ar, membership_number, status, created_at, activated_at FROM members WHERE id = ?", [(int) $case['transferred_to_member_id']]);
}
if ($case['payment_request_id']) {
$paymentRequest = $db->selectOne("SELECT * FROM payment_requests WHERE id = ?", [(int) $case['payment_request_id']]);
......@@ -361,6 +372,14 @@ class DeathController extends Controller
}
}
$newMemberSubs = [];
if ($newMember && $case['status'] === 'completed') {
$newMemberSubs = $db->select(
"SELECT person_type, person_name, total_amount, status, financial_year FROM subscriptions WHERE member_id = ? ORDER BY financial_year DESC, person_type ASC",
[(int) $newMember['id']]
);
}
return $this->view('Death.Views.show', [
'case' => $case,
'fees' => $fees,
......@@ -368,9 +387,11 @@ class DeathController extends Controller
'primarySpouse' => $primarySpouse,
'secondarySpouses' => $secondarySpouses,
'newMember' => $newMember,
'newMemberSubs' => $newMemberSubs,
'paymentRequest' => $paymentRequest,
'boardApprover' => $boardApprover,
'currentPlanPrice' => $currentPlanPrice,
'deceasedName' => $deceasedName,
]);
}
......@@ -1166,40 +1187,29 @@ class DeathController extends Controller
$memberTotal = bcadd($memberSub, $devFee, 2);
// Member subscription (marked as paid — fee included in death transfer payment)
$db->insert('subscriptions', [
'member_id' => $newMemberId,
'financial_year' => $financialYear,
'person_type' => 'member',
'person_id' => $newMemberId,
'base_amount' => $memberSub,
'development_fee' => $devFee,
'discount_amount' => '0.00',
'total_amount' => $memberTotal,
'paid_amount' => $memberTotal,
'fine_amount' => '0.00',
'status' => 'paid',
'paid_at' => $now,
'payment_id' => $paymentId,
'paid_by' => $paidBy,
'created_at' => $now,
'updated_at' => $now,
'created_by' => $createdBy,
]);
// Spouse subscriptions (marked as paid)
$spouses = $db->select("SELECT id, full_name_ar FROM spouses WHERE member_id = ? AND is_archived = 0 AND status = 'active'", [$newMemberId]);
foreach ($spouses as $s) {
$existing = $db->selectOne(
"SELECT id, status FROM subscriptions WHERE member_id = ? AND financial_year = ? AND person_type = 'member'",
[$newMemberId, $financialYear]
);
if ($existing && $existing['status'] === 'paid') {
// Already paid — don't recreate
} elseif ($existing) {
// Exists but unpaid — mark as paid (fee was collected with death transfer)
$db->update('subscriptions', [
'paid_amount' => $memberTotal, 'status' => 'paid', 'paid_at' => $now,
'payment_id' => $paymentId, 'paid_by' => $paidBy, 'updated_at' => $now,
], '`id` = ?', [(int) $existing['id']]);
} else {
$db->insert('subscriptions', [
'member_id' => $newMemberId,
'financial_year' => $financialYear,
'person_type' => 'spouse',
'person_id' => (int) $s['id'],
'person_name' => $s['full_name_ar'],
'base_amount' => $spouseSub,
'development_fee' => '0.00',
'person_type' => 'member',
'person_id' => $newMemberId,
'base_amount' => $memberSub,
'development_fee' => $devFee,
'discount_amount' => '0.00',
'total_amount' => $spouseSub,
'paid_amount' => $spouseSub,
'total_amount' => $memberTotal,
'paid_amount' => $memberTotal,
'fine_amount' => '0.00',
'status' => 'paid',
'paid_at' => $now,
......@@ -1211,54 +1221,70 @@ class DeathController extends Controller
]);
}
// Child subscriptions (marked as paid)
// Spouse subscriptions (marked as paid — dedup-safe)
$spouses = $db->select("SELECT id, full_name_ar FROM spouses WHERE member_id = ? AND is_archived = 0 AND status = 'active'", [$newMemberId]);
foreach ($spouses as $s) {
$exSp = $db->selectOne(
"SELECT id, status FROM subscriptions WHERE member_id = ? AND financial_year = ? AND person_type = 'spouse' AND person_id = ?",
[$newMemberId, $financialYear, (int) $s['id']]
);
if ($exSp && $exSp['status'] === 'paid') { continue; }
if ($exSp) {
$db->update('subscriptions', ['paid_amount' => $spouseSub, 'status' => 'paid', 'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy, 'updated_at' => $now], '`id` = ?', [(int) $exSp['id']]);
} else {
$db->insert('subscriptions', [
'member_id' => $newMemberId, 'financial_year' => $financialYear, 'person_type' => 'spouse',
'person_id' => (int) $s['id'], 'person_name' => $s['full_name_ar'], 'base_amount' => $spouseSub,
'development_fee' => '0.00', 'discount_amount' => '0.00', 'total_amount' => $spouseSub,
'paid_amount' => $spouseSub, 'fine_amount' => '0.00', 'status' => 'paid',
'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy,
'created_at' => $now, 'updated_at' => $now, 'created_by' => $createdBy,
]);
}
}
// Child subscriptions (marked as paid — dedup-safe)
$children = $db->select("SELECT id, full_name_ar FROM children WHERE member_id = ? AND is_archived = 0 AND status = 'active'", [$newMemberId]);
foreach ($children as $c) {
$db->insert('subscriptions', [
'member_id' => $newMemberId,
'financial_year' => $financialYear,
'person_type' => 'child',
'person_id' => (int) $c['id'],
'person_name' => $c['full_name_ar'],
'base_amount' => $childSub,
'development_fee' => '0.00',
'discount_amount' => '0.00',
'total_amount' => $childSub,
'paid_amount' => $childSub,
'fine_amount' => '0.00',
'status' => 'paid',
'paid_at' => $now,
'payment_id' => $paymentId,
'paid_by' => $paidBy,
'created_at' => $now,
'updated_at' => $now,
'created_by' => $createdBy,
]);
$exCh = $db->selectOne(
"SELECT id, status FROM subscriptions WHERE member_id = ? AND financial_year = ? AND person_type = 'child' AND person_id = ?",
[$newMemberId, $financialYear, (int) $c['id']]
);
if ($exCh && $exCh['status'] === 'paid') { continue; }
if ($exCh) {
$db->update('subscriptions', ['paid_amount' => $childSub, 'status' => 'paid', 'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy, 'updated_at' => $now], '`id` = ?', [(int) $exCh['id']]);
} else {
$db->insert('subscriptions', [
'member_id' => $newMemberId, 'financial_year' => $financialYear, 'person_type' => 'child',
'person_id' => (int) $c['id'], 'person_name' => $c['full_name_ar'], 'base_amount' => $childSub,
'development_fee' => '0.00', 'discount_amount' => '0.00', 'total_amount' => $childSub,
'paid_amount' => $childSub, 'fine_amount' => '0.00', 'status' => 'paid',
'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy,
'created_at' => $now, 'updated_at' => $now, 'created_by' => $createdBy,
]);
}
}
// Temp subscriptions (marked as paid)
// Temp subscriptions (marked as paid — dedup-safe)
$temps = $db->select("SELECT id, full_name_ar FROM temporary_members WHERE member_id = ? AND is_archived = 0 AND status = 'active'", [$newMemberId]);
foreach ($temps as $t) {
$db->insert('subscriptions', [
'member_id' => $newMemberId,
'financial_year' => $financialYear,
'person_type' => 'temp',
'person_id' => (int) $t['id'],
'person_name' => $t['full_name_ar'],
'base_amount' => $tempSub,
'development_fee' => '0.00',
'discount_amount' => '0.00',
'total_amount' => $tempSub,
'paid_amount' => $tempSub,
'fine_amount' => '0.00',
'status' => 'paid',
'paid_at' => $now,
'payment_id' => $paymentId,
'paid_by' => $paidBy,
'created_at' => $now,
'updated_at' => $now,
'created_by' => $createdBy,
]);
$exTmp = $db->selectOne(
"SELECT id, status FROM subscriptions WHERE member_id = ? AND financial_year = ? AND person_type = 'temporary' AND person_id = ?",
[$newMemberId, $financialYear, (int) $t['id']]
);
if ($exTmp && $exTmp['status'] === 'paid') { continue; }
if ($exTmp) {
$db->update('subscriptions', ['paid_amount' => $tempSub, 'status' => 'paid', 'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy, 'updated_at' => $now], '`id` = ?', [(int) $exTmp['id']]);
} else {
$db->insert('subscriptions', [
'member_id' => $newMemberId, 'financial_year' => $financialYear, 'person_type' => 'temporary',
'person_id' => (int) $t['id'], 'person_name' => $t['full_name_ar'], 'base_amount' => $tempSub,
'development_fee' => '0.00', 'discount_amount' => '0.00', 'total_amount' => $tempSub,
'paid_amount' => $tempSub, 'fine_amount' => '0.00', 'status' => 'paid',
'paid_at' => $now, 'payment_id' => $paymentId, 'paid_by' => $paidBy,
'created_at' => $now, 'updated_at' => $now, 'created_by' => $createdBy,
]);
}
}
$totalSubs = 1 + count($spouses) + count($children) + count($temps);
......
app/Modules/Death/Views/index.php
View file @ 784c7ee8
......@@ -14,7 +14,18 @@
<td><?= $r['deceased_type'] === 'primary_member' ? 'العضو الرئيسي' : ($r['deceased_type'] === 'spouse' ? 'الزوج/ة' : $r['deceased_type']) ?></td>
<td style="font-size:13px;"><?= e($r['death_date']) ?></td>
<td style="font-weight:600;"><?= money($r['fee_amount'] ?? '0') ?></td>
<td><span style="color:<?= $r['status'] === 'completed' ? '#059669' : '#D97706' ?>;font-weight:600;">● <?= $r['status'] === 'completed' ? 'مكتمل' : 'مسجّل' ?></span></td>
<?php
$idxStatusLabel = match($r['status']) {
'completed' => 'مكتمل', 'recorded' => 'مسجّل', 'board_review' => 'مراجعة المجلس',
'board_approved' => 'معتمد — انتظار الدفع', 'rejected' => 'مرفوض', 'fee_paid' => 'تم الدفع',
'pending_form_fill' => 'انتظار الاستمارة', default => $r['status'],
};
$idxStatusColor = match($r['status']) {
'completed' => '#059669', 'rejected' => '#DC2626', 'board_approved' => '#2563EB',
'fee_paid' => '#0D7377', 'pending_form_fill' => '#7C3AED', default => '#D97706',
};
?>
<td><span style="color:<?= $idxStatusColor ?>;font-weight:600;">● <?= $idxStatusLabel ?></span></td>
<td><a href="/death/<?= (int) $r['id'] ?>" class="btn btn-sm btn-outline">عرض</a></td>
</tr>
<?php endforeach; ?>
......
app/Modules/Death/Views/show.php
View file @ 784c7ee8
......@@ -35,19 +35,27 @@ $canApprove = can('transfer.approve');
<!-- Case Info -->
<div class="card" style="padding:20px;margin-bottom:20px;">
<div style="display:flex;justify-content:space-between;align-items:start;">
<table style="width:100%;max-width:600px;font-size:14px;">
<tr><td style="padding:6px 0;color:#6B7280;width:35%;">العضو</td><td style="padding:6px 0;font-weight:600;"><?= e($case['member_name']) ?> (<?= e($case['membership_number'] ?? '—') ?>)</td></tr>
<tr><td style="padding:6px 0;color:#6B7280;">المتوفى</td><td style="padding:6px 0;font-weight:600;"><?= $deceasedLabel ?></td></tr>
<table style="width:100%;max-width:700px;font-size:14px;">
<tr><td style="padding:6px 0;color:#6B7280;width:35%;">صاحب العضوية</td><td style="padding:6px 0;font-weight:600;"><a href="/members/<?= (int) $case['member_id'] ?>" style="color:#1D4ED8;"><?= e($case['member_name']) ?></a> (<?= e($case['membership_number'] ?? '—') ?>)</td></tr>
<tr><td style="padding:6px 0;color:#6B7280;">المتوفى</td><td style="padding:6px 0;font-weight:600;"><?= $deceasedLabel ?><?php if (!empty($deceasedName) && $deceasedName !== $case['member_name']): ?> — <span style="color:#DC2626;"><?= e($deceasedName) ?></span><?php endif; ?></td></tr>
<tr><td style="padding:6px 0;color:#6B7280;">تاريخ الوفاة</td><td style="padding:6px 0;"><?= e($case['death_date']) ?></td></tr>
<?php if ($case['death_certificate_number']): ?>
<tr><td style="padding:6px 0;color:#6B7280;">رقم شهادة الوفاة</td><td style="padding:6px 0;"><?= e($case['death_certificate_number']) ?></td></tr>
<?php endif; ?>
<tr><td style="padding:6px 0;color:#6B7280;">تاريخ تسجيل الحالة</td><td style="padding:6px 0;"><?= e(substr($case['created_at'] ?? '', 0, 10)) ?></td></tr>
<tr><td style="padding:6px 0;color:#6B7280;">تاريخ إنشاء العضوية الأصلية</td><td style="padding:6px 0;"><?= e(substr($case['membership_created_at'] ?? '', 0, 10)) ?></td></tr>
<?php if (!empty($case['membership_activated_at'])): ?>
<tr><td style="padding:6px 0;color:#6B7280;">تاريخ تفعيل العضوية الأصلية</td><td style="padding:6px 0;"><?= e(substr($case['membership_activated_at'], 0, 10)) ?></td></tr>
<?php endif; ?>
<tr><td style="padding:6px 0;color:#6B7280;">الحالة</td><td style="padding:6px 0;font-weight:700;color:<?= $statusColor ?>;">● <?= $statusLabel ?></td></tr>
<?php if ($primarySpouse): ?>
<tr><td style="padding:6px 0;color:#6B7280;">الزوجة الأساسية</td><td style="padding:6px 0;font-weight:600;"><?= e($primarySpouse['full_name_ar']) ?></td></tr>
<?php endif; ?>
<?php if ($newMember): ?>
<tr><td style="padding:6px 0;color:#6B7280;">نُقلت العضوية إلى</td><td style="padding:6px 0;"><a href="/members/<?= (int) $newMember['id'] ?>" style="color:#0D7377;font-weight:700;font-size:16px;"><?= e($newMember['full_name_ar']) ?> — رقم <?= e($newMember['membership_number'] ?? '—') ?></a></td></tr>
<?php if (!empty($newMember['activated_at'])): ?>
<tr><td style="padding:6px 0;color:#6B7280;">تاريخ اكتساب العضوية الجديدة</td><td style="padding:6px 0;font-weight:600;color:#059669;"><?= e(substr($newMember['activated_at'], 0, 10)) ?></td></tr>
<?php endif; ?>
<?php endif; ?>
</table>
<a href="/death" class="btn btn-outline">← القائمة</a>
......@@ -269,6 +277,40 @@ $canApprove = can('transfer.approve');
</form>
<?php endif; ?>
<!-- Subscription Status after completion -->
<?php if (!empty($newMemberSubs)): ?>
<div class="card" style="margin-bottom:20px;margin-top:20px;">
<div style="padding:15px 20px;border-bottom:1px solid #E5E7EB;background:#F0FDF4;">
<h3 style="margin:0;color:#065F46;font-size:15px;">الاشتراكات السنوية (العضوية الجديدة)</h3>
</div>
<div style="padding:20px;">
<?php
$subsByYear = [];
foreach ($newMemberSubs as $ns) { $subsByYear[$ns['financial_year']][] = $ns; }
?>
<?php foreach ($subsByYear as $fy => $fyRows): ?>
<div style="margin-bottom:12px;">
<div style="font-size:13px;font-weight:600;color:#1F2937;margin-bottom:6px;"><?= e($fy) ?></div>
<table style="width:100%;font-size:13px;border-collapse:collapse;">
<?php foreach ($fyRows as $sr):
$personLabel = match($sr['person_type']) { 'member' => 'عضو', 'spouse' => 'زوجة', 'child' => 'ابن', 'temporary' => 'مؤقت', default => $sr['person_type'] };
$stColor = $sr['status'] === 'paid' ? '#059669' : '#D97706';
$stLabel = $sr['status'] === 'paid' ? 'مدفوع' : ($sr['status'] === 'pending' ? 'معلق' : $sr['status']);
?>
<tr style="border-bottom:1px solid #F3F4F6;">
<td style="padding:4px 8px;color:#6B7280;"><?= $personLabel ?></td>
<td style="padding:4px 8px;"><?= e($sr['person_name'] ?? '—') ?></td>
<td style="padding:4px 8px;"><?= money($sr['total_amount']) ?></td>
<td style="padding:4px 8px;color:<?= $stColor ?>;font-weight:600;">● <?= $stLabel ?></td>
</tr>
<?php endforeach; ?>
</table>
</div>
<?php endforeach; ?>
</div>
</div>
<?php endif; ?>
<!-- Audit Trail (displayed when case is completed) -->
<?php
$notesData = !empty($case['notes']) ? json_decode($case['notes'], true) : [];
......
app/Modules/Subscriptions/Controllers/SubscriptionController.php
View file @ 784c7ee8
......@@ -43,6 +43,11 @@ class SubscriptionController extends Controller
$member = $db->selectOne("SELECT * FROM members WHERE id = ?", [(int) $memberId]);
if (!$member) return $this->redirect('/members')->withError('العضو غير موجود');
// Auto-fill missing subscription rows for active dependents in current FY
if ($member['status'] === 'active') {
\App\Modules\Subscriptions\Services\SubscriptionSyncService::refreshForMember((int) $memberId);
}
$lateFine = OverdueFineApplicator::applyForMember((int) $memberId);
$subscriptions = Subscription::getForMember((int) $memberId);
......
app/Modules/Transfers/Controllers/TransferController.php
View file @ 784c7ee8
......@@ -74,7 +74,7 @@ class TransferController extends Controller
return $this->redirect("/transfers/create/{$memberId}")->withError('يجب اختيار الابن/الابنة');
}
// Age validation: male dependents under separation age cannot self-separate
// Age validation: male dependents under separation age can only separate if employed+graduated
// Females are separated based on marriage date, not age
if ($transferType === 'child_separation' && $childId) {
$child = $db->selectOne("SELECT * FROM children WHERE id = ? AND is_archived = 0", [$childId]);
......@@ -84,9 +84,13 @@ class TransferController extends Controller
$age = (int) $now->diff($dob)->y;
$separationAge = (int) (RuleEngine::getValue('CHILD_MANDATORY_SEPARATION_AGE', 'value') ?? 25);
if ($age < $separationAge) {
return $this->redirect("/transfers/create/{$memberId}")->withError(
'لا يمكن فصل الملحق تحت سن ' . $separationAge . ' سنة. العمر الحالي: ' . $age . ' سنة. يتم الفصل الوجوبي عند بلوغ ' . $separationAge . ' سنة.'
);
$isEmployedPost = $request->post('is_employed', '');
$graduationDate = trim($request->post('graduation_date', '')) ?: null;
if ($isEmployedPost === '' || !(bool)(int)$isEmployedPost || !$graduationDate) {
return $this->redirect("/transfers/create/{$memberId}")->withError(
'لا يمكن فصل الملحق تحت سن ' . $separationAge . ' سنة إلا إذا كان متخرجاً وموظفاً بأجر. العمر الحالي: ' . $age . ' سنة.'
);
}
}
}
}
......@@ -111,6 +115,13 @@ class TransferController extends Controller
if (!$marriageDate) {
return $this->redirect("/transfers/create/{$memberId}")->withError('يجب إدخال تاريخ الزواج لفصل الإناث');
}
$memberRecord = $db->selectOne("SELECT created_at, activated_at FROM members WHERE id = ?", [(int) $memberId]);
$membershipStart = $memberRecord['activated_at'] ?? $memberRecord['created_at'] ?? null;
if ($membershipStart && $marriageDate < substr($membershipStart, 0, 10)) {
return $this->redirect("/transfers/create/{$memberId}")->withError(
'تاريخ الزواج (' . $marriageDate . ') لا يمكن أن يسبق تاريخ إنشاء العضوية (' . substr($membershipStart, 0, 10) . '). يرجى مراجعة البيانات.'
);
}
$effectiveTransferDate = $marriageDate;
} else {
// Male path: work + graduation + date_turned_25
......
app/Modules/Transfers/Views/create.php
View file @ 784c7ee8
......@@ -423,26 +423,15 @@
if (isChildType) {
allOptions.forEach(function(opt) {
var age = parseInt(opt.getAttribute('data-age'), 10);
var gender = opt.getAttribute('data-gender') || 'male';
if (type === 'child_separation') {
// Males: must be >= 25; Females: eligible at any age (marriage-based)
var eligible = (gender === 'female') || (age >= 25);
opt.style.display = eligible ? '' : 'none';
opt.disabled = !eligible;
// All children are eligible: males >= 25 (age), males < 25 (work/graduation), females (marriage)
opt.style.display = '';
opt.disabled = false;
} else {
opt.style.display = '';
opt.disabled = false;
}
});
if (type === 'child_separation') {
var hasEligible = allOptions.some(function(opt) {
var age = parseInt(opt.getAttribute('data-age'), 10);
var gender = opt.getAttribute('data-gender') || 'male';
return (gender === 'female') || (age >= 25);
});
if (!hasEligible) ageWarning.style.display = 'block';
}
}
fetchFeePreview();
......
app/Modules/Waiver/Controllers/WaiverController.php
View file @ 784c7ee8
......@@ -171,6 +171,15 @@ class WaiverController extends Controller
// Already-saved individual fees
$individualFees = WaiverProcessor::getIndividualFees((int) $id);
// Payment request tracking
$paymentRequest = null;
if (!empty($waiver['target_member_id'])) {
$paymentRequest = $db->selectOne(
"SELECT id, request_number, status, amount, created_at FROM payment_requests WHERE related_entity_type = 'waiver_requests' AND related_entity_id = ? AND is_voided = 0 ORDER BY id DESC LIMIT 1",
[(int) $id]
);
}
return $this->view('Waiver.Views.show', [
'waiver' => $waiver,
'source_deps' => $sourceDeps,
......@@ -183,6 +192,7 @@ class WaiverController extends Controller
'target_debt_check' => $targetDebtCheck,
'all_target_dependents' => $allTargetDependents,
'individual_fees' => $individualFees,
'paymentRequest' => $paymentRequest,
]);
}
......
app/Modules/Waiver/Views/index.php
View file @ 784c7ee8
......@@ -6,16 +6,19 @@
</div>
<?php $__template->endSection(); ?>
<?php $__template->section('content'); ?>
<div class="card"><div class="table-responsive"><table class="data-table"><thead><tr><th>#</th><th>العضو المتنازل</th><th>رقم العضوية</th><th>قيمة العضوية</th><th>نسبة التنازل</th><th>رسوم التنازل</th><th>الحالة</th><th>الإجراءات</th></tr></thead><tbody>
<?php foreach ($rows as $r): ?>
<div class="card"><div class="table-responsive"><table class="data-table"><thead><tr><th>#</th><th>المتنازل</th><th>المتنازل إليه</th><th>رقم العضوية</th><th>رسوم التنازل</th><th>التاريخ</th><th>الحالة</th><th>الإجراءات</th></tr></thead><tbody>
<?php foreach ($rows as $r):
$wStatusLabel = match($r['status'] ?? '') { 'requested' => 'مقدم', 'approved' => 'معتمد', 'fee_paid' => 'تم الدفع', 'completed' => 'مكتمل', 'rejected' => 'مرفوض', default => $r['status'] ?? '' };
$wStatusColor = match($r['status'] ?? '') { 'completed' => '#059669', 'approved' => '#0284C7', 'fee_paid' => '#0D7377', 'rejected' => '#DC2626', default => '#D97706' };
?>
<tr>
<td><?= (int) $r['id'] ?></td>
<td><a href="/members/<?= (int) $r['source_member_id'] ?>" style="color:#0D7377;font-weight:600;"><?= e($r['source_name'] ?? '') ?></a></td>
<td><?php if (!empty($r['target_name'])): ?><a href="/members/<?= (int) ($r['target_member_id'] ?? 0) ?>" style="color:#1D4ED8;font-weight:600;"><?= e($r['target_name']) ?></a><?php else: ?>—<?php endif; ?></td>
<td style="font-weight:600;"><?= e($r['membership_number'] ?? '—') ?></td>
<td><?= money($r['membership_value_at_waiver'] ?? '0') ?></td>
<td><?= e($r['waiver_fee_percentage'] ?? '30') ?>%</td>
<td style="font-weight:700;color:#0D7377;"><?= money($r['waiver_fee_amount'] ?? '0') ?></td>
<td><span style="color:<?= match($r['status'] ?? '') { 'completed' => '#059669', 'approved' => '#0284C7', default => '#D97706' } ?>;font-weight:600;">● <?= match($r['status'] ?? '') { 'requested' => 'مقدم', 'approved' => 'معتمد', 'completed' => 'مكتمل', default => $r['status'] ?? '' } ?></span></td>
<td style="font-size:12px;color:#6B7280;"><?= e(substr($r['created_at'] ?? '', 0, 10)) ?></td>
<td><span style="color:<?= $wStatusColor ?>;font-weight:600;">● <?= $wStatusLabel ?></span></td>
<td><a href="/waivers/<?= (int) $r['id'] ?>" class="btn btn-sm btn-outline">عرض</a></td>
</tr>
<?php endforeach; ?>
......
app/Modules/Waiver/Views/show.php
View file @ 784c7ee8
......@@ -415,6 +415,21 @@ $statusIcon = match($waiver['status']) { 'requested' => '⏳', 'approved' => '
</div>
<?php endif; ?>
<!-- Payment Request Tracking -->
<?php if (!empty($paymentRequest)): ?>
<div class="card" style="padding:16px 20px;margin-bottom:20px;background:<?= $paymentRequest['status'] === 'completed' ? '#F0FDF4' : '#FFFBEB' ?>;border:1px solid <?= $paymentRequest['status'] === 'completed' ? '#86EFAC' : '#FDE68A' ?>;">
<div style="display:flex;align-items:center;gap:10px;font-size:14px;">
<span style="font-size:18px;"><?= $paymentRequest['status'] === 'completed' ? '✅' : '⏳' ?></span>
<div>
<strong>طلب الدفع <?= e($paymentRequest['request_number'] ?? '#' . $paymentRequest['id']) ?></strong>
— المبلغ: <strong><?= money($paymentRequest['amount']) ?></strong>
— الحالة: <strong style="color:<?= $paymentRequest['status'] === 'completed' ? '#059669' : '#D97706' ?>;"><?= match($paymentRequest['status']) { 'pending' => 'معلق بالخزينة', 'processing' => 'قيد التحصيل', 'completed' => 'مدفوع', default => $paymentRequest['status'] } ?></strong>
<span style="font-size:12px;color:#6B7280;margin-right:8px;">(<?= e(substr($paymentRequest['created_at'], 0, 10)) ?>)</span>
</div>
</div>
</div>
<?php endif; ?>
<!-- SECTION 7: Board Approval (per-individual fee assignment — shows ALL dependents) -->
<?php if ($waiver['status'] === 'requested' && can('waiver.approve')): ?>
<div class="card" style="padding:20px;margin-bottom:20px;background:#EFF6FF;border:2px solid #3B82F6;">
......
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