From ef97b2b249cad195c3c8ba9e92738b3f4c52ebb6 Mon Sep 17 00:00:00 2001
From: hamed <15238-genius.ha@users.noreply.drupalcode.org>
Date: Thu, 16 Jul 2026 12:22:37 +0330
Subject: [PATCH] feat: unify wallet with real payment methods, full
 transaction transparency, pay-session-from-wallet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Address wallet feedback: use the clinic's real payment infrastructure,
redesign the tab to match the admin panel, and make every wallet movement
fully auditable.

Backend:
- WalletTransaction: add createdBy (acting user) + createdByName, payment_method,
  reference, status; toArray exposes them (migration Version20260716083939).
- WalletService (Settlement): balance/charge/withdraw + settleSessionFromWallet,
  records actor/method/reason; insufficient balance throws ERR_WALLET_INSUFFICIENT.
- PatientController: charge/withdraw delegate to WalletService and accept
  payment_method/reference; PATCH /session/{uuid} with payment_method=wallet
  debits the patient's final share from the wallet (reference=session:{uuid}).
- docs/api/patient.md updated.

Frontend:
- Wallet modal redesigned to panel style (no gradient); payment method now uses
  the clinic's real bank accounts + POS devices (usePaymentMethods) plus cash.
- Wallet tab: panel balance card + DataTable ledger with columns مبلغ/نوع/روش/
  دلیل/ثبت‌کننده/تاریخ/ساعت/وضعیت + همه/واریزی/برداشت filters.
- Session card «تکمیل پرداخت» opens a payment-method chooser incl. کیف پول.

Tests: backend transparency + session-from-wallet (success/insufficient/cash);
frontend modal (real methods, toman→rials) + wallet tab + settle chooser.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../WalletTransactionModal.test.tsx           |  12 +-
 .../components/WalletTransactionModal.tsx     | 192 +++++++++---------
 assets/admin/hooks/usePatientWallet.ts        |   6 +
 assets/admin/pages/PatientDetailPage.test.tsx |  18 +-
 assets/admin/pages/PatientDetailPage.tsx      | 137 +++++++++----
 docs/api/patient.md                           |  17 +-
 migrations/Version20260716083939.php          |  35 ++++
 src/Patient/Controller/PatientController.php  |  62 +++---
 src/Settlement/Entity/WalletTransaction.php   |  48 ++++-
 src/Settlement/Service/WalletService.php      | 131 ++++++++++++
 tests/Patient/PatientFinancialsTest.php       |  25 +++
 .../PatientWalletSessionSettleTest.php        | 102 ++++++++++
 12 files changed, 598 insertions(+), 187 deletions(-)
 create mode 100644 migrations/Version20260716083939.php
 create mode 100644 src/Settlement/Service/WalletService.php
 create mode 100644 tests/Patient/PatientWalletSessionSettleTest.php

diff --git a/assets/admin/components/WalletTransactionModal.test.tsx b/assets/admin/components/WalletTransactionModal.test.tsx
index 4d4868e2..ca699edb 100644
--- a/assets/admin/components/WalletTransactionModal.test.tsx
+++ b/assets/admin/components/WalletTransactionModal.test.tsx
@@ -1,6 +1,12 @@
 import { describe, it, expect, vi } from 'vitest';
 import { screen, fireEvent } from '@testing-library/react';
 import { renderWithProviders } from '../test/utils';
+
+vi.mock('../lib/api', () => ({
+  api: { get: vi.fn().mockResolvedValue({ success: true, data: [] }), post: vi.fn(), patch: vi.fn(), put: vi.fn(), delete: vi.fn() },
+  ApiError: class extends Error {},
+}));
+
 import WalletTransactionModal from './WalletTransactionModal';
 
 // موجودی نمونه: ۳۰۰٬۰۰۰ ریال = ۳۰٬۰۰۰ تومان
@@ -23,11 +29,11 @@ describe('WalletTransactionModal (شارژ/برداشت کیف پول)', () => {
     expect(screen.getAllByRole('button', { name: /تومان/ }).length).toBe(4);
   });
 
