From b5a1cfa4c62889a19a09faf4af7a62c17983f095 Mon Sep 17 00:00:00 2001
From: faiqahzaman <zmnfqh@gmail.com>
Date: Sun, 5 Jun 2022 16:54:15 +0800
Subject: [PATCH 1/2] update tangguh lelong pc

---
 app/Http/Controllers/MarhunController.php     | 51 ++++++++++++----
 .../Mobile/LelongMobileController.php         | 35 +++++++++++
 .../Controllers/TangguhLelongController.php   | 59 ++++++++++++++-----
 .../marhun/sentangguhlelongsah.blade.php      |  9 +++
 .../pengesahan/perubahanmutumarhun.blade.php  |  1 +
 .../views/tangguhlelong/searchbyic.blade.php  | 20 +++++--
 routes/api.php                                |  1 +
 7 files changed, 143 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index d85daa48..378412d6 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -373,10 +373,15 @@ class MarhunController extends Controller
         $lelongbidmarhun->bil = 1;
         $lelongbidmarhun->marhun = $request->marhuntambahan;
         $lelongbidmarhun->nota = $request->notatambahan;
+        $lelongbidmarhun->old_karat = $request->karattambahan;
         $lelongbidmarhun->karat = $request->karattambahan;
+        $lelongbidmarhun->old_berat = $request->berat_emastambahan;
         $lelongbidmarhun->berat = $request->berat_emastambahan;
+        $lelongbidmarhun->old_harga = $request->hargatambahan;
         $lelongbidmarhun->harga = $request->hargatambahan;
+        $lelongbidmarhun->old_nmarhun = $request->nilai_marhuntambahan;
         $lelongbidmarhun->n_marhun = $request->nilai_marhuntambahan;
+        $lelongbidmarhun->old_hargaasas = $request->harga_asastambahan;
         $lelongbidmarhun->hargaasas = $request->harga_asastambahan;
         $lelongbidmarhun->status_semak = 0;
         $lelongbidmarhun->save();
@@ -473,7 +478,6 @@ class MarhunController extends Controller
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
-
         }
 
         return view('marhun.senlelmarhun',compact('lelong', 'arrayinfo'));
@@ -484,6 +488,12 @@ class MarhunController extends Controller
         $user = Auth::user();
         // dd($user);
 
+        $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('cawangan.caw_code', $user->kodcaw)
+        ->select('tarikh_lelong', 'caw_name')
+        ->first();
+
         $sdhdisahkan = TangguhLelong::join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan')
         ->where('gadai.kodcaw', $user['kodcaw'] )
         ->where('tangguhlelong.lelong_id', $lelong_id)
@@ -498,7 +508,7 @@ class MarhunController extends Controller
         )
         ->get();
         
-        return view('marhun.sentangguhlelongsah', compact('sdhdisahkan'));
+        return view('marhun.sentangguhlelongsah', compact('sdhdisahkan', 'lelong'));
 
     }
     //Khazanah
@@ -611,16 +621,18 @@ class MarhunController extends Controller
             $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
             $karat = Lelkarat::where('lelong_id', $id)->get();
     
+            // dd($lelbidmarhuns);
             foreach($marhuns as $index1=>$marhun)
             {          
+                // dd($marhun);
                 $status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id)
                 ->where('lelongbid_id', $marhun['lelongbid_id'])
                 ->select('status_ubah')
                 ->value('status_ubah');
     
-                $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
-                ->where('norujukan', $lelongbid->norujukan) 
-                ->first();
+                // $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun'])
+                // ->where('norujukan', $lelongbid->norujukan) 
+                // ->first();
 
                 if($lelongbid->baki > 0)
                 {
@@ -631,14 +643,29 @@ class MarhunController extends Controller
                     $rugilelong = $rugilelong - $lelongbid->baki;
                 }
                 
-                $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
-                $marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun;
-                $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
-                $marhuns[$index1]['status_ubah'] = $status;
-                $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
-                $marhuns[$index1]['baki_lelong'] = $bakilelong;
-                $marhuns[$index1]['rugi_lelong'] = $rugilelong;
+                // if($gadaimarhun)
+                // {
+                    $marhuns[$index1]['harga_gadai'] = $marhun['old_harga'];
+                    $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
+                    $marhuns[$index1]['old_marhun'] = $marhun['marhun'];
+                    $marhuns[$index1]['status_ubah'] = $status;
+                    $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                    $marhuns[$index1]['baki_lelong'] = $bakilelong;
+                    $marhuns[$index1]['rugi_lelong'] = $rugilelong;
+                // }
+                // else
+                // {
+                //     $marhuns[$index1]['harga_gadai'] = 0;
+                //     $marhuns[$index1]['nmarhun_gadai'] = 0;
+                //     $marhuns[$index1]['old_marhun'] = 0;
+                //     $marhuns[$index1]['status_ubah'] = 0;
+                //     $marhuns[$index1]['pembiayaan'] = 0;
+                //     $marhuns[$index1]['baki_lelong'] = 0;
+                //     $marhuns[$index1]['rugi_lelong'] = 0;
+                // }
+                
             }
