From 6706de0753a07cb6dcb57e2680c3d0bfffb4256c Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Sun, 17 Oct 2021 10:17:23 +0800
Subject: [PATCH] fix laporan

---
 app/GlDetail.php                              |  3 ++-
 app/Http/Controllers/DenominasiController.php | 12 +++++++++
 .../PendahuluanSerahanController.php          | 27 +++++++++++++++++++
 routes/web.php                                |  2 ++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app/GlDetail.php b/app/GlDetail.php
index 417e552..f0d03f7 100644
--- a/app/GlDetail.php
+++ b/app/GlDetail.php
@@ -22,7 +22,8 @@ class GlDetail extends Model
       'descpt',
       'amaun',
       'pendahuluan',
-      'serahan'
+      'serahan',
+      'teller'
     ];
 
     /**
diff --git a/app/Http/Controllers/DenominasiController.php b/app/Http/Controllers/DenominasiController.php
index 721ccb4..066e0d5 100644
--- a/app/Http/Controllers/DenominasiController.php
+++ b/app/Http/Controllers/DenominasiController.php
@@ -213,4 +213,16 @@ class DenominasiController extends Controller
 
       return response()->json($savedeno);
    }
+
+   public function listtarikhdenominasi($kodcaw,Request $request)
+   {
+   $current = Carbon::now();
+   $current = new Carbon();
+   
+    $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    $data=Denominasi::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->orderby('tarikh','desc')->limit(1)->get();
+    
+    return response()->json($data);
+    
+   }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/PendahuluanSerahanController.php b/app/Http/Controllers/PendahuluanSerahanController.php
index 62d484a..5b1001d 100644
--- a/app/Http/Controllers/PendahuluanSerahanController.php
+++ b/app/Http/Controllers/PendahuluanSerahanController.php
@@ -81,4 +81,31 @@ class PendahuluanSerahanController extends Controller
 
         return response('Batal Berjaya', 200);
     }
+
+    public function listpendahuluanserahan($kodcaw,Request $request)
+    {
+       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+ 
+       if($request->jenis == 'pendahuluan')
+       {
+            $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                ->where('pendahuluan','>',0)
+                ->orderby('tarikh','desc')
+                ->get();
+       }else{
+
+            $gldetail=GlDetail::on($cawangan['mysql'])
+                ->where('kodcaw','=',$kodcaw)
+                ->where([['tarikh','>=',$request->mula],['tarikh','<=',$request->hingga]])
+                ->where('descpt','NOT LIKE','SERAHAN BAYAR ONLINE%')
+                ->where('serahan','>',0)
+                ->orderby('tarikh','desc')
+                ->get();
+       }
+      
+ 
+       return response()->json($gldetail,200);
+    }
 }
diff --git a/routes/web.php b/routes/web.php
index 91134f5..671fe98 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -329,6 +329,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('requestdenopendser/update/{kodcaw}',['uses' => 'PendahuluanSerahanController@updateDenoPendSer']);
     $router->get('SenaraiPendSer/listeach/{kodcaw}',['uses'=>'PendahuluanSerahanController@listeachpendser']);
     $router->post('DeletePendSer/{kodcaw}',['uses'=>'PendahuluanSerahanController@delete']);
+    $router->get('SenaraiPendSer/range/{kodcaw}',['uses'=>'PendahuluanSerahanController@listpendahuluanserahan']);
 
     // $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultPanjar']);
     $router->put('UpdateVault/PendahuluanSerahan/{kodcaw}', ['uses'=>'VaultController@updateVaultDeletePendahuluanSerahan']);
@@ -357,6 +358,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']);
     $router->put('DenominasiUpdate/{kodcaw}',['uses'=>'DenominasiController@updatedenominasi']);
     $router->post('DenominasiCreate/{kodcaw}',['uses'=>'DenominasiController@createdenominasi']);
+    $router->get('DenominasiLaporan/{kodcaw}',['uses'=>'DenominasiController@listtarikhdenominasi']);
 
     //Tuntut Baki
     $router->get('TuntutBaki/{kodcaw}',['uses'=>'LelongController@showTuntutBaki']);