Merged in hotfix/laporan (pull request #213)

fix rebate in laporan and added imbang duga harian checkup

app/Http/Controllers/CustomerController.php

@@ -15,6 +15,7 @@ use Illuminate\Http\Request;
 use App\TuntutBaki;
 
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 use DB;
 
@@ -156,12 +157,14 @@ class CustomerController extends Controller
                 ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
                 ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
                 ->get();
+            if(!$gadai->isEmpty()){
             if($gadai[0]['trkhtuntut'] != NULL){
                     $tuntutbaki = TuntutBaki::on($cawangan['mysql'])
                     ->where('norujukan','=',$gadai[0]['norujukan'])
                     ->first();
                     $gadai[0]['datatuntut'] = $tuntutbaki;
                 }
+            }
         }        
         return response()->json($gadai);
     }

app/Http/Controllers/GadaiController.php

@@ -1015,10 +1015,21 @@ class GadaiController extends Controller
                     "teller" => $ansuranData['teller'],
                     "ansuranujrah" => $ansuranData['ujrah'],
                     "ansuranonepercent" => $ansuranData['onepercent'],
+                    "t_gadai" => $gadai['t_gadai'],
                 ]);
             }
         }
 
+        usort($ansuran, function ($a, $b) {
+            $compare_teller = strcmp($a['teller'], $b['teller']);
+
+            if ($compare_teller === 0) {
+                return strcmp($a['tarikh_bayaran'], $b['tarikh_bayaran']);
+            }
+
+            return $compare_teller;
+        });
+
         return response()->json($ansuran);
     }
 

app/Http/Controllers/LaporanController.php

@@ -24,6 +24,8 @@ use App\AkruNet;
 use App\imbangdugabackup;
 use Carbon\Carbon;
 use App\imbangdugalama;
+use App\Services\Reports\ImbangDugaService;
+
 
 use DateTime;
 use Illuminate\Support\Facades\DB;
@@ -1761,4 +1763,22 @@ class LaporanController extends Controller
         }
     }
 
+    public function getImbangDugaBackup(Request $request){
+        $cawangan = Cawangan::on('mysql7')->get();
+        $array_imbangduga = [];
+        foreach($cawangan as $caw){
+            $igService = new ImbangDugaService($caw['kodcaw'],$request->tarikh);
+            $imbangdugabackup = $igService->getImbangDugaBackupData($request->jenistally);
+
+            if(!isset($imbangdugabackup['message'])){
+                $ig = $imbangdugabackup->toArray();
+                $ig['cawangan'] = $caw['details_caw'];
+                array_push($array_imbangduga,$ig);
+            }
+        }
+
+        usort($array_imbangduga, fn($a, $b) => $a['tagtally'] <=> $b['tagtally']);
+
+        return response()->json($array_imbangduga,200);        
+    }
 }

app/Http/Controllers/TebusController.php

@@ -224,13 +224,23 @@ class TebusController extends Controller
                     "nama"=>$customer_info['nama'],
                     "nokp"=>$tebusData['nokp'],
                     "jbg"=>$tebusData['jbg'],
-                    "ujrah"=>$tebusData['ujrah'],    
+                    "ujrah"=>$trans['ujrah_rebet'],    
-                    "onepercent"=>$tebusData['onepercent']
+                    "onepercent"=>$trans['onepercent_rebet']
 
                 ]);
             }
         }
 
+        usort($tebus, function ($a, $b) {
+            $compare_teller = strcmp($a['teller'], $b['teller']);
+
+            if ($compare_teller === 0) {
+                return strcmp($a['t_tebus'], $b['t_tebus']);
+            }
+
+            return $compare_teller;
+        });
+
         return response()->json($tebus);
     }
 
@@ -272,13 +282,23 @@ class TebusController extends Controller
                     "nama"=>$customer_info['nama'],
                     "nokp"=>$tebusData['nokp'],
                     "jbg"=>$tebusData['jbg'],
-                    "ujrah"=>$tebusData['ujrah'],    
+                    "ujrah"=>$trans['ujrah_rebet'],    
-                    "onepercent"=>$tebusData['onepercent']
+                    "onepercent"=>$trans['onepercent_rebet']
 
                 ]);
             }
         }
 
