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

Update naming and some bugs

Browse Source
This commit is contained in:
unknown
2024-09-22 08:42:59 +08:00
parent 7a5f68e72c
commit 905350f3ec
11 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+46 -10
View File
@@ -3105,6 +3105,29 @@ class KhazanahController extends Controller
return view('khazanah.laporan.tuntutbaki', compact('cawangan_info','api_url')); return view('khazanah.laporan.tuntutbaki', compact('cawangan_info','api_url'));
} }
// public function cetaklaporan_tuntutbaki(Request $request){
// $api_url = config('api.url');
// $auth_user = Auth::user();
// $current = Carbon::now();
// $current = new Carbon();
// $tarikh_cetak = $current->toDateString();
// if($request->datetimepicker1 == null){
// $gadai_date = $current->toDateString();
// }else{
// $split_date = explode('-',$request->datetimepicker1);
// $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
// }
// $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/TuntutBakiTarikh/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json();
// $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
// $cawangan_detail=$cawangan[0];
// return view('print.laporan_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
// }
public function cetaklaporan_tuntutbaki(Request $request){ public function cetaklaporan_tuntutbaki(Request $request){
$api_url = config('api.url'); $api_url = config('api.url');
@@ -3112,21 +3135,34 @@ class KhazanahController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$tarikh_cetak = $current->toDateString(); $tarikh_cetak = $current->toDateString();
if($request->datetimepicker1 == null){ if($request->datetimepicker1 == null){
$gadai_date = $current->toDateString(); $gadai_date = $current->toDateString();
}else{ } else {
$split_date = explode('-',$request->datetimepicker1); $split_date = explode('-', $request->datetimepicker1);
$gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/TuntutBakiTarikh/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json(); // Fetching the data from API
$tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')])
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date])
$cawangan_detail=$cawangan[0]; ->json();
return view('print.laporan_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url')); $cawangan = Http::withOptions(['verify' => config('app.api_verify')])
->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])
->json();
// Check if $tuntutbaki is an array and not empty before sending it to the view
if (!is_array($tuntutbaki) || empty($tuntutbaki)) {
$tuntutbaki = []; // If not valid, set it to an empty array
}
$cawangan_detail = $cawangan[0] ?? null;
return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url'));
} }
resources/views/callcenter/v2/index.blade.php
+1 -1
View File
@@ -3220,7 +3220,7 @@
urlroute = urlroute.replace(':id', norujukan); urlroute = urlroute.replace(':id', norujukan);
Swal.fire( Swal.fire(
'Berjaya!', 'Berjaya!',
'Tebus Pembiayaan Semula Berjaya', 'Penyelesaian Pembiayaan Semula Berjaya',
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
resources/views/khazanah/bajet.blade.php
+5 -5
View File
@@ -51,7 +51,7 @@
</div> </div>
<div class="card bg-light mb-3 col-4 mr-1"> <div class="card bg-light mb-3 col-4 mr-1">
<div class="card-header font-weight-bold">Penebusan</div> <div class="card-header font-weight-bold">Penyelesaian Pembiayaan</div>
<div class="card-body"> <div class="card-body">
<div class="progress mb-2"> <div class="progress mb-2">
<div id="penbprogress" <div id="penbprogress"
@@ -127,7 +127,7 @@
</div> </div>
<div class="card bg-light mb-3 col-4 mr-1"> <div class="card bg-light mb-3 col-4 mr-1">
<span class="font-weight-bold mt-2 mb-2">Penyelesaian Pem. Bulanan</span> <span class="font-weight-bold mt-2 mb-2">Penyelesaian Pembiayaan Bulanan</span>
<div class="card-body"> <div class="card-body">
<div id="chartpenebusan"> <div id="chartpenebusan">
</div> </div>
@@ -163,7 +163,7 @@
</div> </div>
<div class="card bg-light mb-3 col-4"> <div class="card bg-light mb-3 col-4">
<div class="card-header font-weight-bold">Penebusan Terkumpul</div> <div class="card-header font-weight-bold">Penyelesaian Pembiayaan Terkumpul</div>
<div class="card-body"> <div class="card-body">
<div class="row justify-content-center"> <div class="row justify-content-center">
@@ -384,10 +384,10 @@
var optionsbilangan = { var optionsbilangan = {
series: [{ series: [{
name: 'Gadai', name: 'Pembiayaan',
data: [] data: []
}, { }, {
name: 'Tebus', name: 'Penyelesaian Pembiayaan',
data: [] data: []
}], }],
chart: { chart: {
resources/views/penebusan/v2/index-khazanah.blade.php
+1 -1
View File
@@ -2665,7 +2665,7 @@
urlroute = urlroute.replace(':id', norujukan); urlroute = urlroute.replace(':id', norujukan);
Swal.fire( Swal.fire(
'Berjaya!', 'Berjaya!',
'Tebus Pembiayaan Semula Berjaya', 'Penyelesaian Pembiayaan Semula Berjaya',
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
resources/views/penebusan/v2/index.blade-backup.php
+1 -1
View File
@@ -2876,7 +2876,7 @@
urlroute = urlroute.replace(':id', norujukan); urlroute = urlroute.replace(':id', norujukan);
Swal.fire( Swal.fire(
'Berjaya!', 'Berjaya!',
'Tebus Pembiayaan Semula Berjaya', 'Penyelesaian Pembiayaan Semula Berjaya',
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
resources/views/penebusan/v2/index.blade.php
+1 -1
View File
@@ -3298,7 +3298,7 @@
urlroute = urlroute.replace(':id', norujukan); urlroute = urlroute.replace(':id', norujukan);
Swal.fire( Swal.fire(
'Berjaya!', 'Berjaya!',
'Tebus Pembiayaan Semula Berjaya', 'Penyelesaian Pembiayaan Semula Berjaya',
'success' 'success'
) .then(function() { ) .then(function() {
window.open(urlroute, '_blank'); window.open(urlroute, '_blank');
resources/views/print/laporan_audittrail.blade.php
+4 -4
View File
@@ -153,20 +153,20 @@
<table id="header"> <table id="header">
<tr> <tr>
{{-- <th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}} {{-- <th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
{{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}} <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
</tr> </tr>
<tr> <tr>
<td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td> <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td></td> <th colspan="1">{{ $cawangan_detail['namacaw'] }}</th>
</tr> </tr>
{{-- <tr> <tr>
<td>{{ $cawangan_detail['alamat1'] }}</td> <td>{{ $cawangan_detail['alamat1'] }}</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td> <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td> <td></td>
</tr> --}} </tr>
</table> </table>
<br> <br>
resources/views/print/laporan_gadaian.blade.php
+4 -4
View File
@@ -146,21 +146,21 @@
<table id="header"> <table id="header">
<tr> <tr>
{{-- <th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}} <th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
{{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}} <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
</tr> </tr>
<tr> <tr>
<td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td> <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
<td></td> <td></td>
</tr> </tr>
{{-- <tr> <tr>
<td>{{ $cawangan_detail['alamat1'] }}</td> <td>{{ $cawangan_detail['alamat1'] }}</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td> <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
<td></td> <td></td>
</tr> --}} </tr>
</table> </table>
<br> <br>
resources/views/print/laporan_penebusan.blade.php
+1 -1
View File
@@ -167,7 +167,7 @@
<table id="scan"> <table id="scan">
<tr> <tr>
<th colspan ="5"><b>LAPORAN Penyelesaian Pem.</b></th> <th colspan ="5"><b>LAPORAN PENYELESAIAN PEMBIAYAAN</b></th>
<th> </th> <th> </th>
<th> </th> <th> </th>
<th><b> Tarikh Cetak:</b> <th><b> Tarikh Cetak:</b>
resources/views/print/laporan_tebus_ujrah.blade.php
+1 -1
View File
@@ -192,7 +192,7 @@
<table id="scan"> <table id="scan">
<tr> <tr>
<th colspan ="5"><b>LAPORAN PENYELESAIAN PEM.</b></th> <th colspan ="5"><b>LAPORAN PENYELESAIAN PEMBIAYAAN</b></th>
</tr> </tr>
<tr> <tr>
resources/views/print/sag_ujrah_3.blade.php
+3 -3
View File
@@ -375,7 +375,7 @@
<div class="grid-3-col"> <div class="grid-3-col">
<div class="header-left"> <div class="header-left">
<div> <div>
<p>KOPERASI PERMODALAN Kelantan berhad (D-5-0228)</p> <p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
<p>{{ $cawangan_detail['namacaw'] }}</p> <p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p> <p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p> <p>{{ $cawangan_detail['alamat2'] }}</p>
@@ -481,7 +481,7 @@
<table class="main-table mt-5 uppercase no-border"> <table class="main-table mt-5 uppercase no-border">
<tr> <tr>
<th colspan="6" class="centered-header"> <th colspan="2" class="centered-header">
<strong>KETERANGAN MARHUN</strong> <strong>KETERANGAN MARHUN</strong>
</th> </th>
</tr> </tr>
@@ -748,7 +748,7 @@
<th colspan="2">TANDATANGAN SAKSI </th> <th colspan="2">TANDATANGAN SAKSI </th>
</tr> </tr>
<tr> <tr>
<td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td> <td rowspan="2" colspan="2" style="padding:2px; width:33%; height:30px;"></td>
<td rowspan="2" colspan="2" style="width:33%;"></td> <td rowspan="2" colspan="2" style="width:33%;"></td>
<td rowspan="2" colspan="2" style="width:33%;"></td> <td rowspan="2" colspan="2" style="width:33%;"></td>
</tr> </tr>