Merge branch 'apiaku' into 'master'

fix hapus dan kelulusan

See merge request online-sistem1/api_arrahn!46

app/Http/Controllers/GadaiController.php

@@ -15,6 +15,7 @@ use App\WTD;
 use App\HapusKira;
 use App\Tebus;
 use App\Vault;
+use App\Tunai;
 
 use Illuminate\Http\Request;
 
@@ -1292,12 +1293,63 @@ class GadaiController extends Controller
 
     public function GadaiHapus($kodcaw,$norujukan,Request $request)
     {
+        $current = Carbon::now();
+        $current = new Carbon();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
 
-        if($gadai[0]['historygadaian'] != "0")
+        $tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('t_tebus','desc')->first();
+
+        $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
+                        ->orderBy('tarikh','desc')
+                        ->first();
+
+        $keluar=$tunai['keluar'];
+        $baki=$tunai['baki'];
+        $masuk=$tunai['masuk'];
+        $bakiawal=$tunai['bakiawal'];
+        $pendahuluan=$tunai['tambah'];
+        $serahan=$tunai['kurang'];
+        $totalmasuk = 0;
+        $bakiakhir = 0;
+        $totalkeluar = 0;
+
+        if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
         {
+
+            if($tebus['tagterima'] == 1)
+            {
+                if($tebus['jenistebus'] == 'P')
+                {
+                     $totalkeluar = $keluar - $tebus['addpinjaman'];
+                     $totalmasuk = $masuk - $tebus['bakiupah'];
+         
+                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+         
+                    $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+                    update(array(
+                    'keluar' => $totalkeluar,
+                    'masuk' => $totalmasuk,
+                    'baki' => $bakiakhir
+                    ));
+         
+                }else{
+         
+                     $totalmasuk = $masuk - $tebus['bakipjm'];
+                     $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+         
+                    $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+                    update(array(
+                    'keluar' => $keluar,
+                    'masuk' => $totalmasuk,
+                    'baki' => $bakiakhir
+                    ));
+                }
+            }
+
+
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->update(['sttebus' => '']);
 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
@@ -1310,30 +1362,78 @@ class GadaiController extends Controller
         }
         else
         {
+
+            if($gadai[0]['tagserah'] == 1 && $gadai[0]['cetak'] == 1)
+            {
+                $totalkeluar = $keluar - $gadai[0]['pinjaman'];
+            
+                $bakiakhir = $bakiawal-$totalkeluar+$masuk+$pendahuluan-$serahan;
+
+                $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+                update(array(
+                    'keluar' => $totalkeluar,
+                    'masuk' => $masuk,
+                    'baki' => $bakiakhir
+                ));
+            }
+                
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+    
+            
 
             return response('Deleted Successfully', 200);
         }
        
     }
 
-    public function TebusHapus($kodcaw,$norujukan)
+    public function TebusHapus($kodcaw,$norujukan,Request $request)
     {
+        $current = Carbon::now();
+        $current = new Carbon();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
 
-        if($tebus[0]['jenistebus'] == 'T')
+        $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$request->kodlaluan]])
-        {
+        ->orderBy('tarikh','desc')
-            Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+        ->first();
 
-            Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+        $keluar=$tunai['keluar'];
-    
+        $baki=$tunai['baki'];
-            return response('Deleted Successfully', 200);
+        $masuk=$tunai['masuk'];
+        $bakiawal=$tunai['bakiawal'];
+        $pendahuluan=$tunai['tambah'];
+        $serahan=$tunai['kurang'];
+        $totalmasuk = 0;
+        $bakiakhir = 0;
+        $totalkeluar = 0;
+
+        if($tebus[0]['tagterima'] == 1)
+        {
+            if($tebus[0]['jenistebus'] == 'T')
+            {
+                $totalmasuk = $masuk - $tebus[0]['bakipjm'];
+                $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+
+                $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
+                update(array(
+                'keluar' => $keluar,
+                'masuk' => $totalmasuk,
+                'baki' => $bakiakhir
+                ));
+
+
+                Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(['sttebus' => '']);
+
+                Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
+        
+                return response('Deleted Successfully', 200);
+            }
+            else
+                return response('Bukan-Tebus', 200);
         }
-        else
-            return response('Bukan-Tebus', 200);
     }
 
     public function senaraiLelong($kodcaw,Request $request){

app/Http/Controllers/KelulusanController.php

@@ -152,7 +152,7 @@ class KelulusanController extends Controller
                   'pelulus' => 'dahlulus',
                   'masalulus'=> $harini->toTimeString()
          )); 
-      }else{
+      }else if($request->sahkan === 2){
          $kelulusan=Mohon::on($cawangan['mysql'])
          ->where('tarikh','=',$harini->toDateString())
          ->where('norujukan','=',$norujukan)