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

edit marhun

Browse Source
This commit is contained in:
afiq
2021-02-17 21:34:21 +08:00
parent fb145a4dda
commit 11b9a37928
5 changed files with 297 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+4 -4
View File
@@ -127,9 +127,8 @@ class GadaianController extends Controller
}
public function ubahmarhun(Request $request){
dd($request);
$api_url = config('api.url');
$auth_user = Auth::user();
$gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukedit,[
@@ -137,8 +136,9 @@ class GadaianController extends Controller
'karat' => $request->sltkarat,
'berat' => $request->berat,
'harga' => $request->harga1,
'n_marhun' => $request->nilaimarhun
'n_marhun' => $request->nilaimarhun,
'marhun' => $request->marhun_edit,
'nota' => $request->nota_edit
])->json();
return redirect()->back();
resources/views/gadaian/edit.blade.php
+92 -13
View File
@@ -337,6 +337,14 @@
closeOnSelect: false
});
$(".select2_nota").select2({
dropdownParent: $('#editMarhunModal'),
tags: true,
tokenSeparators: [',', ' '],
allowClear: true,
closeOnSelect: false
});
var total_nilai_marhun = 0;
var total_berat = 0;
var kadarupah = 0;
@@ -443,39 +451,110 @@
}
function editmarhun(e){
let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
let nm = recno[3];let karat = recno[4];let berat = recno[5];
let norujuk = $('#norujukan').val();
let selectedrow = $(e).closest('tr');
let recno = tablemarhun.row(selectedrow).data();
let nm = recno[3];
let karat = recno[4];
let berat = recno[5];
let harga = recno[7];
let nota = recno[6];
let jenismarhun = recno[2];
var res = nota.split(",");
$.ajax({
method:'GET',
url: api_url + '/api/jemas',
success:function(data){
$.each(data,function(index,jemas){
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
})
}
});
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#berat').val(berat);
$('#nilaimarhun').val(nm.substring(2));
$('#harga1').val(harga);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
}
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
let ber = parseFloat($('#berat').val());
let ber = parseFloat($('#berat_edit').val());
let total = ber * hargaref;
// $('#berat').attr('readonly', false);
$('#nilaimarhun').val(total.toFixed(2));
$('#harga1').val(hargaref);
$('#nilaimarhun_edit').val(formatter.format(total));
$('#harga_edit').val(hargaref);
});
function calculationharga(e){
let berat = $(e).val();
let total = 0;
let harga = $('#harga1').val();
let harga = $('#harga_edit').val();
total = berat * harga;
$('#nilaimarhun').val(total.toFixed(2));
$('#nilaimarhun_edit').val(formatter.format(total));
}
$('#terima_edit').on('click',function(){
var nota_edit = $('#nota_edit').val();
var norujukedit = $('#norujukedit').val();
var recnoedit = $('#recnoedit').val();
var marhun_edit = $('#marhun_edit').val();
var sltkarat = $('#sltkarat').val();
var berat_edit = $('#berat_edit').val();
var harga_edit = $('#harga_edit').val();
var nilaimarhun_edit = $('#nilaimarhun_edit').val();
var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
if(nota_edit != null){
var nota = nota_edit.toString();
}else{
var nota = '';
}
if($.isNumeric(berat_edit) == false){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Berat Marhun'
});
event.preventDefault();
return false;
}else{
$.ajax({
method:'put',
url: api_url + '/api/gadai/ubah/marhun/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + norujukedit,
datatype:'json',
data:{
'recno' : recnoedit,
'karat' : sltkarat,
'berat' : berat_edit,
'harga' : harga_edit,
'n_marhun' : nilai_marhun_edit,
'marhun' : marhun_edit,
'nota' : nota
},
success:function(data){
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Ubah Marhun Berjaya'
});
getMarhun(norujukedit);
$('#editMarhunModal').modal('hide');
}
})
}
});
$('#pinjaman').on('input',function(){
var pinjaman = Number(this.value);
var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
resources/views/gadaian/index.blade.php
+94 -20
View File
@@ -158,15 +158,15 @@
</select>
</div>
<div class="col-md-12">
<div class="form-group">
<label>Nota</label>
<select name="nota" id="nota" class="select2 form-control" multiple="multiple" data-placeholder="Nota Tambahan" style="width: 100%;">
<option>Rosak</option>
<option>Putus</option>
<option>Patah</option>
<option>Permata</option>
<option>Sebelah</option>
</select>
<div class="form-group">
<label>Nota</label>
<select name="nota" id="nota" class="select2 form-control" multiple="multiple" data-placeholder="Nota Tambahan" style="width: 100%;">
<option value="Rosak">Rosak</option>
<option value="Putus">Putus</option>
<option value="Patah">Patah</option>
<option value="Permata">Permata</option>
<option value="Sebelah">Sebelah</option>
</select>
</div>
</div>
<div class="col-md-4">Karat</div>
@@ -314,6 +314,14 @@
closeOnSelect: false
});
$(".select2_nota").select2({
dropdownParent: $('#editMarhunModal'),
tags: true,
tokenSeparators: [',', ' '],
allowClear: true,
closeOnSelect: false
});
var total_nilai_marhun = 0;
var total_berat = 0;
var kadarupah = 0;
@@ -519,7 +527,7 @@
var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
var nota_array = $('#nota').val();
console.log($.isNumeric(berat_emas));
if(nota_array != null){
var nota = nota_array.toString();
}else{
@@ -985,34 +993,100 @@
let karat = recno[4];
let berat = recno[5];
let harga = recno[7];
let nota = recno[6];
let jenismarhun = recno[2];
var res = nota.split(",");
$.ajax({
method:'GET',
url: api_url + '/api/jemas',
success:function(data){
$.each(data,function(index,jemas){
$("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
})
}
});
$('#nota_edit').val(res).trigger('change');
$('#sltkarat').val(karat);
$('#berat').val(berat);
$('#nilaimarhun').val(nm);
$('#harga1').val(harga);
$('#marhun_edit').val(jenismarhun);
$('#berat_edit').val(berat);
$('#nilaimarhun_edit').val(nm);
$('#harga_edit').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#recnoedit').val(recno[1]);
$('#editMarhunModal').modal();
}
$('#terima_edit').on('click',function(){
var nota_edit = $('#nota_edit').val();
var norujukedit = $('#norujukedit').val();
var recnoedit = $('#recnoedit').val();
var marhun_edit = $('#marhun_edit').val();
var sltkarat = $('#sltkarat').val();
var berat_edit = $('#berat_edit').val();
var harga_edit = $('#harga_edit').val();
var nilaimarhun_edit = $('#nilaimarhun_edit').val();
var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
if(nota_edit != null){
var nota = nota_edit.toString();
}else{
var nota = '';
}
if($.isNumeric(berat_edit) == false){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Berat Marhun'
});
event.preventDefault();
return false;
}else{
$.ajax({
method:'put',
url: api_url + '/api/gadai/ubah/marhun/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + norujukedit,
datatype:'json',
data:{
'recno' : recnoedit,
'karat' : sltkarat,
'berat' : berat_edit,
'harga' : harga_edit,
'n_marhun' : nilai_marhun_edit,
'marhun' : marhun_edit,
'nota' : nota
},
success:function(data){
Swal.fire({
icon: 'success',
title: 'Berjaya!',
text: 'Ubah Marhun Berjaya'
});
getMarhun(norujukedit);
$('#editMarhunModal').modal('hide');
}
})
}
});
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
let ber = parseFloat($('#berat').val());
let ber = parseFloat($('#berat_edit').val());
let total = ber * hargaref;
$('#nilaimarhun').val(total.toFixed(2));
$('#harga1').val(hargaref);
$('#nilaimarhun_edit').val(formatter.format(total));
$('#harga_edit').val(hargaref);
});
function calculationharga(e){
let berat = $(e).val();
let total = 0;
let harga = $('#harga1').val();
let harga = $('#harga_edit').val();
total = berat * harga;
$('#nilaimarhun').val(total.toFixed(2));
$('#nilaimarhun_edit').val(formatter.format(total));
}
</script>
resources/views/modal/editmarhun.blade.php
+40 -34
View File
@@ -14,48 +14,54 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form name="ubahmarhunform" method="put" action='{{ route('gadai.ubahmarhun') }}'>
@csrf
<div class="modal-body">
<input type="hidden" name="norujukedit" id="norujukedit"/>
<input type="hidden" name="recno" id="recno"/>
<div class="form-group row">
<div class="col-6 form-group row">
<label class="col-4">Karat</label>
<select name="sltkarat" id="sltkarat" class="col-8 form-control">
@foreach ($hargaemas as $index=>$he)
<option value="{{ $he['karat'] }}" data-harga="{{ $he['harga'] }}">{{ $he['karat'] }}</option>
@endforeach
</select>
</div>
<div class="col-6 form-group row">
<label class="col-4 ">Berat</label>
<input type="text" name="berat" id="berat" onkeyup="calculationharga(this)" class="form-control col-8" />
<input type="hidden" name="recnoedit" id="recnoedit"/>
<div class="row justify-content-center">
<div class="col-md-6">
<div class="form-group row">
<div class="col-md-4">Marhun</div>
<div class="col-md-8">
<select class="form-control" name="marhun_edit" id="marhun_edit">
<option disabled selected value> -- Pilih Jenis Marhun -- </option>
</select>
</div>
<div class="col-md-12">
<div class="form-group">
<label>Nota</label>
<select name="nota_edit" id="nota_edit" class="select2_nota form-control" multiple="multiple" data-placeholder="Nota Tambahan" style="width: 100%;">
<option value="Rosak">Rosak</option>
<option value="Putus">Putus</option>
<option value="Patah">Patah</option>
<option value="Permata">Permata</option>
<option value="Sebelah">Sebelah</option>
</select>
</div>
</div>
<div class="col-md-4">Karat</div>
<div class="col-md-8">
<select name="sltkarat" id="sltkarat" class="form-control">
<option disabled selected value> -- Pilih Karat -- </option>
@foreach ($hargaemas as $index=>$he)
<option value="{{ $he['karat'] }}" data-harga="{{ $he['harga'] }}">{{ $he['karat'] }}</option>
@endforeach
</select>
</div>
<div class="col-md-4">Berat</div>
<div class="col-md-8"><input type="text" class="form-control" name="berat_edit" id="berat_edit" onkeyup="calculationharga(this)"/></div>
<div class="col-md-4">Harga</div>
<div class="col-md-8"><input type="text" name="harga_edit" id="harga_edit" class="form-control" readonly/></div>
<div class="col-md-4">Nilai Marhun</div>
<div class="col-md-8"><input type="text" name="nilaimarhun_edit" id="nilaimarhun_edit" class="form-control" readonly/></div>
</div>
</div>
<div class="form-group row">
<div class="col-6 form-group row">
<label class="col-4">Harga</label>
<input type="text" name="harga1" id="harga1" class="form-control col-8" readonly/>
</div>
<div class="col-6 form-group row">
<label class="col-6">Nilai Marhun</label>
<input type="text" name="nilaimarhun" id="nilaimarhun" class="form-control col-6" readonly/>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success btn-lg">Terima</button>
<button type="button" id="terima_edit" class="btn btn-success btn-lg">Terima</button>
</div>
</form>
</div>
</div>
</div>
resources/views/operasi/hargaemas.blade.php
+67 -39
View File
@@ -36,6 +36,7 @@
<td>{{ $he['tarikhupdate'] }}</td>
<td class="text-center">
<a href="#" onclick="editharga(this)" data-recno="{{ $he['recno'] }}" class="btn btn-primary"><i class="fas fa-edit"></i></a>
<a href="#" id="modal_history_es" data-toggle="modal" data-target="#history_emas" data-karat="{{ $he['karat'] }}" class="btn btn-info"><i class="fas fa-info"></i></a>
</td>
</tr>
@endforeach
@@ -54,6 +55,38 @@
</div>
</div>
</div>
<div class="modal fade" id="history_emas" tabindex="-1" data-backdrop="static" aria-labelledby="ModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ModalLabel">Rekod Emas Sandaran</h5>
</div>
<div class="modal-body">
<div class="row">
<div class="col-12">
<table id="history_es">
<thead>
<tr>
<td></td>
<td>Karat</td>
<td>Harga/Gram</td>
<td>Tarikh Efektif</td>
<td>Masa Efektif</td>
</tr>
</thead>
</table>
</div>
</div>
</div>
<div class="modal-footer">
<div class="form-group row">
<button type="button" class="btn btn-danger" name="tutup_komuditi" id="tutup_komuditi" data-dismiss="modal">Tutup</button>
</div>
</div>
</form>
</div>
</div>
</div>
<script>
let api_url = "{{ $api_url }}";
@@ -62,6 +95,12 @@
"scrollX": true
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
var history_es = $('#history_es').DataTable();
$('#terima_emas').on('click',function(){
$('#kemaskiniHargaModal').modal('hide');
var recno = $('#recno').val();
@@ -124,6 +163,34 @@
}
});
});
$('#history_emas').on('show.bs.modal', function(event) {
var button = $(event.relatedTarget);
var karat = button.data('karat');
history_es.clear().draw();
$.ajax({
method:'get',
url: api_url + '/api/harga_emas/rekod/sandaran',
datatype:'json',
data:{
'karat':karat
},
success:function(rekodsandaran){
console.log(rekodsandaran);
var bilcount = 0;
$.each(rekodsandaran,function(index,emassandaran){
bilcount ++
history_es.row.add([
bilcount,
emassandaran['karat'],
formatter.format(emassandaran['harga']),
emassandaran['t_efektif'],
emassandaran['m_efektif']
]).draw();
});
}
});
});
function editharga(e)
@@ -142,45 +209,6 @@
}
function hapusharga(e)
{
let rec_no = $(e).data('recno');
Swal.fire({
title: 'Are you sure?',
text: "You won't be able to revert this!",
icon: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Yes, delete it!'
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
method: 'put',
url: api_url + '/api/harga_emas/delete/' + rec_no,
success:function(data)
{
console.log(data);
}
});
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
).then(function(){
location.reload();
});
}
});
}
</script>
@endsection