Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!71

app/Http/Controllers/GadaiController.php

@@ -1382,6 +1382,7 @@ class GadaiController extends Controller
         $bakiakhir = 0;
         $totalkeluar = 0;
 
+
         if($gadai[0]['historygadaian'] != "0" && $gadai[0]['historygadaian'] != '')
         {
 
@@ -1389,10 +1390,11 @@ class GadaiController extends Controller
             {
                 if($tebus['jenistebus'] == 'P')
                 {
+
                      $totalkeluar = $keluar - $tebus['addpinjaman'];
                      $totalmasuk = $masuk - $tebus['bakiupah'];
          
-                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
+                     $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1401,11 +1403,14 @@ class GadaiController extends Controller
                     'baki' => $bakiakhir
                     ));
                     
+         
                 }else{
          
                      $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;
+
+                    //  dd($totalmasuk,$totalkeluar,$bakiakhir);
          
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -1413,6 +1418,7 @@ class GadaiController extends Controller
                     'masuk' => $totalmasuk,
                     'baki' => $bakiakhir
                     ));
+
                 }
             }else{
 
@@ -1450,6 +1456,10 @@ class GadaiController extends Controller
 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
+            TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
+            
+            Transaction::on('mysql7')->where('norujukan','=',$gadai[0]['historygadaian'])->orderBy('id', 'desc')->limit(1)->delete();
+    
             Tebus::on($cawangan['mysql'])->where('norujukan','=',$gadai[0]['historygadaian'])->delete();
 
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
@@ -1489,8 +1499,8 @@ class GadaiController extends Controller
                 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
             Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
-    
+            // TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
-            
+            // Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
             
             return response('Deleted Successfully', 200);
         }
@@ -1540,6 +1550,10 @@ class GadaiController extends Controller
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+        
                 return response('Deleted Successfully', 200);
             }
             else
@@ -1562,6 +1576,10 @@ class GadaiController extends Controller
 
                 Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->delete();
 
+                TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+            
+                Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('id', 'desc')->limit(1)->delete();
+        
                 return response('Deleted Successfully', 200);
             }
             else
@@ -1919,42 +1937,84 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
+            if($request->tarikh > '2021-02-25')
+            {
+                $request->tarikh = '2021-02-25';
+            }
         
-        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);
     }
 
+    public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        if($request->tarikh > '2021-02-25'){
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        ->where('tagpalsu','=',0)
+        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-02-25'],['sttebus','=','']])
+        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+        ->sum('pinjaman');
+        }
+
+        return response()->json($rekod_pinjamandiberi);
+    }
+
     public function CalculationKeuntungan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
         $keuntungan = Gadai::on($cawangan['mysql'])
         ->where('t_gadai','<=',$request->tarikh)
         ->where('t_gadai','>=','2021-03-14')
-        ->where('sttebus','=','')
+        // ->where('sttebus','=','')
         ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
         ->whereNotNull('upah12')
         ->sum('upah12');
 
-        return response()->json($keuntungan,200);
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+        ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+        ->where('tarikh_bayaran' ,'<=', $daterequest)
+        ->sum('bayaran_keuntungan');
+
+        $totalkeuntungan = $keuntungan - $transaksi;
+
+        return response()->json($totalkeuntungan,200);
+    }
+
+    public function CalculationBayaranPendahuluan($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+                    ->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    ->where('db2.sttebus','=','')
+                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->sum('bayaran_pembiayaan');
+
+        return response($transaksi);
     }
 
 }

app/Http/Controllers/TebusController.php

@@ -17,6 +17,7 @@ use App\Lelong;
 use App\HapusKira;
 use App\Parameter;
 use App\Panjar;
+use App\HargaEmas;
 
 use Illuminate\Http\Request;
 
@@ -81,6 +82,7 @@ class TebusController extends Controller
         $array_recno_marhun = $request->array_recno;
 
         $margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
+        // $margin_pembiayaan = round(($gadai_data['bakipjm']/$request->hargasemasa)*100,2);
 
         $nilai_marhun = $gadai_data['nilaimarhun'];
         $total_harga_tebus = 0;
