fix(services): restore separate insurance modal + fix ⋮ menu position
- revert the previous merge of insurance coverage into the service edit modal (per user): 'پوشش بیمه' is again a ⋮ menu action opening its own ServiceInsuranceModal, kept within the services page - delete the inline ServiceInsuranceSection; restore ServiceInsuranceModal - fix ⋮ dropdown position: left:8 → insetInlineStart:8 so the menu anchors under the ⋮ button (which sits at inline-start/right in RTL) instead of the opposite side - keep the --primary-subtle → --primary-soft token fix in the modal - test: assert the ⋮ menu exposes ویرایش / تعرفههای سالانه / پوشش بیمه Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
+29
-34
@@ -3,6 +3,7 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
|
||||
import { ShieldCheckIcon, CheckIcon } from '@heroicons/react/24/outline';
|
||||
import { toast } from 'sonner';
|
||||
import { api } from '../lib/api';
|
||||
import Modal from './ui/Modal';
|
||||
import PriceInput from './ui/PriceInput';
|
||||
import type { ServiceItem } from '../types';
|
||||
|
||||
@@ -129,7 +130,7 @@ function ContractCard({ contract, item }: { contract: TenantInsurance; item: Ser
|
||||
type="number" min={0} max={100} dir="ltr" className="input"
|
||||
style={{ height: 40, textAlign: 'left' }}
|
||||
value={draft.coverage_percent ?? ''}
|
||||
placeholder="ارثی"
|
||||
placeholder="ارث"
|
||||
onChange={(e) => setDraft((d) => ({ ...d, coverage_percent: e.target.value === '' ? null : Number(e.target.value) }))}
|
||||
/>
|
||||
</div>
|
||||
@@ -158,7 +159,7 @@ function ContractCard({ contract, item }: { contract: TenantInsurance; item: Ser
|
||||
</div>
|
||||
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 10, marginTop: 12 }}>
|
||||
<span style={{ fontSize: 11, color: 'var(--text-3)' }}>مقدار خالی از قرارداد بیمه ارث میبرد</span>
|
||||
<button type="button" className="btn primary sm" disabled={saveMut.isPending} onClick={() => saveMut.mutate()}>
|
||||
<button className="btn primary sm" disabled={saveMut.isPending} onClick={() => saveMut.mutate()}>
|
||||
{saveMut.isPending ? '...' : 'ذخیره'}
|
||||
</button>
|
||||
</div>
|
||||
@@ -171,7 +172,7 @@ function ContractCard({ contract, item }: { contract: TenantInsurance; item: Ser
|
||||
{!draft.covered && !isLoading && (
|
||||
<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: 10, padding: '12px 14px' }}>
|
||||
<span style={{ fontSize: 12, color: 'var(--text-3)' }}>این خدمت تحت این بیمه پوشش ندارد</span>
|
||||
<button type="button" className="btn sm" disabled={saveMut.isPending} onClick={() => saveMut.mutate()}>
|
||||
<button className="btn sm" disabled={saveMut.isPending} onClick={() => saveMut.mutate()}>
|
||||
{saveMut.isPending ? '...' : 'ذخیره'}
|
||||
</button>
|
||||
</div>
|
||||
@@ -180,47 +181,41 @@ function ContractCard({ contract, item }: { contract: TenantInsurance; item: Ser
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-insurer coverage editor for a single saved service item, rendered inline
|
||||
* inside the service edit modal (no dialog wrapper). Each contract saves on its
|
||||
* own; independent of the service item's own save button.
|
||||
*/
|
||||
export default function ServiceInsuranceSection({ item }: { item: ServiceItem }) {
|
||||
export default function ServiceInsuranceModal({ item, onClose }: { item: ServiceItem | null; onClose: () => void }) {
|
||||
const { data, isLoading } = useQuery<{ data: { data: TenantInsurance[] } }>({
|
||||
queryKey: ['tenant-insurances'],
|
||||
queryFn: () => api.get('/api/v1/billing/tenant-insurances'),
|
||||
enabled: !!item,
|
||||
});
|
||||
|
||||
const contracts = ((data as any)?.data?.data as TenantInsurance[] | undefined) ?? [];
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
|
||||
<div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
|
||||
<ShieldCheckIcon style={{ width: 17, color: 'var(--primary)' }} />
|
||||
<b style={{ fontSize: 14 }}>پوشش بیمه</b>
|
||||
</div>
|
||||
<div style={{
|
||||
display: 'flex', gap: 8, padding: '11px 13px', borderRadius: 'var(--r-sm)',
|
||||
background: 'var(--primary-soft)', fontSize: 12, color: 'var(--text-2)', lineHeight: 1.7,
|
||||
}}>
|
||||
<ShieldCheckIcon style={{ width: 16, flexShrink: 0, marginTop: 1, color: 'var(--primary)' }} />
|
||||
<span>درصد پوشش، فرانشیز و سقف هر بیمهگر برای این خدمت تعیین میشود. این تنظیمات مبنای محاسبهی سهم بیمار و ساخت مطالبات بیمه است.</span>
|
||||
</div>
|
||||
|
||||
{isLoading ? (
|
||||
<div className="muted" style={{ fontSize: 13, padding: '8px 0' }}>در حال بارگذاری...</div>
|
||||
) : contracts.length === 0 ? (
|
||||
<Modal open={!!item} onClose={onClose} title={`پوشش بیمه — ${item?.name ?? ''}`} size="md">
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 14 }}>
|
||||
<div style={{
|
||||
border: '2px dashed var(--border)', borderRadius: 'var(--r)',
|
||||
padding: '28px 16px', textAlign: 'center',
|
||||
display: 'flex', gap: 8, padding: '11px 13px', borderRadius: 'var(--r-sm)',
|
||||
background: 'var(--primary-soft)', fontSize: 12, color: 'var(--text-2)', lineHeight: 1.7,
|
||||
}}>
|
||||
<ShieldCheckIcon style={{ width: 32, margin: '0 auto 10px', display: 'block', opacity: 0.35 }} />
|
||||
<div style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-2)' }}>قرارداد بیمهی فعالی ندارید</div>
|
||||
<div style={{ fontSize: 12, color: 'var(--text-3)', marginTop: 4 }}>ابتدا از بخش بیمهها یک بیمه را فعال کنید.</div>
|
||||
<ShieldCheckIcon style={{ width: 16, flexShrink: 0, marginTop: 1, color: 'var(--primary)' }} />
|
||||
<span>درصد پوشش، فرانشیز و سقف هر بیمهگر برای این خدمت تعیین میشود. این تنظیمات مبنای محاسبهی سهم بیمار و ساخت مطالبات بیمه است.</span>
|
||||
</div>
|
||||
) : (
|
||||
contracts.map((c) => <ContractCard key={c.uuid} contract={c} item={item} />)
|
||||
)}
|
||||
</div>
|
||||
|
||||
{isLoading ? (
|
||||
<div className="muted" style={{ fontSize: 13, padding: '8px 0' }}>در حال بارگذاری...</div>
|
||||
) : contracts.length === 0 ? (
|
||||
<div style={{
|
||||
border: '2px dashed var(--border)', borderRadius: 'var(--r)',
|
||||
padding: '36px 16px', textAlign: 'center',
|
||||
}}>
|
||||
<ShieldCheckIcon style={{ width: 34, margin: '0 auto 10px', display: 'block', opacity: 0.35 }} />
|
||||
<div style={{ fontSize: 13, fontWeight: 600, color: 'var(--text-2)' }}>قرارداد بیمهی فعالی ندارید</div>
|
||||
<div style={{ fontSize: 12, color: 'var(--text-3)', marginTop: 4 }}>ابتدا از بخش بیمهها یک بیمه را فعال کنید.</div>
|
||||
</div>
|
||||
) : (
|
||||
item && contracts.map((c) => <ContractCard key={c.uuid} contract={c} item={item} />)
|
||||
)}
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user