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

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -500,7 +500,7 @@ class RequestLogController extends Controller
         $dataRumahSakit = DB::table('organizations')
         ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.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')
         ->first();
 
@@ -679,7 +679,7 @@ class RequestLogController extends Controller
         $dataRumahSakit = DB::table('organizations')
         ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.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')
         ->first();
 

frontend/hospital-portal/src/App.tsx

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

resources/views/pdf/final_log_page_1.blade.php

@@ -265,7 +265,7 @@
                     <tr>
                         <td style="width: 20%;">Jenis Surat Jaminan</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>
                         <td>Nama Peserta</td>