From d2c4d15d518268dc32652b4dca2d94a3a4b371dd Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Mon, 18 Oct 2021 11:02:27 +0800
Subject: [PATCH] fix laporan

---
 app/Http/Controllers/HargaEmasController.php | 13 +++++++++++++
 app/Http/Controllers/LaporanController.php   | 19 +++++++++++++++++++
 app/Http/Controllers/VaultController.php     | 15 +++++++++++++++
 routes/web.php                               |  5 +++++
 4 files changed, 52 insertions(+)

diff --git a/app/Http/Controllers/HargaEmasController.php b/app/Http/Controllers/HargaEmasController.php
index ff80e35..16fd3bf 100644
--- a/app/Http/Controllers/HargaEmasController.php
+++ b/app/Http/Controllers/HargaEmasController.php
@@ -106,4 +106,17 @@ class HargaEmasController extends Controller
         }
         return response()->json($hargaemas);
     }
+
+    public function laporanhargaemas(Request $request)
+    {
+        $rekod = HistoryEmasSandaran::on('mysql7')
+                ->where('t_efektif','>=',$request->mula)
+                ->where('t_efektif','<=',$request->hingga)
+                ->orderBy('t_efektif','desc')
+                ->orderBy('m_efektif','desc')
+                ->get();
+
+        return response()->json($rekod);
+    }
+
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 9e3fcd2..6548367 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -19,6 +19,7 @@ use App\Denominasi;
 use App\HapusKira;
 use App\GlCode;
 use App\GlDetail;
+use App\Audit;
 use Carbon\Carbon;
 
 class LaporanController extends Controller
@@ -805,4 +806,22 @@ class LaporanController extends Controller
         return response()->json($arrayxtra);
     }
 
+    public function LaporanAuditTrail(Request $request)
+    {
+        $atarray = array();
+        $audittrail = Audit::on('mysql7')
+                        ->where('kodcaw','=',$request->kodcaw)
+                        ->whereDate('created_at','=',$request->tarikh)
+                        ->get();
+
+        foreach($audittrail as $index=>$at)
+        {
+            $atz = json_decode($at['new_data']);
+            
+            dd($atz);
+        }
+
+        return response()->json($audittrail);
+    }
+
 }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index c30a119..92c9ff5 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -667,6 +667,21 @@ class VaultController extends Controller
       return response()->json($arraypend);
    }
 
+   public function laporanPetiBesiRange($kodcaw,Request $request)
+   {
+     $current = Carbon::now();
+     $current = new Carbon();    
+  
+      $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+      $vault=Vault::on($cawangan['mysql'])
+              ->where('kodcaw','=',$kodcaw)
+              ->where('tarikh','>=', $request->mula)
+              ->where('tarikh','<=', $request->hingga)
+              ->orderby('tarikh','desc')->get();
+  
+      return response()->json($vault);
+   }
+
 
 
 }
diff --git a/routes/web.php b/routes/web.php
index 671fe98..de60730 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -156,6 +156,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('harga_emas/create',['uses'=>'HargaEmasController@createhargaemas']);
     $router->put('harga_emas/delete/{id}', ['uses' => 'HargaEmasController@deletehargaemas']);
     $router->get('harga_emas/rekod/sandaran',['uses'=>'HargaEmasController@rekodEmasSandaran']);
+    $router->get('harga_emas/laporan/sandaran',['uses'=>'HargaEmasController@laporanhargaemas']);
+
 
 
     //Cawangan API
@@ -281,6 +283,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('listgldetail/{kodcaw}',['uses'=> 'VaultController@listgldetail']); 
     $router->get('laporanpetibesi/{kodcaw}/{tarikh}',['uses'=> 'VaultController@laporanPetiBesi']); 
     $router->get('GetTunaiSemalam/{kodcaw}',['uses' =>'TunaiController@getTunaiSemalam']);
+    $router->get('laporanpetibesirange/{kodcaw}',['uses'=> 'VaultController@laporanPetiBesiRange']); 
+    $router->get('laporanAuditTrail',['uses'=> 'LaporanController@LaporanAuditTrail']); 
+
 
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);