KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged main into afiqhamzah/recode-index-admin

Browse Source
This commit is contained in:
Afiq Hamzah
2024-08-04 02:01:34 +00:00
parent 746847c67c 6c62bff846
commit 6e49ffd680
10 changed files with 358 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/Akaun/Ansuran.vue
+101 -22
View File
@@ -18,7 +18,11 @@
<input :value="$kodcaw" name="kodcaw" hidden/>
<input :value="$hostname" name="hostname" hidden/>
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
<input id="tarikhmula" name="datetimepicker1" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
<input id="tarikhmula" name="datemula" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
<input id="tarikhhingga" name="datehingga" @change="dateChecking()" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date"/>
</div>
<div class="flex justify-end mt-10">
<button @click.prevent="generatepdf" class=" mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button>
<button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>View</button>
</div>
@@ -39,41 +43,116 @@ export default {
}
},
methods: {
async generatepdf(){
async generatepdf(){
await this.setJenis('pdf');
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
document.getElementById("formansuran").submit();
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
} else{
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formansuran").submit();
}
},
async generateview(){
await this.setJenis('view');
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formansuran").submit();
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
} else{
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formansuran").submit();
}
},
Urlredirect: function() {
return window.route('cetak.ansuran')
return window.route('cetak.ansuranRangeDate')
},
setJenis: function(value){
return this.jenisgenerate = value;
},
dateChecking(){
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
}
}
}
resources/js/Akaun/Penebusan.vue
+100 -21
View File
@@ -21,7 +21,11 @@
<input :value="$hostname" name="hostname" hidden/>
<input :value="$kodcaw" name="kodcaw" hidden/>
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
<input id="tarikhmula" name="datetarikh" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
<input id="tarikhmula" name="datemula" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
<input id="tarikhhingga" name="datehingga" @change="dateChecking()" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date"/>
</div>
<div class="flex justify-end mt-10">
<button @click.prevent="generatepdf" class=" mr-2 border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-file-pdf mr-2"></i>PDF</button>
<button @click.prevent="generateview" class="border border-yellow-600 text-yellow-600 font-montserrat py-2 px-8 font-medium rounded-xl hover:bg-yellow-600 hover:text-white transition-all duration-300"><i class="fas fa-eye mr-2"></i>View</button>
</div>
@@ -35,48 +39,123 @@
<script>
export default {
data(){
return{
jenisgenerate:'none',
kodcaw:''
kodcaw: ''
}
},
methods: {
async generatepdf(){
await this.setJenis('pdf');
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
} else{
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formpenebusan").submit();
}
document.getElementById("formpenebusan").submit();
},
async generateview(){
await this.setJenis('view');
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
} else{
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formpenebusan").submit();
}
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
showCancelButton: false,
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formpenebusan").submit();
},
Urlredirect: function() {
return window.route('cetak.penebusan')
return window.route('cetak.penebusanRangeDate')
},
setJenis: function(value){
return this.jenisgenerate = value;
},
dateChecking(){
var tarikhMula = document.getElementById("tarikhmula");
var tarikhHingga = document.getElementById("tarikhhingga");
var tarikh1 = new Date(tarikhMula.value);
var tarikh2 = new Date(tarikhHingga.value);
var Difference_In_Time = tarikh2.getTime() - tarikh1.getTime();
var Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24) + 1;
if(Difference_In_Days > 62){
Vue.swal({
text: 'Sila Pilih Tarikh Kurang Dari 2 Bulan',
icon: 'error',
allowEscapeKey : false,
showCancelButton: false,
showConfirmButton: true,
});
}
}
}
resources/views/akaun/laporan_ansuran.blade.php
+18 -8
View File
@@ -169,16 +169,23 @@
<th colspan ="5"><b>LAPORAN ANSURAN</b></th>
</tr>
<tr>
<td style="white-space: nowrap" colspan="2"><b>Tarikh Bayaran: </b>
<td style="white-space: nowrap" colspan="2"><b>Tarikh Mula: </b>
@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="white-space: nowrap" colspan="2"><b> Tarikh Hingga: </b>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="white-space: nowrap" colspan="2"><b>Tarikh Cetak: </b>
@@ -220,8 +227,8 @@
$totalduitmasuk += $item['duit_masuk'];
$totalkeuntungan += $item['bayaran_keuntungan'];
$totalpendahuluan += $item['bayaran_pembiayaan'];
$totalujrah += bcdiv(round($item['ansuranujrah'],2),1,1);
$totalonepercent += bcdiv(round($item['ansuranonepercent'],2),1,1);
$totalujrah += array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
$totalonepercent += bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1);
@endphp
@if($index > 0)
@@ -262,8 +269,11 @@
<td>{{ $item['tempoh'] }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>
<td>{{ number_format(bcdiv(round($item['ansuranujrah'],2),1,1),2) }}</td>
<td>{{ number_format(bcdiv(round($item['ansuranonepercent'],2),1,1),2) }}</td>
@php
$totalujrah = array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
@endphp
<td>{{ number_format($totalujrah, 2) }}</td>
<td>{{ number_format(bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1),2) }}</td>
<td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
<td>{{ number_format($item['duit_masuk'],2) }}</td>
</tr>
@@ -272,8 +282,8 @@
$totaldmteller += $item['duit_masuk'];
$totalupahteller += $item['bayaran_keuntungan'];
$totalpendhteller += $item['bayaran_pembiayaan'];
$totalujrahteller += bcdiv(round($item['ansuranujrah'],2),1,1);
$totalonepercentteller += bcdiv(round($item['ansuranonepercent'],2),1,1);
$totalujrahteller += array_key_exists('ansuranujrah', $item) ? bcdiv(round($item['ansuranujrah'],2),1,1) : 0;
$totalonepercentteller += bcdiv(round(array_key_exists('ansuranonepercent', $item) ? $item['ansuranonepercent'] : 0,2),1,1);
@endphp
@if($index+1 < sizeof($tebus))
resources/views/akaun/laporan_imbanduga.blade.php
+6 -1
View File
@@ -418,7 +418,12 @@
<table id="tarikh_ib">
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
<tr>
<td style="width:20%; white-space: nowrap;"><b>Tarikh Laporan</b></td >
<td style="width:20%; white-space: nowrap;"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td>
<td style="width:150%; white-space: nowrap;"><b>Tarikh Cetak</b></td>
<td style="width:20%; white-space: nowrap;"> {{$tarikh_cetak}} </td>
</tr>
resources/views/akaun/laporan_imbangduga-akru.blade.php
+1 -1
View File
@@ -263,7 +263,7 @@
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
width:60%;
}
#tarikh_ib td, #tarikh_ib th {
resources/views/akaun/laporan_online.blade.php
+1
View File
@@ -225,6 +225,7 @@
</tr>
@php $counter = 1; $totalamaun = 0; $jenis = ''; @endphp
@foreach($Online as $index=>$item)
<tr>
<td>{{ $counter }}</td>
<td>{{ $item['tarikh'] }}</td>
<td><b>{{ $item['descpt'] }}</b></td>
resources/views/akaun/laporan_penebusan.blade.php
+14 -5
View File
@@ -174,12 +174,21 @@
<td style="white-space: nowrap" colspan="2"><b>Tarikh Mula: </b>
@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="white-space: nowrap" colspan="2"><b> Tarikh Hingga: </b>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp
</td>
<td style="white-space: nowrap" colspan="2"><b>Tarikh Cetak: </b>
@@ -230,8 +239,8 @@
$totalupah += $item['bakiupah'];
$totalpinjamanasal += $item['pinjaman'];
$totalnm += $item['nilaimarhun'];
$totalujrah += $item['ujrah'];
$totalonepercent += $item['onepercent'];
$totalujrah += array_key_exists('ujrah',$item) ? $item['ujrah'] : 0;
$totalonepercent += array_key_exists('onepercent',$item) ? $item['onepercent'] : 0;
@endphp
@@ -299,8 +308,8 @@
echo number_format($item['pinjaman'],2);
@endphp
</td>
<td>{{ number_format($item['ujrah'],2) }}</td>
<td>{{ number_format($item['onepercent'],2) }}</td>
<td>{{ number_format(array_key_exists('ujrah',$item) ? $item['ujrah'] : 0,2) }}</td>
<td>{{ number_format(array_key_exists('onepercent',$item) ? $item['onepercent'] : 0,2) }}</td>
<td>{{ number_format($item['bakiupah'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['gadaibakipjm']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
resources/views/akaun/laporan_tuntutbaki.blade.php
+27 -24
View File
@@ -34,11 +34,11 @@
width: 100%;
}
#scan td, #scan th {
/* #scan td, #scan th {
padding: 8px;
padding: 15px;
font-size:11px;
}
} */
#scan tr:nth-child(even){background-color: #ffffff;}
@@ -58,13 +58,14 @@
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
width: 600%;
}
#scan td, #scan th {
border-collapse: collapse;
/* border-collapse: collapse; */
padding: 8px;
font-size:11px;
width: 100%; /*new added */
}
#scan tr:nth-child(even){background-color: #ffffff;}
@@ -76,7 +77,7 @@
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
padding:2px;
color:black;
}
</style>
@@ -166,34 +167,36 @@
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN TUNTUT BAKI</b></th>
<th><b>LAPORAN TUNTUT BAKI</b></th>
<th> </th>
<th> </th>
<th>
</th>
<th></th>
<th></th>
</tr>
</table>
<table id="scan">
<tr>
<td><b> Tarikh:</b></td>
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_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
<th colspan="6"> <b>Tarikh Cetak:</b>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:50px">
</td>
echo($formattedweddingdate);
@endphp</th>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
<tr>
<td style="width:20px"><b> Tarikh:</b></td>
<td>
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp</td>
<td> </td>
<td> </td>
<td> </td>
<td> </td>
</tr>
@@ -228,7 +231,7 @@
@endif
<tr>
<td>{{ $counter }}</td>
<td>
<td style="width:100px">
@php
$gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();