fix laporan2
This commit is contained in:
fifi97
@@ -2836,17 +2836,24 @@ class KhazanahController extends Controller
|
||||
$current = new Carbon();
|
||||
$tarikh_cetak = $current->toDateString();
|
||||
|
||||
if($request->dateringkasanharian == null){
|
||||
$ringkasan_date = $current->toDateString();
|
||||
}else{
|
||||
$split_date = explode('-',$request->dateringkasanharian);
|
||||
$ringkasan_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
|
||||
}
|
||||
|
||||
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
|
||||
$cawangan_detail=$cawangan[0];
|
||||
|
||||
$laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[
|
||||
'kodcaw'=>$auth_user['cawangan'],
|
||||
'tarikh'=>$tarikh_cetak
|
||||
'tarikh'=>$ringkasan_date
|
||||
])->json();
|
||||
|
||||
$laporan = $laporan_ringkasan[0];
|
||||
|
||||
return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','api_url','laporan'));
|
||||
return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan'));
|
||||
}
|
||||
|
||||
public function cetakLaporanRingkasanTerkumpul(Request $request){
|
||||
|
||||
@@ -7,7 +7,13 @@
|
||||
<div class="col-md-12">
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">{{ __('Data Imbangduga') }}</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">Imbang Duga</li>
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
<div class="row form-group">
|
||||
@@ -19,15 +25,8 @@
|
||||
<div class="container">
|
||||
<form method="post">
|
||||
@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>
|
||||
<br> <div class="row">
|
||||
<div class="col-sm-2">Hingga</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-2">Tarikh</div>
|
||||
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
|
||||
</div>
|
||||
<br>
|
||||
@@ -38,43 +37,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-sm-1"> </div>
|
||||
<div class="col-sm-6"> </div>
|
||||
<div class="col-sm-6"> </div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</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>
|
||||
</div>
|
||||
</div>
|
||||
@@ -83,205 +48,20 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var api_url = "<?php echo $api_url ?>";
|
||||
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
|
||||
|
||||
var tablecustomers = $('#myTable').DataTable({
|
||||
"ordering": false
|
||||
});
|
||||
$(document).ready( function () {
|
||||
console.log('dsasa');
|
||||
$('#datetimepicker1').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
console.log('dsasa');
|
||||
$('#datetimepicker2').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
var current = new Date();
|
||||
var current_date = current.getDate();
|
||||
var current_month = current.getMonth()+1;
|
||||
var current_year = current.getFullYear();
|
||||
var today_date = current_year + '-' +current_month+'-'+current_date;
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
|
||||
success: function(customers){
|
||||
customertable(customers);
|
||||
},error: function(XMLHttpRequest, textStatus, errorThrown) {
|
||||
console.log(textStatus);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('#datetimepicker1').change(function(){
|
||||
var input_date = this.value;
|
||||
var split_date = input_date.split('-');
|
||||
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: api_url + '/api/marhun/laporan/'+kodcaw+'/' + today_date,
|
||||
success: function(customers){
|
||||
customertable(customers);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function customertable(data){
|
||||
var counter = 1;
|
||||
tablecustomers.clear().draw();
|
||||
$.each(data,function(index,customers){
|
||||
|
||||
tablecustomers.row.add([
|
||||
counter,
|
||||
customers['norujukan'],
|
||||
customers['nokp'],
|
||||
customers['nama'],
|
||||
customers['marhun'],
|
||||
customers['nota'],
|
||||
customers['berat'],
|
||||
customers['karat'],
|
||||
customers['harga'],
|
||||
customers['n_marhun'],
|
||||
]).draw();
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
$(document).ready( function () {
|
||||
console.log('dsasa');
|
||||
$('#datetimepicker2').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
|
||||
$(document).ready( function () {
|
||||
console.log('dsasa');
|
||||
$('#datetimepicker3').datepicker({
|
||||
format: 'dd-mm-yyyy'
|
||||
});
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="modal" id="myModal">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
|
||||
<!-- Modal Header -->
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Laporan Imbangan Duga Cawangan</h5>
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Modal body -->
|
||||
<div class="modal-body">
|
||||
|
||||
<style>
|
||||
#details {
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
border-collapse: collapse;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
#details td, #details th {
|
||||
|
||||
padding: 8px;
|
||||
font-size:11px;
|
||||
}
|
||||
|
||||
#details tr:nth-child(even){background-color: #ffffff;}
|
||||
|
||||
#details tr:hover {background-color: #ffffff;}
|
||||
|
||||
#details th {
|
||||
padding-top: 12px;
|
||||
font-style:bold;
|
||||
padding-bottom: 12px;
|
||||
text-align: left;
|
||||
padding:4px;
|
||||
color:black;
|
||||
}
|
||||
</style>
|
||||
|
||||
<form action="{{route('imbangduga.cetak')}}" method="post">
|
||||
|
||||
@csrf
|
||||
|
||||
<table id="details">
|
||||
<tr>
|
||||
<td> <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker3" name="datetimepicker3" autocomplete="off" aria-describedby="basic-addon1"> </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td> <input type="submit" class="btn btn-success ml-md-5" id="submit_button" name="submit_button" value="Jana Laporan" > </td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Modal footer -->
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-danger" data-dismiss="modal">Kembali</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@endsection
|
||||
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
<a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<a href="{{ route('ringkasanharian.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>
|
||||
<a href="{{ route('laporan.ringkasanharian') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<a href="{{ route('laporan.marhunterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Marhun Terkumpul</a>
|
||||
@@ -81,7 +81,7 @@
|
||||
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Kawalan Stok</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<a href="{{route('laporan.imbangduga')}}" class="btn btn-danger btn-lg btn-block mb-3">Imbang Duga</a>
|
||||
<a href="{{route('laporan.imbangduga')}}" class="btn btn-dark btn-lg btn-block mb-3">Imbang Duga</a>
|
||||
</div>
|
||||
<div class="row">
|
||||
<a href="{{route('laporan.petibesi')}}" class="btn btn-dark btn-lg btn-block mb-3">Peti Besi</a>
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="card">
|
||||
<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">Ringkasan Harian</li>
|
||||
</ol>
|
||||
</nav>
|
||||
|
||||
<div class="card-body text-center">
|
||||
<div class="row form-group">
|
||||
<div class="col-md-2">
|
||||
</div>
|
||||
<div class="col-md-10">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-5">
|
||||
<form action="{{ route('ringkasanharian.laporancetak') }}" target="_blank" method="get">
|
||||
@csrf
|
||||
<div class="input-group mb-3">
|
||||
<div class="input-group-prepend">
|
||||
<span class="input-group-text" id="basic-addon1">Tarikh</span>
|
||||
</div>
|
||||
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="dateringkasanharian" aria-describedby="basic-addon1">
|
||||
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
var api_url = "<?php echo $api_url ?>";
|
||||
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
|
||||
|
||||
var tablecustomers = $('#myTable').DataTable({
|
||||
"ordering": false
|
||||
});
|
||||
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@@ -50,6 +50,8 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p style="font-weight: bold;margin-left: 10px;">Tarikh : {{ $ringkasan_date }} <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
|
||||
|
||||
<div class="row p-4">
|
||||
<div class="col-6 box">
|
||||
<div class="row form-group">
|
||||
@@ -94,11 +96,11 @@
|
||||
<p><b>C) WANG PETI BESI</b></p>
|
||||
</div>
|
||||
<div class="col-6">1. SISTEM</div>
|
||||
<div class="col-6"></div>
|
||||
<div class="col-6">{{ 'RM '. number_format($laporan['petibesi_sistem'],2) }}</div>
|
||||
<div class="col-6">2. IMBANG DUGA</div>
|
||||
<div class="col-6"></div>
|
||||
<div class="col-6">{{ 'RM '. number_format($laporan['petibesiimbangduga'],2) }}</div>
|
||||
<div class="col-6">3. DENOMINASI</div>
|
||||
<div class="col-6"></div>
|
||||
<div class="col-6">{{ 'RM '. number_format($laporan['petibesi_deno'],2) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 box">
|
||||
@@ -146,7 +148,7 @@
|
||||
<tr>
|
||||
<td>2</td>
|
||||
<td>STOK AUDIT</td>
|
||||
<td></td>
|
||||
<td>{{ 'RM '. number_format($laporan['stokaudit'],2) }}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
@@ -183,6 +183,7 @@ Route::get('/laporan/petibesi',['as'=>'laporan.petibesi','uses'=>'KhazanahContro
|
||||
Route::post('laporan/petibesi/cetak',['as'=>'petibesi.laporancetak','uses'=>'KhazanahController@cetakLaporanPetiBesi'])->middleware('auth','khazanah');
|
||||
Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>'KhazanahController@laporanMarhunTerkumpul'])->middleware('auth','khazanah');
|
||||
Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah');
|
||||
Route::get('laporan/ringkasanharian/',['as'=>'laporan.ringkasanharian','uses'=>'KhazanahController@laporanRingkasanHarian'])->middleware('auth','khazanah');
|
||||
Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah');
|
||||
Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
|
||||
Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
|
||||
|
||||
Reference in New Issue
Block a user