diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index e9b7b021..17946569 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -26,19 +26,24 @@ use App\Models\ScanSemak; use App\Models\TangguhLelong; use Carbon\Carbon; use App\Models\ScanJual; +use App\Services\MarhunPhotoService; +use Illuminate\Support\Facades\Request as FacadesRequest; use App\Models\TempPengesahan; use DateTime; class MarhunController extends Controller { + private $marhunPhotoService; + /** * Create a new controller instance. * * @return void */ - public function __construct() + public function __construct(MarhunPhotoService $marhunPhotoService) { $this->middleware('auth'); + $this->marhunPhotoService = $marhunPhotoService; } /** @@ -50,104 +55,101 @@ class MarhunController extends Controller //Khazanah public function index($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); - $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); + $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan - ->where('caw_id','=', $caw->id) - ->get(); + ->where('caw_id', '=', $caw->id) + ->get(); // dd($lelongbid->toArray()); $sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak - ->where('caw_id', $caw->id) - ->where('status_semak', 0) - ->get(); + ->where('caw_id', $caw->id) + ->where('status_semak', 0) + ->get(); // dd($sag); //Get data filtered which is other than tangguh lelong from PC $sdhdisemak = LelongBid::where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbid.caw_id', $caw->id) - ->where('lelongbid.status_semak', 1) - ->get(); + ->where('lelongbid.caw_id', $caw->id) + ->where('lelongbid.status_semak', 1) + ->get(); // dd($sdhdisemak); $dalamproses = Pengesahan::select('pengesahan.norujukan') - ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') - ->where('pengesahan.lelong_id', $lelong_id) - ->where('lelongbid.caw_id','=', $caw->id) - ->where('pengesahan.diminta_oleh', $user['id']) - ->where('pengesahan.status', 0) - ->where('pengesahan.status_ubah', '!=', 6) - ->whereNull('pengesahan.disahkan_oleh') - ->distinct() - ->get(); + ->join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', '=', $caw->id) + ->where('pengesahan.diminta_oleh', $user['id']) + ->where('pengesahan.status', 0) + ->where('pengesahan.status_ubah', '!=', 6) + ->whereNull('pengesahan.disahkan_oleh') + ->distinct() + ->get(); // dd($dalamproses); - + $sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') - ->where('pengesahan.diminta_oleh', $user['id']) - ->where('pengesahan.status', 1) - ->where('pengesahan.status_ubah', '!=', 6) - ->where('pengesahan.lelong_id', $lelong_id) - ->whereNotNull('pengesahan.disahkan_oleh') - ->where('lelongbid.status_semak', 1) - ->get(); + ->where('pengesahan.diminta_oleh', $user['id']) + ->where('pengesahan.status', 1) + ->where('pengesahan.status_ubah', '!=', 6) + ->where('pengesahan.lelong_id', $lelong_id) + ->whereNotNull('pengesahan.disahkan_oleh') + ->where('lelongbid.status_semak', 1) + ->get(); // dd($sdhdisahkan); //Get data filtered which is from PC $sdhdisemaktangguhlel = LelongBid::join('pengesahan', 'lelongbid.id', '=', 'pengesahan.lelongbid_id') - ->where('lelongbid.lelong_id', $lelong_id) - ->where('lelongbid.caw_id', $caw->id) - ->where('lelongbid.status_semak', 1) - ->where('pengesahan.status', 2) - ->where('pengesahan.status_ubah', 6) - ->get(); - - $dalamprosestangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') - ->where('pengesahan.lelong_id', $lelong_id) - ->where('lelongbid.caw_id','=', $caw->id) - ->where('pengesahan.status', 2) - ->where('pengesahan.status_ubah', 6) - ->whereNull('pengesahan.disahkan_oleh') - ->get(); - - $sdhdisahkantangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') - ->where('pengesahan.status', 2) - ->where('pengesahan.status_ubah', 6) - ->where('pengesahan.lelong_id', $lelong_id) - ->where('caw_id','=', $caw->id) - ->whereNotNull('pengesahan.disahkan_oleh') - ->where('lelongbid.status_semak', 1) - ->distinct() - ->get(); - - foreach($lelongbid as $index1=>$bid) - { - $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id']) - ->where('lelong_id', $lelong_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', $caw->id) + ->where('lelongbid.status_semak', 1) + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) ->get(); + $dalamprosestangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.lelong_id', $lelong_id) + ->where('lelongbid.caw_id', '=', $caw->id) + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) + ->whereNull('pengesahan.disahkan_oleh') + ->get(); + + $sdhdisahkantangguhlel = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.status', 2) + ->where('pengesahan.status_ubah', 6) + ->where('pengesahan.lelong_id', $lelong_id) + ->where('caw_id', '=', $caw->id) + ->whereNotNull('pengesahan.disahkan_oleh') + ->where('lelongbid.status_semak', 1) + ->distinct() + ->get(); + + foreach ($lelongbid as $index1 => $bid) { + $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id']) + ->where('lelong_id', $lelong_id) + ->get(); + $statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id']) - ->where('lelong_id', $lelong_id) - ->where('status_ubah', 6) - ->first(); + ->where('lelong_id', $lelong_id) + ->where('status_ubah', 6) + ->first(); $statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id']) - ->whereNotNull('scan_keluar') - ->whereNotNull('terima_marhun') - ->whereNull('serah_marhun') - ->first(); + ->whereNotNull('scan_keluar') + ->whereNotNull('terima_marhun') + ->whereNull('serah_marhun') + ->first(); if ($statusSemakMarhun) { $lelongbid[$index1]['statusterimamarhun'] = 1; } $lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc; - if($sudahdisahkan) - { - foreach($sudahdisahkan as $sahkan) - { + if ($sudahdisahkan) { + foreach ($sudahdisahkan as $sahkan) { // dd($sahkan); $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) @@ -160,50 +162,45 @@ class MarhunController extends Controller $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun; // dd($lelongbid[$index1]['pengesahan']); } - } - else - { + } else { // } - $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get()->toArray();; + $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id']) + ->get() + ->toArray(); $lelongbid[$index1]['marhun'] = $marhun; - } - return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', - 'dalamprosestangguhlel', 'sdhdisahkantangguhlel' - )); + return view('marhun.senaraimarhun', compact('lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel')); } public function kemaskini(Request $request) { // dd($request->all()); //idmarhun => lelongbidmarhun_id - $user = Auth::user(); + $user = Auth::user(); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first(); - $lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first(); + $marhun = LelongBidMarhun::where('id', '=', $request->idmarhun)->first(); + $lelongbid = LelongBid::where('id', '=', $marhun->lelongbid_id)->first(); // dd($marhun); - if($marhun->marhun != $request->marhun) - { - $txtmarhun = ",1 " . $marhun->marhun ; - $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhun . "," ; - $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); - } - $caw = CawanganLelong::where('id','=',$lelongbid->caw_id)->first(); - $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); + if ($marhun->marhun != $request->marhun) { + $txtmarhun = ',1 ' . $marhun->marhun; + $lelongbid->marhun = $lelongbid->marhun . '1 ' . $request->marhun . ','; + $lelongbid->marhun = str_replace($txtmarhun, '', $lelongbid->marhun); + } + $caw = CawanganLelong::where('id', '=', $lelongbid->caw_id)->first(); + $lelong = Lelong::where('id', '=', $lelongbid->lelong_id)->first(); $ubahberatmin = 0.3; $bezaberat = $marhun->old_berat - $request->berat_emas; $bezahargaasas = $marhun->old_hargaasas - $request->harga_asas; - - if(($request->karat < $marhun->old_karat) && ($bezaberat > $ubahberatmin)) - { + + if ($request->karat < $marhun->old_karat && $bezaberat > $ubahberatmin) { $marhun->marhun = $request->marhun; $marhun->karat = $request->karat; $marhun->berat = $request->berat_emas; @@ -212,16 +209,15 @@ class MarhunController extends Controller $marhun->hargaasas = $request->harga_asas; $marhun->save(); - $lelongbid->berat = $lelongbid->berat - ($bezaberat); - $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->berat = $lelongbid->berat - $bezaberat; + $lelongbid->hargaasas = $lelongbid->hargaasas - $bezahargaasas; $lelongbid->save(); $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) - ->where('lelongbid_id', $marhun->lelongbid_id) - ->get(); - - if(isset($pengesahan['id'])) - { + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if (isset($pengesahan['id'])) { $pengesahan->id = $pengesahan->id; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -231,10 +227,8 @@ class MarhunController extends Controller $pengesahan->diminta_pada = $currentdate; $pengesahan->status_ubah = 5; $pengesahan->save(); - } - else - { - $berat = new Pengesahan; + } else { + $berat = new Pengesahan(); $berat->lelong_id = $lelong->id; $berat->lelongbid_id = $lelongbid->id; $berat->lelongbidmarhun_id = $marhun->id; @@ -244,11 +238,7 @@ class MarhunController extends Controller $berat->status_ubah = 5; $berat->save(); } - - } - - else if($request->karat < $marhun->old_karat) - { + } elseif ($request->karat < $marhun->old_karat) { $marhun->marhun = $request->marhun; $marhun->karat = $request->karat; $marhun->berat = $request->berat_emas; @@ -256,13 +246,12 @@ class MarhunController extends Controller $marhun->n_marhun = $request->nilai_marhun; $marhun->hargaasas = $request->harga_asas; $marhun->save(); - + $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) - ->where('lelongbid_id', $marhun->lelongbid_id) - ->get(); - - if(isset($pengesahan['id'])) - { + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if (isset($pengesahan['id'])) { $pengesahan->id = $pengesahan->id; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -272,10 +261,8 @@ class MarhunController extends Controller $pengesahan->diminta_pada = $currentdate; $pengesahan->status_ubah = 1; $pengesahan->save(); - } - else - { - $karat = new Pengesahan; + } else { + $karat = new Pengesahan(); $karat->lelong_id = $lelong->id; $karat->lelongbid_id = $lelongbid->id; $karat->lelongbidmarhun_id = $marhun->id; @@ -285,10 +272,7 @@ class MarhunController extends Controller $karat->status_ubah = 1; $karat->save(); } - } - - else if($bezaberat > $ubahberatmin) - { + } elseif ($bezaberat > $ubahberatmin) { $marhun->marhun = $request->marhun; $marhun->karat = $request->karat; $marhun->berat = $request->berat_emas; @@ -296,17 +280,16 @@ class MarhunController extends Controller $marhun->n_marhun = $request->nilai_marhun; $marhun->hargaasas = $request->harga_asas; $marhun->save(); - - $lelongbid->berat = $lelongbid->berat - ($bezaberat); - $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + + $lelongbid->berat = $lelongbid->berat - $bezaberat; + $lelongbid->hargaasas = $lelongbid->hargaasas - $bezahargaasas; $lelongbid->save(); $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) - ->where('lelongbid_id', $marhun->lelongbid_id) - ->get(); - - if(isset($pengesahan['id'])) - { + ->where('lelongbid_id', $marhun->lelongbid_id) + ->get(); + + if (isset($pengesahan['id'])) { $pengesahan->id = $pengesahan->id; $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; @@ -316,10 +299,8 @@ class MarhunController extends Controller $pengesahan->diminta_pada = $currentdate; $pengesahan->status_ubah = 4; $pengesahan->save(); - } - else - { - $berat = new Pengesahan; + } else { + $berat = new Pengesahan(); $berat->lelong_id = $lelong->id; $berat->lelongbid_id = $lelongbid->id; $berat->lelongbidmarhun_id = $marhun->id; @@ -329,11 +310,9 @@ class MarhunController extends Controller $berat->status_ubah = 4; $berat->save(); } - } //beza berat kurang daripada 0.30 & penambahan berat (tak perlu pengesahan) - else - { + else { $marhun->id = $request->idmarhun; $marhun->marhun = $request->marhun; $marhun->karat = $request->karat; @@ -344,26 +323,28 @@ class MarhunController extends Controller $marhun->save(); $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) - ->where('lelongbid_id', $marhun->lelongbid_id) - ->delete(); - - $lelongbid->berat = $lelongbid->berat - ($bezaberat); - $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + ->where('lelongbid_id', $marhun->lelongbid_id) + ->delete(); + + $lelongbid->berat = $lelongbid->berat - $bezaberat; + $lelongbid->hargaasas = $lelongbid->hargaasas - $bezahargaasas; $lelongbid->save(); } - return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id]) - ->with('success','Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN'); + return redirect() + ->route('marhun.show', [$lelongbid->id, $lelong->id]) + ->with('success', 'Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN'); } - public function kemaskiniMarhun(Request $request) { + public function kemaskiniMarhun(Request $request) + { // dd($request->all()); - $user = Auth::user(); + $user = Auth::user(); $currentdate = Carbon::now(); // $currentdate = $currentdate->toDateTimeString(); - $lelongBidMarhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first(); - $lelongbid = LelongBid::where('id','=',$lelongBidMarhun->lelongbid_id)->first(); - $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); + $lelongBidMarhun = LelongBidMarhun::where('id', '=', $request->idmarhun)->first(); + $lelongbid = LelongBid::where('id', '=', $lelongBidMarhun->lelongbid_id)->first(); + $lelong = Lelong::where('id', '=', $lelongbid->lelong_id)->first(); // $perluPengesahan = false; $parameterBezaBerat = 0.0; //parameterBezaBerat = (berat sebelum) - (berat selepas) @@ -455,9 +436,8 @@ class MarhunController extends Controller $pengesahan->status_ubah = 1; //ubah karat $pengesahan->request_karat = $request->karat; $pengesahan->save(); - } - else if ($lelongBidMarhun->marhun != $request->marhun) { - $pengesahan = new Pengesahan; + } elseif ($lelongBidMarhun->marhun != $request->marhun) { + $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -467,9 +447,8 @@ class MarhunController extends Controller $pengesahan->status_ubah = 7; //ubah marhun $pengesahan->request_marhun = $request->marhun; $pengesahan->save(); - } - else if ($lelongBidMarhun->marhun > $request->marhun) { - $pengesahan = new Pengesahan; + } elseif ($lelongBidMarhun->marhun > $request->marhun) { + $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $lelong->id; $pengesahan->lelongbid_id = $lelongbid->id; $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; @@ -479,10 +458,7 @@ class MarhunController extends Controller $pengesahan->status_ubah = 2; //add marhun $pengesahan->request_marhun = $request->marhun; $pengesahan->save(); - } - - - else { + } else { // $lelongBidMarhun->id; $lelongBidMarhun->marhun = $request->marhun; $lelongBidMarhun->old_berat = $lelongBidMarhun->berat; @@ -497,159 +473,163 @@ class MarhunController extends Controller // ->first(); // //->delete(); } - + // if ($perluPengesahan == true) { - // $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) - // ->where('lelongbid_id', $lelongBidMarhun->lelongbid_id) - // ->first(); - - // if(!$pengesahan) - // { + // $pengesahan = Pengesahan::where('lelongbidmarhun_id', $request->idmarhun) + // ->where('lelongbid_id', $lelongBidMarhun->lelongbid_id) + // ->first(); - // $pengesahan = new Pengesahan; - // $pengesahan->lelong_id = $lelong->id; - // $pengesahan->lelongbid_id = $lelongbid->id; - // $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; - // $pengesahan->norujukan = $lelongbid->norujukan; - // $pengesahan->diminta_oleh = $user->id; - // $pengesahan->diminta_pada = $currentdate; - // $pengesahan->status_ubah = 1; - // $pengesahan->save(); + // if(!$pengesahan) + // { - // } else { - // $pengesahan->id; - // $pengesahan->lelong_id = $lelong->id; - // $pengesahan->lelongbid_id = $lelongbid->id; - // $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; - // $pengesahan->norujukan = $lelongbid->norujukan; - // $pengesahan->diminta_oleh = $user->id; - // $pengesahan->diminta_pada = $currentdate; - // $pengesahan->status_ubah = 1; - // $pengesahan->update(); - // } + // $pengesahan = new Pengesahan; + // $pengesahan->lelong_id = $lelong->id; + // $pengesahan->lelongbid_id = $lelongbid->id; + // $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; + // $pengesahan->norujukan = $lelongbid->norujukan; + // $pengesahan->diminta_oleh = $user->id; + // $pengesahan->diminta_pada = $currentdate; + // $pengesahan->status_ubah = 1; + // $pengesahan->save(); + + // } else { + // $pengesahan->id; + // $pengesahan->lelong_id = $lelong->id; + // $pengesahan->lelongbid_id = $lelongbid->id; + // $pengesahan->lelongbidmarhun_id = $lelongBidMarhun->id; + // $pengesahan->norujukan = $lelongbid->norujukan; + // $pengesahan->diminta_oleh = $user->id; + // $pengesahan->diminta_pada = $currentdate; + // $pengesahan->status_ubah = 1; + // $pengesahan->update(); + // } // } // dd($lelongBidMarhun); // $totallelbid = LelongBid::where('id', $lelongBidMarhun->lelongbid_id)->first(); // dd($totallelbid); - return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id])->with('success','Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN'); + return redirect() + ->route('marhun.show', [$lelongbid->id, $lelong->id]) + ->with('success', 'Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN'); } public function show($id, $lelong_id) { + $lelongbid = LelongBid::where('id', '=', $id)->first(); $filemarhun = FileMarhun::where('lelongbid_id', '=', $lelongbid['id']) - ->where('photo_type', '=', '1')->first(); + ->where('photo_type', '=', '1') + ->first(); if (isset($filemarhun)) { - $lelongbid->filemarhun_filename = $filemarhun->filename; + $lelongbid->filemarhun_filename = true; $lelongbid->filemarhun_id = $filemarhun->id; } - $marhun = LelongBidMarhun::with('pengesahan')->where('lelongbid_id', '=', $id)->get(); - // dd($marhun); - foreach ($marhun as $index=>$data) { - $eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $data['id'])->first(); + $marhun = LelongBidMarhun::with( + // ['pengesahan' => function ($query) + // { + // $query->select('norujukan'); + // } + // ] + 'pengesahan', + ) + ->where('lelongbid_id', '=', $id) + ->get(); + foreach ($marhun as $index) { + $eachmarhun = FileMarhun::where('lelongbidmarhun_id', '=', $index['id'])->first(); if (isset($eachmarhun)) { - $data->eachmarhun_filename = $eachmarhun->filename; - $data->eachmarhun_id = $eachmarhun->id; + $index->eachmarhun_filename = route('marhun.showphotomarhun', ['lelong_id' => $lelong_id, 'filemarhun_id' => $eachmarhun]); + $index->eachmarhun_id = $eachmarhun->id; } $status = Pengesahan::where('lelongbid_id', $id) ->where('lelong_id', $lelongbid['lelong_id']) ->first(); // dd($status); - $marhun[$index]['status'] = $status; - // dd($status); + + + $index->status = $status; } - $lelkarat = LelKarat::where('lelong_id','=',$lelongbid->lelong_id)->get(); + + $lelkarat = LelKarat::where('lelong_id', '=', $lelongbid->lelong_id)->get(); $karatall = JenisKarat::all(); $emasall = JenisEmas::all(); return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id','status')); } - - public function senarailelongmarhun(Request $request){ - + public function senarailelongmarhun(Request $request) + { $user = Auth::user(); $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) - ->where('sts_lelong', 0) - ->select('lelong.fasa','lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->get() - ->toArray(); - - foreach($lelong as $info) - { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong.fasa', 'lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong') ->get() ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + foreach ($lelong as $info) { + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); } - return view('marhun.senarailelongmarhun',compact('lelong', 'arrayinfo')); - + return view('marhun.senarailelongmarhun', compact('lelong', 'arrayinfo')); } - public function senaraiLelongTerimaSerah() { $user = Auth::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) - ->where('sts_lelong', 0) - ->get(); - + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->get(); + // $lelong = Lelong::orderBy('id', 'desc')->get(); return view('marhun.senarailelongterimaserah', compact('lelong')); } - public function senarailelongscan(Request $request){ - + public function senarailelongscan(Request $request) + { $user = Auth::user(); $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->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') - ->get() - ->toArray(); - - foreach($lelong as $info) - { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') ->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') ->get() ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + foreach ($lelong as $info) { + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); } - return view('marhun.senarailelongscan',compact('lelong', 'arrayinfo')); - + return view('marhun.senarailelongscan', compact('lelong', 'arrayinfo')); } public function semak($id, $lelong_id) { //$id => lelongbid_id - $lelongbid = LelongBid::where('id','=',$id) - ->where('lelong_id', $lelong_id) - ->first(); - + $lelongbid = LelongBid::where('id', '=', $id) + ->where('lelong_id', $lelong_id) + ->first(); + // $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $id)->get(); - + // foreach($lelongbidmarhun as $lelbidmarhun) // { // if($lelbidmarhun['karat'] == null && $lelbidmarhun['berat'] == null && $lelbidmarhun['harga'] == null && $lelbidmarhun['n_marhun'] == null && $lelbidmarhun['hargaasas'] == null) @@ -667,23 +647,24 @@ class MarhunController extends Controller $lelongbid->status_semak = 1; $lelongbid->save(); - return redirect()->route('marhun.senaraimarhun',[ $lelong_id ]) - ->with('success','Semakan Marhun Berjaya'); + return redirect() + ->route('marhun.senaraimarhun', [$lelong_id]) + ->with('success', 'Semakan Marhun Berjaya'); } public function tambahmarhun(Request $request) { // dd($request->all()); //get request from form and create lelongbidmarhun - $user = Auth::user(); + $user = Auth::user(); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); $lelongbid = LelongBid::where('norujukan', $request->norujukan_marhuntambahan)->first(); - $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); + $lelong = Lelong::where('id', '=', $lelongbid->lelong_id)->first(); - $lelongbidmarhun = new LelongBidMarhun; + $lelongbidmarhun = new LelongBidMarhun(); $lelongbidmarhun->lelongbid_id = $lelongbid->id; $lelongbidmarhun->bil = 1; $lelongbidmarhun->marhun = $request->marhuntambahan; @@ -700,13 +681,13 @@ class MarhunController extends Controller $lelongbidmarhun->hargaasas = $request->harga_asastambahan; $lelongbidmarhun->status_semak = 0; $lelongbidmarhun->save(); - - $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ; + + $lelongbid->marhun = $lelongbid->marhun . '1 ' . $request->marhuntambahan . ','; $lelongbid->berat = $lelongbid->berat + $request->berat_emastambahan; $lelongbid->hargaasas = $lelongbid->hargaasas + $request->harga_asastambahan; $lelongbid->save(); - - $karat = new Pengesahan; + + $karat = new Pengesahan(); $karat->lelong_id = $lelong->id; $karat->lelongbid_id = $lelongbid->id; $karat->lelongbidmarhun_id = $lelongbidmarhun->id; @@ -716,23 +697,22 @@ class MarhunController extends Controller $karat->status_ubah = 2; $karat->save(); - return redirect()->route('marhun.show',[$lelongbid->id,$lelongbid->lelong_id]) - ->with('success','Marhun Berjaya Ditambah'); + return redirect() + ->route('marhun.show', [$lelongbid->id, $lelongbid->lelong_id]) + ->with('success', 'Marhun Berjaya Ditambah'); } - + public function exportmarhundetails($lelong_id) { $user = Auth::user(); //dd($user); - $lelongs= LelongBid::where('lelong_id','=',$lelong_id) - ->where('kodcaw','=',$user['kodcaw']) - ->get() - ->toArray(); + $lelongs = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('kodcaw', '=', $user['kodcaw']) + ->get() + ->toArray(); //dd($lelongs); - - - $arraycaw= []; + $arraycaw = []; $total_berat = 0; $berat = 0; @@ -746,35 +726,26 @@ class MarhunController extends Controller $total_hargaasas = 0; $hargaasas = 0; - foreach($lelongs as $index1=>$lelong){ + foreach ($lelongs as $index1 => $lelong) { + $marhun = LelongBidMarhun::where('lelongbid_id', '=', $lelong['id'])->get(); + $total_berat = $total_berat + $marhun->sum('berat'); + $total_harga = $total_harga + $marhun->sum('harga'); + $total_nmarhun = $total_nmarhun + $marhun->sum('n_marhun'); + $total_hargaasas = $total_hargaasas + $marhun->sum('hargaasas'); - $marhun= LelongBidMarhun::where('lelongbid_id','=',$lelong['id'])->get(); - $total_berat = $total_berat + ($marhun->sum('berat')); - $total_harga = $total_harga + ($marhun->sum('harga')); - $total_nmarhun = $total_nmarhun + ($marhun->sum('n_marhun')); - $total_hargaasas = $total_hargaasas + ($marhun->sum('hargaasas')); - - $lelongs[$index1]['detailmarhun']=$marhun; - + $lelongs[$index1]['detailmarhun'] = $marhun; } - array_push($arraycaw,[ - 'berat'=>$berat, - 'harga'=>$harga, - 'n_marhun'=>$nilai_marhun, - 'hargaasas'=>$hargaasas - + array_push($arraycaw, [ + 'berat' => $berat, + 'harga' => $harga, + 'n_marhun' => $nilai_marhun, + 'hargaasas' => $hargaasas, ]); - + $pdf = PDF::loadView('pdf.marhundetails', compact('lelongs', 'arraycaw', 'total_nmarhun', 'total_berat', 'total_harga', 'total_hargaasas'))->setPaper('a4', 'potrait'); - - $pdf = PDF::loadView('pdf.marhundetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas' - ))->setPaper('a4', 'potrait'); - return $pdf->download('Senarai Marhun.pdf'); - - } public function senlelmarhun() @@ -783,27 +754,25 @@ class MarhunController extends Controller $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) - ->where('sts_lelong', 0) - ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - foreach($lelong as $info) - { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong.fasa', 'lelong_id', 'tarikh_lelong', 'lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong') + ->groupBy('lelong_id') ->get() ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + foreach ($lelong as $info) { + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); } - return view('marhun.senlelmarhun',compact('lelong', 'arrayinfo')); + return view('marhun.senlelmarhun', compact('lelong', 'arrayinfo')); } public function sentangguhlelongsah($lelong_id) @@ -811,28 +780,20 @@ 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(); + $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) - // ->where('lelongbid.status_semak', 1) - ->select('tangguhlelong.id as tangguhlelong_id', - 'tangguhlelong.norujukan', - 'gadai.marhun', - 'gadai.berat', - 'tangguhlelong.ditangguh_pada', - 'tangguhlelong.pinjaman', - 'tangguhlelong.nota' - ) - ->get(); - - return view('marhun.sentangguhlelongsah', compact('sdhdisahkan', 'lelong')); + ->where('gadai.kodcaw', $user['kodcaw']) + ->where('tangguhlelong.lelong_id', $lelong_id) + // ->where('lelongbid.status_semak', 1) + ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.norujukan', 'gadai.marhun', 'gadai.berat', 'tangguhlelong.ditangguh_pada', 'tangguhlelong.pinjaman', 'tangguhlelong.nota') + ->get(); + return view('marhun.sentangguhlelongsah', compact('sdhdisahkan', 'lelong')); } //Khazanah @@ -854,43 +815,41 @@ class MarhunController extends Controller ->get() ->toArray(); // dd($lelong); - - foreach($lelong as $info) - { - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) - ->where('cawangan.caw_code', $user->kodcaw) - ->get() - ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + foreach ($lelong as $info) { + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); } - return view('pengesahan.senarailelongubahmutu',compact('lelong', 'arrayinfo')); + return view('pengesahan.senarailelongubahmutu', compact('lelong', 'arrayinfo')); } - public function sahubahmutu($id){ - - $user = Auth::user(); - $mutumarhun = Pengesahan::join('lelongbid','lelongbid.norujukan','=','pengesahan.norujukan') - ->where('lelongbid.kodcaw', $user->kodcaw) - ->whereNull('disahkan_oleh') - ->whereNull('disahkan_pada') - ->where('pengesahan.lelong_id', $id) - ->whereIn('status_ubah', [1,2,3,4,5,7,8,9,10]) - ->selectRaw('count(*) as total, sum(status) as tstat,pengesahan.norujukan') - ->groupBy('pengesahan.norujukan') - ->get() - ->toArray(); - - foreach($mutumarhun as $index1=>$mutu) - { - $cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id') + public function sahubahmutu($id) + { + $user = Auth::user(); + $mutumarhun = Pengesahan::join('lelongbid', 'lelongbid.norujukan', '=', 'pengesahan.norujukan') ->where('lelongbid.kodcaw', $user->kodcaw) - ->where('lelongbid.lelong_id', $id) - ->where('lelongbid.norujukan', $mutu['norujukan']) - ->select('cawangan.caw_name') - ->first(); - + ->whereNull('disahkan_oleh') + ->whereNull('disahkan_pada') + ->where('pengesahan.lelong_id', $id) + ->whereIn('status_ubah', [1, 2, 3, 4, 5, 7, 8, 9, 10]) + ->selectRaw('count(*) as total, sum(status) as tstat,pengesahan.norujukan') + ->groupBy('pengesahan.norujukan') + ->get() + ->toArray(); + + foreach ($mutumarhun as $index1 => $mutu) { + $cawangan = LelongBid::join('cawangan', 'lelongbid.caw_id', 'cawangan.id') + ->where('lelongbid.kodcaw', $user->kodcaw) + ->where('lelongbid.lelong_id', $id) + ->where('lelongbid.norujukan', $mutu['norujukan']) + ->select('cawangan.caw_name') + ->first(); + $mutumarhun[$index1]['cawangan_name'] = $cawangan['caw_name']; } @@ -905,7 +864,6 @@ class MarhunController extends Controller // } return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); - } public function mutumarhun($norujukan, $id) @@ -914,47 +872,20 @@ class MarhunController extends Controller $lelbidmarhuns = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbid.lelong_id', $id) ->where('lelongbid.norujukan', $norujukan) - ->select( - 'lelongbidmarhun.id as lelongbidmarhun_id', - 'lelongbid.id as lelongbid_id', - 'lelongbidmarhun.bil', - 'lelongbidmarhun.marhun', - 'lelongbidmarhun.nota', - 'lelongbidmarhun.karat', - 'lelongbidmarhun.berat', - 'lelongbidmarhun.harga', - 'lelongbidmarhun.n_marhun', - 'lelongbidmarhun.hargaasas', - 'lelongbidmarhun.status_semak', - 'lelongbid.lelong_id', - 'lelongbid.caw_id', - 'lelongbid.kodcaw', - 'lelongbid.norujukan', - 'lelongbid.t_lelong', - 'lelongbid.jbg', - 'lelongbid.kadarupah', - 'lelongbid.upahsimpan', - 'lelongbid.bakiupah', - 'lelongbid.ansuran', - 'lelongbid.nilaimarhun', - 'lelongbid.pinjaman', - 'lelongbid.bakiupah', - 'lelongbid.cajlelong', - 'lelongbid.baki', - 'lelongbid.percent' - ) + ->select('lelongbidmarhun.id as lelongbidmarhun_id', 'lelongbid.id as lelongbid_id', 'lelongbidmarhun.bil', 'lelongbidmarhun.marhun', 'lelongbidmarhun.nota', 'lelongbidmarhun.karat', 'lelongbidmarhun.berat', 'lelongbidmarhun.harga', 'lelongbidmarhun.n_marhun', 'lelongbidmarhun.hargaasas', 'lelongbidmarhun.status_semak', 'lelongbid.lelong_id', 'lelongbid.caw_id', 'lelongbid.kodcaw', 'lelongbid.norujukan', 'lelongbid.t_lelong', 'lelongbid.jbg', 'lelongbid.kadarupah', 'lelongbid.upahsimpan', 'lelongbid.bakiupah', 'lelongbid.ansuran', 'lelongbid.nilaimarhun', 'lelongbid.pinjaman', 'lelongbid.bakiupah', 'lelongbid.cajlelong', 'lelongbid.baki', 'lelongbid.percent') ->get(); $arraygadai = $lelbidmarhuns->pluck('norujukan')->toArray(); $datagadai = $lelbidmarhuns; - - $gadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) - ->get()->toArray(); + $gadai = GadaiMarhun::on($datagadai[0]['kodcaw']) + ->whereIn('norujukan', $arraygadai) + ->get() + ->toArray(); foreach ($gadai as $index2 => $gadai2) { - - $listgadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) + $listgadai = GadaiMarhun::on($datagadai[0]['kodcaw']) + ->whereIn('norujukan', $arraygadai) ->get(); // dd($listgadai); @@ -964,11 +895,12 @@ class MarhunController extends Controller $arraylelbidmarhun = []; $bakilelong = 0; $rugilelong = 0; - + foreach ($lelbidmarhuns as $lelbidmarhun) { $marhuns = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) ->where('id', $lelbidmarhun->lelongbidmarhun_id) - ->get()->toArray(); + ->get() + ->toArray(); $marhunsdet = LelongBidMarhun::where('lelongbid_id', $lelbidmarhun->lelongbid_id) // ->where('id', $lelbidmarhun->lelongbidmarhun_id) @@ -989,22 +921,21 @@ class MarhunController extends Controller ->where('lelongbid.lelong_id', $id) ->first(); - $karat = Lelkarat::where('lelong_id', $id)->get(); // dd($id); foreach ($marhuns as $index1 => $marhun) { // dd($lelbidmarhun); - + $status = Pengesahan::where('lelongbidmarhun_id', $lelbidmarhun->lelongbidmarhun_id) ->where('lelongbid_id', $marhun['lelongbid_id']) - ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') + ->select('id as sahid', 'status_ubah', 'request_karat', 'request_berat', 'request_marhun') ->first(); - // dd($status); - // dump($lelbidmarhun->lelongbidmarhun_id); - if($status){ - if($status->status_ubah == 8 )//jika mutu,berat dan marhun - { + // dd($status); + // dump($lelbidmarhun->lelongbidmarhun_id); + if ($status) { + if ($status->status_ubah == 8) { + //jika mutu,berat dan marhun // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $status['request_karat']) @@ -1013,9 +944,8 @@ class MarhunController extends Controller $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); // dump($lelbidmarhun->lelongbidmarhun_id); - } - else if($status->status_ubah == 10)//jika berat dan marhun - { + } elseif ($status->status_ubah == 10) { + //jika berat dan marhun // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $marhun['karat']) @@ -1024,9 +954,8 @@ class MarhunController extends Controller $newhargaasas = round($status['request_berat'] * $marhun['harga'], 1); // dd($newhargaasas); - } - else if($status->status_ubah == 9)//jika mutu dan marhun - { + } elseif ($status->status_ubah == 9) { + //jika mutu dan marhun // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $status['request_karat']) @@ -1035,19 +964,16 @@ class MarhunController extends Controller $newhargaasas = round($marhun['berat'] * $getkaratnew['harga2']); // dd($newhargaasas); - } - - elseif ($status->status_ubah == 7) //jika ubah marhun - { + } elseif ($status->status_ubah == 7) { + //jika ubah marhun $getkaratnew = LelKarat::where('karat', $marhun['karat']) - ->where('lelong_id', $id) - ->first(); + ->where('lelong_id', $id) + ->first(); // dd($getkaratnew); $newhargaasas = round($marhun['berat'] * $marhun['harga']); // dd($newhargaasas); - } - elseif($status->status_ubah == 5)//jika mutu dan berat berubah - { + } elseif ($status->status_ubah == 5) { + //jika mutu dan berat berubah // dd($status['request_karat']); // if($status['request']) $getkaratnew = LelKarat::where('karat', $status['request_karat']) @@ -1056,9 +982,8 @@ class MarhunController extends Controller $newhargaasas = round($status['request_berat'] * $getkaratnew['harga2']); // dd($newhargaasas); - } - elseif($status->status_ubah == 1)//jika karat berubah - { + } elseif ($status->status_ubah == 1) { + //jika karat berubah $getkaratnew = LelKarat::where('karat', $status['request_karat']) ->where('lelong_id', $id) ->first(); @@ -1082,61 +1007,56 @@ class MarhunController extends Controller { // dd($marhun['berat']); $getkaratnew = LelKarat::where('karat', $marhun['karat']) - ->where('lelong_id', $id) - ->first(); - $newhargaasas = 0.00; - } - else - { + ->where('lelong_id', $id) + ->first(); + $newhargaasas = 0.0; + } else { $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); $newhargaasas = round($marhun['berat'] * $marhun['harga']); } - + $marhuns[$index1]['status_ubah'] = $status; - } - else{ //jika tiada $status + } else { + //jika tiada $status $getkaratnew = LelKarat::where('karat', $marhun['karat']) ->where('lelong_id', $id) ->first(); $newhargaasas = round($marhun['berat'] * $marhun['harga']); } // dump($newhargaasas); - - - $totalnewhargaasas = $totalnewhargaasas + $newhargaasas; + + $totalnewhargaasas = $totalnewhargaasas + $newhargaasas; $lelong = Lelong::where('id', $id)->get(); - $sumcajlelong = $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100); + $sumcajlelong = $totalnewhargaasas * ($lelong[0]['cajlelong'] / 100); $totalbaki = $totalnewhargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong, 1, 1); // dd($totalnewhargaasas); if ($totalbaki > 0) { $bakilelong = $totalbaki; - $rugilelong = 0.00; - } else if ($totalbaki < 0) { + $rugilelong = 0.0; + } elseif ($totalbaki < 0) { $rugilelong = $totalbaki; - $bakilelong = 0.00; + $bakilelong = 0.0; } - $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun']; - $marhuns[$index1]['old_marhun'] = $marhun['marhun']; - $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; - $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; - $marhuns[$index1]['karatnew'] = $getkaratnew; - $marhuns[$index1]['newhargaasas'] = $newhargaasas; - $marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas; - $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; - $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; - $marhuns[$index1]['baki_lelong'] = $bakilelong; - $marhuns[$index1]['rugi_lelong'] = $rugilelong; - $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1); + $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun']; + $marhuns[$index1]['old_marhun'] = $marhun['marhun']; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; + $marhuns[$index1]['karatnew'] = $getkaratnew; + $marhuns[$index1]['newhargaasas'] = $newhargaasas; + $marhuns[$index1]['totalnewhargaasas'] = $totalnewhargaasas; + $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; + $marhuns[$index1]['baki_lelong'] = $bakilelong; + $marhuns[$index1]['rugi_lelong'] = $rugilelong; + $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong, 1, 1); } - + array_push($arraylelbidmarhun, $marhuns); // dd($arraylelbidmarhun); - - - } + } // dd($lelbidmarhun->lelongbidmarhun_id); // dd($totalnewhargaasas); return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns', 'gadai')); @@ -1381,7 +1301,7 @@ class MarhunController extends Controller { //update mutu marhun - gadaimarhun // dd($request->all()); - $user = Auth::user(); + $user = Auth::user(); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); @@ -1401,23 +1321,21 @@ class MarhunController extends Controller // $lelongbid = LelongBid::where('id', $sah['lelongbid_id'])->first(); // } - if ($request->jenis_button == "terima") { + if ($request->jenis_button == 'terima') { foreach ($pengesahan as $terimalel) { - $lelongbidmarhuns = LelongBidMarhun::where('lelongbidmarhun.id', $terimalel['lelongbidmarhun_id']) - ->first(); + $lelongbidmarhuns = LelongBidMarhun::where('lelongbidmarhun.id', $terimalel['lelongbidmarhun_id'])->first(); // dd($lelongbidmarhuns); - // foreach ($lelongbidmarhuns as $bidmarhuns) { - // dd($bidmarhuns->old_berat); - if ($terimalel->status_ubah == 3) //hapus marhun - { - $deletemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id) - ->where('lelongbid_id', $terimalel->lelongbid_id) - ->delete(); - } else if ($terimalel->status_ubah == 1) //ubah karat - { - $getkarat = LelKarat::where('karat', $terimalel->request_karat) + // dd($bidmarhuns->old_berat); + if ($terimalel->status_ubah == 3) { + //hapus marhun + $deletemarhun = LelongBidMarhun::where('id', $terimalel->lelongbidmarhun_id) + ->where('lelongbid_id', $terimalel->lelongbid_id) + ->delete(); + } elseif ($terimalel->status_ubah == 1) { + //ubah karat + $getkarat = LelKarat::where('karat', $terimalel->request_karat) ->where('lelong_id', $request->lelong_id) ->first(); $nilaimarhunnew = $lelongbidmarhuns->berat * $getkarat->harga2; @@ -1553,45 +1471,42 @@ class MarhunController extends Controller $itemmarhun = LelongBidMarhun::where('lelongbid_id', $terimalel['lelongbid_id'])->get(); $updatelelongbid = LelongBid::where('id', $terimalel['lelongbid_id']) - ->where('id', $request->lelongbid_id) - ->first(); + ->where('id', $request->lelongbid_id) + ->first(); $updatelelongbid->berat = $itemmarhun->sum('berat'); $updatelelongbid->hargaasas = $itemmarhun->sum('hargaasas'); $updatelelongbid->status_semak = '1'; $updatelelongbid->update(); } - + } elseif ($request->jenis_button == 'tidaksah') { + $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id) + ->where('lelong_id', $request->lelong_id) + ->where('norujukan', $request->norujukan) + ->delete(); } - elseif ($request->jenis_button == "tidaksah"){ - $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id) - ->where('lelong_id', $request->lelong_id) - ->where('norujukan', $request->norujukan) - ->delete(); - - } - - return redirect()->route('pengesahan.senarailelongubahmutu')->with('success', 'Pengesahan Mutu Marhun Berjaya'); + return redirect() + ->route('pengesahan.senarailelongubahmutu') + ->with('success', 'Pengesahan Mutu Marhun Berjaya'); } - public function submitdelete(Request $request){ - + public function submitdelete(Request $request) + { // dd($request->all()); - $user = Auth::user(); - + $user = Auth::user(); + $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbidmarhun.id','=',$request->lelongbidmarhun_id) - ->where('lelongbid.id', $request->lelongbid_id) - ->first(); + ->where('lelongbidmarhun.id', '=', $request->lelongbidmarhun_id) + ->where('lelongbid.id', $request->lelongbid_id) + ->first(); $id = $request->lelongbid_id; $lelong_id = $marhun->lelong_id; - - $pengesahan = new Pengesahan; + + $pengesahan = new Pengesahan(); $pengesahan->lelong_id = $marhun->lelong_id; $pengesahan->lelongbid_id = $request->lelongbid_id; $pengesahan->lelongbidmarhun_id = $request->lelongbidmarhun_id; @@ -1601,134 +1516,100 @@ class MarhunController extends Controller $pengesahan->status_ubah = 3; $pengesahan->save(); - return redirect()->route('marhun.show', compact('id', 'lelong_id')) - ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar'); - + return redirect() + ->route('marhun.show', compact('id', 'lelong_id')) + ->with('success', 'Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar'); } - public function senarailelong() { $arrayinfo = []; - + // $lelong = Lelong::join('tangguhlelong','lelong.id','=','tangguhlelong.lelong_id') // ->select('tangguhlelong.norujukan','tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') // ->distinct() // ->get() // ->toArray(); - - $lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id') - ->select('tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') - ->distinct() - ->orderBy('lelong_id') - ->get() - ->toArray(); + $lelong = TangguhLelong::join('lelong', 'lelong.id', '=', 'tangguhlelong.lelong_id') + ->select('tangguhlelong.lelong_id', 'lelong.id', 'lelong.tarikh_lelong', 'lelong.masatamat_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'sts_lelong') + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); // dd($lelong); - foreach($lelong as $details) - { - + foreach ($lelong as $details) { // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - + // ->where('cawangan_lelong.lelong_id', $details['id']) // ->distinct() // ->get() // ->toArray(); - $detailsinfo = CawanganLelong::select('tangguhlelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') - ->where('tangguhlelong.lelong_id', $details['id']) - // ->where('tangguhlelong.norujukan', $details['norujukan']) - ->distinct() - ->orderBy('lelong_id') - ->get() - ->toArray(); + $detailsinfo = CawanganLelong::select('tangguhlelong.lelong_id', 'cawangan_lelong.caw_id', 'caw_name', 'caw_code') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->join('tangguhlelong', 'tangguhlelong.lelong_id', '=', 'cawangan_lelong.lelong_id') + ->where('tangguhlelong.lelong_id', $details['id']) + // ->where('tangguhlelong.norujukan', $details['norujukan']) + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); // dd($detailsinfo); - - array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + + array_push($arrayinfo, ['detail' => $details, 'detailsinfo' => $detailsinfo]); } - return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); + return view('pengesahan.senarailelong', compact('lelong', 'arrayinfo')); } public function senaraitangguhlelong($id, $caw_code) { - // dd($id); + // dd($id); $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') - ->where('tangguhlelong.norujukan', 'like', "%$caw_code%") - ->where('tangguhlelong.lelong_id', $id) - ->whereNotNull('tangguhlelong.tarikhtangguh') - ->select('tangguhlelong.id as tangguhlelong_id', - 'tangguhlelong.lelongbid_id', - 'tangguhlelong.norujukan', - 'tangguhlelong.tarikhtangguh', - 'tangguhlelong.ditangguh_pada', - 'tangguhlelong.ditangguh_oleh', - 'tangguhlelong.nota', - 'lelong.id as lelong_id', - 'lelong.tarikh_lelong', - 'lelong.harga_emas_asas', - 'lelong.jbg', - 'lelong.cajlelong', - 'lelong.sts_lelong' - ) - ->get(); + ->where('tangguhlelong.norujukan', 'like', "%$caw_code%") + ->where('tangguhlelong.lelong_id', $id) + ->whereNotNull('tangguhlelong.tarikhtangguh') + ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelongbid_id', 'tangguhlelong.norujukan', 'tangguhlelong.tarikhtangguh', 'tangguhlelong.ditangguh_pada', 'tangguhlelong.ditangguh_oleh', 'tangguhlelong.nota', 'lelong.id as lelong_id', 'lelong.tarikh_lelong', 'lelong.harga_emas_asas', 'lelong.jbg', 'lelong.cajlelong', 'lelong.sts_lelong') + ->get(); //dd($tangguhlelong); - - foreach($tangguhlelong as $index1=>$tanguhlel) - { + + foreach ($tangguhlelong as $index1 => $tanguhlel) { $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') - ->where('lelong_id', $id) - ->where('kodcaw', $caw_code) - ->select('cawangan.caw_name') - ->first(); - + ->where('lelong_id', $id) + ->where('kodcaw', $caw_code) + ->select('cawangan.caw_name') + ->first(); + $tangguhlelong[$index1]['details'] = $tanguhlel; // $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; } - - return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_code')); + + return view('pengesahan.senaraitangguhlelong', compact('tangguhlelong', 'id', 'caw_code')); } - + public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) { $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') - ->where('gadaimarhun.norujukan', $norujukan) - ->where('tangguhlelong.id', $tangguhlelong_id) - // ->where('tangguhlelong.lelong_id', $id) - ->select('tangguhlelong.id as tangguhlelong_id', - 'tangguhlelong.lelong_id', - 'tangguhlelong.lelongbid_id', - 'tangguhlelong.norujukan', - 'tangguhlelong.pinjaman', - 'tangguhlelong.tarikhtangguh', - 'tangguhlelong.nota as tangguh_nota', - 'tangguhlelong.pinjaman', - 'gadaimarhun.bil', - 'gadaimarhun.marhun', - 'gadaimarhun.nota as gadai_nota', - 'gadaimarhun.karat', - 'gadaimarhun.berat', - 'gadaimarhun.harga', - 'gadaimarhun.n_marhun' - ) - ->get(); + ->where('gadaimarhun.norujukan', $norujukan) + ->where('tangguhlelong.id', $tangguhlelong_id) + // ->where('tangguhlelong.lelong_id', $id) + ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelong_id', 'tangguhlelong.lelongbid_id', 'tangguhlelong.norujukan', 'tangguhlelong.pinjaman', 'tangguhlelong.tarikhtangguh', 'tangguhlelong.nota as tangguh_nota', 'tangguhlelong.pinjaman', 'gadaimarhun.bil', 'gadaimarhun.marhun', 'gadaimarhun.nota as gadai_nota', 'gadaimarhun.karat', 'gadaimarhun.berat', 'gadaimarhun.harga', 'gadaimarhun.n_marhun') + ->get(); // dd($tangguhlelong); - + $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') - ->where('gadaimarhun.norujukan', $norujukan) - ->select('cawangan.caw_name', 'cawangan.caw_code') - ->first(); + ->where('gadaimarhun.norujukan', $norujukan) + ->select('cawangan.caw_name', 'cawangan.caw_code') + ->first(); // dd($caw_names); - - return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); - + + return view('pengesahan.lelbidmarhun', compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); } - public function listsahubahmutu($id){ - - $user = Auth::user(); + public function listsahubahmutu($id) + { + $user = Auth::user(); $cawangan = Pengesahan::where('pengesahan.lelong_id', $id) ->where('pengesahan.status', 1) @@ -1739,8 +1620,7 @@ class MarhunController extends Controller ->get(); // dd($cawangan); - foreach($cawangan as $index1=>$caw) - { + foreach ($cawangan as $index1 => $caw) { // dd($caw); $getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first(); @@ -1769,12 +1649,11 @@ class MarhunController extends Controller } return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id')); - } public function terimaserahmarhun($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code) @@ -1809,15 +1688,17 @@ class MarhunController extends Controller // dd($sedangDinilai->norujukan); if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) { - return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id')); + return view('marhun.terimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah', 'lelong_id')); } else { - return redirect()->route('marhun.senarailelongterimaserah')->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.'); + return redirect() + ->route('marhun.senarailelongterimaserah') + ->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.'); } } public function terimaMarhun(Request $request) { - $user = Auth::user(); + $user = Auth::user(); $current = Carbon::now(); foreach ($request->scanKeluar_id as $index) { @@ -1826,12 +1707,14 @@ class MarhunController extends Controller $terimaMarhun->terima_marhun = $current->toDateTimeString(); $terimaMarhun->update(); } - return redirect()->route('marhun.terimaserahmarhun', $terimaMarhun->lelong_id)->with('success', 'Terima Marhun Berjaya Direkodkan'); + return redirect() + ->route('marhun.terimaserahmarhun', $terimaMarhun->lelong_id) + ->with('success', 'Terima Marhun Berjaya Direkodkan'); } public function serahMarhun(Request $request) { - $user = Auth::user(); + $user = Auth::user(); $current = Carbon::now(); foreach ($request->sedangDinilai_id as $index) { @@ -1839,12 +1722,14 @@ class MarhunController extends Controller $serahMarhun->serah_marhun = $current->toDateTimeString(); $serahMarhun->update(); } - return redirect()->route('marhun.terimaserahmarhun', $serahMarhun->lelong_id)->with('success', 'Serah Marhun Berjaya Direkodkan'); + return redirect() + ->route('marhun.terimaserahmarhun', $serahMarhun->lelong_id) + ->with('success', 'Serah Marhun Berjaya Direkodkan'); } public function listScanBarcode($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); @@ -1863,7 +1748,9 @@ class MarhunController extends Controller $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray(); $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar); - $new_lelong_bid = LelongBid::with('scanSemakSelesai')->whereIn('id', $diff_lelong_bid)->get(); + $new_lelong_bid = LelongBid::with('scanSemakSelesai') + ->whereIn('id', $diff_lelong_bid) + ->get(); return view('marhun.scanbarcode', compact('lelong_id', 'lelongDetail', 'new_lelong_bid', 'senaraiScanKeluar')); } @@ -1952,14 +1839,15 @@ class MarhunController extends Controller return redirect()->route('marhun.scanbarcode', $request->lelong_id) ->with('success', 'Marhun Berjaya Di Scan Keluar Dari Peti Besi.'); } else { - return redirect()->route('marhun.scanbarcode', $request->lelong_id) + return redirect() + ->route('marhun.scanbarcode', $request->lelong_id) ->with('failed', 'Marhun Sudah Berada Di Luar Peti Besi.'); } } public function scanMasukMarhun(Request $request) { - $user = Auth::user(); + $user = Auth::user(); $current = Carbon::now(); $scanMasuk = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) @@ -1982,61 +1870,35 @@ class MarhunController extends Controller public function addPhotoMarhun(Request $request) { - $data = base64_encode($request->gambarMarhun->get()); - $file_type = $request->gambarMarhun->extension(); + $this->marhunPhotoService->store($request); - $addfile = new FileMarhun(); - $addfile->lelongbid_id = $request->lelongbid_id; - $addfile->file_type = $file_type; - $addfile->filename = $data; - if ($request->photo_type == 1) { - $addfile->photo_type = 1; - $addfile->save(); - } else if ($request->photo_type == 2) { - $addfile->photo_type = 2; - $addfile->lelongbidmarhun_id = $request->lelongbidmarhun_id; - $addfile->save(); - } - return redirect()->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) + return redirect() + ->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) ->with('success', 'Gambar Berjaya Di Simpan.'); } public function deletePhotoMarhun(Request $request) { - $deleteFile = FileMarhun::where('id', '=', $request->filemarhun_id)->first(); - $deleteFile->delete(); + $this->marhunPhotoService->delete($request); - return redirect()->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) + return redirect() + ->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) ->with('success', 'Gambar Berjaya Di Padam.'); } public function updatePhotoMarhun(Request $request) { - $data = base64_encode($request->gambarMarhun->get()); - $file_type = $request->gambarMarhun->extension(); + $this->marhunPhotoService->delete($request); + $this->marhunPhotoService->store($request); - $addfile = new FileMarhun(); - $addfile->lelongbid_id = $request->lelongbid_id; - $addfile->file_type = $file_type; - $addfile->filename = $data; - if ($request->photo_type == 1) { - $addfile->photo_type = 1; - $addfile->save(); - } else if ($request->photo_type == 2) { - $addfile->photo_type = 2; - $addfile->lelongbidmarhun_id = $request->lelongbidmarhun_id; - $addfile->save(); - } - $deleteFile = FileMarhun::where('id', '=', $request->filemarhun_id)->first(); - $deleteFile->delete(); - - return redirect()->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) + return redirect() + ->route('marhun.show', [$request->lelongbid_id, $request->lelong_id]) ->with('success', 'Gambar Berjaya Di Tukar.'); } public function cetakkeluarscanbarcode($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); @@ -2056,31 +1918,29 @@ class MarhunController extends Controller ->orderBy('id', 'desc') ->get(); - //get staf cwgn roles harian - $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'penilai' + //get staf cwgn roles harian + $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'penilai', ])->json(); - - $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'khazanah' + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'khazanah', ])->json(); - $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'pc' + $roles_harian_pc = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'pc', ])->json(); // dd($roles_harian_penilai); // return view('pdf.cetakkeluarscanbarcode', compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc')); - $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc' - ))->setPaper('a4', 'potrait'); - + $pdf = PDF::loadView('pdf.cetakkeluarscanbarcode', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk', 'roles_harian_penilai', 'roles_harian_khazanah', 'roles_harian_pc'))->setPaper('a4', 'potrait'); + return $pdf->download('Senarai Keluar Peti Besi.pdf'); } public function cetakmasukscanbarcode($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); @@ -2099,29 +1959,27 @@ class MarhunController extends Controller ->whereNotNull('scan_masuk') ->orderBy('id', 'desc') ->get(); - - $roles_harian_penilai = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'penilai' - ])->json(); - - - $roles_harian_khazanah = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'khazanah' - ])->json(); - - $roles_harian_pc = Http::get(config('app.api_url_kaunter').'api/roles_harian/' . $user->kodcaw ,[ - 'role_harian' => 'pc' - ])->json(); + + $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'penilai', + ])->json(); + + $roles_harian_khazanah = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'khazanah', + ])->json(); + + $roles_harian_pc = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/' . $user->kodcaw, [ + 'role_harian' => 'pc', + ])->json(); // return view('pdf.cetakmasukscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); - $pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc' - ))->setPaper('a4', 'potrait'); - + $pdf = PDF::loadView('pdf.cetakmasukscanbarcode', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk', 'roles_harian_penilai', 'roles_harian_khazanah', 'roles_harian_pc'))->setPaper('a4', 'potrait'); + return $pdf->download('Senarai Masuk Peti Besi.pdf'); } public function cetakterimaserahmarhun($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $senaraiScanKeluar = ScanSemak::where('kodcaw', '=', $caw->caw_code) @@ -2145,46 +2003,43 @@ class MarhunController extends Controller if ($senaraiScanKeluar || $sedangDinilai || $sudahSerah) { // return view('pdf.cetakterimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id','caw')); - $pdf = PDF::loadView('pdf.cetakterimaserahmarhun',compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah','lelong_id','caw' - ))->setPaper('a4', 'potrait'); + $pdf = PDF::loadView('pdf.cetakterimaserahmarhun', compact('senaraiScanKeluar', 'sedangDinilai', 'sudahSerah', 'lelong_id', 'caw'))->setPaper('a4', 'potrait'); return $pdf->download('Laporan Serahan Marhun.pdf'); } else { - return redirect()->route('marhun.senarailelongterimaserah')->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.'); + return redirect() + ->route('marhun.senarailelongterimaserah') + ->with('failed', 'Tiada Surat Untuk Dilelong Pada Tarikh Ini.'); } } - public function senarailelongscanjual(Request $request){ - + public function senarailelongscanjual(Request $request) + { $user = Auth::user(); $arrayinfo = []; - $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) - ->where('sts_lelong', 3) - ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->get() - ->toArray(); - - foreach($lelong as $info) - { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 3) + ->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong') ->get() ->toArray(); - array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + foreach ($lelong as $info) { + $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong_id', $info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) + ->get() + ->toArray(); + array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]); } - return view('marhun.senarailelongscanjual',compact('lelong', 'arrayinfo')); - + return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo')); } public function listScanBarcodejual($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); @@ -2200,13 +2055,11 @@ class MarhunController extends Controller ->get(); // dd($senaraiScanKeluar); - return view('marhun.scanbarcodejual', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar')); } public function scanKeluarMarhunjual(Request $request) { - - $user = Auth::user(); + $user = Auth::user(); $current = Carbon::now(); $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode) @@ -2237,17 +2090,19 @@ class MarhunController extends Controller $scanJualKeluar->serahkpdpembida = 1; $scanJualKeluar->save(); - return redirect()->route('marhun.scanbarcodejual', $request->lelong_id) + return redirect() + ->route('marhun.scanbarcodejual', $request->lelong_id) ->with('success', 'Marhun Berjaya Di Scan Keluar Serahan Kepada Pembida.'); } else { - return redirect()->route('marhun.scanbarcodejual', $request->lelong_id) + return redirect() + ->route('marhun.scanbarcodejual', $request->lelong_id) ->with('failed', 'Maaf,Marhun Telah Serah Kepada Pembida.'); } } public function cetakkeluarscanbarcodejual($lelong_id) { - $user = Auth::user(); + $user = Auth::user(); $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); $lelongDetail = Lelong::where('id', '=', $lelong_id)->first(); @@ -2262,26 +2117,22 @@ class MarhunController extends Controller ->orderBy('id', 'desc') ->get(); // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw')); - $pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejual',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar' - ))->setPaper('a4', 'potrait'); - + $pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejual', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'))->setPaper('a4', 'potrait'); + return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf'); } - public function senaraiscanbarcode(Request $request){ - + public function senaraiscanbarcode(Request $request) + { $auth_user = Auth::user(); - - $auth_user = ScanSemak::where('kodcaw','=',$auth_user['kodcaw'] ) - ->get(); - return view('marhun.senaraiscanbarcode', compact('auth_user','auth_user')); - + $auth_user = ScanSemak::where('kodcaw', '=', $auth_user['kodcaw'])->get(); + + return view('marhun.senaraiscanbarcode', compact('auth_user', 'auth_user')); } public function cetakscanbarcode(Request $request) { - $auth_user = Auth::user(); $current = Carbon::now(); $current = new Carbon(); @@ -2320,86 +2171,94 @@ class MarhunController extends Controller ->get(); return view('pdf.laporanscanmasuk', compact('scan','auth_user','tarikh_cetak','cawangan')); - } - else if($request->jenis == 'pembida'){ - $scan=ScanJual::where('scan_jual.kodcaw','=',$kodcaw) - ->join('users','scan_jual.khazanah_id','=','users.id') - ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]]) - ->where('serahkpdpembida','=',1) - ->get(); + $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first(); - return view('pdf.laporanscanserahpembida', compact('scan','auth_user','tarikh_cetak','cawangan')); + if ($request->jenis == 'keluar') { + $scan = ScanSemak::where('scan_semak.kodcaw', '=', $kodcaw) + ->join('users', 'scan_semak.khazanah_id', '=', 'users.id') + ->where([['scan_keluar', '>=', $request->datemula], ['scan_keluar', '<=', $request->datehingga]]) + ->get(); + return view('pdf.laporanscankeluar', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); + } elseif ($request->jenis == 'masuk') { + $scan = ScanSemak::where('scan_semak.kodcaw', '=', $kodcaw) + ->join('users', 'scan_semak.khazanah_id', '=', 'users.id') + ->where([['scan_masuk', '>=', $request->datemula], ['scan_masuk', '<=', $request->datehingga]]) + ->get(); + // dd($scan); + + return view('pdf.laporanscanmasuk', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); + } elseif ($request->jenis == 'pembida') { + $scan = ScanJual::where('scan_jual.kodcaw', '=', $kodcaw) + ->join('users', 'scan_jual.khazanah_id', '=', 'users.id') + ->where([['serah_marhun', '>=', $request->datemula], ['serah_marhun', '<=', $request->datehingga]]) + ->where('serahkpdpembida', '=', 1) + ->get(); + + return view('pdf.laporanscanserahpembida', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); } } - public function senaraiterimaserah(Request $request){ - + public function senaraiterimaserah(Request $request) + { $auth_user = Auth::user(); - - $auth_user = ScanSemak::where('kodcaw','=',$auth_user['kodcaw'] ) - ->get(); - return view('marhun.senaraiterimaserah', compact('auth_user','auth_user')); - + $auth_user = ScanSemak::where('kodcaw', '=', $auth_user['kodcaw'])->get(); + + return view('marhun.senaraiterimaserah', compact('auth_user', 'auth_user')); } public function cetakterimaserah(Request $request) { - $auth_user = Auth::user(); $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datemula == null){ + if ($request->datemula == null) { $mula_date = '2017-01-01'; - }else{ + } else { $split_date = explode('-', $request->datemula); $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - if($request->datehingga == null){ + if ($request->datehingga == null) { $hingga_date = $current->toDateString(); - }else{ + } else { $split_date = explode('-', $request->datehingga); $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + $kodcaw = $auth_user['kodcaw']; - $cawangan = Cawangan::where('caw_code','=',$kodcaw) - ->first(); + $cawangan = Cawangan::where('caw_code', '=', $kodcaw)->first(); - if($request->jenis == 'terima') - { - $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) - ->join('users','scan_semak.penilai_id','=','users.id') - ->where([['terima_marhun','>=',$request->datemula],['terima_marhun','<=',$request->datehingga]]) - ->get(); + if ($request->jenis == 'terima') { + $scan = ScanSemak::where('scan_semak.kodcaw', '=', $kodcaw) + ->join('users', 'scan_semak.penilai_id', '=', 'users.id') + ->where([['terima_marhun', '>=', $request->datemula], ['terima_marhun', '<=', $request->datehingga]]) + ->get(); - return view('pdf.laporanscanterima', compact('scan','auth_user','tarikh_cetak','cawangan')); + return view('pdf.laporanscanterima', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); + } elseif ($request->jenis == 'serah') { + $scan = ScanSemak::where('scan_semak.kodcaw', '=', $kodcaw) + ->join('users', 'scan_semak.penilai_id', '=', 'users.id') + ->where([['serah_marhun', '>=', $request->datemula], ['serah_marhun', '<=', $request->datehingga]]) + ->get(); + // dd($scan); + return view('pdf.laporanscanserah', compact('scan', 'auth_user', 'tarikh_cetak', 'cawangan')); } - - else if($request->jenis == 'serah'){ - - $scan=ScanSemak::where('scan_semak.kodcaw','=',$kodcaw) - ->join('users','scan_semak.penilai_id','=','users.id') - ->where([['serah_marhun','>=',$request->datemula],['serah_marhun','<=',$request->datehingga]]) - ->get(); - // dd($scan); - - return view('pdf.laporanscanserah', compact('scan','auth_user','tarikh_cetak','cawangan')); - - } - - + } + public function showPhotoMarhun(Request $request) + { + $marhun = FileMarhun::where('id', '=', $request->filemarhun_id)->first(); + return $this->marhunPhotoService->show($request->lelong_id, $marhun); } diff --git a/app/Services/MarhunPhotoService.php b/app/Services/MarhunPhotoService.php new file mode 100644 index 00000000..802ebdf9 --- /dev/null +++ b/app/Services/MarhunPhotoService.php @@ -0,0 +1,91 @@ +gambarMarhun->extension(); + + $addfile = new FileMarhun(); + $addfile->lelongbid_id = $request->lelongbid_id; + $addfile->file_type = $file_type; + if ($request->photo_type == 1) { + $addfile->photo_type = 1; + $addfile->save(); + } elseif ($request->photo_type == 2) { + $addfile->photo_type = 2; + $addfile->lelongbidmarhun_id = $request->lelongbidmarhun_id; + $addfile->save(); + } + + $no_rujukan_sag = LelongBid::select('norujukan')->where('lelong_id', $request->lelong_id)->first()->norujukan; + $photo_type_name = $request->photo_type === '1' ? 'overall_photo' : 'by_marhun_photo'; + + $directory = "/{$no_rujukan_sag}/{$photo_type_name}/"; + $imageExtension = $request->file('gambarMarhun')->getClientOriginalExtension(); + + $marhunImageFileName = "overall.{$imageExtension}"; + + if (!empty($request->lelongbidmarhun_id)) { + $marhunImageFileName = "$request->lelongbidmarhun_id.$imageExtension"; + } + + Storage::disk('marhun')->putFileAs($directory, $request->gambarMarhun, $marhunImageFileName); + } + + public function delete(Request $request) + { + $deleteFile = FileMarhun::where('id', '=', $request->filemarhun_id)->first(); + + $no_rujukan_sag = LelongBid::select('norujukan')->where('lelong_id', $request->lelong_id)->first()->norujukan; + $photo_type_name = $request->photo_type === '1' ? 'overall_photo' : 'by_marhun_photo'; + + $directory = "/{$no_rujukan_sag}/{$photo_type_name}/"; + $imageExtension = $deleteFile->file_type; + + $marhunImageFileName = "overall.{$imageExtension}"; + + $lelongbidmarhun_id = $deleteFile->lelongbidmarhun_id; + + if (!empty($request->lelongbidmarhun_id)) { + $marhunImageFileName = "$lelongbidmarhun_id.$imageExtension"; + } + + Storage::disk('marhun')->delete("{$directory}${marhunImageFileName}"); + $deleteFile->delete(); + } + + public function show($lelong_id, $marhun) + { + $lelongbidmarhun_id = $marhun->lelongbidmarhun_id; + $lelong_id = $lelong_id; + + $no_rujukan_sag = LelongBid::select('norujukan')->where('lelong_id', $lelong_id)->first()->norujukan; + $photo_type_name = $marhun->photo_type === 1 ? 'overall_photo' : 'by_marhun_photo'; + + $directory = "/{$no_rujukan_sag}/{$photo_type_name}/"; + $imageExtension = $marhun->file_type; + + $marhunImageFileName = "overall.{$imageExtension}"; + + if (!empty($lelongbidmarhun_id)) { + $marhunImageFileName = "$lelongbidmarhun_id.$imageExtension"; + } + + $filePath = Storage::disk('marhun')->path("{$directory}${marhunImageFileName}"); + + header('Content-Type:' . $imageExtension); + header('Content-Length: ' . filesize($filePath)); + readfile($filePath); + } +} diff --git a/config/filesystems.php b/config/filesystems.php index 760ef972..a03e7814 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -35,6 +35,13 @@ return [ 'root' => storage_path('app'), ], + 'marhun' => [ + 'driver' => 'local', + 'root' => storage_path('app/marhun'), + 'url' => env('APP_URL').'/marhun_photo', + 'visibility' => 'public', + ], + 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), diff --git a/public/css/marhun-registrations-webcam.css b/public/css/marhun-registrations-webcam.css new file mode 100644 index 00000000..d15cf51e --- /dev/null +++ b/public/css/marhun-registrations-webcam.css @@ -0,0 +1,64 @@ + +#video { +border: 1px solid black; +box-shadow: 2px 2px 3px black; +width: 320px; +height: 240px; +} + +#photo { +border: 1px solid black; +box-shadow: 2px 2px 3px black; +width: 320px; +/* height: 240px; */ +} + +#canvas { +display: none; +} + +.camera { +width: 340px; +display: inline-block; +} + +.output { +width: 340px; +display: inline-block; +vertical-align: top; +} + +#startbutton { +display: block; +position: relative; +margin-left: auto; +margin-right: auto; +bottom: 32px; +background-color: rgba(0, 150, 0, 0.5); +border: 1px solid rgba(255, 255, 255, 0.7); +box-shadow: 0px 0px 1px 2px rgba(0, 0, 0, 0.2); +font-size: 14px; +font-family: "Lucida Grande", "Arial", sans-serif; +color: rgba(255, 255, 255, 1); +} + +.contentarea { +font-size: 16px; +font-family: "Lucida Grande", "Arial", sans-serif; +width: 760px; +} + +#image-tag-container{ +height: 320px; +overflow: hidden; +} + +#image-tag{ +height: 320px; +} + +img.marhun-uploaded { +cursor: -moz-zoom-in; +cursor: -webkit-zoom-in; +cursor: zoom-in; +} diff --git a/public/img/camera-shutter.svg b/public/img/camera-shutter.svg new file mode 100644 index 00000000..bec038f4 --- /dev/null +++ b/public/img/camera-shutter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/no-image.png b/public/img/no-image.png new file mode 100644 index 00000000..e86053a0 Binary files /dev/null and b/public/img/no-image.png differ diff --git a/public/img/pngtree-diamond-wedding-ring.png b/public/img/pngtree-diamond-wedding-ring.png new file mode 100644 index 00000000..5f748966 Binary files /dev/null and b/public/img/pngtree-diamond-wedding-ring.png differ diff --git a/public/js/marhun-photo-capture-reload-https.js b/public/js/marhun-photo-capture-reload-https.js new file mode 100644 index 00000000..ebe88f21 --- /dev/null +++ b/public/js/marhun-photo-capture-reload-https.js @@ -0,0 +1,31 @@ +function marhunPhotoCapturerReloadHttpsFactory() { + + return { + + reload: function reload() { + + const params = new Proxy(new URLSearchParams(window.location.search), { + get: (searchParams, prop) => searchParams.get(prop), + }); + + const isCameraActivate = params.isCameraActivate; + const locationProtocol = location.protocol; + + if (isCameraActivate == 'true' && locationProtocol == 'https:') { + return; + } + + if (locationProtocol == 'https:') { + return; + } + + new_location = new URL(location); + new_location.protocol = "https:"; + new_location.searchParams.append('isCameraActivate', 'true') + window.location.replace(new_location); + + } + + } + +} diff --git a/public/js/marhun-photo-capture.js b/public/js/marhun-photo-capture.js new file mode 100644 index 00000000..795de07c --- /dev/null +++ b/public/js/marhun-photo-capture.js @@ -0,0 +1,177 @@ + +function marhunPhotoCapturerFactory(modal_selector) { + + return { + + constraints: { "video": { width: { exact: 1080 } } }, + + imageCapturer: null, + + start: function start() { + navigator.mediaDevices.getUserMedia(this.constraints) + .then(this.gotMedia) + .catch(e => { console.error('getUserMedia() failed: ', e); }); + }, + + gotMedia: function (mediastream) { + + let modal = document.querySelector(modal_selector); + let videoTag = modal.querySelector('.video-tag-overallmarhun'); + + videoTag.srcObject = mediastream; + + let videoTrack = mediastream.getVideoTracks()[0]; + this.imageCapturer = new ImageCapture(videoTrack); + + + // Timeout needed in Chrome, see https://crbug.com/711524 + setTimeout(() => { + const capabilities = videoTrack.getCapabilities() + console.log(capabilities) + + // Check whether zoom is supported or not. + if (!capabilities.zoom) { + return; + } + + }, 500); + + }, + + captureMedia: function (mediastream) { + + let videoTrack = mediastream.getVideoTracks()[0]; + let imageCapturer = new ImageCapture(videoTrack); + + let modal = document.querySelector(modal_selector); + let imageTag = modal.querySelector('.image-tag-overallmarhun'); + + + + let setMarhunPhotoInputToCapturedPhoto = function (blob) { + const modal = document.querySelector(modal_selector); + const marhunPhotoInput = modal.querySelector('#inputGroupFile04'); + + + const marhunPhotoFile = new File([blob], 'marhun_photo.png', { + type: 'image/png', + lastModified: new Date().getTime(), + }); + + + const dataTransfer = new DataTransfer(); + dataTransfer.items.add(marhunPhotoFile); + marhunPhotoInput.files = dataTransfer.files; + + }; + + imageCapturer.takePhoto() + .then((blob) => { + imageTag.src = URL.createObjectURL(blob); + imageTag.classList.add('marhun-uploaded'); + + + modal.querySelector('.video-tag-overallmarhun').classList.add('d-none'); + + modal.querySelector('.camera-shutter').classList.remove('d-none'); + modal.querySelector('.camera-shutter').classList.add('d-flex'); + + window.setTimeout(() => { + modal.querySelector('.image-tag-overallmarhun').classList.remove('d-none'); + modal.querySelector('.camera-shutter').classList.remove('d-flex'); + modal.querySelector('.camera-shutter').classList.add('d-none'); + modal.querySelector('.camera-button').classList.add('d-none') + }, 1500); + + modal.querySelector('button[type="submit"]').disabled = false; + + return blob; + + }) + .then(blob => setMarhunPhotoInputToCapturedPhoto(blob)) + .catch((err) => { + console.error("takePhoto() failed: ", err); + }); + + }, + + + takePhoto: function () { + navigator.mediaDevices.getUserMedia(this.constraints) + .then(this.captureMedia) + .catch(e => { console.error('getUserMedia() failed: ', e); }); + }, + + viewCapturedPhoto: function () { + + let imageTag = document.getElementById('image-tag'); + + if (!imageTag.classList.contains('marhun-uploaded')) { + + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Sila ambil gambar marhun' + }); + + return; + } + + displayInNewTab(imageTag.src); + }, + + displayInNewTab: function (src) { + let image = new Image(); + image.src = src; + + let w = window.open(""); + w.document.write(image.outerHTML); + }, + + initiateTakeMarhunPhoto: function () { + + navigator.mediaDevices.getUserMedia(this.constraints) + .then(this.gotMedia) + .catch(e => { console.error('getUserMedia() failed: ', e); }); + + let modal = document.querySelector(modal_selector); + + modal.querySelector('.video-tag-overallmarhun').classList.remove('d-none'); + modal.querySelector('.image-tag-overallmarhun').classList.add('d-none'); + modal.querySelector('.camera-shutter').classList.add('d-none'); + modal.querySelector('.camera-button').classList.remove('d-none'); + modal.querySelector('button[type="submit"]').disabled = true; + + $(modal_selector).modal('show'); + }, + + + initiateUploadMarhunPhoto: function () { + let file_marhun_photo = document.getElementById('marhun_photo'); + let image_tag = document.getElementById('image-tag'); + + let displayUploadFileToImageTag = (event) => { + let selectedFile = event.target.files[0]; + let reader = new FileReader(); + + image_tag.title = selectedFile.name; + + reader.onload = function (event) { + image_tag.src = event.target.result; + }; + + reader.readAsDataURL(selectedFile); + + this.removeEventListener('change', displayUploadFileToImageTag); + + }; + + file_marhun_photo.addEventListener('change', displayUploadFileToImageTag); + + image_tag.classList.add('marhun-uploaded'); + + file_marhun_photo.click(); + } + } + +} diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b847d19e..d6a8b9aa 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -87,6 +87,8 @@ return i; } + + @stack('additional_scripts') diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 66dd01ff..4b00aa60 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -1,5 +1,24 @@ @extends('layouts.app') +@push('additional_scripts') + + + +@endpush + +@push('additional_styles') + +@endpush + +@include('marhun.partials.camera_modals_per_marhun') +@include('marhun.partials.camera_modals') + @section('content')
@@ -47,11 +66,16 @@
@if ($lelongbid['filemarhun_filename'] != null) @else

Tiada Data

+ @endif
@@ -78,10 +102,48 @@ {{ $loop->iteration }} - - + @if (empty($item->eachmarhun_filename)) +
+ + +
+ + Tambah / Padam Gambar + @else + + @endif + + + + {{ $item->marhun }} @if($item->karat != null) @@ -183,462 +245,574 @@
- -