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

resolve conflict

Browse Source
This commit is contained in:
afiq
2021-08-06 09:34:49 +08:00
parent 9c88047218 27fa6fea0b
commit ecaa6a7357
66 changed files with 2234 additions and 4384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/laporan/datalejer_am.blade.php
+8 -32
View File
@@ -6,7 +6,13 @@
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Data Lejer AM') }}</div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
<li class="breadcrumb-item active" aria-current="page">Lejer Am</li>
</ol>
</nav>
<div class="card-body text-center">
<div class="row form-group">
@@ -20,8 +26,6 @@
@csrf
<div class="row">
<div class="col-sm-2">Mula</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
@@ -33,7 +37,7 @@
<div class="row">
<div class="col-sm-1"> </div> <div class="col-sm-6"></div>
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formaction="{{route('cetak.lejer_am')}}">
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank" formaction="{{route('cetak.lejer_am')}}">
</div>
</div>
@@ -51,34 +55,6 @@
</form>
</div><!--end section form-->
<br>
<br>
<div class="row">
<div class="col-md-12">
<table class="" id="myTable">
<thead>
<tr>
<th>Bil</th>
<th>Bil Gadaian</th>
<th>Jumlah Pinjaman (RM)</th>
<th>Peratusan %</th>
</tr>
</thead>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div>
</div>
</div>
</div>
</div>
resources/views/khazanah/laporan/index.blade.php
+5 -3
View File
@@ -35,10 +35,12 @@
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pemodal</a>
</div>
<div class="row">
<a href="{{route('laporan.stokauditbersih')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Bersih </a>
{{-- <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a> --}}
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a>
</div>
<div class="row">
<a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Details</a>
{{-- <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a> --}}
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a>
</div>
</div>
<div class="col-3 mx-1">
@@ -61,7 +63,7 @@
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pelanggan</a>
</div>
<div class="row">
<a href="{{route('laporan.datalejer_am')}}" class="btn btn-danger btn-lg btn-block mb-3">Lejer Am</a>
<a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3">Lejer Am</a>
</div>
<div class="row">
<a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>
resources/views/khazanah/laporan/petibesi.blade.php
+6
View File
@@ -44,6 +44,12 @@
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
$(document).ready( function () {
$('#datetimepicker1').datepicker({
format: 'dd-mm-yyyy'
});
});
var tablecustomers = $('#myTable').DataTable({
"ordering": false
});