From d30d9bb14f04be79af922445a14d39d13514d6d4 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Thu, 14 Apr 2022 09:06:40 +0800
Subject: [PATCH 1/7] update tangguh lelong
---
app/Http/Controllers/MarhunController.php | 108 ++++++++----------
...3_09_122631_create_tangguhlelong_table.php | 1 +
.../views/pengesahan/mutumarhun.blade.php | 56 ++++++++-
3 files changed, 97 insertions(+), 68 deletions(-)
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index cb2338ee..2f11556f 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -473,6 +473,7 @@ class MarhunController extends Controller
->get()->toArray();
$lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first();
+ dd($lelongbid);
$karat = Lelkarat::where('lelong_id', $id)->get();
foreach($marhuns as $index1=>$marhun)
@@ -512,33 +513,37 @@ class MarhunController extends Controller
public function terimaperubahan(Request $request)
{
- dd($request->all());
+ // dd($request->all());
//update mutu marhun - gadaimarhun
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
- $pengesahan = Pengesahan::where('id', $request->pengesahan_id)
+ $pengesahan = Pengesahan::where('norujukan', $request->norujukan)
->first();
- dd($pengesahan);
- $pengesahan->disahkan_oleh = $user->id;
- $pengesahan->disahkan_pada = $currentdate;
- $pengesahan->update();
- $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
+ $pengesahan->id = $pengesahan['id'] ;
+ $pengesahan->disahkan_oleh = $user['id'];
+ $pengesahan->disahkan_pada = $currentdate;
+ // $pengesahan->save();
+
+ // $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete();
+ $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get();
$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();
- }
+ // 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->berat = $bidmarhun->harga;
+ // $newmarhun->berat = $bidmarhun->n_marhun;
+ // $newmarhun->save();
+ // }
if($request->jenis_button == "terima")
{
@@ -551,7 +556,7 @@ class MarhunController extends Controller
{
if($bidmarhuns->status_ubah == 3)
{
- $bidmarhuns->delete();
+ // $bidmarhuns->delete();
}
else
{
@@ -560,48 +565,35 @@ class MarhunController extends Controller
$bidmarhuns->nota = $bidmarhun->nota;
$bidmarhuns->karat = $bidmarhun->karat;
$bidmarhuns->berat = $bidmarhun->berat;
- $bidmarhuns->update();
+ // $bidmarhuns->update();
}
}
+
+ $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
}
else if($request->jenis_button == "tangguhlelong")
{
- //add into table tangguhlelong
- $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();
-
- // $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
+ //add into table tangguhlelong
+ $tangguhlelong = new TangguhLelong;
+ $tangguhlelong->lelong_id = $pengesahan->lelong_id;
+ $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id;
+ $tangguhlelong->norujukan = $pengesahan->norujukan;
+ $tangguhlelong->pinjaman = $lelongbid[0]['pinjaman'];
+ $tangguhlelong->tarikhtangguh = $currentdate;
+ $tangguhlelong->ditangguh_oleh = $user->id;
+ $tangguhlelong->ditangguh_pada = $currentdate;
+ $tangguhlelong->nota = $request->nota;
+ // $tangguhlelong->save();
+
+ $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
+ ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id)
+ ->first();
+
+ $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete();
+
}
-
- $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id);
-
- // $lelongbidmarhunlast = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get();
- // $pengesahanlast = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
- // ->where('lelongbidmarhun.id', $lelongbidmarhunlast->id)
- // ->where('lelongbid_id', $pengesahan->lelongbid_id)
- // ->where('pengesahan.id', $request->pengesahan_id)
- // ->first();
-
- // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
- // ->where('lelongbid_id','=', $pengesahan->lelongbid_id)
- // ->get();
-
- // $lelongbid = LelongBid::where('lelongbid_id', $lelongbidmarhunlast->lelongbid_id)->first();
- // $txtmarhun = ",1 " . $lelongbidmarhunlast->marhun ;
- // $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun);
- // $lelongbid->berat = $lelongbid->berat - $lelongbidmarhunlast->berat_emastambahan;
- // $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhunlast->harga_asastambahan;
- // $lelongbid->save();
-
return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya');
}
@@ -640,14 +632,11 @@ class MarhunController extends Controller
public function pcdelete($id, $lelongbid_id)
{
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first();
-
$pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id')
- ->where('pengesahan.lelongbidmarhun_id', $lelongbidmarhun->id)
->where('pengesahan.lelongbid_id', $lelongbid_id)
->select('pengesahan.id as pengesahan_id')
->first();
-
$marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid_id','=',$lelongbid_id)
->get();
@@ -658,13 +647,6 @@ class MarhunController extends Controller
$lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan;
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
-
- if($pengesahan != null)
- {
- $lelongbidmarhun->delete();
- }
-
- $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete();
// return redirect()->route('pengesahan.perubahanmutumarhun')
// ->with('success','Pengesahan Padam Marhun Telah Berjaya');
diff --git a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php
index e71083c4..4b8ad5a6 100644
--- a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php
+++ b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php
@@ -18,6 +18,7 @@ class CreateTangguhlelongTable extends Migration
$table->unsignedBigInteger('lelong_id')->unsigned();
$table->unsignedBigInteger('lelongbid_id')->unsigned();
$table->string('norujukan');
+ $table->string('pinjaman', $precision = 9, $scale = 2);
$table->datetime('tarikhtangguh')->nullable();
$table->integer('ditangguh_oleh');
$table->datetime('ditangguh_pada');
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index d45dd124..33e9432a 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -100,7 +100,7 @@
@elseif($detail[0]['status_ubah'] == 5)
@else
-
+
@endif
@@ -109,11 +109,40 @@
+