Merged in pipi/imbang_duga_fix (pull request #59)

fix imbangduga latest

app/Http/Controllers/AdminPageController.php

@@ -3157,7 +3157,29 @@ class AdminPageController extends Controller
         ->where('margin_semasa','=',0)
         ->sum('bayaran_keuntungan');
 
-        $total = $sum_keun_tebus + $sum_keun_ansuran;
+
+        $sagbaru_norujukan = Gadai::on($cawangan['mysql'])
+        ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
+        ->whereNotNull('hargajualan')
+        ->having('result','=',1)
+        ->whereYear('t_gadai','=',$year)
+        ->whereMonth('t_gadai','<=',$month)
+        ->where('sttebus','=','')
+        ->where('tagbaru',1)
+        ->pluck('norujukan');
+
+        $keuntungan_baru = Transaction::on('mysql7')
+        ->leftJoin('transaksi_keuntungan as trans', function($join)
+        {
+                $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+        })
+        ->whereIn('trans.norujukan',$sagbaru_norujukan)
+        ->where('transaction.trans_type','A')
+        ->sum('bayaran_keuntungan');
+
+
+        $total = $sum_keun_tebus + $sum_keun_ansuran + $keuntungan_baru;
 
 
         return response()->json($total);

app/Http/Controllers/GadaiController.php

@@ -2022,8 +2022,8 @@ class GadaiController extends Controller
 
                     if($tebus['jenistebus'] == 'S')
                         $bakiakhir = $baki - $tebus['bakipjm'];
-
+                    else
-                    //  dd($totalmasuk,$totalkeluar,$bakiakhir);
+                        $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(
@@ -2051,11 +2051,13 @@ class GadaiController extends Controller
 
                 }else{
 
-                    $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
+                    $totalmasuk = $masuk;
-                    $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                    $totalkeluar = $keluar;
 
                     if($tebus['jenistebus'] == 'S')
                         $bakiakhir = ($bakiakhir - $tebus['bakipjm']);
+                    else
+                        $bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
 
                     $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                     update(array(

app/Http/Controllers/TebusController.php

@@ -1497,7 +1497,7 @@ class TebusController extends Controller
         $ansuran = 0;
         if($ansuran_data){
             foreach($ansuran_data as $index=>$ansuranData){
-                $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
+                $gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null],['tagbaru',0]])->first();
                 if($gadaiData){
                     $ansuran += $ansuranData['bayaran_keuntungan'];
                 }
@@ -1710,6 +1710,7 @@ class TebusController extends Controller
             })
             ->whereIn('trans.norujukan',$get_norujukan)
             ->where('transaction.trans_type','T')
+            // ->where('trans.margin_semasa','=',0) //3.80
             ->sum('keuntungan_rebet');
 
         $sum_keun_ansuran = Transaction::on('mysql7')
@@ -1720,6 +1721,7 @@ class TebusController extends Controller
             })
             ->whereIn('trans.norujukan',$get_norujukan)
             ->where('transaction.trans_type','A')
+            ->where('trans.margin_semasa','=',0)
             ->sum('bayaran_keuntungan');
 
         $total = $sum_keun_tebus + $sum_keun_ansuran;

app/Support/v1/Penebusan.php

@@ -645,7 +645,7 @@ class Penebusan
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
             'bayaran_pembiayaan' => $bayaran_pembiayaan,
-            'keuntungan_rebet' => 0,
+            'keuntungan_rebet' => $request->bakiupah,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);

app/Support/v2/GadaiV2.php

@@ -412,6 +412,9 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
     $bilang_bln = $tempoh - $tempohbayar;
     $keuntungan_semasa = $bilang_bln * $upah['onepercent'];
     $ujrah_semasa = $bilang_bln * $upah['ujrah'];
+    $keuntungan_semasa = $onepercentservices->getRoundedMethod($keuntungan_semasa);
+    $ujrah_semasa = $onepercentservices->getRoundedMethod($ujrah_semasa);
+
     $pendapatan = $keuntungan_semasa + $ujrah_semasa;
     $arraypendapatan = [
         'keuntungan' => $keuntungan_semasa,

app/Support/v2/Penebusan.php

@@ -145,9 +145,10 @@ class Penebusan
         $bilang_bln = $tempoh - $gadai_data['tempohbayar'];
 
         $upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
-        $upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
+
         $keuntungan_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
         $ujrah_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
+        $upahsemasa_raw = $keuntungan_semasa + $ujrah_semasa;
         $upahsemasa_raw = $onepercentservices->getRoundedMethod($upahsemasa_raw);
         $keuntungan_1bln = $onepercentservices->getRoundedMethod((1 * $upah['onepercent'])+(1 * $upah['ujrah']));
 
@@ -464,8 +465,11 @@ class Penebusan
 
         $upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
 
-        $upahrebet_raw = $bilang_bln * $upah['keuntungan'];
+        $ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
-        $upahrebet_raw = $onepercentservices->getRoundedMethod($upahrebet_raw);
+        $onepercent = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
+        $keuntungan = $ujrah + $onepercent;
+
+        $upahrebet_raw = $onepercentservices->getRoundedMethod($keuntungan);
         
         return $upahrebet_raw;
     }
@@ -695,7 +699,7 @@ class Penebusan
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
             'bayaran_pembiayaan' => $bayaran_pembiayaan,
-            'keuntungan_rebet' => 0,
+            'keuntungan_rebet' => $request->bakiupah,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);
@@ -747,6 +751,8 @@ class Penebusan
         $ujrah = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
         $onepercent_semasa = $bilang_bln * $onepercent;
         $ujrah_semasa = $bilang_bln * $ujrah;
+        $onepercent_semasa = $onepercentservices->getRoundedMethod($onepercent_semasa);
+        $ujrah_semasa = $onepercentservices->getRoundedMethod($ujrah_semasa);
 
 
         return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
@@ -773,7 +779,9 @@ class Penebusan
         $keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
         $ujrah = $bilang_bln * $ujrah_rounded;
         $onepercent = $bilang_bln * $keuntungan_rounded;
-
+        $ujrah = $onepercentservices->getRoundedMethod($ujrah);
+        $onepercent = $onepercentservices->getRoundedMethod($onepercent);
+    
         return ['ujrah' => $ujrah, 'onepercent' => $onepercent];
     }
 

database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php

@@ -3,6 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 
 class AddOnepercentToTebusTable extends Migration