Merge branch 'main' of https://gitlab.com/online-sistem1/lelong into fix-kemaskini-harga-emas

.env.example

@@ -299,8 +299,9 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-MARHUN_CAMERAS = "Doccamera"
+MARHUN_CAMERAS_CHROME = "Doccamera"
+MARHUN_CAMERAS_FIREFOX = "jSsq68fCLg2guCV2FaFzvXXiKBqbPA25DaQAWWotfqY="
 
 WABOT_API=https://md.wabot.my/api/send.php
 WABOT_INSTANCES_ID=63C26B7AAD21A
-WABOT_TOKEN_KEYS=cbee7e95cf3ffbfa0531d5fddfd44f87
+WABOT_TOKEN_KEYS=cbee7e95cf3ffbfa0531d5fddfd44f87

.gitignore

@@ -14,3 +14,5 @@ yarn-error.log
 /.idea
 /.vscode
 composer.lock
+/public/js/vue-app.js
+/public/js/vue-app.js.map

app/Console/Commands/kemaskiniCawanganLelong.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\CawanganLelong;
+use App\Models\Lelong;
+use App\Models\LelongBid;
+use Illuminate\Console\Command;
+
+class kemaskiniCawanganLelong extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'kemaskini:cawangan-lelong';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Kemaskini cawangan lelong, hapus bila surat sudah ditebus';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+
+        $lelong = Lelong::with('cawangan')->select('id')->get();
+        foreach($lelong as $lel)
+        {
+            foreach($lel->cawangan as $caw)
+            {
+                $lelong_bid = LelongBid::where('kodcaw', $caw->caw_code)->where('lelong_id', $lel->id)->first();
+                if($lelong_bid == null)
+                {
+                    CawanganLelong::where('caw_id', $caw->id)->where('lelong_id', $lel->id)->delete();
+                }
+            }
+        }
+    }
+}

app/Http/Controllers/AccountController.php

@@ -609,7 +609,7 @@ class AccountController extends Controller
         $fileresit = FileResit::where('lelong_id', $lelong_id)
         ->where('user_id', $user_id)
         ->where('kodcaw', $caw_code)
