Merge branch 'new-master' of https://gitlab.com/online-sistem1/kaunter into pipiv2

This commit is contained in:
MUHD HAFIFIE
2021-06-14 15:54:41 +08:00
19 changed files with 121 additions and 71 deletions
@@ -146,7 +146,7 @@
<td>
@php
$customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
echo ($customer_info[0]['nama']);
echo ($customer_info['nama']);
@endphp
</td>
<td>{{ $gadaian['nokp'] }}</td>
@@ -192,8 +192,8 @@
@php
$customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
@endphp
<td><input type="checkbox" id="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info[0]['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
<td>{{ $customer_info[0]['nama'] }}</td>
<td><input type="checkbox" id="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
<td>{{ $customer_info['nama'] }}</td>
<td>{{ $gadaian['nokp'] }}</td>
<td>
@php
@@ -365,7 +365,7 @@
count++;
table_rekod_gadaian.row.add([
count,
rekodcustomer[0]['nama'],
rekodcustomer['nama'],
rekodgadaian['nokp'],
rekodgadaian['norujukan'],
rekodgadaian['pinjaman'],
+1 -1
View File
@@ -194,7 +194,7 @@
dataType: 'json',
success:function(datagadaiwithnokp){
let nama = datagadaiwithnokp[0].nama;
let nama = datagadaiwithnokp.nama;
$('#namalanjut').text(nama);
$('#nokplanjut').text(nokp);
@@ -130,7 +130,7 @@
tabletebus.row.add([
counter,
tebus['norujukan'],
customer[0]['nama'],
customer['nama'],
gadai[0][0]['nokp'],
gadai[0][0]['tempoh'],
gadai[0][0]['bakipjm'],
@@ -200,7 +200,7 @@
total_berat += Number(gadai['berat']);
tablegadai.row.add([
counter,
customer[0]['nama'],
customer['nama'],
gadai['nokp'],
gadai['norujukan'],
formatter.format(gadai['pinjaman']),
@@ -120,7 +120,7 @@
tabletebus.row.add([
counter,
tebus['norujukan'],
customer[0]['nama'] + "<br>" +gadai[0][0]['nokp'],
customer['nama'] + "<br>" +gadai[0][0]['nokp'],
tebus['nilaimarhun'],
tebus['pinjaman'],
tebus['bakiupah'],
@@ -217,7 +217,7 @@
total_bayaran += parseFloat(tebus['bakipjm']);
tabletebus.row.add([
counter,
customer[0]['nama'],
customer['nama'],
gadai[0][0]['nokp'],
tebus['norujukan'],
tebus['t_tebus'],
@@ -131,12 +131,12 @@ function carila()
$( "#form-display" ).fadeIn( "slow", function() {
$('#form-display').show();
$('#nama').val(customerdata[0]['nama']);
$('#noic1').val(customerdata[0]['kpbaru']);
$('#alamat').val(customerdata[0]['alamat1']);
$('#notel').val(customerdata[0]['telefon']);
$('#notel2').val(customerdata[0]['telefon2']);
$('#poskod').val(customerdata[0]['poskod']);
$('#nama').val(customerdata['nama']);
$('#noic1').val(customerdata['kpbaru']);
$('#alamat').val(customerdata['alamat1']);
$('#notel').val(customerdata['telefon']);
$('#notel2').val(customerdata['telefon2']);
$('#poskod').val(customerdata['poskod']);
var poskod = $('#poskod').val();
+1 -1
View File
@@ -192,7 +192,7 @@
dataType: 'json',
success:function(datagadaiwithnokp){
let nama = datagadaiwithnokp[0].nama;
let nama = datagadaiwithnokp.nama;
$('#namalanjut').text(nama);
$('#nokplanjut').text(nokp);
@@ -219,7 +219,7 @@
$gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
$customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
echo $customer_detail[0]['nama'];
echo $customer_detail['nama'];
@endphp
</td>
<td>{{ $gadai_detail[0][0]['nokp'] }}</td>
@@ -243,10 +243,10 @@
<td>
@php
$customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json();
echo $customer_detail[0]['nama'];
echo $customer_detail['nama'];
@endphp
</td>
<td>{{$customer_detail[0]['alamat1']}}</td>
<td>{{$customer_detail['alamat1']}}</td>
<td>{{ $item['nokp'] }}</td>
<td>{{ $item['masa'] }}</td>
<td>{{ number_format($item['berat'],2) }}</td>
@@ -220,7 +220,7 @@
$gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
$customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
echo $customer_detail[0]['nama'] . '<br>' . $gadai_detail[0][0]['nokp'] . '<br>' . $customer_detail[0]['alamat1'] . '<br>' . $customer_detail[0]['alamat2'];
echo $customer_detail['nama'] . '<br>' . $gadai_detail[0][0]['nokp'] . '<br>' . $customer_detail['alamat1'] . '<br>' . $customer_detail['alamat2'];
@endphp
</td>
<td>{{$item['nilaimarhun']}}</td>
@@ -249,7 +249,7 @@
$gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
$customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
echo $customer_detail[0]['nama'];
echo $customer_detail['nama'];
@endphp
</td>
<td>{{$gadai_detail[0][0]['nokp']}}</td>