-  it('submits a charge with the amount converted from toman to rials', () => {
+  it('submits a charge with the amount converted from toman to rials and the default cash method', () => {
     const onSubmit = open();
     fireEvent.change(screen.getByPlaceholderText('مبلغ دلخواه (تومان)'), { target: { value: '100000' } });
     fireEvent.click(screen.getByRole('button', { name: 'ثبت تراکنش' }));
-    expect(onSubmit).toHaveBeenCalledWith({ mode: 'charge', amount_rials: 1_000_000 });
+    expect(onSubmit).toHaveBeenCalledWith({ mode: 'charge', amount_rials: 1_000_000, payment_method: 'cash' });
   });
 
   it('submits a withdraw (debit) when the برداشت tab is active and amount is within balance', () => {
@@ -35,7 +41,7 @@ describe('WalletTransactionModal (شارژ/برداشت کیف پول)', () => {
     fireEvent.click(screen.getByRole('button', { name: 'برداشت از کیف پول' }));
     fireEvent.change(screen.getByPlaceholderText('مبلغ دلخواه (تومان)'), { target: { value: '20000' } });
     fireEvent.click(screen.getByRole('button', { name: 'ثبت تراکنش' }));
-    expect(onSubmit).toHaveBeenCalledWith({ mode: 'withdraw', amount_rials: 200_000 });
+    expect(onSubmit).toHaveBeenCalledWith({ mode: 'withdraw', amount_rials: 200_000, payment_method: 'cash' });
   });
 
   it('blocks a withdraw above the balance and shows the insufficient-funds hint', () => {
diff --git a/assets/admin/components/WalletTransactionModal.tsx b/assets/admin/components/WalletTransactionModal.tsx
index 9795cec0..72c31005 100644
--- a/assets/admin/components/WalletTransactionModal.tsx
+++ b/assets/admin/components/WalletTransactionModal.tsx
@@ -1,53 +1,62 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { XMarkIcon, WalletIcon } from '@heroicons/react/24/outline';
+import { XMarkIcon } from '@heroicons/react/24/outline';
 import SearchableSelect from './ui/SearchableSelect';
-import PersianDateInput from './ui/PersianDateInput';
+import { useBankAccounts, usePosDevices } from '../hooks/usePaymentMethods';
 import { formatRial, formatNumber, tomanToRial } from '../lib/utils';
 
 export type WalletMode = 'charge' | 'withdraw';
 
+export interface WalletModalSubmit {
+  mode: WalletMode;
+  amount_rials: number;
+  description?: string;
+  payment_method?: string;
+  reference?: string;
+}
+
 interface Props {
   open: boolean;
   balanceRials: number;
   submitting?: boolean;
   onClose: () => void;
-  onSubmit: (payload: { mode: WalletMode; amount_rials: number; description?: string }) => void;
+  onSubmit: (payload: WalletModalSubmit) => void;
 }
 
-// مبالغ پیشنهادی سریع، به تومان (معادل tauri quickAmounts).
+// مبالغ پیشنهادی سریع، به تومان.
 const QUICK_TOMANS = [100_000, 200_000, 300_000, 400_000];
 
-// روش پرداخت / حساب مقصد صرفاً UI هستند (در tauri هم mock بودند و بک‌اندی ندارند).
-const PAYMENT_METHOD_OPTS = [
-  { value: 'card', label: 'کارت به کارت' },
-  { value: 'cash', label: 'نقدی' },
-  { value: 'pos', label: 'دستگاه پوز' },
-  { value: 'gateway', label: 'درگاه اینترنتی' },
-];
-const ACCOUNT_OPTS = [{ value: 'main', label: 'حساب اصلی' }];
+interface MethodOption { value: string; label: string; method: string; reference: string | null }
 
 /**
- * مودال شارژ/برداشت کیف پول بیمار — پورت‌شده از tauri AddTransactionModal.
- * یک مودال با toggle «شارژ کیف پول / برداشت از کیف پول»، مبالغ سریع، و فیلدهای فرم.
- * مبلغ به تومان وارد و هنگام ثبت به ریال (واحد API) تبدیل می‌شود.
- * روش پرداخت/حساب/تاریخ/ساعت فقط UI هستند (بدون ذخیره)، مطابق مبدأ.
+ * مودال شارژ/برداشت کیف پول بیمار — با طراحیِ پنل و روش‌های پرداختِ واقعیِ کلینیک
+ * (حساب بانکی/کارت‌خوان از /my/payment-methods + نقدی). مبلغ به تومان وارد و هنگام
+ * ثبت به ریال (واحد API) تبدیل می‌شود.
  */
 export default function WalletTransactionModal({ open, balanceRials, submitting, onClose, onSubmit }: Props) {
   const [mode, setMode] = useState<WalletMode>('charge');
   const [amountToman, setAmountToman] = useState(0);
-  const [method, setMethod] = useState<string>('');
-  const [account, setAccount] = useState<string>('');
-  const [date, setDate] = useState('');
-  const [time, setTime] = useState('');
+  const [methodValue, setMethodValue] = useState<string>('cash');
   const [description, setDescription] = useState('');
 
-  // با هر بار باز شدن، فرم ریست شود.
-  useEffect(() => {
-    if (open) {
-      setMode('charge'); setAmountToman(0); setMethod(''); setAccount('');
-      setDate(''); setTime(''); setDescription('');
+  const banksQ = useBankAccounts();
+  const posQ = usePosDevices();
+
+  const methodOptions = useMemo<MethodOption[]>(() => {
+    const opts: MethodOption[] = [{ value: 'cash', label: 'نقدی', method: 'cash', reference: null }];
+    for (const b of banksQ.data?.data ?? []) {
+      if (!b.is_active) continue;
+      opts.push({ value: `bank:${b.uuid}`, label: `کارت به کارت — ${b.bank_name}`, method: 'card', reference: `${b.bank_name}${b.card_number ? ` (${b.card_number})` : ''}` });
     }
+    for (const p of posQ.data?.data ?? []) {
+      if (!p.is_active) continue;
+      opts.push({ value: `pos:${p.uuid}`, label: `کارت‌خوان — ${p.bank_name}`, method: 'pos', reference: `${p.bank_name} (${p.terminal_number})` });
+    }
+    return opts;
+  }, [banksQ.data, posQ.data]);
+
+  useEffect(() => {
+    if (open) { setMode('charge'); setAmountToman(0); setMethodValue('cash'); setDescription(''); }
   }, [open]);
 
   useEffect(() => {
@@ -63,14 +72,16 @@ export default function WalletTransactionModal({ open, balanceRials, submitting,
   const isWithdraw = mode === 'withdraw';
   const overBalance = isWithdraw && amountRials > balanceRials;
   const canSubmit = amountToman > 0 && !overBalance && !submitting;
-  const amountLabel = isWithdraw ? 'مبلغ برداشت:' : 'مبلغ شارژ:';
 
   const submit = () => {
     if (!canSubmit) return;
+    const opt = methodOptions.find((o) => o.value === methodValue);
     onSubmit({
       mode,
       amount_rials: amountRials,
       ...(description.trim() ? { description: description.trim() } : {}),
+      ...(opt ? { payment_method: opt.method } : {}),
+      ...(opt?.reference ? { reference: opt.reference } : {}),
     });
   };
 
@@ -81,9 +92,9 @@ export default function WalletTransactionModal({ open, balanceRials, submitting,
         type="button"
         onClick={() => setMode(key)}
         style={{
-          flex: 1, borderRadius: 10, padding: '9px 0', border: 'none', cursor: 'pointer',
-          fontFamily: 'inherit', fontSize: 14, fontWeight: 600, zIndex: 2, background: 'transparent',
-          color: on ? '#fff' : 'var(--text)', transition: 'color .3s',
+          flex: 1, borderRadius: 'var(--r-sm)', padding: '9px 0', border: 'none', cursor: 'pointer',
+          fontFamily: 'inherit', fontSize: 13.5, fontWeight: 600, zIndex: 2, background: 'transparent',
+          color: on ? 'var(--on-primary)' : 'var(--text-2)', transition: 'color .25s var(--ease)',
         }}
       >
         {label}
@@ -93,7 +104,7 @@ export default function WalletTransactionModal({ open, balanceRials, submitting,
 
   return createPortal(
     <div className="overlay" onClick={onClose}>
-      <div className="modal" style={{ maxWidth: 620 }} onClick={(e) => e.stopPropagation()}>
+      <div className="modal" style={{ maxWidth: 560 }} onClick={(e) => e.stopPropagation()}>
         <div className="modal-head">
           <h2>{isWithdraw ? 'برداشت از کیف پول' : 'شارژ کیف پول'}</h2>
           <button type="button" className="mini-btn" onClick={onClose}>
@@ -102,100 +113,79 @@ export default function WalletTransactionModal({ open, balanceRials, submitting,
         </div>
 
         <div className="modal-body" dir="rtl">
-          {/* بنر موجودی (معادل هدر گرادیانی مبدأ) */}
+          {/* موجودی — کارت ساده مطابق پنل (بدون گرادیان) */}
           <div style={{
-            background: 'linear-gradient(135deg, var(--primary), var(--primary-700))',
-            borderRadius: 'var(--r-lg)', padding: '18px 22px', color: '#fff', marginBottom: 20,
             display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+            background: 'var(--primary-soft)', border: '1px solid var(--border)',
+            borderRadius: 'var(--r)', padding: '12px 16px', marginBottom: 18,
           }}>
-            <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
-              <WalletIcon style={{ width: 22, opacity: 0.9 }} />
-              <span style={{ fontSize: 14, fontWeight: 600 }}>موجودی کیف پول</span>
-            </div>
-            <div style={{ fontSize: 20, fontWeight: 800, direction: 'ltr' }}>{formatRial(balanceRials)}</div>
+            <span style={{ fontSize: 13, color: 'var(--text-2)' }}>موجودی کیف پول</span>
+            <span style={{ fontSize: 18, fontWeight: 800, color: 'var(--primary)', direction: 'ltr' }}>{formatRial(balanceRials)}</span>
           </div>
 
           {/* toggle شارژ/برداشت */}
-          <div style={{ position: 'relative', display: 'flex', background: 'var(--primary-soft)', borderRadius: 12, padding: 4, marginBottom: 20 }}>
+          <div style={{ position: 'relative', display: 'flex', background: 'var(--surface-2)', border: '1px solid var(--border)', borderRadius: 'var(--r)', padding: 4, marginBottom: 18 }}>
             <div style={{
               position: 'absolute', top: 4, bottom: 4, width: 'calc(50% - 4px)',
-              right: isWithdraw ? 'calc(50% + 0px)' : 4, left: isWithdraw ? 4 : 'calc(50% + 0px)',
-              background: 'var(--primary)', borderRadius: 10, transition: 'all .3s var(--ease)', zIndex: 1,
+              right: isWithdraw ? 'calc(50%)' : 4, left: isWithdraw ? 4 : 'calc(50%)',
+              background: 'var(--primary)', borderRadius: 'var(--r-sm)', transition: 'all .25s var(--ease)', zIndex: 1,
             }} />
             {tab('charge', 'شارژ کیف پول')}
             {tab('withdraw', 'برداشت از کیف پول')}
           </div>
 
           {/* مبلغ + مبالغ سریع */}
-          <div style={{ marginBottom: 18 }}>
-            <label className="field-label">{amountLabel}</label>
-            <div style={{ display: 'flex', gap: 8, margin: '8px 0 12px', flexWrap: 'wrap' }}>
-              {QUICK_TOMANS.map((t) => (
-                <button
-                  key={t}
-                  type="button"
-                  onClick={() => setAmountToman(t)}
-                  style={{
-                    flex: '1 1 0', minWidth: 90, padding: '8px 6px', borderRadius: 10, cursor: 'pointer',
-                    border: `1px solid ${amountToman === t ? 'var(--primary)' : 'var(--border)'}`,
-                    background: amountToman === t ? 'var(--primary-soft)' : 'var(--surface)',
-                    color: amountToman === t ? 'var(--primary)' : 'var(--text-2)',
-                    fontFamily: 'inherit', fontSize: 13, fontWeight: 600,
-                  }}
-                >
-                  {formatNumber(t)} تومان
-                </button>
-              ))}
-            </div>
-            <div className="field">
-              <input
-                inputMode="numeric"
-                value={amountToman > 0 ? formatNumber(amountToman) : ''}
-                onChange={(e) => {
-                  const raw = e.target.value.replace(/[۰-۹]/g, (d) => String(d.charCodeAt(0) - 0x06f0)).replace(/[^\d]/g, '');
-                  setAmountToman(raw ? parseInt(raw, 10) : 0);
-                }}
-                placeholder="مبلغ دلخواه (تومان)"
-                style={{ textAlign: 'center', direction: 'ltr' }}
+          <label className="field-label">{isWithdraw ? 'مبلغ برداشت (تومان)' : 'مبلغ شارژ (تومان)'}</label>
+          <div style={{ display: 'flex', gap: 8, margin: '8px 0 10px', flexWrap: 'wrap' }}>
+            {QUICK_TOMANS.map((t) => {
+              const on = amountToman === t;
+              return (
+                <button key={t} type="button" onClick={() => setAmountToman(t)} style={{
+                  flex: '1 1 0', minWidth: 92, padding: '8px 6px', borderRadius: 'var(--r-sm)', cursor: 'pointer',
+                  border: `1px solid ${on ? 'var(--primary)' : 'var(--border)'}`,
+                  background: on ? 'var(--primary-soft)' : 'var(--surface)',
+                  color: on ? 'var(--primary)' : 'var(--text-2)', fontFamily: 'inherit', fontSize: 12.5, fontWeight: 600,
+                }}>{formatNumber(t)} تومان</button>
+              );
+            })}
+          </div>
+          <div className="field">
+            <input
+              inputMode="numeric"
+              value={amountToman > 0 ? formatNumber(amountToman) : ''}
+              onChange={(e) => {
+                const raw = e.target.value.replace(/[۰-۹]/g, (d) => String(d.charCodeAt(0) - 0x06f0)).replace(/[^\d]/g, '');
+                setAmountToman(raw ? parseInt(raw, 10) : 0);
+              }}
+              placeholder="مبلغ دلخواه (تومان)"
+              style={{ textAlign: 'center', direction: 'ltr' }}
+            />
+          </div>
+          {overBalance && <div style={{ color: 'var(--danger)', fontSize: 12, marginTop: 6 }}>موجودی کیف پول کافی نیست</div>}
+
+          {/* روش پرداخت واقعی */}
+          <div style={{ marginTop: 16 }}>
+            <label className="field-label">روش پرداخت</label>
+            <div style={{ marginTop: 8 }}>
+              <SearchableSelect
+                options={methodOptions.map((o) => ({ value: o.value, label: o.label }))}
+                value={methodValue}
+                onChange={(v) => setMethodValue(String(v ?? 'cash'))}
+                placeholder="روش پرداخت"
+                height={46}
               />
             </div>
-            {overBalance && (
-              <div style={{ color: 'var(--danger)', fontSize: 12, marginTop: 6 }}>موجودی کیف پول کافی نیست</div>
-            )}
-          </div>
-
-          {/* روش پرداخت + حساب مقصد (UI-only) */}
-          <div style={{ marginBottom: 18 }}>
-            <label className="field-label">انتخاب روش‌های پرداخت:</label>
-            <div style={{ marginTop: 8, marginBottom: 10 }}>
-              <SearchableSelect options={PAYMENT_METHOD_OPTS} value={method} onChange={(v) => setMethod(String(v ?? ''))} placeholder="کارت به کارت" height={46} />
-            </div>
-            <SearchableSelect options={ACCOUNT_OPTS} value={account} onChange={(v) => setAccount(String(v ?? ''))} placeholder="حساب مقصد" height={46} />
-          </div>
-
-          {/* تاریخ + ساعت (UI-only) */}
-          <div style={{ display: 'flex', gap: 12, marginBottom: 18 }}>
-            <div style={{ flex: 1 }}>
-              <label className="field-label">تاریخ</label>
-              <div style={{ marginTop: 8 }}><PersianDateInput value={date} onChange={setDate} /></div>
-            </div>
-            <div style={{ flex: 1 }}>
-              <label className="field-label">ساعت</label>
-              <div className="field" style={{ marginTop: 8 }}>
-                <input type="time" value={time} onChange={(e) => setTime(e.target.value)} dir="ltr" />
-              </div>
-            </div>
           </div>
 
           {/* توضیحات */}
-          <div style={{ marginBottom: 6 }}>
+          <div style={{ marginTop: 16 }}>
             <label className="field-label">توضیحات</label>
             <div className="field" style={{ height: 'auto', marginTop: 8 }}>
               <textarea
                 value={description}
                 onChange={(e) => setDescription(e.target.value)}
-                rows={3}
-                placeholder="توضیحات"
+                rows={2}
+                placeholder="دلیل تراکنش (اختیاری)"
                 style={{ width: '100%', border: 'none', background: 'transparent', fontFamily: 'inherit', resize: 'vertical' }}
               />
             </div>
diff --git a/assets/admin/hooks/usePatientWallet.ts b/assets/admin/hooks/usePatientWallet.ts
index 63b5f60e..87b7f44e 100644
--- a/assets/admin/hooks/usePatientWallet.ts
+++ b/assets/admin/hooks/usePatientWallet.ts
@@ -8,6 +8,10 @@ export interface WalletTxn {
   type: 'credit' | 'debit' | string;
   description?: string | null;
   balance_after: number;
+  created_by_name?: string | null;
+  payment_method?: string | null;
+  reference?: string | null;
+  status?: string;
   created_at: number;
 }
 
@@ -19,6 +23,8 @@ interface WalletData {
 export interface WalletTxnInput {
   amount_rials: number;
   description?: string;
+  payment_method?: string;
+  reference?: string;
 }
 
 /**
diff --git a/assets/admin/pages/PatientDetailPage.test.tsx b/assets/admin/pages/PatientDetailPage.test.tsx
index f1a6f6dd..8f015ae0 100644
--- a/assets/admin/pages/PatientDetailPage.test.tsx
+++ b/assets/admin/pages/PatientDetailPage.test.tsx
@@ -168,8 +168,8 @@ describe('PatientDetailPage (پرونده تب‌دار)', () => {
     expect(screen.getByRole('button', { name: 'همه' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'واریزی' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'برداشت' })).toBeInTheDocument();
-    // تراکنش credit اولیه دیده می‌شود
-    expect(screen.getByText('شارژ')).toBeInTheDocument();
+    // تراکنش credit اولیه دیده می‌شود (سطر جدول async لود می‌شود)
+    expect(await screen.findByText('شارژ')).toBeInTheDocument();
   });
 
   it('filters out the credit transaction when the برداشت filter is selected', async () => {
@@ -193,7 +193,19 @@ describe('PatientDetailPage (پرونده تب‌دار)', () => {
     expect(await screen.findByRole('button', { name: 'برداشت از کیف پول' })).toBeInTheDocument();
     fireEvent.change(screen.getByPlaceholderText('مبلغ دلخواه (تومان)'), { target: { value: '50000' } });
     fireEvent.click(screen.getByRole('button', { name: 'ثبت تراکنش' }));
-    await waitFor(() => expect(post).toHaveBeenCalledWith('/api/v1/patient/r1/wallet/charge', { amount_rials: 500000 }));
+    await waitFor(() => expect(post).toHaveBeenCalledWith('/api/v1/patient/r1/wallet/charge', { amount_rials: 500000, payment_method: 'cash' }));
+  });
+
+  it('settles a session from the wallet via the payment-method chooser', async () => {
+    const patch = api.patch as ReturnType<typeof vi.fn>;
+    patch.mockResolvedValue({ success: true, data: {} });
+    renderDetail();
+    await loaded();
+    // تب سرویس‌ها پیش‌فرض است؛ کارت پرداخت‌نشده → «تکمیل پرداخت»
+    fireEvent.click(await screen.findByText('تکمیل پرداخت'));
+    expect(await screen.findByText('روش پرداخت مراجعه')).toBeInTheDocument();
+    fireEvent.click(screen.getByRole('button', { name: 'کیف پول بیمار' }));
+    await waitFor(() => expect(patch).toHaveBeenCalledWith('/api/v1/session/s1', { payment_method: 'wallet' }));
   });
 
   it('renders the messages tab with a send box', async () => {
diff --git a/assets/admin/pages/PatientDetailPage.tsx b/assets/admin/pages/PatientDetailPage.tsx
index fa874f6d..f8b1d0c6 100644
--- a/assets/admin/pages/PatientDetailPage.tsx
+++ b/assets/admin/pages/PatientDetailPage.tsx
@@ -13,7 +13,10 @@ import { api } from '../lib/api';
 import type { ApiResponse } from '../lib/api';
 import type { PatientRecord } from '../types';
 import { useAuthStore } from '../stores/authStore';
-import { formatDate, formatRial } from '../lib/utils';
+import { formatDate, formatRial, formatTime, formatNumber } from '../lib/utils';
+import DataTable, { type Column } from '../components/ui/DataTable';
+import type { WalletTxn } from '../hooks/usePatientWallet';
+import type { WalletModalSubmit } from '../components/WalletTransactionModal';
 import Modal from '../components/ui/Modal';
 import ConfirmDialog from '../components/ui/ConfirmDialog';
 import PersianDateInput from '../components/ui/PersianDateInput';
@@ -76,6 +79,7 @@ export default function PatientDetailPage() {
 
   const qc = useQueryClient();
   const [invoiceUuid, setInvoiceUuid] = useState<string | null>(null);
+  const [settleTarget, setSettleTarget] = useState<string | null>(null);
 
   // ── فرم «اطلاعات پرونده» (اینلاین، معادل tauri FileInfoSection) ──────────────
   // استان/شهر (Location) و بیمهٔ پایه (insurance-pricing) برای گزینه‌های فرم.
@@ -140,8 +144,15 @@ export default function PatientDetailPage() {
     .sort((a: any, b: any) => a.starts_at - b.starts_at)[0]?.starts_at ?? null;
 
   const settle = useMutation({
-    mutationFn: (sessionUuid: string) => api.patch(`/api/v1/session/${sessionUuid}`, { payment_method: 'cash' }),
-    onSuccess: () => { qc.invalidateQueries({ queryKey: ['patient-sessions', uuid] }); toast.success('پرداخت ثبت شد'); },
+    mutationFn: ({ sessionUuid, method }: { sessionUuid: string; method: string }) =>
+      api.patch(`/api/v1/session/${sessionUuid}`, { payment_method: method }),
+    onSuccess: () => {
+      qc.invalidateQueries({ queryKey: ['patient-sessions', uuid] });
+      // پرداخت از کیف پول موجودی را کم می‌کند → دفتر کیف پول را هم تازه کن.
+      qc.invalidateQueries({ queryKey: ['patient-wallet', uuid] });
+      toast.success('پرداخت ثبت شد');
+      setSettleTarget(null);
+    },
     onError: (e: any) => toast.error(e?.message || 'خطا در ثبت پرداخت'),
   });
 
@@ -219,7 +230,7 @@ export default function PatientDetailPage() {
           ) : (
             <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(240px, 1fr))', columnGap: 6, rowGap: 10, alignItems: 'stretch' }}>
               {sessions.map((s) => (
-                <SessionServiceCard key={s.uuid} session={s} settling={settle.isPending} onSettle={(u) => settle.mutate(u)} onViewInvoice={(iv) => setInvoiceUuid(iv)} />
+                <SessionServiceCard key={s.uuid} session={s} settling={settle.isPending} onSettle={(u) => setSettleTarget(u)} onViewInvoice={(iv) => setInvoiceUuid(iv)} />
               ))}
             </div>
           )}
@@ -243,6 +254,28 @@ export default function PatientDetailPage() {
       )}
 
       <InvoiceSummaryModal invoiceUuid={invoiceUuid} onClose={() => setInvoiceUuid(null)} />
+
+      {/* انتخاب روش پرداختِ مراجعه (نقدی / کارت / کیف پول) */}
+      <Modal open={settleTarget !== null} title="روش پرداخت مراجعه" onClose={() => setSettleTarget(null)}>
+        <div style={{ display: 'flex', flexDirection: 'column', gap: 10 }}>
+          <p style={{ fontSize: 13, color: 'var(--text-3)', margin: 0 }}>روش تسویهٔ این مراجعه را انتخاب کنید:</p>
+          {[
+            { method: 'cash', label: 'نقدی' },
+            { method: 'card', label: 'کارت به کارت' },
+            { method: 'wallet', label: 'کیف پول بیمار' },
+          ].map((m) => (
+            <button
+              key={m.method}
+              className="btn"
+              style={{ justifyContent: 'flex-start' }}
+              disabled={settle.isPending}
+              onClick={() => settleTarget && settle.mutate({ sessionUuid: settleTarget, method: m.method })}
+            >
+              {m.label}
+            </button>
+          ))}
+        </div>
+      </Modal>
     </div>
   );
 }
@@ -609,9 +642,17 @@ const WALLET_FILTERS: { key: WalletFilter; label: string }[] = [
   { key: 'debit', label: 'برداشت' },
 ];
 
+const METHOD_LABEL: Record<string, string> = {
+  card: 'کارت به کارت', pos: 'کارت‌خوان', cash: 'نقدی', wallet: 'کیف پول', gateway: 'درگاه اینترنتی',
+};
+const STATUS_LABEL: Record<string, string> = { confirmed: 'تأیید شده' };
+
+type WalletRow = WalletTxn & { row_no: number };
+
 /**
- * کیف پول — کارت موجودی + مودال شارژ/برداشت (toggle) + فیلتر همه/واریزی/برداشت
- * روی دفتر تراکنش‌های اخیر. پورت‌شده از tauri WalletSection + AddTransactionModal.
+ * کیف پول — کارت موجودی + مودال شارژ/برداشت (روش پرداخت واقعی) + فیلتر
+ * همه/واریزی/برداشت روی دفترِ کاملِ تراکنش‌ها (DataTable با ستون ثبت‌کننده،
+ * روش پرداخت، دلیل و وضعیت). طراحی مطابق پنل.
  */
 function WalletTab({ uuid }: { uuid: string }) {
   const { balanceRials, transactions, isLoading, charge, withdraw } = usePatientWallet(uuid);
@@ -620,36 +661,56 @@ function WalletTab({ uuid }: { uuid: string }) {
 
   const submitting = charge.isPending || withdraw.isPending;
 
-  const handleSubmit = ({ mode, amount_rials, description }: { mode: 'charge' | 'withdraw'; amount_rials: number; description?: string }) => {
+  const handleSubmit = ({ mode, ...body }: WalletModalSubmit) => {
     const mut = mode === 'charge' ? charge : withdraw;
-    mut.mutate(
-      { amount_rials, ...(description ? { description } : {}) },
-      {
-        onSuccess: () => {
-          toast.success(mode === 'charge' ? 'کیف پول شارژ شد' : 'برداشت از کیف پول انجام شد');
-          setModalOpen(false);
-        },
-        onError: (e: any) => toast.error(e?.message || 'خطا در ثبت تراکنش'),
+    mut.mutate(body, {
+      onSuccess: () => {
+        toast.success(mode === 'charge' ? 'کیف پول شارژ شد' : 'برداشت از کیف پول انجام شد');
+        setModalOpen(false);
       },
-    );
+      onError: (e: any) => toast.error(e?.message || 'خطا در ثبت تراکنش'),
+    });
   };
 
-  if (isLoading) return <div style={{ padding: 24, color: 'var(--text-3)', fontSize: 13 }}>در حال بارگذاری...</div>;
-
   const shown = filter === 'all' ? transactions : transactions.filter((t) => t.type === filter);
+  const rows: WalletRow[] = shown.map((t, i) => ({ ...t, row_no: i + 1 }));
+
+  const columns: Column<WalletRow>[] = [
+    { key: 'row_no', header: 'ردیف', className: 'w-[60px]', render: (r) => formatNumber(r.row_no) },
+    {
+      key: 'amount', header: 'مبلغ', render: (r) => (
+        <span style={{ fontWeight: 700, direction: 'ltr', color: r.type === 'credit' ? 'var(--success)' : 'var(--danger)' }}>
+          {r.type === 'credit' ? '+' : '−'}{formatRial(r.amount_rials)}
+        </span>
+      ),
+    },
+    {
+      key: 'type', header: 'نوع تراکنش', render: (r) => (
+        <span className={`badge ${r.type === 'credit' ? 'green' : 'red'}`}>{r.type === 'credit' ? 'واریز' : 'برداشت'}</span>
+      ),
+    },
+    { key: 'method', header: 'روش پرداخت', render: (r) => (r.payment_method ? METHOD_LABEL[r.payment_method] ?? r.payment_method : '—') },
+    { key: 'reason', header: 'دلیل', render: (r) => r.description || '—' },
+    { key: 'by', header: 'ثبت‌کننده', render: (r) => r.created_by_name || '—' },
+    { key: 'date', header: 'تاریخ', render: (r) => formatDate(r.created_at) },
+    { key: 'time', header: 'ساعت', render: (r) => formatTime(r.created_at) },
+    { key: 'status', header: 'وضعیت', render: (r) => <span className="badge gray">{STATUS_LABEL[r.status ?? ''] ?? 'تأیید شده'}</span> },
+  ];
 
   return (
     <div>
-      <div style={{ background: 'var(--surface)', border: '1px solid var(--border)', borderRadius: 'var(--r-lg)', padding: 20, marginBottom: 16, maxWidth: 320 }}>
-        <div style={{ fontSize: 12.5, color: 'var(--text-3)', marginBottom: 6 }}>موجودی کیف پول</div>
-        <div style={{ fontSize: 22, fontWeight: 800, color: 'var(--primary)' }}>{formatRial(balanceRials)}</div>
-        <button className="btn sm" style={{ marginTop: 12, color: '#fff', border: 'none', background: '#5559ce' }}
-          onClick={() => setModalOpen(true)}>
-          <PlusIcon style={{ width: 14 }} /> شارژ کیف پول
+      {/* موجودی + دکمه تراکنش جدید */}
+      <div className="card card-pad" style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 16, marginBottom: 16, flexWrap: 'wrap' }}>
+        <div>
+          <div style={{ fontSize: 12.5, color: 'var(--text-3)', marginBottom: 6 }}>موجودی کیف پول</div>
+          <div style={{ fontSize: 24, fontWeight: 800, color: 'var(--primary)', direction: 'ltr' }}>{formatRial(balanceRials)}</div>
+        </div>
+        <button className="btn primary" onClick={() => setModalOpen(true)}>
+          <PlusIcon style={{ width: 16 }} /> شارژ کیف پول
         </button>
       </div>
 
-      {/* فیلتر تراکنش‌ها: همه / واریزی / برداشت (معادل tauri filters) */}
+      {/* فیلتر تراکنش‌ها */}
       <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 14 }}>
         <span style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-2)' }}>تراکنش‌ها:</span>
         {WALLET_FILTERS.map((f) => {
@@ -673,26 +734,12 @@ function WalletTab({ uuid }: { uuid: string }) {
         onSubmit={handleSubmit}
       />
 
-      {shown.length === 0 ? (
-        <div style={{ padding: '40px 0', textAlign: 'center', color: 'var(--text-3)', fontSize: 14 }}>تراکنشی ثبت نشده است</div>
-      ) : (
-        <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
-          {shown.map((t) => {
-            const credit = t.type === 'credit';
-            return (
-              <div key={t.uuid} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', background: 'var(--surface)', border: '1px solid var(--border)', borderRadius: 'var(--r)', padding: '12px 14px' }}>
-                <div>
-                  <div style={{ fontSize: 13.5, fontWeight: 600 }}>{t.description || (credit ? 'واریز' : 'برداشت')}</div>
-                  <div style={{ fontSize: 12, color: 'var(--text-3)', marginTop: 2 }}>{formatDate(t.created_at)}</div>
-                </div>
-                <div style={{ fontSize: 13.5, fontWeight: 700, direction: 'ltr', color: credit ? 'var(--success)' : 'var(--danger)' }}>
-                  {credit ? '+' : '−'}{formatRial(t.amount_rials)}
-                </div>
-              </div>
-            );
-          })}
-        </div>
-      )}
+      <DataTable<WalletRow>
+        columns={columns}
+        data={rows}
+        loading={isLoading}
+        emptyMessage="تراکنشی ثبت نشده است"
+      />
     </div>
   );
 }
diff --git a/docs/api/patient.md b/docs/api/patient.md
index 8cbc5488..b24e9a3c 100644
--- a/docs/api/patient.md
+++ b/docs/api/patient.md
@@ -589,24 +589,29 @@ When an appointment's status changes to `confirmed` via `PATCH /api/v1/appointme
 لیست پرداخت‌های درگاهیِ بیمار (paginated). Query: `page`, `limit` (≤100)، `status` (اختیاری: `pending|success|failed|canceled|refunded`).
 Response: `{ success, data: [{ uuid, order_id, amount_rials, status, gateway, type, reference_id, appointment_uuid, created_at }], meta: { totalRecords, totalPages, currentPage } }`
 
+هر تراکنش برای شفافیت این فیلدها را دارد: `type` (credit/debit)، `payment_method` (card/pos/cash/gateway/wallet یا null)، `description` (دلیل)، `reference` (مرجعِ ماشینی مثل `session:{uuid}`)، `created_by_name` (کاربرِ ثبت‌کننده)، `status` (`confirmed`)، `balance_after`، `created_at`.
+
 ### GET `/api/v1/patient/{uuid}/wallet`
 موجودی + ۱۰ تراکنش اخیر (تب کیف‌پول). `balance_rials` = مجموع credit − debit.
-Response: `{ success, data: { balance_rials, recent_transactions: [{ uuid, amount_rials, type, description, balance_after, created_at }] } }`
+Response: `{ success, data: { balance_rials, recent_transactions: [{ uuid, amount_rials, type, description, balance_after, created_by_name, payment_method, reference, status, created_at }] } }`
 
 ### POST `/api/v1/patient/{uuid}/wallet/charge`
-شارژ دستی کیف‌پول (مثلاً بیعانهٔ حضوری). یک تراکنش `credit` برای کاربرِ صاحب رکورد می‌سازد.
+شارژ دستی کیف‌پول (مثلاً بیعانهٔ حضوری). یک تراکنش `credit` برای کاربرِ صاحب رکورد می‌سازد؛ کاربرِ درخواست‌کننده به‌عنوان `created_by` ثبت می‌شود.
 ```json
-{ "amount_rials": 300000, "description": "بیعانه نوبت (اختیاری، پیش‌فرض «شارژ کیف پول»)" }
+{ "amount_rials": 300000, "description": "بیعانه نوبت (اختیاری)", "payment_method": "card", "reference": "(اختیاری)" }
 ```
-`amount_rials` باید > 0 باشد وگرنه `422`. Response `201`: `{ success, data: { transaction, balance_rials } }`
+`amount_rials` باید > 0 باشد وگرنه `422`. `payment_method` ناشناخته نادیده گرفته می‌شود (null). Response `201`: `{ success, data: { transaction, balance_rials } }`
 
 ### POST `/api/v1/patient/{uuid}/wallet/withdraw`
-برداشت دستی از کیف‌پول (مثلاً عودت وجه حضوری). یک تراکنش `debit` برای کاربرِ صاحب رکورد می‌سازد.
+برداشت دستی از کیف‌پول (مثلاً عودت وجه حضوری). یک تراکنش `debit` با ثبتِ کاربرِ عامل و روش پرداخت می‌سازد.
 ```json
-{ "amount_rials": 200000, "description": "عودت (اختیاری، پیش‌فرض «برداشت از کیف پول»)" }
+{ "amount_rials": 200000, "description": "عودت (اختیاری)", "payment_method": "cash" }
 ```
 `amount_rials` باید > 0 باشد وگرنه `422`. اگر مبلغ از موجودی فعلی بیشتر باشد `422` با کد `ERR_WALLET_INSUFFICIENT`. Response `201`: `{ success, data: { transaction, balance_rials } }`
 
+### PATCH `/api/v1/session/{uuid}` — پرداخت مراجعه از کیف پول
+با `{"payment_method": "wallet"}` سهمِ نهاییِ بیمار (`final_price_rials`) از کیف پول کسر می‌شود: یک تراکنشِ `debit` با `payment_method=wallet`، `reference=session:{uuid}` و دلیلِ «پرداخت سرویس: …» ثبت می‌گردد. فقط وقتی مراجعه هنوز تسویه نشده و مبلغ > 0 باشد. موجودیِ ناکافی → `422` `ERR_WALLET_INSUFFICIENT` (مراجعه تسویه نمی‌شود).
+
 ### GET `/api/v1/patient/{uuid}/wallet/transactions`
 دفترِ کاملِ تراکنش‌های کیف‌پول (paginated). Query: `page`, `limit` (≤100).
 Response: `{ success, data: [{ uuid, amount_rials, type, description, balance_after, created_at }], meta: { totalRecords, totalPages, currentPage } }`
diff --git a/migrations/Version20260716083939.php b/migrations/Version20260716083939.php
new file mode 100644
index 00000000..61308b35
--- /dev/null
+++ b/migrations/Version20260716083939.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20260716083939 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE wallet_transactions ADD created_by_name VARCHAR(120) DEFAULT NULL, ADD payment_method VARCHAR(20) DEFAULT NULL, ADD reference VARCHAR(120) DEFAULT NULL, ADD status VARCHAR(15) DEFAULT \'confirmed\' NOT NULL, ADD created_by_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE wallet_transactions ADD CONSTRAINT FK_A50205E2B03A8386 FOREIGN KEY (created_by_id) REFERENCES users (id) ON DELETE SET NULL');
+        $this->addSql('CREATE INDEX IDX_A50205E2B03A8386 ON wallet_transactions (created_by_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE wallet_transactions DROP FOREIGN KEY FK_A50205E2B03A8386');
+        $this->addSql('DROP INDEX IDX_A50205E2B03A8386 ON wallet_transactions');
+        $this->addSql('ALTER TABLE wallet_transactions DROP created_by_name, DROP payment_method, DROP reference, DROP status, DROP created_by_id');
+    }
+}
diff --git a/src/Patient/Controller/PatientController.php b/src/Patient/Controller/PatientController.php
index 846d3a9d..ead53d70 100644
--- a/src/Patient/Controller/PatientController.php
+++ b/src/Patient/Controller/PatientController.php
@@ -58,6 +58,7 @@ class PatientController extends BaseController
         private readonly \App\Payment\Repository\PaymentRepository $paymentRepo,
         private readonly \App\Settlement\Repository\WalletTransactionRepository $walletRepo,
         private readonly \App\Settlement\Repository\SettlementRepository $settlementRepo,
+        private readonly \App\Settlement\Service\WalletService $walletService,
         private readonly LoggerInterface             $logger,
     ) {}
 
@@ -155,24 +156,24 @@ class PatientController extends BaseController
         }
 
         $patient = $record->getUser();
-        $balance = $this->settlementRepo->getWalletBalance($patient) + $amount;
-
-        $txn = new \App\Settlement\Entity\WalletTransaction($patient, $amount, 'credit', $balance);
-        $description = trim((string) ($data['description'] ?? ''));
-        $txn->setDescription($description !== '' ? $description : 'شارژ کیف پول');
-        $this->walletRepo->save($txn);
+        $txn = $this->walletService->charge(
+            $patient, $amount, $user,
+            trim((string) ($data['description'] ?? '')) ?: null,
+            $this->normalizeMethod($data['payment_method'] ?? null),
+            trim((string) ($data['reference'] ?? '')) ?: null,
+        );
 
         return $this->success([
             'transaction'   => $txn->toArray(),
-            'balance_rials' => $balance,
+            'balance_rials' => $txn->getBalanceAfter(),
         ], 201);
     }
 
     /**
      * Manual wallet withdrawal (برداشت از کیف پول) — e.g. a refund or cash
      * hand-back at the desk. Creates a debit WalletTransaction for the record's
-     * owner User. Rejected (422) when the amount exceeds the current balance,
-     * mirroring the offline app's balance guard.
+     * owner User (with acting user + payment method recorded). Rejected (422)
+     * when the amount exceeds the current balance, mirroring the offline app.
      */
     #[Route('/api/v1/patient/{uuid}/wallet/withdraw', methods: ['POST'])]
     public function withdrawWallet(string $uuid, Request $request, #[CurrentUser] User $user): JsonResponse
@@ -189,25 +190,28 @@ class PatientController extends BaseController
             return $this->error(ErrorCodes::ERR_VALIDATION_001, 'مبلغ برداشت باید بزرگ‌تر از صفر باشد', 422, 'amount_rials');
         }
 
+        // Insufficient balance → WalletService throws AppException (422), handled globally.
         $patient = $record->getUser();
-        $current = $this->settlementRepo->getWalletBalance($patient);
-        if ($amount > $current) {
-            return $this->error(ErrorCodes::ERR_WALLET_INSUFFICIENT, ErrorCodes::message(ErrorCodes::ERR_WALLET_INSUFFICIENT), 422, 'amount_rials');
-        }
-
-        $balance = $current - $amount;
-
-        $txn = new \App\Settlement\Entity\WalletTransaction($patient, $amount, 'debit', $balance);
-        $description = trim((string) ($data['description'] ?? ''));
-        $txn->setDescription($description !== '' ? $description : 'برداشت از کیف پول');
-        $this->walletRepo->save($txn);
+        $txn = $this->walletService->withdraw(
+            $patient, $amount, $user,
+            trim((string) ($data['description'] ?? '')) ?: null,
+            $this->normalizeMethod($data['payment_method'] ?? null),
+            trim((string) ($data['reference'] ?? '')) ?: null,
+        );
 
         return $this->success([
             'transaction'   => $txn->toArray(),
-            'balance_rials' => $balance,
+            'balance_rials' => $txn->getBalanceAfter(),
         ], 201);
     }
 
+    /** روش پرداختِ مجاز برای کیف پول؛ ورودیِ ناشناخته نادیده گرفته می‌شود. */
+    private function normalizeMethod(mixed $method): ?string
+    {
+        $method = is_string($method) ? trim($method) : '';
+        return in_array($method, ['card', 'pos', 'cash', 'gateway', 'wallet'], true) ? $method : null;
+    }
+
     // ── Call center (کال سنتر) ─────────────────────────────────────────────────
 
     /** List the patient's call log (newest first, optional ?outcome=success|missed). */
@@ -958,8 +962,20 @@ class PatientController extends BaseController
 
         $data = json_decode($request->getContent(), true) ?? [];
 
-        if (isset($data['notes']))          { $session->setNotes($data['notes']); }
-        if (isset($data['payment_method'])) { $session->setPaymentMethod($data['payment_method']); }
+        if (isset($data['notes'])) { $session->setNotes($data['notes']); }
+
+        if (isset($data['payment_method'])) {
+            $method = (string) $data['payment_method'];
+            // پرداخت از کیف پول: سهمِ بیمار را از موجودی کسر کن (فقط یک‌بار، اگر
+            // مراجعه هنوز تسویه نشده). موجودیِ ناکافی → AppException (۴۲۲).
+            if ($method === 'wallet'
+                && $session->getPaymentMethod() === 'pending'
+                && $session->getFinalPriceRials() > 0
+            ) {
+                $this->walletService->settleSessionFromWallet($session, $user);
+            }
+            $session->setPaymentMethod($method);
+        }
 
         $this->sessionRepo->save($session);
 
diff --git a/src/Settlement/Entity/WalletTransaction.php b/src/Settlement/Entity/WalletTransaction.php
index b07a312d..9681364b 100644
--- a/src/Settlement/Entity/WalletTransaction.php
+++ b/src/Settlement/Entity/WalletTransaction.php
@@ -17,6 +17,8 @@ class WalletTransaction
     public const TYPE_CREDIT = 'credit';
     public const TYPE_DEBIT  = 'debit';
 
+    public const STATUS_CONFIRMED = 'confirmed';
+
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: 'integer')]
@@ -45,6 +47,26 @@ class WalletTransaction
     #[ORM\Column(name: 'balance_after', type: 'integer')]
     private int $balanceAfter;
 
+    /** کاربرِ عاملِ تراکنش (منشی/دکتر که شارژ/برداشت را ثبت کرده) — برای شفافیت. */
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'created_by_id', referencedColumnName: 'id', nullable: true, onDelete: 'SET NULL')]
+    private ?User $createdBy = null;
+
+    /** نامِ denormalizedِ کاربرِ عامل، تا خواندنِ دفتر تراکنش join نخواهد. */
+    #[ORM\Column(name: 'created_by_name', type: 'string', length: 120, nullable: true)]
+    private ?string $createdByName = null;
+
+    /** روش پرداخت: card | pos | cash | gateway | wallet. */
+    #[ORM\Column(name: 'payment_method', type: 'string', length: 20, nullable: true)]
+    private ?string $paymentMethod = null;
+
+    /** مرجع/دلیلِ ماشینی تراکنش (مثلاً session:{uuid} برای کسر بابت سرویس). */
+    #[ORM\Column(type: 'string', length: 120, nullable: true)]
+    private ?string $reference = null;
+
+    #[ORM\Column(type: 'string', length: 15)]
+    private string $status = self::STATUS_CONFIRMED;
+
     #[ORM\Column(name: 'created_at', type: 'integer')]
     private int $createdAt;
 
@@ -66,19 +88,33 @@ class WalletTransaction
     public function getType(): string       { return $this->type; }
     public function getDescription(): ?string { return $this->description; }
     public function getBalanceAfter(): int  { return $this->balanceAfter; }
+    public function getCreatedBy(): ?User    { return $this->createdBy; }
+    public function getCreatedByName(): ?string { return $this->createdByName; }
+    public function getPaymentMethod(): ?string { return $this->paymentMethod; }
+    public function getReference(): ?string  { return $this->reference; }
+    public function getStatus(): string      { return $this->status; }
 
     public function setPayment(?Payment $p): self      { $this->payment = $p; return $this; }
     public function setDescription(?string $d): self   { $this->description = $d; return $this; }
+    public function setCreatedBy(?User $u): self        { $this->createdBy = $u; return $this; }
+    public function setCreatedByName(?string $n): self  { $this->createdByName = $n; return $this; }
+    public function setPaymentMethod(?string $m): self  { $this->paymentMethod = $m; return $this; }
+    public function setReference(?string $r): self      { $this->reference = $r; return $this; }
+    public function setStatus(string $s): self          { $this->status = $s; return $this; }
 
     public function toArray(): array
     {
         return [
-            'uuid'          => $this->uuid,
-            'amount_rials'  => $this->amountRials,
-            'type'          => $this->type,
-            'description'   => $this->description,
-            'balance_after' => $this->balanceAfter,
-            'created_at'    => $this->createdAt,
+            'uuid'            => $this->uuid,
+            'amount_rials'    => $this->amountRials,
+            'type'            => $this->type,
+            'description'     => $this->description,
+            'balance_after'   => $this->balanceAfter,
+            'created_by_name' => $this->createdByName,
+            'payment_method'  => $this->paymentMethod,
+            'reference'       => $this->reference,
+            'status'          => $this->status,
+            'created_at'      => $this->createdAt,
         ];
     }
 }
diff --git a/src/Settlement/Service/WalletService.php b/src/Settlement/Service/WalletService.php
new file mode 100644
index 00000000..23c9a73d
--- /dev/null
+++ b/src/Settlement/Service/WalletService.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Settlement\Service;
+
+use App\Auth\Entity\User;
+use App\Patient\Entity\PatientSession;
+use App\Patient\Entity\SessionService;
+use App\Settlement\Entity\WalletTransaction;
+use App\Settlement\Repository\SettlementRepository;
+use App\Settlement\Repository\WalletTransactionRepository;
+use App\Shared\Constant\ErrorCodes;
+use App\Shared\Exception\AppException;
+use App\UserProfile\Repository\UserProfileRepository;
+
+/**
+ * منطق کیف پولِ بیمار: موجودی، شارژ (credit)، برداشت (debit) و تسویهٔ سرویس از
+ * کیف پول — همگی با ثبتِ کاربرِ عامل، روش پرداخت و دلیل برای شفافیت کامل.
+ * موجودی همیشه از مجموع credit − debit مشتق می‌شود (SettlementRepository).
+ */
+class WalletService
+{
+    public function __construct(
+        private readonly WalletTransactionRepository $walletRepo,
+        private readonly SettlementRepository        $settlementRepo,
+        private readonly UserProfileRepository       $profileRepo,
+    ) {}
+
+    public function balance(User $patient): int
+    {
+        return $this->settlementRepo->getWalletBalance($patient);
+    }
+
+    /** نامِ نمایشیِ کاربرِ عامل (برای ستون «ثبت‌کننده»)؛ در نبودِ پروفایل، شماره موبایل. */
+    public function resolveActorName(?User $actor): ?string
+    {
+        if ($actor === null) {
+            return null;
+        }
+        $profile = $this->profileRepo->findByUser($actor);
+        $name = trim(($profile?->getLabel() ?? '') . ' ' . ($profile?->getFamily() ?? ''));
+
+        return $name !== '' ? $name : $actor->getMobileNumber();
+    }
+
+    /** شارژِ کیف پول (credit). فرض بر مثبت بودنِ مبلغ است (اعتبارسنجی در Controller). */
+    public function charge(
+        User $patient,
+        int $amountRials,
+        ?User $actor = null,
+        ?string $description = null,
+        ?string $paymentMethod = null,
+        ?string $reference = null,
+    ): WalletTransaction {
+        $balanceAfter = $this->balance($patient) + $amountRials;
+
+        return $this->record(
+            $patient, $amountRials, WalletTransaction::TYPE_CREDIT, $balanceAfter, $actor,
+            $description !== null && $description !== '' ? $description : 'شارژ کیف پول',
+            $paymentMethod, $reference,
+        );
+    }
+
+    /**
+     * برداشت از کیف پول (debit). اگر مبلغ از موجودی بیشتر باشد
+     * AppException با کد ERR_WALLET_INSUFFICIENT (۴۲۲) پرتاب می‌شود.
+     */
+    public function withdraw(
+        User $patient,
+        int $amountRials,
+        ?User $actor = null,
+        ?string $description = null,
+        ?string $paymentMethod = null,
+        ?string $reference = null,
+    ): WalletTransaction {
+        $current = $this->balance($patient);
+        if ($amountRials > $current) {
+            throw new AppException(ErrorCodes::ERR_WALLET_INSUFFICIENT, null, 422, 'amount_rials');
+        }
+
+        return $this->record(
+            $patient, $amountRials, WalletTransaction::TYPE_DEBIT, $current - $amountRials, $actor,
+            $description !== null && $description !== '' ? $description : 'برداشت از کیف پول',
+            $paymentMethod, $reference,
+        );
+    }
+
+    /**
+     * تسویهٔ یک مراجعه از کیف پول: مبلغِ نهاییِ سهمِ بیمار را به‌صورت debit کسر
+     * می‌کند و دلیل را به نامِ سرویس‌ها و شناسهٔ مراجعه گره می‌زند. موجودیِ ناکافی → ۴۲۲.
+     */
+    public function settleSessionFromWallet(PatientSession $session, ?User $actor = null): WalletTransaction
+    {
+        $patient = $session->getRecord()->getUser();
+        $amount  = $session->getFinalPriceRials();
+
+        $names = array_values(array_filter(array_map(
+            fn(SessionService $s) => $s->toArray()['service_name'] ?? null,
+            $session->getServices()->toArray(),
+        )));
+        $label = $names !== [] ? implode('، ', $names) : 'ویزیت';
+
+        return $this->withdraw(
+            $patient, $amount, $actor,
+            'پرداخت سرویس: ' . $label,
+            'wallet',
+            'session:' . $session->getUuid(),
+        );
+    }
+
+    private function record(
+        User $patient,
+        int $amountRials,
+        string $type,
+        int $balanceAfter,
+        ?User $actor,
+        string $description,
+        ?string $paymentMethod,
+        ?string $reference,
+    ): WalletTransaction {
+        $txn = new WalletTransaction($patient, $amountRials, $type, $balanceAfter);
+        $txn->setDescription($description)
+            ->setCreatedBy($actor)
+            ->setCreatedByName($this->resolveActorName($actor))
+            ->setPaymentMethod($paymentMethod)
+            ->setReference($reference)
+            ->setStatus(WalletTransaction::STATUS_CONFIRMED);
+        $this->walletRepo->save($txn);
+
+        return $txn;
+    }
+}
diff --git a/tests/Patient/PatientFinancialsTest.php b/tests/Patient/PatientFinancialsTest.php
index 5904dbfd..3e6c27a8 100644
--- a/tests/Patient/PatientFinancialsTest.php
+++ b/tests/Patient/PatientFinancialsTest.php
@@ -155,6 +155,31 @@ class PatientFinancialsTest extends ApiTestCase
         self::assertSame(422, $this->responseCode());
     }
 
+    public function testChargeRecordsActingUserPaymentMethodAndStatus(): void
+    {
+        [$owner, $record] = $this->recordFor();
+
+        $res = $this->authJson('POST', '/api/v1/patient/' . $record->getUuid() . '/wallet/charge', $owner, [
+            'amount_rials' => 300000, 'payment_method' => 'card',
+        ]);
+        self::assertSame(201, $this->responseCode());
+        $txn = $res['data']['transaction'];
+        self::assertSame('card', $txn['payment_method']);
+        self::assertSame('confirmed', $txn['status']);
+        // بدون پروفایل → نامِ ثبت‌کننده = شماره موبایلِ کاربرِ عامل
+        self::assertSame($owner->getMobileNumber(), $txn['created_by_name']);
+    }
+
+    public function testChargeIgnoresUnknownPaymentMethod(): void
+    {
+        [$owner, $record] = $this->recordFor();
+        $res = $this->authJson('POST', '/api/v1/patient/' . $record->getUuid() . '/wallet/charge', $owner, [
+            'amount_rials' => 100000, 'payment_method' => 'bitcoin',
+        ]);
+        self::assertSame(201, $this->responseCode());
+        self::assertNull($res['data']['transaction']['payment_method']);
+    }
+
     public function testFinancialsAreOwnershipScoped(): void
     {
         [, $record] = $this->recordFor();
diff --git a/tests/Patient/PatientWalletSessionSettleTest.php b/tests/Patient/PatientWalletSessionSettleTest.php
new file mode 100644
index 00000000..d8d4276d
--- /dev/null
+++ b/tests/Patient/PatientWalletSessionSettleTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Tests\Patient;
+
+use App\Doctor\Entity\Doctor;
+use App\Patient\Entity\PatientRecord;
+use App\Patient\Entity\PatientSession;
+use App\Settlement\Entity\WalletTransaction;
+use App\Tests\ApiTestCase;
+
+/**
+ * تسویهٔ یک مراجعه (PatientSession) از کیف پول: PATCH /session/{uuid} با
+ * payment_method=wallet مبلغِ نهایی را به‌صورت debit از موجودی کسر می‌کند و در
+ * صورتِ ناکافی بودن موجودی رد می‌شود.
+ */
+class PatientWalletSessionSettleTest extends ApiTestCase
+{
+    /** @return array{0: \App\Auth\Entity\User, 1: PatientRecord, 2: \App\Auth\Entity\User} */
+    private function recordFor(): array
+    {
+        $owner  = $this->createUser(['ROLE_DOCTOR']);
+        $doctor = new Doctor($owner, 'دکتر');
+        $this->em->persist($doctor);
+        $this->em->flush();
+
+        $patient = $this->createUser(['ROLE_USER']);
+        $record  = new PatientRecord('doctor', $doctor->getId(), $patient, 'doctor', $doctor->getId());
+        $this->em->persist($record);
+        $this->em->flush();
+
+        return [$owner, $record, $patient];
+    }
+
+    private function sessionFor(PatientRecord $record, int $finalPriceRials): PatientSession
+    {
+        $session = new PatientSession($record);
+        $session->setFinalPriceRials($finalPriceRials);
+        $this->em->persist($session);
+        $this->em->flush();
+
+        return $session;
+    }
+
+    public function testSettleSessionFromWalletDebitsBalanceAndMarksPaid(): void
+    {
+        [$owner, $record, $patient] = $this->recordFor();
+        $this->em->persist(new WalletTransaction($patient, 1_000_000, 'credit', 1_000_000));
+        $this->em->flush();
+
+        $session = $this->sessionFor($record, 400_000);
+
+        $res = $this->authJson('PATCH', '/api/v1/session/' . $session->getUuid(), $owner, [
+            'payment_method' => 'wallet',
+        ]);
+        self::assertSame(200, $this->responseCode());
+        self::assertSame('wallet', $res['data']['payment_method']);
+        self::assertTrue($res['data']['is_paid']);
+
+        // موجودی از ۱٬۰۰۰٬۰۰۰ به ۶۰۰٬۰۰۰ رسید و یک تراکنشِ debitِ گره‌خورده به مراجعه ثبت شد.
+        $wallet = $this->authJson('GET', '/api/v1/patient/' . $record->getUuid() . '/wallet', $owner);
+        self::assertSame(600_000, $wallet['data']['balance_rials']);
+        $debit = $wallet['data']['recent_transactions'][0];
+        self::assertSame('debit', $debit['type']);
+        self::assertSame('wallet', $debit['payment_method']);
+        self::assertSame('session:' . $session->getUuid(), $debit['reference']);
+        self::assertSame($owner->getMobileNumber(), $debit['created_by_name']);
+    }
+
+    public function testSettleSessionFromWalletRejectedWhenInsufficient(): void
+    {
+        [$owner, $record, $patient] = $this->recordFor();
+        $this->em->persist(new WalletTransaction($patient, 100_000, 'credit', 100_000));
+        $this->em->flush();
+
+        $session = $this->sessionFor($record, 400_000);
+
+        $res = $this->authJson('PATCH', '/api/v1/session/' . $session->getUuid(), $owner, [
+            'payment_method' => 'wallet',
+        ]);
+        self::assertSame(422, $this->responseCode());
+        self::assertSame('ERR_WALLET_INSUFFICIENT', $res['errors'][0]['code']);
+
+        // مراجعه تسویه نشد و موجودی دست‌نخورده ماند.
+        $wallet = $this->authJson('GET', '/api/v1/patient/' . $record->getUuid() . '/wallet', $owner);
+        self::assertSame(100_000, $wallet['data']['balance_rials']);
+    }
+
+    public function testSettleSessionWithCashDoesNotTouchWallet(): void
+    {
+        [$owner, $record, $patient] = $this->recordFor();
+        $this->em->persist(new WalletTransaction($patient, 500_000, 'credit', 500_000));
+        $this->em->flush();
+
+        $session = $this->sessionFor($record, 300_000);
+
+        $this->authJson('PATCH', '/api/v1/session/' . $session->getUuid(), $owner, ['payment_method' => 'cash']);
+        self::assertSame(200, $this->responseCode());
+
+        $wallet = $this->authJson('GET', '/api/v1/patient/' . $record->getUuid() . '/wallet', $owner);
+        self::assertSame(500_000, $wallet['data']['balance_rials']);
+    }
+}