@@ -395,7 +395,7 @@ export default {
\ No newline at end of file
+
diff --git a/resources/views/akaun/laporan_auditTrail.blade.php b/resources/views/akaun/laporan_auditTrail.blade.php
index 5dd8646..861b165 100644
--- a/resources/views/akaun/laporan_auditTrail.blade.php
+++ b/resources/views/akaun/laporan_auditTrail.blade.php
@@ -228,7 +228,7 @@
Norujukan |
Pemb. Lama |
Pembiayaan |
-
Upah |
+
Keuntungan |
Nota |
Nokp |
Norujukan Asal |
@@ -276,4 +276,4 @@
Disahkan |
|
-
\ No newline at end of file
+
diff --git a/resources/views/akaun/laporan_bilangan_pengadai.blade.php b/resources/views/akaun/laporan_bilangan_pengadai.blade.php
index 149ff84..1be198e 100644
--- a/resources/views/akaun/laporan_bilangan_pengadai.blade.php
+++ b/resources/views/akaun/laporan_bilangan_pengadai.blade.php
@@ -43,7 +43,7 @@
padding: 8px;
font-size: 11px;
-
+
}
#scan tr:nth-child(even) {
@@ -196,32 +196,32 @@
| Tarikh Dari: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
Tarikh Hingga: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
Tarikh Cetak: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
-
+
| Jenis Pekerjaan |
- Bilangan Pengadai |
+ Bilangan Pembiayaan |
|
|
|
@@ -231,13 +231,13 @@
|
|
|
-
-
-
+
+
+
@php
$totalpengadai = 0;
-
+
@endphp
@foreach ($bilpengadai as $index => $item)
{{ $item['keterangan'] }} |
@@ -256,16 +256,16 @@
|
|
|
-
-
-
-
+
+
+
+
@endforeach
| Jumlah |
- {{number_format($totalpengadai)}} |
+ {{number_format($totalpengadai)}} |
|
|
|
@@ -275,9 +275,9 @@
|
|
|
-
-
-
+
+
+
diff --git a/resources/views/akaun/laporan_gadaian.blade.php b/resources/views/akaun/laporan_gadaian.blade.php
index 4486e97..10574e3 100644
--- a/resources/views/akaun/laporan_gadaian.blade.php
+++ b/resources/views/akaun/laporan_gadaian.blade.php
@@ -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 @@
| Tarikh Mula: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
Tarikh Hingga: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
Tarikh Cetak: |
- @php
+ | @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
-
+
- |
+ |
|
|
|
@@ -224,25 +224,25 @@
Keuntungan |
Peratus (%) |
- @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 @@
| Teller : {{ $item['teller'] }} |
- @php
+ @php
$totalpinjamanteller = 0;
$totalnmteller = 0;
$totalberatteller = 0;
@@ -263,11 +263,11 @@
| Teller : {{ $item['teller'] }} |
- @php
+ @php
$totalpinjamanteller = 0;
$totalnmteller = 0;
$totalberatteller = 0;
- $totalupah12 = 0;
+ $totalupah12 = 0;
$totalujrah = 0;
$totalonepercent= 0;
@endphp
@@ -287,18 +287,18 @@
{{ number_format($item['nilaimarhun'],2) }} |
{{ number_format($item['pinjaman'],2) }} |
{{ number_format($ujrah*12,2) }} |
- {{ number_format($onepercent*12,2) }} |
+ {{ number_format($onepercent*12,2) }} |
{{ number_format($item['upah12'],2) }} |
{{ $item['percentpinj'] }} |
@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 @@
{{ number_format($totalupah12,2) }} |
- @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 @@
Pembiayaan (RM) |
Caj-caj Lain (RM) |
Keuntungan 1% (RM) |
- Upah/Keuntungan (RM) |
+ Keuntungan (RM) |
| JUMLAH KESELURUHAN |
diff --git a/resources/views/akaun/laporan_penebusan.blade.php b/resources/views/akaun/laporan_penebusan.blade.php
index 9c267fd..d21d3ae 100644
--- a/resources/views/akaun/laporan_penebusan.blade.php
+++ b/resources/views/akaun/laporan_penebusan.blade.php
@@ -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;
}
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
| LAPORAN PENYELESAIAN PEMBIAYAAN |
-
+
| Tarikh Mula:
-
- @php
+
+ @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp
-
+
|
-
+
Tarikh Hingga:
-
- @php
+
+ @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp
|
-
+
Tarikh Cetak:
-
- @php
+
+ @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
$formattedweddingdate = $myDateTime->format('d-m-Y');
echo($formattedweddingdate)
@endphp |
-
+
-
+
@@ -221,12 +221,12 @@
| Bayaran(RM) |
Jumlah(RM) |
- @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 @@
| Teller : {{ $item['teller'] }} |
- @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 @@
| Teller : {{ $item['teller'] }} |
- @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 @@
{{ number_format($item['pinjaman'],2) }} |
- @php
+ @php
if($item['hargajualan'] !== $item['bakihargajualan'])
echo number_format($item['gadaibakipjm'],2);
- else
+ else
echo number_format($item['pinjaman'],2);
@endphp
|
@@ -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 @@
{{ number_format($totaljumlahteller,2) }} |
- @php
+ @php
$counter = 1;
$totalpinjamanasalteller = 0;
$totalpinjamanteller = 0;
@@ -380,7 +380,7 @@
@endif
@endforeach
-
+
@@ -389,7 +389,7 @@
| Pembiayaan Asal(RM) |
B. Pembiayaan (RM) |
Keuntungan Rebet(RM) |
- Caj-caj Lain (RM) |
+ Lain-lain Caj (RM) |
Untung 1% (RM) |
Keuntungan Sebenar (Bulan Sama) (RM) |
Pendapatan Kasar (RM) |
@@ -402,7 +402,7 @@
{{ number_format($totalpinjamanasal,2) }} |
{{ number_format($totalpinjaman,2) }} |
@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;
- echo number_format($totalkeuntunganrebet,2);
+ echo number_format($totalkeuntunganrebet,2);
@endphp |
{{ number_format($totalujrah,2) }} |
{{ number_format($totalonepercent,2) }} |
@@ -413,10 +413,10 @@
-
+
Laporan Transaksi Penyelesaian Pembiayaan
-
+
| Bil |
@@ -447,7 +447,7 @@
| {{ $upahlama['bilkaunter'] }} |
- Bayaran Upah |
+ Bayaran Keuntungan |
Not Applicable |
Not Applicable |
Not Applicable |
@@ -456,7 +456,7 @@
| {{ $upahlama['bilonline'] }} |
- Bayaran Upah Online |
+ Bayaran Keuntungan Online |
Not Applicable |
Not Applicable |
Not Applicable |
@@ -482,9 +482,9 @@
Not Applicable |
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/akaun/laporan_prestasi.blade.php b/resources/views/akaun/laporan_prestasi.blade.php
index 9c9f341..7e3e602 100644
--- a/resources/views/akaun/laporan_prestasi.blade.php
+++ b/resources/views/akaun/laporan_prestasi.blade.php
@@ -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;
}
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
+
@@ -382,7 +382,7 @@ hr.new5 {
 }}) |