@@ -215,9 +217,11 @@ class TebusController extends Controller
         $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
         $rebet_round = number_format($rebet_raw,2);
+
         if(strpos($rebet_round,',')){
             $rebet_round = str_replace(',','',$rebet_round);
         }
+
         $rebet = (float)substr($rebet_round, 0, -1);
         
         return $rebet;
@@ -494,12 +498,12 @@ class TebusController extends Controller
         $keuntungansebelumtawarruq = 0;
 
 
-        $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
+        // $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
-            ->where('t_tebus','<=',$request->tarikh)
+        //     ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>=','2021-03-14')
+        //     ->where('t_tebus','>=','2021-03-14')
-            ->whereYear('t_tebus','=',$current->year)
+        //     ->whereYear('t_tebus','=',$current->year)
-            ->whereNotNull('rebate')
+        //     ->whereNotNull('rebate')
-            ->sum('rebate');
+        //     ->sum('rebate');
 
         $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
             ->where('t_tebus','<=',$request->tarikh)
@@ -526,7 +530,8 @@ class TebusController extends Controller
 
         $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
 
-        $keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah; 
+        $keuntunganselepastawarruq = $keuntunganselepastawarruqupah; 
+
 
         $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
 
@@ -635,4 +640,34 @@ class TebusController extends Controller
         return response()->json($penghutangkaki,200);
     }
 
+    public function untungrugicalculation($kodcaw,Request $request)
+    {
+        $datetawarruq = new Carbon('2021-02-25');
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->where('tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->sum('bayaran_keuntungan');
+
+        return response($keuntungan);
+    }
+
+    public function RebetCalculation($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $rebet = Tebus::on($cawangan['mysql'])
+                ->where('t_tebus','>','2021-02-25')
+                ->where('t_tebus','<=',$request->tarikh)
+                ->sum('rebate');
+
+        return response($rebet);
+    }
+
 }

app/Http/Controllers/VaultController.php

@@ -245,13 +245,29 @@ class VaultController extends Controller
      $current = Carbon::now();
      $current = new Carbon();   
      
+     $totalbakiakhirtunai = 0;
+  
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
       $vault=Vault::on($cawangan['mysql'])
               ->where('kodcaw','=',$kodcaw)
-              ->where('tarikh','=', $request->tarikh)
+              ->where('tarikh','<=', $request->tarikh)
               ->orderby('tarikh','desc')->first();
 
-      return response()->json($vault);
+      $tunai = Tunai::on($cawangan['mysql'])
+               ->where('kodcaw','=',$kodcaw)
+               ->where('tarikh','<=', $request->tarikh)
+               ->orderby('tarikh','desc')->first();
+
+
+      if($tunai['baki'] != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
+      }else
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'];
+      }
+   
+      return response()->json($totalbakiakhirtunai);
    }
 
 

config/database.php

@@ -42,6 +42,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',
             'strict'    => false,
+
         ],
 
         'mysql4' => [
@@ -95,6 +96,7 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
         'mysql8' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_8'),
@@ -119,6 +121,7 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
         'mysql10' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_10'),
@@ -131,6 +134,7 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
+
         'mysql11' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_11'),

routes/web.php

@@ -324,9 +324,13 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //Dua-Dua Table
     $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //pendahuluan dan serahan
     $router->get('KeuntunganArRahn/{kodcaw}',['uses'=>'GadaiController@CalculationKeuntungan']); //Penghutang Ar-Rahn dan Keuntungan Terakru
+    $router->get('RebetCalculation/{kodcaw}',['uses'=>'TebusController@RebetCalculation']); //Penghutang Ar-Rahn dan Keuntungan Terakru
 
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
+    $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
+    $router->get('BayaranPendahuluan/{kodcaw}',['uses'=>'GadaiController@CalculationBayaranPendahuluan']); //pembiayaan tawarruq
+
     $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
     $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan
 
@@ -339,6 +343,10 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
     $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
 
+    //-- Untung Rugi --//
+    $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
+    
+    
     //END IMBANG DUGA//
 
     //Komuditi Pukal