+            // dd($marhuns);
             array_push($arraylelbidmarhun,$marhuns);
         }
         
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 27fffe79..b3fdc1b8 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -338,4 +338,39 @@ class LelongMobileController extends Controller
         }
         return response()->json($lelongs, 201);
     }
+
+    public function hisfeepay(Request $request)
+    {
+        $checkpay = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
+        ->where('resit.user_id', $request->user_id)
+        ->where('payment.lelong_id', $request->lelong_id)
+        ->where('payment.status', 1)
+        ->where('resit.resit_type', 1)
+        ->select('resit.id as resit_id',
+                 'resit.resit_type',
+                 'resit.status as resit_status',
+                 'resit.paid_at',
+                 'payment.id as payment_id',
+                 'payment.lelong_id',
+                 'payment.status as payment_status',
+        )
+        ->first();
+
+        if($checkpay)
+        {
+            $response = 
+            [
+                'success' => "success"
+            ];
+        }
+        else
+        {
+            $response = 
+            [
+                'failed' => "Sila buat pembayaran yuran terlebih dahulu"
+            ];
+        }
+
+        return response()->json($response, 201);
+    }
 }
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index c5742460..ea6d18e1 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -58,30 +58,51 @@ class TangguhLelongController extends Controller
     {
         // dd($request->all());
         $user = Auth::user();
+
+        $namacaw = Cawangan::where('caw_code', $user['kodcaw'])->first();
+
+        $checkkodcaw = Customer::join('lelongbid', 'customer.kodcaw', '=', 'lelongbid.kodcaw')
+        ->where('lelongbid.kodcaw', $user['kodcaw'])
+        ->where('customer.kpbaru', $request->nokp)
+        ->orWhere('customer.kplama', $request->nokp)
+        ->first();
         
         if($request->nokp == null)
         {
-            return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Sila Masukkan No Kad Pengenalan');
+            return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan');
+        }
+        else if($checkkodcaw == null)
+        {
+            return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','No Kad Pengenalan Tiada Dalam Rekod');
         }
         else if($request->nokp != null)
         {
             $lelong = Lelong::where('id', $request->lelong_id)->first();
-            
-            $getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp')
-            ->where('gadai.nokp', '=', $request->nokp)
-            // ->where('gadai.tempoh', '=', $lelong->jbg)
+
+            $getic = LelongBid::join('gadai', 'lelongbid.norujukan', '=', 'gadai.norujukan')
+            ->where('lelongbid.kodcaw', $user['kodcaw'])
+            ->where('gadai.nokp', $request->nokp)
+            ->where('lelongbid.lelong_id', $request->lelong_id)
             ->get();
-            // dd($getic);
-            
+
             foreach($getic as $index1=>$ic)
             {
-                // dd($ic);
                 $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
                 ->where('norujukan', $ic->norujukan)
                 ->where('jbg', $ic->tempoh)
+                ->where('lelongbid.kodcaw', $user['kodcaw'])
+                ->where('lelong_id', $request->lelong_id)
                 ->get();
                 // dd($getnorujukan);
-                
+
+                $customer_detail = Customer::where('kpbaru', $ic['nokp'])
+                ->orWhere('kplama', $ic['nokp'])
+                ->first();
+
+                // $getic['customer_detail'] = $customer_detail;
+                // $getic2 = $customer_detail;
+                // dd($getic2);
+
                 foreach($getnorujukan as $norujukan)
                 {
                     // dd($norujukan);
@@ -104,21 +125,27 @@ class TangguhLelongController extends Controller
                     }
                     else
                     {
-                        //
+                        $getic[$index1]['user_details'] = $getnorujukan;
+                        $getic[$index1]['t_lelong'] = $getnorujukan[0]['t_lelong'];
+                        $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
                     }
 
-                    $getic[$index1]['user_details'] = $getnorujukan;
-                    // dd($getic[$index1]['user_details']);
-                    $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
                 }
                 
             }
+            // $icarray = [];
+
+            // foreach($getic->toArray() as $array)
+            // {
+            //     if(sizeof($array) == 170)
+            //         array_push($icarray, $array);
+            // }
+
             // dd($getic->toArray());
-            $getic_array = $getic->toArray();
-            dd($getic_array);
+
             $lelong_id = $request->lelong_id;
     
-            return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id'));
+            return view('tangguhlelong.searchbyic', compact('getic', 'customer_detail', 'user', 'lelong_id', 'namacaw'));
 
         }
 
diff --git a/resources/views/marhun/sentangguhlelongsah.blade.php b/resources/views/marhun/sentangguhlelongsah.blade.php
index 8e985b6c..2290302d 100644
--- a/resources/views/marhun/sentangguhlelongsah.blade.php
+++ b/resources/views/marhun/sentangguhlelongsah.blade.php
@@ -11,6 +11,15 @@
             @endif
             <h3 class="pt-3" style="margin-left:1%;">Senarai Tangguh Lelong Yang Telah Disahkan Oleh Operasi</h3>
             <br>
+            <div class="container">
+                <div class="row mb-2">
+                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                        <p><b>Cawangan :</b> {{ $lelong['caw_name'] }} </p>
+                        <p><b>Tarikh Lelong : </b> {{ $lelong['tarikh_lelong'] }} </p>
+                    </div>
+                </div>
+            </div>
+            <br>
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
                 <table class="table table-striped  table-xl text-center" id="sentangguhlelongsah" style="width:100%">
diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php
index 88feaacf..f503011a 100644
--- a/resources/views/pengesahan/perubahanmutumarhun.blade.php
+++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php
@@ -10,6 +10,7 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
+            <h4 class="pt-3" style="margin-left:1%;">Pengesahan Perubahan Mutu Marhun</h4>
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php
index dd8cea4d..ebf47ca8 100644
--- a/resources/views/tangguhlelong/searchbyic.blade.php
+++ b/resources/views/tangguhlelong/searchbyic.blade.php
@@ -10,7 +10,18 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
-
+            <div class="container">
+                <div class="row mb-2">
+                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                        <p> <b>Nama : {{$customer_detail['nama']}} </b> </p>
+                        <p> <b>No Kad Pengenalan : {{ ($customer_detail) ? $customer_detail['kpbaru'] : $customer_detail['kplama']}} </b></p>
+                        <p> <b>Alamat : {{$customer_detail['alamat1']}}</b></p>
+                        <p> <b>Not Telefon : {{$customer_detail['telefon']}}</b></p>
+                        <p> <b>Tarikh Lelong : {{$getic[0]['t_lelong']}} </b></p>
+                        <p> <b>Nama Cawangan : {{$namacaw['caw_name']}} </b></p>
+                    </div>
+                </div>
+            </div>
             <form id="formtangguhlel" action="{{route('tangguhlelong.tangguhlelong')}}" method="POST">
                 @csrf
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}">
@@ -18,7 +29,6 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Tarikh Lelong</th>
                             <th>No Rujukan</th>                   
                             <th>JBG</th>                   
                             <th>Narhun</th>                   
@@ -33,7 +43,6 @@
                         @foreach ($getic as $ic)
                         <tr>
                             <td>{{$loop->iteration}}</td>
-                            <td>{{$ic['user_details'][0]['t_lelong']}}</td>
                             <td>{{$ic['norujukan']}}</td>
                             <td>{{$ic['jbg']}}</td>
                             <td>{{$ic['marhun']}}</td>
@@ -41,16 +50,17 @@
                             <td>{{$ic['pinjaman']}}</td>
                             <td>{{$ic['berat']}}</td>
                             <td class="text-center">
-                                @if(sizeof($ic['sdhadapengesahan']) !== 0)
+                                @if(!$ic['sdhadapengesahan'])
 
                                 @else
-                                    <input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['id'] }}">
+                                    <input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['lelongbid_id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['lelongbid_id'] }}">
                                 @endif
                             </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
+                <br>
                 <div class="form-group row">
                     <label for="remark" class=" col-form-label mr-4" style="margin-left:2%;">Remark</label>
                     <div>
diff --git a/routes/api.php b/routes/api.php
index b916615c..1a309e96 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -65,6 +65,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post('/bidder/biditem', [LelongMobileController::class, 'bidderSelectBidItem']);
     Route::get('/bidder/listbiditem', [LelongMobileController::class, 'listBidItem']);
     Route::get('/bidder/listBidItemWeb', [LelongMobileController::class, 'listBidItemWeb']);
+    Route::get('/bidder/hisfeepay', [LelongMobileController::class, 'hisfeepay']);
     Route::post('/bidder/updatebiditem', [LelongMobileController::class, 'updatebiditem']);
     
 });

From f0043b7c18ad2ca950c4f5194628023605a15466 Mon Sep 17 00:00:00 2001
From: faiqahzaman <zmnfqh@gmail.com>
Date: Tue, 14 Jun 2022 08:58:35 +0800
Subject: [PATCH 2/2] update 14/6

---
 app/Http/Controllers/AccountController.php    |  63 +++++--
 app/Http/Controllers/MarhunController.php     |  49 ++---
 app/Http/Controllers/PaymentController.php    | 169 ++++++++++++------
 app/Models/FileResit.php                      |  22 +++
 ...22_06_12_105248_create_fileresit_table.php |  47 +++++
 .../views/account/listbayaranonline.blade.php |   4 +-
 .../views/account/sahsagonline.blade.php      |  52 +++++-
 .../views/account/senarailelongan.blade.php   |   3 +-
 .../views/pembayaran/SAGBidItem.blade.php     | 116 ++++++++++--
 .../pembayaran/kaunterpembayaran.blade.php    |   4 +-
 routes/web.php                                |   4 +-
 11 files changed, 411 insertions(+), 122 deletions(-)
 create mode 100644 app/Models/FileResit.php
 create mode 100644 database/migrations/2022_06_12_105248_create_fileresit_table.php

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 334b7f6e..0fe0f498 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -14,6 +14,7 @@ use App\Models\Payment;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
 use App\Models\Resit;
+use App\Models\FileResit;
 
 class AccountController extends Controller
 {
@@ -30,14 +31,23 @@ class AccountController extends Controller
         return view('account.senarailelongan',compact('senarai'));
     }
 
