Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn into apiaku

app/Http/Controllers/GadaiController.php

@@ -272,6 +272,25 @@ class GadaiController extends Controller
         return $upah_semasa;
     }
 
+    public function kiraUpahRebet($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+        $upah_rebet_round = number_format($upahrebet_raw,2);
+        $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+
+        return $upah_rebet;
+    }
+
     public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
@@ -280,6 +299,7 @@ class GadaiController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
         
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
@@ -312,6 +332,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
             'bayaran_pembiayaan' => $baki_bayaran,
+            'keuntungan_rebet'=> $upahrebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);
@@ -333,6 +354,7 @@ class GadaiController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
+        $upahrebet = $this->kiraUpahRebet($kodcaw,$norujukan);
 
         $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
 
@@ -365,6 +387,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
             'bayaran_pembiayaan' => $baki_bayaran,
+            'keuntungan_rebet'=> $upahrebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);

app/Http/Controllers/TebusController.php

@@ -60,6 +60,25 @@ class TebusController extends Controller
         return $upah_semasa;
     }
 
+    public function kiraUpahRebet($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+        $upah_rebet_round = number_format($upahrebet_raw,2);
+        $upah_rebet = (float)substr($upah_rebet_round, 0, -1);
+
+        return $upah_rebet;
+    }
+
     public function upahTawarruq($kodcaw,$norujukan){
         
         $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
@@ -133,16 +152,24 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
+        $upahtelahbayar = Advansur::on($cawangan['mysql'])
+                        ->where('norujukan','=',$norujukan)
+                        ->sum('upahdibayar');
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-
+        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
-        $upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
+        $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
-        $upah_semasa = (float)number_format($upah_semasa,2);
+        $upah_semasa = number_format($upah_semasa,2);
+        if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
+        $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
         return response()->json($upah_semasa);
     }
@@ -155,7 +182,7 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
@@ -212,9 +239,13 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $bln_tebus_awl = 12 - $gadai_data['tempoh'];
+        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
+                    ->where('norujukan','=',$norujukan)
+                    ->sum('keuntungan_rebet');
         
-        $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
+
+        $rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
 
         $rebet_round = number_format($rebet_raw,2);
 

app/TransaksiKeuntungan.php

@@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model
      * @var array
      */
     protected $fillable = [
-      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan'
+      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet'
     ];
 
     /**

config/database.php

@@ -17,7 +17,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
          ],
-
         'mysql2' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_2'),
@@ -30,7 +29,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql3' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_3'),
@@ -43,7 +41,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql4' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_4'),
@@ -56,7 +53,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
         'mysql5' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_5'),
@@ -143,8 +139,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
-
         'mysql12' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_12'),
@@ -157,8 +151,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
-
         'mysql13' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_13'),
@@ -387,8 +379,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
-
         'mysql32' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST_32'),
@@ -413,9 +403,6 @@ return [
             'prefix'    => '',
             'strict'    => false,
         ],
-
-
-
     ],
 ];