Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!70

app/Http/Controllers/GadaiController.php

@@ -1967,12 +1967,24 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        
+        if($request->tarikh <= '2021-02-25')
+        {
+            $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
+        }
+        else{
+            $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+            ->sum('pinjaman');
+        }
+
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
         return response()->json($array_rekodemas);
@@ -1986,6 +1998,7 @@ class GadaiController extends Controller
         ->where('t_gadai','<=',$request->tarikh)
         ->where('t_gadai','>=','2021-03-14')
         ->where('sttebus','=','')
+        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 

app/Http/Controllers/LelongController.php

@@ -148,14 +148,32 @@ class LelongController extends Controller
         $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
             ->sum('rugi_lelong');
 
-        $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');
+        } 
+       
+
+
+
+        // dd($bakilelong->toSql());
 
         $ansrugi = AnsRugi::on($cawangan['mysql'])
             ->sum('bayaran');

app/Http/Controllers/TunaiController.php

@@ -261,6 +261,16 @@ class TunaiController extends Controller
         return response()->json($requestteller);
     }
 
+    public function getRequestTellerByDate($kodcaw,Request $request)
+    {
+       
+        $current = Carbon::now();
+        $current = new Carbon();
+        
+        $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0],['tarikh','<=',$request->hingga],['tarikh','>=',$request->mula]])->get();
+        return response()->json($requestteller);
+    }
+
     public function updateRequestTeller($kodcaw,Request $request)
     {
         $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
@@ -280,9 +290,14 @@ class TunaiController extends Controller
     public function createRequestTeller($kodcaw,Request $request)
     {
     
+
         $current = Carbon::now();
         $current = new Carbon();
 
+        // dd($current->toTimeString());
+
+        // strtotime($current->toTimeString());
+
         $reqteller=RequestTeller::on('mysql7')->create([ 
               
              'tarikh' => $current->toDateString(),

app/Http/Controllers/VaultController.php

@@ -58,6 +58,36 @@ class VaultController extends Controller
    return response()->json($updateVault, 200);
  }
 
+ public function updateVaultPanjar($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','=',$current->toDateString())->orderby('tarikh','desc')->first();
+
+   $bakiawal = $vault['bakiawal'];
+   $keluar = $vault['keluar'];
+   $masuk = $vault['masuk'];
+   $bakiakhir = $vault['bakiakhir'];
+   $bakieod = $vault['bakieod'];
+   $pendahuluan = $vault['pendahuluan'];
+   $serahan = $vault['serahan'];
+   $totpanjaran = $vault['totpanjar'];
+
+   $totalpanjar = $request->totpanjar + $totpanjaran;
+
+   $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;
+
+   $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
+      'totpanjar' => $totalpanjar,
+      'bakiakhir'=>$bakiakhir,
+      'bakieod'=>$bakiakhir
+   ));
+
+   return response()->json($updateVault, 200);
+ }
+
  public function updateVaultPendahuluanSerahan($kodcaw, Request $request)
  {
    $current = Carbon::now();
@@ -73,12 +103,13 @@ class VaultController extends Controller
    $bakieod = $vault['bakieod'];
    $pendahuluan = $vault['pendahuluan'];
    $serahan = $vault['serahan'];
+   $totpanjaran = $vault['totpanjar'];
 
    if($request->jenispendahuluanserahan == 'pendahuluan'){
 
       $totalpendahuluan = $request->amaun + $pendahuluan;
 
-      $bakiakhir = $bakiawal-$keluar+$masuk+$totalpendahuluan-$serahan;
+      $bakiakhir = $bakiawal - $keluar + $masuk + $totalpendahuluan - $serahan - $totpanjaran;
 
       $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
          'pendahuluan' => $totalpendahuluan,
@@ -90,7 +121,7 @@ class VaultController extends Controller
 
       $totalserahan = $request->amaun + $serahan;
 
-      $bakiakhir = $bakiawal - $keluar  + $masuk + $pendahuluan - $totalserahan;
+      $bakiakhir = $bakiawal - $keluar  + $masuk + $pendahuluan - $totalserahan - $totpanjaran;
 
       $updateVault=Vault::on($cawangan['mysql'])->where([['tarikh','=',$current->toDateString()],['kodcaw','=', $kodcaw]])->update(array(
          'serahan' => $totalserahan,
@@ -258,6 +289,17 @@ class VaultController extends Controller
       $pendahuluanjmc = '7000/106';
       $serahankoperasi = '1000/090';
 
+      //Selepas Tawarruq
+
+      $serahanpkbTawarruq = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=',$serahanpkb)
+         ->where('tarikh','<=', $request->tarikh)
+         ->where('tarikh','>','2021-03-24')
+         ->sum('serahan');
+
+
+      //Sebelum Tawarruq
+
       $serahanpkb = GlDetail::on($cawangan['mysql'])
          ->where('dtacct','=',$serahanpkb)
          ->where('tarikh','<=', $request->tarikh)
@@ -279,7 +321,17 @@ class VaultController extends Controller
       $totaljmc = $serahanJMC + $serahanjmclama;
       $totalpkb = $serahanpkb + $serahanpkblama;
 
-      $totalserahan = $totaljmc + $totalpkb;
+      $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+
+
+      //Selepas Tawarruq
+
+      $pendahuluanPKBtawarruq = GlDetail::on($cawangan['mysql'])
+      ->where('ktacct','=',$pendahuluanpkb)
+      ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2021-03-24']])
+      ->sum('pendahuluan');
+      
+      //Sebelum Tawarruq
 
       $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
          ->where('ktacct','=',$pendahuluanpkb)
@@ -297,7 +349,7 @@ class VaultController extends Controller
       $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
          ->sum('pendahuluan_jmc');
 
-      $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
+      $total = $pendahuluanPKBtawarruq + $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;
 
       $pindahkekpkb = GlCode::on($cawangan['mysql'])
       ->where('glcode','=',$serahankoperasi)