KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'faiqahzaman'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-03-15 12:54:20 +08:00
parent 41c408567e 60dd89b0ab
commit d46007cf67
6 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+55 -9
View File
@@ -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,11 +191,19 @@ 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');
@@ -348,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);
@@ -362,11 +411,8 @@ class MarhunController extends Controller
$lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan;
$lelongbid->save();
$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');
}
}
resources/views/includes/sidebar.blade.php
+5
View File
@@ -119,6 +119,11 @@
<a href="{{url('pengesahan/perubahanmutumarhun')}}">Perubahan Mutu Marhun</a>
</li>
</ul>
<ul class="list-unstyled collapse {{ (request()->is('pengesahan/*')) ? 'show' : '' }}" id="pengesahanSubmenu" >
<li class="{{ (request()->is('pengesahan/senaraitangguhlelong/*') || request()->is('pengesahan/senaraitangguhlelong') ) ? 'active' : '' }}">
<a href="{{url('pengesahan/senaraitangguhlelong')}}">Senarai Tangguh Lelong</a>
</li>
</ul>
</li>
<li class="{{ (request()->is('Pembida/*')) ? 'active' : '' }}">
<a href="#pembidaSubmenu" data-toggle="collapse" aria-expanded="false" style="">Pembida</a>
resources/views/lelong/showlelong.blade.php
+4 -4
View File
@@ -30,10 +30,10 @@
<td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
<td>Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
</tr>
</table>
</div>
@@ -63,8 +63,8 @@
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Pinjaman (RM)</th>
<th>Upah (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
resources/views/marhun/marhun.blade.php
+1 -1
View File
@@ -44,7 +44,7 @@
<td>{{ $item->nota }}</td>
<td class="text-center">
<a onclick="kemaskini(this)" data-idmarhun="{{ $item->id }}" data-marhun="{{ $item->marhun }}" data-karat="{{ $item->karat }}" data-berat="{{ $item->berat }}" data-harga="{{ $item->harga }}" data-nmarhun="{{ $item->n_marhun }}" data-hargaasas="{{ $item->hargaasas }}" data-nota="{{ $item->nota }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Marhun" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('marhun.delete',$item->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
<a class="confirmdel" href="{{ route('marhun.submitdelete',$item->id) }}" data-toggle="tooltip" data-placement="top" title="Padam Marhun"><i class="far fa-trash-alt"></i></a>
</td>
</tr>
@endforeach
resources/views/simulasi/showsimulasi.blade.php
+4 -4
View File
@@ -27,10 +27,10 @@
<td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
</tr>
<tr>
<td>Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
<td>Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
</tr>
</table>
</div>
@@ -60,8 +60,8 @@
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Pinjaman (RM)</th>
<th>Upah (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Harga Asas (RM)</th>
<th>Caj Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
routes/web.php
+3 -1
View File
@@ -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