diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7daf548b..e096776e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -534,8 +534,9 @@ class MarhunController extends Controller { $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) - ->where('pengesahan.id', $request->pengesahan_id) + ->where('pengesahan.id', $pengesahan->id) ->get(); + dd($lelongbidmarhuns['marhun']); foreach($lelongbidmarhuns as $bidmarhuns) { @@ -550,19 +551,19 @@ class MarhunController extends Controller } $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('pengesahan.lelongbid_id', $lelongbid_id) + ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) ->select('pengesahan.id as pengesahan_id') ->first(); $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid_id','=',$lelongbid_id) + ->where('lelongbid_id','=',$pengesahan->lelongbid_id) ->get(); - $lelongbid = LelongBid::where('id', $lelongbid_id)->first(); + $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); $txtmarhun = ",1 " . $lelongbidmarhuns->marhun ; $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); - $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat_emastambahan; - $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->harga_asastambahan; + $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat; + $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas; $lelongbid->save(); // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index a1c175a3..a2a7bfa4 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -27,17 +27,17 @@ class CreatePengesahanTable extends Migration $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun, 4 = ubah berat, 5 = ubah mutu & berat $table->timestamps(); - $table->foreign('lelong_id') - ->references('id')->on('lelong') - ->onDelete('cascade'); + // $table->foreign('lelong_id') + // ->references('id')->on('lelong') + // ->onDelete('cascade'); - $table->foreign('lelongbid_id') - ->references('id')->on('lelongbid') - ->onDelete('cascade'); + // $table->foreign('lelongbid_id') + // ->references('id')->on('lelongbid') + // ->onDelete('cascade'); - $table->foreign('lelongbidmarhun_id') - ->references('id')->on('lelongbidmarhun') - ->onDelete('cascade'); + // $table->foreign('lelongbidmarhun_id') + // ->references('id')->on('lelongbidmarhun') + // ->onDelete('cascade'); }); } 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 4b8ad5a6..f404a9de 100644 --- a/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php +++ b/database/migrations/2022_03_09_122631_create_tangguhlelong_table.php @@ -25,13 +25,13 @@ class CreateTangguhlelongTable extends Migration $table->string('nota'); $table->timestamps(); - $table->foreign('lelong_id') - ->references('id')->on('lelong') - ->onDelete('cascade'); + // $table->foreign('lelong_id') + // ->references('id')->on('lelong') + // ->onDelete('cascade'); - $table->foreign('lelongbid_id') - ->references('id')->on('lelongbid') - ->onDelete('cascade'); + // $table->foreign('lelongbid_id') + // ->references('id')->on('lelongbid') + // ->onDelete('cascade'); }); }