From 95a39357b84c4e7e1e755d99fdd5ca577cc12061 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 9 Mar 2022 16:45:03 +0800 Subject: [PATCH 01/17] semak marhun --- app/Http/Controllers/MarhunController.php | 14 +++++++++++++- resources/views/marhun/marhun.blade.php | 1 + routes/web.php | 3 +-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 4caea8df..ab9d386a 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -160,7 +160,8 @@ class MarhunController extends Controller } - public function senarailelongmarhun(Request $request){ + public function senarailelongmarhun(Request $request) + { $user = Auth::user(); @@ -177,6 +178,17 @@ class MarhunController extends Controller return view('marhun.senarailelongmarhun',compact('senarai')); } + public function semak($id) + { + $lelongbid = LelongBid::where('id','=',$id)->first(); + $lelongbid->status_semak = 1; + $lelongbid->save(); + + return redirect()->route('marhun.show',$lelongbid->id) + ->with('success','Semakan Marhun Berjaya'); + } + + //Operasi public function sahubahmutu(Request $request) { // dd($request->all()); diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 3e656a02..c5ce7557 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -54,6 +54,7 @@
Kembali + Semak
diff --git a/routes/web.php b/routes/web.php index 32fce910..f34a2a20 100644 --- a/routes/web.php +++ b/routes/web.php @@ -126,8 +126,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); Route::post('/exportmarhun',['as'=>'marhun.exportmarhundetails','uses'=>'MarhunController@exportmarhundetails']); - - + Route::get('/semak/{id}',['as'=>'marhun.semak','uses'=>'MarhunController@semak']); }); //Khazanah From 5f193606d723ca697d4076ac5664fe926fa869a5 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 10 Mar 2022 10:51:16 +0800 Subject: [PATCH 02/17] update api & migration --- app/Http/Controllers/ApiController.php | 4 ++-- app/Http/Controllers/CartController.php | 19 +++++++++++++++++++ .../2022_01_13_064027_create_file_table.php | 4 +++- routes/api.php | 4 +++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 51279bc0..5d0c5fb6 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -163,7 +163,7 @@ class ApiController extends Controller Money::MYR($total_bayaran), route('pay.callback'), 'Bayaran Borang', - ['redirect_url' => 'http://192.168.88:8003/api/pembayaran/response'] + ['redirect_url' => 'http://192.168.85:8003/api/pembayaran/response'] ); // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); @@ -341,7 +341,7 @@ class ApiController extends Controller Money::MYR($total_bayaran), route('pay.bidcallback'), 'Bayaran Bidaan', - ['redirect_url' => 'http://192.168.88:8003/api/pembayaran/bidresponse'] + ['redirect_url' => 'http://192.168.85:8003/api/pembayaran/bidresponse'] ); // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php index 77f359b0..3c09500f 100644 --- a/app/Http/Controllers/CartController.php +++ b/app/Http/Controllers/CartController.php @@ -76,6 +76,25 @@ class CartController extends Controller } } + public function removeFromCart(Request $request) + { + $item = Cart::where('id',$request->cart_id)->first(); + if($item->delete()) + { + return response()->json([ + 'success' => true, + 'carts' => $item + ]); + } + else + { + return response()->json([ + 'success' => false, + 'message' => 'Error! Cannot save.', + ], 401); + } + } + public function updateItem (Request $request) { $cart = Cart::where('id','=',$request->id)->first(); diff --git a/database/migrations/2022_01_13_064027_create_file_table.php b/database/migrations/2022_01_13_064027_create_file_table.php index 05757333..2a575f7a 100644 --- a/database/migrations/2022_01_13_064027_create_file_table.php +++ b/database/migrations/2022_01_13_064027_create_file_table.php @@ -17,7 +17,6 @@ class CreateFileTable extends Migration $table->bigIncrements('id'); $table->unsignedBigInteger('user_id')->unsigned(); $table->string('file_type'); - $table->binary('filename'); $table->datetime('deleted_at')->nullable(); $table->integer('deleted_by')->nullable(); $table->timestamps(); @@ -26,6 +25,9 @@ class CreateFileTable extends Migration ->references('id')->on('users') ->onDelete('cascade'); }); + + // once the table is created use a raw query to ALTER it and add the MEDIUMBLOB + DB::statement("ALTER TABLE file ADD filename LONGBLOB"); } /** diff --git a/routes/api.php b/routes/api.php index baa8c135..840818f0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -24,7 +24,7 @@ use App\Http\Controllers\ApiController; //Public routes Route::post('/register', [AuthController::class, 'register']); Route::post('/user/login', [AuthController::class, 'loginUser']); -Route::post('/addToCart', [CartController::class, 'addToCart']); + Route::get('/cart/{userid}', [CartController::class, 'getCart']); Route::post('/password/email', [ForgotPasswordController::class, 'sendResetLinkEmail']); @@ -52,6 +52,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () { Route::put('/userUpdate/profile', [UserController::class, 'updateProfileUser']); // Cart + Route::post('/addToCart', [CartController::class, 'addToCart']); + Route::post('/removeFromCart', [CartController::class, 'removeFromCart']); Route::post('/updateItem', [CartController::class, 'updateItem']); Route::get('/deleteItem/{id}', [CartController::class, 'deleteCart']); From 3dd80211e61de9002d979a8bc77d74ce8605c742 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 10 Mar 2022 16:33:35 +0800 Subject: [PATCH 03/17] tambah marhun --- app/Http/Controllers/MarhunController.php | 49 +++++ ...2021_12_14_041557_create_lelongs_table.php | 4 +- resources/views/marhun/marhun.blade.php | 176 +++++++++++++----- routes/web.php | 1 + 4 files changed, 186 insertions(+), 44 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ab9d386a..ad281f18 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -188,6 +188,34 @@ class MarhunController extends Controller ->with('success','Semakan Marhun Berjaya'); } + public function tambahmarhun(Request $request) + { + // dd($request->all()); + //get request from form and create lelongbidmarhun + $lelongbid = LelongBid::where('norujukan', $request->norujukan_marhuntambahan)->first(); + + $lelongbidmarhun = new LelongBidMarhun; + $lelongbidmarhun->lelongbid_id = $lelongbid->id; + $lelongbidmarhun->bil = 1; + $lelongbidmarhun->marhun = $request->marhuntambahan; + $lelongbidmarhun->nota = $request->notatambahan; + $lelongbidmarhun->karat = $request->karattambahan; + $lelongbidmarhun->berat = $request->berat_emastambahan; + $lelongbidmarhun->harga = $request->hargatambahan; + $lelongbidmarhun->n_marhun = $request->nilai_marhuntambahan; + $lelongbidmarhun->hargaasas = $request->harga_asastambahan; + $lelongbidmarhun->status_semak = 0; + $lelongbidmarhun->save(); + + $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ; + $lelongbid->berat = $lelongbid->berat + $request->berat_emastambahan; + $lelongbid->hargaasas = $lelongbid->hargaasas + $request->harga_asastambahan; + $lelongbid->save(); + + return redirect()->route('marhun.show',$lelongbid->id) + ->with('success','Marhun Berjaya Ditambah'); + } + //Operasi public function sahubahmutu(Request $request) { @@ -288,6 +316,27 @@ class MarhunController extends Controller return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya'); } + + public function delete($id){ + // dd($id); + $lelongbidmarhun = LelongBidMarhun::where('id', $id)->first(); + + + $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first(); + // dd($lelongbid); + $txtmarhun = ",1 " . $lelongbidmarhun->marhun ; + $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); + // $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ; + $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; + $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; + $lelongbid->save(); + + $lelongbidmarhun->delete(); + + return redirect()->route('marhun.show',$lelongbid->id) + ->with('success','Marhun Berjaya Dipadam'); + + } } \ No newline at end of file diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 3d3c3b3d..3b375d54 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -93,13 +93,13 @@ class CreateLelongsTable extends Migration $table->unsignedBigInteger('lelongbid_id')->unsigned(); $table->decimal('bil', $precision = 3, $scale = 0); $table->string('marhun'); - $table->string('nota'); + $table->string('nota')->nullable(); $table->string('karat'); $table->decimal('berat', $precision = 7, $scale = 2); $table->decimal('harga', $precision = 5, $scale = 2); $table->decimal('n_marhun', $precision = 9, $scale = 2); $table->decimal('hargaasas', $precision = 11, $scale = 2); - $table->integer('status_semak')->default(0); + $table->integer('status_semak')->default(0)->nullable(); $table->timestamps(); $table->foreign('lelongbid_id') diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index e2a89124..2623708c 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -53,8 +53,8 @@
- Kembali - Semak + Kembali + Semak
@@ -111,12 +111,72 @@
- - + +
+ - + + +@endsection diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 1a609260..824871ab 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -73,7 +73,7 @@ @foreach ($arraycaw as $index=>$caw) {{$index+1}} - {{ $caw['cawangan'] }} + {{ $caw['cawangan'] }} {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} diff --git a/routes/web.php b/routes/web.php index a87f717c..85e748e3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -59,6 +59,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::get('/senaraisimulasi',['as'=>'analisa.senaraisimulasi','uses'=>'SimulasiController@senaraisimulasi']); Route::get('/showsimulasi/{id}',['as'=>'analisa.show','uses'=>'SimulasiController@show']); Route::get('/deletesimulasi/{id}',['as'=>'analisa.delete','uses'=>'SimulasiController@delete']); + Route::get('/senaraimarhunlel/{lelongid}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); + Route::get('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']); From c563a97df8e00b1ce478960dec2bd8a5a4947330 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 13 Mar 2022 14:50:08 +0800 Subject: [PATCH 07/17] add senarai marhun sim --- app/Http/Controllers/SimulasiController.php | 37 ++++++++++--------- ...m.blade.php => senaraimarhunlel.blade.php} | 8 ++-- .../views/simulasi/showsimulasi.blade.php | 2 +- routes/web.php | 4 +- 4 files changed, 26 insertions(+), 25 deletions(-) rename resources/views/simulasi/{senaraimarhunsim.blade.php => senaraimarhunlel.blade.php} (94%) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 384f362f..ac2df2e7 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -396,6 +396,7 @@ class SimulasiController extends Controller } array_push($arraycaw,[ + 'id_cawangan'=> $cawangan->id, 'cawangan'=>$cawangan->caw_name, 't_lelong'=>$simulasi->tarikh_lelong, 'bil_marhun'=>sizeof($databid), @@ -707,41 +708,41 @@ class SimulasiController extends Controller } - public function senaraimarhunlel($lelongid, $cawid) + public function senaraimarhunlel($simulasi_id, $cawid) { - $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - ->where('lelong_id','=',$lelongid) + $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id') + ->where('simulasi_id','=',$simulasi_id) ->where('caw_id','=',$cawid) ->select( - 'lelongbid.t_lelong', - 'lelongbid.kodcaw', + 'simulasibid.t_lelong', + 'simulasibid.kodcaw', 'cawangan.caw_name', - 'lelongbid.norujukan', - 'lelongbid.pinjaman', - 'lelongbid.berat', - 'lelongbid.nilaimarhun', - 'lelongbid.hargaasas', - 'lelongbid.upahsimpan', - 'lelongbid.cajlelong', - 'lelongbid.baki', - 'lelongbid.status_jual', + 'simulasibid.norujukan', + 'simulasibid.pinjaman', + 'simulasibid.berat', + 'simulasibid.nilaimarhun', + 'simulasibid.hargaasas', + 'simulasibid.upahsimpan', + 'simulasibid.cajlelong', + 'simulasibid.baki', + 'simulasibid.status_jual', ) ->get(); - return view('lelong.senaraimarhunsim',compact('marhuns','lelongid','cawid')); + return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid')); } public function deletemarhunlel(Request $request){ - dd($request->checkboxdata); + // dd($request->checkboxdata); $data = $request->checkboxdata; foreach($data as $index=>$norujukan) { - $marhun = LelongBid::where('norujukan','=',$norujukan)->first(); + $marhun = SimulasiBid::where('norujukan','=',$norujukan)->first(); $marhun->delete(); } - return redirect()->route('lelong.senaraimarhunlel',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid]) + return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid]) ->with('success','Delete Berjaya'); } } diff --git a/resources/views/simulasi/senaraimarhunsim.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php similarity index 94% rename from resources/views/simulasi/senaraimarhunsim.blade.php rename to resources/views/simulasi/senaraimarhunlel.blade.php index d1461cd1..11d0c7f6 100644 --- a/resources/views/simulasi/senaraimarhunsim.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -11,9 +11,9 @@

