feat: dock PDP buy bar above mobile nav, redesign B2B modal to mobile-card layout, and implement full symptoms CRUD in backend & admin panel
Deploy Canina / deploy (push) Failing after 1m23s
Deploy Canina / deploy (push) Failing after 1m23s
This commit is contained in:
1 parent
8e4388c325
commit
c7b95b4d2b
7 files changed
+555
-69
No files matched your search
@@ -163,32 +163,107 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
||||
{/* Main Grid Area */}
|
||||
<div className="flex-1 flex flex-col bg-medical-gray-50 overflow-hidden">
|
||||
{/* Header & Search */}
|
||||
<div className="p-8 border-b border-medical-gray-200 flex flex-col md:flex-row md:items-center justify-between gap-6 bg-white">
|
||||
<div className="p-4 sm:p-6 md:p-8 border-b border-medical-gray-200 flex flex-col sm:flex-row sm:items-center justify-between gap-3 sm:gap-6 bg-white shrink-0">
|
||||
<div className="relative flex-1 max-w-md">
|
||||
<Search className="absolute right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||
<Search className="absolute right-3 sm:right-4 top-1/2 -translate-y-1/2 w-4 h-4 text-medical-gray-400" />
|
||||
<input
|
||||
type="text"
|
||||
placeholder="جستجوی کد کالا یا نام محصول..."
|
||||
value={searchQuery}
|
||||
onChange={e => setSearchQuery(e.target.value)}
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-2xl py-3 pr-11 pl-4 text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
||||
className="w-full bg-medical-gray-50 border border-medical-gray-200 rounded-xl sm:rounded-2xl py-2.5 sm:py-3 pr-9 sm:pr-11 pl-4 text-xs sm:text-sm focus:outline-none focus:ring-2 focus:ring-canina-blue/20"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={handleAddAll}
|
||||
disabled={totalItems === 0}
|
||||
className="bg-medical-gray-900 text-white px-8 py-3 rounded-2xl font-black text-sm flex items-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30"
|
||||
className="bg-medical-gray-900 text-white px-5 sm:px-8 py-2.5 sm:py-3 rounded-xl sm:rounded-2xl font-black text-xs sm:text-sm flex items-center justify-center gap-2 hover:bg-canina-blue transition-colors disabled:opacity-30 cursor-pointer shadow-md"
|
||||
>
|
||||
<ShoppingCart className="w-4 h-4" />
|
||||
افزودن کلی ({totalItems} عدد)
|
||||
<span>افزودن کلی ({toPersian(totalItems)} عدد)</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Table */}
|
||||
<div className="flex-1 overflow-y-auto p-8">
|
||||
{loadError && <p role="alert">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
||||
<div className="bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
||||
{/* Products Container */}
|
||||
<div className="flex-1 overflow-y-auto p-3 sm:p-6 md:p-8">
|
||||
{loadError && <p role="alert" className="text-red-500 font-bold text-xs p-4 bg-red-50 rounded-2xl mb-4">خطا در دریافت محصولات. لطفاً دوباره تلاش کنید.</p>}
|
||||
|
||||
{/* Mobile View: Clean Card Layout for each product */}
|
||||
<div className="md:hidden space-y-3">
|
||||
{filteredProducts.map(product => {
|
||||
const basePrice = product.priceValue || 0;
|
||||
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||
const wholesalePrice = prodWholesale
|
||||
? Number(prodWholesale)
|
||||
: Math.round(basePrice * (1 - wholesaleDiscountPercent / 100));
|
||||
const currentQty = quantities[product.id] || 0;
|
||||
|
||||
return (
|
||||
<div key={product.id} className="bg-white border border-medical-gray-200 rounded-2xl p-3.5 shadow-xs space-y-3">
|
||||
<div className="flex items-center gap-3">
|
||||
<div className="w-14 h-14 bg-medical-gray-50 rounded-xl p-1.5 shrink-0 border border-medical-gray-100 flex items-center justify-center">
|
||||
<SafeImage src={product.image} className="w-full h-full" imgClassName="object-contain" alt={product.name} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<h4 className="font-black text-xs text-medical-gray-900 leading-snug line-clamp-2">{product.name}</h4>
|
||||
<span className="text-[10px] font-mono text-medical-gray-400 block mt-0.5 dir-ltr text-right">کد: {product.artNo}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center justify-between border-t border-medical-gray-100 pt-2.5 text-xs">
|
||||
<div>
|
||||
<span className="text-[10px] text-medical-gray-400 block font-medium">تکفروشی</span>
|
||||
<span className="font-bold text-medical-gray-600 text-xs">{toPersian(basePrice.toLocaleString())} ت</span>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<span className="text-[10px] text-amber-600 block font-black">قیمت همکار B2B</span>
|
||||
{isWholesaleVerified ? (
|
||||
<span className="font-black text-amber-800 text-xs bg-amber-50 px-2 py-0.5 rounded-md border border-amber-200 inline-block">
|
||||
{toPersian(wholesalePrice.toLocaleString())} ت
|
||||
</span>
|
||||
) : (
|
||||
<span className="inline-flex items-center gap-1 text-[10px] font-bold text-gray-400 bg-gray-50 px-1.5 py-0.5 rounded">
|
||||
<Lock className="w-2.5 h-2.5" />
|
||||
تایید ادمین
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-1 bg-medical-gray-50 border border-medical-gray-200 rounded-xl p-1">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleQuantityChange(product.id, String(Math.max(0, currentQty - 1)))}
|
||||
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||
>
|
||||
-
|
||||
</button>
|
||||
<input
|
||||
type="number"
|
||||
min="0"
|
||||
value={currentQty || ""}
|
||||
onChange={(e) => handleQuantityChange(product.id, e.target.value)}
|
||||
placeholder="0"
|
||||
className="w-8 text-center bg-transparent font-mono font-black text-xs outline-none"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleQuantityChange(product.id, String(currentQty + 1))}
|
||||
className="w-7 h-7 flex items-center justify-center bg-white rounded-lg text-gray-700 font-bold text-sm shadow-xs active:bg-gray-100"
|
||||
>
|
||||
+
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* Desktop / Tablet View: Rich Table */}
|
||||
<div className="hidden md:block bg-white border border-medical-gray-200 rounded-3xl overflow-hidden shadow-sm">
|
||||
<table className="w-full text-right">
|
||||
<thead className="bg-medical-gray-50 border-b border-medical-gray-200">
|
||||
<tr>
|
||||
@@ -202,7 +277,6 @@ export default function B2BPortal({ onClose }: { onClose: () => void }) {
|
||||
<tbody className="divide-y divide-medical-gray-100">
|
||||
{filteredProducts.map(product => {
|
||||
const basePrice = product.priceValue || 0;
|
||||
// Priority 1: Specific product wholesalePrice, Priority 2: General settings percentage discount (default 30%)
|
||||
const wholesaleDiscountPercent = Number(useSettingsStore.getState().getText('B2B_DISCOUNT_PERCENT', '30')) || 30;
|
||||
const prodWholesale = (product as unknown as { wholesalePrice?: number }).wholesalePrice;
|
||||
const wholesalePrice = prodWholesale
|
||||
|
||||
@@ -1598,8 +1598,8 @@ export default function ProductPage({
|
||||
)}
|
||||
</AnimatePresence>
|
||||
|
||||
{/* Mobile Floating Sticky Bottom Buy Bar */}
|
||||
<div className="lg:hidden fixed bottom-0 left-0 right-0 z-50 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 p-3 pb-safe shadow-2xl flex items-center justify-between gap-3 font-vazir" dir="rtl">
|
||||
{/* Mobile Floating Sticky Bottom Buy Bar - Docked cleanly ABOVE MobileBottomNav */}
|
||||
<div className="lg:hidden fixed bottom-[65px] left-0 right-0 z-30 bg-white/95 backdrop-blur-md border-t border-medical-gray-200 px-3 py-2.5 shadow-[0_-4px_16px_rgba(0,0,0,0.08)] flex items-center justify-between gap-3 font-vazir" dir="rtl">
|
||||
{!isCatalogHidePrices ? (
|
||||
<div>
|
||||
<span className="text-[10px] text-medical-gray-400 font-bold block">قیمت نهایی</span>
|
||||
|
||||
Reference in new issue
Block a user