feat(payment): fix zibal refund api, add maskable fields, receipt modal, standardized buttons and order refund options
Deploy Canina / deploy (push) Successful in 41s

This commit is contained in:
parsa aghaei committed 2026-08-22 17:01:13 +03:30
1 parent f9e40564cf
commit d62787cd99
22 files changed
+10934 -9318

No files matched your search

@@ -0,0 +1,235 @@
import React from 'react';
import { Printer, X, CheckCircle2, ShieldCheck, Copy } from 'lucide-react';
import { toast } from 'react-hot-toast';
import Button from './ui/Button';
export interface TransactionReceiptData {
trackId?: string | number;
refNumber?: string | number;
amountRials?: number | string;
amountTomans?: number | string;
statusText?: string;
orderNumber?: string;
orderId?: string;
cardNumber?: string;
paidAt?: string;
createdAt?: string;
fee?: number | string;
mobile?: string;
description?: string;
psp?: string;
ip?: string;
}
interface TransactionReceiptModalProps {
isOpen: boolean;
onClose: () => void;
data: TransactionReceiptData | null;
}
export default function TransactionReceiptModal({
isOpen,
onClose,
data,
}: TransactionReceiptModalProps) {
if (!isOpen || !data) return null;
const handlePrint = () => {
window.print();
};
const handleCopy = (text: string, label: string) => {
if (!text) return;
navigator.clipboard.writeText(text);
toast.success(`${label} کپی شد`);
};
const rials =
data.amountRials !== undefined
? Number(data.amountRials)
: (Number(data.amountTomans || 0) * 10);
const tomans =
data.amountTomans !== undefined
? Number(data.amountTomans)
: Math.floor(Number(data.amountRials || 0) / 10);
return (
<div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm print:p-0 print:bg-white">
<div className="bg-white rounded-3xl max-w-sm w-full shadow-2xl border border-gray-100 overflow-hidden print:border-none print:shadow-none font-vazir" dir="rtl">
{/* Modal Header */}
<div className="p-4 border-b border-gray-100 flex items-center justify-between print:hidden">
<h3 className="font-black text-sm text-gray-900 flex items-center gap-1.5">
<ShieldCheck className="w-4 h-4 text-emerald-600" />
<span>رسید تراکنش {data.trackId || ''}</span>
</h3>
<button
onClick={onClose}
className="text-gray-400 hover:text-gray-700 font-bold p-1 cursor-pointer"
>
<X className="w-5 h-5" />
</button>
</div>
{/* The Zigzag Receipt Slip (Matching Zibal screenshot exactly) */}
<div className="p-6 space-y-5 bg-white relative">
{/* Top Jagged Border (CSS Jagged effect) */}
<div className="w-full h-3 bg-indigo-50/50 -mt-6 mb-3 flex justify-between overflow-hidden opacity-60">
{Array.from({ length: 24 }).map((_, i) => (
<div
key={i}
className="w-0 h-0 border-l-[6px] border-l-transparent border-r-[6px] border-r-transparent border-t-[8px] border-t-white"
/>
))}
</div>
{/* Amount Display */}
<div className="text-center space-y-1">
<div className="text-2xl font-black text-emerald-600 font-mono">
{rials.toLocaleString('fa-IR')}{' '}
<span className="text-sm font-black text-emerald-700">ریال</span>
</div>
<p className="text-[11px] font-bold text-gray-400 font-mono">
({tomans.toLocaleString('fa-IR')} تومان)
</p>
</div>
{/* Data List (Aligned exactly like Zibal slip) */}
<div className="space-y-2.5 text-xs">
{/* Track ID */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<button
type="button"
onClick={() => handleCopy(String(data.trackId || ''), 'شماره تراکنش')}
className="text-indigo-600 hover:text-indigo-800 flex items-center gap-1 font-mono font-bold cursor-pointer"
title="کپی"
>
<Copy className="w-3 h-3" />
<span>{data.trackId || '-'}</span>
</button>
<span className="text-gray-500 font-bold">شماره تراکنش</span>
</div>
{/* Reference Number */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<button
type="button"
onClick={() => handleCopy(String(data.refNumber || ''), 'شناسه مرجع')}
className="text-indigo-600 hover:text-indigo-800 flex items-center gap-1 font-mono font-bold cursor-pointer"
title="کپی"
>
<Copy className="w-3 h-3" />
<span>{data.refNumber || '-'}</span>
</button>
<span className="text-gray-500 font-bold">شناسه مرجع</span>
</div>
{/* Paid At */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<span className="font-mono text-gray-700 font-bold dir-ltr">
{data.paidAt || data.createdAt || '-'}
</span>
<span className="text-gray-500 font-bold">تاریخ پرداخت</span>
</div>
{/* Status */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<span className="text-emerald-600 font-black flex items-center gap-1">
<span className="w-2 h-2 rounded-full bg-emerald-500 inline-block"></span>
<span>{data.statusText || 'پرداخت موفق'}</span>
</span>
<span className="text-gray-500 font-bold">وضعیت</span>
</div>
{/* Order ID */}
<div className="flex items-center justify-between py-1.5 px-2 bg-gray-50/80 rounded-lg">
<span className="font-mono font-bold text-gray-900">
{data.orderNumber || data.orderId || '-'}
</span>
<span className="text-gray-500 font-bold">شناسه سفارش</span>
</div>
{/* Card Number */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<span className="font-mono text-gray-800 font-bold dir-ltr">
{data.cardNumber || '-'}
</span>
<span className="text-gray-500 font-bold">شماره کارت</span>
</div>
{/* Creation Date */}
<div className="flex items-center justify-between py-1.5 px-2 bg-gray-50/80 rounded-lg">
<span className="font-mono font-bold text-gray-700 dir-ltr">
{data.createdAt || data.paidAt || '-'}
</span>
<span className="text-gray-500 font-bold">تاریخ ایجاد</span>
</div>
{/* Mobile */}
<div className="flex items-center justify-between py-1.5 px-2 bg-gray-50/80 rounded-lg">
<span className="font-mono font-bold text-gray-800 dir-ltr">
{data.mobile || '-'}
</span>
<span className="text-gray-500 font-bold">شماره موبایل</span>
</div>
{/* Description */}
<div className="flex items-center justify-between py-1 border-b border-gray-50">
<span className="text-gray-800 font-bold max-w-[180px] truncate text-left">
{data.description || 'پرداخت آنلاین - پت شاپ کنینا'}
</span>
<span className="text-gray-500 font-bold">توضیحات</span>
</div>
{/* PSP */}
<div className="flex items-center justify-between py-1.5 px-2 bg-gray-50/80 rounded-lg">
<span className="font-bold text-indigo-700 text-[11px]">
{data.psp || 'زیبال / به‌پرداخت ملت'}
</span>
<span className="text-gray-500 font-bold">PSP</span>
</div>
{/* Real IP */}
<div className="flex items-center justify-between py-1">
<button
type="button"
onClick={() => handleCopy(String(data.ip || ''), 'آی‌پی کاربر')}
className="text-indigo-600 hover:text-indigo-800 flex items-center gap-1 font-mono font-bold cursor-pointer dir-ltr"
title="کپی آی‌پی"
>
<Copy className="w-3 h-3" />
<span>{data.ip || '-'}</span>
</button>
<span className="text-gray-500 font-bold">IP</span>
</div>
</div>
{/* Bottom Jagged Border */}
<div className="w-full h-3 bg-indigo-50/50 -mb-6 mt-4 flex justify-between overflow-hidden opacity-60">
{Array.from({ length: 24 }).map((_, i) => (
<div
key={i}
className="w-0 h-0 border-l-[6px] border-l-transparent border-r-[6px] border-r-transparent border-b-[8px] border-b-white"
/>
))}
</div>
</div>
{/* Actions / Print Footer */}
<div className="p-4 bg-gray-50/80 border-t border-gray-100 flex items-center justify-between print:hidden">
<Button variant="outline" size="sm" onClick={onClose}>
بستن
</Button>
<Button
variant="outline"
size="sm"
startIcon={Printer}
onClick={handlePrint}
className="border-gray-300 hover:border-indigo-600 text-indigo-600 hover:bg-indigo-50"
>
چاپ رسید
</Button>
</div>
</div>
</div>
);
}
@@ -0,0 +1,114 @@
import React from 'react';
import { Info } from 'lucide-react';
import Spinner from './Spinner';
export type ButtonVariant =
| 'primary'
| 'secondary'
| 'danger'
| 'success'
| 'warning'
| 'outline'
| 'ghost';
export type ButtonSize = 'xs' | 'sm' | 'md' | 'lg';
export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
variant?: ButtonVariant;
size?: ButtonSize;
isLoading?: boolean;
startIcon?: React.ComponentType<{ className?: string }>;
endIcon?: React.ComponentType<{ className?: string }>;
info?: string;
badge?: string | number;
fullWidth?: boolean;
}
export default function Button({
children,
variant = 'primary',
size = 'md',
isLoading = false,
startIcon: StartIcon,
endIcon: EndIcon,
info,
badge,
fullWidth = false,
className = '',
disabled,
...props
}: ButtonProps) {
// Base styles: strict whitespace-nowrap and touch-friendly cursor
const baseClasses =
'inline-flex items-center justify-center font-bold whitespace-nowrap transition-all select-none rounded-xl cursor-pointer disabled:opacity-50 disabled:cursor-not-allowed disabled:pointer-events-none focus:outline-none focus:ring-2 focus:ring-offset-2';
// Size styling
const sizeClasses: Record<ButtonSize, string> = {
xs: 'px-2.5 py-1 text-[11px] gap-1.5',
sm: 'px-3.5 py-1.5 text-xs gap-2',
md: 'px-4 py-2.5 text-xs sm:text-sm gap-2',
lg: 'px-6 py-3 text-sm sm:text-base gap-2.5 shadow-md',
};
// Variant styling
const variantClasses: Record<ButtonVariant, string> = {
primary:
'bg-indigo-600 hover:bg-indigo-700 text-white shadow-sm shadow-indigo-200 focus:ring-indigo-500 border border-indigo-600',
secondary:
'bg-slate-100 hover:bg-slate-200 text-slate-700 focus:ring-slate-400 border border-slate-200',
danger:
'bg-rose-600 hover:bg-rose-700 text-white shadow-sm shadow-rose-200 focus:ring-rose-500 border border-rose-600',
success:
'bg-emerald-600 hover:bg-emerald-700 text-white shadow-sm shadow-emerald-200 focus:ring-emerald-500 border border-emerald-600',
warning:
'bg-amber-500 hover:bg-amber-600 text-white shadow-sm shadow-amber-200 focus:ring-amber-400 border border-amber-500',
outline:
'bg-white hover:bg-gray-50 text-gray-700 border border-gray-300 focus:ring-indigo-500',
ghost:
'bg-transparent hover:bg-gray-100 text-gray-600 focus:ring-gray-300 border border-transparent',
};
const iconSizes: Record<ButtonSize, string> = {
xs: 'w-3 h-3',
sm: 'w-3.5 h-3.5',
md: 'w-4 h-4',
lg: 'w-5 h-5',
};
return (
<button
disabled={disabled || isLoading}
className={`
${baseClasses}
${sizeClasses[size]}
${variantClasses[variant]}
${fullWidth ? 'w-full' : ''}
${className}
`}
{...props}
>
{isLoading ? (
<Spinner size={size === 'lg' ? 'md' : 'sm'} />
) : (
<>
{StartIcon && <StartIcon className={iconSizes[size]} />}
{children && <span>{children}</span>}
{badge !== undefined && (
<span className="px-1.5 py-0.5 rounded-full text-[10px] bg-white/20 text-current font-mono">
{badge}
</span>
)}
{EndIcon && <EndIcon className={iconSizes[size]} />}
{info && (
<span
className="inline-flex items-center text-current/80 hover:text-current cursor-help ml-0.5"
title={info}
>
<Info className="w-3.5 h-3.5" />
</span>
)}
</>
)}
</button>
);
}
@@ -0,0 +1,96 @@
import React, { useState } from 'react';
import { Eye, EyeOff, Copy, Check } from 'lucide-react';
import { toast } from 'react-hot-toast';
interface MaskableFieldProps {
value?: string | number | null;
maskedValue?: string;
isMaskedByDefault?: boolean;
label?: string;
copyable?: boolean;
className?: string;
valueClassName?: string;
dir?: 'ltr' | 'rtl';
}
export default function MaskableField({
value,
maskedValue,
isMaskedByDefault = true,
label,
copyable = true,
className = '',
valueClassName = '',
dir = 'ltr',
}: MaskableFieldProps) {
const [isRevealed, setIsRevealed] = useState(!isMaskedByDefault);
const [copied, setCopied] = useState(false);
const rawVal = value !== undefined && value !== null ? String(value) : '';
// Create mask if not provided
const generateMask = (str: string) => {
if (!str) return '-';
if (str.length <= 4) return '****';
if (str.length === 16) {
// 16-digit Card: 6037-99**-****-1234
return `${str.slice(0, 4)}-${str.slice(4, 6)}**-****-${str.slice(12)}`;
}
const visibleStart = Math.min(4, Math.floor(str.length / 3));
const visibleEnd = Math.min(4, Math.floor(str.length / 3));
return `${str.slice(0, visibleStart)}${'*'.repeat(Math.max(4, str.length - visibleStart - visibleEnd))}${str.slice(-visibleEnd)}`;
};
const displayMasked = maskedValue || generateMask(rawVal);
const currentText = isRevealed ? (rawVal || '-') : displayMasked;
const handleCopy = (e: React.MouseEvent) => {
e.stopPropagation();
if (!rawVal) return;
navigator.clipboard.writeText(rawVal);
setCopied(true);
toast.success(`${label || 'مقدار'} در کلیپ‌بورد کپی شد`);
setTimeout(() => setCopied(false), 2000);
};
return (
<div className={`inline-flex items-center gap-1.5 ${className}`}>
<span
dir={dir}
className={`font-mono text-xs select-all ${valueClassName}`}
title={isRevealed ? 'مقدار واقعی' : 'مقدار پنهان‌شده'}
>
{currentText}
</span>
{rawVal && (
<div className="inline-flex items-center gap-1">
{/* Toggle Eye Button */}
<button
type="button"
onClick={(e) => {
e.stopPropagation();
setIsRevealed(!isRevealed);
}}
className="p-1 text-gray-400 hover:text-indigo-600 hover:bg-indigo-50 rounded-md transition-colors cursor-pointer"
title={isRevealed ? 'پنهان‌سازی' : 'نمایش مقدار اصلی'}
>
{isRevealed ? <EyeOff className="w-3.5 h-3.5" /> : <Eye className="w-3.5 h-3.5" />}
</button>
{/* Copy to Clipboard Button */}
{copyable && (
<button
type="button"
onClick={handleCopy}
className="p-1 text-gray-400 hover:text-emerald-600 hover:bg-emerald-50 rounded-md transition-colors cursor-pointer"
title="کپی در کلیپ‌بورد"
>
{copied ? <Check className="w-3.5 h-3.5 text-emerald-600" /> : <Copy className="w-3.5 h-3.5" />}
</button>
)}
</div>
)}
</div>
);
}
+213 -12
View File
@@ -22,12 +22,16 @@ import {
CreditCard,
ArrowUpDown,
ArrowUp,
ArrowDown
ArrowDown,
Undo2,
Wallet,
} from 'lucide-react';
import { toast } from 'react-hot-toast';
import api from '../services/api';
import Skeleton from '../components/ui/Skeleton';
import Spinner from '../components/ui/Spinner';
import Pagination from '../components/ui/Pagination';
import Button from '../components/ui/Button';
export interface OrderItem {
id?: string;
@@ -269,16 +273,79 @@ export default function Orders() {
setIsSavingTracking(true);
await api.put(`/admin/orders/${selectedOrder.id}/status`, {
status: modalStatus,
trackingNumber: modalTrackingCode
trackingNumber: modalTrackingCode,
});
await fetchOrders();
toast.success('تغییرات سفارش با موفقیت ذخیره شد');
} catch (err) {
console.error('Failed to save tracking number', err);
toast.error('خطا در ذخیره تغییرات سفارش');
} finally {
setIsSavingTracking(false);
}
};
// Refund Order State & Handlers
const [refundModalOrder, setRefundModalOrder] = useState<Order | null>(null);
const [refundTarget, setRefundTarget] = useState<'wallet' | 'zibal'>('wallet');
const [refundAmount, setRefundAmount] = useState<string>('');
const [refundReason, setRefundReason] = useState<string>('');
const [isProcessingRefund, setIsProcessingRefund] = useState(false);
const openOrderRefundModal = (order: Order) => {
setRefundModalOrder(order);
const amt = Number(order.totalAmount || order.total || 0);
setRefundAmount(String(amt));
// If order was paid by wallet, default to wallet. If online, let admin choose.
setRefundTarget(order.paymentMethod === 'wallet' ? 'wallet' : 'zibal');
setRefundReason(`استرداد سفارش #${order.trackingNumber || order.id.slice(0, 8)}`);
};
const handleExecuteOrderRefund = async () => {
if (!refundModalOrder) return;
try {
setIsProcessingRefund(true);
if (refundTarget === 'wallet') {
const res = await api.post(`/admin/orders/${refundModalOrder.id}/refund-wallet`, {
amount: refundAmount ? Number(refundAmount) : undefined,
reason: refundReason,
});
toast.success(res.data?.message || 'مبلغ با موفقیت به کیف پول کاربر عودت داده شد.');
setRefundModalOrder(null);
await fetchOrders();
} else {
// Find transaction trackId if exists
const tx = refundModalOrder.paymentTransactions?.[0];
const trackId = tx?.trackId;
if (!trackId) {
toast.error('شماره تراکنش زیبال (Track ID) برای این سفارش یافت نشد. لطفاً از گزینه کیف پول استفاده کنید.');
return;
}
const res = await api.post('/payment/admin/refund', {
trackId,
amount: refundAmount ? Number(refundAmount) * 10 : undefined,
tryReverse: true,
description: refundReason || `استرداد وجه سفارش #${refundModalOrder.trackingNumber || refundModalOrder.id.slice(0, 8)}`,
});
if (res.data?.result === 1 || res.data?.status === 1 || res.data?.success) {
toast.success('درخواست استرداد وجه به درگاه زیبال با موفقیت ارسال شد.');
// Also mark order as cancelled
await api.put(`/admin/orders/${refundModalOrder.id}/status`, { status: 'cancelled' });
setRefundModalOrder(null);
await fetchOrders();
} else {
toast.error(res.data?.message || 'خطا در ارسال استرداد وجه به زیبال');
}
}
} catch (err: any) {
toast.error(err?.response?.data?.message || 'خطا در انجام عملیات استرداد وجه');
} finally {
setIsProcessingRefund(false);
}
};
const handlePrintInvoice = (orderToPrint: Order) => {
if (!orderToPrint) return;
const printWindow = window.open('', '_blank');
@@ -649,24 +716,37 @@ export default function Orders() {
</select>
</td>
<td className="py-4 px-6">
<div className="flex items-center justify-center gap-2">
<div className="flex items-center justify-center gap-1.5">
<button
onClick={() => openOrderModal(order)}
className="text-purple-600 hover:bg-purple-50 p-2 rounded-xl transition-colors flex items-center gap-1 font-bold text-xs"
className="text-purple-600 hover:bg-purple-50 p-2 rounded-xl transition-colors flex items-center gap-1 font-bold text-xs cursor-pointer"
title="مشاهده فاکتور و جزئیات کامل"
disabled={isProcessing}
>
<Eye className="w-4 h-4" />
<span>جزئیات</span>
</button>
<button
onClick={() => handlePrintInvoice(order)}
className="text-gray-600 hover:bg-gray-100 p-2 rounded-xl transition-colors"
className="text-gray-600 hover:bg-gray-100 p-2 rounded-xl transition-colors cursor-pointer"
title="چاپ فوری فاکتور رسمی"
disabled={isProcessing}
>
<Printer className="w-4 h-4" />
</button>
{(order.status === 'cancelled' || order.status === 'pending_payment') && (
<button
onClick={() => openOrderRefundModal(order)}
className="text-rose-600 hover:bg-rose-50 p-2 rounded-xl transition-colors flex items-center gap-1 font-bold text-xs cursor-pointer"
title="استرداد وجه به کاربر (کیف پول / شاپرک)"
disabled={isProcessing}
>
<Undo2 className="w-4 h-4" />
<span>استرداد</span>
</button>
)}
</div>
</td>
</tr>
@@ -886,21 +966,142 @@ export default function Orders() {
</div>
{/* Modal Footer */}
<div className="p-6 bg-gray-50 border-t border-gray-200 flex gap-4 shrink-0">
<button
<div className="p-6 bg-gray-50 border-t border-gray-200 flex flex-wrap gap-3 shrink-0">
<Button
variant="primary"
startIcon={Download}
onClick={() => handlePrintInvoice(selectedOrder)}
className="flex-1 py-3.5 bg-purple-600 text-white rounded-xl font-black text-sm flex items-center justify-center gap-2 hover:bg-purple-700 transition-all shadow-lg shadow-purple-600/20"
className="flex-1"
>
<Download className="w-4 h-4" />
دانلود و چاپ فاکتور رسمی
</button>
<button
</Button>
{(selectedOrder.status === 'cancelled' || selectedOrder.status === 'pending_payment') && (
<Button
variant="danger"
startIcon={Undo2}
onClick={() => {
const ord = selectedOrder;
setSelectedOrder(null);
openOrderRefundModal(ord);
}}
>
استرداد وجه سفارش
</Button>
)}
<Button
variant="secondary"
onClick={() => setSelectedOrder(null)}
className="px-6 py-3.5 bg-white border border-gray-200 text-gray-700 rounded-xl font-bold text-sm hover:bg-gray-100 transition-all"
>
بستن
</Button>
</div>
</div>
</div>
)}
{/* Order Refund Modal (Wallet / Zibal Gateway) */}
{refundModalOrder && (
<div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm font-vazir" dir="rtl">
<div className="bg-white rounded-3xl w-full max-w-lg border border-gray-200 shadow-2xl p-6 sm:p-8 space-y-5">
<div className="flex items-center justify-between border-b border-gray-100 pb-4">
<h3 className="text-base font-black text-gray-900 flex items-center gap-2">
<Undo2 className="w-5 h-5 text-rose-600" />
استرداد وجه سفارش #{refundModalOrder.trackingNumber || refundModalOrder.id.slice(0, 8)}
</h3>
<button
onClick={() => setRefundModalOrder(null)}
className="text-gray-400 hover:text-gray-700 font-bold text-lg cursor-pointer"
>
✕
</button>
</div>
<div className="space-y-4 text-xs">
{/* Destination selector */}
<div>
<label className="block font-bold text-gray-700 mb-2">روش عودت و بازگشت وجه:</label>
<div className="grid grid-cols-2 gap-3">
<button
type="button"
onClick={() => setRefundTarget('wallet')}
className={`p-4 rounded-2xl border text-right transition-all cursor-pointer flex flex-col gap-1.5 ${
refundTarget === 'wallet'
? 'border-purple-600 bg-purple-50/60 ring-2 ring-purple-600/20'
: 'border-gray-200 hover:border-gray-300'
}`}
>
<div className="flex items-center gap-2 font-black text-gray-900">
<Wallet className="w-4 h-4 text-purple-600" />
<span>شارژ کیف پول کاربر</span>
</div>
<p className="text-[11px] text-gray-500 font-medium leading-relaxed">
افزایش فوری اعتبار کیف پول جهت خریدهای بعدی مشتری
</p>
</button>
<button
type="button"
onClick={() => setRefundTarget('zibal')}
className={`p-4 rounded-2xl border text-right transition-all cursor-pointer flex flex-col gap-1.5 ${
refundTarget === 'zibal'
? 'border-rose-600 bg-rose-50/60 ring-2 ring-rose-600/20'
: 'border-gray-200 hover:border-gray-300'
}`}
>
<div className="flex items-center gap-2 font-black text-gray-900">
<CreditCard className="w-4 h-4 text-rose-600" />
<span>استرداد شاپرک (زیبال)</span>
</div>
<p className="text-[11px] text-gray-500 font-medium leading-relaxed">
برگشت مستقیم به کارت بانکی مشتری از طریق درگاه پرداخت
</p>
</button>
</div>
</div>
<div>
<label className="block font-bold text-gray-700 mb-1">مبلغ استرداد به تومان</label>
<input
type="number"
value={refundAmount}
onChange={(e) => setRefundAmount(e.target.value)}
placeholder="مبلغ استرداد"
className="w-full border border-gray-200 rounded-xl p-3 font-mono outline-none focus:ring-2 focus:ring-purple-500 font-bold"
dir="ltr"
/>
</div>
<div>
<label className="block font-bold text-gray-700 mb-1">علت استرداد</label>
<textarea
rows={2}
value={refundReason}
onChange={(e) => setRefundReason(e.target.value)}
placeholder="علت لغو سفارش یا مرجوعی کالا..."
className="w-full border border-gray-200 rounded-xl p-3 outline-none focus:ring-2 focus:ring-purple-500"
/>
</div>
<div className="flex justify-end gap-3 pt-3 border-t border-gray-100">
<Button
variant="outline"
size="sm"
onClick={() => setRefundModalOrder(null)}
>
انصراف
</Button>
<Button
variant={refundTarget === 'wallet' ? 'primary' : 'danger'}
size="sm"
isLoading={isProcessingRefund}
onClick={handleExecuteOrderRefund}
>
{refundTarget === 'wallet' ? 'تایید و افزایش اعتبار کیف پول' : 'ارسال درخواست استرداد به زیبال'}
</Button>
</div>
</div>
</div>
</div>
)}
+203 -46
View File
@@ -25,11 +25,15 @@ import {
Code,
Send,
Undo2,
Printer,
} from 'lucide-react';
import { toast } from 'react-hot-toast';
import api from '../services/api';
import Spinner from '../components/ui/Spinner';
import Pagination from '../components/ui/Pagination';
import Button from '../components/ui/Button';
import MaskableField from '../components/ui/MaskableField';
import TransactionReceiptModal, { type TransactionReceiptData } from '../components/TransactionReceiptModal';
interface Transaction {
id: string;
@@ -114,8 +118,13 @@ export default function Transactions() {
const [liveInquiryData, setLiveInquiryData] = useState<any>(null);
const [showRawLogs, setShowRawLogs] = useState(false);
// Refund Modal State
// Receipt Modal State
const [receiptModalOpen, setReceiptModalOpen] = useState(false);
const [receiptData, setReceiptData] = useState<TransactionReceiptData | null>(null);
// Refund Modal State & Confirmation
const [refundModalOpen, setRefundModalOpen] = useState(false);
const [refundConfirmOpen, setRefundConfirmOpen] = useState(false);
const [refundForm, setRefundForm] = useState({
trackId: '',
amount: '',
@@ -125,6 +134,32 @@ export default function Transactions() {
});
const [isSubmittingRefund, setIsSubmittingRefund] = useState(false);
const openReceiptModal = (tx: Transaction) => {
setReceiptData({
trackId: tx.trackId || '-',
refNumber: tx.refNumber || '-',
amountTomans: tx.amount,
amountRials: tx.amountRials || Number(tx.amount) * 10,
statusText: tx.status === 'VERIFIED' ? 'پرداخت موفق' : tx.status === 'PENDING' ? 'در انتظار پرداخت' : 'ناموفق',
orderNumber: tx.order?.orderNumber || (tx.orderId ? `سفارش ${tx.orderId.slice(0, 8)}` : '-'),
orderId: tx.orderId || undefined,
cardNumber: tx.cardNumber || '-',
paidAt: tx.paidAt ? new Date(tx.paidAt).toLocaleDateString('fa-IR') : undefined,
createdAt: new Date(tx.createdAt).toLocaleDateString('fa-IR', {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
}),
mobile: tx.user?.mobile || '-',
description: tx.description || 'پرداخت سفارش آنلاین کنینا',
psp: tx.gateway === 'zibal' ? 'زیبال / به‌پرداخت ملت' : tx.gateway,
ip: tx.ipAddress || '-',
});
setReceiptModalOpen(true);
};
const openRefundModal = (tx: Transaction) => {
setRefundForm({
trackId: tx.trackId || '',
@@ -136,8 +171,7 @@ export default function Transactions() {
setRefundModalOpen(true);
};
const handleRefundSubmit = async (e: React.FormEvent) => {
e.preventDefault();
const executeRefund = async () => {
if (!refundForm.trackId) {
toast.error('شناسه تراکنش (Track ID) الزامی است');
return;
@@ -154,6 +188,7 @@ export default function Transactions() {
if (res.data?.result === 1 || res.data?.status === 1 || res.data?.success) {
toast.success(res.data?.message || 'درخواست استرداد وجه با موفقیت به زیبال ارسال شد.');
setRefundConfirmOpen(false);
setRefundModalOpen(false);
fetchTransactions();
fetchStats();
@@ -167,6 +202,16 @@ export default function Transactions() {
}
};
const handleRefundSubmit = (e: React.FormEvent) => {
e.preventDefault();
if (!refundForm.trackId) {
toast.error('شناسه تراکنش (Track ID) الزامی است');
return;
}
// Open confirmation prompt modal
setRefundConfirmOpen(true);
};
const fetchStats = async () => {
try {
const res = await api.get('/payment/admin/stats');
@@ -656,12 +701,20 @@ export default function Transactions() {
setLiveInquiryData(null);
setShowRawLogs(false);
}}
className="p-2 bg-gray-100 hover:bg-purple-50 text-gray-600 hover:text-purple-600 rounded-xl transition-all"
className="p-2 bg-gray-100 hover:bg-purple-50 text-gray-600 hover:text-purple-600 rounded-xl transition-all cursor-pointer"
title="مشاهده جزئیات و عیب‌یابی"
>
<Eye className="w-4 h-4" />
</button>
<button
onClick={() => openReceiptModal(tx)}
className="p-2 bg-emerald-50 hover:bg-emerald-100 text-emerald-600 rounded-xl transition-all cursor-pointer"
title="رسید تراکنش و چاپ"
>
<Printer className="w-4 h-4" />
</button>
{tx.gateway === 'zibal' && tx.trackId && (
<button
onClick={() => {
@@ -757,31 +810,47 @@ export default function Transactions() {
<div>
<span className="text-gray-400 block font-medium">شناسه پیگیری (Track ID):</span>
<span className="font-mono font-bold text-gray-900 dir-ltr inline-block">
{selectedTx.trackId || 'ثبت نشده'}
</span>
<div className="mt-0.5">
<MaskableField
value={selectedTx.trackId}
isMaskedByDefault={false}
label="شناسه پیگیری"
/>
</div>
</div>
<div>
<span className="text-gray-400 block font-medium">شماره مرجع بانکی:</span>
<span className="font-mono font-bold text-gray-900 dir-ltr inline-block">
{selectedTx.refNumber || 'ثبت نشده'}
</span>
<div className="mt-0.5">
<MaskableField
value={selectedTx.refNumber}
isMaskedByDefault={false}
label="شماره مرجع بانکی"
/>
</div>
</div>
<div>
<span className="text-gray-400 block font-medium">شماره کارت ماسک شده:</span>
<span className="font-mono font-bold text-gray-900 dir-ltr inline-block">
{selectedTx.cardNumber || 'ثبت نشده'}
</span>
<span className="text-gray-400 block font-medium">شماره کارت:</span>
<div className="mt-0.5">
<MaskableField
value={selectedTx.cardNumber}
isMaskedByDefault={true}
label="شماره کارت"
/>
</div>
</div>
{selectedTx.ipAddress && (
<div>
<span className="text-gray-400 block font-medium">IP کلاینت:</span>
<span className="font-mono font-bold text-gray-700 dir-ltr inline-block">
{selectedTx.ipAddress}
</span>
<div className="mt-0.5">
<MaskableField
value={selectedTx.ipAddress}
isMaskedByDefault={false}
label="IP کلاینت"
/>
</div>
</div>
)}
@@ -893,59 +962,86 @@ export default function Transactions() {
{/* Modal Actions */}
<div className="flex items-center justify-between gap-3 pt-2">
<div className="flex items-center gap-2">
<div className="flex flex-wrap items-center gap-2">
<Button
type="button"
variant="outline"
size="sm"
startIcon={Printer}
onClick={() => {
const tx = selectedTx;
setSelectedTx(null);
openReceiptModal(tx);
}}
>
رسید و چاپ
</Button>
{selectedTx.gateway !== 'zibal' && selectedTx.gateway !== 'online' && selectedTx.status !== 'VERIFIED' && (
<button
<Button
type="button"
variant="success"
size="sm"
startIcon={CheckCircle2}
onClick={() => handleManualVerify(selectedTx.id)}
className="bg-emerald-600 hover:bg-emerald-700 text-white font-black px-4 py-2.5 rounded-xl text-xs flex items-center gap-1.5 shadow-md shadow-emerald-600/20 transition-all cursor-pointer"
>
<CheckCircle2 className="w-4 h-4" />
<span>تایید دستی واریز کارت به کارت</span>
</button>
تایید دستی کارت به کارت
</Button>
)}
{selectedTx.gateway !== 'zibal' && selectedTx.gateway !== 'online' && selectedTx.status === 'PENDING' && (
<button
<Button
type="button"
variant="outline"
size="sm"
startIcon={XCircle}
className="text-rose-600 border-rose-200 hover:bg-rose-50"
onClick={() => handleManualReject(selectedTx.id)}
className="bg-rose-50 hover:bg-rose-100 text-rose-700 border border-rose-200 font-bold px-4 py-2.5 rounded-xl text-xs flex items-center gap-1.5 transition-all cursor-pointer"
>
<XCircle className="w-4 h-4" />
<span>رد فیش کارت به کارت</span>
</button>
رد فیش
</Button>
)}
{selectedTx.gateway === 'zibal' && selectedTx.trackId && selectedTx.status === 'VERIFIED' && (
<button
<Button
type="button"
variant="danger"
size="sm"
startIcon={Undo2}
info="برگشت وجه به حساب یا کارت مشتری"
onClick={() => {
const tx = selectedTx;
setSelectedTx(null);
openRefundModal(tx);
}}
className="bg-rose-600 hover:bg-rose-700 text-white font-black px-4 py-2.5 rounded-xl text-xs flex items-center gap-1.5 shadow-md shadow-rose-600/20 transition-all cursor-pointer"
>
<Undo2 className="w-4 h-4" />
<span>استرداد وجه به مشتری (Refund / Reverse)</span>
</button>
استرداد وجه
</Button>
)}
</div>
<button
<Button
type="button"
variant="secondary"
size="sm"
onClick={() => {
setSelectedTx(null);
setLiveInquiryData(null);
setShowRawLogs(false);
}}
className="bg-gray-100 hover:bg-gray-200 text-gray-800 font-bold px-6 py-2.5 rounded-xl text-xs transition-colors cursor-pointer"
>
بستن
</button>
</Button>
</div>
</div>
</div>
)}
{/* Refund Submission Modal */}
{/* Transaction Receipt Modal */}
<TransactionReceiptModal
isOpen={receiptModalOpen}
onClose={() => setReceiptModalOpen(false)}
data={receiptData}
/>
{/* Refund Submission Form Modal */}
{refundModalOpen && (
<div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/50 backdrop-blur-sm">
<div className="bg-white rounded-3xl w-full max-w-lg border border-gray-200 shadow-2xl p-6 sm:p-8 space-y-6">
@@ -1025,26 +1121,87 @@ export default function Transactions() {
</div>
<div className="flex justify-end gap-3 pt-3">
<button
<Button
type="button"
variant="outline"
size="sm"
onClick={() => setRefundModalOpen(false)}
className="px-5 py-2.5 rounded-xl font-bold bg-gray-100 hover:bg-gray-200 text-gray-600 cursor-pointer"
>
انصراف
</button>
<button
</Button>
<Button
type="submit"
disabled={isSubmittingRefund}
className="bg-rose-600 hover:bg-rose-700 text-white font-bold px-6 py-2.5 rounded-xl transition-colors flex items-center gap-2 cursor-pointer shadow-md shadow-rose-200"
variant="danger"
size="sm"
startIcon={Send}
>
{isSubmittingRefund ? <Spinner size="sm" /> : <Send className="w-4 h-4" />}
<span>ارسال استرداد وجه به زیبال</span>
</button>
بررسی و تایید نهایی استرداد
</Button>
</div>
</form>
</div>
</div>
)}
{/* Confirmation Modal Before Sending Refund */}
{refundConfirmOpen && (
<div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm">
<div className="bg-white rounded-3xl w-full max-w-md border border-gray-200 shadow-2xl p-6 sm:p-8 space-y-6 font-vazir" dir="rtl">
<div className="flex items-center gap-3 text-rose-600">
<div className="w-12 h-12 bg-rose-50 rounded-2xl flex items-center justify-center">
<AlertTriangle className="w-6 h-6" />
</div>
<div>
<h3 className="text-base font-black text-gray-900">تایید عملیات استرداد وجه شاپرک</h3>
<p className="text-xs text-gray-500 mt-0.5">آیا از ارسال درخواست استرداد زیر به زیبال اطمینان دارید؟</p>
</div>
</div>
<div className="bg-rose-50/60 border border-rose-100 rounded-2xl p-4 space-y-2 text-xs">
<div className="flex justify-between">
<span className="text-gray-500 font-bold">شماره تراکنش:</span>
<span className="font-mono font-black text-gray-900">{refundForm.trackId}</span>
</div>
<div className="flex justify-between">
<span className="text-gray-500 font-bold">مبلغ استرداد:</span>
<span className="font-mono font-black text-rose-700">
{refundForm.amount ? `${Number(refundForm.amount).toLocaleString('fa-IR')} تومان` : 'کل مبلغ تراکنش'}
</span>
</div>
{refundForm.cardNumber && (
<div className="flex justify-between">
<span className="text-gray-500 font-bold">کارت مقصد:</span>
<span className="font-mono font-bold text-gray-800">{refundForm.cardNumber}</span>
</div>
)}
<div className="flex justify-between">
<span className="text-gray-500 font-bold">روش بازگشت:</span>
<span className="font-bold text-gray-900">
{refundForm.tryReverse ? 'برگشت آنی شاپرک (Reverse)' : 'واریز پایا بانکی (Refund)'}
</span>
</div>
</div>
<div className="flex justify-end gap-3 pt-2">
<Button
variant="outline"
size="sm"
onClick={() => setRefundConfirmOpen(false)}
>
بازگشت و ویرایش
</Button>
<Button
variant="danger"
size="sm"
isLoading={isSubmittingRefund}
onClick={executeRefund}
>
تایید قطعی و ارسال به زیبال
</Button>
</div>
</div>
</div>
)}
</div>
);
}
@@ -319,53 +319,53 @@ export default function ZibalPortalPage() {
</div>
{/* Main Feature Tabs (Matching Zibal Panel layout) */}
<div className="bg-white p-2 rounded-2xl shadow-sm border border-gray-200 flex items-center justify-between overflow-x-auto gap-2">
<div className="flex items-center gap-2">
<div className="bg-white p-2 rounded-2xl shadow-sm border border-gray-200 flex items-center justify-between overflow-x-auto gap-2 no-scrollbar">
<div className="flex items-center gap-2 shrink-0">
<button
onClick={() => setActiveMainTab('refunds')}
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer ${
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer whitespace-nowrap ${
activeMainTab === 'refunds'
? 'bg-indigo-600 text-white shadow-md shadow-indigo-200'
: 'text-gray-600 hover:bg-gray-100'
}`}
>
<RotateCcw className="w-4 h-4" />
<RotateCcw className="w-4 h-4 shrink-0" />
<span>استرداد وجه</span>
</button>
<button
onClick={() => setActiveMainTab('checkouts')}
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer ${
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer whitespace-nowrap ${
activeMainTab === 'checkouts'
? 'bg-indigo-600 text-white shadow-md shadow-indigo-200'
: 'text-gray-600 hover:bg-gray-100'
}`}
>
<CreditCard className="w-4 h-4" />
<CreditCard className="w-4 h-4 shrink-0" />
<span>گزارش واریز و تسویه</span>
</button>
<button
onClick={() => setActiveMainTab('queue')}
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer ${
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer whitespace-nowrap ${
activeMainTab === 'queue'
? 'bg-indigo-600 text-white shadow-md shadow-indigo-200'
: 'text-gray-600 hover:bg-gray-100'
}`}
>
<ListOrdered className="w-4 h-4" />
<ListOrdered className="w-4 h-4 shrink-0" />
<span>صف تسویه</span>
</button>
<button
onClick={() => setActiveMainTab('gateway_transactions')}
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer ${
className={`px-5 py-2.5 rounded-xl font-black text-xs sm:text-sm transition-all flex items-center gap-2 cursor-pointer whitespace-nowrap ${
activeMainTab === 'gateway_transactions'
? 'bg-indigo-600 text-white shadow-md shadow-indigo-200'
: 'text-gray-600 hover:bg-gray-100'
}`}
>
<TrendingUp className="w-4 h-4" />
<TrendingUp className="w-4 h-4 shrink-0" />
<span>تراکنش‌های درگاه (IPG)</span>
</button>
</div>