Update
This commit is contained in:
@@ -26,6 +26,7 @@ class ApotekController extends Controller
|
||||
$results = DB::connection('oldlms')->table('tx_prescriptions')
|
||||
->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID')
|
||||
->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser')
|
||||
->where('tx_prescription_orders.nIDApotek', '=', auth()->user()->organization_id)
|
||||
->when($request->input('search'), function ($query, $search) {
|
||||
$query->where(function ($query) use ($search) {
|
||||
$query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%")
|
||||
|
||||
@@ -47,7 +47,7 @@ export default function NotificationsPopover() {
|
||||
};
|
||||
useEffect(() => {
|
||||
getDataNotifications();
|
||||
}, []);
|
||||
}, []);
|
||||
|
||||
const totalUnRead = notifications.filter((item) => item.isUnRead === 1).length;
|
||||
|
||||
@@ -137,7 +137,7 @@ export default function NotificationsPopover() {
|
||||
</List>
|
||||
</>
|
||||
): ''}
|
||||
|
||||
|
||||
</Scrollbar>
|
||||
|
||||
<Divider sx={{ borderStyle: 'dashed' }} />
|
||||
@@ -256,12 +256,12 @@ function renderContent(notification: NotificationItemProps) {
|
||||
title,
|
||||
};
|
||||
}
|
||||
if (notification.type === 'mail' || notification.type === 'request_document') {
|
||||
if (notification.type === 'mail' || notification.type === 'request_document' || notification.type === 'grab_status') {
|
||||
return {
|
||||
avatar: (
|
||||
<img
|
||||
alt={notification.title}
|
||||
src="https://minimal-assets-api.vercel.app/assets/icons/ic_notification_mail.svg"
|
||||
src="/icons/ic_mail.svg"
|
||||
/>
|
||||
),
|
||||
title,
|
||||
|
||||
Reference in New Issue
Block a user