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-07 15:22:53 +07:00
parent 39bc02b224
commit 3fb8dbb091
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,9 @@ class ApotekController extends Controller
$results = DB::connection('oldlms')->table('tx_prescriptions') $results = DB::connection('oldlms')->table('tx_prescriptions')
->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID') ->join('tx_prescription_orders', 'tx_prescription_orders.nIDPrescription', '=', 'tx_prescriptions.nID')
->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser') ->join('tm_users', 'tm_users.nID', '=', 'tx_prescriptions.nIDUser')
->where('tx_prescription_orders.nIDApotek', '=', auth()->user()->organization_id) ->when(auth()->user()->organization_id, function ($query, $organizationId) {
$query->where('tx_prescription_orders.nIDApotek', '=', $organizationId);
})
->when($request->input('search'), function ($query, $search) { ->when($request->input('search'), function ($query, $search) {
$query->where(function ($query) use ($search) { $query->where(function ($query) use ($search) {
$query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%") $query->orWhere('tx_prescriptions.sKodeResep', 'like', "%" . $search . "%")

2
frontend/hospital-portal/src/components/Table.tsx
View File

@@ -230,7 +230,7 @@ export default function Table<T>({
const formattedRoleName = user?.role.name; const formattedRoleName = user?.role.name;
// List of statuses for 'apotek' // List of statuses for 'apotek'
const allowedStatusesForApotek = ['waiting_pharmacy', 'order_prepared']; const allowedStatusesForApotek = ['waiting_pharmacy', 'order_prepared'];
const allowedStatusesForCSLMS = ['ready', 'waiting_for_courir', 'package_picked_up', 'package_on_delivery']; const allowedStatusesForCSLMS = ['waiting_pharmacy', 'order_prepared', 'ready', 'waiting_for_courir', 'package_picked_up', 'package_on_delivery'];
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);