-        ->where('photo_type', '=', '2')
+        // ->where('photo_type', '=', '2')
         ->get();
         // dd($fileresit);
         foreach ($fileresit as $index => $itemresit) {
@@ -686,7 +686,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan','resit.total_payment as paid')
         ->groupBy('lelongbidder.user_id')
         ->get();
 
@@ -744,7 +744,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan','resit.total_payment as paid')
         ->groupBy('lelongbidder.user_id')
         ->get();
 
@@ -811,7 +811,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         // ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan','resit.total_payment as paid')
         ->groupBy('resit.billplz_id')
         ->orderBy('lelongbid.kodcaw')
         ->get();
@@ -871,7 +871,7 @@ class AccountController extends Controller
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         // ->where('lelongbid.kodcaw', $kodcaw)
-        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+        ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan', 'resit.total_payment as paid')
         ->groupBy('resit.billplz_id')
         ->orderBy('lelongbid.kodcaw')
         ->get();

app/Http/Controllers/ApiController.php

@@ -555,7 +555,7 @@ class ApiController extends Controller
         $req = $request->toArray();
         $response = $bill->get($req['billplz']['id']);
         $data = $response->toArray();
-        if ($data['paid'] == 'true') {
+        if ($data['paid'] == 'true' || $data['paid_at'] != null) {
             $resit = Resit::where('billplz_id', '=', $data['id'])->first();
             $resit->status = 'PAID';
             $resit->paid_at = $data['paid_at'];
@@ -615,6 +615,8 @@ class ApiController extends Controller
 
             $result = $resit->toArray();
 
+            $resit->response = json_encode($data);
+            $resit->save();
             // return response()->json([
             //     'success' => true,
             //     'resit' => $resit
@@ -625,6 +627,7 @@ class ApiController extends Controller
             $resit = Resit::where('billplz_id', '=', $data['id'])->first();
             $resit->status = 'UNSUCCESSFUL';
             $resit->paid_at = null;
+            $resit->response = json_encode($data);
             $resit->save();
 
             event(new PaymentNotify('UNSUCCESSFUL', $resit->user_id, ''));

app/Http/Controllers/AuthMobile/AuthController.php

@@ -11,6 +11,9 @@ use App\Models\Staff;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Mail;
+use App\Mail\ResetPassword;
 
 class AuthController extends Controller
 {
@@ -161,4 +164,36 @@ class AuthController extends Controller
         ];
 
     }
+
+    public function forgotPassword(Request $request)
+    {
+        $user = User::where('email', $request->email)->first();
+        if (!$user) {
+            return response()->json([
+                'success' => false,
+                'status' => 0,
+                'message' => "Emel tidak dijumpai. Sila daftar sekarang."
+            ]);
+        }
+
+        $token = Str::random(60);
+
+        $user['token'] = $token;
+        $user['is_verified'] = 0;
+        $user->save();
+
+        Mail::to($request->email)->send(new ResetPassword($user->name, $token));
+
+        if (Mail::failures() != 0) {
+            return response()->json([
+                'success' => true,
+                'message' => "Berjaya DiHantar! Pautan Lupa Katalaluan Telah Dihantarkan Kepada Alamat Emel Anda."
+            ]);
+        }
+        return response()->json([
+            'success' => false,
+            'status' => 500,
+            'message' => "Failed! there is some issue with email provider"
+        ]);
+    }
 }

app/Http/Controllers/CartController.php

@@ -80,7 +80,7 @@ class CartController extends Controller
             $total_surat = 0;
 
             foreach ($cart as $index1 => $data) {
-                $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
+                $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->where('photo_type', 1)->get();
                 if ($fileMarhun->isNotEmpty()) {
                     $cart[$index1]['filemarhun'] = $fileMarhun;
                 }

app/Http/Controllers/DatabaseController.php

@@ -10,6 +10,8 @@ use App\Models\Cawangan;
 use App\Models\Gadai;
 use App\Models\TransaksiKeuntungan;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Storage;
+use Exception;
 
 class DatabaseController extends Controller
 {
@@ -121,4 +123,23 @@ class DatabaseController extends Controller
         return view('pengurusandatabase.yuranbidaan');
 
     }
+
+    public function pengurusanMaxUploadSize()
+    {
+        return view('pengurusanuploaddownload.index');
+    }
+
+    public function postUploadFile(Request $request)
+    {
+        $file_size = filesize($request->file_upload);
+        try {
+            $file = $request->file_upload;
+            $extension = $request->file_upload->getClientOriginalExtension();
+            Storage::putFileAs('test', $file, "test-upload.$extension");
+
+            return redirect()->route('pengurusanuploaddownload.testupload')->with('success', 'Upload successful with size ' . $file_size);
+        } catch (Exception $exception) {
+            return redirect()->route('pengurusanuploaddownload.testupload')->with('failed', 'Upload failed with size ' . $file_size);
+        }
+    }
 }

app/Http/Controllers/MarhunController.php

@@ -610,6 +610,7 @@ class MarhunController extends Controller
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
             ->where('cawangan.caw_code', $user->kodcaw)
             ->where('sts_lelong', 0)
+            ->orderBy('lelong_id', 'asc')
             ->get();
 
         // $lelong = Lelong::orderBy('id', 'desc')->get();
@@ -627,6 +628,7 @@ class MarhunController extends Controller
             ->where('cawangan.caw_code', $user->kodcaw)
             ->where('sts_lelong', 0)
             ->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
+            ->orderBy('lelong_id', 'asc')
             ->get()
             ->toArray();
 
@@ -1723,7 +1725,7 @@ class MarhunController extends Controller
         $user = Auth::user();
         $current = Carbon::now();
 
-        foreach ($request->scanKeluar_id as $index) {
+        foreach (json_decode($request->scanKeluar_id) as $index) {
             $terimaMarhun = ScanSemak::where('id', '=', $index)->first();
             $terimaMarhun->penilai_id = $user->id;
             $terimaMarhun->terima_marhun = $current->toDateTimeString();
@@ -1811,6 +1813,7 @@ class MarhunController extends Controller
 
         $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
             ->whereNull('scan_masuk')
+            ->where('lelong_id', $request-> lelong_id)
             ->get();
 
         if ($checkExisting->isEmpty()) {
@@ -2052,12 +2055,14 @@ class MarhunController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $tarikhlelong_semasa = $currentdate;
+        //$tarikhlelong_semasa = $currentdate;
+        $tarikhlelong_semasa = date('Y-m-d', strtotime(now()));
 
         $lelongAll = Lelong::with('cawangan')->get();
 
 
         if($lelong){
+
         foreach ($lelong as $info) 
         {
             $lelong_id = $info['lelong_id'];
@@ -2083,21 +2088,25 @@ class MarhunController extends Controller
             ->where('cawangan.caw_code', $user->kodcaw)
             ->get()
             ->toArray();
-            array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
+            //array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
-        }
-
-        }
-        foreach ($arrayinfo as $lelong) {
-           
 
             if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
-                array_push($arraydetails0, $lelong);
+                array_push($arraydetails0, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
-            } 
+            } else {
-            else
+                array_push($arraydetails1, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
-            {
-                array_push($arraydetails1, $lelong);
             } 
+        }    
+
         }
+        // foreach ($arrayinfo as $lelong) {
+        //     if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
+        //         array_push($arraydetails0, $lelong);
+        //     } 
+        //     else
+        //     {
+        //         array_push($arraydetails1, $lelong);
+        //     } 
+        // }
         
 
 
@@ -2544,7 +2553,16 @@ class MarhunController extends Controller
         return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf');
     }
 
-
+    public function pengurusanGambarMarhun()
+    {
+        return view('pengurusangambar.index');
+    }
    
-    
+    public function galeriMarhun()
+    {
+        $user = Auth::user();
+
+        $kodcaw = Cawangan::select('id')->where('caw_code', $user->kodcaw)->first();
+        return view('pengurusangambar.galerimarhun', compact('kodcaw'));
+    }
 }

app/Http/Controllers/Mobile/LelongMobileController.php

@@ -14,6 +14,7 @@ use App\Models\Payment;
 use App\Models\Cart;
 use Carbon\Carbon;
 use App\Models\Cawangan;
+use App\Models\CawanganLelong;
 use App\Models\FileMarhun;
 use App\Models\Resit;
 use App\Models\FileResit;
@@ -216,7 +217,7 @@ class LelongMobileController extends Controller
                 $total_hargabida = 0;
                 $total_berat = 0;
                 foreach ($lelongBidder as $index1 => $data) {
-                    $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
+                    $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->where('photo_type', 1)->get();
                     if ($fileMarhun->isNotEmpty()) {
                         $lelongBidder[$index1]['filemarhun'] = $fileMarhun;
                     }
@@ -398,7 +399,7 @@ class LelongMobileController extends Controller
 
                 $lelongbid['lelongbidmarhun'] = $lelongbidmarhun;
 
-                $fileMarhun = FileMarhun::where('lelongbid_id', $lelongbid['id'])->get();
+                $fileMarhun = FileMarhun::where('lelongbid_id', $lelongbid['id'])->where('photo_type', 1)->get();
                 // dd($fileMarhun);
 
                 // foreach ($fileMarhun as $index) {
@@ -625,11 +626,47 @@ class LelongMobileController extends Controller
             $namaCawangan = $getCawangan->caw_name;
             $kodCawangan = $getCawangan->caw_code;
 
-            
+            $status_payment_cawangan['status'] = 1;
+
+            $payment = Payment::where('norujukan', $groupBycaw[0]->norujukan)
+            ->where(function ($query) {
+                $query->where('status', '=', 1)
+                      ->orWhere('status', '=', 2);
+            })
+            ->first();
+            if ($payment != null) {
+                $checkPayMethod = Resit::find($payment->resit_id);
+                $date_convert = strtotime($checkPayMethod->created_at);
+                $checkPayMethod['pay_time'] = date("H:i:s", $date_convert);
+                $status_payment_cawangan['resit'] = $checkPayMethod->toArray();
+                if ($checkPayMethod->billplz_id == "") {
+                    $status_payment_cawangan['payment_method'] = "TUNAI";
+                    $status_payment_cawangan['payment_method_opt'] = 1;
+                } elseif (str_starts_with($checkPayMethod->billplz_id, 'CDM')) {
+                    $status_payment_cawangan['payment_method'] = "CDM";
+                    $status_payment_cawangan['payment_method_opt'] = 3;
+                    $file_resit = FileResit::where('user_id', $user_id)->where('lelong_id', $lelong_id)->where('kodcaw', $kodCawangan)->get();
+                    foreach($file_resit as $index => $resit)
+                    {
+                        $date_convert = strtotime($resit->created_at);
+                        $updatedDateTime = date("H:i:s", $date_convert);
+                        $file_resit[$index]['masa_upload'] = $updatedDateTime;
+                    }
+                    $status_payment_cawangan['file_resit'] = $file_resit;
+                } else {
+                    $status_payment_cawangan['payment_method'] = "ONLINE";
+                    $status_payment_cawangan['payment_method_opt'] = 2;
+                }
+                if ($payment->disahkan_pada == NULL) {
+                    $status_payment_cawangan['status'] = 9; // status pending tunggu pengesahan
+                }
+            } else {
+                $status_payment_cawangan['status'] = null;
+            }
+
             $total_hargabida = 0;
-            $status_payment_cawangan = 1;
             foreach ($groupBycaw as $index => $hargabida) {
-                $fileMarhun = FileMarhun::where('lelongbid_id', $hargabida->id)->get();
+                $fileMarhun = FileMarhun::where('lelongbid_id', $hargabida->id)->where('photo_type', 1)->get();
                 if ($fileMarhun->isNotEmpty()) {
                     $groupBycaw[$index]['filemarhun'] = $fileMarhun;
                 }
@@ -641,9 +678,6 @@ class LelongMobileController extends Controller
                 ->first();
                 $groupBycaw[$index]['hargabida'] = number_format($totalbida['hargabida'], 2, '.', ',');
                 $total_hargabida = $total_hargabida + $totalbida['hargabida'];
-                if($hargabida->status_payment == null) {
-                    $status_payment_cawangan = null;
-                }
             }
             $sag = $groupBycaw;
             array_push($data, [
@@ -1177,10 +1211,9 @@ class LelongMobileController extends Controller
             foreach ($lelongbid as $data) {
                 $jumlah = $jumlah + $data->hargabida;
 
-                if($data->status_payment == null) {
+                if ($data->status_payment == null) {
                     $status = null;
                 }
-
             }
 
             $date_convert = strtotime($tarikhLelong->tarikh_lelong);
@@ -1268,7 +1301,10 @@ class LelongMobileController extends Controller
         $addfile = new FileResit();
         $addfile->user_id = $request->user_id;
         $addfile->lelong_id = $request->lelong_id;
-        $addfile->file_type = $file_type;
+        $addfile->original_file_type = $file_type;
+        $addfile->kodcaw = $request->kodcaw;
+        $addfile->payment_id = 0;
+        $addfile->original_size = filesize($request->gambarResit);
         $addfile->save();
 
         $directory = "/{$request->user_id}/{$request->lelong_id}/";
@@ -1280,23 +1316,21 @@ class LelongMobileController extends Controller
         $stored_path = Storage::disk('resit')->path("{$directory}{$resitImageFileName}.${imageExtension}");
         $resitPhotoService = new ResitPhotoService();
 
-        // try {
+        try {
-
+            $convertToWebP = $resitPhotoService->optimizeImageToWebP($stored_path, $directory, $resitImageFileName);
-        $convertToWebP = $resitPhotoService->optimizeImageToWebP($stored_path, $directory, $resitImageFileName);
+        } catch (\Exception $e) {
-
+            return $e;
-        // } catch (\Exception $e)
+        }
-
-        // {
-        //     return $e;
-        // }
-
-
-        Storage::disk('resit')->delete("{$directory}${resitImageFileName}.${imageExtension}");
 
+        $compress_size = Storage::disk('resit')->getSize("{$directory}${resitImageFileName}.webp");
+        
         $addfile->update([
             'file_type' => 'webp',
+            'compress_size' => $compress_size
         ]);
 
+        Storage::disk('resit')->delete("{$directory}${resitImageFileName}.${imageExtension}");
+
         return response()->json(['success' => true]);
     }
 
@@ -1329,9 +1363,136 @@ class LelongMobileController extends Controller
     public function portalApi(Request $request)
     {
         $lelong = LelongBid::select('fasa', 't_lelong')
-        ->where([['norujukan', $request->norujukan], ['status_jual', '=', 0]])
+        ->where([['norujukan', $request->norujukan]])
             ->first();
         return response()->json(['lelong' => $lelong]);
     }
 
+    public function initializeCdmPayment(Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $day = $current->day;
+        $month = $current->month;
+		$year = $current->format('y');
+
+        $this->addPhotoResit($request);
+
+        $previous_siri = Resit::orderBy('id','desc')->first();
+        if($previous_siri){
+            $nosiri = $previous_siri->id + 1;
+        }else{
+            $nosiri = 1;
+        }
+
+        $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
+
+        $cdm_reference = 'CDM' . sprintf('%06d', $nosiri);
+
+        $add_resit = new Resit();
+        $add_resit->user_id = $request->user_id;
+        $add_resit->lelong_id = $request->lelong_id;
+        $add_resit->reference_no = $reference_no;
+        $add_resit->invoice_id = $request->invoice_id;
+        $add_resit->invoice_no = $request->invoice_no;
+        $add_resit->billplz_id = $cdm_reference;
+        $add_resit->total_payment = $request->total;
+        $add_resit->resit_type = 2;
+        $add_resit->save();
+
+        $selectedSag = json_decode($request->sag, true);
+        foreach ($selectedSag as $index) {
+            $add_payment = new Payment;
+            $add_payment->user_id = $request->user_id;
+            $add_payment->lelong_id = $request->lelong_id;
+            $add_payment->kodcaw = $index['kodcaw'];
+            $add_payment->lelongbid_id = $index['lelongbid_id'];
+            $add_payment->norujukan = $index['norujukan'];
+            $add_payment->total_payment = $index['total_payment'];
+            $add_payment->status_payment_opt = 3;  //bayar secara CDM 3
+            $add_payment->status = 2; //paybidwin
+            $add_payment->remark = 'CDM';
+            $add_payment->resit_id = $add_resit->id;
+            $add_payment->save();
+
+            $updateTagBid = LelongBid::where('norujukan', $index['norujukan'])->first();
+            $updateTagBid->status_payment = 2;
+            $updateTagBid->save();
+
+            $updateTagBidder = LelongBidder::where('lelongbid_id', $updateTagBid->id)
+            ->where('user_id', $request->user_id)->first();
+            $updateTagBidder->status_payment = 2;
+            $updateTagBidder->payment_id = $add_payment->id;
+            $updateTagBidder->save();
+        }
+        return response()->json(['success' => true]);
+    }
+    
+    public function listLelong()
+    {
+        $lelong_all = Lelong::select('id', 'tarikh_lelong')->get();
+        foreach($lelong_all as $index => $lelong)
+        {
+            $date_convert = strtotime($lelong->tarikh_lelong);
+            $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+        }
+        return response()->json($lelong_all);
+    }
+
+    public function listLelongByCawangan(Request $request)
+    {
+        $cawangan = Cawangan::with('lelong')->find($request->caw_id);
+        $lelong_all = $cawangan->lelong;
+        foreach($lelong_all as $index => $lelong)
+        {
+            $date_convert = strtotime($lelong->tarikh_lelong);
+            $lelong_all[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+            $lelong_all[$index]['new_id'] = str_pad($lelong->id, 3, "0", STR_PAD_LEFT);
+        }
+        return response()->json($lelong_all);
+    }
+
+    public function listCawangan(Request $request)
+    {
+        $cawangan_all = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('lelong_id', $request->lelong_id)
+        ->select('cawangan_lelong.caw_id', 'cawangan.caw_name')->get();
+        return response()->json($cawangan_all);
+    }
+
+    public function listLelongBid(Request $request)
+    {
+        $lelong_bid_all = LelongBid::with('fileMarhunMain')
+        ->where('caw_id', $request->caw_id)
+        ->where('lelong_id', $request->lelong_id)
+        ->select(['id','norujukan', 'marhun', 'nilaimarhun', 'status_semak'])
+        ->get();
+        
+        $belum_semak = $lelong_bid_all->where('status_semak', 0)->count();
+        
+        return response()->json([
+            "jumlah_surat" => $lelong_bid_all->count(),
+            "belum_semak" => $belum_semak,
+            "lelong_bid" => $lelong_bid_all,
+        ]);
+    }
+
+    public function showPhotoMarhun(Request $request)
+    {
+        $fileMarhun = FileMarhun::find($request->filemarhun_id, ['file_type']);
+
+        $directory = "/{$request->norujukan}/overall_photo/";
+        $imageExtension = $fileMarhun->file_type;
+
+        $marhunImageFileName = "overall.{$imageExtension}";
+
+        if (Storage::disk('marhun')->exists("{$directory}${marhunImageFileName}")) {
+            $marhun_photo = Storage::disk('marhun')->get("{$directory}${marhunImageFileName}");
+            return base64_encode($marhun_photo);
+        } else {
+            return 0;
+        }
+    }
+
 }

app/Http/Controllers/PembidaController.php

@@ -22,18 +22,20 @@ use App\Models\LogUser;
 use App\Models\FileResit;
 use App\Models\Invoice;
 use App\Models\ScanJual;
-
+use App\Services\ResitPhotoService;
 
 class PembidaController extends Controller
 {
+    private $resitPhotoService;
     /**
      * Create a new controller instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct(ResitPhotoService $resitPhotoService)
     {
         $this->middleware('auth');
+        $this->resitPhotoService = $resitPhotoService;
     }
 
     /**
@@ -311,6 +313,7 @@ class PembidaController extends Controller
             $listwinner[$index1]['payment_id'] = $payment_id;
             $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
             $listwinner[$index1]['jenisbayaran']['status'] = ($detailspayment) ? $detailspayment['status'] : 0;
+            $listwinner[$index1]['jenisbayaran']['kaedah_bayaran'] = ($detailspayment) ? $detailspayment['status_payment_opt'] : 0;
 
         }
        
@@ -324,7 +327,7 @@ class PembidaController extends Controller
 
     
 
-    public function detailsbidaan($user_id, $kodcaw)
+    public function detailsbidaan($lelong_id, $user_id, $kodcaw)
     {
 
         $userdetail = User::where('id', $user_id)->first();
@@ -336,6 +339,7 @@ class PembidaController extends Controller
         ->where('cawangan.caw_code', $kodcaw)
         ->where('lelongbid.kodcaw', $kodcaw)
         ->where('lelongbidder.status_payment', 1)
+        ->where('lelongbid.lelong_id', $lelong_id)
         ->select('lelongbid.id as lelongbid_id',
                  'lelongbidder.id as lelongbidder_id',
                  'lelongbid.lelong_id',
@@ -375,6 +379,37 @@ class PembidaController extends Controller
         return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw'));
     }
 
+    public function detailsbayaran($lelong_id, $user_id, $kodcaw)
+    {
+        $lelong = Lelong::find($lelong_id, ['id', 'tarikh_lelong']);
+        $cawangan = Cawangan::where('caw_code', $kodcaw)->select('id', 'caw_name')->first();
+        $user = User::find($user_id, ['id', 'name']);
+        $lelong_bid_all = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
+            ->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+            ->where('lelongbid.nopembeli', $user_id)
+            ->where('cawangan.caw_code', $kodcaw)
+            ->where('lelongbid.kodcaw', $kodcaw)
+            ->where('lelongbidder.status_payment', 1)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->select('lelongbid.id', 'norujukan', 'hargabida')
+            ->get();
+        $disahkan_oleh = Payment::with('disahkanOleh:id,name')->where('lelongbid_id', $lelong_bid_all[0]->id)->where('disahkan_oleh', '<>', null)->select('id', 'disahkan_oleh', 'disahkan_pada', 'remark')->first();
+
+        $total_payment = $lelong_bid_all->sum('hargabida');
+        $fileresit_all = FileResit::where('lelong_id', $lelong_id)->where('user_id', $user_id)->where('kodcaw', $kodcaw)->get();
+        if ($disahkan_oleh->remark == "BERJAYA BAYARAN ONLINE") {
+            $disahkan_oleh->remark = "FPX";
+        }
+
+        return view('pembida.detailspembayaran', compact('lelong', 'cawangan', 'user', 'fileresit_all', 'total_payment', 'disahkan_oleh'));
+    }
+
+    public function showPhotoResit(Request $request)
+    {
+        $resit = FileResit::where('id', '=', $request->fileresit_id)->first();
+        return $this->resitPhotoService->show($request->user_id, $resit);
+    }
+
     public function belumbayarbidaan(Request $request)
     {
 
@@ -830,10 +865,12 @@ class PembidaController extends Controller
     public function statuspembayaran(Request $request)
     {
         $kodcaw = $request->kodcaw;
-        
+        $tarikh_semasa = date('Y-m-d', strtotime(now()));
         
         $sumtotalpayment = 0;
         $arrayinfo = [];
+        $arraysms = [];
+        $arraysls = [];
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
@@ -853,7 +890,13 @@ class PembidaController extends Controller
             ->orderBy('lelong_id')
             ->get();
            
-            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            // array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            if($details['tarikh_lelong'] == $tarikh_semasa)
+            {
+                array_push($arraysms, ['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            } else {
+                array_push($arraysls, ['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            }
            
             foreach($detailsinfo as $index1=>$cal){
                 $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -904,7 +947,73 @@ class PembidaController extends Controller
         // $sumtotalpayment += $total_payment;
         // dd($sumtotalpayment);
         // dd($arrayinfo);
-        return view('pembida.statuspembayaran',compact('listwinner','lelong','arrayinfo','detailsinfo'));
+        return view('pembida.statuspembayaran',compact('arraysms','arraysls','listwinner','lelong','arrayinfo','detailsinfo'));
+    }
+
+    public function statuspembayaran2()
+    {
+        $current_date = Carbon::now();
+        $current_date = $current_date->toDateString();
+
+        $lelong_all = Lelong::with(
+            'cawangan:id,caw_code,caw_name',
+            'lelongBidJual:lelong_id,id,norujukan,caw_id,kodcaw',
+            'lelongBidJual.lelongBidderMenang:lelongbid_id,user_id,nama_bidder,hargabida,status_payment',
+            'lelongBidJual.lelongBidderMenang.payment:lelongbid_id,user_id,status_payment_opt',
+            'lelongBidJual.lelongBidderMenang.payment.user:id,name',
+        )->select('id', 'tarikh_lelong')->where('sts_lelong', 3)->get();
+
+        $lelong_array = [];
+        foreach ($lelong_all as $lelong) {
+            $allCawangan = $lelong->cawangan->keyBy('caw_code');
+            $lelongBid = $lelong->lelongBidJual->groupBy('kodcaw');
+
+            foreach ($lelongBid as $index => $lelong_bid) {
+                foreach ($allCawangan as $data => $cawangan) {
+                    if ($data == $index) {
+                        $cawangan['lelongBid'] = $lelong_bid;
+                    }
+                }
+            }
+            $cawangan_array = [];
+            foreach ($lelong->cawangan as $caw) {
+                $users = $caw->lelongBid->pluck('lelongBidderMenang')->groupBy('user_id');
+                $jumlah_bidaan_cawangan = $caw->lelongBid->pluck('lelongBidderMenang')->sum('hargabida');
+                $user_array = [];
+                foreach ($users as $user) {
+//dd($user[0]);
+                    $user_to_be_added = [];
+                    $user_to_be_added['name_bidder'] = $user[0]->nama_bidder;
+                    $user_to_be_added['jumlah_bidaan'] = $user->sum('hargabida');
+                    $user_to_be_added['status_bayaran'] = $user[0]->status_payment;
+		    if($user[0]->payment != null) {
+                    	$user_to_be_added['jenis_bayaran'] = $user[0]->payment->status_payment_opt; }
+		    else {$user_to_be_added['jenis_bayaran'] = "99";}
+                    array_push($user_array, $user_to_be_added);
+                }
+                $cawangan_to_be_added = [];
+                $cawangan_to_be_added['caw_code'] = $caw->caw_code;
+                $cawangan_to_be_added['caw_name'] = $caw->caw_name;
+                $cawangan_to_be_added['pembida'] = $user_array;
+                $cawangan_to_be_added['jumlah_bidaan_cawangan'] = $jumlah_bidaan_cawangan;
+                array_push($cawangan_array, $cawangan_to_be_added);
+            }
+            $lelong_to_be_added = [];
+            $lelong_to_be_added['lelong_id'] = $lelong->id;
+            $lelong_to_be_added['tarikh_lelong'] = $lelong->tarikh_lelong;
+            $lelong_to_be_added['cawangan'] = $cawangan_array;
+            array_push($lelong_array, $lelong_to_be_added);
+        }
+        $lelong_array_semasa = [];
+        $lelong_array_selesai = [];
+        foreach ($lelong_array as $lelong) {
+            if ($lelong['tarikh_lelong'] == $current_date) {
+                array_push($lelong_array_semasa, $lelong);
+            } else {
+                array_push($lelong_array_selesai, $lelong);
+            }
+        }
+        return view('pembida.statuspembayaran2', compact('lelong_array_semasa', 'lelong_array_selesai'));
     }
 
     public function statuspembayaranbypembida(Request $request)
@@ -1054,6 +1163,7 @@ class PembidaController extends Controller
                     {
                         // dd($detailspayment);
                         $detailspayment  = null;
+                        $scanserah = null;
                         if($sag['payment_id'] != null)
                         {
                             $detailspayment = Payment::where('id', $sag['payment_id'])->first();
@@ -1067,7 +1177,8 @@ class PembidaController extends Controller
                         }else
                         {
                             $total_payment = '0.00';
-                            $scanserah = 'Belum Bayar';
+                            //$scanserah = 'Belum Bayar';
+                            $scanserah = null;
                         }
 
                     }

app/Http/Controllers/ReportAllController.php

@@ -78,77 +78,6 @@ class ReportAllController extends Controller
        return view('lelongall.laporanlelongall', compact('lelong','arrayinfo'));
     }
 
-    public function senaraibrglelongall(Request $request, $kali){
-     
-
-        $kali = $kali;
-        $lelong = Lelong::where('kali','=',$kali)->first();
-        // dd($lelong);
-
-        $cawanganlel = CawanganLelong::where('kali','=',$kali)->get();
-        // dd($cawanganlel);
-
-        
-        $arraycaw = [];
-
-        $total_marhun = 0;
-        $total_berat = 0;
-        $total_hargaasas = 0;
-      
-
-        foreach($cawanganlel as $cawlel)
-        {
-            $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
-            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas')
-            ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id)
-            ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id)
-            ->get();
-            // dd($cawlel);
-            
-            $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
-            ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
-            ->where('cawangan_lelong.kali','=',$kali)->first();
-            
-            $packet = 0;
-            $berat = 0;
-            $hargaasas = 0;
-            $id = $cawlel->lelong_id;
-            
-            foreach($brglel as $index1=>$bid)
-            {
-                
-                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
-                $berat = $berat + $bid['berat'];
-                $hargaasas = $hargaasas + $bid['hargaasas'];
-
-
-            }
-
-            array_push($arraycaw,[
-                'id_cawangan'=> $cawangan['id'],
-                'cawangan'=>$cawangan['caw_name'],
-                't_lelong'=>$t_lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($brglel),
-                'berat'=>$berat,
-                'hargaasas'=>$hargaasas,
-               
-            ]);
-
-            $total_marhun = $total_marhun + sizeof($brglel);
-            $total_berat = $total_berat + $berat;
-            $total_hargaasas = $total_hargaasas  + $hargaasas;
-           
-        }
-
-        $pdf = PDF::loadView('pdf.listlelongall',compact('arraycaw',
-            'total_marhun',
-            'total_berat',
-            'total_hargaasas',
-            'kali'))->setPaper('a4', 'potrait');
-            
-        return $pdf->download('Senarai Barang Lelong All.pdf');
-    }
 
     public function lapbidaanpembidaindexall (){
         
@@ -178,66 +107,82 @@ class ReportAllController extends Controller
     
         $kali = $kali;
         $lelong = Lelong::where('kali','=',$kali)->first();
-        // dd($lelong);
 
         $cawanganlel = CawanganLelong::where('kali','=',$kali)->get();
-        // dd($cawanganlel);
 
-        
+        $arraycaw = [];      
-        $arraycaw = [];
+        $total_hargaasas = 0;   
-
+        $total_marhun = 0; 
-        $total_marhun = 0;
         $total_berat = 0;
-        $total_hargaasas = 0;
+        $total_hargajual = 0;
-        $total_hargabida = 0;
+     
-      
 
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+
-            ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+            $databid = LelongBid::   join('cawangan_lelong', function ($join) {
-            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas','lelongbidder.hargabida','lelongbidder.status_bidder')
+                $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
-            ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id)
+                     ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id');
-            ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id)
+            })
+            // ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah','cawangan_lelong.kali','lelongbid.hargajual')
+            ->where('cawangan_lelong.caw_id','=', $cawlel->caw_id)
+            ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)
             ->get();
-            
+
             $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
             ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
             ->where('cawangan_lelong.kali','=',$kali)->first();
-            
+
+
             $packet = 0;
-            $berat = 0;
+            $berat = 0;          
             $hargaasas = 0;
-            $hargabida = 0;
+            $hargajual = 0;
+           
             $id = $cawlel->lelong_id;
-            
+
-            foreach($brglel as $index1=>$bid)
+
+            foreach($databid as $index1=>$bid)
             {
                 
                 $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
                 $berat = $berat + $bid['berat'];
+
                 $hargaasas = $hargaasas + $bid['hargaasas'];
-                $hargabida = $hargabida + $bid['hargabida'];
+                $hargajual = $hargajual + $bid['hargajual'];
-                
+
+
+             
+
 
             }
 
             array_push($arraycaw,[
                 'id_cawangan'=> $cawangan['id'],
                 'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$lelong['tarikh_lelong'],
                 't_lelong'=>$t_lelong['tarikh_lelong'],
-                'bil_marhun'=>sizeof($brglel),
+                'bil_marhun'=>sizeof($databid),
                 'berat'=>$berat,
                 'hargaasas'=>$hargaasas,
-                'hargabida'=>$hargabida,
+                'hargajual'=>$hargajual,
-               
             ]);
 
-            $total_marhun = $total_marhun + sizeof($brglel);
+
-            $total_berat = $total_berat + $berat;
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;          
             $total_hargaasas = $total_hargaasas  + $hargaasas;
-            $total_hargabida = $total_hargabida + $hargabida;
+            $total_hargajual = $total_hargajual + $hargajual;
+           
+
+
+            $data = Lelong::where('kali','=',$kali)
+            ->first();
+            // dd($data);
            
         }
 
@@ -245,13 +190,15 @@ class ReportAllController extends Controller
 
 
         $pdf = PDF::loadView('pdf.pdfsenarailapbidaanall',compact('arraycaw',
-                                                         'total_marhun',
+                                                                    'total_marhun',
-                                                         'total_berat',
+                                                                    'total_berat',                                                                   
-                                                         'total_hargaasas',
+                                                                    'total_hargaasas',
-                                                         'total_hargabida',
+                                                                    'total_hargajual',                                                                   
-                                                         'kali'))->setPaper('a4', 'potrait');
+                                                                    'data',
+                                                                    'kali'))->setPaper('a4', 'potrait');
         
-        return $pdf->download('Senarai Barang Lelong All.pdf');
+        return $pdf->download('Senarai Lelong Pembida By Batch.pdf');
+
 
 
         
@@ -306,13 +253,17 @@ class ReportAllController extends Controller
         foreach($cawanganlel as $cawlel)
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
-            $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+            $databid = LelongBid::join('cawangan_lelong', function ($join) {
-            ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+                $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
+                     ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id');
+            })
+            //->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
             ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
             'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah')
-            ->where('lelongbidder.status_bidder','=','1')
+            //->where('lelongbidder.status_bidder','=','1')
             ->where('cawangan_lelong.caw_id','=', $cawlel->caw_id)
             ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)
             ->get();
       
             $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
@@ -518,14 +469,87 @@ class ReportAllController extends Controller
         ->setPaper('a4','potrait');
 
         return $pdf->download('Laporan Barang Lelong Pembida.pdf');
-     
-
-
 
      }
 
 
-  
+  public function senaraibrglelongall(Request $request, $kali){
+     
+
+        $kali = $kali;
+        $lelong = Lelong::where('kali','=',$kali)->first();
+        // dd($lelong);
+
+        $cawanganlel = CawanganLelong::where('kali','=',$kali)->get();
+        // dd($cawanganlel);
+
+        
+        $arraycaw = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_hargaasas = 0;
+      
+
+        foreach($cawanganlel as $cawlel)
+        {
+            $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
+            //$brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+            $brglel = LelongBid::   join('cawangan_lelong', function ($join) {
+                $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id')
+                     ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id');
+            })
+            ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas')
+            ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id)
+            ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)
+            ->get();
+            // dd($cawlel);
+            
+            $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
+            ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id)
+            ->where('cawangan_lelong.kali','=',$kali)->first();
+            
+            $packet = 0;
+            $berat = 0;
+            $hargaasas = 0;
+            $id = $cawlel->lelong_id;
+            
+            
+            foreach($brglel as $index1=>$bid)
+            {
+                
+                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+
+
+            }
+
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$t_lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($brglel),
+                'berat'=>$berat,
+                'hargaasas'=>$hargaasas,
+               
+            ]);
+
+            $total_marhun = $total_marhun + sizeof($brglel);
+            $total_berat = $total_berat + $berat;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+           
+        }
+
+        $pdf = PDF::loadView('pdf.listlelongall',compact('arraycaw',
+            'total_marhun',
+            'total_berat',
+            'total_hargaasas',
+            'kali'))->setPaper('a4', 'potrait');
+            
+        return $pdf->download('Senarai Barang Lelong All.pdf');
+    }
 
     
   

app/Http/Controllers/ReportCawanganController.php

@@ -903,9 +903,46 @@ class ReportCawanganController extends Controller
           
       return $pdf->download('Laporan Tuntut/Belum Baki Lelong.pdf');
 
-
   }
 
+  public function indexubahmarhun (){
+
+    $arraydetails = [];
+
+    $user =  Auth::user();
+    $caw = Cawangan::where('caw_code','=',$user->kodcaw)
+    ->first(); 
+    // dd($caw);
+    
+    $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+    ->join('pengesahan','lelong.id','=','pengesahan.lelong_id')
+    ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+    ->where('cawangan.caw_code','=',$user['kodcaw'])
+    ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa')
+    ->distinct()
+    ->orderBy('cawangan_lelong.lelong_id')
+    ->get()
+    ->toArray();
+    // dd($laporan);
+
+
+    foreach($laporan as $brg)
+    {
+        $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('lelong_id', $brg['lelong_id'])
+        ->where('cawangan.caw_code','=',$user['kodcaw'])
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->get()
+        ->toArray();
+        array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
+    }
+
+
+    return view('marhun.ubahmarhuncaw', compact('arraydetails'));
+
+}
+
 
     
 

app/Http/Controllers/ReportController.php

@@ -1171,7 +1171,10 @@ class ReportController extends Controller
         $arraydetails = [];
         $total_berat = 0;
         $total_hargaasas = 0;
-        
+
+         $t_mula = $request->datemula;
+         $t_hingga = $request->datehingga;
+               
         $cawangan_id = $request->caw;
 
         if($request->datemula == null){
@@ -1188,33 +1191,84 @@ class ReportController extends Controller
             $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
         }
 
-        $cawangan = Cawangan::where('cawangan.id',$cawangan_id)
+        // $cawangan = Cawangan::join('cawangan_lelong','cawangan_lelong.caw_id','=','cawangan.id')
-        ->join('cawangan_lelong','cawangan.id','=','cawangan_lelong.caw_id')
+        // ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        // ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw')
-        ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw')
+        // ->where('lelong.tarikh_lelong','>=',$t_mula)
-        ->where([['tarikh_lelong','>=',$request->datemula],['tarikh_lelong','<=',$request->datehingga]])
+        // ->where('lelong.tarikh_lelong','<=',$t_hingga)
-        ->select('norujukan','marhun','berat','hargaasas','cawangan_lelong.lelong_id','lelongbid.id','cawangan.caw_code')
+        // ->where('cawangan_lelong.caw_id',$cawangan_id)
-        ->get()->toArray();
+        // ->select('cawangan.id','cawangan_lelong.lelong_id','cawangan.caw_code','lelongbid.norujukan','lelongbid.marhun','lelongbid.berat','lelongbid.hargaasas','lelong.tarikh_lelong','lelongbid.lelong_id')
+        // ->get()->toArray();
 
+        $namacaw = Cawangan::where('id',$cawangan_id)
+        ->select('caw_name')
+        ->get();
+
+        $cawangan = LelongBid::join('lelong','lelong.id','=','lelongbid.lelong_id')
+        ->where('lelong.tarikh_lelong','>=',$t_mula)
+        ->where('lelong.tarikh_lelong','<=',$t_hingga)
+        ->where('lelongbid.caw_id',$cawangan_id)
+        ->select('lelongbid.lelong_id','lelongbid.norujukan','lelongbid.marhun','lelongbid.berat','lelongbid.hargaasas','lelong.tarikh_lelong')
+        ->get()->toArray();
+        //dd($cawangan);
 
         foreach($cawangan as $index1=>$brglelong){
             
-            $data = LelongBid::where('id','=',$brglelong['id'])
+            // $data = LelongBid::where('id','=',$brglelong['id'])
-            ->where('kodcaw','=',$brglelong['caw_code'])
+            // ->where('kodcaw','=',$brglelong['caw_code'])
-            ->get();
+            // ->select('norujukan','marhun','berat','hargaasas','id')
-            $total_berat = $total_berat + ($data->sum('berat'));
+            // ->get();
-            $total_hargaasas = $total_hargaasas + ($data->sum('hargaasas'));
+            $total_berat = $total_berat + $brglelong['berat'];
-            
+            $total_hargaasas = $total_hargaasas + $brglelong['hargaasas'];
-            
         }
-        // dd($total_berat);
 
-
+        return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas','namacaw','t_mula','t_hingga'));
-
-        return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas'));
     }
 
+    public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){
 
+        $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
+        ->where('pengesahan.status', 1)
+        ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
+        ->whereNotNull('pengesahan.disahkan_oleh')
+        ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
+        ->orderBy('pengesahan.lelongbid_id')
+        ->distinct()
+        ->get();
+
+        foreach($cawangan as $index1=>$caw)
+        {
+            
+            $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+            $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first();
+            $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first();
+
+            $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id'])
+            ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun')
+            ->get();
+
+          
+            $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id'])
+            ->get()
+            ->toArray();
+            $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name'];
+            $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name'];
+            $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name'];
+            $cawangan[$index1]['detailmarhun']=$status;
+            $cawangan[$index1]['detail']=$marhuns;
+        }
+
+        $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first();
+
+
+    //    return view('pdf.laporanubahmarhun', compact('cawangan','lelong_id','getpengesahan','t_lelong'));
+
+       $pdf = PDF::loadView('pdf.laporanubahmarhun',compact('cawangan','lelong_id','getpengesahan','t_lelong'))
+        ->setPaper('a4', 'potrait');
+            
+        return $pdf->download('Senarai Ubah Marhun.pdf');
+    }
     
 
     

app/Http/Controllers/SerahanController.php

@@ -338,6 +338,7 @@ class SerahanController extends Controller
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw',$user->kodcaw)
         ->select('lelongbid.id','lelongbid.norujukan','lelongbid.hargajual')
+        ->orderBy('lelongbid.id')
         // ->where('payment.resit_id',$resit_id)
         ->get();
         // dd($SAGWin);

app/Http/Controllers/TangguhLelongController.php

@@ -128,9 +128,8 @@ class TangguhLelongController extends Controller
                 foreach($getic as $index1=>$ic)
                 {
                     
-                        $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
+                        $getnorujukan = LelongBid::where('norujukan', $ic['norujukan'])
-                        ->where('norujukan', $ic['norujukan'])
+                        // ->where('jbg', $ic['tempoh'])
-                        ->where('jbg', $ic['tempoh'])
                         ->where('lelongbid.kodcaw', $user['kodcaw'])
                         ->where('lelong_id', $request->lelong_id)
                         ->get();
@@ -156,9 +155,9 @@ class TangguhLelongController extends Controller
                         {
                             
                             $getic[$index1]['user_details'] = $getnorujukan;
-                            $getic[$index1]['t_lelong'] = $getnorujukan[0]['t_lelong'];
+                            $getic[$index1]['t_lelong'] = $lelong->tarikh_lelong;
                             // $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
-                            $getic[$index1]['lelongbid_id'] = $norujukan->lelongbid_id;
+                            $getic[$index1]['lelongbid_id'] = $norujukan['id'];
 
                         }
 
@@ -279,15 +278,14 @@ class TangguhLelongController extends Controller
     {
         $arrayinfo = [];
 
-        $tangguh = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
+        $tangguh = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
-        ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')    
-        ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
         ->where('tangguhlelong.status','!=',4)
         ->where('lelong.sts_lelong',0)
-        ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
+        ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
         ->distinct()
         ->get();
-        // ->toArray();
+        //display only cwgn yg mohon tangguh 24.01.2023..to be continued..done
 
         foreach($tangguh as $index=>$t)
         {
@@ -302,8 +300,6 @@ class TangguhLelongController extends Controller
             array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
         }
 
-        
-
         return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
 
     }
@@ -711,47 +707,54 @@ class TangguhLelongController extends Controller
     public function sentangguh()
     {
         $user = Auth::user();
+        //baru mohon@belum dilulus
+        $tangguh = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
+            ->where('tangguhlelong.kodcaw', $user->kodcaw)
+            ->where(function($query){
+                $query->whereNotNull('tangguhlelong.status')
+                    ->orWhere('tangguhlelong.status','!=', 4);
+            })  
+            ->get();
 
-        // // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id')
+            foreach ($tangguh as $index1 => $t) {
-        // ->where('tangguhlelong.kodcaw', $user->kodcaw)
+                
-        // ->get();
+                    $lelongbid = LelongBid::join('tangguhlelong', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id')
-
+                        ->where('lelongbid.id', $t->lelongbid_id)
-        // foreach($tangguh as $index1=>$t)
+                        ->where('lelongbid.lelong_id', $t->lelong_id)
-        // {
+                        ->where('lelongbid.norujukan', $t->norujukan)
-
+                        ->get();
-        //     $lelongbid = LelongBid::where('id', $t->lelongbid_id)
+                   
-        //     ->where('norujukan', $t->norujukan)
-        //     ->get();
-
-        //     $tangguh[$index1]['tdet'] = $lelongbid;
-        // }
-       // $tangguh = TangguhLelong::join('lelongbid','tangguhlelong.lelongbid_id','=','lelongbid.id')
-       
-       $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
-       ->get();
-    //    dd($tangguh);
-
-       foreach($tangguh as $index1=>$t)
-       {
-            if($t['status'] == 4)
-            {
-                $lelongbid = Lelong::where('id', $t->lelong_id)
-                ->get();
-
-                $tangguh[$index1]['tdet'] = $lelongbid;
-            } else 
-            {
-                $lelongbid = LelongBid::where('id', $t->lelongbid_id)
-                ->where('norujukan', $t->norujukan)
-                ->get();
-
                 $tangguh[$index1]['tdet'] = $lelongbid;
             }
+        
+        //telah dilulus
+        $tlhtangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
+            ->where('tangguhlelong.status','=', 4)
+        ->get();
 
-           
+        foreach ($tlhtangguh as $index1 => $l) {
-       }
+            $lelong = Lelong::join('tangguhlelong','tangguhlelong.lelong_id','=','lelong.id')
+                ->where('lelong.id', $l->lelong_id)
+                ->where('tangguhlelong.kodcaw',$user->kodcaw)
+                ->get();
 
-        return view('tangguhlelong.senaraimohontangguh',compact('user','tangguh'));
+            $tlhtangguh[$index1]['tlh'] = $lelong;
+        }
+        
+        //ditangguh terus dari operasi/ bukan permohonan cwgn
+        $oprtangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
+            ->whereNull('tangguhlelong.status')
+        ->get();
+
+        foreach ($oprtangguh as $index1 => $o) {
+            $lelong = Lelong::join('tangguhlelong','tangguhlelong.lelong_id','=','lelong.id')
+                // ->where('lelong.id', $o->lelong_id)
+                ->where('tangguhlelong.kodcaw',$user->kodcaw)
+                ->get();
+
+            $oprtangguh[$index1]['opr'] = $lelong;
+        }
+        return view('tangguhlelong.senaraimohontangguh', compact('user', 'tangguh', 'tlhtangguh', 'oprtangguh'));
     }
 
     public function uploadborang(Request $request)
@@ -778,6 +781,7 @@ class TangguhLelongController extends Controller
         $currentdate = $currentdate->toDateTimeString();
 
         $pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan')
+        ->where('tangguhlelong.kodcaw', $caw_code)
         ->where('pengesahan.lelong_id', $lelong_id)
         ->whereNull('pengesahan.disahkan_oleh')
         ->whereNull('pengesahan.disahkan_pada')
@@ -885,6 +889,12 @@ class TangguhLelongController extends Controller
             $lelongbid = LelongBid::where('lelongbid.id', $request->lelongbidid_mdl)
             ->delete();
 
+            $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+            ->post(config('app.api_url').'taglel/revert',[
+                'kodcaw'=> $tangguhlelong->kodcaw,
+                'norujukan'=> $request->norujukan_mdl
+                ])
+                ->json();
             return redirect()->route('pengesahan.opsenaraisahtangguh',[$tangguhlelong->lelong_id, $tangguhlelong->kodcaw])
             ->with('success', 'Tangguh Lelong Telah Di Lulus.');
 
@@ -904,58 +914,37 @@ class TangguhLelongController extends Controller
     {
         $arrayinfo = [];
 
-        // $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        $lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id')
-        // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->join('cawangan','cawangan.caw_code','=','tangguhlelong.kodcaw')    
-        // ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
+        ->where(function($query){
-        // ->where('lelong.sts_lelong', 0)
+            $query->whereNull('tangguhlelong.status')
-        // ->where('tangguhlelong.status',4)
+                ->orWhere('tangguhlelong.status','=', 4);
-        // ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','lelong.sts_lelong','cawangan.caw_code')
+        })
-        // ->groupBy('cawangan_lelong.lelong_id')
+        ->select('tangguhlelong.kodcaw','tangguhlelong.lelong_id', 'lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
-        // ->get()
-        // ->toArray();
-
-        $lelong = CawanganLelong::join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id')
-        ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
-        ->where('tangguhlelong.status',4)
-        ->where('lelong.sts_lelong',0)
-        ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
         ->distinct()
-        ->orderBy('cawangan_lelong.lelong_id')
+        ->get();
-        ->get()
+        //display only cwgn yg mohon tangguh 24.01.2023..to be continued ..done
-        ->toArray();
 
-        $lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        foreach($lelong as $index=>$info)
-        ->where('lelong.sts_lelong',0)
-        ->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong')
-        ->distinct()
-        ->orderBy('lelong_id')
-        ->get()
-        ->toArray();
-        // dd($lelong);
-
-        foreach($lelong as $info)
         {
-
-            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->where('lelong_id',$info['lelong_id'])
-            ->get()
-            ->toArray();
-
             $sag = TangguhLelong::where('lelong_id', $info['lelong_id'])
-            // ->where('kodcaw', $info['caw_code'])
+            ->where('kodcaw', $info['caw_code'])
-            ->where('status',4)
+            ->where(function($query){
+                $query->whereNull('tangguhlelong.status')
+                    ->orWhere('tangguhlelong.status','=', 4);
+            })
             ->select('norujukan')
             ->get()
             ->count();
 
-            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo, 'sag'=>$sag]);
+            $tangguh[$index]['bilsag'] = $sag;
-            // dd($arrayinfo);
+            array_push($arrayinfo,['info'=>$info, 'sag'=>$sag]);
         }
 
         return view('tangguhlelong.senleltlhtangguh',compact('lelong', 'arrayinfo'));
     }
 
+    
     public function operasisenlulustangguh($lelong_id, $caw_code)
     {
         $caw_code = $caw_code;
@@ -963,8 +952,12 @@ class TangguhLelongController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $tangguh = TangguhLelong::where('status',4)
+        $tangguh = TangguhLelong::where(function($query){
+            $query->whereNull('tangguhlelong.status')
+                ->orWhere('tangguhlelong.status','=', 4);
+        })
         ->where('kodcaw','=',$caw_code)
+        ->where('lelong_id','=',$lelong_id)
         ->get();
 
         // dd($tangguh);
@@ -1014,4 +1007,6 @@ class TangguhLelongController extends Controller
         ]);
 
     }
+
+    
 }

app/Http/Controllers/UserController.php

@@ -139,6 +139,11 @@ class UserController extends Controller
             $user['token'] = '';
             $user['password'] = Hash::make($request->password);
             $user->save();
+            // dd($user->user_type);
+            if($user->user_type = 2){
+                return redirect()->to('https://bid.arrahn.com.my');
+            }
+            
             return redirect()->route('login')->with('success', 'Berjaya! Katalaluan Anda Telah Didaftarkan.');
         }
         return redirect()->route('forgot-password')->with('failed', 'Gadal! Sila Cuba Lagi...');

app/Models/FileResit.php

@@ -18,6 +18,9 @@ class FileResit extends Model
        'file_type',
        'filename',
        'deleted_at',
-       'deleted_by'
+       'deleted_by',
+       'original_file_type',
+       'original_size',
+       'compress_size'
     ];
 }

app/Models/LelongBid.php

@@ -54,7 +54,7 @@ class LelongBid extends Model
     }
 
     public function fileMarhunMain() {
-        return $this->hasOne(FileMarhun::class, 'lelongbidmarhun_id');
+        return $this->hasOne(FileMarhun::class, 'lelongbid_id');
     }
 
     public function lelong()

app/Models/LelongBidder.php

@@ -27,4 +27,9 @@ class LelongBidder extends Model
     public function lelongbid() {
         return $this->hasOne(LelongBid::class,'id', 'lelongbid_id');
     }
+
+    public function payment()
+    {
+        return $this->hasOne(Payment::class, 'lelongbid_id', 'lelongbid_id')->where('remark', '<>', '');
+    }
 }

app/Models/Payment.php

@@ -41,4 +41,15 @@ class Payment extends Model
         'disahkan_pada',
         'disahkan_oleh'
     ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+
+    public function disahkanOleh()
+    {
+        return $this->belongsTo(User::class, 'disahkan_oleh', 'id');
+
+    }
 }

app/Models/Resit.php

@@ -20,6 +20,7 @@ class Resit extends Model
         'total_payment',
         'resit_type', // 1 = fee , 2 = bid
         'status', //status => 1 = paid , 2 = pending
-        'paid_at'
+        'paid_at',
+        'response'
     ];
 }

app/Models/User.php

@@ -73,4 +73,9 @@ class User extends Authenticatable
         return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw');
     }
 
+    public function payment()
+    {
+        return $this->hasMany(Payment::class, 'user_id', 'id');
+    }
+
 }

app/Services/ResitPhotoService.php

@@ -41,9 +41,9 @@ class ResitPhotoService
         $fileresit_id = $resit->id;
         // dd($fileresit_id);;
 
-        $photo_type_name = $resit->photo_type === 1 ? '1' : '2';
+        // $photo_type_name = $resit->photo_type === 1 ? '1' : '2';
 
-        $directory = $user_id.$DS.$lelong_id.$DS.$photo_type_name.$DS;
+        $directory = $user_id.$DS.$lelong_id.$DS;
         // dd($directory);
         $imageExtension = $resit->file_type;
         // dd($imageExtension);

composer.json

@@ -19,6 +19,7 @@
         "laravelcollective/html": "^6.3",
         "php-http/guzzle7-adapter": "^1.0",
         "pusher/pusher-php-server": "^7.0",
+        "rap2hpoutre/laravel-log-viewer": "^2.2",
         "spatie/laravel-image-optimizer": "^1.6",
         "spatie/laravel-permission": "^5.3"
     },

composer.lock

@@ -5543,6 +5543,69 @@
             ],
             "time": "2021-09-25T23:10:38+00:00"
         },
+        {
+            "name": "rap2hpoutre/laravel-log-viewer",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rap2hpoutre/laravel-log-viewer.git",
+                "reference": "52e7c703a1e83cdae450f406c7d8472332dfb34e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/52e7c703a1e83cdae450f406c7d8472332dfb34e",
+                "reference": "52e7c703a1e83cdae450f406c7d8472332dfb34e",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0|^9.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.7.*|^7.0",
+                "phpunit/phpunit": "^7|^9.5.10"
+            },
+            "type": "laravel-package",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Rap2hpoutre\\LaravelLogViewer\\": "src/"
+                },
+                "classmap": [
+                    "src/controllers"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "rap2hpoutre",
+                    "email": "raphaelht@gmail.com"
+                }
+            ],
+            "description": "A Laravel log reader",
+            "keywords": [
+                "laravel",
+                "log",
+                "log-reader",
+                "log-viewer",
+                "logging",
+                "lumen"
+            ],
+            "support": {
+                "issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues",
+                "source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/v2.2.0"
+            },
+            "time": "2022-04-06T15:15:40+00:00"
+        },
         {
             "name": "react/promise",
             "version": "v2.9.0",

config/app.php

@@ -176,7 +176,7 @@ return [
         App\Providers\RouteServiceProvider::class,
         App\Providers\TelescopeServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
-
+        Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class,
         //form
         Collective\Html\HtmlServiceProvider::class,
 

config/filesystems.php

@@ -49,6 +49,13 @@ return [
             'visibility' => 'public',
         ],
 
+        'test' => [
+            'driver' => 'local',
+            'root' => storage_path('app/test'),
+            'url' => env('APP_URL').'/test_photo',
+            'visibility' => 'public',
+        ],
+
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),

config/marhun_camera.php

@@ -1,7 +1,6 @@
 <?php
 
 return [
-
+    'marhun_cameras_chrome' => array_map(fn ($camera_label) => trim($camera_label), explode(',', env('MARHUN_CAMERAS_CHROME'))) ?? 'Doccamera',
-    'marhun_cameras' => array_map(fn ($camera_label) => trim($camera_label), explode(',', env('MARHUN_CAMERAS'))) ?? 'Doccamera'
+    'marhun_cameras_firefox' => array_map(fn ($camera_label) => trim($camera_label), explode(',', env('MARHUN_CAMERAS_FIREFOX'))) ?? "jSsq68fCLg2guCV2FaFzvXXiKBqbPA25DaQAWWotfqY="
-
 ];

database/migrations/2022_01_25_010223_create_payment_table.php

@@ -46,6 +46,7 @@ class CreatePaymentTable extends Migration
             $table->decimal('total_payment', $precision = 11, $scale = 2);
             $table->string('resit_type'); // 1 = fee , 2 = bid
             $table->string('status')->nullable(); //status => 1 = paid , 2 = pending
+            $table->longText('response');
             $table->timestamp('paid_at')->nullable();
             $table->timestamps();
 

database/migrations/2022_06_12_105248_create_fileresit_table.php

@@ -19,7 +19,10 @@ class CreateFileresitTable extends Migration
             $table->unsignedBigInteger('lelong_id')->unsigned();
             $table->string('kodcaw')->nullable();
             $table->unsignedBigInteger('payment_id')->unsigned();
-            $table->string('file_type');
+            $table->string('original_file_type');
+            $table->string('file_type')->nullable();
+            $table->integer('original_size')->nullable();
+            $table->integer('compress_size')->nullable();
             $table->datetime('deleted_at')->nullable();
             $table->integer('deleted_by')->nullable();
             $table->timestamps();

database/seeders/RolesSeeder.php

@@ -37,6 +37,14 @@ class RolesSeeder extends Seeder
             'name' => 'sistem',
             'description' => 'Pengurusan connection database dan environment system'
         ]);
+        Permission::create([
+            'name' => 'pengurusangambar',
+            'description' => 'Pengurusan gambar mengikut pilihan parameter pengguna'
+        ]);
+        Permission::create([
+            'name' => 'pengurusanuploaddownload',
+            'description' => 'Pengurusan upload download'
+        ]);
 
         //khazanah
         Permission::create([
@@ -160,20 +168,30 @@ class RolesSeeder extends Seeder
             'description' => 'Laporan Lelong Khas'
         ]);
 
+        //callcenter
+        Permission::create([
+            'name' => 'notisperingatan',
+            'description' => 'Penjanaan Notis Peringatan Oleh Call Center'
+        ]);
+
         // create roles and assign existing permissions
         $role1 = Role::create(['name' => 'admin']);
         $role1->givePermissionTo('pengguna');
         $role1->givePermissionTo('pengurusanlelongan');
         $role1->givePermissionTo('analisa');
         $role1->givePermissionTo('sistem');
+        $role1->givePermissionTo('pengurusangambar');
+        $role1->givePermissionTo('pengurusanuploaddownload');
 
         $role2 = Role::create(['name' => 'khazanah']);
         $role2->givePermissionTo('semakanmarhun');
         $role2->givePermissionTo('kemaskinimarhun');
+        $role2->givePermissionTo('pengurusangambar');
 
         $role3 = Role::create(['name' => 'penilai']);
         $role3->givePermissionTo('semakanmarhun');
         $role3->givePermissionTo('kemaskinimarhun');
+        $role3->givePermissionTo('pengurusangambar');
 
         $role4 = Role::create(['name' => 'pengurus-cawangan']);
         $role4->givePermissionTo('pendaftaranpembida');
@@ -183,7 +201,7 @@ class RolesSeeder extends Seeder
         $role4->givePermissionTo('serahan');
         $role4->givePermissionTo('tangguhlelong');
         $role4->givePermissionTo('report');
-
+        $role4->givePermissionTo('pengurusangambar');
 
         $role5 = Role::create(['name' => 'jurulelong']);
         $role5->givePermissionTo('pendaftaranbatch');
@@ -207,11 +225,14 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('jananotis');
         $role6->givePermissionTo('backdate');
         $role6->givePermissionTo('reportkali');
+        $role6->givePermissionTo('pengurusangambar');
 
 
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');
+        $role7->givePermissionTo('pengesahanpembida');
+        $role7->givePermissionTo('report');
 
         $role8 = Role::create(['name' => 'pembida']);
         $role8->givePermissionTo('pendaftaranpembida');
@@ -222,7 +243,16 @@ class RolesSeeder extends Seeder
         $role9->givePermissionTo('sebelumdaftarbatch');
         $role9->givePermissionTo('lelonghargajual');
         $role9->givePermissionTo('reportcawkhas');
-        
+
+        $role10 = Role::create(['name' => 'callcenter']);
+        $role10->givePermissionTo('notisperingatan');
+
+        $role11 = Role::create(['name' => 'pengurus-operasi']);
+        $role11->givePermissionTo('pengurusangambar');
+        $role11->givePermissionTo('pengesahan');
+        $role11->givePermissionTo('report');
+        $role11->givePermissionTo('pengesahanpembida');
+        $role11->givePermissionTo('pendaftaranbatch');
 
 
         // $role3 = Role::create(['name' => 'Super-Admin']);
@@ -313,5 +343,13 @@ class RolesSeeder extends Seeder
             'user_type' => 1
         ]);
         $user->assignRole($role9);
+
+        $user = \App\Models\User::factory()->create([
+            'name' => 'Call Center',
+            'username' => 'callcenter',
+            'email' => 'callcenter@example.com',
+            'user_type' => 1
+        ]);
+        $user->assignRole($role10);
     }
 }

package.json

@@ -27,6 +27,10 @@
         "@fortawesome/fontawesome-free": "^5.15.4",
         "datatables.net": "^1.11.3",
         "datatables.net-dt": "^1.11.3",
-        "jquery-confirm": "^3.3.4"
+        "jquery-confirm": "^3.3.4",
+        "v-viewer": "^3.0.11",
+        "viewerjs": "^1.11.2",
+        "vue": "^3.2.13",
+        "vue-loader": "^17.0.1"
     }
 }

public/css/app.css

@@ -16434,375 +16434,3 @@ readers do not read off random characters that represent icons */
   font-family: "Font Awesome 5 Brands";
   font-weight: 400;
 }
-
-.header-style {
-  padding: 0px 0px;
-  display: flex;
-  align-items: center;
-  background-color: #fff;
-}
-
-.header-style-icon {
-  padding: 15px 18px;
-  border-right: 1px solid #ced4da;
-}
-
-.header-style-icon:hover {
-  background-color: #6c757d;
-  color: white;
-  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
-}
-
-.header-style-title {
-  font-size: 1.125rem;
-  font-weight: bold;
-  text-transform: capitalize;
-  padding: 12px 12px;
-}
-
-a,
-a:hover,
-a:focus {
-    color: inherit;
-    text-decoration: none;
-    transition: all 0.3s;
-}
-
-.navbar {
-    padding: 15px 10px;
-    background: #fff;
-    border: none;
-    border-radius: 0;
-    margin-bottom: 40px;
-    box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-btn {
-    box-shadow: none;
-    outline: none !important;
-    border: none;
-}
-
-.line {
-    width: 100%;
-    height: 1px;
-    border-bottom: 1px dashed #ddd;
-    margin: 40px 0;
-}
-
-
-/* ---------------------------------------------------
-    SIDEBAR STYLE
------------------------------------------------------ */
-
-#sidebar {
-    bottom: 0;
-    overflow-y: scroll;
-    width: 265px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    z-index: 999;
-    background: #1E1E2D;
-    /* color: rgb(41, 39, 39); */
-    color: #808080;
-    transition: all 0.3s;
-}
-
-#sidebar.active {
-    margin-left: -265px;
-}
-
-.sidebar-header {
-  padding: 20px;
-  display: flex;
-  justify-content: space-between;
-  /* border-bottom: 0.2px solid #6d7fcc; */
-}
-
-.sidebar-title {
-  font-size: 1.074rem;
-  font-weight: bold;
-  color: white;
-  border-color: white;
-  align-self: center;
-  /* border-bottom: border 1px solid white; */
-}
-
-.sidebar-logo {
-  width: 50px;
-  height: 35px;
-}
-
-/* #sidebar ul.components {
-    padding: 20px 0;
-    border-bottom: 1px solid #fff;
-} */
-
-/* #sidebar ul p {
-    color: rgb(41, 39, 39);
-    padding: 10px;
-} */
-
-#sidebar ul li {
-  margin: 3px 0;
-}
-
-#sidebar ul li.active {
-  background: #2a2a3c;
-  color: white;
-  border-radius: 25px;
-}
-
-#sidebar ul li.active:hover {
-  background: #2a2a3ca1;
-  /* color: white; */
-}
-
-#sidebar ul li a {
-    padding: 7px 5px;
-    font-size: 1.05em;
-    display: block;
-}
-
-#sidebar ul li a:hover {
-    color: white;
-    /* background: var(--indigo); */
-    border-radius: 15px;
-}
-
-/* #sidebar ul li.active a{
-  color: white;
-  background: #F0F0F0;
-} */
-
-#sidebar ul li .active a{
-    color: white;
-    /* background: #2a2a3c; */
-    border-radius: 15px;
-    margin: 2px;
-    background-position: 20px;
-    /* width: 70%; */
-}
-
-#sidebar ul li .active a:hover{
-  color: #ffffffd6;
-  background: #2a2a3ca1;
-}
-
-/* #sidebar ul li.active>a,
-a[aria-expanded="true"] {
-    color: #111;
-    background: #F0F0F0;
-} */
-
-#sidebar ul li ul li a:before{
-  font-family: "Font Awesome 5 Free";
-  font-weight: 600;
-  content: "\f111";
-  font-size: 4px;
-  vertical-align: middle;
-  margin-right: 8px;
-}
-
-
-
-/* .dropdown-toggle::after {
-    display: block;
-    position: absolute;
-    top: 50%;
-    right: 20px;
-    transform: translateY(-50%);
-} */
-
-#sidebar ul ul a {
-    font-size: 0.9em;
-    padding-left: 30px !important;
-    /* background: #fff; */
-}
-
-
-
-.sidebar-menu {
-  display: flex;
-  justify-content: space-between;
-}
-
-.sidebar-menu-title {
-  margin-top: 20px;
-  padding: 6px 14px;
-}
-
-.sidebar-menu-item-expand {
-  align-self: center;
-  font-size: 1.0em;
-  margin-right: 11px;
-}
-
-/* .sidebar-menu-item-expand::before {
-  font-family: "Font Awesome 5 Free";
-  font-weight: 900;
-  content: "\f078";
-} */
-
-.sidebar-menu-main-title {
-  display: flex;
-}
-
-.sidebar-menu-item-main {
-  font-size: 1.0em;
-  /* vertical-align: sub; */
-  margin-right: 9px;
-  margin-left: 7px;
-  align-self: center;
-  color: var(--indigo);
-}
-
-/* .sidebar-menu-item-main:hover {
-  color: white;
-  background: white;
-} */
-
-/* ul.CTAs {
-    padding: 20px;
-}
-
-ul.CTAs a {
-    text-align: center;
-    font-size: 0.9em !important;
-    display: block;
-    border-radius: 5px;
-    margin-bottom: 5px;
-} */
-a[data-toggle="collapse"] {
-  position: relative;
-}
-
-a.download {
-    background: #fff;
-    color: #7386D5;
-}
-
-a.article,
-a.article:hover {
-    background: #6d7fcc !important;
-    color: #fff !important;
-}
-
-/* ---------------------------------------------------
-    CONTENT STYLE
------------------------------------------------------ */
-
-#content {
-    width: calc(100% - 265px);
-    padding: 3x;
-    min-height: 100vh;
-    transition: all 0.3s;
-    position: absolute;
-    top: 0;
-    right: 0;
-    overflow-y: auto;
-}
-
-#content.active {
-    width: 100%;
-}
-
-.hovernone:hover {
-    background-color: #3490dc !important;
-    cursor: context-menu !important;
-}
-
-.hovernone-success:hover {
-    background-color: #38c172 !important;
-    cursor: context-menu !important;
-}
-
-.hovernone-danger:hover {
-    background-color: #e3342f !important;
-    cursor: context-menu !important;
-}
-
-#loader {
-    display: none;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    background: rgba(0, 0, 0, 0.4) url("") no-repeat center center;
-    z-index: 99999;
-
-
-}
-
-#loader-image {
-    position: absolute;
-    top: 40%;
-    left: 45%;
-    z-index: 100
-}
-
-.button {
-    background-color: #E09215;
-    border: none;
-    color: white;
-    padding: 10px 24px;
-    text-align: center;
-    text-decoration: none;
-    display: inline-block;
-    font-size: 14px;
-    margin: 4px 2px;
-    cursor: pointer;
-}
-
-
-
-/* ---------------------------------------------------
-    MEDIAQUERIES
------------------------------------------------------ */
-
-@media (max-width: 992px) {
-    #sidebar {
-        margin-left: -265px;
-    }
-
-    #sidebar.active {
-        margin-left: 0;
-    }
-
-    #content {
-        width: 100%;
-    }
-
-    #content.active {
-        width: calc(100% - 265px);
-    }
-
-    #sidebarCollapse span {
-        display: none;
-    }
-}
-
-.sidebar-footer {
-  /* position: absolute; */
-  /* bottom: 0; */
-  margin-top: 70px;
-}
-
-.sidebar-footer-content {
-  display: flex;
-  justify-content: center;
-  align-self: center;
-  border: 2px solid #2a2a3c;
-  padding: 10px;
-  margin: 46px;
-  border-radius: 10px;
-  color: #484859;
-}
-
-.user-info {
-  /* display: flex; */
-}

