Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2023-12-29 16:06:48 +07:00
4 changed files with 74 additions and 6 deletions

View File

@@ -350,6 +350,24 @@ class RequestLogController extends Controller
$data['request_logs'] = $dataRequestLog;
$dataRumahSakit = DB::table('users')
->where('users.id', '=', $dataRequestLog->created_by)
->select(
'*',
DB::raw('
(Select organizations.name FROM organizations
WHERE organizations.id = users.organization_id LIMIT 1) AS nama_rumahsakit
'),
DB::raw('
(Select addresses.text FROM organizations
INNER JOIN addresses ON addresses.id = organizations.main_address_id
WHERE organizations.id = users.organization_id LIMIT 1) AS alamat_rumahsakit
')
)
->first();
$data['rumahSakit'] = $dataRumahSakit;
$pdf = new Dompdf();
$options = new Options();
@@ -456,6 +474,24 @@ class RequestLogController extends Controller
$data['dataClaimLog'] = $dataClaimLog;
$dataRumahSakit = DB::table('users')
->where('users.id', '=', $dataRequestLog->created_by)
->select(
'*',
DB::raw('
(Select organizations.name FROM organizations
WHERE organizations.id = users.organization_id LIMIT 1) AS nama_rumahsakit
'),
DB::raw('
(Select addresses.text FROM organizations
INNER JOIN addresses ON addresses.id = organizations.main_address_id
WHERE organizations.id = users.organization_id LIMIT 1) AS alamat_rumahsakit
')
)
->first();
$data['rumahSakit'] = $dataRumahSakit;
$pdf = new Dompdf();
$options = new Options();