Merge branch 'apiaku' into 'master'

merge yang lejer am

See merge request online-sistem1/api_arrahn!79

app/Http/Controllers/TebusController.php

@@ -505,12 +505,12 @@ class TebusController extends Controller
         //     ->whereNotNull('rebate')
         //     ->sum('rebate');
 
-        $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
-            ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>','2021-04-13')
-            ->whereYear('t_tebus','=',$current->year)
-            ->whereNotNull('bakiupah')
-            ->sum('bakiupah');
+        // $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
+        //     ->where('t_tebus','<=',$request->tarikh)
+        //     ->where('t_tebus','>','2021-04-13')
+        //     ->whereYear('t_tebus','=',$current->year)
+        //     ->whereNotNull('bakiupah')
+        //     ->sum('bakiupah');
 
         $upahtebus = Tebus::on($cawangan['mysql'])
             ->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
@@ -530,10 +530,11 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        // $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+        
+        // $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
-
-        $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
+        $total = $keuntungansebelumtawarruq;
 
         return response()->json($total,200);
     }

app/Http/Controllers/TransaksiKeuntunganController.php

@@ -13,6 +13,23 @@ class TransaksiKeuntunganController extends Controller
         return response()->json($transaksi);
     }
 
+    public function getLatestTransaksi_Untung($norujukan)  //added byy fariz 20210413
+    {
+        $transaksi = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id','desc')->limit(1)->get();
+        return response()->json($transaksi);
+    }
+  
+  
+    public function GetjumlahBayaranPendahuluan($norujukan)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh = $current->toDateString();
+    
+        $transaction=DB::connection('mysql7')->select( "SELECT SUM(bayaran_pembiayaan) AS total_byr_pendahuluan FROM transaksi_keuntungan  WHERE norujukan='".$norujukan."' AND  DATE( tarikh_bayaran) = '".$tarikh."'" );
+        return response()->json($transaction);
+    }
+
     public function createTransaksiKeuntungan(Request $request){
         $transaksi = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $request->norujukan,

routes/web.php

@@ -350,6 +350,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     
     //END IMBANG DUGA//
 
+    //ADDED LEJER AM
+
+    $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
+    
+
     //Komuditi Pukal
     $router->get('komuditi/check',['uses'=>'KomuditiController@checkKomuditi']);
     $router->post('komuditi/pembelian',['uses'=>'KomuditiController@beliKomuditi']);