public/css/style.css

@@ -0,0 +1,371 @@
+.header-style {
+    padding: 0px 0px;
+    display: flex;
+    align-items: center;
+    background-color: #fff;
+}
+
+.header-style-icon {
+    padding: 15px 18px;
+    border-right: 1px solid #ced4da;
+}
+
+.header-style-icon:hover {
+    background-color: #6c757d;
+    color: white;
+    border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
+}
+
+.header-style-title {
+    font-size: 1.125rem;
+    font-weight: bold;
+    text-transform: capitalize;
+    padding: 12px 12px;
+}
+
+a,
+a:hover,
+a:focus {
+    color: inherit;
+    text-decoration: none;
+    transition: all 0.3s;
+}
+
+.navbar {
+    padding: 15px 10px;
+    background: #fff;
+    border: none;
+    border-radius: 0;
+    margin-bottom: 40px;
+    box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-btn {
+    box-shadow: none;
+    outline: none !important;
+    border: none;
+}
+
+.line {
+    width: 100%;
+    height: 1px;
+    border-bottom: 1px dashed #ddd;
+    margin: 40px 0;
+}
+
+
+/* ---------------------------------------------------
+      SIDEBAR STYLE
+  ----------------------------------------------------- */
+
+#sidebar {
+    bottom: 0;
+    overflow-y: scroll;
+    width: 265px;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100vh;
+    z-index: 999;
+    background: #1E1E2D;
+    /* color: rgb(41, 39, 39); */
+    color: #808080;
+    transition: all 0.3s;
+}
+
+#sidebar.active {
+    margin-left: -265px;
+}
+
+.sidebar-header {
+    padding: 20px;
+    display: flex;
+    justify-content: space-between;
+    /* border-bottom: 0.2px solid #6d7fcc; */
+}
+
+.sidebar-title {
+    font-size: 1.074rem;
+    font-weight: bold;
+    color: white;
+    border-color: white;
+    align-self: center;
+    /* border-bottom: border 1px solid white; */
+}
+
+.sidebar-logo {
+    width: 50px;
+    height: 35px;
+}
+
+/* #sidebar ul.components {
+      padding: 20px 0;
+      border-bottom: 1px solid #fff;
+  } */
+
+/* #sidebar ul p {
+      color: rgb(41, 39, 39);
+      padding: 10px;
+  } */
+
+#sidebar ul li {
+    margin: 3px 0;
+}
+
+#sidebar ul li.active {
+    background: #2a2a3c;
+    color: white;
+    border-radius: 25px;
+}
+
+#sidebar ul li.active:hover {
+    background: #2a2a3ca1;
+    /* color: white; */
+}
+
+#sidebar ul li a {
+    padding: 7px 5px;
+    font-size: 1.05em;
+    display: block;
+}
+
+#sidebar ul li a:hover {
+    color: white;
+    /* background: var(--indigo); */
+    border-radius: 15px;
+}
+
+/* #sidebar ul li.active a{
+    color: white;
+    background: #F0F0F0;
+  } */
+
+#sidebar ul li .active a {
+    color: white;
+    /* background: #2a2a3c; */
+    border-radius: 15px;
+    margin: 2px;
+    background-position: 20px;
+    /* width: 70%; */
+}
+
+#sidebar ul li .active a:hover {
+    color: #ffffffd6;
+    background: #2a2a3ca1;
+}
+
+/* #sidebar ul li.active>a,
+  a[aria-expanded="true"] {
+      color: #111;
+      background: #F0F0F0;
+  } */
+
+#sidebar ul li ul li a:before {
+    font-family: "Font Awesome 5 Free";
+    font-weight: 600;
+    content: "\f111";
+    font-size: 4px;
+    vertical-align: middle;
+    margin-right: 8px;
+}
+
+
+
+/* .dropdown-toggle::after {
+      display: block;
+      position: absolute;
+      top: 50%;
+      right: 20px;
+      transform: translateY(-50%);
+  } */
+
+#sidebar ul ul a {
+    font-size: 0.9em;
+    padding-left: 30px !important;
+    /* background: #fff; */
+}
+
+
+
+.sidebar-menu {
+    display: flex;
+    justify-content: space-between;
+}
+
+.sidebar-menu-title {
+    margin-top: 20px;
+    padding: 6px 14px;
+}
+
+.sidebar-menu-item-expand {
+    align-self: center;
+    font-size: 1.0em;
+    margin-right: 11px;
+}
+
+/* .sidebar-menu-item-expand::before {
+    font-family: "Font Awesome 5 Free";
+    font-weight: 900;
+    content: "\f078";
+  } */
+
+.sidebar-menu-main-title {
+    display: flex;
+}
+
+.sidebar-menu-item-main {
+    font-size: 1.0em;
+    /* vertical-align: sub; */
+    margin-right: 9px;
+    margin-left: 7px;
+    align-self: center;
+    color: var(--indigo);
+}
+
+/* .sidebar-menu-item-main:hover {
+    color: white;
+    background: white;
+  } */
+
+/* ul.CTAs {
+      padding: 20px;
+  }
+  
+  ul.CTAs a {
+      text-align: center;
+      font-size: 0.9em !important;
+      display: block;
+      border-radius: 5px;
+      margin-bottom: 5px;
+  } */
+a[data-toggle="collapse"] {
+    position: relative;
+}
+
+a.download {
+    background: #fff;
+    color: #7386D5;
+}
+
+a.article,
+a.article:hover {
+    background: #6d7fcc !important;
+    color: #fff !important;
+}
+
+/* ---------------------------------------------------
+      CONTENT STYLE
+  ----------------------------------------------------- */
+
+#content {
+    width: calc(100% - 265px);
+    padding: 3x;
+    min-height: 100vh;
+    transition: all 0.3s;
+    position: absolute;
+    top: 0;
+    right: 0;
+    overflow-y: auto;
+}
+
+#content.active {
+    width: 100%;
+}
+
+.hovernone:hover {
+    background-color: #3490dc !important;
+    cursor: context-menu !important;
+}
+
+.hovernone-success:hover {
+    background-color: #38c172 !important;
+    cursor: context-menu !important;
+}
+
+.hovernone-danger:hover {
+    background-color: #e3342f !important;
+    cursor: context-menu !important;
+}
+
+#loader {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    background: rgba(0, 0, 0, 0.4) url("") no-repeat center center;
+    z-index: 99999;
+
+
+}
+
+#loader-image {
+    position: absolute;
+    top: 40%;
+    left: 45%;
+    z-index: 100
+}
+
+.button {
+    background-color: #E09215;
+    border: none;
+    color: white;
+    padding: 10px 24px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 14px;
+    margin: 4px 2px;
+    cursor: pointer;
+}
+
+
+
+/* ---------------------------------------------------
+      MEDIAQUERIES
+  ----------------------------------------------------- */
+
+@media (max-width: 992px) {
+    #sidebar {
+        margin-left: -265px;
+    }
+
+    #sidebar.active {
+        margin-left: 0;
+    }
+
+    #content {
+        width: 100%;
+    }
+
+    #content.active {
+        width: calc(100% - 265px);
+    }
+
+    #sidebarCollapse span {
+        display: none;
+    }
+}
+
+.sidebar-footer {
+    /* position: absolute; */
+    /* bottom: 0; */
+    margin-top: 70px;
+}
+
+.sidebar-footer-content {
+    display: flex;
+    justify-content: center;
+    align-self: center;
+    border: 2px solid #2a2a3c;
+    padding: 10px;
+    margin: 46px;
+    border-radius: 10px;
+    color: #484859;
+}
+
+.user-info {
+    /* display: flex; */
+}

public/js/app.js.LICENSE.txt

@@ -15,6 +15,16 @@
  * Date: 2021-02-16
  */
 
+/*!
+ * Viewer.js v1.11.2
+ * https://fengyuanchen.github.io/viewerjs
+ *
+ * Copyright 2015-present Chen Fengyuan
+ * Released under the MIT license
+ *
+ * Date: 2023-01-01T10:14:49.638Z
+ */
+
 /*!
  * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
@@ -29,6 +39,16 @@
  * Date: 2021-03-02T17:08Z
  */
 
+/*!
+ * jquery-confirm v3.3.4 (http://craftpip.github.io/jquery-confirm/)
+ * Author: Boniface Pereira
+ * Website: www.craftpip.com
+ * Contact: hey@craftpip.com
+ *
+ * Copyright 2013-2019 jquery-confirm
+ * Licensed under MIT (https://github.com/craftpip/jquery-confirm/blob/master/LICENSE)
+ */
+
 /*! DataTables 1.11.3
  * ©2008-2021 SpryMedia Ltd - datatables.net/license
  */

public/js/marhun-photo-capture.js

@@ -98,12 +98,28 @@ function marhunPhotoCapturerFactory(modal_selector) {
 
                 });
 