+        usort($tebus, function ($a, $b) {
+            $compare_teller = strcmp($a['teller'], $b['teller']);
+
+            if ($compare_teller === 0) {
+                return strcmp($a['t_tebus'], $b['t_tebus']);
+            }
+
+            return $compare_teller;
+        });
+        
         return response()->json($tebus);
     }
 

app/Services/Reports/ImbangDugaService.php

@@ -959,4 +959,27 @@ class ImbangDugaService
 
         return $this->transactionExecute($funcInsert);
     }
+
+    public function getImbangDugaBackupData($jenistally){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$this->kodcaw)->first();
+
+        $tagtallyValue = 0;
+        if($jenistally == 'taktally'){
+            $tagtallyValue = 0;
+        }else if($jenistally == 'tally'){
+            $tagtallyValue = 1;
+        }
+
+        $response = imbangdugabackup::on($cawangan['mysql'])->whereDate('tarikh','=',$this->tarikh)
+        ->when($jenistally != 'semua', function ($query) use ($tagtallyValue) {
+            return $query->where('tagtally', $tagtallyValue);
+        })
+        ->firstOr(function () {
+            return ['message' => 'No Data'];
+        });
+
+        if(isset($response['message']) == false) $response = $response;
+        
+        return $response;
+    }
 }

app/Support/v2/Calculation.php

@@ -62,8 +62,8 @@ class Calculation
         $onepercent = $this->kiraanOnePercent($pembiayaan);
         $ujrah_sebenar = $this->kiraanUjrahSebenar($nilaimarhun,$kadarujrah,$margin);
 
-        // $onepercent = $this->getRoundedMethod($onepercent);
+        $onepercent = (!empty($onepercent)) ? $this->getRoundedMethod($onepercent) : 0;
-        // $ujrah_sebenar = $this->getRoundedMethod($ujrah_sebenar);
+        $ujrah_sebenar = (!empty($ujrah_sebenar)) ? $this->getRoundedMethod($ujrah_sebenar) : 0;
 
         $keuntungan = $onepercent + $ujrah_sebenar;
 
@@ -75,8 +75,8 @@ class Calculation
         $this->one_percent = $this->getKadarUpah($nilaimarhun);
         $onepercent = $this->kiraanOnePercent($pembiayaan);
         $ujrah_sebenar = $this->kiraanUjrah($nilaimarhun,$kadarujrah,$margin);
-        // $onepercent = $this->getRoundedMethod($onepercent);
+        $onepercent = (!empty($onepercent)) ? $this->getRoundedMethod($onepercent) : 0;
-        // $ujrah_sebenar = $this->getRoundedMethod($ujrah_sebenar);
+        $ujrah_sebenar = (!empty($ujrah_sebenar)) ? $this->getRoundedMethod($ujrah_sebenar) : 0;
 
         $keuntungan = $onepercent + $ujrah_sebenar;
 

app/Support/v2/Penebusan.php

@@ -535,8 +535,8 @@ class Penebusan
             'historygadaian' => $norujukan,
             'tarikhbyrn' => $current->toDateString(),
             'teller' => $request->teller,
-            'ujrah' => $ujrah,
+            'ujrah' => $ujrah_rebet,
-            'onepercent' => $onepercent,
+            'onepercent' => $onepercent_rebet,
         ]);
 
         $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
@@ -708,8 +708,8 @@ class Penebusan
             'historygadaian' => $norujukan,
             'tarikhbyrn' => $current->toDateString(),
             'teller' => $request->teller,
-            'ujrah' => $ujrah,
+            'ujrah' => $ujrah_rebet,
-            'onepercent' => $onepercent,
+            'onepercent' => $onepercent_rebet,
         ]);
 
         $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([

routes/web.php

@@ -839,6 +839,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('laporan/akrual/getImbangDugaBackupData',['uses'=>'LaporanController@getImbangDugaBackupData']);
     $router->post('ansuran/delete',['uses'=>'GadaiController@deleteAnsuran']);
     $router->get('ansuran/getLatest',['uses'=>'GadaiController@getLatestAdvanceWithoutDelete']);
+    $router->get('laporan/imbangdugabackup',['uses' => 'LaporanController@getImbangDugaBackup']);
 
     $router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']);
     $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']);