Merged in finadev (pull request #90)
add jenis bayaran at history ansuran
This commit is contained in:
@@ -1402,14 +1402,23 @@
|
||||
$.each(data,function(index,bayaran){
|
||||
|
||||
var urlroute = '{{ route("resit.ansuran", ":id") }}';
|
||||
var bayaranteller;
|
||||
|
||||
if(bayaran['teller'] != 'Online')
|
||||
bayaranteller = 'KT';
|
||||
|
||||
if(bayaran['teller'] == 'Online')
|
||||
bayaranteller = 'ON';
|
||||
|
||||
urlroute = urlroute.replace(':id', bayaran['id']);
|
||||
historybayarandatatable.row.add([
|
||||
counter,
|
||||
bayaran['created_at'],
|
||||
"RM " + bayaran['duit_masuk'],
|
||||
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
|
||||
]).draw();
|
||||
counter = counter + 1;
|
||||
counter,
|
||||
bayaran['created_at'],
|
||||
"RM " + bayaran['duit_masuk'],
|
||||
bayaranteller,
|
||||
'<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
|
||||
]).draw();
|
||||
counter = counter + 1;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
</div>
|
||||
<ul class="nav nav-tabs" id="custom-tabs-one-tab" role="tablist">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" id="custom-tabs-one-home-tab" data-toggle="pill" href="#custom-tabs-one-home" role="tab" aria-controls="custom-tabs-one-home" aria-selected="true">Bayaran</a>
|
||||
<a class="nav-link active" id="custom-tabs-one-home-tab" data-toggle="pill" href="#custom-tabs-one-home" role="tab" aria-controls="custom-tabs-one-home" aria-selected="true">Ansuran</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="custom-tabs-upah-tab" data-toggle="pill" href="#custom-tabs-upah" role="tab" aria-controls="custom-tabs-upah" aria-selected="false">Keuntungan</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="custom-tabs-one-profile-tab" data-toggle="pill" href="#custom-tabs-one-profile" role="tab" aria-controls="custom-tabs-one-profile" aria-selected="false">Rekod</a>
|
||||
<a class="nav-link" id="custom-tabs-one-profile-tab" data-toggle="pill" href="#custom-tabs-one-profile" role="tab" aria-controls="custom-tabs-one-profile" aria-selected="false">Tebus</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content" id="custom-content-below-tabContent">
|
||||
@@ -43,6 +43,7 @@
|
||||
<th>Bil</th>
|
||||
<th>Tarikh Bayaran</th>
|
||||
<th>Bayaran</th>
|
||||
<th>Jenis Bayaran</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
Reference in New Issue
Block a user