Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

app/Http/Controllers/GadaiController.php

@@ -2168,6 +2168,17 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        $tarikhtawarruq = '';
+
+        switch ($kodcaw) {
+            case 'KB2':
+                $tarikhtawarruq = '2021-04-13';
+              break;
+            case 'WCY':
+                $tarikhtawarruq = '2021-05-04';
+              break;
+          }
+
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
@@ -2176,8 +2187,8 @@ class GadaiController extends Controller
 
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
+            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
             ->sum('pinjaman');
 
             // $gadaibaru = Gadai::on($cawangan['mysql'])
@@ -2197,15 +2208,16 @@ class GadaiController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        if($request->tarikh > '2021-04-13'){
+        // if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
-            ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=',''],['hargajualan','<>','NULL']])
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            // ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['hargajualan','<>','null']])
             ->sum('pinjaman');
-        }
+        // }
 
         return response()->json($rekod_pinjamandiberi);
     }
@@ -2223,7 +2235,8 @@ class GadaiController extends Controller
 
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
-        ->where('t_gadai','>=','2021-04-14')
+        // ->where('t_gadai','>=','2021-04-14')
+        ->where('hargajualan','<>','null')
         // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
         ->whereNotNull('upah12')
@@ -2261,7 +2274,8 @@ class GadaiController extends Controller
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     ->where('db2.sttebus','=','')
-                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('db2.hargajualan','<>','null')
                     ->where('tarikh_bayaran' ,'<=', $daterequest)
                     ->sum('bayaran_pembiayaan');
 

app/Http/Controllers/LelongController.php

@@ -142,33 +142,45 @@ class LelongController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
 
-        $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
-            ->sum('baki_lelong');
+        // $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
+        //     ->sum('baki_lelong');
 
-        $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
-            ->sum('rugi_lelong');
+        // $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
+        //     ->sum('rugi_lelong');
 
 
-        if($request->tarikh <= '2021-02-25')
+        if($kodcaw == 'KB2')
         {
-            $bakilelong = Lelong::on($cawangan['mysql'])
-            ->where('t_jual','<=',$request->tarikh)
-            ->where(function($query) use ($tarikhbaru){
-                $query->whereNull('trkhtuntut')
-                      ->orWhere('trkhtuntut','>',$tarikhbaru);
-            })
-            ->where('baki','>=',0)
-            ->sum('baki');
+            if($request->tarikh <= '2021-02-25')
+            {
+                $bakilelong = Lelong::on($cawangan['mysql'])
+                ->where('t_jual','<=',$request->tarikh)
+                ->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->tarikh)
+                ->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('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');
-        } 
+        }
        
 
 

app/Http/Controllers/TebusController.php

@@ -355,7 +355,6 @@ class TebusController extends Controller
             'kodcaw'=> $kodcaw
         ]);
 
-        
         if($request->jenistebus == 'P'){
             $baki_hargajualan = $gadai['bakihargajualan'] - $request->bakiupah;
             $transaction = Transaction::on('mysql7')->create([
@@ -866,10 +865,11 @@ class TebusController extends Controller
 
         $rebet = Tebus::on($cawangan['mysql'])
                 ->join($cawangan['db_name'].'.gadai as db2','tebus.norujukan','=','db2.norujukan')
-                ->where('tebus.t_tebus','>','2021-04-13')
+                // ->where('tebus.t_tebus','>','2021-04-13')
                 ->where('tebus.t_tebus','<=',$request->tarikh)
+                ->where('db2.hargajualan','>','0') // tambahan 2021-05-07
                 ->whereNotNull('db2.hargajualan')
-                ->sum('rebate');
+                ->sum('rebate');      
 
         return response($rebet);
     }

app/Http/Controllers/TunaiController.php

@@ -85,7 +85,7 @@ class TunaiController extends Controller
         $current = new Carbon();
        
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+        $updatetunai = Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
              'keluar'=>$request->keluar,
               'masuk'=>$request->masuk,