Merge remote-tracking branch 'origin' into afiqhamzah-fix-marhun-camera-not-detecting-camera-with-label

app/Http/Controllers/LelongController.php

@@ -2085,7 +2085,7 @@ class LelongController extends Controller
         $month = $current->month;
         $year = $current->format('y');
 
-        $today =  $current->format('Y-m-d');
+        $today =  $current->format('2022-12-24');
         // dd($today);
 
         $lelong = Lelong::where('id', '=', $lelong_id)->first();
@@ -2173,18 +2173,7 @@ class LelongController extends Controller
                             $invoice->total_invoice =  '0.00';
                             $invoice->invoice_type = 2; // 1 = fee , 2 = bid
                             $invoice->save();
-                            // dd($invoice->toArray());
-                            // dd("sni");
-                            //sending notify emel kepada pembida
                         }
-                        //send email
-                        // Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name']));
-                        // //send sms
-                        // Nexmo::message()->send([
-                        //     'to' => $userdetails['notelbimbit'],
-                        //     'from' => 'Sender',
-                        //     'text' => 'ArrahnBid-Tahniah Anda Pemenang ArrahnBid, sila semak dalam pautan ini. https://bid.arrahn.com.my'
-                        // ]);
                     } else {
                         $kalah = LelongBidder::where('id', '=', $bidder->id)
                         ->first();
@@ -2206,6 +2195,17 @@ class LelongController extends Controller
             $userdetailsnoti = User::where('id', $noti['nopembeli'])->first();
             // dd($userdetailsnoti);
             Mail::to($userdetailsnoti['email'])->send(new Pemenang($userdetailsnoti['name']));
+            //blast whatsapp notifikasi
+            $mobileno = ltrim($userdetailsnoti['notelbimbit'], '+');
+            $messages = 'AR-RAHN PKB: Tahniah Anda Pemenang ArrahnBid, Sila Semak Melalui Pautan ini. https://bid.arrahn.com.my';
+    
+            $status = Http::get(env('WABOT_API'),[
+                'number' => $mobileno,
+                'type' => 'text',
+                'message' =>  $messages,
+                'instance_id' => env('WABOT_INSTANCES_ID'),
+                'access_token'=> env('WABOT_TOKEN_KEYS')
+            ]);  
         }
 
         $lelong->sts_lelong = 3; //siap jana pemenang

app/Http/Controllers/TangguhLelongController.php

@@ -651,20 +651,22 @@ class TangguhLelongController extends Controller
         
             $lelongbid = LelongBid::where('lelongbid.id', $selectedbid_id)
             ->get();
-          
 
-            foreach($lelongbid as $bidmarhun)
+            $arraynorujukan = [];
+
+            foreach($lelongbid as $index1=>$bidmarhun)
             {
 
                 $cust = Gadai::on($bidmarhun->kodcaw)->where('norujukan',$bidmarhun->norujukan)
                 ->first();
                 //dd($cust['nokp']);
                 //to get nokp
+                $nokp = $cust['nokp'];
             
                 $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id',$bidmarhun->id)
                 ->get();
                 
-                    $percents = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2);
+                $bidmarhun['percents'] = round(($bidmarhun->pinjaman / $bidmarhun->nmarhuns * 100),2);
 
                     $history = TangguhLelong::where('lelongbid_id',$bidmarhun->id)
                     ->first();               
@@ -679,7 +681,7 @@ class TangguhLelongController extends Controller
                     ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri')
                     ->first();               
 
-                    $lelongbid['nama'] = ($customer) ? $customer : dd($cust['nokp']);
+                    $lelongbid[$index1]['nama'] = ($customer) ? $customer : dd($cust['nokp']);
                 
             }
 
@@ -699,7 +701,7 @@ class TangguhLelongController extends Controller
             // dd($roles_harian_penilai,$roles_harian_khazanah,$roles_harian_pc);
             
         
-        // return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
+         //return view('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
         $pdf = PDF::loadView('pdf.brgtangguhlelong',compact('lelongbid','lelongbidmarhun','customer','cwgn','t_mohon','nokp','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'))
             ->setPaper('a4', 'potrait');