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

fix penebusan & gadaian range

Browse Source
This commit is contained in:
fifi97
2021-06-07 19:48:38 +08:00
parent c78e125a6f
commit c0b1bfa09e
6 changed files with 273 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+54 -16
View File
@@ -2770,17 +2770,38 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
$gadai_date = $current->toDateString();
// dd($request->all());
if($request->datemula == null){
$split_date = explode('-', $request->datehingga);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}else{
$split_date = explode('-',$request->datetimepicker1);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
$split_date = explode('-', $request->datemula);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
if($request->datehingga == null){
$hingga_date = $request->datemula;
}else{
$split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datemula == null && $request->datehingga == null)
{
$mula_date = $current->toDateString();
$hingga_date = $current->toDateString();
}
// $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
$gadai = Http::get(config('api.url'). '/api/gadailaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date, 'akhir' => $hingga_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
}
public function laporanPenebusan(){
@@ -2797,20 +2818,37 @@ class KhazanahController extends Controller
$current = Carbon::now();
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){
$tebus_date = $current->toDateString();
if($request->datemula == null){
$split_date = explode('-', $request->datehingga);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}else{
$split_date = explode('-',$request->datetimepicker1);
$tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
$split_date = explode('-', $request->datemula);
$mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
$tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
$tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
$upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
if($request->datehingga == null){
$hingga_date = $request->datemula;
}else{
$split_date = explode('-', $request->datehingga);
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
if($request->datemula == null && $request->datehingga == null)
{
$mula_date = $current->toDateString();
$hingga_date = $current->toDateString();
}
$tebus = Http::get(config('api.url'). '/api/tebuslaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
$tebuspengasingan = Http::get(config('api.url'). '/api/tebuslaporanjenistawarruqrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
$upahlama = Http::get(config('api.url'). '/api/advansurdetailsrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama'));
}
public function laporanLelongan(){
@@ -3332,11 +3370,11 @@ class KhazanahController extends Controller
'akhir' => $hingga_date
])->json();
dd($laporan_ringkasan);
$laporan_ringkasan = $laporan_ringkasan[0];
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
// dd($gadai);
return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
}
resources/views/khazanah/laporan/gadaian.blade.php
+80 -11
View File
@@ -21,14 +21,21 @@
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="col-md-">
<form action="{{ route('gadaian.laporancetak') }}" target="_blank" method="post">
@csrf
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
<div class="input-group-prepend ml-3">
<span class="input-group-text" id="basic-addon1">Mula</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
<input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
<div class="input-group-prepend ml-2 ">
<span class="input-group-text" id="basic-addon1">Hingga</span>
</div>
<input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" aria-describedby="basic-addon1">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</form>
@@ -78,7 +85,10 @@
"ordering": false
});
$(document).ready( function () {
$('#datetimepicker1').datepicker({
$('#datemula').datepicker({
format: 'dd-mm-yyyy'
});
$('#datehingga').datepicker({
format: 'dd-mm-yyyy'
});
var current = new Date();
@@ -88,22 +98,81 @@
var today_date = current_year + '-' +current_month+'-'+current_date;
$.ajax({
method:'get',
url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date,
url: api_url + '/api/gadailaporanRange/'+kodcaw,
data:{'mula' : today_date, 'akhir' : today_date },
success: function(gadai){
console.log(gadai);
gadaitable(gadai);
}
});
});
$('#datetimepicker1').change(function(){
$('#datemula').change(function(){
//mula
var input_date = this.value;
var split_date = input_date.split('-');
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula = mula_date;
//current time
var hinggainput = $('#datehingga').val();
if(hinggainput != '')
{
var input_date = hinggainput;
var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var hingga = hingga_date;
}else{
var hingga = mula_date;
}
$.ajax({
method:'get',
url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date,
success: function(gadai){
gadaitable(gadai);
url: api_url + '/api/gadailaporanRange/' + kodcaw,
data:{'mula' : mula, 'akhir' : hingga },
success: function(panjar){
gadaitable(panjar);
}
});
});
$('#datehingga').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var hingga = hingga_date;
//current time
var mulainput = $('#datemula').val();
if(mulainput != '')
{
var input_date = mulainput;
var split_date = input_date.split('-');
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula = mula_date;
}else{
var dulu_date = hingga_date;
var mula = dulu_date;
}
$.ajax({
method:'get',
url: api_url + '/api/gadailaporanRange/' + kodcaw,
data:{'mula' : mula, 'akhir' : hingga },
success: function(panjar){
gadaitable(panjar);
}
});
});
resources/views/khazanah/laporan/penebusan.blade.php
+95 -14
View File
@@ -21,14 +21,21 @@
</div>
</div>
<div class="row">
<div class="col-md-5">
<div class="col-md-">
<form action="{{ route('tebus.laporancetak') }}" target="_blank" method="post">
@csrf
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
<div class="input-group-prepend ml-3">
<span class="input-group-text" id="basic-addon1">Mula</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
<input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
<div class="input-group-prepend ml-2 ">
<span class="input-group-text" id="basic-addon1">Hingga</span>
</div>
<input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" aria-describedby="basic-addon1">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</form>
@@ -76,7 +83,10 @@
"ordering": true
});
$(document).ready( function () {
$('#datetimepicker1').datepicker({
$('#datemula').datepicker({
format: 'dd-mm-yyyy'
});
$('#datehingga').datepicker({
format: 'dd-mm-yyyy'
});
var current = new Date();
@@ -86,28 +96,99 @@
var today_date = current_year + '-' +current_month+'-'+current_date;
$.ajax({
method:'get',
url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
url: api_url + '/api/tebuslaporanRange/' + kodcaw,
data:{'mula' : today_date, 'akhir' : today_date },
success: function(tebus){
tebustable(tebus);
}
});
});
$('#datetimepicker1').change(function(){
// $('#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/tebus/laporan/'+kodcaw+'/' + today_date,
// success: function(tebus){
// tebustable(tebus);
// }
// });
// $('#pinjamantotal').text('0.00');
// $('#keuntungantotal').text('0.00');
// $('#bayarantotal').text('0.00');
// });
$('#datemula').change(function(){
//mula
var input_date = this.value;
var split_date = input_date.split('-');
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula = mula_date;
//current time
var hinggainput = $('#datehingga').val();
if(hinggainput != '')
{
var input_date = hinggainput;
var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var hingga = hingga_date;
}else{
var hingga = mula_date;
}
$.ajax({
method:'get',
url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
success: function(tebus){
tebustable(tebus);
url: api_url + '/api/tebuslaporanRange/' + kodcaw,
data:{'mula' : mula, 'akhir' : hingga },
success: function(panjar){
tebustable(panjar);
}
});
$('#pinjamantotal').text('0.00');
$('#keuntungantotal').text('0.00');
$('#bayarantotal').text('0.00');
});
$('#datehingga').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var hingga = hingga_date;
//current time
var mulainput = $('#datemula').val();
if(mulainput != '')
{
var input_date = mulainput;
var split_date = input_date.split('-');
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var mula = mula_date;
}else{
var dulu_date = hingga_date;
var mula = dulu_date;
}
$.ajax({
method:'get',
url: api_url + '/api/gadailaporanRange/' + kodcaw,
data:{'mula' : mula, 'akhir' : hingga },
success: function(panjar){
tebustable(panjar);
}
});
});
resources/views/print/laporan_gadaian.blade.php
+10 -4
View File
@@ -174,20 +174,26 @@
<th></th>
</tr>
<tr>
<td><b> Tarikh:</b></td>
<td><b> Tarikh Mula:</b></td>
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td><b> Tarikh Hingga:</b></td>
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
</tr>
<tr>
<td style="width:10px"> <b>Tarikh Cetak</b></td>
<td style="text-align:left;">@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
</tr>
<tr>
<td style="width:50px">
</td>
<td> </td>
resources/views/print/laporan_penebusan.blade.php
+10 -4
View File
@@ -186,16 +186,22 @@
<th></th>
</tr>
<tr>
<td style="width:10px"> <b>TARIKH</b></td>
<td style="width:10px"> <b>Tarikh Mula:</b></td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:50px">
</td>
<td style="width:10px"> <b>Tarikh Hingga:</b></td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:50px">
</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
resources/views/print/laporan_ringkasanterkumpulv2.blade.php
+24 -24
View File
@@ -51,7 +51,7 @@
</table>
<br><br>
<p style="font-weight: bold;margin-left: 10px;">Tarikh Mula: {{ $mula_date }} <span style="margin-left:20px;">Tarikh Hingga : {{ $hingga_date }}</span> <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
{{ dd($laporan_ringkasan) }}
<div class="row p-4">
<div class="col-6 box">
<div class="row form-group">
@@ -59,15 +59,15 @@
<p><b>A) LAPORAN TERKUMPUL</b></p>
</div>
<div class="col-6">1. PEMBIAYAAN</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}</div>
<div class="col-6">2. PENEBUSAN</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['total_tebus'],2) }}</div>
<div class="col-6">3. ANSURAN PEMBIAYAAN</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['total_ansuran'],2) }}</div>
<div class="col-6">4. BAYARAN ONLINE</div>
<div class="col-6"> RM 0.00 </div>
<div class="col-6">5. KEUNTUNGAN</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['total_keuntungan'],2) }}</div>
<div class="col-6">6. KEUNTUNGAN ONLINE</div>
<div class="col-6"> RM 0.00 </div>
</div>
@@ -78,15 +78,15 @@
<p><b>B) BIL TRANSAKSI</b></p>
</div>
<div class="col-6">1. PEMBIAYAAN</div>
<div class="col-6"></div>
<div class="col-6">{{ $laporan_ringkasan['bilangan_gadai'] }}</div>
<div class="col-6">2. PENEBUSAN</div>
<div class="col-6"></div>
<div class="col-6">{{ $laporan_ringkasan['bilangan_tebus'] }}</div>
<div class="col-6">3. ANSURAN PEMBIAYAAN</div>
<div class="col-6"></div>
<div class="col-6">{{ $laporan_ringkasan['bilangan_ansuran'] }}</div>
<div class="col-6">4. BAYARAN ONLINE</div>
<div class="col-6"></div>
<div class="col-6">0</div>
<div class="col-6">5. PELANGGAN BARU</div>
<div class="col-6"></div>
<div class="col-6">{{ $laporan_ringkasan['bilangan_customer_baru'] }}</div>
</div>
</div>
</div>
@@ -98,15 +98,15 @@
<p><b>F) LELONG</b></p>
</div>
<div class="col-6">1. LELONG HARI INI</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}</div>
<div class="col-6">2. BAKI</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}</div>
<div class="col-6">3. RUGI</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}</div>
<div class="col-6">4. CAJ LELONG</div>
<div class="col-6"></div>
<div class="col-6">RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}</div>
<div class="col-6">5. BIL</div>
<div class="col-6"></div>
<div class="col-6">{{ $laporan_ringkasan['bilangan_lelong'] }}</div>
</div>
</div>
<div class="col-6 box">
@@ -143,23 +143,23 @@
<tr>
<td>1</td>
<td>PEMBIAYAAN</td>
<td></td>
<td></td>
<td></td>
<td>RM {{ number_format($laporan_ringkasan['gadai_70'],2) }}</td>
<td>RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}</td>
<td>RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}</td>
</tr>
<tr>
<td>2</td>
<td>NILAI MARHUN</td>
<td></td>
<td></td>
<td></td>
<td>RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}</td>
<td>RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}</td>
<td>RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}</td>
</tr>
<tr>
<td>3</td>
<td>BILANGAN</td>
<td></td>
<td></td>
<td></td>
<td>{{ $laporan_ringkasan['bilangan_70'] }}</td>
<td>{{ $laporan_ringkasan['bilangan_75'] }}</td>
<td>{{ $laporan_ringkasan['bilangan_80'] }}</td>
</tr>
</tbody>
</table>