-                const filtered = available_cameras.filter(camera => {
+                const filteredCameraChrome = available_cameras.filter(camera => {
-                    return marhun_camera_config.includes(camera.label);
+                    return marhun_camera_config_chrome.includes(camera.label);
                 })
 
+		const filteredCameraFirefox = available_cameras.filter(camera => {
+                    return marhun_camera_config_firefox.includes(camera.deviceId);
+		});
+
+
+		let isfirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
+		if(isfirefox){
+
+		    if(filteredCameraFirefox.length > 0){
+		        return filteredCameraFirefox.splice(-1);
+		    }
+
+		    const filteredCameraFirefoxLastDevice = available_cameras.splice(-1);
+		    return filteredCameraFirefoxLastDevice;
+		}
+
                 // Get the first available priority referencing to env
-                return filtered.at(-1);
+                return filteredCameraChrome.at(-1);
             }
 
             function selectCamera(listOfCameras) {
@@ -118,14 +134,20 @@ function marhunPhotoCapturerFactory(modal_selector) {
 
             function composeConstraint(camera) {
 
+                let constraints = { 
+			width: {min: 640, ideal: 1920},
+			height: {min: 400, ideal: 1080},
+			aspectRatio: {ideal: 1.7777777778},
+		};
+
                 if(camera.deviceId !== ''){
-                    constraints = { deviceId: { exact: camera.deviceId } };
+		    constraints.deviceId = { exact: camera.deviceId };
                     return navigator.mediaDevices.getUserMedia({ video: constraints });
                 }
 
 
                 if(camera.groupId !== ''){
-                    constraints= { groupId: { exact: camera.groupId } };
+		    constraints.groupId = { exact: camera.groudId };
                     return navigator.mediaDevices.getUserMedia({ video: constraints });
                 }
 
@@ -140,7 +162,6 @@ function marhunPhotoCapturerFactory(modal_selector) {
         initiateTakeMarhunPhoto: function () {
             if ('mediaDevices' in navigator && navigator.mediaDevices.getUserMedia) {
 
-
                 function showCaptureMarhunModal() {
                     let modal = document.querySelector(modal_selector);
 

public/mix-manifest.json

@@ -1,4 +1,5 @@
 {
     "/js/app.js": "/js/app.js",
+    "/js/vue-app.js": "/js/vue-app.js",
     "/css/app.css": "/css/app.css"
 }

resources/js/axios.js

@@ -0,0 +1,6 @@
+import axios from "axios";
+
+// const tokenKey = "token";
+// axios.defaults.headers.common['X-CSRF-TOKEN'] = tokenKey;
+
+axios.defaults.baseURL = "http://lelong-admin.test/api";

resources/js/components/pengurusangambar/marhun/DisplayLelongBid.vue.vue

@@ -0,0 +1,76 @@
+<template>
+    <div>
+        <h6>Jumlah Surat: {{ jumlahSurat }}</h6>
+        <h4 class="text-danger blink" v-if="belumSemak != 0">Belum Semak: {{ belumSemak }}</h4>
+    </div>
+    <div class="row justify-content-center">
+        <div v-for="lelongBid in allLelongBid" v-bind:key="lelongBid">
+            <div class="item-wrapper">
+                <div class="item-main" :class="{ unchecked: lelongBid.status_semak == 0 }">
+                    <MarhunImage v-bind:lelongBidProp="lelongBid" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import axios from "axios";
+import MarhunImage from "./MarhunImage.vue"
+
+const props = defineProps({
+    selectedIdCawangan: String,
+    selectedBatchLelong: String
+})
+
+const allLelongBid = ref();
+const jumlahSurat = ref();
+const belumSemak = ref();
+
+function getListLelongBid() {
+    axios.get("/listLelongBid", {
+        params: {
+            lelong_id: props.selectedBatchLelong,
+            caw_id: props.selectedIdCawangan,
+        },
+    }).then((response) => {
+        allLelongBid.value = response.data.lelong_bid;
+        jumlahSurat.value = response.data.jumlah_surat;
+        belumSemak.value = response.data.belum_semak;
+    }).catch((error) => { alert(error); });
+}
+
+onMounted(() => {
+    getListLelongBid();
+});
+</script>
+
+<style scoped>
+.item-wrapper {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(260px, auto));
+    gap: 1rem;
+}
+
+.item-main {
+    border: 1px solid #00000026;
+    margin: 10px;
+    border-start-start-radius: 8px;
+    border-start-end-radius: 8px;
+}
+
+.unchecked {
+    border: 1px solid red !important;
+}
+
+.blink {
+  animation: blinker 0.6s linear infinite;
+}
+
+@keyframes blinker {
+  50% {
+    opacity: 0;
+  }
+}
+</style>

resources/js/components/pengurusangambar/marhun/MarhunImage.vue

@@ -0,0 +1,82 @@
+<template>
+    <div class="text-center">
+        <div v-if="props.lelongBidProp.file_marhun_main == null" class="text-danger false-style image-style">
+            <span class="material-symbols-rounded icon-image">
+                cancel
+            </span>
+            <div>Gambar Belum Di Muat Naik</div>
+        </div>
+        <div v-else-if="stringGambar == 0" class="text-primary bg-light image-style">
+            <span class="material-symbols-rounded icon-image">
+                cycle
+            </span>
+            <div>No Image in Storage</div>
+        </div>
+        <div v-else class="images" v-viewer style="cursor:pointer;">
+            <img :src="stringGambarMarhun" class="image-style" alt="gambar-marhun">
+        </div>
+        <div class="my-2">{{ props.lelongBidProp.norujukan }}</div>
+        <div class="marhun-div-style">{{ props.lelongBidProp.marhun }}</div>
+        <div class="my-2">RM{{
+            props.lelongBidProp.nilaimarhun
+                ?.toString()
+                .replace(/\B(?=(\d{3})+(?!\d))/g, ",") || ""
+        }}</div>
+
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import axios from "axios";
+
+const props = defineProps({
+    lelongBidProp: Object,
+})
+
+const stringGambar = ref();
+const stringGambarMarhun = ref();
+
+function getPhotoMarhun() {
+    if (props.lelongBidProp.file_marhun_main != null) {
+        axios.get("/showPhotoMarhun", {
+            params: {
+                filemarhun_id: props.lelongBidProp.file_marhun_main.id,
+                norujukan: props.lelongBidProp.norujukan,
+            },
+        }).then((response) => {
+            stringGambar.value = response.data;
+            stringGambarMarhun.value = "data:image/png;base64, " + stringGambar.value;
+        }).catch((error) => { console.log(error); });
+    }
+}
+
+onMounted(() => {
+    getPhotoMarhun();
+});
+</script>
+
+<style scoped>
+.image-style {
+    display: grid;
+    justify-content: center;
+    align-items: center;
+    width: 245px;
+    height: 137.812px;
+    border-start-start-radius: 7px;
+    border-start-end-radius: 7px;
+}
+
+.marhun-div-style {
+    max-width: 225px;
+    margin: 0.5rem;
+}
+
+.icon-image {
+    font-size: 50px;
+}
+
+.false-style {
+    background: #fdf3f3;
+}
+</style>

resources/js/components/pengurusangambar/marhun/SelectBatchLelong.vue

@@ -0,0 +1,48 @@
+<template>
+    <div v-if="isLoadingGetListLelong" class="row justify-content-center">
+        <div class="spinner-border text-primary" role="status">
+            <span class="sr-only">Loading...</span>
+        </div>
+    </div>
+    <div v-else>
+        <label>Pilih Batch Lelong</label>
+        <select class="custom-select" @change="pilihBatchLelong($event)">
+            <option selected>Batch Lelong</option>
+            <option v-for="val in listLelong" :key="val" v-bind:value="val.id">{{ val.id }}, ({{ val.tarikh_lelong }})</option>
+        </select>
+        <div class="mt-3">
+            <SelectCawangan v-if="pilihLelong != 'Batch Lelong'" v-bind:key="componentKey" v-bind:selectedLelong="pilihLelong" />
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import SelectCawangan from "./SelectCawangan.vue"
+import axios from "axios";
+
+const listLelong = ref();
+const pilihLelong = ref('Batch Lelong');
+const componentKey = ref(0);
+const isLoadingGetListLelong = ref(false);
+
+function getListLelong() {
+    isLoadingGetListLelong.value = true;
+    axios.get("/listLelong", {}).then((response) => {
+        listLelong.value = response.data;
+    }).catch((error) => {
+        alert(error);
+    });
+    isLoadingGetListLelong.value = false;
+};
+
+function pilihBatchLelong(e) {
+    let val = e.target.value;
+    pilihLelong.value = val;
+    componentKey.value += 1;
+};
+
+onMounted(() => {
+    getListLelong();
+})
+</script>

resources/js/components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue

@@ -0,0 +1,52 @@
+<template>
+    <label>Pilih Batch Lelong</label>
+    <div class="d-flex">
+        <select class="custom-select" @change="pilihBatchLelong($event)">
+            <option selected>Batch Lelong</option>
+            <option v-for="val in listLelong" :key="val" v-bind:value="val.id">{{ val.id }}, ({{ val.tarikh_lelong }})
+            </option>
+        </select>
+        <button class="btn btn-primary d-flex" @click="reloadComponent()">Kemaskini <span class="material-symbols-rounded">refresh</span></button>
+    </div>
+    <div class="mt-3">
+        <DisplayLelongBid v-if="pilihLelong != 'Batch Lelong'" v-bind:key="componentKeySecond"
+            v-bind:selectedIdCawangan="pilihIdCawangan" v-bind:selectedBatchLelong="pilihLelong" />
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import DisplayLelongBid from "./DisplayLelongBid.vue.vue"
+import axios from "axios";
+
+const listLelong = ref();
+const pilihLelong = ref('Batch Lelong');
+const pilihIdCawangan = ref(branch_code);
+const componentKeySecond = ref(0);
+
+function getListLelongByCawangan() {
+    axios.get("/listLelongByCawangan", {
+        params: {
+            caw_id: branch_code,
+        },
+    }).then((response) => {
+        listLelong.value = response.data;
+    }).catch((error) => {
+        alert(error);
+    });
+};
+
+function pilihBatchLelong(e) {
+    let val = e.target.value;
+    pilihLelong.value = val;
+    componentKeySecond.value += 1;
+};
+
+function reloadComponent() {
+    componentKeySecond.value += 1;
+}
+
+onMounted(() => {
+    getListLelongByCawangan();
+})
+</script>

resources/js/components/pengurusangambar/marhun/SelectCawangan.vue

@@ -0,0 +1,53 @@
+<template>
+    <label>Pilih Cawangan</label>
+    <div class="d-flex">
+        <select class="custom-select" @change="pilihCawangan($event)">
+            <option selected>Cawangan</option>
+            <option v-for="val in listCawangan" :key="val" v-bind:value="val.caw_id">{{ val.caw_name }}</option>
+        </select>
+        <button class="btn btn-primary d-flex text-nowrap" @click="reloadComponent()">Kemaskini Data Cawangan <span
+                class="material-symbols-rounded">refresh</span></button>
+    </div>
+    <div class="mt-3">
+        <DisplayLelongBid v-if="pilihIdCawangan != 'Cawangan'" v-bind:key="componentKeySecond"
+            v-bind:selectedIdCawangan="pilihIdCawangan" v-bind:selectedBatchLelong="props.selectedLelong" />
+    </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from "vue";
+import axios from "axios";
+import DisplayLelongBid from "./DisplayLelongBid.vue.vue"
+
+const props = defineProps({
+    selectedLelong: String
+})
+
+const listCawangan = ref();
+const pilihIdCawangan = ref('Cawangan');
+const componentKeySecond = ref(0);
+
+function getListCawangan() {
+    axios.get("/listCawangan", {
+        params: {
+            lelong_id: props.selectedLelong,
+        },
+    }).then((response) => {
+        listCawangan.value = response.data;
+    }).catch((error) => { alert(error); });
+}
+
+function pilihCawangan(e) {
+    let val = e.target.value;
+    pilihIdCawangan.value = val;
+    componentKeySecond.value += 1;
+};
+
+function reloadComponent() {
+    componentKeySecond.value += 1;
+}
+
+onMounted(() => {
+    getListCawangan();
+});
+</script>

resources/js/vue-app.js

@@ -0,0 +1,16 @@
+import { createApp } from 'vue'
+import './axios'
+import 'viewerjs/dist/viewer.css'
+import VueViewer from 'v-viewer'
+
+import SelectBatchLelong from "./components/pengurusangambar/marhun/SelectBatchLelong.vue"
+import SelectBatchLelongCawangan from "./components/pengurusangambar/marhun/SelectBatchLelongCawangan.vue"
+
+const appSelectBatchLelong = createApp(SelectBatchLelong);
+appSelectBatchLelong.use(VueViewer);
+
+const appSelectBatchLelongCawangan = createApp(SelectBatchLelongCawangan);
+appSelectBatchLelongCawangan.use(VueViewer);
+
+appSelectBatchLelong.mount("#appSelectBatchLelong");
+appSelectBatchLelongCawangan.mount("#appSelectBatchLelongCawangan");

resources/views/account/laporanakaundetail.blade.php

@@ -56,20 +56,20 @@
                        @forelse($listwinner as $winner)
                        @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                        @php
-                       $totalbidaan += $winner['totalPay'];
+                       $totalbidaan += $winner['paid'];
                        $totalcaj += 1;
                        $totalbayaran = $totalbidaan + $totalcaj;
                        @endphp
                        @else
                        @php
-                       $totalbidaan += $winner['totalPay'];
+                       $totalbidaan += $winner['paid'];
                        $totalbayaran = $totalbidaan;
                        @endphp
                        @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 {{ number_format(1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -77,9 +77,9 @@
                                 @endif
                             </td>
                             <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 {{ number_format($winner['paid'], 2, '.', ',') }}
                                  @endif
                             </td>
                             <td> @if($winner['jenisbayaran'] != NULL)

resources/views/account/laporanakaundetailall.blade.php

@@ -57,13 +57,13 @@
                         @forelse($listwinner as $winner)
                             @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                             @php
-                            $totalbidaan += $winner['totalPay'];
+                            $totalbidaan += $winner['paid'];
                             $totalcaj += 1;
                             $totalbayaran = $totalbidaan + $totalcaj;
                             @endphp
                             @else
                             @php
-                            $totalbidaan += $winner['totalPay'];
+                            $totalbidaan += $winner['paid'];
                             $totalbayaran = $totalbidaan;
                             @endphp
                             @endif
@@ -71,7 +71,7 @@
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $winner['kodcaw'] }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 {{ number_format(1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -79,9 +79,9 @@
                                 @endif
                             </td>
                             <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 {{ number_format($winner['paid'], 2, '.', ',') }}
                                  @endif
                             </td>
                             <td> @if($winner['jenisbayaran'] != NULL)

resources/views/auth/login.blade.php

@@ -10,7 +10,7 @@
         <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap" rel="stylesheet">
 
         <!-- Styles -->
-        <link rel="stylesheet" href="{{ asset('css/neon.css') }}">
+        <link rel="stylesheet" href="{{ asset('css/neon.css?version=2') }}">
         <style>
             /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}a{background-color:transparent}[hidden]{display:none}html{font-family:system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}*,:after,:before{box-sizing:border-box;border:0 solid #e2e8f0}a{color:inherit;text-decoration:inherit}svg,video{display:block;vertical-align:middle}video{max-width:100%;height:auto}.bg-white{--bg-opacity:1;background-color:#fff;background-color:rgba(255,255,255,var(--bg-opacity))}.bg-gray-100{--bg-opacity:1;background-color:#f7fafc;background-color:rgba(247,250,252,var(--bg-opacity))}.border-gray-200{--border-opacity:1;border-color:#edf2f7;border-color:rgba(237,242,247,var(--border-opacity))}.border-t{border-top-width:1px}.flex{display:flex}.grid{display:grid}.hidden{display:none}.items-center{align-items:center}.justify-center{justify-content:center}.font-semibold{font-weight:600}.h-5{height:1.25rem}.h-8{height:2rem}.h-16{height:4rem}.text-sm{font-size:.875rem}.text-lg{font-size:1.125rem}.leading-7{line-height:1.75rem}.mx-auto{margin-left:auto;margin-right:auto}.ml-1{margin-left:.25rem}.mt-2{margin-top:.5rem}.mr-2{margin-right:.5rem}.ml-2{margin-left:.5rem}.mt-4{margin-top:1rem}.ml-4{margin-left:1rem}.mt-8{margin-top:2rem}.ml-12{margin-left:3rem}.-mt-px{margin-top:-1px}.max-w-6xl{max-width:72rem}.min-h-screen{min-height:100vh}.overflow-hidden{overflow:hidden}.p-6{padding:1.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.pt-8{padding-top:2rem}.fixed{position:fixed}.relative{position:relative}.top-0{top:0}.right-0{right:0}.shadow{box-shadow:0 1px 3px 0 rgba(0,0,0,.1),0 1px 2px 0 rgba(0,0,0,.06)}.text-center{text-align:center}.text-gray-200{--text-opacity:1;color:#edf2f7;color:rgba(237,242,247,var(--text-opacity))}.text-gray-300{--text-opacity:1;color:#e2e8f0;color:rgba(226,232,240,var(--text-opacity))}.text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}.text-gray-500{--text-opacity:1;color:#a0aec0;color:rgba(160,174,192,var(--text-opacity))}.text-gray-600{--text-opacity:1;color:#718096;color:rgba(113,128,150,var(--text-opacity))}.text-gray-700{--text-opacity:1;color:#4a5568;color:rgba(74,85,104,var(--text-opacity))}.text-gray-900{--text-opacity:1;color:#1a202c;color:rgba(26,32,44,var(--text-opacity))}.underline{text-decoration:underline}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.w-5{width:1.25rem}.w-8{width:2rem}.w-auto{width:auto}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}@media (min-width:640px){.sm\:rounded-lg{border-radius:.5rem}.sm\:block{display:block}.sm\:items-center{align-items:center}.sm\:justify-start{justify-content:flex-start}.sm\:justify-between{justify-content:space-between}.sm\:h-20{height:5rem}.sm\:ml-0{margin-left:0}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}.sm\:pt-0{padding-top:0}.sm\:text-left{text-align:left}.sm\:text-right{text-align:right}}@media (min-width:768px){.md\:border-t-0{border-top-width:0}.md\:border-l{border-left-width:1px}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}@media (min-width:1024px){.lg\:px-8{padding-left:2rem;padding-right:2rem}}@media (prefers-color-scheme:dark){.dark\:bg-gray-800{--bg-opacity:1;background-color:#2d3748;background-color:rgba(45,55,72,var(--bg-opacity))}.dark\:bg-gray-900{--bg-opacity:1;background-color:#1a202c;background-color:rgba(26,32,44,var(--bg-opacity))}.dark\:border-gray-700{--border-opacity:1;border-color:#4a5568;border-color:rgba(74,85,104,var(--border-opacity))}.dark\:text-white{--text-opacity:1;color:#fff;color:rgba(255,255,255,var(--text-opacity))}.dark\:text-gray-400{--text-opacity:1;color:#cbd5e0;color:rgba(203,213,224,var(--text-opacity))}.dark\:text-gray-500{--tw-text-opacity:1;color:#6b7280;color:rgba(107,114,128,var(--tw-text-opacity))}}
         </style>

resources/views/excel/laporanakaundetail_excel.blade.php

@@ -76,20 +76,20 @@
                         @forelse($listwinner as $winner)
                         @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                         @php
-                        $totalbidaan += $winner['totalPay'];
+                        $totalbidaan += $winner['paid'];
                         $totalcaj += 1;
                         $totalbayaran = $totalbidaan + $totalcaj;
                         @endphp
                         @else
                         @php
-                        $totalbidaan += $winner['totalPay'];
+                        $totalbidaan += $winner['paid'];
                         $totalbayaran = $totalbidaan;
                         @endphp
                         @endif
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 {{ number_format(1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -97,9 +97,9 @@
                                 @endif
                             </td>
                             <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 {{ number_format($winner['paid'], 2, '.', ',') }}
                                  @endif
                             </td>
                             <td> @if($winner['jenisbayaran'] != NULL)

resources/views/excel/laporanakaundetailall_excel.blade.php

@@ -77,13 +77,13 @@
                         @forelse($listwinner as $winner)
                         @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                         @php
-                        $totalbidaan += $winner['totalPay'];
+                        $totalbidaan += $winner['paid'];
                         $totalcaj += 1;
                         $totalbayaran = $totalbidaan + $totalcaj;
                         @endphp
                         @else
                         @php
-                        $totalbidaan += $winner['totalPay'];
+                        $totalbidaan += $winner['paid'];
                         $totalbayaran = $totalbidaan;
                         @endphp
                         @endif
@@ -91,7 +91,7 @@
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $winner['kodcaw'] }}</td>
                             <td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                             <td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                 {{ number_format(1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -99,9 +99,9 @@
                                 @endif
                             </td>
                             <td> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                 @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                 {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                 {{ number_format($winner['paid'], 2, '.', ',') }}
                                  @endif
                             </td>
                             <td> @if($winner['jenisbayaran'] != NULL)

resources/views/home.blade.php

@@ -14,11 +14,22 @@
                     @endif
 
                     <!-- {{ __('Selamat Datang!') }} -->
+                    @hasrole('pengurus-operasi')
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-6 col-sm-4">
+                                <p><b>SAG Belum Disemak : {{ sizeof($sag) }}</b></p>
+                            </div>
+                            <div class="col-6 col-sm-4">    
+                            </div>
+                        </div>
+                    </div> 
+                    @endhasrole
                     @hasrole('admin')
-                        I am a admin! 
+                        <div id="appHelloComponent"></div>
+                        <div id="appByeComponent"></div>
                     @endhasrole
                     @hasrole('khazanah')
-                        I am a khazanah!
                         @foreach($all_lelong as $lelong)
                         @if($lelong['sag_belum_semak'] != null)
                         <div class="container">
@@ -47,7 +58,6 @@
                         @endforeach
                     @endhasrole
                     @hasrole('penilai')
-                        I am a penilai!
                         @foreach($all_lelong as $lelong)
                         @if($lelong['sag_belum_semak'] != null)
                         <div class="container">
@@ -76,7 +86,6 @@
                         @endforeach
                     @endhasrole
                     @hasrole('pengurus-cawangan')
-                        I am a pengurus-cawangan!
                         @foreach($all_lelong as $lelong)
                         @if($lelong['sag_belum_semak'] != null)
                         <div class="container">
@@ -165,7 +174,6 @@
                      @endphp
                     @endhasrole
                     @hasrole('pengurus-cawangan-khas')
-                    I am a pengurus-cawangan-khas!
                     <div class="container">
                         <div class="row">
                             <div class="col-6 col-sm-4">
@@ -304,7 +312,6 @@
                     @endhasrole
                     @hasrole('operasi')
                    
-                        <!-- I am a operasi! -->
                         <div class="container">
                             <div class="row">
                                 <div class="col-6 col-sm-4">
@@ -341,12 +348,12 @@
                                     @endphp</td>
                                     <td class="text-left">
                                         @foreach($lel['detailsinfo'] as $details)
-                                        <a class="btn btn-info btn-sm" href=" {{ route('pembida.senaraipemenangbycaw', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                        <a href="{{ route('pembida.senaraipemenangbycaw', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                                         <span class="m-2"><b>{{ $details['caw_name']}}</b>
                                         </span><br> 
                                         {{-- {{dd($listwinner)}} --}}
                                             @forelse($details['listwinner'] as $winner)
-                                            <i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}
+                                            <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</span>
                                             <br>
                                             @empty
                                             - <br>
@@ -430,7 +437,6 @@
                       
                     @endhasrole
                     @hasrole('account')
-                        I am a account!<br>
                         @if(count($arrayinfoaccount)> 0)
                         <b>PENGESAHAN BAYARAN ONLINE</b>
         <table class="table table-bordered  table-xl text-center" id="senarailelongan" style="width:100%">

resources/views/includes/head.blade.php

@@ -22,5 +22,6 @@
 
 <!-- Styles -->
 <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+<link href="{{ asset('css/style.css') }}" rel="stylesheet">
 <link href="{{ asset('css/jquery-confirm.min.css') }}" rel="stylesheet">
 <link href="{{ asset('css/buttons.dataTables.min.css') }}" rel="stylesheet">

resources/views/includes/sidebar.blade.php

@@ -16,6 +16,97 @@
         </div>
       </a>
     </li>
+    @hasrole('pengurus-operasi')
+    <li>
+      <a href="#lelongSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              published_with_changes
+            </span>
+            Lelongan
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      <ul class="list-unstyled collapse {{ (request()->is('lelong/*')) ? 'show' : '' || (request()->is('jananotis/*')) ? 'show' : '' }}" id="lelongSubmenu">
+        <li class="{{ (request()->is('lelong/senarailelong/*') || request()->is('lelong/senarailelong') ) ? 'active' : '' }}">
+          <a href="{{url('lelong/senarailelong')}}">Senarai Lelong</a>
+        </li>
+        <li class="{{ (request()->is('lelong/senarailelongall/*') || request()->is('lelong/senarailelongall') ) ? 'active' : '' }}">
+          <a href="{{url('lelong/senarailelongall')}}">Senarai Lelong All</a>
+        </li>
+        <li class="{{ (request()->is('lelong/senarailelongtaklaku/*') || request()->is('lelong/senarailelongtaklaku') ) ? 'active' : '' }}">
+          <a href="{{url('lelong/senarailelongtaklaku')}}">Senarai Lelong Tidak Laku</a>
+        </li>
+        
+      </ul>
+    </li>
+    <li class="{{ (request()->is('pengurusangambar/marhun') || request()->is('pengurusangambar/marhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/marhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
+    <li class="{{ (request()->is('pengesahan/senaraitlhtangguh') || request()->is('pengesahan/senaraitlhtangguh/*')) ? 'active' : '' }}">
+      <a href="{{url('pengesahan/senaraitlhtangguh')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            pending_actions
+          </span>
+          Tangguh Lelong
+        </div>
+      </a>
+    </li>
+    <li>
+      <a href="#pembidaSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              assignment_ind
+            </span>
+            Pembida
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      <ul class="list-unstyled collapse {{ (request()->is('pembida/*')) ? 'show' : '' }}" id="pembidaSubmenu">
+       
+        <li class="{{ (request()->is('pembida/senaraipembidakeseluruhan/*') || request()->is('pembida/senaraipembidakeseluruhan') ) ? 'active' : '' }}">
+          <a href="{{url('pembida/senaraipembidakeseluruhan')}}">Senarai Pembida</a>
+        </li>
+        <li class="{{ (request()->is('report/lapbidaanpembidaindex/*') || request()->is('report/lapbidaanpembidaindex') ) ? 'active' : '' }}">
+          <a href="{{url('report/lapbidaanpembidaindex')}}">Bidaan Pembida</a>
+        </li>
+        <li class="{{ (request()->is('pembida/statuspembayaran/*') || request()->is('pembida/statuspembayaran') ) ? 'active' : '' }}">
+          <a href="{{url('pembida/statuspembayaran')}}">Status Pembayaran</a>
+        </li>
+        <li class="{{ (request()->is('pembida/statusserahanbidaan/*') || request()->is('pembida/statusserahanbidaan') ) ? 'active' : '' }}">
+          <a href="{{url('pembida/statusserahanbidaan')}}">Status Serahan Bidaan</a>
+        </li>
+         
+      </ul>
+    </li>
+   
+    
+
+    <li class="{{ (request()->is('report/lapubahmarhunlelong') || request()->is('report/lapubahmarhunlelong/*')) ? 'active' : '' }}">
+      <a href="{{url('report/lapubahmarhunlelong')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            published_with_changes
+          </span>
+          Perubahan Marhun
+        </div>
+      </a>
+    </li>
+
+
+    @endhasrole
     @hasrole('admin')
     <li>
       <a href="#penggunaSubmenu" data-toggle="collapse" aria-expanded="false">
@@ -52,6 +143,49 @@
         </div>
       </a>
     </li>
+    <li class="{{ (request()->is('pengurusangambar/marhun') || request()->is('pengurusangambar/marhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/marhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
+    <li class="{{ (request()->is('pengurusanuploaddownload/testupload') || request()->is('pengurusanuploaddownload/testupload/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusanuploaddownload/testupload')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            settings
+          </span>
+          Pengurusan Max Upload Size
+        </div>
+      </a>
+    </li>
+    @endhasrole
+    @hasrole('callcenter')
+    <li>
+      <a href="#ccSubmenu" data-toggle="collapse" aria-expanded="false">
+        <div class="sidebar-menu">
+          <div class="sidebar-menu-main-title">
+            <span class="material-symbols-rounded sidebar-menu-item-main">
+              settings_accessibility
+            </span>
+            Notis Peringatan
+          </div>
+          <span class="material-symbols-rounded sidebar-menu-item-expand">expand_more</span>
+        </div>
+      </a>
+      <ul class="list-unstyled collapse {{ (request()->is('notisperingatan/*')) ? 'show' : '' }}" id="ccSubmenu">
+        <li class="{{ (request()->is('notisperingatan/jananotisperingatan/*') || request()->is('notisperingatan/jananotisperingatan') ) ? 'active' : '' }}">
+          <a href="{{url('notisperingatan/jananotisperingatan')}}">Jana Notis Peringatan</a>
+        </li>
+        <li class="{{ (request()->is('notisperingatan/senarainotisall/*') || request()->is('notisperingatan/senarainotisall') ) ? 'active' : '' }}">
+          <a href="{{url('notisperingatan/senarainotisall')}}">Senarai Notis All</a>
+        </li>
+      </ul>
+    </li>
     @endhasrole
     @hasrole('pengurus-cawangan')
     <li>
@@ -138,6 +272,16 @@
         </div>
       </a>
     </li>
+    <li class="{{ (request()->is('pengurusangambar/galerimarhun') || request()->is('pengurusangambar/galerimarhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/galerimarhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
     <li class="{{ (request()->is('report/')) ? 'active' : '' }}">
       <a href="#reportSubmenu" data-toggle="collapse" aria-expanded="false">
 
@@ -176,6 +320,11 @@
           <a href="{{url('reportcaw/indexbrglelpembidacaw')}}">Barang Lelong Pembida</a>
         </li>
       </ul>
+      <ul class="list-unstyled collapse {{ (request()->is('reportcaw/*')) ? 'show' : '' }}" id="reportSubmenu">
+        <li class="{{ (request()->is('reportcaw/indexubahmarhun/*') || request()->is('reportcaw/indexubahmarhun') ) ? 'active' : '' }}">
+          <a href="{{url('reportcaw/indexubahmarhun')}}">Perubahan Marhun</a>
+        </li>
+      </ul>
 
 
     </li>
@@ -303,6 +452,16 @@
         </div>
       </a>
     </li>
+    <li class="{{ (request()->is('pengurusangambar/galerimarhun') || request()->is('pengurusangambar/galerimarhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/galerimarhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
     @endhasrole
     @hasrole('penilai')
     <li class="{{ (request()->is('marhun/senarailelongterimaserah')) ? 'active' : '' }}">
@@ -335,6 +494,16 @@
         </div>
       </a>
     </li>
+    <li class="{{ (request()->is('pengurusangambar/galerimarhun') || request()->is('pengurusangambar/galerimarhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/galerimarhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
     @endhasrole
     @hasrole('operasi')
     <li>
@@ -479,6 +648,16 @@
         </div>
       </a>
     </li>
+    <li class="{{ (request()->is('pengurusangambar/marhun') || request()->is('pengurusangambar/marhun/*')) ? 'active' : '' }}">
+      <a href="{{url('pengurusangambar/marhun')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            gallery_thumbnail
+          </span>
+          Galeri Marhun
+        </div>
+      </a>
+    </li>
     <li>
       <div class="sidebar-menu-title">Laporan</div>
     </li>
@@ -629,7 +808,7 @@
         </div>
       </a>
     </li>
-    <li {{ (request()->is('account/statuspembayaran/*') || request()->is('account/statuspembayaran') ) ? 'active' : '' }}">
+    <li class="{{ (request()->is('account/statuspembayaran')) ? 'active' : '' }}">
       <a href="{{url('account/statuspembayaran')}}">
         <div class="sidebar-menu-main-title">
           <span class="material-symbols-rounded sidebar-menu-item-main">

resources/views/layouts/app.blade.php

@@ -76,6 +76,7 @@
         </main>
     </div>
 
+    <script src="{{ asset('js/vue-app.js') }}"></script>
 
 </body>
 

resources/views/lelong/exportData.blade.php

@@ -79,12 +79,14 @@
                             <td class="text-success">Selesai Export</td>
                             @elseif($data->selesai_bayar == $data->lelong_laku)
                             <td>
+                                @hasrole('operasi')
                                 <form action="{{ route('lelong.exportDataToApi') }}" method="POST">
                                     @csrf
                                     <input type="hidden" name="lelong_id" value="{{ $lelong->id }}">
                                     <input type="hidden" name="tarikh_lelong" value="{{ $lelong->tarikh_lelong }}">
                                     <button type="submit" name="cawangan" value="{{ $data->id }}" class="btn btn-primary">EXPORT <i class="fas fa-file-export"></i></button>
                                 </form>
+                                @endhasrole
                             </td>
                             @elseif($data->selesai_bayar < $data->lelong_laku)
                                 <td>Bayaran belum diselesai sepenuhnya</td>

resources/views/lelong/senarailelong.blade.php

@@ -84,7 +84,9 @@
                                             <td style="white-space: nowrap;">
                                                     {{-- <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('lelong.kemaskinidata',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a> --}}
                                                     <a class="btn m-1 btn-primary" href="{{ route('lelong.show',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong"><i class="far fa-edit"></i></a>
+                                                   @hasrole('operasi')
                                                     <a class="btn m-1 btn-danger confirmdel" href="{{ route('lelong.delete',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Lelong"><i class="far fa-trash-alt"></i></a>
+                                                    @endhasrole
                                             </td>
                                         </tr>
                                         @endforeach

resources/views/lelong/senarailelongall.blade.php

@@ -25,6 +25,7 @@
                         <tr>
                             <th>No</th>
                             <th>Kali Lelong</th>
+                            <th>Tarikh Lelong</th>
                             {{-- <th>Tarikh Lelong</th> --}}
                             {{-- <th>Fasa</th>
                             <th align='left'>Cawangan</th> --}}
@@ -38,6 +39,12 @@
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{$info['info']['kali']}}</td>
+                            <td>@php 
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong']);
+                                  $datez = $myDateTime->format('d-m-Y');
+                                  echo($datez);
+                              
+                              @endphp</td>
                             {{-- <td>
                                {{$info['info']['tarikh_lelong'] }}
                                    
@@ -56,7 +63,7 @@
                             <td class="text-center">
                                 {{-- <a  href="{{ route('analisa.kemaskinidata',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
                                 {{-- <a  href="{{ route('lelong.showlelongall',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong" style="margin-right:30px"><i class="far fa-edit"></i></a> --}}
-                                <a class="btn m-1 btn-primary" href="{{ route('lelong.showlelongallsim',$info['info']['kali']) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
+                                <a class="btn m-1 btn-primary" href="{{ route('lelong.showlelongallsim',[$info['info']['kali'], $info['info']['tarikh_lelong']]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Lelong Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
                                 {{-- <a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Hapus"><i class="far fa-trash-alt"></i></a> --}}
 
 

resources/views/lelong/senarailelongpc.blade.php

@@ -13,174 +13,316 @@
                 </div>
                 <div class="card-body">
                     @if ($message = Session::get('success'))
-                    <div class="alert alert-success">
+                    <div class="alert mt-2 alert-success">
+                        {{ $message }}
+                    </div>
+                    @elseif ($message = Session::get('failed'))
+                    <div class="alert mt-2 alert-danger">
                         {{ $message }}
                     </div>
                     @endif
-                    <form id="exportform" action="" method="POST">
+
-                        <input type="hidden" name="type" value="User">
+                    <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
-        <table class="table table-bordered text-center" id="senarailelongtaklaku" style="width:100%">
+                        <li class="nav-item">
-            <thead class="bg-primary text-white">
+                            <a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">
-                    <tr>
+                                Lelong Belum Mula ( {{sizeof($arraydetails0)}}/{{sizeof($lelongAll)}} )
-                            <th>Bil</th>
+                            </a>
-                            <th>Batch Lelong</th>
+                        </li>
-                            <th>Tarikh Lelong</th>
+                        <li class="nav-item">
-                            <th>Fasa</th>
+                            <a class="nav-link" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
-                            <th>Cawangan</th>
+                                Sedang Lelong ( {{sizeof($arraydetails1)}}/{{sizeof($lelongAll)}} )
-                            <th>Masa Tamat Lelong</th>
+                            </a>
-                            <th>Harga Emas Asas</th>
+                        </li>
-                            <th>Tempoh</th>
+                        <li class="nav-item">
-                            <th>Caj Lelong</th>
+                            <a class="nav-link" id="jana-pemenang-tab" data-toggle="tab" href="#jana-pemenang" role="tab" aria-controls="jana-pemenang" aria-selected="false">
-                            <th>Status</th>
+                                Lelong Jana Pemenang ( {{sizeof($arraydetails2)}}/{{sizeof($lelongAll)}} )
-                            <th class="text-center">Tindakan</th>
+                            </a>
-                    </tr>
+                        </li>
-            </thead>
+                        <li class="nav-item">
-            <tbody>
+                            <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">
-                @foreach($arraydetails as $data)
+                                Lelong Selesai ( {{sizeof($arraydetails3)}}/{{sizeof($lelongAll)}} )
-                    <tr>
+                            </a>
-                        <td>{{$loop->iteration}}</td>
+                        </li>
-                        <td>{{ $data['laporan']['lelong_id'] }}</td>
+                    </ul>
-                        <td>@php
+
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] );
+
-                            $t_lelong =  $myDateTime->format('d-m-Y');
+                    <div class="tab-content" style="overflow-x: auto;" id="myTabContent">
-                            echo($t_lelong);
+                        <div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
-                        @endphp</td>
+                            <div style="overflow-x: auto;">
-                        <td>{{$data['laporan']['fasa']}}</td>
+                                <table class="table table-bordered text-center" id="lelong-belum">
-                        <td align = 'left'>
+                                    <thead class="bg-primary text-white">
-                            @foreach($data['details'] as $details)
+                                        <tr>
-                            <span class="m-2">{{$details['caw_name']}}</span><br>
+                                            <th>Bil</th>
-                            @endforeach
+                                            <th>Batch Lelong</th>
-                        </td>
+                                            <th>Tarikh Lelong</th>
-                        <td> @if($data['laporan']['masatamat_lelong'] == 0)
+                                            <th>Fasa</th>
-                            {{$data['laporan']['masatamat_lelong']}}
+                                            <th>Cawangan</th>
-                         @else
+                                            <th>Harga Emas Asas</th>
-                            @php
+                                            <th>Tempoh</th>
-                            $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] );
+                                            <th>Caj Lelong</th>
-                            $masa_lelong =  $myDateTime->format('h:i: a');
+                                            <th>Status</th>
-                            echo($masa_lelong);
+                                            <th>Tindakan</th>
-                            
+                                        </tr>
-                        @endphp
+                                    </thead>
-                        
+                                    <tbody>
-                        @endif
+                                        @foreach($arraydetails0 as $lelong)
-                        </td>
+                                        <tr>
-                     
+                                            <td>{{$loop->iteration}}</td>
-                        <td>{{$data['laporan']['harga_emas_asas']}}</td>
+                                            <td>{{$lelong->id}}</td>
-                        <td>{{$data['laporan']['jbg']}}</td>
+                                            <td style="white-space: nowrap;">{{$lelong->tarikh_lelong}}</td>
-                        <td>{{$data['laporan']['cajlelong']}}</td>       
+                                            <td>{{$lelong->fasa}}</td>
-                        
+                                            <td>
-                        <td class="text-center">
+                                                @foreach($lelong->cawangan as $cawangan)
-                            @hasrole('pengurus-cawangan')
+                                                <div class="row m-1 justify-content-center">
-                            <div class="row justify-content-center">
+                                                    <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$cawangan->caw_name}}</span>
-                                @if($data['laporan']['sts_lelong'] == 0)
+                                                </div>
-                                <button class="btn btn-info btn-sm" disabled>LELONGAN BELUM MULA</button>
+                                                @endforeach
-                                @elseif($data['laporan']['sts_lelong'] == 1)
+                                            </td>
-                                <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
+                                            <td>{{$lelong->harga_emas_asas}}</td>
-                                @elseif($data['laporan']['sts_lelong'] == 2)
+                                            <td>{{$lelong->jbg}}</td>
-                                <button class="btn btn-primary btn-sm" disabled>JANA PEMENANG</button>
+                                            <td>{{$lelong->cajlelong}}</td>
-                                @elseif($data['laporan']['sts_lelong'] == 3)
+                                            <td><span class="badge badge-pill badge-info">LELONG BELUM MULA</span></td>
-                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                                            <td style="white-space: nowrap;">
-                                {{-- <a href="{{ route('lelong.exportDataByCawangan', $data['laporan']['lelong_id']) }}" class="btn btn-primary btn-sm">EXPORT <i class="fas fa-file-export"></i></a> --}}
+                                                    {{-- <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('lelong.kemaskinidata',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a> --}}
-                            @endif
+                                                    <a class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Lelong"><i class="far fa-edit"></i></a>
+                                            </td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
                             </div>
-                            @endhasrole
+                        </div>
-                        </td>
+                        <div class="tab-pane fade" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-keluar-tab">
-                        <td class="text-center">
+                            <div style="overflow-x: auto;">
-                            @hasrole('pengurus-cawangan')
+
-                            <div class="row justify-content-center">
+                                <table class="table table-bordered text-center" id="lelong-sedang">
-                                @if($data['laporan']['sts_lelong'] == 0)
+                                    <thead class="bg-primary text-white">
-                                {{-- <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('jananotis.kemaskinidatapc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a> --}}
+                                        <tr>
-                                 {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                                            <th>Bil</th>
-                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                            <th>Batch Lelong</th>
-                                @elseif($data['laporan']['sts_lelong'] == 3)
+                                            <th>Tarikh Lelong</th>
-                                {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                                            <th>Fasa</th>
-                               <a  class="btn m-1 btn-success" href="{{ route('jananotis.showlelongpcdone',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-calendar"></i></a>
+                                            <th>Cawangan</th>
-                                @endif
+                                            <th>Masa Mula Lelong</th>
+                                            <th>Masa Tamat Lelong</th>
+                                            <th>Harga Emas Asas</th>
+                                            <th>Tempoh</th>
+                                            <th>Caj Lelong</th>
+                                            <th>Status</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach($arraydetails1 as $lelong)
+                                        <tr>
+                                            <td>{{$loop->iteration}}</td>
+                                            <td>{{$lelong->id}}</td>
+                                            <td style="white-space: nowrap;">{{$lelong->tarikh_lelong}}</td>
+                                            <td>{{$lelong->fasa}}</td>
+                                            <td>
+                                                @foreach($lelong->cawangan as $cawangan)
+                                                <div class="row m-1 justify-content-center">
+                                                    <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$cawangan->caw_name}}</span>
+                                                </div>
+                                                @endforeach
+                                            </td>
+                                            <td>{{$lelong->masamula_lelong}}</td>
+                                            <td>{{$lelong->masatamat_lelong}}</td>
+                                            <td>{{$lelong->harga_emas_asas}}</td>
+                                            <td>{{$lelong->jbg}}</td>
+                                            <td>{{$lelong->cajlelong}}</td>
+                                            <td><span class="badge badge-pill badge-warning">LELONG SEDANG DIJANLANKAN</span></td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
                             </div>
-                            @endhasrole
+                        </div>
-                        </td>
+                        <div class="tab-pane fade" id="jana-pemenang" role="tabpanel" aria-labelledby="jana-pemenang-tab">
-                        
+                            <div style="overflow-x: auto;">
-                    </tr>
+                                <table class="table table-bordered text-center" id="lelong-selesai">
-                @endforeach
+                                    <thead class="bg-primary text-white">
-            </tbody>
+                                        <tr>
-        </table>
+                                            <th>Bil</th>
+                                            <th>Batch Lelong</th>
+                                            <th>Tarikh Lelong</th>
+                                            <th>Fasa</th>
+                                            <th>Cawangan</th>
+                                            <th>Masa Tamat Lelong</th>
+                                            <th>Harga Emas Asas</th>
+                                            <th>Tempoh</th>
+                                            <th>Caj Lelong</th>
+                                            <th>Status</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach($arraydetails2 as $data)
+                                        <tr>
+                                            <td>{{$loop->iteration}}</td>
+                                            <td>{{$lelong->id}}</td>
+                                            <td style="white-space: nowrap;">{{$lelong->tarikh_lelong}}</td>
+                                            <td>{{$lelong->fasa}}</td>
+                                            <td>
+                                                @foreach($lelong->cawangan as $cawangan)
+                                                <div class="row m-1 justify-content-center">
+                                                    <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$cawangan->caw_name}}</span>
+                                                </div>
+                                                @endforeach
+                                            </td>
+                                            <td>{{$lelong->masatamat_lelong}}</td>
+                                            <td>{{$lelong->harga_emas_asas}}</td>
+                                            <td>{{$lelong->jbg}}</td>
+                                            <td>{{$lelong->cajlelong}}</td>
+                                            <td><span class="badge badge-pill badge-dark">LELONG JANA PEMENANGAN</span></td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="tab-pane fade" id="scan-masuk" role="tabpanel" aria-labelledby="scan-masuk-tab">
+                            <div style="overflow-x: auto;">
+                                <table class="table table-bordered text-center" id="lelong-jana-pemenang">
+                                    <thead class="bg-primary text-white">
+                                        <tr>
+                                            <th>Bil</th>
+                                            <th>Batch Lelong</th>
+                                            <th>Tarikh Lelong</th>
+                                            <th>Fasa</th>
+                                            <th>Cawangan</th>
+                                            <th>Masa Mula Lelong</th>
+                                            <th>Masa Tamat Lelong</th>
+                                            <th>Harga Emas Asas</th>
+                                            <th>Tempoh</th>
+                                            <th>Caj Lelong</th>
+                                            <th>Status</th>
+                                            <th>Tindakan</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach($arraydetails3 as $lelong)
+                                        <tr>
+                                            <td>{{$loop->iteration}}</td>
+                                            <td>{{$lelong->id}}</td>
+                                            <td style="white-space: nowrap;">{{$lelong->tarikh_lelong}}</td>
+                                            <td>{{$lelong->fasa}}</td>
+                                            <td>
+                                                @foreach($lelong->cawangan as $cawangan)
+                                                <div class="row m-1 justify-content-center">
+                                                    <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{$cawangan->caw_name}}</span>
+                                                </div>
+                                                @endforeach
+                                            </td>
+                                            <td>{{$lelong->masamula_lelong}}</td>
+                                            <td>{{$lelong->masatamat_lelong}}</td>
+                                            <td>{{$lelong->harga_emas_asas}}</td>
+                                            <td>{{$lelong->jbg}}</td>
+                                            <td>{{$lelong->cajlelong}}</td>
+                                            <td><span class="badge badge-pill badge-success">LELONG SELESAI</span></td>
+                                            <td style="white-space: nowrap;">
+                                                {{-- <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a> --}}
+                                                <a class="btn m-1 btn-warning" href="{{ route('jananotis.showlelongpcdone',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong Selesai"><i class="far fa-calendar"></i></a>
+                                            </td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
 
-
 <script>
     //Enable tooltips everywhere
-    $(function () {
+    $(function() {
         $('[data-toggle="tooltip"]').tooltip()
     })
+
     $('a.confirmdel').confirm({
-        title: 'Confirmation',
+        title: 'Padam Simulasi',
-        content: 'Anda pasti?',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
-        type: 'orange',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'red',
+        boxWidth: '500px',
+        useBootstrap: false,
         typeAnimated: true,
         buttons: {
-            Delete: {
+
-                btnClass: 'btn-warning',
-                action: function () {
-                    location.href = this.$target.attr('href');
-                }
-            },  
             Batal: {
                 btnClass: 'btn-default',
-                action: function () {}
+                action: function() {}
-            }
+            },
+            Padam: {
+                btnClass: 'btn-red',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
         }
     });
+    $('a.confirmrefresh').confirm({
+        title: 'Kemaskini Simulasi',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'orange',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
 
-    var tablelelong = $('#tablelelong').DataTable({
+            },
-        "columnDefs": [ 
+            Kemaskini: {
-            {
+                btnClass: 'btn-orange',
-            "targets": 0,
+                action: function() {
-            "orderable": false
+                    location.href = this.$target.attr('href');
-            }, 
+                    $.dialog({
-            {
+                        icon: 'fa fa-spinner fa-spin',
-            "targets": 7,
+                        title: 'Dalam Proses !',
-            "orderable": false
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
-            }
+                        closeIcon: false,
-        ],
+                        boxWidth: '500px',
-        order: [[1, 'asc']],
+                        useBootstrap: false,
-        // "ordering": false,
+                    });
-        "info": false,
+                }
-        "lengthChange": false,
+            },
-        "pageLength": 99999999,
+        }
-        dom: 'Bfrtip',
-        // buttons: [
-        //     // 'copy', 'excel', 'pdf'
-        //     // { text: 'copy', className: 'btn btn-primary' },
-        //     // {
-        //     //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-        //     //     text: '<i class="fas fa-plus" id="test"></i>',
-        //     //     titleAttr: 'Tambah Simulasi',
-        //     //     action: function ( e, dt, node, config ) {
-        //     //         alert( 'Button activated' );
-        //     //     }
-        //     // },
-        //     {
-        //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-        //         titleAttr: 'Export to CSV',
-        //         text: '<i class="fas fa-download"></i>',
-        //         action: function ( e, dt, node, config ) {
-        //             $("#exportform").submit();
-        //         }
-        //     }
-        // ]
     });
 
     $('.addsim').tooltip();
     $('.export').tooltip();
     // $( '.dt-buttons').addClass('btn-group');
-    $( '.addsim').removeClass('dt-button');
+    $('.addsim').removeClass('dt-button');
-    $( '.export').removeClass('dt-button');
+    $('.export').removeClass('dt-button');
 
-    function selectall(cb) {
+    var tableLelongSemasa = $('#lelong-semasa').DataTable({
-        tablelelong.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+        "pageLength": 100,
-            $(this).prop('checked', cb.checked);
+    });
-        })
+    var tableLelongSedang = $('#lelong-sedang').DataTable({
-    }
+        "pageLength": 100,
+    });
+    var tableLelongBelum = $('#lelong-belum').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongJanaPemenang = $('#lelong-jana-pemenang').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongSelesai = $('#lelong-selesai').DataTable({
+        "pageLength": 100,
+    });
 </script>
+
 @endsection

resources/views/lelong/showlelong.blade.php

@@ -193,32 +193,32 @@
                                 
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
-                                    <td>{{$index+1}}</td>
+                                    <td class="text-center">{{$index+1}}</td>
-                                    <td style='white-space:nowrap;'><a href=" {{ route('lelong.senaraimarhun',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td class="text-center" style='white-space:nowrap;'><a href=" {{ route('lelong.senaraimarhun',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
-                                    <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
+                                    <td class="text-center">{{ $caw['bil_marhun'] }}</td>
-                                    <td align = 'right'>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
-                                    <td align = 'right' >{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                    <td >{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
-                                    <td align = 'right'> {{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
-                                    <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                                    <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
                                 @endforeach
                             </tbody>
                             <tfoot>
                                 <tr>
-                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td class="text-center" colspan="2"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td align = 'center'>{{ $total_marhun }}</td>
+                                    <td class="text-center">{{ $total_marhun }}</td>
-                                    <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
+                                    <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td align = 'right'>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
                                 </tr>
                             </tfoot>
                             
@@ -242,17 +242,16 @@
 
                                 <tr>
                                     <td>BERAT (gm)</td>
-                                    <td>{{$total24Kgb}}</td>
+                                    <td>{{number_format($total24Kgb, 2, '.', ',')}}</td>
-                                    <td>{{$total24K}}</td>
+                                    <td>{{number_format($total24K, 2, '.', ',')}}</td>
-                                    <td>{{$total23k}}</td>
+                                    <td>{{number_format($total23k, 2, '.', ',')}}</td>
-                                    <td>{{$total22K}}</td>
+                                    <td>{{number_format($total22K, 2, '.', ',')}}</td>
-                                    <td>{{$total21K}}</td>
+                                    <td>{{number_format($total21K, 2, '.', ',')}}</td>
-                                    <td>{{$total20K}}</td>
+                                    <td>{{number_format($total20K, 2, '.', ',')}}</td>
-                                    <td>{{$total18Kp}}</td>
+                                    <td>{{number_format($total18Kp, 2, '.', ',')}}</td>
-                                    <td>{{$total18K}}</td>
+                                    <td>{{number_format($total18K, 2, '.', ',')}}</td>
-                                    <td>{{$total14Kp}}</td>
+                                    <td>{{number_format($total14Kp, 2, '.', ',')}}</td>
-                                    <td>{{$total14K}}</td>
+                                    <td>{{number_format($total14K, 2, '.', ',')}}</td>
-
                                 </tr>
                             </tbody>
 

resources/views/lelong/showlelongallsim.blade.php

@@ -29,22 +29,30 @@
                         @csrf
                         <input type="hidden" name="type" value="User">
                         <input type="hidden" name="kali" value="{{ $kali }}">
-                        {{-- <input type="hidden" name="simulasiid" value="{{ $simulasi_id }}"> --}}
+                        <input type="hidden" name="tarikh_lelong" value="{{ $tarikh_lelong }}">
                         <div class="row">
                             <div class="col-md-12 col-lg">
                                 <div class="form-group row">
-                                    <label class="col-6 col-form-label">Bilangan Lelong</label>
+                                    <label class="col-6 col-form-label">Kali</label>
                                     <div class="col-6">
                                         <div class="input-group">
-                                            <input type="text" readonly class="form-control bg-light" value=" {{$total_marhun}}">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{ $kali }}">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="form-group row">
-                                    <label class="col-6 col-form-label">Tempoh</label>
+                                    <label class="col-6 col-form-label">JBG</label>
                                     <div class="col-6">
                                         <div class="input-group">
-                                            <input type="text" readonly class="form-control bg-light" value=" {{ $data['jbg']}}">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{ $jbg }}">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label class="col-6 col-form-label">Bilangan SAG</label>
+                                    <div class="col-6">
+                                        <div class="input-group">
+                                            <input type="text" readonly class="form-control bg-light" value=" {{$total_marhun}}">
                                         </div>
                                     </div>
                                 </div>
@@ -136,11 +144,12 @@
 
                         <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
 
+                        <div style="overflow-x: auto;">
                         <table class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>No</th>
-                                    <th>T.Lelong</th>
+                                    <th>Tarikh Lelong</th>
                                     <th>Cawangan</th>
                                     <th>Bil SAG</th>
                                     <th>Berat (gm)</th>
@@ -157,14 +166,14 @@
 
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
-                                    <td>{{$index+1}}</td>
+                                    <td class="text-center">{{$index+1}}</td>
-                                    <td style='white-space:nowrap;'>@php
+                                    <td style='white-space:nowrap;' class="text-center">@php
                                         $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
                                         $t_lelong =  $myDateTime->format('d-m-Y');
                                         echo($t_lelong);
                                     @endphp</td>
-                                    <td style='white-space:nowrap;'>{{ $caw['cawangan'] }}</td>
+                                    <td style='white-space:nowrap;' class="text-center">{{ $caw['cawangan'] }}</td>
-                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td class="text-center">{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
@@ -178,8 +187,8 @@
                             </tbody>
                             <tfoot>
                                 <tr>
-                                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td class="text-center" colspan="3"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td class="text-center"><b>{{ $total_marhun }}</b></td>
                                     <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
@@ -192,6 +201,7 @@
                             </tfoot>
 
                         </table>
+                        </div>
 
                         {{-- <table class="table table-striped  table-xl" id="jumlahberat" style="width:80%">
                                 <tr class="text-center">
@@ -223,6 +233,35 @@
                             </tbody>
 
                         </table> --}}
+                        <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
+                        <div style="overflow-x: auto;">
+                            <table width="50%" class="table table-bordered text-center" id="jumlahberat">
+                                <thead class="bg-light">
+                                    <tr>
+                                        <th>MUTU</th>
+                                        @foreach ($jeniskarat as $index=>$karat)
+                                        <th>{{$karat->karat}}</th>
+                                        @endforeach
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td>BERAT (gm)</td>
+                                        <td>{{number_format($total24Kgb, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total24K, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total23k, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total22K, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total21K, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total20K, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total18Kp, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total18K, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total14Kp, 2, '.', ',')}}</td>
+                                        <td>{{number_format($total14K, 2, '.', ',')}}</td>
+                                    </tr>
+                                </tbody>
+
+                            </table>
+                        </div>
                     </form>
                     {{-- <div class="row">
                         <div class="text-center">
@@ -376,30 +415,14 @@
     });
 
     var tablesimulasi = $('#simulasi').DataTable( {
-        "columnDefs": [
+        "pageLength": 50,
-            {
+    });
-            "targets": 0,
-            "orderable": false
-            }
-        ],
-        order: [[0, 'asc']],
-        // "ordering": false,
-        "searching":false,
-        "info": false,
-        "lengthChange": false,
-        "pageLength": 15,
-        dom: 'Bfrtip',
-        buttons: [
 
-            // {
+    var tableJumlahBerat = $('#jumlahberat').DataTable({
-            //     className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+        "info": false,
-            //     titleAttr: 'Download to PDF',
+        "paging": false,
-            //     text: '<i class="fas fa-download"></i>',
+        "searching": false,
-            //     action: function ( e, dt, node, config ) {
+        "ordering": false
-            //         $("#exportform").submit();
-            //     }
-            // }
-        ]
     });
 
     $('.addsim').tooltip();

resources/views/lelong/showlelongpc.blade.php

@@ -2,51 +2,50 @@
 
 @section('content')
 <div class="container-fluid">
-    <div class="row ">
+    <div class="row">
-        <div class="col-md-11 mx-auto card p-4">
+        <div class="col">
-            <div class="card-header header-style">
+            <div class="card">
-                <a href="{{ route('jananotis.senarailelongpc') }}" class="header-style-icon">
+                <div class="card-header header-style">
-                    <i class="fas fa-arrow-left"></i>
+                    <a href="{{ route('jananotis.senarailelongpc') }}" class="header-style-icon">
-                </a>
+                        <i class="fas fa-arrow-left"></i>
-                <div class="header-style-title">
+                    </a>
-                    @foreach($data as $data1)
+                    <div class="header-style-title">
-                    @php 
+                        @php
-                        $today = date('d-m-Y');
+                          $today = date('d-m-Y');
                         $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
-                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                        $datez = $myDateTime->format('d-m-Y');
+                        $t_lelong = $myDateTime->format('d-m-Y');
-                    @endphp
+                        @endphp
-                    @endforeach
+                        butiran lelong : {{$t_lelong}}
-                    butiran lelong : {{$datez}}
+                    </div>
                 </div>
-            </div>
+                <div class="card-body">
-              <div class="card-body">
+                    @if ($message = Session::get('success'))
-                @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
-                <div class="alert alert-success">
+                        {{ $message }}
-                    {{ $message }}
+                    </div>
+                    @endif
+              <nav>
+                <div class="nav mb-3 nav-tabs" id="nav-tab" role="tablist">
+                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
+                  {{-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> --}}
                 </div>
-                @endif
+              </nav>
+              <div class="tab-content" id="nav-tabContent">
+                <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
+      
                 <form id="exportform" action="{{route('jananotis.exportlelongpc')}}" method="POST">
                     @csrf
                     <input type="hidden" name="type" value="User">
                     <input type="hidden" name="lelongid" value="{{ $lelong_id }}">
+
                     <div class="row">
                         <div class="col-md-12 col-lg">
                             <div class="form-group row">
                                 <label class="col-6 col-form-label">Tarikh Lelong</label>
                                 <div class="col-6">
                                     <div class="input-group">
-                                        @foreach($data as $data1)
+                                        <input type="text" readonly class="form-control bg-light" value="{{$t_lelong}}">
-                                            @php 
-                                            $today = date('d-m-Y');
-                                            $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
-                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
-                                              $datez = $myDateTime->format('d-m-Y');
-                                            //   echo($datez);
-                                          
-                                          @endphp
-                                        @endforeach
-                                        <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
                                     </div>
                                 </div>
                             </div>
@@ -54,10 +53,7 @@
                                 <label class="col-6 col-form-label">JBG</label>
                                 <div class="col-6">
                                     <div class="input-group">
-                                        @foreach($data as $data)
-                                        {{-- <td>Tempoh : {{$data['jbg'] }}</td> --}}
                                         <input type="text" readonly class="form-control bg-light" value="{{$data['jbg']}}">
-                                        @endforeach
                                     </div>
                                 </div>
                             </div>
@@ -76,7 +72,7 @@
                                         <div class="input-group-prepend">
                                             <div class="input-group-text">RM</div>
                                         </div>
-                                        <input type="text" readonly class="form-control bg-light" value="{{$tarikhkemaskini->harga2}}">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$lelong->harga_emas_asas}}">
                                     </div>
                                 </div>
                             </div>
@@ -106,10 +102,10 @@
                         <div class="col-lg-1"></div>
                         <div class="col-md-12 col-lg">
                             <div class="form-group row">
-                                <div class="col-6">
+                                <div class="col-12 col-form-label">
                                     <div class="input-group">
                                         @if($kemaskini == $today) 
-                                        <button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
+                                        <button class="btn btn-success btn-sm" disabled>Harga Emas Lelong Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
                                         {{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
                                         @else
                                         <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>
@@ -169,27 +165,26 @@
                                         <div class="input-group-prepend">
                                             <div class="input-group-text">RM</div>
                                         </div>
-                                        <input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_rugilelong, 2, '.', ',') }}">
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    
-                        
                     <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+                    <div style="overflow-x: auto;">
                         <table class="table text-right table-bordered" id="simulasi">
-                            <thead class="bg-primary text-white">
+                            <thead class="bg-primary text-center text-white">
                                 <tr class="text-center">
                                     <th>No</th>
                                     <th>Cawangan</th>
-                                    <th>Bil SAG</th>
+                                    <th>Bil Surat</th>
                                     <th>Berat (gm)</th>
-                                    <th>N. Marhun (RM)</th>
+                                    <th>N.Marhun Asal (RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -198,15 +193,15 @@
                                 
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
-                                    <td>{{$index+1}}</td>
+                                    <td class="text-center">{{$index+1}}</td>
-                                    <td style="white-space: nowrap;"><a href=" {{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td class="text-center" style='white-space:nowrap;'><a href="{{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
-                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td class="text-center">{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                    <td >{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -214,23 +209,24 @@
                             </tbody>
                             <tfoot>
                                 <tr>
-                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td class="text-center" colspan="2"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td class="text-center">{{ $total_marhun }}</td>
-                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
                                 </tr>
                             </tfoot>
                             
                         </table>
-
+                        </div>
                         <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
-                        <table class="table table-bordered text-center" id="jumlahberat">
+                        <div style="overflow-x: auto;">
+                            <table width="100%" class="table table-bordered text-center" id="jumlahberat">
                             <thead class="bg-light">
                                 <!-- <tr class="text-center">
                                     <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
@@ -246,21 +242,21 @@
 
                                 <tr>
                                     <td>BERAT (gm)</td>
-                                    <td>{{$total24Kgb}}</td>
+                                    <td>{{number_format($total24Kgb, 2, '.', ',')}}</td>
-                                    <td>{{$total24K}}</td>
+                                    <td>{{number_format($total24K, 2, '.', ',')}}</td>
-                                    <td>{{$total23k}}</td>
+                                    <td>{{number_format($total23k, 2, '.', ',')}}</td>
-                                    <td>{{$total22K}}</td>
+                                    <td>{{number_format($total22K, 2, '.', ',')}}</td>
-                                    <td>{{$total21K}}</td>
+                                    <td>{{number_format($total21K, 2, '.', ',')}}</td>
-                                    <td>{{$total20K}}</td>
+                                    <td>{{number_format($total20K, 2, '.', ',')}}</td>
-                                    <td>{{$total18Kp}}</td>
+                                    <td>{{number_format($total18Kp, 2, '.', ',')}}</td>
-                                    <td>{{$total18K}}</td>
+                                    <td>{{number_format($total18K, 2, '.', ',')}}</td>
-                                    <td>{{$total14Kp}}</td>
+                                    <td>{{number_format($total14Kp, 2, '.', ',')}}</td>
-                                    <td>{{$total14K}}</td>
+                                    <td>{{number_format($total14K, 2, '.', ',')}}</td>
-
                                 </tr>
                             </tbody>
 
-                        </table>
+                            </table>
+                        </div>
                     </form>
                     <div class="row">
                         <div class="text-center">
@@ -268,32 +264,65 @@
                         </div>
                     </div>
                 </div>
+               
                 <div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
                     <br>
+                    {{-- <form id="exporthargaemas" action="{{route('lelong.exporthargaemas')}}" method="POST"> --}}
+                        {{-- @csrf
+                        <input type="hidden" name="type" value="User">
+                        <input type="hidden" name="lelongid" value="{{ $lelong_id }}"> --}}
+                       
                     <div class="row ">
                         <div class="col-md-10 mx-auto ">
-                            <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
+                            <button  type="button"  class="btn mb-5 btn-outline-success" ><a href="{{ route('lelong.exporthargaemas', $lelong_id)}}"><h3><i class="fas fa-print"></i></h3></a></button>
+                            <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Ubah</button>
                             
                             <div id="hideform">
-                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
+                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Per Gram (916) RM</label>
-                                <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
+                                <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
-                                <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
+                                <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Kemaskini</button>
-                                <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
+                                <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Batal</button>
                             </div>
                             
                         </div>
                     </div>
-              
+                   
+
+                    <div class="row ">
+                        <div class="col-md-10 mx-auto">
+                            
+                            <form action="{{ route('lelong.kemaskinihargaasas') }}" method="POST" id="formhargaasas">
+                                @csrf
+                                <input type="hidden" name="idlelong" value="{{$lelong_id}}">
+                                <table class="table table-bordered" id="kemaskinikarat" style="width:100%" >
+                                    <thead class="bg-primary text-white">
+                                        <tr class="text-center">
+                                            <th>Karat</th>
+                                            <th>Keterangan</th>
+                                            <th>Harga</th>
+                                            {{-- <th>Harga</th> --}}
+                                        </tr>
+                                    </thead>
+                                    <tbody class="text-center">
+                                        @foreach ($lelkarat as $index=>$karat)
+                                            <tr>
+                                                <td>{{$karat->karat}}</td>
+                                                <td>{{$karat->keterangan}}</td>
+                                                <td class="input">{{$karat->harga2}}</td>
+                                                {{-- <td class="input">{{$karat->harga}}</td> --}}
+                                            </tr>
+                                        @endforeach
+                                    </tbody>
+                                    
+                                </table>
+                            {{-- </form> --}}
+                        </div>
+                    </div>
                     {{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
                     
                     
                 </div>
               </div>
-            @if ($message = Session::get('success'))
-            <div class="alert alert-success">
-                <p>{{ $message }}</p>
-            </div>
-            @endif
             {{-- {{$cawangan[0] }} --}}
         </div>
         <div class="modal fade" tabindex="-1" id="modalfilter">
@@ -419,10 +448,18 @@
 
     function save(){
         $('#formhargaasas').submit();
+        $.dialog({
+            icon: 'fa fa-spinner fa-spin',
+            title: 'Dalam Proses !',
+            content: 'Halaman akan dikemaskini selepas proses selesai.',
+            closeIcon: false,
+            boxWidth: '500px',
+            useBootstrap: false,
+        });
     }
 
     $('a.confirmdel').confirm({
-        title: 'Confirmation',
+        title: 'Pengesahan',
         content: 'Anda pasti?',
         type: 'orange',
         typeAnimated: true,
@@ -440,31 +477,19 @@
         }
     });
 
-    var tablesimulasi = $('#simulasi').DataTable( {
+    var tablesimulasi = $('#simulasi').DataTable({
-            "columnDefs": [ 
+        "pageLength": 50,
-                {
-                "targets": 0,
-                "orderable": false,
-                "width": 100%
-                }
-            ],
-            order: [[0, 'asc']],
-            // "ordering": false,
-            "searching":true,
-            "info": false,
-            "lengthChange": false,
-            "scrollX": true,
-            "paging": false,
-
     });
-        var tableJumlahBerat = $('#jumlahberat').DataTable({
+
-        "scrollX": true,
+    
+    var tableJumlahBerat = $('#jumlahberat').DataTable({
         "info": false,
         "paging": false,
         "searching": false,
         "ordering": false
     });
 
+
         $('.addsim').tooltip();
         $('.export').tooltip();
         // $( '.dt-buttons').addClass('btn-group');

resources/views/lelong/showlelongpcdone.blade.php

@@ -157,7 +157,7 @@
                                         <div class="input-group-prepend">
                                             <div class="input-group-text">RM</div>
                                         </div>
-                                        <input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})">
+                                        <input type="text" readonly class="form-control bg-light" value="({{ number_format($total_rugilelong, 2, '.', ',') }})">
                                     </div>
                                 </div>
                             </div>
@@ -166,7 +166,8 @@
                     
                         
                     <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
-                        <table class="table text-right table-bordered" id="simulasi">
+                    <div style="overflow-x: auto;">
+                    <table class="table text-right table-bordered" id="simulasi">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>No</th>
@@ -188,7 +189,7 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('jananotis.senaraimarhunpcdone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td  class="text-center" style='white-space:nowrap;'><a href=" {{ route('jananotis.senaraimarhunpcdone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
@@ -219,6 +220,7 @@
                             </tfoot>
                             
                         </table>
+                    </div>
 
                         <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
                         <table class="table table-bordered text-center" id="jumlahberat">

resources/views/lelong/showrenewxlaku.blade.php

@@ -92,7 +92,9 @@
  
                         </div>
                     </div>
+                    @hasrole('operasi')
                     <button type="submit" class="btn btn-success">Daftar Lelong</button>
+                    @endhasrole
                 </form>
 
                 

resources/views/marhun/marhun.blade.php

@@ -1,12 +1,14 @@
 @extends('layouts.app')
 
 @push('additional_scripts')
-    <script src="{{ asset('js/marhun-photo-capture.js') }}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/image-capture@0.4.0/lib/imagecapture.min.js"></script>
+    <script src="{{ asset('js/marhun-photo-capture.js').'?'.rand(1,1000) }}"></script>
     <script src="{{ asset('js/marhun-photo-capture-reload-https.js') }}"></script>
     <script src="{{ asset('js/marhun-photo-capture-debugger.js') }}"></script>
     <script src="{{ asset('js/marhun-photo-viewer.js') }}"></script>
     <script>
-        var marhun_camera_config = @json(config('marhun_camera.marhun_cameras'));
+        var marhun_camera_config_chrome = @json(config('marhun_camera.marhun_cameras_chrome'));
+        var marhun_camera_config_firefox= @json(config('marhun_camera.marhun_cameras_firefox'));
         let modalOverallPhotoCapture = new marhunPhotoCapturerFactory('#modaloverallphoto-capture');
         let modalOverallPhotoCaptureUpdate = new marhunPhotoCapturerFactory('#modaloverallphoto-capture-update');
         let modalOverallPhotoCapturePerMarhun = new marhunPhotoCapturerFactory('#modalpermarhunphoto-capture');
@@ -103,7 +105,7 @@
                 <thead class="bg-primary text-white">
                     <tr>
                         <th class="text-center">Barang</th>
-                        <th>Gambar</th>
+                        {{--<th>Gambar</th>--}}
                         <th>Marhun</th>
                         <th>Karat</th>
                         <th>Berat</th>
@@ -118,7 +120,7 @@
                     @foreach ($marhun as $item)
                     <tr>
                         <td class="text-center"> {{ $loop->iteration }} </td>
-                        <td class="p-2 m-2" style="border: 1px solid black; width: 100px; height: 130px">
+                        {{--<td class="p-2 m-2" style="border: 1px solid black; width: 100px; height: 130px">
                                     @if (empty($item->eachmarhun_filename))
                                         <div class="btn-group" role="group" style="width: 100%;">
                                             <span data-toggle="tooltip" data-placement="top" title="Muat naik gambar per marhun">
@@ -166,7 +168,7 @@
 
 
 
-                                </td>
+                                </td>--}}
                         <td>{{ $item->marhun }}</td>
                         <td>
                             @if($item->karat != null)

resources/views/marhun/senarailelongscan.blade.php

@@ -4,90 +4,74 @@
 
 <div class="container-fluid">
     <div class="row ">
-            <div class="col mx-auto p-4">
+        <div class="col mx-auto p-4">
-                <div class="card">
+            <div class="card">
-                    <div class="card-header header-style">
+                <div class="card-header header-style">
-                        <a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
+                    <div class="header-style-title">
-                            <i class="fas fa-arrow-left"></i>
+                        Scan Barcode
-                        </a>
-                        <div class="header-style-title">
-                            Senarai Lelongan Scan
-                        </div>
                     </div>
-                    <div class="card-body">
+                </div>
-            <table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
+                <div class="card-body">
-                <thead class="bg-primary text-white">
+                    <div style="overflow-x: auto;">
-                    <tr>
+                        <table class="table table-bordered text-center" id="senarailelongonline">
-                        <th>No</th>
+                            <thead class="bg-primary text-white">
-                        <th>Batch Lelong</th>
+                                <tr>
-                        <th>Tarikh Lelong</th>
+                                    <th>No</th>
-                        <th>Status Lelong</th>
+                                    <th>Batch Lelong</th>
-                        <th>Tindakan</th>
+                                    <th>Tarikh Lelong</th>
-                        <th>Scan Keluar</th>
+                                    <th>Status Lelong</th>
-                        <th>Scan Masuk</th>
+                                    <th>Tindakan</th>
-                    </tr>
+                                    <th>Scan Keluar</th>
-                </thead>
+                                    <th>Scan Masuk</th>
-                <tbody>
+                                </tr>
-                    @foreach($arrayinfo as $lel)
+                            </thead>
-                    <tr>
+                            <tbody>
-                        <td>{{$loop->iteration}}</td>
+                                @foreach($arrayinfo as $lel)
-                        <td>{{ $lel['info']['lelong_id']}}</td>
+                                <tr>
-                        <td>@php
+                                    <td>{{$loop->iteration}}</td>
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                    <td>{{ $lel['info']['lelong_id']}}</td>
-                            $t_lelong = $myDateTime->format('d-m-Y');
+                                    <td>@php
-                            echo($t_lelong);
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
-                            @endphp</td>
+                                        $t_lelong = $myDateTime->format('d-m-Y');
-                        <td>
+                                        echo($t_lelong);
-                            @if($lel['info']['sts_lelong'] == 0)
+                                        @endphp</td>
-                            <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                                    <td>
-                            @endif
+                                        @if($lel['info']['sts_lelong'] == 0)
-                        </td>
+                                        <span class="badge badge-warning">LELONG BELUM BERMULA</span>
-                        <td>
+                                        @endif
-                            @if($lel['info']['sts_lelong'] == 0)
+                                    </td>
-                            <a class="btn btn-warning btn-sm" href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
+                                    <td>
-                            @endif
+                                        @if($lel['info']['sts_lelong'] == 0)
-                        </td>
+                                        <a class="btn btn-warning btn-sm" href="{{ route('marhun.exportmarhundetails', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="fas fa-download"></i></a>
-                        <td>
+                                        @endif
-                            @if($lel['info']['sts_lelong'] == 0)
+                                    </td>
-                            <a class="btn btn-info btn-sm" href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
+                                    <td>
-                            @endif
+                                        @if($lel['info']['sts_lelong'] == 0)
-                        </td>
+                                        <a class="btn btn-primary btn-sm" href=" {{ route('marhun.scanbarcode', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
-                        <td>
+                                        @endif
-                            @if($lel['info']['sts_lelong'] == 0)
+                                    </td>
-                            <a class="btn btn-info btn-sm" href=" {{ route('marhun.scanbarcodemasuk', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
+                                    <td>
-                            @endif
+                                        @if($lel['info']['sts_lelong'] == 0)
-                        </td>
+                                        <a class="btn btn-info btn-sm" href=" {{ route('marhun.scanbarcodemasuk', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Marhun"><i class="far fa-edit"></i></a>
-                    </tr>
+                                        @endif
-                    @endforeach
+                                    </td>
-                </tbody>
+                                </tr>
-            </table>
+                                @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
         </div>
+
     </div>
 </div>
-
 <script>
     $(function() {
         $('[data-toggle="tooltip"]').tooltip()
     })
 
-    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
+    var tablesenarailelongonline = $('#senarailelongonline').DataTable({});
-        "columnDefs": [{
-                "targets": 0,
-                "orderable": false
-            },
-            {
-                "targets": 3,
-                "orderable": false
-            }
-        ],
-        order: [
-            [1, 'asc']
-        ],
-        "info": false,
-        "lengthChange": false,
-        "pageLength": 15,
-        dom: 'Bfrtip',
-    });
 </script>
 
 @endsection

resources/views/marhun/senarailelongterimaserah.blade.php

@@ -7,11 +7,8 @@
         <div class="col mx-auto p-4">
             <div class="card">
                 <div class="card-header header-style">
-                    <a href="{{ route('marhun.senarailelongterimaserah') }}" class="header-style-icon">
-                        <i class="fas fa-arrow-left"></i>
-                    </a>
                     <div class="header-style-title">
-                     Terima/Serah Marhun
+                        Terima/Serah Marhun
                     </div>
                 </div>
                 <div class="card-body">
@@ -25,32 +22,40 @@
                         <p>{{ $message }}</p>
                     </div>
                     @endif
-                    <table class='table table-bordered table-hover' id="table-lelong">
+                    <div style="overflow-x: auto;">
-                        <thead class="bg-primary text-white">
+                        <table class='table table-bordered text-center' id="table-lelong">
-                            <th>Bil</th>
+                            <thead class="bg-primary text-white">
-                            <th>Batch Lelong</th>
+                                <th>Bil</th>
-                            <th>Tarikh Lelong</th>
+                                <th>Batch Lelong</th>
-                            <th>Status Lelong</th>
+                                <th>Tarikh Lelong</th>
-                            <th>Tindakan</th>
+                                <th>Status Lelong</th>
-                        </thead>
+                                <th>Tindakan</th>
-                        <tbody>
+                            </thead>
-                            @foreach ($lelong as $index)
+                            <tbody>
-                            <tr>
+                                @foreach ($lelong as $index)
-                                <td>{{$loop->iteration}}</td>
+                                <tr>
-                                <td>{{$index->lelong_id}}</td>
+                                    <td>{{$loop->iteration}}</td>
-                                <td>{{$index->tarikh_lelong}}</td>
+                                    <td>{{$index->lelong_id}}</td>
-                                @if($index->sts_lelong == 0)
+                                    <td>
-                                <td>
+                                        @php
-                                    <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $index->tarikh_lelong );
-                                </td>
+                                        $t_lelong = $myDateTime->format('d-m-Y');
-                                @endif
+                                        echo($t_lelong);
-                                <td>
+                                        @endphp
-                                    <a class="btn m-1 btn-primary" href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
+                                    </td>
-                                </td>
+                                    @if($index->sts_lelong == 0)
-                            </tr>
+                                    <td>
-                            @endforeach
+                                        <span class="badge badge-warning">LELONG BELUM BERMULA</span>
-                        </tbody>
+                                    </td>
-                    </table>
+                                    @endif
+                                    <td>
+                                        <a class="btn btn-primary btn-sm" href="{{route('marhun.terimaserahmarhun', ['lelong_id'=>$index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun"><i class="far fa-edit"></i></a>
+                                    </td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>

resources/views/marhun/terimaserahmarhun.blade.php

@@ -7,21 +7,21 @@
         <div class="col mx-auto p-4">
             <div class="card">
                 <div class="card-header header-style">
-                    <a href="{{ route('marhun.senarailelongscan') }}" class="header-style-icon">
+                    <a href="{{ route('marhun.senarailelongterimaserah') }}" class="header-style-icon">
                         <i class="fas fa-arrow-left"></i>
                     </a>
                     <div class="header-style-title">
-                        Terima/Serah Marhun
+                        Terima/Serah Marhun, Batch Lelong: {{ $lelong_id}}
                     </div>
                 </div>
                 <div class="card-body">
                     @if ($message = Session::get('success'))
                     <div class="alert mt-2 alert-success">
-                        <p>{{ $message }}</p>
+                        {{ $message }}
                     </div>
                     @elseif ($message = Session::get('failed'))
                     <div class="alert mt-2 alert-danger">
-                        <p>{{ $message }}</p>
+                        {{ $message }}
                     </div>
                     @endif
                     {{-- <a href="{{route('marhun.senarailelongterimaserah')}}" class="btn mb-2 btn-secondary">Kembali</a> --}}
@@ -40,117 +40,104 @@
                         <div class="tab-pane fade show active" id="belum-diterima" role="tabpanel" aria-labelledby="belum-diterima-tab">
                             <form action="{{ route('marhun.terimamarhun') }}" method="POST">
                                 @csrf
+                                <input type="hidden" name="scanKeluar_id" value="{{ json_encode($senaraiScanKeluar->pluck('id')->toArray()) }}">
                                 <table class='table table-bordered table-hover' id='table-belum-diterima'>
                                     <thead class="bg-primary text-white">
                                         <tr>
                                             <th>Bil</th>
                                             <th>No Rujukan</th>
                                             <th>Tarikh/Masa Scan Keluar</th>
-                                            <th>Status</th>
+                                            <th class="text-center">Status</th>
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        {{-- @foreach($senaraiScanKeluar as $index) --}}
+                                        @foreach($senaraiScanKeluar as $index)
-                                        @forelse($senaraiScanKeluar as $index)
-                                        <input type="hidden" name="scanKeluar_id[]" value="{{$index->id}}">
                                         <tr>
                                             <td>{{$loop->iteration}}</td>
                                             <td>{{$index->norujukan}}</td>
                                             <td>{{$index->scan_keluar}}</td>
-                                            <td><span class="badge badge-pill badge-danger">Belum Terima</span></td>
+                                            <td class="text-center"><span class="badge badge-danger">Belum Terima</span></td>
                                         </tr>
-                                        @empty
+                                        @endforeach
-                                        <tr>
-                                            <td colspan="4">No Data</td>
-                                        </tr>
-                    
-                                         @endforelse
-                                        {{-- @endforeach --}}
                                     </tbody>
                                 </table>
+                                @if ($senaraiScanKeluar->isNotEmpty())
                                 <div class="d-flex mt-2 justify-content-end">
-                                    <button type="submit" class="btn btn-primary">Terima Marhun</button>
+                                    <button type="submit" class="btn btn-primary btn-sm">Terima Marhun</button>
                                 </div>
+                                @endif
                             </form>
 
                         </div>
                         <div class="tab-pane fade" id="sedang-dinilai" role="tabpanel" aria-labelledby="sedang-dinilai-tab">
                             <form action="{{ route('marhun.serahmarhun') }}" method="POST">
                                 @csrf
-                                <input type="hidden" name="test" value="essds">
+                                <div style="overflow-x: auto;">
-                                <table class='table table-bordered table-hover' id='table-sedang-dinilai'>
+                                    <table class='table table-bordered table-hover' id='table-sedang-dinilai'>
-                                    <thead class="bg-primary text-white">
+                                        <thead class="bg-primary text-white">
-                                        <tr>
+                                            <tr>
-                                            <th>Bil</th>
+                                                <th class="text-center"><input type="checkbox" id="checkall"></th>
-                                            <th>No Rujukan</th>
+                                                <th class="text-center">Bil</th>
-                                            <th>Tarikh/Masa Scan Keluar</th>
+                                                <th>No Rujukan</th>
-                                            <th>Tarikh/Masa Terima Marhun</th>
+                                                <th>Tarikh/Masa Scan Keluar</th>
-                                            <th>Status</th>
+                                                <th>Tarikh/Masa Terima Marhun</th>
-                                        </tr>
+                                                <th class="text-center">Status</th>
-                                    </thead>
+                                                <th class="text-center">Tindakan</th>
-                                    <tbody>
+                                            </tr>
-                                        @forelse($sedangDinilai as $index)
+                                        </thead>
-                                        <input type="hidden" name="sedangDinilai_id[]" value="{{$index->id}}">
+                                        <tbody>
-                                        <tr>
+                                            @forelse($sedangDinilai as $index)
-                                            <td>{{$loop->iteration}}</td>
+                                            <tr>
-                                            <td>{{$index->norujukan}}</td>
+                                                <td class="text-center"><input type="checkbox" class="checkbox" name="sedangDinilai_id[]" value="{{$index->id}}"></td>
-                                            <td>{{$index->scan_keluar}}</td>
+                                                <td class="text-center">{{$loop->iteration}}</td>
-                                            <td>{{$index->terima_marhun}}</td>
+                                                <td>{{$index->norujukan}}</td>
-                                            @if (isset($index['sdhdisemak']['status_semak']))
+                                                <td>{{$index->scan_keluar}}</td>
-                                                @if(($index['sdhdisemak']['status_semak']) == 1)
+                                                <td>{{$index->terima_marhun}}</td>
-                                                <td><span class="badge badge-pill badge-success">Telah Dinilai</span></td>
+                                                <td class="text-center"><span class="badge badge-warning">Sedang Dinilai</span></td>
-                                                @else
+                                                <td class="text-center"><a class="btn btn-primary btn-sm" href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}" data-toggle="tooltip" data-placement="top" title="Semak Marhun"><i class="far fa-edit"></i></a></td>
-                                                <td><a href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}"><span class="badge badge-pill badge-warning">Sedang Dinilai</span></a></td>
+                                            </tr>
-                                                @endif
+                                            @empty
-                                            @else
+                                            <tr>
-                                             <td><a href="{{route('marhun.show',[$index->lelongbid_id, $index->lelong_id])}}"><span class="badge badge-pill badge-warning">Sedang Dinilai</span></a></td>
+                                                <td colspan="99" class="text-center">No Data</td>
-                                            @endif
+                                            </tr>
-                                        </tr>
+                                            @endforelse
-                                        @empty
+                                        </tbody>
-                                        <tr>
+                                    </table>
-                                            <td colspan="4">No Data</td>
+                                </div>
-                                        </tr>
-                                        @endforelse
-                                    </tbody>
-                                </table>
                                 <div class="d-flex mt-2 justify-content-end">
-                                    <button type="submit" class="btn btn-primary">Serah Marhun</button>
+                                    <button type="submit" class="btn btn-primary btn-sm" disabled id="button-serah">Serah Marhun</button>
                                 </div>
                             </form>
                         </div>
 
                         <div class="tab-pane fade" id="sudah-serah" role="tabpanel" aria-labelledby="sudah-serah-tab">
-                            <div style="text-align: left;"> <a  href="{{ route('marhun.cetakterimaserahmarhun', $lelong_id) }}" class="btn btn-info">Laporan Serahan Marhun Penilai</a><br></div>
+                            <div class="mb-2"> <a href="{{ route('marhun.cetakterimaserahmarhun', $lelong_id) }}" class="btn btn-primary btn-sm">Laporan Serahan Marhun Penilai</a><br></div>
-                            <table class="table table-bordered table-hover" id="table-sudah-serah" style="width: 100%;">
+                            <div style="overflow-x: auto;">
-                                <thead class="bg-primary text-white">
+                                <table class="table table-bordered" id="table-sudah-serah" style="width: 100%;">
-                                    <tr>
+                                    <thead class="bg-primary text-white">
-                                        <th>Bil</th>
-                                        <th>No Rujukan</th>
-                                        <th>Tarikh/Masa Scan Keluar</th>
-                                        <th>Tarikh/Masa Terima Marhun</th>
-                                        <th>Tarikh/Masa Serah Marhun</th>
-                                        <th>Status</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {{-- @foreach($sudahSerah as $index) --}}
-                                    @forelse($sudahSerah as $index)
-                                    <tr>
-                                        <td>{{$loop->iteration}}</td>
-                                        <td>{{$index->norujukan}}</td>
-                                        <td>{{$index->scan_keluar}}</td>
-                                        <td>{{$index->terima_marhun}}</td>
-                                        <td>{{$index->serah_marhun}}</td>
-                                        <td><span class="badge badge-pill badge-success">Sudah Serah</span></td>
-                                    </tr>
-                                    @empty
                                         <tr>
-                                            <td colspan="6">No Data</td>
+                                            <th class="text-center">Bil</th>
+                                            <th>No Rujukan</th>
+                                            <th>Tarikh/Masa Scan Keluar</th>
+                                            <th>Tarikh/Masa Terima Marhun</th>
+                                            <th>Tarikh/Masa Serah Marhun</th>
+                                            <th class="text-center">Status</th>
                                         </tr>
-                                    @endforelse
+                                    </thead>
-                                    {{-- @endforeach --}}
+                                    <tbody>
-                                </tbody>
+                                        @foreach($sudahSerah as $index)
-                            </table>
+                                        <tr>
+                                            <td class="text-center">{{$loop->iteration}}</td>
+                                            <td>{{$index->norujukan}}</td>
+                                            <td>{{$index->scan_keluar}}</td>
+                                            <td>{{$index->terima_marhun}}</td>
+                                            <td>{{$index->serah_marhun}}</td>
+                                            <td class="text-center"><span class="badge badge-success">Sudah Serah</span></td>
+                                        </tr>
+                                        @endforeach
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -160,9 +147,47 @@
 </div>
 
 <script>
-    // var tableBelumDiterima = $('#table-belum-diterima').DataTable({});
+    $(function() {
-    // var tableSedangDinilai = $('#table-sedang-dinilai').DataTable({});
+        $('[data-toggle="tooltip"]').tooltip()
-    // var tableSudahSerah = $('#table-sudah-serah').DataTable({});
+    });
+
+    $(document).ready(function() {
+        $("#checkall").change(function() {
+            var checked = $(this).is(':checked');
+            if (checked) {
+                $(".checkbox").each(function() {
+                    $(this).prop("checked", true);
+                    $('#button-serah').removeAttr('disabled');
+                });
+            } else {
+                $(".checkbox").each(function() {
+                    $(this).prop("checked", false);
+                    $('#button-serah').attr('disabled', true);
+                });
+            }
+        });
+
+        $(".checkbox").click(function() {
+            if ($(".checkbox").length == $(".checkbox:checked").length) {
+                $("#checkall").prop("checked", true);
+            } else {
+                $("#checkall").prop("checked", false);
+            }
+
+            if ($(this).is(':checked')) {
+                $('#button-serah').removeAttr('disabled');
+            } else if ($(".checkbox:checked").length == 0) {
+                $('#button-serah').attr('disabled', true);
+            }
+        });
+
+    });
+    var tableBelumDiterima = $('#table-belum-diterima').DataTable({
+        "pageLength": 100,
+    });
+    var tableSudahSerah = $('#table-sudah-serah').DataTable({
+        "pageLength": 100,
+    });
 </script>
 
 @endsection

resources/views/marhun/ubahmarhuncaw.blade.php

@@ -44,7 +44,8 @@
                                         <td>{{ $laporan['brg']['fasa']}}</td>
                                         <td align="left">
                                             @foreach($laporan['detailsbrg'] as $details)
-                                            <a class="btn m-1 btn-danger" href=" {{ route('report.lapubahmarhunlelongindex', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="far fa-edit"></i></a>
+                                            <a  class="confirmrefresh btn m-1 btn-danger" href="{{ route('report.lapubahmarhunlelongindexpdf', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code'], 't_lelong'=>$t_lelong ]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun"><i class="fas fa-download"></i></a>
+                                            <a class="btn m-1 btn-primary" href=" {{ route('report.lapubahmarhunlelongindex', ['lelong_id'=>$laporan['brg']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Perubahan Marhun"><i class="far fa-edit"></i></a>
                                                 <span class="badge badge-pill badge-info text-white" style="font-size:100%">{{ $details['caw_name']}}</span><br>
                                             @endforeach
                                         </td>

resources/views/pdf/cetakbdbrglelong.blade.php

@@ -89,21 +89,19 @@ tr:nth-child(even) {
                     <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
                       <thead>
                         <br>
-                        {{-- <tr>
+                        
-                          @foreach ($arrayinfo as $laporan)
+                        <tr>
-                          <td>Batch Lelong : {{$laporan['laporan']['lelong_id']}}</td>
+                        @foreach ($namacaw as $item)
-                          <td>Tarikh Lelong : @php
+                          <td>Cawangan :  {{$item->caw_name}}</td>
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
-                            $t_lelong =  $myDateTime->format('d-m-Y');
-                            echo($t_lelong);
-                            @endphp</td>
-                            <td>Fasa : {{$laporan['laporan']['fasa']}}</td>
-
-                          @foreach ($laporan['details'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
-                          @endforeach
                         @endforeach
-                        </tr> --}}
+                        </tr>
+                        @php
+                          $tarikh_mula = date('d-m-Y', strtotime($t_mula));
+                          $tarikh_hingga = date('d-m-Y', strtotime($t_hingga));
+                          @endphp
+                        <tr>
+                          <td>Tarikh Lelong : {{ $tarikh_mula }} Hingga {{ $tarikh_hingga }}</td>
+                        </tr>
                       </thead>
                     </table>
 
@@ -114,6 +112,8 @@ tr:nth-child(even) {
                         <thead>
                         <tr> 
                           <th width="5%" align="left">No</th> 
+                          <th width="10%" align="left">Lelong ID</th>
+                          <th width="10%" align="left">Tarikh Lelong</th>
                           <th width="25%" align="left">No Rujukan</th> 
                           <th width="25%" align="left">Marhun</th>
                           <th width="25%" align="left">Berat (gm)</th>
@@ -124,16 +124,20 @@ tr:nth-child(even) {
                         @foreach ($cawangan as $item)
                         <tr>
                           <td>{{ $loop->iteration }} </td>
-
+                          <td>{{ $item['lelong_id'] }}</td>
+                          @php
+                          $t_lelong = date('d-m-Y', strtotime($item['tarikh_lelong']));
+                          @endphp
+                          <td>{{ $t_lelong }}</td>
                           <td>{{ $item['norujukan'] }}</td>
-                            <td>{{ $item['marhun'] }}</td>
+                          <td>{{ $item['marhun'] }}</td>
-                            <td>{{ $item['berat'] }}</td>  
+                          <td>{{ $item['berat'] }}</td>  
-                            <td>{{ $item['hargaasas'] }}</td>    
+                          <td>{{ $item['hargaasas'] }}</td>    
                         </tr>
                         @endforeach
                         
                         <tr>
-                          <td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
+                          <td colspan="5" align="left"><strong>Jumlah Keseluruhan</strong></td>
                           <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
                           <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
                           <td></td>

resources/views/pdf/jananotis.blade.php

@@ -233,10 +233,10 @@
       </table>
   
   
-      <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan <br><b>sebelum 
+      <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut dikaunter cawangan <b>pada atau sebelum 
         @php 
         $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongid->tarikh_lelong );
-            $datez = $myDateTime->modify('-2 day')->format('d-m-Y');
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
             echo($datez);
         
         @endphp:-</b></p>

resources/views/pdf/jananotisfasa2.blade.php

@@ -197,7 +197,7 @@
       @foreach ($lelongid as $bid)
   
       <p>Tuan/Puan,</p>
-      <h4>LELONGAN BARANGAN GADAIAN SECARA TENDER PADA 
+      <h4>LELONGAN AWAM BARANG GADAIAN PADA
         @php 
         $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong);
             $datez = $myDateTime->format('d-m-Y');
@@ -235,7 +235,7 @@
       <p>Tuan/Puan adalah dikehendaki untuk membuat urusan berikut <b>pada atau sebelum 
         @php 
         $myDateTime = DateTime::createFromFormat('Y-m-d', $bid->tarikh_lelong );
-            $datez = $myDateTime->modify('-2 day')->format('d-m-Y');
+            $datez = $myDateTime->modify('-3 day')->format('d-m-Y');
             echo($datez);
         
         @endphp:-</b></p>

resources/views/pdf/laporanakaundetailallpdf.blade.php

@@ -184,13 +184,13 @@
                                               @forelse($listwinner as $winner)
                                               @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                               @php
-                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbidaan += $winner['paid'];
                                               $totalcaj += 1;
                                               $totalbayaran = $totalbidaan + $totalcaj;
                                               @endphp
                                               @else
                                               @php
-                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbidaan += $winner['paid'];
                                               $totalbayaran = $totalbidaan;
                                               @endphp
                                               @endif
@@ -198,7 +198,7 @@
                                                   <td>{{ $loop->iteration }}</td>
                                                   <td>{{ $winner['kodcaw'] }}</td>
                                                   <td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                                                  <td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                                                  <td align = 'right'>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                                                   <td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                                     {{ number_format(1, 2, '.', ',') }}
                                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -206,9 +206,9 @@
                                                     @endif
                                                   </td>
                                                   <td align="right"> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                                      {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                                      {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                                       @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                                      {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                                      {{ number_format($winner['paid'], 2, '.', ',') }}
                                                       @endif
                                                   </td>
                                                   <td align = 'center'> @if($winner['jenisbayaran'] != NULL)

resources/views/pdf/laporanakaundetailpdf.blade.php

@@ -183,20 +183,20 @@
                                               @forelse($listwinner as $winner)
                                               @if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                               @php
-                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbidaan += $winner['paid'];
                                               $totalcaj += 1;
                                               $totalbayaran = $totalbidaan + $totalcaj;
                                               @endphp
                                               @else
                                               @php
-                                              $totalbidaan += $winner['totalPay'];
+                                              $totalbidaan += $winner['paid'];
                                               $totalbayaran = $totalbidaan;
                                               @endphp
                                               @endif
                                               <tr>
                                                   <td>{{ $loop->iteration }}</td>
                                                   <td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
-                                                  <td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                                                  <td align = 'right'>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
                                                   <td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
                                                     {{ number_format(1, 2, '.', ',') }}
                                                     @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -204,9 +204,9 @@
                                                     @endif
                                                   </td>
                                                   <td align="right"> @if($winner['jenisbayaran']['status_payment_opt'] == 2)
-                                                      {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+                                                      {{ number_format($winner['paid']+1, 2, '.', ',') }}
                                                       @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
-                                                      {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                                      {{ number_format($winner['paid'], 2, '.', ',') }}
                                                       @endif
                                                   </td>
                                                   <td align = 'center'> @if($winner['jenisbayaran'] != NULL)

resources/views/pdf/laporanubahmarhun.blade.php

@@ -0,0 +1,207 @@
+
+<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+<style>
+#sim {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    /* text-align: left; */
+    
+}
+
+#sim tr:nth-child(even){}
+
+#sim tr:hover {}
+
+#sim th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+.row {
+  margin-left:-5px;
+  margin-right:-5px;
+}
+  
+.column {
+  /* float: left; */
+  width: 100%;
+  padding: 5px;
+}
+
+/* Clearfix (clear floats) */
+.row::after {
+  content: "";
+  clear: both;
+  display: table;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 200%;
+  border: 0px solid #ddd;
+}
+
+td {
+  /* text-align: left; */
+  padding: 16px;
+}
+
+th{
+  /* text-align: left; */
+  padding: 16px;
+  /* background-color:gainsboro; */
+}
+
+tr:nth-child(even) {
+  /* background-color: #f2f2f2; */
+}
+
+
+ 
+
+
+
+.table th,
+.table td {
+  padding: 0.75rem;
+  vertical-align: top;
+  border-top: 1px solid #dee2e6;
+}
+
+    </style>
+
+        <table width="100%" border="0" id="sim">
+            <tr>
+            <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
+            </tr>
+
+            <tr>
+            <td colspan="2"><u><b>Laporan Ubah Marhun</b></u></td>
+
+            </tr>
+        </table>
+
+        <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+        <thead>
+            <br>
+            <tr>
+            <td>Batch Lelong: {{$lelong_id}}</td>
+            <td>Cawangan : {{$getpengesahan['caw_name']}}  
+            <tr>
+            <td>Tarikh Lelong : {{$t_lelong}} </td>
+            <tr>
+
+            </tr>
+        </thead>
+        </table> 
+
+    <br>
+
+
+
+                <table class='table text-center table-bordered table-hover'  style="width:100%" cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>Bil</th>
+                            <th>No Rujukan</th>
+                            <th>Perubahan</th>
+                            <th>Marhun Asal</th>
+                            <th>Marhun Baru</th>
+                            <th>Mutu Asal</th>
+                            <th>Mutu Baru</th>
+                            <th>Berat Asal (gm)</th>
+                            <th>Berat Baru (gm)</th>
+                            <th>Diminta Oleh</th>
+                            <th>Disahkan Oleh</th>
+                            {{-- <th>Status</th> --}}
+                           
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @forelse($cawangan as $marhun)
+                        <tr>
+                            <td>{{ $loop->iteration }}</td>
+                            <td>{{ $marhun['norujukan'] }}</td>
+                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                                    @if($item['status_ubah'] == 1)
+                                    Mutu 
+                                    @elseif($item['status_ubah'] == 2)
+                                    Pertambahan Marhun 
+                                    @elseif($item['status_ubah'] == 3)
+                                    Hapus Marhun 
+                                    @elseif($item['status_ubah'] == 4)
+                                    Berat 
+                                    @elseif($item['status_ubah'] == 5)
+                                    Mutu & Berat 
+                                    @elseif($item['status_ubah'] == 7)
+                                    Marhun 
+                                    @elseif($item['status_ubah'] == 8)
+                                    Mutu, Berat & Marhun 
+                                    @elseif($item['status_ubah'] == 9)
+                                    Mutu & Marhun 
+                                    @elseif($item['status_ubah'] == 10)
+                                    Berat & Marhun
+                                @endif
+                                <br>
+                              @endforeach</td>
+                              <td>@foreach ($marhun['detail'] as $item)
+                                {{$item['old_marhun']}}<br>
+                                @endforeach</td>
+                              <td>@foreach ($marhun['detailmarhun'] as $item)
+                                @if($item['request_marhun'] == null)
+                                @else
+                                 <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
+                                @endif {{$item['request_marhun']}}<br>
+                                @endforeach</td>
+                                <td>@foreach ($marhun['detail'] as $item)
+                                    {{$item['old_karat']}}<br>
+                                    @endforeach</td>
+                                <td>@foreach ($marhun['detailmarhun'] as $item)
+                                    @if($item['request_karat'] == null)
+                                    @else
+                                     <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
+                                    @endif{{$item['request_karat']}}<br>
+                                @endforeach</td>
+                                <td>@foreach ($marhun['detail'] as $item)
+                                    {{$item['old_berat']}}<br>
+                                    @endforeach</td>
+                              <td>@foreach ($marhun['detailmarhun'] as $item)
+                                @if($item['request_berat'] == null)
+                                @else
+                                 <i class="btn fa fa-arrow-right" aria-hidden="true" style="font-size: 10px"></i> 
+                                @endif{{$item['request_berat']}}<br>
+                                @endforeach</td>
+                            
+                                <td>{{ $marhun['diminta_oleh'] }}</td>
+                                <td>{{ $marhun['disahkan_oleh'] }}</td>
+                            {{-- <td><button class="btn btn-success btn-sm hovernone-success" disabled>BERJAYA DISAHKAN</button></td> --}}
+                        
+                        </tr>
+                        @empty
+                        <tr>
+                            <td colspan="12">No Data</td>
+                        </tr>
+    
+                @endforelse
+                    </tbody>
+                    
+                </table>
+
+
+     
+{{-- @endsection --}}

resources/views/pdf/lelreportkali.blade.php

@@ -78,7 +78,12 @@
     <u><b><h5>LAPORAN SIMULASI LELONGAN CAWANGAN KALI KE-{{$kali}}</h5></b></u>
     </header>
 
-    {{-- <div> Tempoh: {{$data('jbg')}} --}}
+    <div> Tarikh: @php 
+      $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_lelong );
+        $datez = $myDateTime->format('d-m-Y');
+        echo($datez);                            
+    @endphp
+    </div>
                                           
                      
 

resources/views/pdf/lelreportpc.blade.php

@@ -34,6 +34,8 @@
   .row {
     margin-right:-5px;
     margin-right:-5px;
+    font-size:10px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
   }
     
   .column {
@@ -76,32 +78,18 @@
 <body>
 
   <header>
-    @foreach($datacaw as $data1)
+    @foreach ($arraycaw as $cawangan)
-    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data1['caw_name']}}</h5></b></u>
+    <u><b><h5>LAPORAN LELONGAN CAWANGAN: {{$cawangan['cawangan']}}</h5></b></u>
-    @endforeach
+   
     </header>
-                                          
+                    <div class = 'row'>Batch Lelong: {{ $lelong_id}}</div>   
-                      <table text-align="left" border="0" height="25" style="text-left" id="sim">
+                    <div class = 'row'>Tarikh Lelong :@php 
-                        <thead>
+                        $myDateTime1 = DateTime::createFromFormat('Y-m-d', $cawangan['t_lelong'] );
-                          
+                        $datez = $myDateTime1->format('d-m-Y');
-                          <tr>
+                        echo($datez);                            
-                            <td style="text-left">Bilangan Lelong:  {{$total_marhun}}</td>
+                        @endphp</div>
-                            <td style="text-left">Tempoh: {{ $data['jbg']}}</td> 
+                    <div class = 'row'>Harga Emas Lelong: RM {{ $tarikhkemaskini->harga2}} /gram</div>
-                            <td style="text-left">Tarikh Lelong: <br>@php 
+      @endforeach   
-                              $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                                $datez = $myDateTime->format('d-m-Y');
-                                echo($datez);                            
-                            @endphp
-                          </td> 
-                            {{-- <td>Nilai Marhun: RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td> --}}
-                            {{-- <td>Pembiayaan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td> --}}
-                            {{-- <td>Keuntungan: <br>RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                          --}}
-                            {{-- <td>Harga Asas: <br>RM{{ number_format($total_hargaasas, 2, '.', ',') }}</td>                                                   --}}
-                        </thead>
-                      </table>
-          
-                  
-              
                       <br>
                       <table width="100%" id="sim">      
                         <thead>

resources/views/pdf/lelreportpcdone.blade.php

@@ -78,18 +78,18 @@
 <body>
 
   <header>
-    @foreach($datacaw as $data1)
+    @foreach ($arraycaw as $cawangan)
-    <u><b><h5>LAPORAN LELONGAN CAWANGAN: {{$data1['caw_name']}}</h5></b></u>
+    <u><b><h5>LAPORAN LELONGAN CAWANGAN: {{$cawangan['cawangan']}}</h5></b></u>
-    @endforeach
+   
     </header>
-                                          
+                    <div class = 'row'>Batch Lelong: {{ $lelong_id}}</div>                    
                     <div class = 'row'>Tarikh Lelong :@php 
-                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
+                        $myDateTime1 = DateTime::createFromFormat('Y-m-d', $cawangan['t_lelong'] );
-                        $datez = $myDateTime->format('d-m-Y');
+                        $datez = $myDateTime1->format('d-m-Y');
                         echo($datez);                            
                         @endphp</div>
-                    <div class = 'row'>Tempoh: {{ $data['jbg']}}</div>
+                    <div class = 'row'>Harga Emas Lelong: RM {{ $tarikhkemaskini->harga2}} /gram</div>
-          
+      @endforeach     
                   
               
                       <br>

resources/views/pdf/pdflaplelongall.blade.php

@@ -81,7 +81,7 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA - {{$kali}}</b></u></td>
+                          <td colspan="2"><u><b>LAPORAN KESELURUHAN LELONG - {{$kali}}</b></u></td>
 
                         </tr>
                     </table>

resources/views/pdf/pdfsenarailapbidaanall.blade.php

@@ -81,7 +81,7 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA - {{$kali}}</b></u></td>
+                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA KALI - {{$kali}}</b></u></td>
 
                         </tr>
                     </table>
@@ -102,29 +102,28 @@ tr:nth-child(even) {
                         </thead>                        
                       
                         @foreach ($arraycaw as $index=>$caw)
-                        <tr>
+                                <tr>
-                            <td>{{$index+1}}</td>
+                                    <td>{{$index+1}}</td>
-                            <td>@php
+                                    <td style='white-space:nowrap;'>@php
-                                $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
+                                        $myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
-                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                        $t_lelong =  $myDateTime->format('d-m-Y');
-                                echo($t_lelong);
+                                        echo($t_lelong);
-                            @endphp</td>
+                                    @endphp</td>
-                            <td>{{ $caw['cawangan'] }}</td>
+                                    <td>{{ $caw['cawangan'] }}</td>
-                            <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td>{{ $caw['bil_marhun'] }}</td>
-                            <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>                                    
+                                    <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>                                    
-                            <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
-                            <td>{{ number_format($caw['hargabida'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
 
-                       
+                                </tr>
-                        </tr>
+                                @endforeach                                 
-                        @endforeach                                      
 
                         <tr>
                             <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
                             <td>{{ $total_marhun }}</td>
                             <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
                            <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                           <td>{{ number_format($total_hargabida, 2, '.', ',') }}</td>
+                           <td>{{ number_format($total_hargajual, 2, '.', ',') }}</td>
 
                            
                         </tr>

resources/views/pdf/simulasireportbycust.blade.php

@@ -75,8 +75,8 @@ tr:nth-child(even) {
   /** Define now the real margins of every page in the PDF **/
   body {
       margin-top: 1cm;
-      /* margin-left: 2cm; */
+      /*margin-left: 0cm; 
-      /* margin-right: 2cm; */
+       margin-right: 1cm; */
       margin-bottom: 2cm;
   }
   
@@ -134,7 +134,7 @@ tr:nth-child(even) {
                             <th>Tempoh</th>
                             <th>Berat(gm)</th>
                             <th>Nilai Marhun (RM)</th>
-                            <th>Pembiayaan Asal (RM)</th>
+                            <!-- <th>Pembiayaan Asal (RM)</th> -->
                             <th>Baki Pembiayaan (RM)</th>
                             <th>Keuntungan 6 Bulan (RM)</th>
                             <th>Keuntungan Telah Bayar (RM)</th>
@@ -146,7 +146,7 @@ tr:nth-child(even) {
                         @foreach ($marhuns as $index=> $marhun)
                             <tr>
                                 <td>{{$loop->iteration}}</td>                              
-                                <td style='word-wrap' align="left">{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap' align='left'>{{ $marhun['nama']['nama']}}</td>
                                 <td style='word-wrap'>{{ $marhun['nokp']}}</td>
                                 <td style='white-space:nowrap;'>@foreach ($marhun['listsag'] as $item)
                                 {{-- {{$loop->iteration}}.{{ $item['norujukan'] }}<br> --}}
@@ -176,7 +176,7 @@ tr:nth-child(even) {
                                             <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                    
                                         </td> 
-                                        <td align = 'right'>
+                                        <!-- <td align = 'right'>
                                             @php $jumpinjasal = 0;@endphp 
                                             @foreach ($marhun['listsag'] as $item)
                                             @php 
@@ -186,7 +186,7 @@ tr:nth-child(even) {
                                             @endforeach
                                                 <strong>{{ number_format($jumpinjasal, 2, '.', ',') }}</strong>
                                        
-                                        </td> 
+                                        </td>  -->
                                         <td align = 'right'>
                                             @php $jumpinjaman = 0;@endphp 
                                             @foreach ($marhun['listsag'] as $item)

resources/views/pembayaran/kaunterpembayaran.blade.php

@@ -7,167 +7,127 @@
         <div class="col">
             <div class="card">
                 <div class="card-header header-style">
-                <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
+                    <a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="header-style-icon">
-                    <i class="fas fa-arrow-left"></i>
+                        <i class="fas fa-arrow-left"></i>
-                </a>
+                    </a>
-                <div class="header-style-title">
+                    <div class="header-style-title">
-                    Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
+                        Senarai Bayaran Pemenang : @foreach($datacaw as $data1)
-                    {{$data1['caw_name']}}
+                        {{$data1['caw_name']}}
-                    @endforeach 
+                        @endforeach
+                    </div>
                 </div>
-            </div>
+                <div class="card-body">
-            <div class="card-body">
+                    @if ($message = Session::get('success'))
-            @if ($message = Session::get('success'))
                     <div class="alert alert-success">
                         <p>{{ $message }}</p>
                     </div>
-            @elseif ($message = Session::get('failed'))
+                    @elseif ($message = Session::get('failed'))
                     <div class="alert alert-danger">
                         <p>{{ $message }}</p>
                     </div>
-            @endif
+                    @endif
-        <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
+                    <table class="table text-center table-bordered" id="tablekaunter" style="width:100%">
-            <thead class="bg-primary text-white">
+                        <thead class="bg-primary text-white">
-                    <tr>
+                            <tr>
-                        <th>No</th>
+                                <th>No</th>
-                        <th>Nama</th>
+                                <th>Nama</th>
-                        <th>No Kad Pengenalan</th>
+                                <th>No Kad Pengenalan</th>
-                        <th>No Telefon</th>
+                                <th>No Telefon</th>
-                        <th>Bilangan Surat</th>
+                                <th>Bilangan Surat</th>
-                        <th>Jumlah Bidaan(RM)</th>
+                                <th>Jumlah Bidaan(RM)</th>
-                        <th>Amaun Telah Dibayar(RM)</th>
+                                <th>Penyata Pemenang</th>
-                        <th>Status Bayaran</th>
+                                <th class="text-center">Lakukan Bayaran Tunai</th>
-                        <th>Penyata Bayaran</th>
+                                <th>Status Bayaran</th>
-                        <th>Slip Serahan</th>
+                                <th>Maklumat Bayaran</th>
-                        {{-- <th>Resit Pembayaran</th> --}}
+                                <th>Slip Serahan Marhun</th>
-                        <th class="text-center">Tindakan</th>
+                                {{-- <th>Resit Pembayaran</th> --}}
-                    </tr>
+                            </tr>
-            </thead>
+                        </thead>
-            <tbody>
+                        <tbody>
-          @php  $totalsurat = 0;
+                            @php $totalsurat = 0;
-                $totalbid = 0;
+                            $totalbid = 0;
-                $totalpay = 0;
+                            $totalpay = 0;
-          @endphp
+                            @endphp
-                @foreach($listwinner as $winner)
+                            @foreach($listwinner as $winner)
-                        <tr>
+                            <tr>
-                            <td> {{ $loop->iteration }} </td>
+                                <td> {{ $loop->iteration }} </td>
-                            <td style='white-space:nowrap;' align = 'left'>{{ $winner['details']['name']}}</td>
+                                <td style='white-space:nowrap;' align='left'>{{ $winner['details']['name']}}</td>
-                            <td>{{ $winner['details']['nokp']}}</td>
+                                <td>{{ $winner['details']['nokp']}}</td>
-                            <td>{{ $winner['details']['notelbimbit']}}</td>
+                                <td>{{ $winner['details']['notelbimbit']}}</td>
-                            <td>{{ $winner['total_surat']}}</td>
+                                <td>{{ $winner['total_surat']}}</td>
-                            <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
+                                <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
+                                <td align="center">
-                            <td>
+                                    <a class="btn btn-warning" href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target="blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran"><i class="fas fa-download"></i></a>
-                                @if($winner['totalPay'] < $winner['totalBid'])
+                                </td>
-                                    <button class="btn btn-danger btn-sm" disabled>BELUM SELESAI</button>
+                                <td>
-                                @elseif($winner['totalPay'] == $winner['totalBid'])
+                                    <a class="btn btn-primary" href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
-                                    <button class="btn btn-success btn-sm" disabled>SELESAI</button>
+                                </td>
-                                @endif
+                                <td>
-                            </td>
+                                    @if($winner['sts_payment'] == 2)
-                            <td align="center">
+                                    <button class="btn btn-warning" disabled>TUNGGU PENGESAHAN</button>
-                                <a class="btn m-1 btn-warning"  href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
+                                    @elseif($winner['sts_payment'] == 1)
-                            </td>
+                                    <button class="btn btn-success" disabled>SELESAI</button>
+                                    @else
+                                    <button class="btn btn-danger" disabled>BELUM BAYAR</button>
+                                    @endif
+                                </td>
+                                <td>
+                                    @if($winner['sts_payment'] == 1)
+                                    <a href="{{ route('report.detailsbayaran', [ $lelong_id, 'user_id'=>$winner['details']['id'], $datacaw[0]->caw_code ]) }}" class="btn btn-warning" data-toggle="tooltip" data-placement="top" title="Butiran Bayaran"><i class="far fa-list-alt"></i></a>
+                                    @endif
+                                </td>
 
-                            <td align="center">
+                                <td align="center">
-                                <a class="btn m-1 btn-success" href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
+                                    <a class="btn m-1 btn-success" href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target="blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan"><i class="fas fa-download"></i></a>
-                            </td>
+                                </td>
-
+                            </tr>
-                            {{-- <td>
+                            @php
-                            <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
+                            $totalsurat += $winner['total_surat'];
-                            </td> --}}
+                            $totalbid += $winner['totalBid'];
-
+                            $totalpay += $winner['totalPay'];
-                           
+                            @endphp
-                            <td>
+                            @endforeach
-                                {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
+                        </tbody>
-                                    <a class="btn m-1 btn-primary" href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                        <tfoot>
-                                {{-- @endif --}}
+                            <tr>
-                            </td>
+                                <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
-                        </tr>
+                                <td align='center'><b><b>{{$totalsurat}}</b></td>
-                        @php 
+                                <td align='center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
-                        $totalsurat += $winner['total_surat'];
+                                <td colspan="5"></td>
-                        $totalbid += $winner['totalBid'];
+                            </tr>
-                        $totalpay += $winner['totalPay'];
+                        </tfoot>
-                    @endphp
+                    </table>
-                @endforeach
+            </div>
-            </tbody>
+        </div>
-            <tfoot>
-                <tr>
-                    <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
-                    <td align = 'center'><b><b>{{$totalsurat}}</b></td>
-                    <td align = 'center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
-                    <td align = 'center'><b>{{ number_format($totalpay, 2, '.', ',') }}</b></td>
-                    <td colspan="4"></td>
-                </tr>
-            </tfoot>
-        </table>
-        {{-- <div class="modal-footer" style="margin-top:2%;">
-            <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
-        </div> --}}
     </div>
-    </div>
-</div>
 
-<script>
+    <script>
-      //Enable tooltips everywhere
+        $(function() {
-      $(function () {
+            $('[data-toggle="tooltip"]').tooltip()
-        $('[data-toggle="tooltip"]').tooltip()
+        })
-    })
+        var tablekaunter = $('#tablekaunter').DataTable({
-    var tablekaunter = $('#tablekaunter').DataTable({
+            "columnDefs": [{
-            "columnDefs": [ 
+                    "targets": 6,
-                {
+                    "orderable": false
-                "targets": 0,
-                "orderable": false
-                }, 
-                {
-                "targets": 8,
-                "orderable": false
                 },
                 {
-                "targets": 9,
+                    "targets": 7,
-                "orderable": false
+                    "orderable": false
                 },
                 {
-                "targets": 10,
+                    "targets": 8,
-                "orderable": false
+                    "orderable": false
+                },
+                {
+                    "targets": 9,
+                    "orderable": false
+                },
+                {
+                    "targets": 10,
+                    "orderable": false
                 }
             ],
-            order: [[0, 'asc']],
+        });
-            "info": false,
+    </script>
-            "lengthChange": false,
-            "pageLength": 15,
-            dom: 'Bfrtip',
-            // buttons: [
-            //     {
-            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
-            //         text: '<i class="fas fa-plus" id="test"></i>',
-            //         titleAttr: 'Tambah Cawangan',
-            //         action: function ( e, dt, node, config ) {
-            //             // alert( 'Button activated' );
-            //             // console.log('hye');
-                        
-            //             $('#myModal').modal("show");
-            //             $('#myModal').on('shown.bs.modal', function () {
-            //                 $('#rolename').trigger('focus')
-            //             })
-            //         }
-            //     },
-            //     {
-            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-            //         titleAttr: 'Export to CSV',
-            //         text: '<i class="fas fa-download"></i>',
-            //         action: function ( e, dt, node, config ) {
-            //             $("#exportform").submit();
-            //         }
-            //     }
-            // ]
-    });
-
-        // $('.addcaw').tooltip();
-        // $('.export').tooltip();
-        // // $( '.dt-buttons').addClass('btn-group');
-        // $( '.addcaw').removeClass('dt-button');
-        // $( '.export').removeClass('dt-button');
-</script>
-
-@endsection
 
+    @endsection

resources/views/pembida/detailspembayaran.blade.php

@@ -0,0 +1,102 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                        Butiran Pembayaran
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$lelong->tarikh_lelong}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Batch Lelong</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$lelong->id}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Cawangan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$cawangan->caw_name}}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-1"></div>
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Pembida</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light text-uppercase" value="{{ $user->name }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Jumlah Bidaan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_payment, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Kaedah Bayaran</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->remark }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Disahkan Oleh</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->disahkanOleh->name }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Disahkan Pada</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{ $disahkan_oleh->disahkan_pada }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row justify-content-center">
+                        @foreach ($fileresit_all as $item)
+                        <img class="m-2" src="{{ route('report.showphotoresit', ['user_id' => $user->id, 'fileresit_id' => $item->id]) }}" width="50%">
+                        @endforeach
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@endsection

resources/views/pembida/feePaymentResult.blade.php

@@ -105,8 +105,8 @@
                     @endif
                 </div>
                 <div class="card-footer">
-                    <!-- <a href="https://elelong.arrahn.com.my/" class="btn btn-primary">To Home</a> -->
+                    <!-- <a href="https://bid.arrahn.com.my/result" class="btn btn-primary">To Home</a> -->
-                    <a href="http://localhost:8080/" class="btn btn-primary">To Home</a>
+                    <a href="http://localhost:8080/result" class="btn btn-primary">To Home</a>
                 </div>
             </div>
         </div>

resources/views/pembida/kemaskini.blade.php

@@ -91,7 +91,9 @@
                 <div class="text-right pt-4">
                     <input type="hidden" name="userid" value="{{$user->id}}">
                     <a href="{{url('pembida/senaraipembidakeseluruhan')}}" class="btn btn-primary">Kembali</a>
+                    @hasrole('operasi')
                     <button type="button" class="btn btn-success" onclick="kemaskini()" >Kemaskini</button>
+                    @endhasrole
                 </div>
                 
             </form>

resources/views/pembida/pembayaranbidaan.blade.php

@@ -33,14 +33,15 @@
                     <tr>
                         <th>Bil</th>
                         <th>Nama</th>
-                        <th>No Kad Pengenalan</th>
+                        <!-- <th>No Kad Pengenalan</th> -->
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
-                        <th>Jumlah Pembayaran(RM)</th>
+                        <!-- <th>Jumlah Pembayaran(RM)</th> -->
-                        <th>Jumlah Bidaan(RM)</th>
+                        <th>Jumlah Bidaan (RM)</th>
-                        <th>Jenis Bayaran</th>
                         <th>Status</th>
+                        <th>Kaedah Bayaran</th>
                         <th class="text-center">Maklumat</th>
+                        <th>Bayaran</th>
                     </tr>
             </thead>
             <tbody>
@@ -51,29 +52,36 @@
                 @foreach($listwinner as $winner)
                         <tr>
                         <td>{{ $loop->iteration }}</td>
-                        <td class="text-left">{{ $winner['details']['name'] }}</td>
+                        <td class="text-left text-uppercase">{{ $winner['details']['name'] }}</td>
-                        <td>{{ $winner['details']['nokp'] }}</td>
+                        <!-- <td>{{ $winner['details']['nokp'] }}</td> -->
                         <td>{{ $winner['details']['notelbimbit']}}</td>
                         <td>{{ $winner['total_surat'] }}</td>
+                        <!-- <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td> -->
                         <td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
-                        <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
                         <td>
-                            @if($winner['jenisbayaran']['status'] == 1)
+                            @if($winner['jenisbayaran']['status_payment'] == 1)
-                                <button class="btn btn-info btn-sm" disabled>YURAN</button>
+                                <button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
-                            @elseif($winner['jenisbayaran']['status'] == 2)
+                            @else 
-                                <button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
+                                <button class="btn btn-sm btn-secondary" disabled>Belum Bayar</button>
                             @endif
                         </td>
+                        <td>
+                            @if($winner['jenisbayaran']['kaedah_bayaran'] == 1)
+                            <button class="btn btn-sm btn-dark" disabled>TUNAI</button>
+                            @elseif($winner['jenisbayaran']['kaedah_bayaran'] == 2)
+                            <button class="btn btn-sm btn-primary" disabled>FPX</button>
+                            @elseif($winner['jenisbayaran']['kaedah_bayaran'] == 3)
+                            <button class="btn btn-sm btn-secondary" disabled>CDM</button>
+                            @endif
+                        </td>
+                        <td>
+                            <a class="btn btn-sm btn-info" href="{{ route('pembida.detailsbidaan', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
+                        </td>
                         <td>
                             @if($winner['jenisbayaran']['status_payment'] == 1)
-                                <button class="btn btn-success btn-sm" disabled>BERJAYA SELESAI</button>
+                            <a href="{{ route('pembida.detailsbayaran', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}" class="btn btn-sm btn-warning" data-toggle="tooltip" data-placement="top" title="Butiran Bayaran"><i class="far fa-list-alt"></i></a>
-                            @else 
-                                <button class="btn btn-secondary btn-sm" disabled>BELUM SELESAI</button>
                             @endif
                         </td>
-                        <td>
-                            <a class="btn m-1 btn-info" href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
-                        </td>
                         </tr>
                     @php 
                         $totalsurat += $winner['total_surat'];
@@ -84,11 +92,10 @@
             </tbody>
             <tfoot>
                 <tr>
-                    <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
+                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
                     <td align = 'center'><b><b>{{$totalsurat}}</b></td>
                     <td align = 'center'><b>{{ number_format($totalbid, 2, '.', ',') }}</b></td>
-                    <td align = 'center'><b>{{ number_format($totalpay, 2, '.', ',') }}</b></td>
+                    <td colspan="5"></td>
-                    <td colspan="3"></td>
                 </tr>
             </tfoot>
         </table>
@@ -102,47 +109,7 @@
         $('[data-toggle="tooltip"]').tooltip()
     })
     
-    var tablesahsagonline = $('#sahsagonline').DataTable({
+    var tablesahsagonline = $('#sahsagonline').DataTable({});
-            "columnDefs": [ 
-                {
-                "targets": 0,
-                "orderable": false
-                }, 
-                {
-                "targets": 9,
-                "orderable": false
-                }
-            ],
-            order: [[0, 'asc']],
-            "info": false,
-            "lengthChange": false,
-            "pageLength": 15,
-            dom: 'Bfrtip',
-            // buttons: [
-            //     {
-            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
-            //         text: '<i class="fas fa-plus" id="test"></i>',
-            //         titleAttr: 'Tambah Cawangan',
-            //         action: function ( e, dt, node, config ) {
-            //             // alert( 'Button activated' );
-            //             // console.log('hye');
-                        
-            //             $('#myModal').modal("show");
-            //             $('#myModal').on('shown.bs.modal', function () {
-            //                 $('#rolename').trigger('focus')
-            //             })
-            //         }
-            //     },
-            //     {
-            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-            //         titleAttr: 'Export to CSV',
-            //         text: '<i class="fas fa-download"></i>',
-            //         action: function ( e, dt, node, config ) {
-            //             $("#exportform").submit();
-            //         }
-            //     }
-            // ]
-    });
 
         // $('.addcaw').tooltip();
         // $('.export').tooltip();

resources/views/pembida/senaraipembidakeseluruhan.blade.php

@@ -29,6 +29,7 @@
                             <!-- <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th> -->
                             <th>Bil</th>
                             <th>Nama</th>
+                            <th>Nama Pengguna</th>
                             <th>No Telefon</th>
                             <th>Emel</th>
                             <th>Status</th>
@@ -42,6 +43,7 @@
                             <!-- <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $user->id }}"></td> -->
                             <td>{{ $loop->iteration }}</td>
                             <td align = 'left'>{{ $user->name }}</td>
+                            <td>{{ $user->username }}</td>
                             <td>{{ $user->notelbimbit }}</td>
                             <td>{{ $user->email }}</td>
                             <td>

resources/views/pembida/statuspembayaran.blade.php

@@ -8,7 +8,7 @@
             <div class="card">
                 <div class="card-header header-style">
                     <div class="header-style-title">
-                        Senarai Status Pembayaran
+                        Status Pembayaran (Mengikut Cawangan)
                     </div>
                 </div>
                 <div class="card-body">
@@ -17,6 +17,18 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+            <li class="nav-item">
+                <a class="nav-link active" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
+                    Lelongan Semasa
+                </a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" id="selesai-lelong-tab" data-toggle="tab" href="#selesai-lelong" role="tab" aria-controls="selesai-lelong" aria-selected="false">
+                    Lelongan Selesai
+                </a>
+            </li>
+        </ul>
         <div class="mb-3">
             {{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
             @hasrole('operasi')
@@ -27,7 +39,10 @@
             @endhasrole
 
         </div>
-        <table class="table table-bordered text-center" id="tablestatuspembayaran" style="width:100%">
+        <div class="tab-content" style="overflow-x: auto;" id="myTabContent">
+            <div class="tab-pane fade show active" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-lelong-tab">
+                <div style="overflow-x: auto;">
+        <table class="table table-bordered text-center" id="tablestatussedanglelong" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -41,7 +56,7 @@
                     </tr>
             </thead>
             <tbody>
-                @foreach($arrayinfo as $lel)
+                @foreach($arraysms as $lel)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $lel['detail']['lelong_id']}}</td>
@@ -53,10 +68,11 @@
                     <td class="text-left">
                         @foreach($lel['detailsinfo'] as $details)
                         @hasrole('operasi')
-                        <a class="btn btn-info btn-sm" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                        <a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                        @endhasrole
-                        <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                      <span class="m-2"><b>{{ $details['caw_name']}}</b>
-                        </span><br> 
+                       </span>
+                        <br> 
                         {{-- {{dd($listwinner)}} --}}
                             @forelse($details['listwinner'] as $winner)
                             <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</<span>
@@ -154,61 +170,190 @@
         </table>
         </div>
     </div>
+
+    <div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
+        <div style="overflow-x: auto;">
+    <table class="table table-bordered text-center" id="tablestatusselesailelong" style="width:100%">
+        <thead class="bg-primary text-white">
+                <tr>
+                    <th>No</th>
+                    <th>Batch Lelong</th>
+                    <th>Tarikh Lelong</th>
+                    <th>Cawangan</th>
+                    <th>Jumlah Bayaran(RM)</th>
+                    <th>Jenis Bayaran</th>
+                    <th>Status Bayaran</th>
+                    <th>Status Lelong</th>
+                </tr>
+        </thead>
+        <tbody>
+            @foreach($arraysls as $lel)
+            <tr>
+                <td>{{ $loop->iteration }}</td>
+                <td>{{ $lel['detail']['lelong_id']}}</td>
+                <td>@php
+                    $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                    $t_lelong =  $myDateTime->format('d-m-Y');
+                    echo($t_lelong);
+                @endphp</td>
+                <td class="text-left">
+                    @foreach($lel['detailsinfo'] as $details)
+                    @hasrole('operasi')
+                    <a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                   @endhasrole
+                   <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                   </span>
+                    <br> 
+                    {{-- {{dd($listwinner)}} --}}
+                        @forelse($details['listwinner'] as $winner)
+                        <span style='text-transform: uppercase'><i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}</<span>
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse
+                     @endforeach
+                     
+                </td>
+              
+                <td class="text-right">
+                    @php $totalall = 0; @endphp
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                        @forelse($details['listwinner'] as $winner)
+                        {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                        @php
+                            $totalall += $winner['totalPay'];
+                        @endphp
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse                        
+                    @endforeach
+                    {{-- <b>{{number_format($totalall, 2, '.', ',')}}</b> --}}
+                </td>
+               
+                <td class="text-center">
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                    
+                        @forelse($details['listwinner'] as $winner)
+                        @if($winner['jenisbayaran'] != NULL)
+                       {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                            @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                            TUNAI
+                            @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                            FPX
+                            @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                            KAUNTER BANK/CDM
+                            
+                            @endif
+                        @else
+                            -
+                        @endif
+                        <br>
+                        @empty
+                        - <br>
+                        @endforelse     
+                    @endforeach
+                </td>
+                <td class="text-center">
+                    @foreach($lel['detailsinfo'] as $details)
+                    <a href=""></a>
+                    <span class="m-2">
+                    </span><br>
+                        @forelse($details['listwinner'] as $winner)
+                        @if($winner['jenisbayaran'] != NULL)
+                            @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                SELESAI
+                            @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                TUNGGU PENGESAHAN
+                            @else 
+                                BELUM SELESAI
+                            @endif
+                        @else 
+                        BELUM SELESAI
+                        @endif
+                            <br>
+                        @empty
+                        - <br>
+                        @endforelse 
+                    @endforeach
+                </td>
+                <td>
+                    @if($lel['detail']['sts_lelong'] == 3)
+                        <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                    @endif
+                </td>
+                <tr>
+                    <td colspan="4"></td>
+                    <td class="text-right"><b>{{number_format($totalall, 2, '.', ',')}}</b> </td>
+                    <td colspan="3"></td>
+
+    
+                    </tr>
+            </tr>
+            @endforeach
+            
+        </tbody>
+    </table>
+    </div>
+</div>
 </div>
 
 <script>
-     //Enable tooltips everywhere
+    //Enable tooltips everywhere
-     $(function () {
+    $(function () {
-        $('[data-toggle="tooltip"]').tooltip()
+       $('[data-toggle="tooltip"]').tooltip()
-    })
+   })
-    var tablestatuspembayaran = $('#senarailelongonline').DataTable({
+   var tablestatussedanglelong = $('#tablestatussedanglelong').DataTable({
-            "columnDefs": [ 
+           "columnDefs": [ 
-                {
+               {
-                "targets": 0,
+               "targets": 0,
-                "orderable": false
+               "orderable": false
-                }, 
+               }, 
-                {
+               {
-                "targets": 7,
+               "targets": 7,
-                "orderable": false
+               "orderable": false
-                }
+               }
-            ],
+           ],
-            order: [[1, 'asc']],
+           order: [[1, 'asc']],
-            // "ordering": false,
+           // "ordering": false,
-            "info": false,
+           "info": false,
-            "lengthChange": false,
+           "lengthChange": false,
-            "pageLength": 15,
+           "pageLength": 15,
-            dom: 'Bfrtip',
+           dom: 'Bfrtip',
-            // buttons: [
+           
-            //     {
+   });
-            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
-            //         text: '<i class="fas fa-plus" id="test"></i>',
-            //         titleAttr: 'Tambah Cawangan',
-            //         action: function ( e, dt, node, config ) {
-            //             // alert( 'Button activated' );
-            //             // console.log('hye');
-                        
-            //             $('#myModal').modal("show");
-            //             $('#myModal').on('shown.bs.modal', function () {
-            //                 $('#rolename').trigger('focus')
-            //             })
-            //         }
-            //     },
-            //     {
-            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-            //         titleAttr: 'Export to CSV',
-            //         text: '<i class="fas fa-download"></i>',
-            //         action: function ( e, dt, node, config ) {
-            //             $("#exportform").submit();
-            //         }
-            //     }
-            // ]
-    });
 
-        // $('.addcaw').tooltip();
+   var tablestatusselesailelong = $('#tablestatusselesailelong').DataTable({
-        // $('.export').tooltip();
+           "columnDefs": [ 
-        // // $( '.dt-buttons').addClass('btn-group');
+               {
-        // $( '.addcaw').removeClass('dt-button');
+               "targets": 0,
-        // $( '.export').removeClass('dt-button');
+               "orderable": false
+               }, 
+               {
+               "targets": 7,
+               "orderable": false
+               }
+           ],
+           order: [[1, 'asc']],
+           // "ordering": false,
+           "info": false,
+           "lengthChange": false,
+           "pageLength": 15,
+           dom: 'Bfrtip',
+           
+   });
+
+       // $('.addcaw').tooltip();
+       // $('.export').tooltip();
+       // // $( '.dt-buttons').addClass('btn-group');
+       // $( '.addcaw').removeClass('dt-button');
+       // $( '.export').removeClass('dt-button');
 
 </script>
 

resources/views/pembida/statuspembayaran2.blade.php

@@ -0,0 +1,198 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Status Pembayaran (Mengikut Cawangan)
+                    </div>
+                </div>
+                <div class="card-body">
+                    @hasrole('operasi')
+                    <a href="{{ route('pembida.statuspembayaranbypembida') }}" class="btn btn-success mb-2">Status Pembayaran Mengikut Nama Pembida</a>
+                    @endhasrole
+                    @hasrole('account')
+                    <a href="{{ route('account.statuspembayaranbypembida') }}" class="btn btn-success mb-2">Status Pembayaran Mengikut Nama Pembida</a>
+                    @endhasrole
+                    <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
+                                Lelongan Semasa
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" id="selesai-lelong-tab" data-toggle="tab" href="#selesai-lelong" role="tab" aria-controls="selesai-lelong" aria-selected="false">
+                                Lelongan Selesai
+                            </a>
+                        </li>
+                    </ul>
+                    <div class="tab-content" style="overflow-x: auto;" id="myTabContent">
+                        <div class="tab-pane fade show active" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-lelong-tab">
+                            @if($lelong_array_semasa != null)
+                            <table class="table table-bordered" style="width:100%">
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th class="text-center">No</th>
+                                        <th class="text-center">Batch Lelong</th>
+                                        <th class="text-center">Tarikh Lelong</th>
+                                        <th>Cawangan</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($lelong_array_semasa as $lelong)
+                                    <tr>
+                                        <td class="text-center">{{ $loop->iteration }}</td>
+                                        <td class="text-center">{{ $lelong['lelong_id'] }}</td>
+                                        <td class="text-center text-nowrap">
+                                            @php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] );
+                                            $t_lelong = $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                            @endphp
+                                        </td>
+                                        <td>
+                                            @foreach($lelong['cawangan'] as $cawangan)
+                                            <div class="mb-1"><a class="btn btn-primary btn-sm mr-1" href="{{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lelong['lelong_id'], 'kodcaw'=>$cawangan['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran"><i class="far fa-edit"></i></a>{{ $cawangan['caw_name'] }}</div>
+                                            <table class="table table-bordered mb-5" width="10">
+                                                <thead class="bg-primary text-white">
+                                                    <tr>
+                                                        <th class="text-centere">No</th>
+                                                        <th style="min-width: 200px;">Pembida</th>
+                                                        <th class="text-right" style="min-width: 125px;">Jumlah Bidaan</th>
+                                                        <th class="text-center">Status Bayaran</th>
+                                                        <th class="text-center">Jenis Bayaran</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach($cawangan['pembida'] as $pembida)
+                                                    <tr>
+                                                        <td class="text-center">{{ $loop->iteration }}</td>
+                                                        <td class="text-uppercase">{{ $pembida['name_bidder'] }}</td>
+                                                        <td class="text-right">{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}}</td>
+                                                        <td class="text-center">
+                                                            @if($pembida['status_bayaran'] == 1)
+                                                            <button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
+                                                            @elseif($pembida['status_bayaran'] == 2)
+                                                            <button class="btn btn-sm btn-warning" disabled>Tungguh Pengesahan</button>
+                                                            @else
+                                                            <button class="btn btn-sm btn-danger" disabled>Belum Bayar</button>
+                                                            @endif
+                                                        </td>
+                                                        <td class="text-center">
+                                                            @if($pembida['jenis_bayaran'] == 1)
+                                                            <span class="badge badge-pill badge-dark">TUNAI</span>
+                                                            @elseif($pembida['jenis_bayaran'] == 2)
+                                                            <span class="badge badge-pill badge-primary">FPX</span>
+                                                            @elseif($pembida['jenis_bayaran'] == 3)
+                                                            <span class="badge badge-pill badge-secondary">CDM</span>
+                                                            @else
+							     @endif
+                                                        </td>
+                                                    </tr>
+                                                    @endforeach
+                                                    <tr>
+                                                        <td class="text-center" colspan="2">JUMLAH KESELURUHAN</td>
+                                                        <td class="text-right">{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            @endforeach
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                            @endif
+                        </div>
+                        <div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
+                            @if($lelong_array_selesai != null)
+                            <table class="table table-bordered" style="width:100%">
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th class="text-center">No</th>
+                                        <th class="text-center">Batch Lelong</th>
+                                        <th class="text-center">Tarikh Lelong</th>
+                                        <th>Cawangan</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($lelong_array_selesai as $lelong)
+                                    <tr>
+                                        <td class="text-center">{{ $loop->iteration }}</td>
+                                        <td class="text-center">{{ $lelong['lelong_id'] }}</td>
+                                        <td class="text-center text-nowrap">
+                                            @php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] );
+                                            $t_lelong = $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                            @endphp
+                                        </td>
+                                        <td>
+                                            @foreach($lelong['cawangan'] as $cawangan)
+                                            <div class="mb-1"><a class="btn btn-primary btn-sm mr-1" href="{{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lelong['lelong_id'], 'kodcaw'=>$cawangan['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran"><i class="far fa-edit"></i></a>{{ $cawangan['caw_name'] }}</div>
+                                            <table class="table table-bordered mb-5" width="10">
+                                                <thead class="bg-primary text-white">
+                                                    <tr>
+                                                        <th class="text-centere">No</th>
+                                                        <th style="min-width: 200px;">Pembida</th>
+                                                        <th class="text-right" style="min-width: 125px;">Jumlah Bidaan</th>
+                                                        <th class="text-center">Status Bayaran</th>
+                                                        <th class="text-center">Jenis Bayaran</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach($cawangan['pembida'] as $pembida)
+                                                    <tr>
+                                                        <td class="text-center">{{ $loop->iteration }}</td>
+                                                        <td class="text-uppercase">{{ $pembida['name_bidder'] }}</td>
+                                                        <td class="text-right">{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}}</td>
+                                                        <td class="text-center">
+                                                            @if($pembida['status_bayaran'] == 1)
+                                                            <button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
+                                                            @elseif($pembida['status_bayaran'] == 2)
+                                                            <button class="btn btn-sm btn-warning" disabled>Tungguh Pengesahan</button>
+                                                            @else
+                                                            <button class="btn btn-sm btn-danger" disabled>Belum Bayar</button>
+                                                            @endif
+                                                        </td>
+                                                        <td class="text-center">
+                                                            @if($pembida['jenis_bayaran'] == 1)
+                                                            <span class="badge badge-pill badge-dark">TUNAI</span>
+                                                            @elseif($pembida['jenis_bayaran'] == 2)
+                                                            <span class="badge badge-pill badge-primary">FPX</span>
+                                                            @else
+                                                            <span class="badge badge-pill badge-secondary">CDM</span>
+                                                            @endif
+                                                        </td>
+                                                    </tr>
+                                                    @endforeach
+                                                    <tr>
+                                                        <td class="text-center" colspan="2">JUMLAH KESELURUHAN</td>
+                                                        <td class="text-right">{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                            @endforeach
+                                        </td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                            @endif
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    $(function() {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
+</script>
+@endsection

resources/views/pembida/statuspembayaranbypembida.blade.php

@@ -7,8 +7,18 @@
         <div class="col">
             <div class="card">
                 <div class="card-header header-style">
+                    @hasrole('operasi')
+                    <a href="{{ route('pembida.statuspembayaran') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    @endhasrole
+                    @hasrole('account')
+                    <a href="{{ route('account.statuspembayaran') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    @endhasrole
                     <div class="header-style-title">
-                        Senarai Status Pembayaran
+                        Status Pembayaran (Mengikut Nama)
                     </div>
                 </div>
                 <div class="card-body">
@@ -18,14 +28,6 @@
                 </div>
         @endif
         <div class="mb-3">
-            {{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
-            @hasrole('operasi')
-            <a href="{{ route('pembida.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
-            @endhasrole
-            @hasrole('account')
-            <a href="{{ route('account.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
-            @endhasrole
-
         </div>
         <table class="table table-bordered  table-xl text-center" id="senarailelongonline" style="width:100%">
             <thead class="bg-primary text-white">

resources/views/pembida/statusserahanbidaan.blade.php

@@ -319,7 +319,7 @@
                                     BELUM SERAH
                                 @endif
                             @else 
-                            BELUM SELESAI
+                            BELUM SERAH
                             @endif
                                 <br>
                             @empty

resources/views/pembida/statusserahanbypembida.blade.php

@@ -170,7 +170,7 @@
                     </tr>
             </thead>
             <tbody>
-            @foreach($arraysls as $lel)
+            @forelse($arraysls as $lel)
                 @php $totalall = 0; @endphp
                 <tr>
                     <td>{{ $loop->iteration }}</td>
@@ -252,7 +252,11 @@
         
                         </tr>
                 </tr>
-                @endforeach
+                @empty
+                <tr>
+                    <td colspan="6">No data available in table</td>
+                </tr>
+            @endforelse
                 
             </tbody>
         </table>

resources/views/pengurusangambar/galerimarhun.blade.php

@@ -0,0 +1,26 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Galeri Marhun
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div id="appSelectBatchLelongCawangan">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    window.branch_code = "<?php echo "$kodcaw->id" ?>"
+</script>
+
+@endsection

resources/views/pengurusangambar/index.blade.php

@@ -0,0 +1,21 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Galeri Marhun
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div id="appSelectBatchLelong"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@endsection

resources/views/pengurusanuploaddownload/index.blade.php

@@ -0,0 +1,37 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Pengurusan Max Upload Size
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success" role="alert">
+                        {{ $message }}
+                    </div>
+                    @elseif($message = Session::get('failed'))
+                    <div class="alert alert-danger" role="alert">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    <form action="{{ route('pengurusanuploaddownload.uploadfile') }}" method="POST" enctype="multipart/form-data">
+                        @csrf
+                        <div class="mb-3">
+                            <input type="file" name="file_upload">
+                        </div>
+                        <button class="btn btn-primary" type="submit">Submit</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@endsection

resources/views/simulasi/listsagbycust.blade.php

@@ -39,7 +39,7 @@
                             <th>Tempoh</th>
                             <th>Berat Asal(gm)</th>
                             <th>Nilai Marhun Asal(RM)</th>
-                            <th>Pembiayaan Asal (RM)</th>
+                            <!-- <th>Pembiayaan Asal (RM)</th> -->
                             <th>Baki Pembiayaan (RM)</th>
                             <th>Keuntungan 6 Bulan (RM)</th>
                             <th>Keuntungan Telah Bayar (RM)</th>
@@ -86,7 +86,7 @@
                                         <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <td align = 'right'>
+                                <!-- <td align = 'right'>
                                     @php $jumpinjasal = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
@@ -96,7 +96,7 @@
                                     @endforeach
                                         <strong>{{ number_format($jumpinjasal, 2, '.', ',') }}</strong>
                                
-                                </td> 
+                                </td>  -->
                                 <td align = 'right'>
                                     @php $jumpinjaman = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)