From fb19c174705c4a40a4c537377d50322870a722cd Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Wed, 11 Jan 2023 16:13:46 +0800
Subject: [PATCH] update pengesahan CDM oleh account by cawangan

---
 app/Http/Controllers/AccountController.php                | 8 +++++---
 app/Services/ResitPhotoService.php                        | 4 ++--
 .../2022_06_12_105248_create_fileresit_table.php          | 1 +
 resources/views/account/sahsagcdm.blade.php               | 3 ++-
 resources/views/home.blade.php                            | 8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 54aa35d8..6287cceb 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -504,7 +504,8 @@ class AccountController extends Controller
     public function sahsagcdm($lelong_id, $user_id, $caw_code)
     {
         $userdetails = User::where('id', $user_id)->first();
-
+        $lelonglel = Lelong::with('cawangan')->find($lelong_id);
+        $cawanganDetail = $lelonglel->cawangan->where('caw_code', $caw_code)->first();
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
         ->join('resit', 'payment.resit_id', '=', 'resit.id')
@@ -607,7 +608,8 @@ class AccountController extends Controller
 
         $fileresit = FileResit::where('lelong_id', $lelong_id)
         ->where('user_id', $user_id)
-        ->where('photo_type', '=', '1')
+        ->where('kodcaw', $caw_code)
+        ->where('photo_type', '=', '2')
         ->get();
         // dd($fileresit);
         foreach ($fileresit as $index => $itemresit) {
@@ -630,7 +632,7 @@ class AccountController extends Controller
         // }
         
 
-        return view('account.sahsagcdm', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'fileresit'));
+        return view('account.sahsagcdm', compact('cawanganDetail','senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'fileresit'));
     }
 
     public function showPhotoResit(Request $request)
diff --git a/app/Services/ResitPhotoService.php b/app/Services/ResitPhotoService.php
index f38f9517..f47b26f7 100644
--- a/app/Services/ResitPhotoService.php
+++ b/app/Services/ResitPhotoService.php
@@ -88,9 +88,9 @@ class ResitPhotoService
         $fileresit_id = $resit->id;
         // dd($fileresit_id);;
 
-        // $photo_type_name = $marhun->photo_type === 1 ? 'overall_photo' : 'by_marhun_photo';
+        $photo_type_name = $resit->photo_type === 1 ? '1' : '2';
 
-        $directory = $user_id.$DS.$lelong_id.$DS;
+        $directory = $user_id.$DS.$lelong_id.$DS.$photo_type_name.$DS;
         // dd($directory);
         $imageExtension = $resit->file_type;
         // dd($imageExtension);
diff --git a/database/migrations/2022_06_12_105248_create_fileresit_table.php b/database/migrations/2022_06_12_105248_create_fileresit_table.php
index d3f1be1a..5c8156b6 100644
--- a/database/migrations/2022_06_12_105248_create_fileresit_table.php
+++ b/database/migrations/2022_06_12_105248_create_fileresit_table.php
@@ -17,6 +17,7 @@ class CreateFileresitTable extends Migration
             $table->bigIncrements('id');
             $table->unsignedBigInteger('user_id')->unsigned();
             $table->unsignedBigInteger('lelong_id')->unsigned();
+            $table->string('kodcaw')->nullable();
             $table->unsignedBigInteger('payment_id')->unsigned();
             $table->string('file_type');
             $table->datetime('deleted_at')->nullable();
diff --git a/resources/views/account/sahsagcdm.blade.php b/resources/views/account/sahsagcdm.blade.php
index 53dfd65a..1488ad73 100644
--- a/resources/views/account/sahsagcdm.blade.php
+++ b/resources/views/account/sahsagcdm.blade.php
@@ -15,7 +15,7 @@
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
-                    Pengesahan Bayaran Kaunter Bank/CDM
+                    Pengesahan Bayaran Kaunter Bank/CDM : {{ $cawanganDetail->caw_name }}
                 </div>
             </div>
             <div class="card-body">
@@ -37,6 +37,7 @@
             <form action="{{ route('account.sahbayaronline') }}" method="POST" id="formsahbayaronline">
             @csrf
                 <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
+                <input type="hidden" name="kodcaw" value="{{ $cawanganDetail->caw_code }}" />
                 <input type="hidden" name="user_id" value="{{ $user_id }}" />
                 <input type="hidden" name="senarai_sag" value="{{ $senaraisag }}" />
                 <table class="table table-bordered text-center" style="width:100%">
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index b5166690..8a533ee0 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -461,8 +461,8 @@
                         {{-- <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
                         <strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
                         @forelse($details['listwinner'] as $winner)
-                            <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$winner['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
-                           {{$winner['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
+                            <a class="btn btn-warning btn-sm" href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$winner['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-user"></i>
+                           <span style='text-transform: uppercase'>{{$winner['nama']}}</span></a><img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
                             <br>
                             @empty
                              <br>
@@ -508,8 +508,8 @@
                         {{-- <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
                         <strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
                         @forelse($details['listwinner'] as $winner)
-                            <a href=" {{ route('account.sahsagcdm', ['lelong_id'=>$data['detailcdm']['lelong_id'],'user_id'=>$winner['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
-                           {{$winner['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
+                            <a class="btn btn-warning btn-sm" href=" {{ route('account.sahsagcdm', ['lelong_id'=>$data['detailcdm']['lelong_id'],'user_id'=>$winner['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-user"></i>
+                            <span style='text-transform: uppercase'>{{$winner['nama']}}</span></a><img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
                             <br>
                             @empty
                              <br>