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

fix gadaian marhun

Browse Source
This commit is contained in:
Zakwan Hamdan
2020-11-02 16:08:34 +08:00
parent ac9c0b94cf
commit 4e23c1fc78
9 changed files with 237 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomersController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class CustomersController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
if(sizeof($customers_info)!= 0){
if($customers_info){
$customer_info = $customers_info[0];
}else{
$customer_info = $customers_info;
app/Http/Controllers/HargaEmasController.php
+1 -1
View File
@@ -18,7 +18,7 @@ class HargaEmasController extends Controller
public function index(){
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$harga_emas = HargaEmas::all();
$harga_emas = Http::get(config('api.url') . '/api/harga_emas')->json();
return view('harga_emas.index',compact('harga_emas','cawangan_info'));
}
}
public/css/select2.min.css
Vendored
+1
View File
File diff suppressed because one or more lines are too long
public/js/jquery.min.js
Vendored
+6
View File
File diff suppressed because one or more lines are too long
public/js/select2.min.js
Vendored
+3
View File
File diff suppressed because one or more lines are too long
resources/views/customers/info.blade.php
+9 -5
View File
@@ -17,7 +17,7 @@
No Kad Pengenalan
</div>
<div class="col-8">
<input type="text" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
<input type="text" class="form-control" name="noic" id="noic" readonly value="{{ $customer_info['kpbaru'] }}">
</div>
</div>
</div>
@@ -27,7 +27,7 @@
No Pelanggan
</div>
<div class="col-8">
<input type="text" name="no_pelanggan" readonly id="no_pelanggan" value="{{ $customer_info['nopelanggan'] }}">
<input type="text" class="form-control" name="no_pelanggan" readonly id="no_pelanggan" value="{{ $customer_info['nopelanggan'] }}">
</div>
</div>
</div>
@@ -37,7 +37,7 @@
Nama
</div>
<div class="col-8">
<input type="text" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
<input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
</div>
</div>
</div>
@@ -47,7 +47,7 @@
Alamat
</div>
<div class="col-8">
<textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="2" readonly>{{ $customer_info['alamat1'].','.$customer_info['alamat2'].','.$customer_info['alamat3'].','.$customer_info['alamat4'] }}</textarea>
<textarea style="resize:none" class="form-control" name="alamat" id="alamat" cols="30" rows="2" readonly>{{ $customer_info['alamat1'].','.$customer_info['alamat2'].','.$customer_info['alamat3'].','.$customer_info['alamat4'] }}</textarea>
</div>
</div>
</div>
@@ -57,7 +57,7 @@
No Telefon
</div>
<div class="col-8">
<input type="text" readonly name="no_phone" id="no_phone" value="{{ $customer_info['telefon'] }}">
<input type="text" class="form-control" readonly name="no_phone" id="no_phone" value="{{ $customer_info['telefon'] }}">
</div>
</div>
</div>
@@ -90,6 +90,10 @@
<th>Nilai Marhun</th>
<th>Tempoh</th>
<th>Keuntungan</th>
<th>Tarikh Matang</th>
<th>Margin</th>
<th>Kos Keuntungan</th>
<th>Hapus Gadai</th>
<!-- <th>Tebus/Upah</th> -->
</tr>
</thead>
resources/views/gadaian/index.blade.php
+206 -31
View File
@@ -16,7 +16,7 @@
Nama
</div>
<div class="col-8">
<input type="text" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
<input type="text" class="form-control" name="name" id="name" readonly value="{{ $customer_info['nama'] }}">
</div>
</div>
</div>
@@ -26,7 +26,7 @@
No Pelanggan
</div>
<div class="col-8">
<input type="text" name="nopelanggan" readonly id="nopelanggan" value="{{ $customer_info['nopelanggan'] }}">
<input type="text" class="form-control" name="nopelanggan" readonly id="nopelanggan" value="{{ $customer_info['nopelanggan'] }}">
</div>
</div>
</div>
@@ -36,7 +36,7 @@
No Rujukan
</div>
<div class="col-8">
<input type="text" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
<input type="text" class="form-control" name="norujukan" id="norujukan" readonly value="{{ $norujukan }}">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
Jumlah Pinjaman Semasa
</div>
<div class="col-8">
<input type="text" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="">
<input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="">
</div>
</div>
</div>
@@ -56,13 +56,15 @@
Limit Pinjaman Semasa
</div>
<div class="col-8">
<input type="text" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ $limit_pinjaman_semasa }}">
<input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ $limit_pinjaman_semasa }}">
</div>
</div>
</div>
</div>
<div class="col-12 text-right mb-2">
<a class="btn btn-primary" href="{{ route('daftar_marhun',['norujukan'=>$norujukan ]) }}">DAFTAR MARHUN</a>
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">
DAFTAR MARHUN
</button>
</div>
<div class="card">
<div class="card-body">
@@ -70,9 +72,7 @@
<thead>
<tr>
<th>Bil</th>
<th>Kuantiti</th>
<th>Marhun</th>
<th>Keterangan</th>
<th>Nilai Marhun</th>
<th>Karat</th>
<th>Berat</th>
@@ -92,7 +92,7 @@
PINJAMAN MAX
</div>
<div class="col-8">
<input type="text" readonly name="pinjaman_max_teller" id="pinjaman_max_teller">
<input type="text" class="form-control" readonly name="pinjaman_max_teller" id="pinjaman_max_teller">
</div>
</diV>
</div>
@@ -102,18 +102,12 @@
UPAH SEBULAN
</div>
<div class="col-8">
<input type="text" readonly name="upah_sebulan" id="upah_sebulan">
<input type="text" class="form-control" readonly name="upah_sebulan" id="upah_sebulan">
</div>
</diV>
</div>
<div class="col-4">
<div class="form-group row">
<div class="col-4">
ID PELULUS
</div>
<div class="col-8">
<input type="text" name="id_pelulus" id="id_pelulus">
</div>
</diV>
</div>
<div class="col-4">
@@ -122,7 +116,7 @@
PINJAMAN
</div>
<div class="col-8">
<input type="text" name="pinjaman" id="pinjaman">
<input type="text" class="form-control" name="pinjaman" id="pinjaman">
</div>
</diV>
</div>
@@ -132,7 +126,7 @@
UPAH 6 BULAN
</div>
<div class="col-8">
<input type="text" readonly name="upah_6bln" id="upah_6bln">
<input type="text" class="form-control" readonly name="upah_6bln" id="upah_6bln">
</div>
</diV>
</div>
@@ -142,7 +136,7 @@
PINJAMAN MAX PELULUS
</div>
<div class="col-8">
<input type="text" readonly name="pinjaman_max_pelulus" id="pinjaman_max_pelulus">
<input type="text" class="form-control" readonly name="pinjaman_max_pelulus" id="pinjaman_max_pelulus">
</div>
</diV>
</div>
@@ -155,13 +149,170 @@
</form>
</div>
</div>
<!-- modal daftar marhun-->
<div class="modal fade" id="daftar_marhun" tabindex="-1" data-backdrop="static" aria-labelledby="ModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="ModalLabel">Daftar Marhun</h5>
</div>
<div class="modal-body">
<form action="" id="maklumat_marhun" method="post">
<div class="row">
<div class="col-md-6">
<div class="form-group row">
<input type="hidden" name="kodcaw" id="kodcaw" value="">
<div class="col-md-4">No Rujukan</div>
<div class="col-md-8"><input class="form-control" type="text" name="norujukan_marhun" id="norujukan_marhun" value=""></div>
<div class="col-md-4">Marhun</div>
<div class="col-md-8">
<select class="form-control" name="marhun" id="marhun">
<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" 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>
</div>
<div class="col-md-4">Karat</div>
<div class="col-md-8">
<select class="form-control" name="karat" id="karat">
<option disabled selected value> -- Pilih Karat -- </option>
</select>
</div>
<div class="col-md-4">Berat</div>
<div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas"></div>
<div class="col-md-4">Harga</div>
<div class="col-md-8"><input class="form-control" type="text" name="harga" id="harga" readonly></div>
<div class="col-md-4">Nilai Marhun</div>
<div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
<div class="col-md-4">Bilangan Marhun</div>
<div class="col-md-8"><input class="form-control" type="text" name="bilangan_marhun" id="bilangan_marhun" readonly></div>
<div class="col-md-4">Jumlah Nilai Marhun</div>
<div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
</div>
</div>
<div class="col-md-6">
<div class="row">
<div class="col-md-12">
<img style="width:200px" src="{{ asset('img/logo_arrahn_baru.png') }}" alt="">
</div>
</div>
<div class="row">
<div class="form-group row" style="margin-right:auto;margin-left:auto">
<button class="btn btn-primary mr-2">KAMERA</button>
<button class="btn btn-primary">MUAT NAIK</button>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="form-group row">
<input class="btn btn-primary mr-2" type="button" name="tambah_marhun" id="tambah_marhun" value="Tambah">
<input class="btn btn-primary mr-2" type="submit" name="terima_marhun" id="terima_marhun" value="Terima">
<button type="button" class="btn btn-danger" name="batal_marhun" id="batal_marhun">Batal</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
</div>
<script>
$(document).ready( function () {
var norujukan = $('#norujukan').val();
$.ajax({
method:'GET',
url:'http://localhost:8000/api/marhun/'+norujukan,
success:function(data){
marhuntable(data);
}
});
$.ajax({
method:'GET',
url:'http://localhost:8000/api/jemas/'+ $('#kodcaw').val(),
success:function(data){
$.each(data,function(index,jemas){
$("#marhun").append(new Option(jemas['descpt'], jemas['marhun']));
})
}
});
$.ajax({
method:'GET',
url:'http://localhost:8000/api/harga_emas',
success:function(data){
$.each(data,function(index,harga_emas){
var text = harga_emas['karat']+' - '+harga_emas['keterangan'];
$("#karat").append(new Option(text, harga_emas['karat']));
})
}
});
});
$('#karat').change(function(){
var karat = this.value;
karat = karat.replace(/\./g,'-');
var berat = $('#berat_emas').val();
getHargaEmas(karat,berat)
});
$('#berat_emas').change(function(){
var berat = this.value;
var karat = $('#karat').val();
karat = karat.replace(/\./g,'-');
getHargaEmas(karat,berat)
})
$('#batal_marhun').click(function(){
$('#nota').val('').trigger("change");
$('#marhun').val(0);
$('#karat').val(0);
$('#berat_emas').val("");
$('#harga').val("");
$('#nilai_marhun').val("");
$('#daftar_marhun').modal('hide');
})
function getHargaEmas(karat,berat){
$.ajax({
method:'GET',
url:'http://localhost:8000/api/harga_emas/'+karat,
success:function(data){
var nilai_marhun = data['harga2'] * berat;
$('#harga').val(data['harga2']);
$('#nilai_marhun').val(nilai_marhun);
}
})
}
var tablemarhun = $('#myTable').DataTable({
"ordering": false
});
$(".select2").select2({
dropdownParent: $('#daftar_marhun'),
tags: true,
tokenSeparators: [',', ' '],
allowClear: true,
closeOnSelect: false
});
var total_nilai_marhun = 0;
var total_berat = 0;
var kadarupah = 0;
@@ -196,18 +347,6 @@
$('#pinjaman_max_pelulus').val(max_pelulus.toFixed(2));
}
$(document).ready( function () {
var norujukan = $('#norujukan').val();
$.ajax({
method:'GET',
url:'http://localhost:8000/api/marhun/'+norujukan,
success:function(data){
marhuntable(data);
}
})
} );
$('#pinjaman').change(function(){
var pinjaman = Number(this.value);
@@ -226,6 +365,42 @@
$('#upah_6bln').val(upah_6bln.toFixed(2));
});
$('#tambah_marhun').click(function(){
var kodcaw = $('#kodcaw').val();
var norujukan = $('#norujukan').val();
var marhun = $('#marhun').val();
var karat = $('#karat').val();
var berat_emas = $('#berat_emas').val();
var harga = $('#harga').val();
var nilai_marhun = $('#nilai_marhun').val();
$.ajax({
method:'POST',
url:'http://localhost:8000/api/marhun/'+kodcaw,
dataType:'json',
data:{
'norujukan': norujukan,
'marhun' : marhun,
'karat' : karat,
'berat_emas' :berat_emas,
'harga' : harga,
'nilai_marhun' : nilai_marhun
},
success:function(data){
alert('Tambah Marhun Berjaya');
$('#marhun').val(0);
$('#karat').val(0);
$('#berat_emas').val("");
$('#harga').val("");
$('#nilai_marhun').val("");
},
error: function(xhRequest, ErrorText, thrownError){
alert('Tambah Marhun Tidak Berjaya');
console.log(xhRequest);
}
});
})
$('#terima_gadai').click(function(){
var kodcaw = $('#kodcaw').val();
var nokp = $('#nokp').val();
resources/views/harga_emas/index.blade.php
+4 -6
View File
@@ -4,8 +4,8 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<a href="{{ url('/') }}"><i class="fas fa-arrow-left"></i> Kembali</a>
<h3 class="text-center text-uppercase">harga emas sandaran</h3>
<!-- {{ $harga_emas[1]['mutu_emas'] }} -->
<h5 class="text-center text-uppercase">tarikh kemaskini <span>13/12/2020</span></h5>
<div class="card">
<div class="card-body text-center">
@@ -15,18 +15,16 @@
<th>Bil</th>
<th>Mutu Emas</th>
<th>Karat</th>
<th>Kaunter</th>
<th>Harga/Gram</th>
</tr>
</thead>
<tbody>
@foreach($harga_emas as $harga)
<tr>
<td>{{ $harga['id'] }}</td>
<td>{{ $harga['mutu_emas'] }}</td>
<td>{{ $harga['recno'] }}</td>
<td>{{ $harga['keterangan'] }}</td>
<td>{{ $harga['karat'] }}</td>
<td>{{ number_format($harga['kaunter'],2) }}</td>
<td>{{ number_format($harga['harga_gram'],2) }}</td>
<td>{{ number_format($harga['harga'],2) }}</td>
</tr>
@endforeach
</tbody>
resources/views/layouts/app.blade.php
+6 -1
View File
@@ -25,7 +25,12 @@
<link href="{{ asset('vendor/DataTables/datatables.min.css') }}" rel="stylesheet">
<link rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
<script src="{{ asset('js/jquery.min.js') }}"></script>
<link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
<script src="{{ asset('js/select2.min.js') }}"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="{{ asset('vendor/DataTables/datatables.min.js') }}"></script>