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'],    
-                    "onepercent"=>$tebusData['onepercent']
+                    "ujrah"=>$trans['ujrah_rebet'],    
+                    "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'],    
-                    "onepercent"=>$tebusData['onepercent']
+                    "ujrah"=>$trans['ujrah_rebet'],    
+                    "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);
     }