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

update

Browse Source
This commit is contained in:
Azfar Arsyad
2021-12-28 12:34:18 +08:00
parent bf5359464c
commit 6b53072fee
5 changed files with 223 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+59 -3
View File
@@ -56,7 +56,8 @@ class LelongController extends Controller
$lelong = Lelong::where('id','=',$id)->first();
$cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get();
$lelkarat = LelKarat::where('lelong_id','=',$id)->get();
$jeniskarat = JenisKarat::all();
$arraydata = [];
$arraycaw = [];
$data = [];
@@ -216,7 +217,8 @@ class LelongController extends Controller
'total14K',
'total9K',
'lelkarat',
'lelong_id'));
'lelong_id',
'jeniskarat'));
}
public function create($id)
@@ -336,7 +338,61 @@ class LelongController extends Controller
public function kemaskini(Request $request)
{
return redirect()->route('lelong.showlelong',$request->idlelong)
$lelkarat = lelKarat::where('lelong_id','=',$request->idlelong)->get();
foreach($lelkarat as $karat) //save old harga asas
{
$lelkarat_temp = new LelKarat_temp;
$lelkarat_temp->lelong_id = $request->idlelong;
$lelkarat_temp->karat = $karat->karat;
$lelkarat_temp->keterangan = $karat->keterangan;
$lelkarat_temp->harga = $karat->harga;
$lelkarat_temp->harga2 = $karat->harga2;
$lelkarat_temp->save();
}
foreach($lelkarat as $index=>$karat) //update harga asas
{
$karat->karat = $karat->karat;
$karat->keterangan = $karat->keterangan;
$karat->harga = $request->harga[$index];
$karat->harga2 = $request->harga2[$index];
$karat->save();
}
//update marhun
$lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get();
foreach($lelongbid as $bid)
{
$sumhargaasas = 0;
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get();
foreach($lelongbidmarhun as $marhun)
{
$lelkarat = LelKarat::where('lelong_id','=',$bid->lelong_id)->get();
// dd($simkarat);
foreach($lelkarat as $karat)
{
if($karat->karat == $marhun->karat)
{
$val = round($marhun->berat * $karat->harga);
$sumhargaasas = $sumhargaasas + $val;
$marhun->harga = $karat->harga;
$marhun->n_marhun = $marhun->berat * $karat->harga;
$marhun->hargaasas = floatval(number_format($val,2));
$marhun->save();
}
}
}
$bid->hargaasas = $sumhargaasas;
$bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong;
$bid->save();
}
return redirect()->route('lelong.show',$request->idlelong)
->with('success','Kemaskini Berjaya');
}
app/Models/LelKarat_temp.php
+2 -3
View File
@@ -12,12 +12,11 @@ class LelKarat_temp extends Model
protected $table = 'lelkarat_temp';
protected $fillable = [
'lelong_id',
'karat',
'karat2',
'keterangan',
'harga',
'harga2',
't_harga'
'harga2'
];
}
resources/views/lelong/senarailelong.blade.php
+14 -8
View File
@@ -35,14 +35,20 @@
<td>{{ $lel->jbg }}</td>
<td>{{ $lel->cajlelong }}</td>
<td class="text-center">
<a href="{{ route('lelong.refresh') }}"><i class="fas fa-sync-alt"></i></a>
<a href="{{ route('lelong.show',$lel->id) }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}"><i class="far fa-trash-alt"></i></a>
@if(!$lel->masatamat_lelong)
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-play"></i></a>
@else
<a class="stoplelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-stop"></i></a>
@endif
@hasrole('jurulelong')
<a href="{{ route('lelong.refresh') }}"><i class="fas fa-sync-alt"></i></a>
@if(!$lel->masatamat_lelong)
<a class="startlelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-play"></i></a>
@else
<a class="stoplelong" href="{{ route('lelong.start',$lel->id) }}"><i class="fa fa-stop"></i></a>
@endif
<a href="{{ route('lelong.show',$lel->id) }}"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('lelong.delete',$lel->id) }}"><i class="far fa-trash-alt"></i></a>
@endhasrole
</td>
</tr>
resources/views/lelong/showlelong.blade.php
+122 -45
View File
@@ -13,6 +13,11 @@
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
<br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<div class="row">
@@ -142,42 +147,54 @@
</div>
<div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
<br>
{{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
<button class="btn btn-primary" onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
<button class="btn btn-success" onclick="save()" id="btnsimpan">Simpan</button>
<button class="btn btn-danger" onclick="kemaskini()" id="btncancel">Cancel</button>
<form action="{{ route('lelong.kemaskinihargaasas') }}" method="POST" id="formhargaasas">
@csrf
<input type="hidden" name="idlelong" value="{{$lelong_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:80%" >
<thead class="bg-primary text-white">
<tr class="text-center">
<th>Karat</th>
<th>Keterangan</th>
<th>Harga</th>
<th>Harga</th>
</tr>
</thead>
<tbody class="text-center">
@foreach ($lelkarat as $index=>$karat)
<tr>
<td>{{$karat->karat}}</td>
<td>{{$karat->keterangan}}</td>
<td class="input">{{$karat->harga2}}</td>
<td class="input">{{$karat->harga}}</td>
</tr>
@endforeach
</tbody>
<div class="row ">
<div class="col-md-10 mx-auto ">
<button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
</table>
</form>
<div id="hideform">
<label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
<input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
<button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
<button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
</div>
</div>
</div>
<div class="row ">
<div class="col-md-10 mx-auto">
<form action="{{ route('lelong.kemaskinihargaasas') }}" method="POST" id="formhargaasas">
@csrf
<input type="hidden" name="idlelong" value="{{$lelong_id}}">
<table class="table table-striped table-xl" id="kemaskinikarat" style="width:100%" >
<thead class="bg-primary text-white">
<tr class="text-center">
<th>Karat</th>
<th>Keterangan</th>
<th>Harga</th>
<th>Harga</th>
</tr>
</thead>
<tbody class="text-center">
@foreach ($lelkarat as $index=>$karat)
<tr>
<td>{{$karat->karat}}</td>
<td>{{$karat->keterangan}}</td>
<td class="input">{{$karat->harga2}}</td>
<td class="input">{{$karat->harga}}</td>
</tr>
@endforeach
</tbody>
</table>
</form>
</div>
</div>
{{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
</div>
</div>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
</div>
@endif
{{-- {{$cawangan[0] }} --}}
</div>
<div class="modal fade" tabindex="-1" id="modalfilter">
@@ -212,20 +229,26 @@
</div>
</div>
<script>
$("#btnsimpan").hide();
$("#btncancel").hide();
$("#hideform").hide();
$('#btnsimpan').prop('disabled', true)
function kemaskini() {
let inputdata = $("td.input").find("input");
console.log();
var inputdata = $("td.input").find("input");
if(inputdata.length ==0)
{
$("td.input").each(function() {
$("td.input").each(function(index) {
// console.log(index)
var la = $(this).html();
$(this).html("<input type='text' name='harga2[]' value="+la+" />");
if(index%2 ==0 ) //even-0-2-4
{
$(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
}
else //odd-1-3-5-7
{
$(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
}
})
$("#btnsimpan").show();
$("#btncancel").show();
$("#hideform").show();
$("#btnkemaskini").hide();
}
else
@@ -233,18 +256,72 @@
$("td.input").each(function() {
var la = $(this).html();
$(this).html($(la).val());
console.log($(la).val());
})
$("#btnsimpan").hide();
$("#btncancel").hide();
$("#hideform").hide();
$("#btnkemaskini").show();
}
}
function calculate(e)
{
let hargaasasbaru = $('#txthargaasas').val();
let jeniskarat = $(e).data('jeniskarat');
let maxcolumn = 2;
let count = 0;
let indexarray = 0;
$("td.input").each(function(index) {
if(hargaasasbaru)
{
$('#btnsimpan').prop('disabled', false)
if(index%2 == 0)
{
let harga1 = parseInt(hargaasasbaru);
let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
let newhargaasas = harga1 + (harga2);
count++;
$('#harga2'+index).val(newhargaasas.toFixed(2));
}
else
{
let harga1 = parseInt(hargaasasbaru);
let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']);
let newhargaasas = (harga1 + (harga2))/2.72;;
count++;
$('#harga'+index).val(newhargaasas.toFixed(2));
}
if(count == maxcolumn)
{
count = 0;
indexarray++;
}
}
else
{
$('#btnsimpan').prop('disabled', true)
let dummy =0;
if(index%2 == 0)
{
$('#harga2'+index).val(dummy.toFixed(2));
}
else
{
$('#harga'+index).val(dummy.toFixed(2));
}
}
})
}
function save(){
$('#formhargaasas').submit();
}
$('a.confirmdel').confirm({
title: 'Confirmation',
content: 'Anda pasti?',
routes/web.php
+26 -15
View File
@@ -66,24 +66,35 @@ Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], functio
Route::post('/export',['as'=>'sistem.export','uses'=>'DatabaseController@export']);
});
Route::group(['middleware' => ['permission:pendaftaranbatch'],'prefix'=>'lelong'], function () {
Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']);
Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']);
Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
Route::get('/refresh',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']);
Route::group(['prefix'=>'lelong'], function () {
Route::group(['middleware' => ['permission:pendaftaranbatch']], function () {
Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']);
Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']);
Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
});
Route::group(['middleware' => ['permission:import']], function () {
Route::get('/refresh',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']);
});
Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () {
Route::post('/kemaskini',['as'=>'lelong.kemaskinihargaasas','uses'=>'LelongController@kemaskini']);
});
// Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']);
Route::group(['middleware' => ['permission:lelongan']], function () {
Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']);
Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']);
});
Route::group(['middleware' => ['permission:janapemenang']], function () {
Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
});
});
Route::group(['middleware' => ['permission:lelongan'],'prefix'=>'lelong'], function () {
Route::post('/kemaskini',['as'=>'lelong.kemaskinihargaasas','uses'=>'LelongController@kemaskini']);
// Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
// Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']);
// Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']);
Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']);
});
Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () {
Route::get('/senaraimarhun',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']);