Merge branch 'faiqahzaman' into 'main'

Faiqahzaman

See merge request online-sistem1/lelong!31

app/Http/Controllers/MarhunController.php

@@ -394,26 +394,25 @@ class MarhunController extends Controller
         return view('pengesahan.senarailelongubahmutu',compact('lelong'));
     }
 
-    public function sahubahmutu($id)
-    {
-        $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id')
-        ->where('lelong.id', $id)
-        ->whereNull('disahkan_oleh')
-        ->where('pengesahan.status_ubah', [1,2,3,4,5])
+    public function sahubahmutu($id){
+        
+        $mutumarhun = Pengesahan::whereNull('disahkan_oleh')
+        ->whereNull('disahkan_pada')
+        ->where('lelong_id', $id)
+        ->whereIn('status_ubah', [1,2,3,4,5])
         ->selectRaw('count(*) as total, sum(status) as tstat,norujukan')
-        ->groupBy('pengesahan.norujukan')
+        ->groupBy('norujukan')
         ->get()->toArray();
-
+        
         foreach($mutumarhun as $index1=>$mutu)
         {
-            $cawangan = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', 'cawangan.id')
-            ->join('lelongbid', 'cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id')
+            $cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id')
             ->where('lelongbid.lelong_id', $id)
             ->where('lelongbid.norujukan', $mutu['norujukan'])
             ->select('cawangan.caw_name')
             ->first();
-            // dd($cawangan);
-            $mutumarhun[$index1]['cawangan_name'] = $cawangan;
+            
+            $mutumarhun[$index1]['cawangan_name'] = $cawangan['caw_name'];
         }
 
         // foreach($mutumarhun as $index1=>$marhun)
@@ -529,7 +528,7 @@ class MarhunController extends Controller
         $pengesahan->disahkan_oleh = $user['id'];
         $pengesahan->disahkan_pada = $currentdate;
         $pengesahan->save();
-        // dd($pengesahan);
+        
         $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
         $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
 
@@ -539,7 +538,6 @@ class MarhunController extends Controller
             ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
             ->where('pengesahan.id', $pengesahan->id)
             ->get();
-            dd($lelongbidmarhuns['marhun']);
 
             foreach($lelongbidmarhuns as $bidmarhuns)
             {
@@ -551,29 +549,32 @@ class MarhunController extends Controller
                 {
                     //
                 }
+                $txtmarhun = ",1 " . $bidmarhuns->marhun ;
             }
 
-            $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
+            $pengesahans = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
             ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
             ->select('pengesahan.id as pengesahan_id')
             ->first();
 
-            $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
-            ->where('lelongbid_id','=',$pengesahan->lelongbid_id)
-            ->get();
-            
-            $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first();
-            $txtmarhun = ",1 " . $lelongbidmarhuns->marhun ;
-            $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
-            $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat;
-            $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas;
-            $lelongbid->save();
+            // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
+            // ->where('lelongbid_id','=',$pengesahan->lelongbid_id)
+            // ->get();
+
+            $lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first();
+            $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
+            $lelongbids->berat = $lelongbids->berat;
+            $lelongbids->hargaasas = $lelongbids->hargaasas;
+            $lelongbids->save();
 
             // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
         }
         
         else if($request->jenis_button == "tangguhlelong")
         {
+            $pengesahan = Pengesahan::where('norujukan', $request->norujukan)
+            ->get(); 
+            dd($pengesahan) ;
             //add into table tangguhlelong
             $tangguhlelong = new TangguhLelong;
             $tangguhlelong->lelong_id = $pengesahan->lelong_id;
@@ -676,8 +677,7 @@ class MarhunController extends Controller
     {
         $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id')
         ->where('tangguhlelong.lelong_id', $id)
-        // ->join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
-        // ->where('tangguhlelong.lelong_id', $id)
+        ->whereNotNull('tangguhlelong.tarikhtangguh')
         ->select('tangguhlelong.id as tangguhlelong_id',
                  'tangguhlelong.lelongbid_id',
                  'tangguhlelong.norujukan',
@@ -743,4 +743,3 @@ class MarhunController extends Controller
     }
     
 }
-       

resources/views/pengesahan/perubahanmutumarhun.blade.php

@@ -24,7 +24,7 @@
                         @foreach($mutumarhun as $marhun)
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
-                            <td>{{ $marhun['cawangan_name']['caw_name'] }}</td>
+                            <td>{{ $marhun['cawangan_name'] }}</td>
                             <td>{{ $marhun['norujukan'] }}</td>
                             <td>
                                 @if($marhun['total'] === intval($marhun['tstat']))

resources/views/simulasi/senaraisimulasi.blade.php

@@ -82,7 +82,7 @@
                 "orderable": false
                 }, 
                 {
-                "targets": 5,
+                "targets": 4,
                 "orderable": false
                 }
             ],