-    public function listbayaranonline($lelong_id){
+    public function listbayaranonline($lelong_id, $caw_code)
+    {
+        $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('lelong.id', $lelong_id)
+        ->where('caw_code')
+        ->select('cawangan.caw_name')
+        ->get();
+
+        $getkodcaw = Cawangan::where('caw_code', $caw_code)->select('caw_name')->first();
 
-        
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', 'payment.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('payment.status_payment_opt','=', '3,2')
+        ->where('payment.status_payment_opt', 3)
+        ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->whereNull('payment.disahkan_pada')
         ->select('.lelongbidder.user_id'
@@ -45,7 +55,6 @@ class AccountController extends Controller
         ->groupBy('lelongbidder.user_id')
         ->get();
 
-        // dd($listwinner);
         foreach($listwinner as $index1=>$winner){
 
             $userdetails = User::where('id', $winner['user_id'])->first();
@@ -82,26 +91,42 @@ class AccountController extends Controller
         }
 
 
-        return view('account.listbayaranonline',compact('listwinner','lelong_id'));
+        return view('account.listbayaranonline',compact('listwinner','lelong_id', 'getkodcaw', 'caw_code'));
     }
 
-    public function sahsagonline($lelong_id, $user_id)
+    public function sahsagonline($lelong_id, $user_id, $caw_code)
     {
+        $userdetails = User::where('id', $user_id)->first();
+
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbid.kodcaw', $caw_code)
         ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', '=', '3,2')
+        ->where('payment.status_payment_opt', 3)
+        ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->get()->toArray();
 
+        foreach($senaraisag as $index1=>$sag)
+        {
+            $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
+            ->where('lelongbid.status_jual', 1)
+            ->where('lelongbid.status_payment', 1)
+            ->whereNotNull('payment.disahkan_pada')
+            ->whereNotNull('payment.disahkan_pada')
+            ->first();
+        }
+
         $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbid.kodcaw', $caw_code)
         ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', '=', '3,2')
+        ->where('payment.status_payment_opt', 3)
+        ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->select(
             'lelongbidder.payment_id as payment_id'
@@ -110,14 +135,24 @@ class AccountController extends Controller
             ->get();
         // $payments = Payment::whereIn($saggroupbyid)->get()
         $total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment');
-       
 
-        return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment'));
+        $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id')
+        ->where('payment.lelong_id', $lelong_id)
+        ->where('payment.user_id', $user_id)
+        ->where('payment.kodcaw', $caw_code)
+        ->get()->toArray();
+
+        $array_resit = [];
+        foreach($getresit as $index1=>$resit)
+        {
+            $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']);
+        }
+
+        return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit', 'checking'));
     }
 
     public function sahbayaronline(Request $request)
     {
-        // dd($request->all());
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
@@ -128,7 +163,8 @@ class AccountController extends Controller
         ->where('lelongbid.lelong_id', $request->lelong_id)
         ->where('lelongbidder.user_id', $request->user_id)
         ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', '3,2')    
+        ->where('payment.status_payment_opt', 3)
+        ->orWhere('payment.status_payment_opt', 2)   
         ->where('lelongbidder.status_payment', 2)
         ->select(
             'lelongbid.id as lelongbid_id',
@@ -144,7 +180,8 @@ class AccountController extends Controller
         ->where('lelongbid.lelong_id', $request->lelong_id)
         ->where('lelongbidder.user_id', $request->user_id)
         ->where('lelongbidder.status_bidder', 1)
-        ->where('payment.status_payment_opt', '3,2')
+        ->where('payment.status_payment_opt', 3)
+        ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->select(
             'lelongbidder.payment_id as payment_id'
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 67293827..2d5622ee 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -664,37 +664,16 @@ class MarhunController extends Controller
                     $rugilelong = $totalbaki;
                 }
                 
-                // if($gadaimarhun)
-                // {
-                    $marhuns[$index1]['harga_gadai'] = $marhun['old_harga'];
-                    $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
-                    $marhuns[$index1]['old_marhun'] = $marhun['marhun'];
-                    $marhuns[$index1]['status_ubah'] = $status;
-                    $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
-                    $marhuns[$index1]['baki_lelong'] = $bakilelong;
-                    $marhuns[$index1]['rugi_lelong'] = $rugilelong;
-                // }
-                // else
-                // {
-                //     $marhuns[$index1]['harga_gadai'] = 0;
-                //     $marhuns[$index1]['nmarhun_gadai'] = 0;
-                //     $marhuns[$index1]['old_marhun'] = 0;
-                //     $marhuns[$index1]['status_ubah'] = 0;
-                //     $marhuns[$index1]['pembiayaan'] = 0;
-                //     $marhuns[$index1]['baki_lelong'] = 0;
-                //     $marhuns[$index1]['rugi_lelong'] = 0;
-                // }
-                
-                // $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga;
-                // $marhuns[$index1]['nmarhun_gadai'] = $gadaimarhun->n_marhun;
-                // $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun;
-                // $marhuns[$index1]['status_ubah'] = $status;
-                // $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
-                // $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
-                // $marhuns[$index1]['baki_lelong'] = $bakilelong;
-                // $marhuns[$index1]['rugi_lelong'] = $rugilelong;
+                $marhuns[$index1]['harga_gadai'] = $marhun['old_harga'];
+                $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun'];
+                $marhuns[$index1]['old_marhun'] = $marhun['marhun'];
+                $marhuns[$index1]['status_ubah'] = $status;
+                $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman;
+                $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah;
+                $marhuns[$index1]['baki_lelong'] = $bakilelong;
+                $marhuns[$index1]['rugi_lelong'] = $rugilelong;
             }
-            // dd($marhuns);
+
             array_push($arraylelbidmarhun,$marhuns);
         }
         
@@ -740,7 +719,9 @@ class MarhunController extends Controller
                     {
                         if($bidmarhuns->status_ubah == 3)
                         {
-                            $bidmarhuns->delete();
+                            $deletemarhun = LelongBidMarhun::where('id', $bidmarhuns->lelongbidmarhun_id)
+                            ->where('lelongbid_id', $bidmarhuns->lelongbid_id)
+                            ->delete();
                         }
                         else
                         {
@@ -751,8 +732,10 @@ class MarhunController extends Controller
     
                     $pengesahans = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
                     ->where('pengesahan.lelongbid_id', $terimalel['lelongbid_id'])
-                    ->select('pengesahan.id as pengesahan_id')
-                    ->first();
+                    ->select('pengesahan.id as pengesahan_id', 
+                             'pengesahan.status'
+                    )
+                    ->update(['status' => 1]);
     
                     $lelongbids = LelongBid::where('id', $lelongbid['id'])->first();
                     $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun);
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 3b351d78..f02b039c 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -12,6 +12,8 @@ use App\Models\LelongBidder;
 use App\Models\LelongBidMarhun;
 use App\Models\Payment;
 use App\Models\User;
+use App\Models\File;
+use App\Models\FileResit;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 
@@ -83,6 +85,7 @@ class PaymentController extends Controller
             foreach($payment_id as $id){
                 $payment = Payment::where('id', $id->payment_id)
                 ->first();
+                // dd($payment);
 
                 if($payment){
                     $total_payment = $total_payment + $payment->total_payment;
@@ -128,8 +131,20 @@ class PaymentController extends Controller
                     'lelongbidder.status_payment'
                     )
         ->get();
+        // dd($eachbid);
+        
+        $getresit = FileResit::join('payment', 'fileresit.payment_id', '=', 'payment.id')
+        ->where('payment.lelong_id', $lelong_id)
+        ->where('payment.user_id', $user_id)
+        ->get()->toArray();
 
-        return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id'));
+        $array_resit = [];
+        foreach($getresit as $index1=>$resit)
+        {
+            $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']);
+        }
+
+        return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id', 'getresit'));
     }
 
     public function paymentdenokaunter(Request $request){
@@ -243,66 +258,112 @@ class PaymentController extends Controller
     public function banktransfer(Request $request)
     {
         // dd($request->all());
+        //eachbid = lelongbid_id
 
-        $currentdate = Carbon::now();
-        $currentdate = $currentdate->toDateTimeString();
-
-        $user = Auth::user();
-
-        // $totalcheck = implode(",", $request->checkboxdata);
-        $bid_id = explode(",", $request->eachbid); //bid_id = lelongbid_id
-
-        $resit = Resit::where('lelong_id', $request->lelong_id)
-        ->where('user_id',$request->user_id)
-        ->where('resit_type', 2)
+        $paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
+        ->where('payment.lelong_id', $request->lelong_id)
+        ->where('payment.user_id', $request->user_id)
         ->first();
-        
-        $payment = new Payment;
-        $payment->user_id = $request->user_id;
-        $payment->lelong_id = $request->lelong_id;
-        $payment->kodcaw = $user->kodcaw;
-        $payment->status_payment_opt = 3;
-        $payment->status = 2;
-        $payment->remark = 'BAYARAN CDM';
-        $payment->resit_id = $resit->id;
-        $payment->total_payment = $request->total;
-        $payment->diminta_pada = $currentdate;
-        $payment->diminta_oleh = $user->id;
-        $payment->save();
 
-        foreach($bid_id as $bid){
+        if($paymentexist)
+        {
+            $getpayment = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
+            ->where('payment.lelong_id', $request->lelong_id)
+            ->where('payment.user_id', $request->user_id)
+            ->select('payment.id as payment_id',
+                     'payment.lelong_id',
+                     'payment.user_id',
+                     'fileresit.id as fileresit_id',
+                     'fileresit.file_type',
+                     'fileresit.filename'
+            )
+            ->first();
 
-        $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-        ->join('users', 'lelongbidder.user_id', '=', 'users.id')
-        ->where('lelongbidder.lelongbid_id', $bid)
-        ->select('lelongbidder.hargabida',
-                    'lelongbid.hargaasas',
-                    'lelongbid.norujukan',
-                    'lelongbidder.lelongbid_id',
-                    'lelongbidder.id as lelongbidder_id',
-                    'lelongbid.lelong_id as lelong_id'
-                    )
-        ->first();
+            $data = base64_encode($request->resit->get());
+            $file_type = $request->resit->extension();
+            
+            $updatepayment = FileResit::where('payment_id', $getpayment['payment_id'])
+            ->where('id', $getpayment['fileresit_id'])
+            ->first();
+            $updatepayment->id;
+            $updatepayment->user_id = $request->user_id;
+            $updatepayment->payment_id = $updatepayment->payment_id;
+            $updatepayment->file_type = $file_type;
+            $updatepayment->filename = $data;
+            $updatepayment->update();
+
+            return redirect()->route('pembayaran.kaunterpembayaran', $request->lelong_id)
+                            ->with('success','Ubah Resit Berjaya, Tunggu Pengesahan Akaun');
+        }
+        else
+        {
+            $bid_id = $request->eachbid;
+            $currentdate = Carbon::now();
+            $currentdate = $currentdate->toDateTimeString();
     
-        $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
-        ->where('user_id',$request->user_id)
-        ->first();
-        $updatelelbidbidder->status_payment = 1;
-        $updatelelbidbidder->payment_id = $payment->id;
-        $updatelelbidbidder->save();
-
-        $eachbidupdate = LelongBid::where('id',$bid)->first();
-        $eachbidupdate->status_jual = 1;
-        $eachbidupdate->status_payment = 2;
-        $eachbidupdate->t_jual = $currentdate;
-        $eachbidupdate->hargajual = $eachbid->hargabida;
-        $eachbidupdate->save();
+            $user = Auth::user();
+    
+            // $imageName = time().'.'.$request->resit->extension();
+            $data = base64_encode($request->resit->get());
+            $file_type = $request->resit->extension();
+    
+            $resit = Resit::where('lelong_id', $request->lelong_id)
+            ->where('user_id',$request->user_id)
+            ->where('resit_type', 2)
+            ->first();
+            
+            $payment = new Payment;
+            $payment->user_id = $request->user_id;
+            $payment->lelong_id = $request->lelong_id;
+            $payment->kodcaw = $user->kodcaw;
+            $payment->status_payment_opt = 3;
+            $payment->status = 2;
+            $payment->remark = 'BAYARAN CDM';
+            $payment->resit_id = $resit->id;
+            $payment->total_payment = $request->total_payment;
+            $payment->diminta_pada = $currentdate;
+            $payment->diminta_oleh = $user->id;
+            $payment->save();
+    
+            $addfile = new FileResit;
+            $addfile->user_id = $request->user_id;
+            $addfile->payment_id = $payment->id;
+            $addfile->file_type = $file_type;
+            $addfile->filename = $data;
+            $addfile->save();
+    
+            foreach($bid_id as $bid)
+            {
+                $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                ->join('users', 'lelongbidder.user_id', '=', 'users.id')
+                ->where('lelongbidder.lelongbid_id', $bid)
+                ->select('lelongbidder.hargabida',
+                            'lelongbid.hargaasas',
+                            'lelongbid.norujukan',
+                            'lelongbidder.lelongbid_id',
+                            'lelongbidder.id as lelongbidder_id',
+                            'lelongbid.lelong_id as lelong_id'
+                            )
+                ->first();
+            
+                $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
+                ->where('user_id',$request->user_id)
+                ->first();
+                $updatelelbidbidder->status_payment = 2;
+                $updatelelbidbidder->payment_id = $payment->id;
+                $updatelelbidbidder->save();
+    
+                $eachbidupdate = LelongBid::where('id',$bid)->first();
+                $eachbidupdate->hargajual = $eachbid->hargabida;
+                $eachbidupdate->save();
+    
+            }
+    
+    
+            return redirect()->route('pembayaran.kaunterpembayaran', $request->lelong_id)
+                            ->with('success','Menunggu Pengesahan Akaun');
 
         }
 
-
-        return redirect()->route('pembayaran.SenaraiLelongBayar')
-                        ->with('success','Menunggu Pengesahan Account');
-
     }
 }
diff --git a/app/Models/FileResit.php b/app/Models/FileResit.php
new file mode 100644
index 00000000..f1d85b00
--- /dev/null
+++ b/app/Models/FileResit.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class FileResit extends Model
+{
+    use HasFactory;
+
+    protected $table = 'fileresit';
+
+    protected $fillable = [
+       'user_id',
+       'payment_id',
+       'file_type',
+       'filename',
+       'deleted_at',
+       'deleted_by'
+    ];
+}
diff --git a/database/migrations/2022_06_12_105248_create_fileresit_table.php b/database/migrations/2022_06_12_105248_create_fileresit_table.php
new file mode 100644
index 00000000..2d26eaac
--- /dev/null
+++ b/database/migrations/2022_06_12_105248_create_fileresit_table.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateFileresitTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('fileresit', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_id')->unsigned();
+            $table->unsignedBigInteger('payment_id')->unsigned();
+            $table->string('file_type');
+            $table->datetime('deleted_at')->nullable();
+            $table->integer('deleted_by')->nullable();
+            $table->timestamps();
+
+            $table->foreign('user_id')
+            ->references('id')->on('users')
+            ->onDelete('cascade');
+           
+            $table->foreign('payment_id')
+            ->references('id')->on('payment')
+            ->onDelete('cascade');
+        });
+
+         // once the table is created use a raw query to ALTER it and add the MEDIUMBLOB
+         DB::statement("ALTER TABLE fileresit ADD filename LONGBLOB");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('fileresit');
+    }
+}
diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index 0ea0e14c..8402803e 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -10,6 +10,8 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <h4> Senarai Bayaran Atas Talian </h4>
+            <p><i class="fas fa-caret-right"></i>  {{ $getkodcaw['caw_name'] }}</p>
         <table class="table table-striped  table-xl text-center" id="sahsagonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
@@ -34,7 +36,7 @@
                             <td>{{ $winner['totalBid']}}</td>
                             <td>{{ $winner['totalPay']}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index fb0ca877..1a396b12 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -10,6 +10,15 @@
                 <p>{{ $message }}</p>
             </div>
             @endif
+            <div class="container">
+                <div class="row mb-2">
+                    <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                        <p> <b>Nama Pembida : </b> {{ $userdetails['name'] }}</p>
+                        <p> <b>No Kad Pengenalan : </b> {{ $userdetails['nokp'] }}</p>
+                        <p> <b>No Telefon : </b> {{ $userdetails['notelbimbit'] }}</p>
+                    </div>
+                </div>
+            </div>
             <form action="{{ route('account.sahbayaronline') }}" method="POST" id="formsahbayaronline">
                             @csrf
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
@@ -49,19 +58,54 @@
                     <td colspan="2"><b> Jumlah Bayaran</b></td>
                     <td colspan="2"></td>
                     <td colspan="1"><b>RM<input type="text" id="total" value="{{ $total_payment }}" style="border: none;" readonly></b></td>
-                    <td colspan="3"></td>
+                    <td></td>
+                    <td>
+                        @if($getresit)
+                            <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exampleModal">
+                                Lihat Resit <i class="fas fa-file-alt"></i>
+                            </button>
+                        @else
+                        @endif
+                    </td>
+                    <td></td>
                 </tr>
                 </table>
                 <div class="modal-footer" style="margin-top:2%;">
-                    <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
-                    <!-- <a  href="{{ route('account.sahbayaronline', ['lelong_id'=>$lelong_id, 'user_id'=>$user_id]) }}" class="btn btn-warning">Sahkan</a> -->
-                    <button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
+                    <a  href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a>
+                    @if($checking)
+                        <button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
+                    @else
+                        <button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
+                    @endif
                 </div>
             </form> 
         </div>
     </div>
 </div>
 
+<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="exampleModalLabel">Resit Bayaran CDM</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body text-center" style="padding:3rem">
+          @foreach($getresit as $resit)
+            <div class=".col-6 .col-sm-4 form-check form-check-inline">
+                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="width:350px; height:450px; border: 1px solid #dee2e6"/>
+            </div>
+          @endforeach
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Kembali</button>
+        </div>
+      </div>
+    </div>
+</div>
+
 <script>
 
     function confirm() {
diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php
index 646569fa..2f7f6801 100644
--- a/resources/views/account/senarailelongan.blade.php
+++ b/resources/views/account/senarailelongan.blade.php
@@ -10,6 +10,7 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <h4 style="margin-left:1%;"> Senarai Lelongan </h4>
         <table class="table table-striped  table-xl text-center" id="senarailelongan" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
@@ -28,7 +29,7 @@
                     <td>{{ $data->tarikh_lelong }}</td>
                     <td>{{ $data->sts_lelong }}</td>
                     <td>
-                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Pembida"><i class="far fa-edit"></i></a>
+                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['lelong_id'], 'caw_code'=>$data['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Pembida"><i class="far fa-edit"></i></a>
                     </td>
                 </tr>
                 @endforeach
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index cf058271..d692b87a 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -15,7 +15,7 @@
 <div class="container">
     <div class="row ">
             <div class="col-md-11 mx-auto card p-4">
-            <form action="{{ route('pembayaran.banktransfer') }}" method="POST" id="formbanktransfer">
+            <form action="{{ route('pembayaran.banktransfer') }}" method="POST" id="">
                     @csrf
                 <input type="hidden" name="user_id" value="{{ $user_id }}" />
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
@@ -34,16 +34,18 @@
                             @foreach($eachbid as $biditem)
                                 <tr>
                                     <td class="text-center">{{ $loop->iteration }}</td>
-                                    <td class="text-center">{{ $biditem->norujukan}}</td>
+                                    <td class="text-center">
+                                        {{ $biditem->norujukan}}
+                                    </td>
                                     <td class="text-center">{{ $biditem->hargaasas}}</td>
                                     <td class="text-center">{{ $biditem->hargabida}}</td>
                                     <td class="text-center">
                                         @if($biditem->status_payment == 0)
                                             <input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" data-bid_id="{{ $biditem->lelongbid_id}}" onclick="sum(this.value,this)" value="{{ $biditem->hargabida }}">
                                         @elseif($biditem->status_payment == 2)
-                                            <span class="btn btn-warning btn-sm hovernone-warning">MENUNGGU PENGESAHAN</span>
+                                            <span class="btn btn-warning btn-sm hovernone-warning">TUNGGU PENGESAHAN</span>
                                         @else
-                                            <span class="btn btn-danger btn-sm hovernone-danger">PAID</span>
+                                            <span class="btn btn-success btn-sm hovernone-success">PAID</span>
 
                                         @endif
                                     </td>
@@ -52,14 +54,21 @@
                             <tr>
                                 <td colspan="3"><b> Jumlah Bayaran</b></td>
                                 <td class="text-center"><b>RM<input type="text" id="total" name="total" value="0" style="border: none;" readonly></b></td>
-                                <td> </td>
+                                <td class="text-center">
+                                    @if($getresit)
+                                        <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exampleModal">
+                                            Lihat Resit <i class="fas fa-file-alt"></i>
+                                        </button>
+                                    @else
+                                    @endif
+                                </td>
                             </tr>
                         </tbody>
                     </table>
             </form>
                 <div class="text-right">
                     <a  href="{{ route('pembayaran.kaunterpembayaran', $lelong_id ) }}" class="btn btn-primary" style="width:15%; margin-right:53%;" >Kembali</a>
-                    <button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="confirm()">CDM</button>
+                    <button type="button" class="btn btn-info" style="width:15%" id="btnbanktransfer" onclick="funccdm()">CDM</button>
                     <button type="button" class="btn btn-success" style="width:15%" id="btnterima" onclick="functerima()">Tunai</button>
                 </div>
             </div>
@@ -174,25 +183,108 @@
   </div>
 </div>
 
+<div class="modal fade" id="CDM" data-backdrop="static" data-keyboard="false" role="dialog" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered" role="document">
+ 
+
+    <div class="modal-content text-center">
+        <form action="{{ route('pembayaran.banktransfer') }}" method="POST" id="formbanktransfer" enctype="multipart/form-data">
+        @csrf
+        <input type="hidden" name="user_id" value="{{ $user_id }}" />
+        <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
+        <input type="hidden" name="eachbid[]" id="eachbid" value="" />
+        <input type="hidden" name="total_payment" id="totalpay" value="" />
+
+        <div class="modal-header">
+            <h5 class="modal-title" id="exampleModalLabel">Bukti Pembayaran</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body">
+            <div class="tab-content">
+            <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
+                <div class="input-group">
+                    <div class="custom-file">
+                    <input type="file" name="resit" id="inputGroupFile04" >
+                    {{-- <label class="custom-file-label" for="inputGroupFile04">Muat Naik Resit</label> --}}
+                    </div>
+                </div>
+            </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger" onclick="funccdmbatal()">Batal</button>
+            <button type="button" class="btn btn-success" data-toggle="modal"  data-target=".bd-example-modal-sm" onclick="submitcdm()" >Muat Naik</button>
+        </div>
+        </form>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="exampleModalLabel">Resit Bayaran CDM</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body text-center" style="padding:3rem">
+          @foreach($getresit as $resit)
+            <div class=".col-6 .col-sm-4 form-check form-check-inline">
+                <img src="data:image/png;base64, {{ $resit['filename'] }}" alt="Image Preview" style="width:350px; height:450px; border: 1px solid #dee2e6"/>
+            </div>
+          @endforeach
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal">Kembali</button>
+          <button type="button" class="btn btn-primary" onclick="funcubah()">Ubah</button>
+        </div>
+      </div>
+    </div>
+</div>
+
 
 <script>
     var arraylelongbid = [];
     $("#btnterima").prop("disabled", true);
     $("#btnbanktransfer").prop("disabled", true);
-    function terimadeno() {
+    function terimadeno() 
+    {
         $("input[name='eachbid[]']").val(arraylelongbid);
         $("#formpaymentdenokaunter").submit();
     }
-    function funcbatal(){
-        $('#denominasiHQModal').modal('hide');
-    }
-    function functerima(){
-        
+    function functerima()
+    {
         $('#denominasiHQModal').modal('show');
         var total_sum = parseFloat($('#total').val());
         $('#amaundiminta').val(parseFloat(total_sum).toFixed(2));
         $('#amaunkiraan').val(parseFloat(0).toFixed(2));
     }
+    function funcbatal(){
+        $('#denominasiHQModal').modal('hide');
+    }
+    function submitcdm() {
+        $("input[name='eachbid[]']").val(arraylelongbid);
+        $("#formbanktransfer").submit();
+    }
+    function funccdm()
+    {
+        $('#CDM').modal('show');
+        var total_sum = parseFloat($('#total').val());
+        $('#totalpay').val(parseFloat(total_sum).toFixed(2));
+    }
+    function funccdmbatal()
+    {
+        $('#CDM').modal('hide');
+    }
+    function funcubah()
+    {
+        $('#exampleModal').modal('hide');
+        $('#CDM').modal('show');
+    }
     function confirm() {
         $.confirm({
         title: 'Confirmation',
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index bd932cf7..f1ab46f4 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -40,9 +40,9 @@
                                 <a 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>
                             </td>
                             <td>
-                                @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )    
+                                {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
                                     <a 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>
-                                @endif
+                                {{-- @endif --}}
                             </td>
                         </tr>
                 @endforeach
diff --git a/routes/web.php b/routes/web.php
index 2bec4b50..0b243840 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -273,8 +273,8 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel
 // Account
 Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'account'], function () {
     Route::get('/senarailelongan', ['as'=>'account.senarailelongan','uses'=>'AccountController@senarailelongan']);
-    Route::get('/listbayaranonline/{lelong_id}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
-    Route::get('/sahsagonline/{lelong_id}/{user_id}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
+    Route::get('/listbayaranonline/{lelong_id}/{caw_code}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
+    Route::get('/sahsagonline/{lelong_id}/{user_id}/{caw_code}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
     Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
 
 });