Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!85

app/Http/Controllers/GadaiController.php

@@ -581,18 +581,40 @@ class GadaiController extends Controller
         //Gadai Terkumpul
         $gadai = Gadai::on($cawangan['mysql'])
         ->where('sttebus','=','')
+        ->whereNull('hargajualan')
         ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        //Tebus Terkumpul
+        $gadaitawarruq = Gadai::on($cawangan['mysql'])
-        $tebus = Tebus::on($cawangan['mysql'])
+        ->where('sttebus','=','')
-        ->where('jenistebus','=','T')
+        ->whereNotNull('hargajualan')
-        ->whereYear('t_tebus','=',$current->year)
+        ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_tebus','desc')
         ->sum('pinjaman');
 
-        //Upah Terkumpul
+        // //Tebus Terkumpul
+        // $tebus = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        // $tebustawarruq = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNotNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        $tebus = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
+
+        $tebustawarruq = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNotNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
 
 
         //Variasi
@@ -605,7 +627,7 @@ class GadaiController extends Controller
         ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]);
+        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
 
         return response()->json($array_dashboard);
     }
@@ -1414,10 +1436,11 @@ class GadaiController extends Controller
                 if($tebus['jenistebus'] == 'P')
                 {
 
-                     $totalkeluar = $keluar - $tebus['addpinjaman'];
+                     $totalkeluar = $keluar - ($tebus['addpinjaman'] + $tebus['pinjaman']);
-                     $totalmasuk = $masuk - $tebus['bakiupah'];
+                     $totalmasuk = $masuk - ($tebus['bakiupah'] + $tebus['pinjaman']);
          
-                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    $bakiakhir = $baki - $tebus['bakiupah'] + $tebus['addpinjaman'];
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1431,7 +1454,10 @@ class GadaiController extends Controller
          
                      $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
                      $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
-                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+                    //  $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
+
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = $baki - $tebus['bakipjm'];
 
                     //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
@@ -1461,7 +1487,11 @@ class GadaiController extends Controller
 
                 }else{
 
-                    $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
+                    $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+
+                    if($tebus['jenistebus'] == 'S')
+                        $bakiakhir = ($bakiakhir - $tebus['bakipjm']);
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1559,7 +1589,8 @@ class GadaiController extends Controller
             {
                 $totalmasuk = $masuk - $tebus[0]['bakipjm'];
 
-                $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                $bakiakhir = $baki - $tebus[0]['bakipjm'];
 
                 $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                 update(array(

app/Http/Controllers/TransactionController.php

@@ -9,6 +9,7 @@ use App\Cawangan;
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
+use DB;
 
 class TransactionController extends Controller
 {
@@ -82,4 +83,17 @@ class TransactionController extends Controller
 
         return response()->json($pengguna);
     }
+
+    public function getSumBayaran_Ansuran($kodcaw,$norujukan)
+    {
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh = $current->toDateString();
+
+        $transaction=DB::connection('mysql7')->select("SELECT  SUM(duit_masuk) AS cash_in  FROM transaction WHERE DATE(created_at)='".$tarikh."' AND kodcaw='".$kodcaw."' AND norujukan ='".$norujukan."'" );     
+
+        return response()->json($transaction);
+
+    }
 }

routes/web.php

@@ -355,6 +355,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+
+
     
     
     //END IMBANG DUGA//
@@ -363,6 +365,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     $router->get('latest_transaksi_untung/data/{norujukan}',['uses'=>'TransaksiKeuntunganController@getLatestTransaksi_Untung']);  // new added 20210413
     $router->get('jumlah_bayaran_pendahuluan/{norujukan}',['uses'=>'TransaksiKeuntunganController@GetjumlahBayaranPendahuluan']);  // new added  20210413
+
+    //-- Ansuran GLEJER --//
+    $router->get('ansuranByrKaunter/{kodcaw}/{norujukan}',['uses'=>'TransactionController@getSumBayaran_Ansuran']);
     
 
     //Komuditi Pukal