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

Merged in hotfix/updateterm (pull request #70)

Browse Source 
update sentence term yang belum tukar

Approved-by: Muhd hafifie
This commit is contained in:
Ain Izazi Aziz
2024-11-24 10:50:15 +00:00
committed by Muhd hafifie
parent f3bdd84330 e7ed6d7fa5
commit 94e2ba0057
21 changed files with 334 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/Akaun/Home.vue
+1 -1
View File
@@ -90,7 +90,7 @@
<div class="bg-white ml-2 shadow border border-solid px-6 py-4 rounded-lg hover:bg-yellow-300 hover:transition-all mb-2 cursor-pointer">
<router-link to="/akaunhome/upah">
<h2 class="mx-auto text-center font-bold text-2xl uppercase">Upah</h2>
<h2 class="mx-auto text-center font-bold text-2xl uppercase">Keuntungan</h2>
</router-link>
</div>
resources/js/Akaun/Upah.vue
+9 -9
View File
@@ -3,12 +3,12 @@
<div class="flex w-full">
<div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
<div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">
<div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">
<router-link to="/akaunhome">
<i class="fas fa-backspace text-white"></i>
</router-link>
<span class="text-center mx-auto text-white font-bold">Laporan Upah</span>
<span class="text-center mx-auto text-white font-bold">Laporan Keuntungan</span>
</div>
<form method="get" id="formupah" :action="Urlredirect()" target="_blank">
<div class="rounded bg-white shadow p-6">
@@ -22,7 +22,7 @@
<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" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
</div>
</div>
</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>
@@ -47,7 +47,7 @@ export default {
async generatepdf(){
await this.setJenis('pdf');
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
@@ -62,7 +62,7 @@ export default {
async generateview(){
await this.setJenis('view');
Vue.swal({
title: 'Memuatkan...',
allowEscapeKey : false,
@@ -71,7 +71,7 @@ export default {
showConfirmButton: false,
timer: 8000,
});
document.getElementById("formupah").submit();
},
Urlredirect: function() {
@@ -81,6 +81,6 @@ export default {
return this.jenisgenerate = value;
}
}
}
</script>
</script>
resources/js/Audit/Audit copy.vue
+2 -2
View File
@@ -6,7 +6,7 @@
<button class="bg-yellow-500 p-4 rounded text-white mr-4">Keuntungan Sebenar</button>
</router-link>
<router-link to="/wtd/tambah">
<button class="bg-yellow-500 p-4 rounded text-white">Upah Simpan</button>
<button class="bg-yellow-500 p-4 rounded text-white">Keuntungan Simpan</button>
</router-link>
</div>
</div>
@@ -20,4 +20,4 @@ export default {
<style>
</style>
</style>
resources/js/Audit/Audit.vue
+2 -2
View File
@@ -6,7 +6,7 @@
<button class="bg-yellow-500 p-4 rounded text-white mr-4">Keuntungan Sebenar</button>
</router-link>
<router-link to="">
<button class="bg-yellow-200 p-4 rounded text-white">Upah Simpan</button>
<button class="bg-yellow-200 p-4 rounded text-white">Keuntungan Simpan</button>
</router-link>
</div>
</div>
@@ -20,4 +20,4 @@ export default {
<style>
</style>
</style>
resources/js/Audit/UpahSimpan.vue
+7 -7
View File
@@ -1,15 +1,15 @@
<template>
<div class="container">
<div class="flex w-full">
<div class="xl:w-2/3 2xl:w-1/2 p-8 mx-auto">
<div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">
<div class="bg-yellow-600 text-gray-200 text-lg px-6 py-4 rounded-t-lg">
<router-link to="/audit">
<i class="fas fa-backspace text-white"></i>
</router-link>
<span class="text-center mx-auto text-white font-bold">Laporan Upah Simpan</span>
<span class="text-center mx-auto text-white font-bold">Laporan Keuntungan Simpan</span>
</div>
<form method="get" id="formpenebusan" target="_blank">
<input :value="$kodcaw" name="kodcaw" hidden/>
@@ -25,7 +25,7 @@
<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>
</div>
</div>
</div>
</form>
</div>
@@ -50,7 +50,7 @@ export default {
dateFormat: "m-Y", //defaults to "F Y"
altFormat: "F Y", //defaults to "F Y"
})
]
]
},
}
},
@@ -59,4 +59,4 @@ export default {
<style>
</style>
</style>
resources/js/components/util/RekodBayaranModal.vue
+9 -9
View File
@@ -1,6 +1,6 @@
<template>
<div>
<transition name="modal-fade">
<div v-if="showModal" class=" overflow-x-hidden overflow-y-auto fixed inset-0 z-50 outline-none focus:outline-none justify-center items-center flex">
<div class="relative w-full my-6 mx-auto max-w-6xl">
@@ -21,10 +21,10 @@
<input type="radio" id="bayaran" name="radpendser" value="bayaran" class="hidden focus:bg-gray-500" v-model="selected">
<label for="bayaran" class="cursor-pointer text-gray-500 focus:bg-gray-500 hover:bg-gray-200 focus:outline-none border px-10 py-4 border-solid border-gray-500 rounded">Bayaran</label>
</div>
<div class="mx-2 radio cursor-pointer">
<input type="radio" id="upah" name="radpendser" value="upah" class="hidden focus:bg-gray-500" v-model="selected">
<label for="upah" class="cursor-pointer text-gray-500 focus:bg-gray-500 hover:bg-gray-200 focus:outline-none border px-10 py-4 border-solid border-gray-500 rounded">Upah</label>
<label for="upah" class="cursor-pointer text-gray-500 focus:bg-gray-500 hover:bg-gray-200 focus:outline-none border px-10 py-4 border-solid border-gray-500 rounded">Keuntungan</label>
</div>
<div class="mx-2 radio cursor-pointer">
@@ -101,7 +101,7 @@
</div>
</td>
</tr>
</tbody>
</tbody>
</table>
</div>
<div v-if="selected=='upah'">
@@ -115,10 +115,10 @@
Tarikh
</th>
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Upah
Keuntungan
</th>
<th class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Action
Tindakan
</th>
</tr>
</thead>
@@ -279,7 +279,7 @@
</tbody>
</table>
</div>
</div>
<!--footer-->
<div class="flex items-center justify-end p-6 border-t border-solid border-blueGray-200 rounded-b">
@@ -395,7 +395,7 @@ export default {
</script>
<style>
.modal-fade-enter,
.modal-fade-leave-to {
opacity: 0;
@@ -405,4 +405,4 @@ export default {
.modal-fade-leave-active {
transition: opacity .5s ease;
}
</style>
</style>
resources/views/akaun/laporan_auditTrail.blade.php
+2 -2
View File
@@ -228,7 +228,7 @@
<th>Norujukan</th>
<th>Pemb. Lama</th>
<th>Pembiayaan</th>
<th>Upah</th>
<th>Keuntungan</th>
<th>Nota</th>
<th>Nokp</th>
<th>Norujukan Asal</th>
@@ -276,4 +276,4 @@
<td colspan="2"><B> Disahkan </B></td>
<td> </td>
</tr>
</table>
</table>
resources/views/akaun/laporan_bilangan_pengadai.blade.php
+18 -18
View File
@@ -43,7 +43,7 @@
padding: 8px;
font-size: 11px;
}
#scan tr:nth-child(even) {
@@ -196,32 +196,32 @@
</tr>
<tr>
<td style="width:100px"><b> Tarikh Dari: </b></td>
<td style="text-align:left;"> @php
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"><b> Tarikh Hingga: </b></td>
<td style="text-align:left;"> @php
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"> <b>Tarikh Cetak: </b></td>
<td style="text-align:left;">@php
<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>
</table>
<br>
<table id="details">
<tr>
<th><u>Jenis Pekerjaan</u></th>
<th><u>Bilangan Pengadai</u></th>
<th><u>Bilangan Pembiayaan</u></th>
<th></th>
<th></th>
<th></th>
@@ -231,13 +231,13 @@
<th></th>
<th></th>
<th></th>
</tr>
@php
$totalpengadai = 0;
@endphp
@foreach ($bilpengadai as $index => $item)
<td>{{ $item['keterangan'] }}</td>
@@ -256,16 +256,16 @@
<td></td>
<td></td>
<td></td>
</tr>
@endforeach
<tr>
<td><b>Jumlah <b></td>
<td><b>{{number_format($totalpengadai)}} <b></td>
<td><b>{{number_format($totalpengadai)}} <b></td>
<td></td>
<td></td>
<td></td>
@@ -275,9 +275,9 @@
<td></td>
<td></td>
<td></td>
</tr>
resources/views/akaun/laporan_gadaian.blade.php
+35 -35
View File
@@ -6,7 +6,7 @@
}
#header td, #customers th {
padding:4px;
font-size:10px;
}
@@ -35,7 +35,7 @@
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
@@ -91,7 +91,7 @@
}
#details td, #details th {
padding: 8px;
font-size:8px;
}
@@ -175,27 +175,27 @@
</tr>
<tr>
<td style="width:100px"><b> Tarikh Mula: </b></td>
<td style="text-align:left;"> @php
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"><b> Tarikh Hingga: </b></td>
<td style="text-align:left;"> @php
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
<td style="width:100px"> <b>Tarikh Cetak: </b></td>
<td style="text-align:left;">@php
<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 style="width:50px">
</td>
<td> </td>
<td> </td>
@@ -224,25 +224,25 @@
<th>Keuntungan</th>
<th>Peratus (%)</th>
</tr>
@php
$counter = 1;
$totalpinjaman = 0;
$totalberat = 0;
$totalnm = 0;
$totalupah = 0;
$bil = 0;
$full_total_ujrah = 0;
@php
$counter = 1;
$totalpinjaman = 0;
$totalberat = 0;
$totalnm = 0;
$totalupah = 0;
$bil = 0;
$full_total_ujrah = 0;
$full_total_onepercent = 0;
@endphp
@foreach($gadai as $index=>$item)
@php
$ujrah = isset($item['ujrah']) ? $item['ujrah'] : 0;
$onepercent = isset($item['onepercent']) ? $item['onepercent'] : 0;
@php
$ujrah = isset($item['ujrah']) ? $item['ujrah'] : 0;
$onepercent = isset($item['onepercent']) ? $item['onepercent'] : 0;
$totalpinjaman += $item['pinjaman'];
$totalberat += $item['berat'];
$totalnm += $item['nilaimarhun'];
$totalupah += $item['upah12'];
$totalpinjaman += $item['pinjaman'];
$totalberat += $item['berat'];
$totalnm += $item['nilaimarhun'];
$totalupah += $item['upah12'];
$full_total_ujrah += $ujrah * 12;
$full_total_onepercent += $onepercent * 12;
@endphp
@@ -251,7 +251,7 @@
<tr>
<td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php
@php
$totalpinjamanteller = 0;
$totalnmteller = 0;
$totalberatteller = 0;
@@ -263,11 +263,11 @@
<tr>
<td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php
@php
$totalpinjamanteller = 0;
$totalnmteller = 0;
$totalberatteller = 0;
$totalupah12 = 0;
$totalupah12 = 0;
$totalujrah = 0;
$totalonepercent= 0;
@endphp
@@ -287,18 +287,18 @@
<td>{{ number_format($item['nilaimarhun'],2) }}</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>{{ number_format($ujrah*12,2) }}</td>
<td>{{ number_format($onepercent*12,2) }}</td>
<td>{{ number_format($onepercent*12,2) }}</td>
<td>{{ number_format($item['upah12'],2) }}</td>
<td>{{ $item['percentpinj'] }}</td>
</tr>
@php $counter++; @endphp
@php
@php
$totalpinjamanteller += $item['pinjaman'];
$totalnmteller += $item['nilaimarhun'];
$totalberatteller += $item['berat'];
$totalupah12 += $item['upah12'];
$totalujrah += $ujrah*12;
$totalonepercent += $onepercent*12;
$totalupah12 += $item['upah12'];
$totalujrah += $ujrah*12;
$totalonepercent += $onepercent*12;
@endphp
@if($index+1 < sizeof($gadai))
@if($item['teller'] != $gadai[$index + 1]['teller'])
@@ -313,13 +313,13 @@
<td><b>{{ number_format($totalupah12,2) }} </b></td>
</tr>
@php
@php
$counter = 1;
$totalupah12 = 0;
$totalpinjamanteller = 0;
$totalnmteller = 0;
$totalnmteller = 0;
$totalujrah = 0;
$totalonepercent = 0;
$totalonepercent = 0;
@endphp
@endif
@else
@@ -346,7 +346,7 @@
<th style="text-align:center;">Pembiayaan (RM)</th>
<th style="text-align:center;">Caj-caj Lain (RM)</th>
<th style="text-align:center;">Keuntungan 1% (RM)</th>
<th style="text-align:center;">Upah/Keuntungan (RM)</th>
<th style="text-align:center;">Keuntungan (RM)</th>
</tr>
<tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
resources/views/akaun/laporan_penebusan.blade.php
+93 -94
View File
@@ -4,17 +4,17 @@
border-collapse: collapse;
width: 100%;
}
#header td, #customers th {
padding:4px;
font-size:10px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
@@ -23,27 +23,27 @@
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
@@ -52,25 +52,25 @@
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#scan td, #scan th {
border-collapse: collapse;
padding: 8px;
font-size:11px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
border-collapse: collapse;
padding-top: 12px;
@@ -80,26 +80,26 @@
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#details td, #details th {
padding: 8px;
font-size:8px;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
font-style:bold;
@@ -109,25 +109,25 @@
color:black;
}
</style>
<style>
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
@@ -135,16 +135,16 @@
padding:4px;
color:black;
}
@media print {
.new-page {
page-break-before: always;
}
}
</style>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
@@ -164,43 +164,43 @@
</tr>
</table>
<br>
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN PENYELESAIAN PEMBIAYAAN</b></th>
</tr>
<tr>
<td style="white-space: nowrap" colspan="2"><b>Tarikh Mula: </b>
@php
@php
$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
@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>
@php
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp</td>
</tr>
</table>
<br>
<table id="details">
<tr>
@@ -221,12 +221,12 @@
<th>Bayaran(RM)</th>
<th>Jumlah(RM)</th>
</tr>
@php
@php
$counter = 1;
$totalnm = 0;
$totalnm = 0;
$totalbayaran = 0;
$totalpinjamanasal = 0;
$totalpinjaman = 0;
$totalpinjamanasal = 0;
$totalpinjaman = 0;
$totalupah = 0;
$totalujrah = 0;
$totalonepercent = 0;
@@ -234,7 +234,7 @@
@endphp
@foreach($tebus as $index=>$item)
@php
@php
$tarikh_tebus = new DateTime($item['t_tebus']);
$tarikh_gadai = new DateTime($item['t_gadai']);
@@ -243,11 +243,11 @@
$year_tebus = $tarikh_tebus->format('Y');
$year_gadai = $tarikh_gadai->format('Y');
$totalbayaran += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm'];
$totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];
$totalbayaran += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm'];
$totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];
$totalupah += $item['bakiupah'];
$totalpinjamanasal += $item['pinjaman'];
$totalpinjamanasal += $item['pinjaman'];
$totalnm += $item['nilaimarhun'];
$totalujrah += array_key_exists('ujrah',$item) ? $item['ujrah'] : 0;
$totalonepercent += array_key_exists('onepercent',$item) ? $item['onepercent'] : 0;
@@ -259,12 +259,12 @@
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php
@php
$totalnmteller = 0;
$totalpinjamanasalteller = 0;
$totalpinjamanasalteller = 0;
$totalpinjamanteller = 0;
$totalupahteller = 0;
$totalbayaranteller = 0;
$totalbayaranteller = 0;
$totalujrahteller = 0;
$totalonepercentteller = 0;
@endphp
@@ -273,12 +273,12 @@
<tr>
<td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
</tr>
@php
@php
$totalnmteller = 0;
$totalpinjamanasalteller = 0;
$totalpinjamanasalteller = 0;
$totalpinjamanteller = 0;
$totalupahteller = 0;
$totalbayaranteller = 0;
$totalbayaranteller = 0;
$totaljumlahteller = 0;
$totalujrahteller = 0;
$totalonepercentteller = 0;
@@ -311,10 +311,10 @@
</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>
@php
@php
if($item['hargajualan'] !== $item['bakihargajualan'])
echo number_format($item['gadaibakipjm'],2);
else
else
echo number_format($item['pinjaman'],2);
@endphp
</td>
@@ -327,16 +327,16 @@
@php $counter++; @endphp
@php
@php
$totalnmteller += $item['nilaimarhun'];
$totalpinjamanasalteller += $item['pinjaman'];
$totalpinjamanasalteller += $item['pinjaman'];
$totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];
$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm'];
$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm'];
$totalujrahteller += $item['ujrah'];
$totalonepercentteller += $item['onepercent'];
@endphp
@php
@php
$totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm'];
@endphp
@@ -354,7 +354,7 @@
<td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
</tr>
@php
@php
$counter = 1;
$totalpinjamanasalteller = 0;
$totalpinjamanteller = 0;
@@ -380,7 +380,7 @@
@endif
@endforeach
</table>
<br><br>
<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
<tr>
@@ -389,7 +389,7 @@
<th style="text-align:center;">Pembiayaan Asal(RM)</th>
<th style="text-align:center;">B. Pembiayaan (RM)</th>
<th style="text-align:center;">Keuntungan Rebet(RM)</th>
<th style="text-align:center;">Caj-caj Lain (RM)</th>
<th style="text-align:center;">Lain-lain Caj (RM)</th>
<th style="text-align:center;">Untung 1% (RM)</th>
<th style="text-align:center;">Keuntungan Sebenar (Bulan Sama) (RM)</th>
<th style="text-align:center;">Pendapatan Kasar (RM)</th>
@@ -402,7 +402,7 @@
<td>{{ number_format($totalpinjamanasal,2) }}</td>
<td>{{ number_format($totalpinjaman,2) }}</td>
<td>@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;
echo number_format($totalkeuntunganrebet,2);
echo number_format($totalkeuntunganrebet,2);
@endphp</td>
<td>{{ number_format($totalujrah,2) }}</td>
<td>{{ number_format($totalonepercent,2) }}</td>
@@ -413,10 +413,10 @@
</tr>
</table>
<h4>Laporan Transaksi Penyelesaian Pembiayaan</h4>
<br>
<table id="details">
<thead>
<th>Bil</th>
@@ -447,7 +447,7 @@
</tr>
<tr>
<td>{{ $upahlama['bilkaunter'] }}</td>
<td>Bayaran Upah</td>
<td>Bayaran Keuntungan</td>
<td> Not Applicable </td>
<td> Not Applicable</td>
<td> Not Applicable</td>
@@ -456,7 +456,7 @@
</tr>
<tr>
<td>{{ $upahlama['bilonline'] }}</td>
<td>Bayaran Upah Online</td>
<td>Bayaran Keuntungan Online</td>
<td> Not Applicable </td>
<td> Not Applicable</td>
<td> Not Applicable</td>
@@ -482,9 +482,9 @@
<td> Not Applicable </td>
</tr>
</table>
<br>
<br>
<table id="sign">
@@ -503,14 +503,13 @@
<td> </td>
</tr>
</table>
resources/views/akaun/laporan_prestasi.blade.php
+52 -53
View File
@@ -4,17 +4,17 @@
border-collapse: collapse;
width: 100%;
}
#header td, #customers th {
padding:4px;
font-size:10px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
@@ -23,27 +23,27 @@
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
@@ -52,26 +52,26 @@
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#scan td, #scan th {
border-collapse: collapse;
padding: 8px;
font-size:11px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
border-collapse: collapse;
padding-top: 12px;
@@ -79,31 +79,31 @@
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#details td, #details th {
padding: 8px;
font-size:8px;
border: 0.1px solid black;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
font-style:bold;
@@ -113,25 +113,25 @@
color:black;
}
</style>
<style>
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
@@ -143,21 +143,21 @@
<br>
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN URUS NIAGA AR-RAHN PADA @php
<th colspan ="5"><b>LAPORAN URUS NIAGA AR-RAHN PADA @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$date = $myDateTime->format('d-m-Y');
echo($date)
@endphp
HINGGA @php
HINGGA @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$date = $myDateTime->format('d-m-Y');
echo($date)
@endphp</b></th>
</tr>
<tr>
<td style="width:1000px">Tarikh Cetak: @php
<td style="width:1000px">Tarikh Cetak: @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$date_cetak = $myDateTime->format('d-m-Y');
echo($date_cetak)
@@ -165,7 +165,7 @@
</tr>
</table>
<br>
<table id="details">
@@ -190,12 +190,12 @@
<th>Penyelesaian Pembiayaan</th>
<th>Keuntungan Penyelesaian Pembiayaan</th>
<th>Keuntungan Ansuran Pembiayaan</th>
<th>Jumlah Upah</th>
<th>Jumlah Keuntungan</th>
</tr>
@foreach($gadaiallcaw as $item)
<tr>
<td style="width:50px">{{$item['cawangan']}}</td>
<td style="width:50px">{{$item['jum_org_gadai']}}</td>
@@ -215,14 +215,13 @@
</tr>
@endforeach
</table>
resources/views/akaun/laporan_serahpetibesigadai.blade.php
+7 -7
View File
@@ -6,7 +6,7 @@
}
#header td, #customers th {
padding:4px;
font-size:10px;
}
@@ -35,7 +35,7 @@
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
@@ -91,7 +91,7 @@
}
#details td, #details th {
padding: 8px;
font-size:8px;
}
@@ -166,7 +166,7 @@
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN SERAH MARHUN GADAI</b></th>
<th colspan ="5"><b>LAPORAN SERAH MARHUN PEMBIAYAAN</b></th>
<th> </th>
<th> </th>
<th>
@@ -175,7 +175,7 @@
</tr>
<tr>
<td><b> Tarikh:</b></td>
<td style="text-align:left;"> @php
<td style="text-align:left;"> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $datemula);
$datefirst = $myDateTime->format('d-m-Y');
echo($datefirst);
@@ -185,14 +185,14 @@
echo($datelast);
@endphp</td>
<td style="width:10px"> <b>Tarikh Cetak</b></td>
<td style="text-align:left;">@php
<td style="text-align:left;">@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$datecetak = $myDateTime->format('d-m-Y');
echo($datecetak)
@endphp</td>
</tr>
<tr>
<td style="width:50px">
<td style="width:50px">
</td>
<td> </td>
<td> </td>
resources/views/akaun/laporan_stokaudit.blade.php
+1 -1
View File
@@ -259,7 +259,7 @@
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Kadar Upah</th>
<th>Kadar Keuntungan</th>
<th>Tempoh Belum Bayar</th>
<th>Keuntungan Belum Bayar (RM)</th>
<th>Lain-Lain Caj (RM)</th>
resources/views/akaun/laporan_stokaudit_combine.blade.php
+1 -1
View File
@@ -234,7 +234,7 @@
<th>Marhun</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Kadar Upah</th>
<th>Kadar Keuntungan</th>
<th>Tempoh Belum Bayar</th>
<th>Keuntungan Belum Bayar (RM)</th>
<th>Lain-Lain Caj (RM)</th>
resources/views/akaun/laporan_stokauditbackdate.blade.php
+1 -1
View File
@@ -203,7 +203,7 @@
<th>Nilai Marhun (RM)</th>
<th>Pembiayaan Asal (RM)</th>
<th>Baki Pembiayaan (RM)</th>
<th>Kadar Upah</th>
<th>Kadar Keuntungan</th>
<th>Tempoh Belum Bayar</th>
<th>Keuntungan Belum Bayar (RM)</th>
<th>Utg 1%(RM) </th>
resources/views/akaun/laporan_upah.blade.php
+11 -11
View File
@@ -6,7 +6,7 @@
}
#header td, #customers th {
padding:4px;
font-size:10px;
}
@@ -34,7 +34,7 @@
}
#scan td, #scan th {
padding: 8px;
font-size:11px;
}
@@ -90,7 +90,7 @@
}
#details td, #details th {
padding: 8px;
font-size:8px;
}
@@ -172,14 +172,14 @@
<table id="scan">
<tr>
<th colspan ="5"><b>LAPORAN UPAH</b></th>
<th colspan ="5"><b>LAPORAN KEUNTUNGAN</b></th>
<th> </th>
<th> </th>
<th></th>
</tr>
<tr>
<th colspan="5"><b> TARIKH CETAK:</b>
@php
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@@ -194,13 +194,13 @@
</tr>
<tr>
<td style="width:10px"> <b>MULA:</b></td>
<td>@php
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@endphp</td>
<td style="width:10px"> <b>HINGGA:</b></td>
<td>@php
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate);
@@ -223,8 +223,8 @@
<th>Teller</th>
<th>Tempoh</th>
<th>Pembiayaan (RM)</th>
<th>Upah Sebenar (RM)</th>
<th>Upah Dibayar (RM)</th>
<th>Keuntungan Sebenar (RM)</th>
<th>Keuntungan Dibayar (RM)</th>
</tr>
@php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalsebenar = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
@foreach($advansur as $index=>$item)
@@ -280,8 +280,8 @@
<tr>
<th colspan="9"></th>
<th style="text-align:center;">Pembiayaan (RM)</th>
<th style="text-align:center;">Upah Sebenar (RM)</th>
<th style="text-align:center;">Upah Dibayar (RM)</th>
<th style="text-align:center;">Keuntungan Sebenar (RM)</th>
<th style="text-align:center;">Keuntungan Dibayar (RM)</th>
</tr>
<tr>
<td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
resources/views/audit/cetakanexcelelong.blade.php
+4 -4
View File
@@ -185,11 +185,11 @@
<th>Bil</th>
<th>Norujukan</th>
<th>Tarikh Lelong</th>
<th>Baki Upah</th>
<th>Baki Keuntungan</th>
</thead>
@php $counter = 1;$totalbaki = 0; @endphp
@foreach($laporan as $index=>$item)
@php
@php
$totalbaki += $item['bakiupah'];
@endphp
<tr>
@@ -242,7 +242,7 @@ $(document).ready(function () {
table2excel.export(document.querySelectorAll("#details"),'laporan_audit_' + tarikh + '_' + namacawangan + '_' + jenis);
setTimeout(function(){ window.close() }, 1000);
});
</script>
resources/views/online/gadaian/show.blade.php
+30 -30
View File
@@ -32,7 +32,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['nokp'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">t_gadai</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">t_pembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['t_gadai'] }}</td>
</tr>
<tr>
@@ -64,7 +64,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['telahbayar'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahtelahbyr</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">Keuntungantelahbyr</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahtelahbyr'] }}</td>
</tr>
<tr>
@@ -72,15 +72,15 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['cajtelahbyr'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">ansuran</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">ansuranpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['ansuran'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">ansupah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">anskeuntungan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['ansupah'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">kadarupah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">kadarkeuntungan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['kadarupah'] }}</td>
</tr>
<tr>
@@ -128,7 +128,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['t_hapus'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">sttebus</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">stpenyelesaianpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['sttebus'] }}</td>
</tr>
<tr>
@@ -200,7 +200,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['bakipjm'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">bakiupah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">bakikeuntungan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['bakiupah'] }}</td>
</tr>
<tr>
@@ -216,7 +216,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['kuantiti'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jenisupah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jeniskeuntungan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jenisupah'] ?? 'tiada column jenisupah' }}</td>
</tr>
<tr>
@@ -248,11 +248,11 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['ansakhir'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">ansupahakhir</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">anskeuntunganakhir</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['ansupahakhir'] ?? 'tiada column ansupahakhir' }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jumupahaz</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jumkeuntunganaz</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jumupahaz'] ?? 'tiada column jumupahaz' }}</td>
</tr>
<tr>
@@ -312,7 +312,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['temptarikhaging'] ?? 'Tiada column temptarikhaging' }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jenistebus</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">jenispenyelesaianpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jenistebus'] }}</td>
</tr>
<tr>
@@ -328,7 +328,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jumtebus'] ?? 'tiada column jumtebus' }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahnotis</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntungannotis</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahnotis'] }}</td>
</tr>
<tr>
@@ -372,15 +372,15 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['semakpetibesi'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">historygadaian</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">sejarahpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['historygadaian'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tagkiratebus</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tagkirapenyelesaianpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tagkiratebus'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">penyelesaian pembiayaan</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">penyelesaianpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tebus'] }}</td>
</tr>
<tr>
@@ -396,7 +396,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jbgakru'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahakru</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntunganakru</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahakru'] }}</td>
</tr>
<tr>
@@ -420,7 +420,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['sim_cajlelong'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">sim_upahlelong</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">sim_keuntunganlelong</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['sim_upahlelong'] }}</td>
</tr>
<tr>
@@ -436,7 +436,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['rebet'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahlpsrebet</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntunganlpsrebet</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahlpsrebet'] }}</td>
</tr>
<tr>
@@ -444,11 +444,11 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['taguploadslip'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tagsahupahonline</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tagsahkeuntunganonline</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tagsahupahonline'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">bayarupahonline</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">bayarkeuntunganonline</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['bayarupahonline'] }}</td>
</tr>
<tr>
@@ -456,7 +456,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tbayaronline'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahsebenar</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntungansebenar</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahsebenar'] }}</td>
</tr>
<tr>
@@ -472,7 +472,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['jenis_bayaran'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upah12</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntungan12</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upah12'] }}</td>
</tr>
<tr>
@@ -484,19 +484,19 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['bakihargajualan'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahSim</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntunganSim</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahSim'] ?? 'Tiada column upahSim' }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upah_semasa</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntungan_semasa</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upah_semasa'] ?? 'Tiada column upah_semasa' }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahdibayar</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntungandibayar</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahdibayar'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">upahpercuma</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">keuntunganpercuma</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['upahpercuma'] }}</td>
</tr>
<tr>
@@ -512,11 +512,11 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tagkomuditi'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">kadarujrah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">kadarlain-laincaj</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['kadarujrah'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">ujrah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">lain-laincaj</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['ujrah'] }}</td>
</tr>
<tr>
@@ -532,7 +532,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tagbaru'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tunggakanujrah</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tunggakanlain-laincaj</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tunggakanujrah'] }}</td>
</tr>
<tr>
@@ -544,7 +544,7 @@
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tagnotis'] }}</td>
</tr>
<tr>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tag_tebus</th>
<th class="border border-gray-300 bg-gray-100 p-2 font-bold text-left w-3/12">tag_penyelesaianpembiayaan</th>
<td class="border border-gray-300 p-2 bg-white w-9/12">{{ $gadaian['tag_tebus'] }}</td>
</tr>
</table>
resources/views/reports/stok-audit/show.blade.php
+3 -3
View File
@@ -193,9 +193,9 @@
<th>Nilai Marhun</th>
<th>Baki Pembiayaan</th>
<th>Pembiayaan</th>
<th>Upah Belum Bayar</th>
<th>Total Untung 1% Percent</th>
<th>Total Ujrah</th>
<th>Keuntungan Belum Bayar</th>
<th>Jumlah Untung 1% Percent</th>
<th>Jumlah Lain-lain Caj</th>
</thead>
@foreach($stokAudit as $item)
<tr>
resources/views/resit/resitadvansur.blade.php
+23 -23
View File
@@ -300,12 +300,12 @@ hr.new5 {
.page-break{
page-break-before:always;
}
.formula{
font-family: Arial, Helvetica, sans-serif;
font-size:12px;
}
#copy_cust {
font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse;
@@ -370,7 +370,7 @@ hr.new5 {
}
</style>
@@ -382,7 +382,7 @@ hr.new5 {
<table>
<td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" > </td>
<td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>
<td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>
@@ -438,7 +438,7 @@ hr.new5 {
<td style="width:10px">Pinjaman</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
<td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Di Terima</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($advansur['upahDibayar'],2) }} </b></td>
@@ -455,22 +455,22 @@ hr.new5 {
<table id="semakan">
<tr>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
</tr>
<tr>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td></td>
<td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
</tr>
</table>
@@ -534,7 +534,7 @@ hr.new5 {
<td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
</tr>
<tr>
<td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
<td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($advansur['upahDibayar'],2) }} </td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Di Terima</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format($advansur['upahDibayar'],2) }}</b></td>
@@ -550,24 +550,24 @@ hr.new5 {
<table id="semakan">
<tr>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
</tr>
<tr>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td></td>
<td colspan="3"> Ar-Rahn<br><b>{{ Auth::user()->name }}</b></td>
</tr>
</table>
<br>
<br>
resources/views/resit/resittebusautotawarruq.blade.php
+23 -23
View File
@@ -275,12 +275,12 @@ hr.new5 {
.page-break{
page-break-before:always;
}
.formula{
font-family: Arial, Helvetica, sans-serif;
font-size:12px;
}
#copy_cust {
font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse;
@@ -339,7 +339,7 @@ hr.new5 {
color: black;
padding:4px;
}
</style>
@@ -351,7 +351,7 @@ hr.new5 {
<table>
<td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" > </td>
<td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>
<td rowspan="4" style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>
@@ -409,7 +409,7 @@ hr.new5 {
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Upah</b></td>
<td style="width:10px"><b>Bayaran Keuntungan</b></td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
@@ -433,22 +433,22 @@ hr.new5 {
<table id="semakan">
<tr>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
</tr>
<tr>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
@@ -517,7 +517,7 @@ hr.new5 {
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
</tr>
<tr>
<td style="width:10px"><b>Bayaran Upah</b></td>
<td style="width:10px"><b>Bayaran Keuntungan</b></td>
<td style="width:5px"> </td>
<td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
</tr>
@@ -541,25 +541,25 @@ hr.new5 {
<table id="semakan">
<tr>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td></td>
<td colspan="3">.................................................... </td>
<td></td>
<td colspan="3">.................................................... </td>
</tr>
<tr>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3">DiSemak </td>
<td></td>
<td colspan="3"> Cagaran Di Keluarkan</td>
<td></td>
<td></td>
<td colspan="3">Cagaran Diterima </td>
<td></td>
<td></td>
<td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
</tr>
</table>
<br>
<br>