From 957d3c82a27e2b189e276dc0beaac7da2b0d9ff4 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Sun, 18 Apr 2021 16:13:42 +0800
Subject: [PATCH] fix skit2

---
 app/Http/Controllers/TebusController.php      | 31 +++++++++++++++++++
 .../Controllers/TransactionController.php     |  2 --
 routes/web.php                                |  6 ++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index cbdb49d..8e292b7 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -470,6 +470,37 @@ class TebusController extends Controller
         return response()->json($listadvansur,200);
     }
 
+    public function SenaraiAdvansur($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('teller','=',$request->kodlaluan)
+        ->where('tarikh','=',$current->toDateString())
+        ->orderBy('tarikh','desc')
+        ->get();
+
+        return response()->json($listadvansur,200);
+    }
+
+    public function getAdvansurByKodlaluan($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $listadvansur = Advansur::on($cawangan['mysql'])
+            ->where('teller','=',$request->kodlaluan)
+            ->where('tarikh','=',$current->toDateString())
+            ->sum('upahdibayar');
+
+        return response()->json($listadvansur,200);
+    }
+
     public function createAdvansur($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index da7c4c8..b333220 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -76,8 +76,6 @@ class TransactionController extends Controller
     {
         $namateller = $request->namateller;
 
-        $namateller = 'NUR ADNIN BINTI MOHAMED';
-
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $pengguna=Pengguna::on($cawangan['mysql'])
                 ->where('nama','=',$namateller)->limit(1)->get();
diff --git a/routes/web.php b/routes/web.php
index 45b2db8..239b588 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -177,9 +177,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('online/transaction',['uses'=>'TransactionOnlineController@updateStatus']);
     
 
-    //ANSURAN API
+    //ANSURAN UPAH API
     $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
-    $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); 
+    $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']);
+    $router->get('AnsuranByTarikh/{kodcaw}',['uses'=>'TebusController@SenaraiAdvansur']);
+    $router->get('ansuranupah/{kodcaw}',['uses'=>'TebusController@getAdvansurByKodlaluan']);
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
 
     //LAPORAN API