Prod kopkb (#8)

Co-authored-by: nurafrinaalimi16 <nurafrinaalimi16@gmail.com>
Co-authored-by: dev_kopkb <xtrabiz.sb@gmail.com>
Co-authored-by: root <root@erahn.click>
Reviewed-on: #8
Co-authored-by: afrina <afrina@koppkb.com>
Co-committed-by: afrina <afrina@koppkb.com>

app/Http/Controllers/LelongController.php

@@ -605,7 +605,7 @@ class LelongController extends Controller
 
         if($cawangan['tagarrahnbid'] == 1){
             if(env('APP_ENV') != 'production'){
-                $link = 'http://niklah.arrahn.com.my/api/portalApi';
+                $link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi';
             }else{
                 $link = 'https://adminbid-kopkb.erahn.com.my/api/portalApi';
             }

app/Services/Reports/OnePercentService.php

@@ -398,7 +398,7 @@ class OnePercentService
                     $t_gadai = Carbon::parse($gadai->t_gadai);
                     $t_bayaran = Carbon::parse($trans->tarikh_bayaran);
                     
-                    if ($t_gadai->month === $t_bayaran->month && $t_gadai->year === $t_bayaran->year) {
+                    if (($t_gadai->month == $t_bayaran->month) && ($t_gadai->year == $t_bayaran->year)) {
                         return false;
                     }else{
                         return true;

app/Support/v2/GadaiV2.php

@@ -58,9 +58,12 @@ class GadaiV2
         }
     }
 
-    private function getKadarUpahAnggota($nokp,$total_nilai_marhun = 0,$groupid = 2) : Float{
+  private function getKadarUpahAnggota($nokp, $total_nilai_marhun = 0, $groupid = 2): ?float
-        //Log::info('DEBUG NOKP:' . $nokp);
+{
-        if($nokp){
+    if (!$nokp) {
+        return null; // tiada nokp = tak boleh tentukan kadar
+    }
+
     $customer = Customer::on('mysql7')
         ->select('tag_anggota')
         ->where(function ($q) use ($nokp) {
@@ -68,19 +71,19 @@ class GadaiV2
               ->orWhere('kplama', $nokp);
         })
         ->first();
+
     $customer = $customer ? $customer->toArray() : [];
-            if(isset($customer) && $customer['tag_anggota'] == 1){
+
-                return 0.16;
+    if (isset($customer['tag_anggota']) && $customer['tag_anggota'] == 1) {
-            }else{
+        return 0.00; // ahli — kadar 0.00 memang sah
-                return KadarUpah::where('min', '<=', $total_nilai_marhun)
+    }
+
+    $kadar = KadarUpah::where('min', '<=', $total_nilai_marhun)
         ->where('max', '>=', $total_nilai_marhun)
         ->where('group_id', $groupid)
         ->value('kadarujrah');
-            }
-        }
-
-        return 0.0;
 
+    return is_null($kadar) ? null : (float) $kadar; // tak jumpa row = null (block)
 }
 
     public function createMarhun($norujukan,HttpRequest $request){
@@ -110,17 +113,16 @@ class GadaiV2
 
           $kadar_raw = $this->getKadarUpahAnggota($request->nokp, $total_nilai_marhun, $cawangan['group_id']);
 
-            if (empty($kadar_raw) || $kadar_raw == 0) {
+if (is_null($kadar_raw)) {
-
+    Log::error('[BLOCKED] Kadar upah tidak dijumpai', [
-            Log::error('[BLOCKED] Kadar upah kosong / 0', [
         'nokp' => $request->nokp,
         'total_nilai_marhun' => $total_nilai_marhun,
         'group_id' => $cawangan['group_id'],
     ]);
-
+    throw new \Exception("Kadar upah tidak dijumpai, transaksi dibatalkan!");
-            throw new \Exception("Kadar upah kosong / 0, transaksi dibatalkan!");
 }
 
+// $kadar_raw = 0.00 (ahli) akan lepas ke sini dan diteruskan
 
             // query kadar upah lama
             // $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();