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

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-01-17 14:49:58 +07:00
parent df0ebe5c82 5c514a0bbc
commit 1d791a2643
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -500,7 +500,7 @@ class RequestLogController extends Controller
$dataRumahSakit = DB::table('organizations') $dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id') ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id) ->where('organizations.id', '=', $dataRequestLog->organization_id)
->where('addresses.addressable_type', '=', 'App\Models\Organization') // ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit') ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
->first(); ->first();
@@ -679,7 +679,7 @@ class RequestLogController extends Controller
$dataRumahSakit = DB::table('organizations') $dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id') ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id) ->where('organizations.id', '=', $dataRequestLog->organization_id)
->where('addresses.addressable_type', '=', 'App\Models\Organization') // ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit') ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
->first(); ->first();

2
frontend/hospital-portal/src/App.tsx
View File

@@ -12,7 +12,7 @@ import MotionLazyContainer from './components/animate/MotionLazyContainer';
import { SnackbarProvider } from 'notistack'; import { SnackbarProvider } from 'notistack';
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
export const u = 12
export default function App() { export default function App() {
return ( return (
<ThemeProvider> <ThemeProvider>

2
resources/views/pdf/final_log_page_1.blade.php
View File

@@ -265,7 +265,7 @@
<tr> <tr>
<td style="width: 20%;">Jenis Surat Jaminan</td> <td style="width: 20%;">Jenis Surat Jaminan</td>
<td style="width: 1%;">:</td> <td style="width: 1%;">:</td>
<td style="width: 29%;"><b>SURAT JAMINAN AWAL</b></td> <td style="width: 29%;"><b>SURAT JAMINAN AKHIR</b></td>
</tr> </tr>
<tr> <tr>
<td>Nama Peserta</td> <td>Nama Peserta</td>