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

Merge branch 'pipi' into 'master'

Browse Source 
fix skit2 tambah lelongan

See merge request online-sistem1/kaunter!78
This commit is contained in:
hafifie rahman
2021-03-01 06:42:00 +00:00
parent 1fa1fd3144 da466fd828
commit 7a4137d80e
7 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+13 -13
View File
@@ -350,13 +350,13 @@
<tr> <tr>
<th>Bil</th> <th>Bil</th>
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Tarikh Gadai</th> <th>Tarikh Lelong</th>
<th>Tarikh Matang</th> <th>Tarikh Tuntut</th>
<th>Baki Harga Jualan</th> <th>Pembiayaan</th>
<th>Baki Pembiayaan</th> <th>Harga Jual</th>
<th>Margin</th> <th>Jum Tuntut/Bayar</th>
<th>Tempoh</th>
<th>Keuntungan</th> <th>Keuntungan</th>
<th>Caj Lelong</th>
</tr> </tr>
</thead> </thead>
</table> </table>
@@ -468,13 +468,13 @@
tablelelong.row.add([ tablelelong.row.add([
counter, counter,
'<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>', '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
gadai_detail['t_gadai'], gadai_detail['t_lelong'],
gadai_detail['t_matang1'], gadai_detail['trkhtuntut'],
'RM '+ formatter.format(gadai_detail['bakihargajualan']), 'RM '+ formatter.format(gadai_detail['pinjaman']),
'RM '+formatter.format(gadai_detail['bakipjm']), 'RM '+formatter.format(gadai_detail['hargajual']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', 'RM '+formatter.format(gadai_detail['baki']),
gadai_detail['jbg'], 'RM '+formatter.format(gadai_detail['bakiupah']),
'RM '+ formatter.format(upahsemasa) 'RM '+formatter.format(gadai_detail['cajlelong'])
]).draw(); ]).draw();
} }
counter = counter + 1; counter = counter + 1;
resources/views/lelongan/index.blade.php
+22 -4
View File
@@ -85,6 +85,15 @@
<div class="col-12 form-group row"> <div class="col-12 form-group row">
<div class="col-6" id="divbakihargajualan"> <div class="col-6" id="divbakihargajualan">
<div class="form-group row">
<div class="col-4">
TARIKH
</div>
<div class="col-8">
<input type="text" value="{{ $lelong['sirilel'] }}" class="form-control" readonly/>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col-4"> <div class="col-4">
@@ -97,7 +106,7 @@
<div class="form-group row"> <div class="form-group row">
<div class="col-4"> <div class="col-4">
HARGA JUAL HARGA JUAL (RM)
</div> </div>
<div class="col-8"> <div class="col-8">
<input type="text" value="{{ number_format($lelong['hargajual'],2) }}" class="form-control" readonly/> <input type="text" value="{{ number_format($lelong['hargajual'],2) }}" class="form-control" readonly/>
@@ -106,7 +115,7 @@
<div class="form-group row"> <div class="form-group row">
<div class="col-4"> <div class="col-4">
PEMBIAYAAN PEMBIAYAAN (RM)
</div> </div>
<div class="col-8"> <div class="col-8">
<input type="text" value="{{ number_format($lelong['pinjaman'],2) }}" class="form-control" readonly/> <input type="text" value="{{ number_format($lelong['pinjaman'],2) }}" class="form-control" readonly/>
@@ -117,6 +126,15 @@
<div class="col-6"> <div class="col-6">
<div class="form-group row">
<div class="col-4">
BATCH LELONG
</div>
<div class="col-8">
<input type="text" value="{{ $lelong['batchno'] }}" class="form-control" readonly/>
</div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col-4"> <div class="col-4">
KEUNTUNGAN (RM) KEUNTUNGAN (RM)
@@ -140,7 +158,7 @@
JUMLAH (RM) JUMLAH (RM)
</div> </div>
<div class="col-8"> <div class="col-8">
<input type="text" value="" class="form-control" readonly/> <input type="text" value="{{ number_format($lelong['baki'],2) }}" class="form-control" readonly/>
</div> </div>
</div> </div>
@@ -149,7 +167,7 @@
</div> </div>
<div class="col-12 mt-3"> <div class="col-12 mt-3">
<input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ url()->previous() }}')"> <input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ route('customer_info') }}')">
<input type="button" id="terima_transaksi" class="float-right btn btn-primary mr-2" value="TERIMA"> <input type="button" id="terima_transaksi" class="float-right btn btn-primary mr-2" value="TERIMA">
</div> </div>
resources/views/penebusan/index.blade.php
+4 -4
View File
@@ -825,7 +825,7 @@
text: 'Penebusan Berjaya', text: 'Penebusan Berjaya',
}).then(function() { }).then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}"); window.location.replace("{{ route('customer_info') }}");
}) })
} }
}); });
@@ -878,7 +878,7 @@
'success' 'success'
).then(function() { ).then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}"); window.location.replace("{{ route('customer_info') }}");
}) })
} }
}); });
@@ -1158,7 +1158,7 @@
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}"); window.location.replace("{{ route('customer_info') }}");
}) })
},error: function (request, status, error) { },error: function (request, status, error) {
console.log(request.responseText); console.log(request.responseText);
@@ -1515,7 +1515,7 @@
'success' 'success'
).then(function() { ).then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
window.location.replace("{{ url()->previous() }}"); window.location.replace("{{ route('customer_info') }}");
}) })
},error: function (request, status, error) { },error: function (request, status, error) {
console.log(request.responseText); console.log(request.responseText);
resources/views/print/resitansuran.blade.php
+2 -2
View File
@@ -409,7 +409,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
@@ -502,7 +502,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
resources/views/print/resittambahpinjam.blade.php
+2 -2
View File
@@ -409,7 +409,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
@@ -505,7 +505,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
resources/views/print/resittebus.blade.php
+2 -2
View File
@@ -410,7 +410,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
@@ -509,7 +509,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>
resources/views/print/resittebusseparuh.blade.php
+2 -2
View File
@@ -410,7 +410,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>
<tr> <tr>
@@ -511,7 +511,7 @@ hr.new5 {
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td> <td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
</tr> </tr>