diff --git a/resources/js/Pages/Owner/Components/Header.jsx b/resources/js/Pages/Owner/Components/Header.jsx index 1b912b9..3da553f 100644 --- a/resources/js/Pages/Owner/Components/Header.jsx +++ b/resources/js/Pages/Owner/Components/Header.jsx @@ -1,5 +1,5 @@ import React, { useState, useRef, useEffect } from 'react'; -import { Search, Bell, ChevronDown, LogOut, User, Settings, Shield } from 'lucide-react'; +import { Search, ChevronDown, LogOut, User, Settings, Shield } from 'lucide-react'; export default function Header({ profile }) { const [isProfileOpen, setIsProfileOpen] = useState(false); @@ -49,10 +49,6 @@ export default function Header({ profile }) { {/* User Actions */}
-
setAdjustmentRemarks(e.target.value)} + maxLength={120} className="w-full bg-amber-50/30 border border-amber-100 py-1.5 px-3 rounded-lg text-xs font-bold text-gray-900 focus:outline-none focus:border-amber-300 transition-all resize-none shadow-sm min-h-[40px]" />
diff --git a/resources/js/Pages/Owner/Staff/View.jsx b/resources/js/Pages/Owner/Staff/View.jsx index 70d3727..064dbf8 100644 --- a/resources/js/Pages/Owner/Staff/View.jsx +++ b/resources/js/Pages/Owner/Staff/View.jsx @@ -269,7 +269,7 @@ export default function StaffView({ id }) {
- {staff.designation || 'N/A'} + {staff.role || staff.designation || 'N/A'}
@@ -323,7 +323,7 @@ export default function StaffView({ id }) {

Designation

- {staff.designation || 'N/A'} + {staff.role || staff.designation || 'N/A'}
@@ -554,7 +554,12 @@ export default function StaffView({ id }) { payments.slice(0, 3).map((p) => ( {p.payment_date} - {p.payment_type} + + {p.payment_type} + {p.payment_type === 'Salary Settlement' && p.settlement_month && ( + ({p.settlement_month}) + )} + {(parseFloat(p.amount) || 0).toLocaleString()} AED {p.status} @@ -1106,7 +1111,12 @@ export default function StaffView({ id }) { {payments.map((p) => ( {p.payment_date} - {p.payment_type} + + {p.payment_type} + {p.payment_type === 'Salary Settlement' && p.settlement_month && ( + ({p.settlement_month}) + )} + {(parseFloat(p.amount) || 0).toLocaleString()} AED {p.status} diff --git a/resources/js/Pages/Receptionist/POS.jsx b/resources/js/Pages/Receptionist/POS.jsx index f234cd8..ef2f426 100644 --- a/resources/js/Pages/Receptionist/POS.jsx +++ b/resources/js/Pages/Receptionist/POS.jsx @@ -359,6 +359,7 @@ export default function POS() { placeholder="Why is adjusted?" value={adjustmentRemarks} onChange={(e) => setAdjustmentRemarks(e.target.value)} + maxLength={120} className="w-full bg-amber-50/30 border border-amber-100 py-1.5 px-3 rounded-lg text-xs font-bold text-gray-900 focus:outline-none focus:border-amber-300 transition-all resize-none shadow-sm min-h-[40px]" />