From f29bb6a8b1e57b1ddbbc3fe0151ad8a6c99aec0b Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 27 Jul 2022 15:43:04 +0700 Subject: [PATCH] solved conflict --- app/Http/Controllers/ProjectController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index fcc8471..4435bbc 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -230,10 +230,9 @@ class ProjectController extends Controller } public function dashboard($id) - { - // $data = Project::WHERE("id", $id)->first(); + { $data = DB::table('m_proyek as mp') - ->select('mp.kode_sortname', 'mp.nama as name_project', 'mp.mulai_proyek as start', 'mp.akhir_proyek as finish', 'mp.rencana_biaya', 'mp.company', 'mu.name as pm') + ->select('mp.kode_sortname', 'mp.nama as name_project', 'mp.mulai_proyek as start', 'mp.akhir_proyek as finish', 'mp.rencana_biaya', 'mp.company', 'mp.currency_symbol', 'mu.name as pm') ->join('m_users as mu', 'mu.id', '=', 'mp.pm_id') ->where('mp.id', $id) ->get();