{{ $message }}

@endif -
+ @csrf - + @@ -72,10 +72,10 @@
- Kembali + Kembali
- {{-- Kembali --}} + {{-- Kembali --}}
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 824871ab..fa480286 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -73,7 +73,7 @@ @foreach ($arraycaw as $index=>$caw) {{$index+1}} - {{ $caw['cawangan'] }} + {{ $caw['cawangan'] }} {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} diff --git a/routes/web.php b/routes/web.php index 85e748e3..70f5e4aa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -59,8 +59,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::get('/senaraisimulasi',['as'=>'analisa.senaraisimulasi','uses'=>'SimulasiController@senaraisimulasi']); Route::get('/showsimulasi/{id}',['as'=>'analisa.show','uses'=>'SimulasiController@show']); Route::get('/deletesimulasi/{id}',['as'=>'analisa.delete','uses'=>'SimulasiController@delete']); - Route::get('/senaraimarhunlel/{lelongid}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); - Route::get('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); + Route::get('/senaraimarhunlel/{simulasi_id}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']); + Route::post('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@deletemarhunlel']); Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']); From 251636dc0f8f2f4331e361d55ab206b545d92ac0 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 13 Mar 2022 17:06:08 +0800 Subject: [PATCH 08/17] add sah tambah marhun --- app/Http/Controllers/MarhunController.php | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 85fbb7ae..e7695f81 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -41,7 +41,7 @@ class MarhunController extends Controller * * @return \Illuminate\Contracts\Support\Renderable */ - public function index() + public function index($lelong_id) { $user = Auth::user(); @@ -171,7 +171,13 @@ class MarhunController extends Controller { // dd($request->all()); //get request from form and create lelongbidmarhun + $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(); $lelongbidmarhun = new LelongBidMarhun; $lelongbidmarhun->lelongbid_id = $lelongbid->id; @@ -185,12 +191,20 @@ class MarhunController extends Controller $lelongbidmarhun->hargaasas = $request->harga_asastambahan; $lelongbidmarhun->status_semak = 0; $lelongbidmarhun->save(); - + $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->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->save(); + return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Marhun Berjaya Ditambah'); } From 6dd0b3726192be6c3d84a170c999f572df82c5b9 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 13 Mar 2022 17:14:02 +0800 Subject: [PATCH 09/17] add sah delete marhun --- app/Http/Controllers/MarhunController.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index e7695f81..16c292e9 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -204,7 +204,7 @@ class MarhunController extends Controller $karat->diminta_oleh = $user->id; $karat->diminta_pada = $currentdate; $karat->save(); - + return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Marhun Berjaya Ditambah'); } @@ -376,7 +376,15 @@ class MarhunController extends Controller $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); - $lelongbidmarhun->delete(); + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbidmarhun.id', $id) + ->where('lelongbid_id', $lelongbid_id) + ->first(); + + if($pengesahan != null) + { + $lelongbidmarhun->delete(); + } return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Marhun Berjaya Dipadam'); From 7af1b6891bfdbd23ae9c3ab6a74c7c33f8b97684 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:46:47 +0800 Subject: [PATCH 10/17] update sah delete marhun --- app/Http/Controllers/MarhunController.php | 54 ++++++++++++++++------ resources/views/includes/sidebar.blade.php | 5 ++ resources/views/marhun/marhun.blade.php | 2 +- routes/web.php | 4 +- 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 16c292e9..765ceebe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -362,10 +362,45 @@ class MarhunController extends Controller return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya'); } - public function delete($id){ - // dd($id); + public function submitdelete($id){ + + $user = Auth::user(); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid_id','=',$id) + ->get(); + + $pengesahan = new Pengesahan; + $pengesahan->lelong_id = $marhun->lelong_id; + $pengesahan->lelongbid = $id; + $pengesahan->norujukan = $marhun->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->save(); + + return redirect()->route('pengesahan.pcdelete',$lelongbid->id) + ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar'); + + } + + public function pcdelete($id) + { $lelongbidmarhun = LelongBidMarhun::where('id', $id)->first(); + //save in table pengesahan first + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbidmarhun.id', $id) + ->where('lelongbid_id', $lelongbid_id) + ->select('pengesahan.id as pengesahan_id') + ->first(); + + if($pengesahan != null) + { + $lelongbidmarhun->delete(); + } $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first(); // dd($lelongbid); @@ -376,19 +411,8 @@ class MarhunController extends Controller $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); - $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('lelongbidmarhun.id', $id) - ->where('lelongbid_id', $lelongbid_id) - ->first(); - - if($pengesahan != null) - { - $lelongbidmarhun->delete(); - } - - return redirect()->route('marhun.show',$lelongbid->id) - ->with('success','Marhun Berjaya Dipadam'); - + return redirect()->route('pengesahan.perubahanmutumarhun') + ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index fee7a72c..d0cf44b5 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -119,6 +119,11 @@ Perubahan Mutu Marhun +
  • diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 2623708c..fd8c65aa 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -44,7 +44,7 @@ {{ $item->nota }} - + @endforeach diff --git a/routes/web.php b/routes/web.php index 70f5e4aa..fca15acc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -123,7 +123,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); - Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']); + Route::get('/submitdelete/{id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); @@ -151,6 +151,8 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']); Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); + Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); + Route::post('/senaraitangguhlelong',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); }); //Operasi From 60dd89b0ab1154ded455575e3b87b112eebe15a8 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 15 Mar 2022 10:47:16 +0800 Subject: [PATCH 11/17] edit nama pjmn & upah --- resources/views/lelong/showlelong.blade.php | 8 ++++---- resources/views/simulasi/showsimulasi.blade.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 68175bd9..30292945 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -30,10 +30,10 @@ Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} - Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} + Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} @@ -63,8 +63,8 @@ Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) - Pinjaman (RM) - Upah (RM) + Pembiayaan (RM) + Keuntungan (RM) Harga Asas (RM) Caj Lelong (RM) Baki Lelong (RM) diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index fa480286..22e3f250 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -27,10 +27,10 @@ Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} - Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} + Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} @@ -60,8 +60,8 @@ Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) - Pinjaman (RM) - Upah (RM) + Pembiayaan (RM) + Keuntungan (RM) Harga Asas (RM) Caj Lelong (RM) Baki Lelong (RM) From 41c408567ec529220924bb04bdb812bbd4f3e382 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 15 Mar 2022 12:41:25 +0800 Subject: [PATCH 12/17] update --- app/Http/Controllers/LelongController.php | 7 +++++++ app/Http/Controllers/SimulasiController.php | 7 ++++++- app/Models/lelongBidder.php | 2 +- resources/views/simulasi/janasimulasi.blade.php | 6 ++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index afddf859..e468383f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Auth; use PDF; use App\Models\User; use App\Models\Cawangan; +use App\Models\Gadai; use App\Models\JenisEmas; use App\Models\JenisKarat; @@ -302,6 +303,12 @@ class LelongController extends Controller $lelongbid->status_payment =$simulasibid->status_payment; $lelongbid->mora_upah =$simulasibid->mora_upah; $lelongbid->save(); + if($lelongbid->save()) + { + $updategadai = Gadai::where('norujukan','=',$simulasibid->norujukan)->first(); + $updategadai->taglel = 1; + $updategadai->save(); + } $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$simulasibid->id)->get(); foreach($simulasibidmarhun as $simbidmarhun) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index ac2df2e7..3c545219 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -68,7 +68,12 @@ class SimulasiController extends Controller ->where('tagpalsu2','=',0) ->where('taglel','=',0) ->where('lelong_tawarruq','=',1) - ->get(); + ->get(); + if(sizeof($surat) == 0) + { + return redirect()->route('analisa.index') + ->with('failed','Tiada surat untuk di lelong'); + } $cawangan = Cawangan::all(); //create simulasi $simulasi = new Simulasi; diff --git a/app/Models/lelongBidder.php b/app/Models/lelongBidder.php index c739a829..9e5a7730 100644 --- a/app/Models/lelongBidder.php +++ b/app/Models/lelongBidder.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class lelongBidder extends Model +class LelongBidder extends Model { use HasFactory; diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index 9c310523..336e9bbd 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -5,6 +5,12 @@

    Simulasi

    + + @if ($message = Session::get('failed')) +
    +

    {{ $message }}

    +
    + @endif
    @csrf
    From 848230d55c56aa9cad7fe581aef75b4aae64b490 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 15 Mar 2022 13:25:14 +0800 Subject: [PATCH 13/17] Delete lelongBidder.php --- app/Models/lelongBidder.php | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 app/Models/lelongBidder.php diff --git a/app/Models/lelongBidder.php b/app/Models/lelongBidder.php deleted file mode 100644 index 9e5a7730..00000000 --- a/app/Models/lelongBidder.php +++ /dev/null @@ -1,26 +0,0 @@ - Date: Tue, 15 Mar 2022 13:26:54 +0800 Subject: [PATCH 14/17] Create LelongBidder.php --- app/Models/LelongBidder.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 app/Models/LelongBidder.php diff --git a/app/Models/LelongBidder.php b/app/Models/LelongBidder.php new file mode 100644 index 00000000..9e5a7730 --- /dev/null +++ b/app/Models/LelongBidder.php @@ -0,0 +1,26 @@ + Date: Tue, 15 Mar 2022 21:13:10 +0800 Subject: [PATCH 15/17] Delete resit.php --- app/Models/resit.php | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 app/Models/resit.php diff --git a/app/Models/resit.php b/app/Models/resit.php deleted file mode 100644 index 4573687c..00000000 --- a/app/Models/resit.php +++ /dev/null @@ -1,24 +0,0 @@ - 1 = paid , 2 = pending - 'paid_at' - ]; -} From 20b74df7358fd9883c30805890712b0bd66f9efb Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 15 Mar 2022 21:14:37 +0800 Subject: [PATCH 16/17] rename file --- app/Models/Resit.php | 24 +++++++++++++++++++++++ app/Models/payment.php | 43 ------------------------------------------ 2 files changed, 24 insertions(+), 43 deletions(-) create mode 100644 app/Models/Resit.php delete mode 100644 app/Models/payment.php diff --git a/app/Models/Resit.php b/app/Models/Resit.php new file mode 100644 index 00000000..02befe25 --- /dev/null +++ b/app/Models/Resit.php @@ -0,0 +1,24 @@ + 1 = paid , 2 = pending + 'paid_at' + ]; +} diff --git a/app/Models/payment.php b/app/Models/payment.php deleted file mode 100644 index 5f0f20ea..00000000 --- a/app/Models/payment.php +++ /dev/null @@ -1,43 +0,0 @@ - Date: Tue, 15 Mar 2022 21:15:36 +0800 Subject: [PATCH 17/17] Create Payment.php --- app/Models/Payment.php | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 app/Models/Payment.php diff --git a/app/Models/Payment.php b/app/Models/Payment.php new file mode 100644 index 00000000..b5b0b333 --- /dev/null +++ b/app/Models/Payment.php @@ -0,0 +1,43 @@ +