-  }}) |
+ |
@@ -438,7 +438,7 @@ hr.new5 {
Pinjaman | | : RM {{ number_format(($gadai['pinjaman']),2) }} |
- | Jumlah Upah | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
+ Jumlah Keuntungan | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
| Bayaran Di Terima | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
@@ -455,22 +455,22 @@ hr.new5 {
- | .................................................... |
- |
.................................................... |
- |
+ |
.................................................... |
- |
+ |
+ .................................................... |
+ |
.................................................... |
-| DiSemak |
- |
+DiSemak |
+ |
Cagaran Di Keluarkan |
- |
+ |
Cagaran Diterima |
- |
+ |
Ar-Rahn
{{ Auth::user()->name }} |
@@ -534,7 +534,7 @@ hr.new5 {
Pembiayaan | | : RM {{ number_format(($gadai['pinjaman']),2) }} |
- | Jumlah Upah | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
+ Jumlah Keuntungan | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
| Bayaran Di Terima | | : RM {{ number_format($advansur['upahDibayar'],2) }} |
@@ -550,24 +550,24 @@ hr.new5 {
- | .................................................... |
- |
.................................................... |
- |
+ |
.................................................... |
- |
+ |
+ .................................................... |
+ |
.................................................... |
-| DiSemak |
- |
+DiSemak |
+ |
Cagaran Di Keluarkan |
- |
+ |
Cagaran Diterima |
- |
+ |
Ar-Rahn
{{ Auth::user()->name }} |
-
\ No newline at end of file
+
diff --git a/resources/views/resit/resittebusautotawarruq.blade.php b/resources/views/resit/resittebusautotawarruq.blade.php
index 03dce05..80b708d 100644
--- a/resources/views/resit/resittebusautotawarruq.blade.php
+++ b/resources/views/resit/resittebusautotawarruq.blade.php
@@ -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;
}
-
+
@@ -351,7 +351,7 @@ hr.new5 {
| |
- |
+ |
@@ -409,7 +409,7 @@ hr.new5 {
: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }} |
- | Bayaran Upah |
+ Bayaran Keuntungan |
|
: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} |
@@ -433,22 +433,22 @@ hr.new5 {
- | .................................................... |
- |
.................................................... |
- |
+ |
.................................................... |
- |
+ |
+ .................................................... |
+ |
.................................................... |
-| DiSemak |
- |
+DiSemak |
+ |
Cagaran Di Keluarkan |
- |
+ |
Cagaran Diterima |
- |
+ |
Ar-Rahn
{{ Auth::user()->name }} |
@@ -517,7 +517,7 @@ hr.new5 {
: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }} |
- | Bayaran Upah |
+ Bayaran Keuntungan |
|
: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} |
@@ -541,25 +541,25 @@ hr.new5 {
- | .................................................... |
- |
.................................................... |
- |
+ |
.................................................... |
- |
+ |
+ .................................................... |
+ |
.................................................... |
-| DiSemak |
- |
+DiSemak |
+ |
Cagaran Di Keluarkan |
- |
+ |
Cagaran Diterima |
- |
+ |
Ar-Rahn
{{ Auth::user()->name }} |
-
\ No newline at end of file
+
-
