tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ivan-sim
2024-10-17 14:35:42 +07:00
parent e4253756e4
commit 888a364a22
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/HospitalPortal/Http/Controllers/ApotekController.php
View File

@@ -51,7 +51,7 @@ class ApotekController extends Controller
$query->where('tx_prescriptions.dTanggalresep', '<', $start_date); $query->where('tx_prescriptions.dTanggalresep', '<', $start_date);
}); });
}) })
->when($request->input('status'), function ($query, $status) { ->when($request->input('status') && $request->input('status') != 'all', function ($query, $status) {
$query->where(function ($query) use ($status) { $query->where(function ($query) use ($status) {
$query->where('tx_prescription_orders.sStatus', '=', $status); $query->where('tx_prescription_orders.sStatus', '=', $status);
}); });

3
frontend/hospital-portal/src/sections/dashboardApotek/TableList.tsx
View File

@@ -335,7 +335,8 @@ export default function TableList() {
: Object.fromEntries([...searchParams.entries(), ['order', order], ['orderBy', orderBy]]); : Object.fromEntries([...searchParams.entries(), ['order', order], ['orderBy', orderBy]]);
const response = await axios.get(`/get-prescription-orders`, { const response = await axios.get(`/get-prescription-orders`, {
params: { ...parameters, type: 'prescription-orders' }, params: { ...parameters, search:searchText, order: order,
orderBy: orderBy, status:statusValue, type: 'prescription-orders' },
}); });
setDataTableData(response.data); setDataTableData(response.data);
setData( setData(