diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 1fadfde6..4caea8df 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -21,6 +21,7 @@ use App\Models\LelKarat_temp; use App\Models\Pengesahan; use App\Models\GadaiMarhun; +use App\Models\TangguhLelong; use Carbon\Carbon; class MarhunController extends Controller @@ -63,7 +64,16 @@ class MarhunController extends Controller // dd($request->all()); $marhun = LelongBidMarhun::where('id','=',$request->idmarhun)->first(); $lelongbid = LelongBid::where('id','=',$marhun->lelongbid_id)->first(); - // dd($lelongbid); + // dd($marhun); + + if($marhun->marhun != $request->marhun) + { + // dd($marhun->marhun); + $txtmarhun = ",1 " . $marhun->marhun ; + // dd($txtmarhun); + $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(); @@ -75,16 +85,26 @@ class MarhunController extends Controller // { if($request->karat != $marhun->karat) { - $karat = new Pengesahan; - $karat->lelong_id = $lelong->id; - $karat->lelongbid_id = $lelongbid->id; - $karat->norujukan = $lelongbid->norujukan; - $karat->diminta_oleh = $user->id; - $karat->diminta_pada = $currentdate; - $karat->save(); + $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) + ->whereNull('disahkan_pada') + ->first(); + if($checkdata) + { + // + } + else + { + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->save(); + } } $bezaberat = $marhun->berat - $request->berat_emas; - // $bezahargaasas = $marhun->hargaasas - $request->hargaasas; + $bezahargaasas = $marhun->hargaasas - $request->harga_asas; // $val = round($request->berat_emas * $karat->harga); $marhun->marhun = $request->marhun; @@ -94,9 +114,10 @@ class MarhunController extends Controller $marhun->n_marhun = $request->nilai_marhun; $marhun->hargaasas = $request->harga_asas; $marhun->save(); + // dd($marhun->marhun); $lelongbid->berat = $lelongbid->berat - ($bezaberat); - // $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); + $lelongbid->hargaasas = $lelongbid->hargaasas - ($bezahargaasas); $lelongbid->save(); // } @@ -160,19 +181,22 @@ class MarhunController extends Controller { // dd($request->all()); $mutumarhun = Pengesahan::join('lelong', 'pengesahan.lelong_id', '=', 'lelong.id') + ->whereNull('disahkan_oleh') ->select( 'pengesahan.id as pengesahan_id', 'pengesahan.norujukan', - 'lelong.tarikh_lelong' + 'lelong.tarikh_lelong', + 'pengesahan.norujukan' ) ->get(); return view('pengesahan.perubahanmutumarhun', compact('mutumarhun')); } - public function mutumarhun($pengesahan_id) + public function mutumarhun($pengesahan_id, $norujukan) { $pengesahan = Pengesahan::where('id', $pengesahan_id) + ->where('norujukan', $norujukan) ->first(); $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) @@ -206,9 +230,8 @@ class MarhunController extends Controller $marhuns[$index1]['old_harga'] = $karat->harga; $marhuns[$index1]['old_nilaimarhun'] = $total; $marhuns[$index1]['old_hargaasas'] = $hargaasas; - // $marhun } - return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id')); + return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan')); } public function terimaperubahan(Request $request) @@ -221,14 +244,37 @@ class MarhunController extends Controller $pengesahan = Pengesahan::where('id', $request->pengesahan_id) ->first(); - dd($pengesahan); $pengesahan->disahkan_oleh = $user->id; $pengesahan->disahkan_pada = $currentdate; $pengesahan->update(); - // $updategadaimarhun = GadaiMarhun::where('') + $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete(); + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); + foreach($lelongbidmarhun as $bidmarhun) + { + $newmarhun = new GadaiMarhun; + $newmarhun->norujukan = $pengesahan->norujukan; + $newmarhun->bil = $bidmarhun->bil; + $newmarhun->marhun = $bidmarhun->marhun; + $newmarhun->nota = $bidmarhun->nota; + $newmarhun->karat = $bidmarhun->karat; + $newmarhun->berat = $bidmarhun->berat; + $newmarhun->save(); + } //update status lelongbidmarhun = tangguh + + $tangguhlelong = new TangguhLelong; + $tangguhlelong->lelong_id = $pengesahan->lelong_id; + $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id; + $tangguhlelong->norujukan = $pengesahan->norujukan; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun'; + $tangguhlelong->save(); + + return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya'); } } diff --git a/app/Models/TangguhLelong.php b/app/Models/TangguhLelong.php new file mode 100644 index 00000000..ea232941 --- /dev/null +++ b/app/Models/TangguhLelong.php @@ -0,0 +1,23 @@ +id(); + $table->unsignedBigInteger('lelong_id')->unsigned(); + $table->unsignedBigInteger('lelongbid_id')->unsigned(); + $table->string('norujukan'); + $table->datetime('tarikhtangguh')->nullable(); + $table->integer('ditangguh_oleh'); + $table->datetime('ditangguh_pada'); + $table->string('nota'); + $table->timestamps(); + + $table->foreign('lelong_id') + ->references('id')->on('lelong') + ->onDelete('cascade'); + + $table->foreign('lelongbid_id') + ->references('id')->on('lelongbid') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('tangguhlelong'); + } +} diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index edca7ce7..91ff5b6f 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -6,7 +6,8 @@
@csrf - + + @if ($message = Session::get('success'))
@@ -73,7 +74,7 @@
Kembali - Sahkan +
@@ -84,9 +85,8 @@ $(function () { $('[data-toggle="tooltip"]').tooltip() }) - - function terima(){ - $('#formmutumarhun').submit(); + function functerima(){ + $("#formmutumarhun").submit(); } var tablelelong = $('#tablelelong').DataTable( { diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index b26fa578..b0a0dd2f 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -26,7 +26,7 @@ {{ $marhun['tarikh_lelong'] }} {{ $marhun['norujukan'] }} - + @endforeach diff --git a/routes/web.php b/routes/web.php index dcc01aa3..32fce910 100644 --- a/routes/web.php +++ b/routes/web.php @@ -145,7 +145,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']); - Route::get('/mutumarhun/{pengesahan_id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); + Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); }); //Operasi