diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index e069baa9..154430db 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -952,7 +952,7 @@ class MarhunController extends Controller $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') ->where('gadaimarhun.norujukan', $norujukan) ->where('tangguhlelong.id', $tangguhlelong_id) - ->where('tangguhlelong.lelong_id', $id) + // ->where('tangguhlelong.lelong_id', $id) ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelong_id', 'tangguhlelong.lelongbid_id', @@ -970,6 +970,7 @@ class MarhunController extends Controller 'gadaimarhun.n_marhun' ) ->get(); + // dd($tangguhlelong); $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') ->where('gadaimarhun.norujukan', $norujukan) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 4650b426..b5af01ec 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -15,6 +15,7 @@ use App\Models\LelongBidMarhun; use App\Models\CawanganLelong; use App\Models\TangguhLelong; use App\Models\Pengesahan; +use App\Models\GadaiMarhun; class TangguhLelongController extends Controller { @@ -428,4 +429,39 @@ class TangguhLelongController extends Controller } + + public function taglelbidmarhun($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(); + // dd($tangguhlelong); + + $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') + ->where('gadaimarhun.norujukan', $norujukan) + ->select('cawangan.caw_name', 'cawangan.caw_code') + ->first(); + // dd($caw_names); + + return view('tangguhlelong.taglelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); + + } } diff --git a/resources/views/pengesahan/listperubahanmutumarhun.blade.php b/resources/views/pengesahan/listperubahanmutumarhun.blade.php index 232341bc..3ce36e92 100644 --- a/resources/views/pengesahan/listperubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/listperubahanmutumarhun.blade.php @@ -14,6 +14,7 @@ Bil + ID Lelong Cawangan No Rujukan Status @@ -26,6 +27,7 @@ @foreach($cawangan as $marhun) {{ $loop->iteration }} + {{ $marhun['lelong_id'] }} {{ $marhun['namacaw'] }} {{ $marhun['norujukan'] }} diff --git a/resources/views/tangguhlelong/listtangguh.blade.php b/resources/views/tangguhlelong/listtangguh.blade.php index 620977ea..edd34ecc 100644 --- a/resources/views/tangguhlelong/listtangguh.blade.php +++ b/resources/views/tangguhlelong/listtangguh.blade.php @@ -36,7 +36,7 @@ {{ $tangguhlel->norujukan }} {{ $tangguhlel->nota }} - + @endif @@ -45,7 +45,7 @@ diff --git a/resources/views/tangguhlelong/taglelbidmarhun.blade.php b/resources/views/tangguhlelong/taglelbidmarhun.blade.php new file mode 100644 index 00000000..a496d760 --- /dev/null +++ b/resources/views/tangguhlelong/taglelbidmarhun.blade.php @@ -0,0 +1,117 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + +
+
+
+

Norujukan : {{ $tangguhlelong[0]['norujukan'] }}

+

Pembiayaan : {{ $tangguhlelong[0]['pinjaman'] }}

+

Remark : {{ $tangguhlelong[0]['tangguh_nota'] }}

+
+
+
+
+ + + + + + + + + + + + + + + @foreach ($tangguhlelong as $index1=>$tangguhlel) + + + + + + + + + + @endforeach + +
BilMarhunKaratBeratHarga (RM)Nilai MarhunNota
{{ $loop->iteration }}{{ $tangguhlel->marhun }}{{ $tangguhlel->karat }}{{ $tangguhlel->berat }}{{ $tangguhlel->harga }}{{ $tangguhlel->n_marhun }}{{ $tangguhlel->gadai_nota }}
+
+ +
+ +
+
+ + +@endsection diff --git a/routes/web.php b/routes/web.php index 861c0b20..aa0d02a8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -268,6 +268,7 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']); Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']); Route::get('/listtangguh/{lelong_id}/{caw_code}', ['as'=>'tangguhlelong.listtangguh','uses'=>'TangguhLelongController@listtangguh']); + Route::get('/taglelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'tangguhlelong.taglelbidmarhun','uses'=>'TangguhLelongController@taglelbidmarhun']); });