From 95ff170d1296a42c5ac55eb630fc1f019ffee5c7 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Sun, 19 Sep 2021 16:15:28 +0800
Subject: [PATCH 1/2] fix lelong

---
 app/Http/Controllers/LelongController.php | 54 ++++-------------------
 1 file changed, 8 insertions(+), 46 deletions(-)

diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 87b4853..8035f8c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -171,7 +171,7 @@ class LelongController extends Controller
                 ->where('t_jual','<=',$request->tarikh)
                 ->where(function($query) use ($tarikhbaru){
                     $query->whereNull('trkhtuntut')
-                        ->orWhere('trkhtuntut','>','2021-02-25');
+                        ->orWhere('trkhtuntut','>',$tarikhbaru);
                 })
                 ->where('baki','>=',0)
                 ->sum('baki');
@@ -236,57 +236,19 @@ class LelongController extends Controller
         $tarikhbaru = $request->mula;
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        if($kodcaw == 'KB2')
-        {
-            if($request->tarikh <= '2021-02-25')
-            {
-                $bakilelong = Lelong::on($cawangan['mysql'])
-                ->where('t_jual','>=',$request->mula)
-                ->where('t_jual','<=',$request->hingga)
-                ->where(function($query) use ($tarikhbaru){
-                    $query->whereNull('trkhtuntut')
-                        ->orWhere('trkhtuntut','>',$tarikhbaru);
-                })
-                ->where('baki','>=',0)
-                ->sum('baki');
-            }else{
-                $bakilelong = Lelong::on($cawangan['mysql'])
-                ->where('t_jual','>=',$request->mula)
-                ->where('t_jual','<=',$request->hingga)
-                ->where(function($query) use ($tarikhbaru){
-                    $query->whereNull('trkhtuntut')
-                        ->orWhere('trkhtuntut','>','2021-02-25');
-                })
-                ->where('baki','>=',0)
-                ->sum('baki');
-            } 
-        }else{
-            $bakilelong = Lelong::on($cawangan['mysql'])
-            ->where('trkhtuntut','>=',$request->mula)
-            ->where('trkhtuntut','<=',$request->hingga)
-           // ->where(function($query) use ($tarikhbaru){
-           //     $query->whereNull('trkhtuntut')
-           //         ->orWhere('trkhtuntut','>',$tarikhbaru);
-           // })
-            ->where('baki','>=',0)
-            ->sum('baki');
-        }
-
-        $ansrugi = AnsRugi::on($cawangan['mysql'])
-            ->sum('bayaran');
+        
+        $bakilelong = Lelong::on($cawangan['mysql'])
+        ->where('trkhtuntut','>=',$request->mula)
+        ->where('trkhtuntut','<=',$request->hingga)
+        ->where('baki','>=',0)
+        ->sum('baki');
                 
         $rugilelong = Lelong::on($cawangan['mysql'])
             ->where('trkhtuntut','>=',$request->mula)
             ->where('trkhtuntut','<=',$request->hingga)
-            //->where(function($query) use ($tarikhbaru)
-            //{
-            //    $query->whereNull('t_jual')
-            //        ->orWhere('t_jual','>',$tarikhbaru);
-            //})
             ->where('baki','<',0)
             ->sum('baki');
-
-        // $rugitotal = $rugilelong + $ansrugi; 
+            
         $rugitotal = $rugilelong;  
         
         $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];

From 3174cddc7af9ac65dbbb354940f2f2561a341b0b Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Wed, 22 Sep 2021 00:54:01 +0800
Subject: [PATCH 2/2] bayaran lelong

---
 app/Http/Controllers/TebusController.php | 2 ++
 routes/web.php                           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 71dc89b..9f0f36d 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -164,6 +164,8 @@ class TebusController extends Controller
 
     public function getMoratorium(){
         $bln_mora = Moratorium::first();
+
+        return response()->json($bln_mora);
     }
 
     public function updateMoratorium(Request $request){
diff --git a/routes/web.php b/routes/web.php
index 6b83392..285a2fa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -101,6 +101,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('tebus/laporan/{kodcaw}/{tarikh}',['uses'=>'TebusController@getLaporanTebus']);
     $router->get('tebus/laporanjenistawarruq/{kodcaw}',['uses'=>'TebusController@getLaporanTebusPengasingan']);
 
+    $router->get('moratorium/details',['uses'=>'TebusController@getMoratorium']);
+
     //Maintenance API TEBUS
     // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
     $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);