diff --git a/resources/js/Akaun/Ansuran.vue b/resources/js/Akaun/Ansuran.vue index 7334738..e3cd785 100644 --- a/resources/js/Akaun/Ansuran.vue +++ b/resources/js/Akaun/Ansuran.vue @@ -7,7 +7,7 @@ - Laporan Ansuran + Laporan Ansuran Pembiayaan
diff --git a/resources/js/Akaun/Gadaian.vue b/resources/js/Akaun/Gadaian.vue index 869a03e..190446f 100644 --- a/resources/js/Akaun/Gadaian.vue +++ b/resources/js/Akaun/Gadaian.vue @@ -7,7 +7,7 @@ - Laporan Gadaian + Laporan Pembiayaan
diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 968ee01..bea2aa4 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -53,12 +53,12 @@
-

Gadaian

+

Pembiayaan
-

Penebusan

+

Penyelesaian Pembiayaan
@@ -73,7 +73,7 @@
-

Ansuran

+

Ansuran Pembiayaan
@@ -152,12 +152,12 @@
-

Serah Marhun Gadai

+

Serah Marhun Pembiayaan

-

Serah Marhun Tebus

+

Serah Marhun Penyelesaian Pembiayaan
diff --git a/resources/js/Akaun/Penebusan.vue b/resources/js/Akaun/Penebusan.vue index 0b1990a..71832b7 100644 --- a/resources/js/Akaun/Penebusan.vue +++ b/resources/js/Akaun/Penebusan.vue @@ -9,7 +9,7 @@ - Laporan Penebusan + Laporan Penyelesaian Pembiayaan
diff --git a/resources/js/Akaun/SerahGadai.vue b/resources/js/Akaun/SerahGadai.vue index 1eb0569..39186be 100644 --- a/resources/js/Akaun/SerahGadai.vue +++ b/resources/js/Akaun/SerahGadai.vue @@ -8,7 +8,7 @@ - Laporan Serahan Gadai + Laporan Serahan Pembiayaan
diff --git a/resources/js/Akaun/SerahTebus.vue b/resources/js/Akaun/SerahTebus.vue index 7081b9d..3017b53 100644 --- a/resources/js/Akaun/SerahTebus.vue +++ b/resources/js/Akaun/SerahTebus.vue @@ -8,7 +8,7 @@ - Laporan Serahan Tebus + Laporan Serahan Penyelesaian Pembiayaan
diff --git a/resources/js/Audit/KeuntunganSebenar.vue b/resources/js/Audit/KeuntunganSebenar.vue index e039311..bf42f20 100644 --- a/resources/js/Audit/KeuntunganSebenar.vue +++ b/resources/js/Audit/KeuntunganSebenar.vue @@ -27,12 +27,12 @@
- +
- +
diff --git a/resources/js/Dashboard/index.vue b/resources/js/Dashboard/index.vue index 0555579..30a7a1f 100644 --- a/resources/js/Dashboard/index.vue +++ b/resources/js/Dashboard/index.vue @@ -20,7 +20,7 @@
-

Penebusan Bulanan

+

Penyelesaian Pembiayaan Bulanan

diff --git a/resources/js/Tetapan/index.vue b/resources/js/Tetapan/index.vue index 6fb5b7b..5f29354 100644 --- a/resources/js/Tetapan/index.vue +++ b/resources/js/Tetapan/index.vue @@ -27,7 +27,7 @@ Pembiayaan (RM) - Tarikh Gadai + Tarikh Pembiayaan Cetakan Penilai diff --git a/resources/js/components/Analisa/Harian.vue b/resources/js/components/Analisa/Harian.vue index 6d5ec5a..840baa0 100644 --- a/resources/js/components/Analisa/Harian.vue +++ b/resources/js/components/Analisa/Harian.vue @@ -67,7 +67,7 @@
-

Penebusan

+

Penyelesaian Pemb.

diff --git a/resources/js/components/Analisa/Tahunan.vue b/resources/js/components/Analisa/Tahunan.vue index 2ffa055..2352bbf 100644 --- a/resources/js/components/Analisa/Tahunan.vue +++ b/resources/js/components/Analisa/Tahunan.vue @@ -27,7 +27,7 @@
-

Penebusan Terkumpul

+

Penyelesaian Pemb. Terkumpul

diff --git a/resources/js/components/Chart/BilanganChart.vue b/resources/js/components/Chart/BilanganChart.vue index e6a88f7..4d3bb1f 100644 --- a/resources/js/components/Chart/BilanganChart.vue +++ b/resources/js/components/Chart/BilanganChart.vue @@ -101,7 +101,7 @@ export default { legend: { show: true, showForSingleSeries: true, - customLegendItems: ['Gadai', 'Tebus','Expected'], + customLegendItems: ['Pembiayaan', 'Penebusan','Expected'], markers: { fillColors: ['#70a1ff', '#7bed9f','#e74c3c'] } diff --git a/resources/js/components/Tunai.vue b/resources/js/components/Tunai.vue index 962ce63..f986ddc 100644 --- a/resources/js/components/Tunai.vue +++ b/resources/js/components/Tunai.vue @@ -61,10 +61,10 @@ Serahan - Gadaian + Pembiayaan - Penebusan + Penyelesaian Pembiayaan C/F diff --git a/resources/js/components/util/Modal.vue b/resources/js/components/util/Modal.vue index 2cedb9f..fe4429c 100644 --- a/resources/js/components/util/Modal.vue +++ b/resources/js/components/util/Modal.vue @@ -29,12 +29,12 @@

AW Baki Awal

PE Pendahuluan

-

TS Penebusan

+

TS Penyelesaian Pembiayaan

AK Baki Akhir

SE Serahan

-

GA Gadaian

+

GA Pembiayaan

Formula AW + PE + TS - GA - SE = AK

diff --git a/resources/js/components/util/RekodBayaranModal.vue b/resources/js/components/util/RekodBayaranModal.vue index d060351..70272af 100644 --- a/resources/js/components/util/RekodBayaranModal.vue +++ b/resources/js/components/util/RekodBayaranModal.vue @@ -186,7 +186,7 @@ No Rujukan - Jenis Tebus + Jenis Penyelesaian Pembiayaan Pembiayaan Asal @@ -195,7 +195,7 @@ Tempoh - Tarikh Tebus + Tarikh Penyelesaian Pembiayaan Action diff --git a/resources/js/pages/Detailspelanggan.vue b/resources/js/pages/Detailspelanggan.vue index 46c6f33..2e126c0 100644 --- a/resources/js/pages/Detailspelanggan.vue +++ b/resources/js/pages/Detailspelanggan.vue @@ -148,12 +148,12 @@
- +
- +
@@ -185,7 +185,7 @@ Norujukan - Tarikh Gadai + Tarikh Pembiayaan Tarikh Matang @@ -315,7 +315,7 @@ Norujukan - Tarikh Tebus + Tarikh Penyelesaian Pembiayaan Baki Pembiayaan diff --git a/resources/views/akaun/laporan_aging.blade.php b/resources/views/akaun/laporan_aging.blade.php index b2a3410..ff3500a 100644 --- a/resources/views/akaun/laporan_aging.blade.php +++ b/resources/views/akaun/laporan_aging.blade.php @@ -296,7 +296,7 @@ - + diff --git a/resources/views/akaun/laporan_akrubulan_pecahan.blade.php b/resources/views/akaun/laporan_akrubulan_pecahan.blade.php index 3ce3b1b..cfbf86b 100644 --- a/resources/views/akaun/laporan_akrubulan_pecahan.blade.php +++ b/resources/views/akaun/laporan_akrubulan_pecahan.blade.php @@ -249,7 +249,7 @@

-

PAPARAN UJRAH

+

PAPARAN CAJ-CAJ LAIN

TEMPOH BIL GADAIAN BIL PEMBIAYAAN BAKI PEMBIAYAAN (RM) PERATUS SASARAN (%)
diff --git a/resources/views/akaun/laporan_ansuran.blade.php b/resources/views/akaun/laporan_ansuran.blade.php index 6681dda..749de62 100644 --- a/resources/views/akaun/laporan_ansuran.blade.php +++ b/resources/views/akaun/laporan_ansuran.blade.php @@ -166,7 +166,7 @@
CAWANGAN
- + - + @@ -341,7 +341,7 @@ - + diff --git a/resources/views/akaun/laporan_auditTrail.blade.php b/resources/views/akaun/laporan_auditTrail.blade.php index 5cbc960..5dd8646 100644 --- a/resources/views/akaun/laporan_auditTrail.blade.php +++ b/resources/views/akaun/laporan_auditTrail.blade.php @@ -226,8 +226,8 @@ - - + + diff --git a/resources/views/akaun/laporan_gadaian.blade.php b/resources/views/akaun/laporan_gadaian.blade.php index b17f934..4486e97 100644 --- a/resources/views/akaun/laporan_gadaian.blade.php +++ b/resources/views/akaun/laporan_gadaian.blade.php @@ -166,7 +166,7 @@
LAPORAN ANSURANLAPORAN ANSURAN PEMBIAYAAN
Tarikh Mula: @@ -209,7 +209,7 @@ Tempoh Baki Pembiayaan (RM) Bayaran Pemb. (RM)Ujrah(RM)Caj-caj Lain (RM) Keuntungan 1% (RM) Keuntungan (RM) Bayaran (RM)
Bayaran Pemb. (RM)Ujrah (RM)Caj-caj Lain (RM) Keuntungan 1% (RM) Keuntungan Sebenar (Bulan Sama) (RM) Keuntungan (RM)Pelulus Act NorujukanPinj. LamaPinjamanPemb. LamaPembiayaan Upah Nota Nokp
- + - + - + @@ -344,7 +344,7 @@ - + diff --git a/resources/views/akaun/laporan_kawalanstok.blade.php b/resources/views/akaun/laporan_kawalanstok.blade.php index 952cd5e..fb795b6 100644 --- a/resources/views/akaun/laporan_kawalanstok.blade.php +++ b/resources/views/akaun/laporan_kawalanstok.blade.php @@ -226,7 +226,7 @@ @php $counter = 1;@endphp - + - +
LAPORAN GADAIANLAPORAN PEMBIAYAAN @@ -213,13 +213,13 @@ Norujukan Nama AlamatTarikh GadaiTarikh Pembiayaan No K/P Masa Berat N Marhun PembiayaanUjrahCaj-caj Lain Keuntungan 1% Keuntungan Peratus (%)Berat (g/m) Nilai Marhun (RM) Pembiayaan (RM)Ujrah (RM)Caj-caj Lain (RM) Keuntungan 1% (RM) Upah/Keuntungan (RM)
GadaiPembiayaan Baki C/F
Hari Ini
@@ -275,7 +275,7 @@
PenebusanPenyelesaian Pembiayaan Baki C/F
Hari Ini
diff --git a/resources/views/akaun/laporan_penebusan.blade.php b/resources/views/akaun/laporan_penebusan.blade.php index ed23021..9c267fd 100644 --- a/resources/views/akaun/laporan_penebusan.blade.php +++ b/resources/views/akaun/laporan_penebusan.blade.php @@ -167,7 +167,7 @@ - + @@ -208,16 +208,16 @@ - + - + - + - + - + @@ -389,7 +389,7 @@ - + @@ -414,15 +414,15 @@
LAPORAN PENEBUSANLAPORAN PENYELESAIAN PEMBIAYAAN
Norujukan Nama No KPTarikh TebusTarikh Penyelesaian Pembiayaan Masa JBGJ TebusJ Penyelesaian Pembiayaan Nilai Marhun(RM)P. Asal(RM)Pemb. Asal(RM) B.Pembiayaan(RM)Ujrah(RM)Caj-caj Lain (RM) Untung 1%(RM)Pendapatan(RM)Keuntungan(RM) Bayaran(RM) Jumlah(RM)
Pembiayaan Asal(RM) B. Pembiayaan (RM) Keuntungan Rebet(RM)Ujrah (RM)Caj-caj Lain (RM) Untung 1% (RM) Keuntungan Sebenar (Bulan Sama) (RM) Pendapatan Kasar (RM)
-

Laporan Transaksi Penebusan

+

Laporan Transaksi Penyelesaian Pembiayaan


- - + + diff --git a/resources/views/akaun/laporan_prestasi.blade.php b/resources/views/akaun/laporan_prestasi.blade.php index 0e46e8e..9c9f341 100644 --- a/resources/views/akaun/laporan_prestasi.blade.php +++ b/resources/views/akaun/laporan_prestasi.blade.php @@ -174,7 +174,7 @@ - + @@ -182,14 +182,14 @@ - - - - - - - - + + + + + + + + diff --git a/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php b/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php index 97f8312..c5e6963 100644 --- a/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php +++ b/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php @@ -60,7 +60,7 @@
1. PEMBIAYAAN
RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}
-
2. PENEBUSAN
+
2. PENYELESAIAN PEMBIAYAAN
RM {{ number_format($laporan_ringkasan['total_tebus'],2) }}
3. ANSURAN PEMBIAYAAN
RM {{ number_format($laporan_ringkasan['total_ansuran'],2) }}
@@ -79,7 +79,7 @@
1. PEMBIAYAAN
{{ $laporan_ringkasan['bilangan_gadai'] }}
-
2. PENEBUSAN
+
2. PENYELESAIAN PEMBIAYAAN
{{ $laporan_ringkasan['bilangan_tebus'] }}
3. ANSURAN PEMBIAYAAN
{{ $laporan_ringkasan['bilangan_ansuran'] }}
diff --git a/resources/views/akaun/laporan_serahmarhun.blade.php b/resources/views/akaun/laporan_serahmarhun.blade.php index 16df165..ebb1b02 100644 --- a/resources/views/akaun/laporan_serahmarhun.blade.php +++ b/resources/views/akaun/laporan_serahmarhun.blade.php @@ -166,7 +166,7 @@
Bil JenisPenebusan(RM)Ujrah(RM)Penyelesaian Pembiayaan(RM)Caj-caj Lain (RM) Untung 1% (RM) Pendapatan(RM) Rebate(RM)Bilangan Orang Bilangan Surat Jumlah (RM)Jumlah Pinjaman Semasa (RM)Jumlah Pembiayaan Semasa (RM) Baki Awal (RM) Baki Akhir (RM) Bilangan Pelanggan Baru
GadaiTebusGadaiTebusGadaianPenebusanUpah TebusUpah AnsuranPembiayaanPenyelesaian PembiayaanPembiayaanPenyelesaian PembiayaanPembiayaanPenyelesaian PembiayaanKeuntungan Penyelesaian PembiayaanKeuntungan Ansuran Pembiayaan Jumlah Upah
- + - + @php $counter = 1;$totalpinjaman = 0; @endphp diff --git a/resources/views/bajet/tambahbajet.blade.php b/resources/views/bajet/tambahbajet.blade.php index 3c50222..92e76fb 100644 --- a/resources/views/bajet/tambahbajet.blade.php +++ b/resources/views/bajet/tambahbajet.blade.php @@ -41,11 +41,11 @@
diff --git a/resources/views/exports/Ansuran/cawangan.blade.php b/resources/views/exports/Ansuran/cawangan.blade.php index c661a0f..3975c14 100644 --- a/resources/views/exports/Ansuran/cawangan.blade.php +++ b/resources/views/exports/Ansuran/cawangan.blade.php @@ -16,7 +16,7 @@
LAPORAN SERAH MARHUN TEBUSLAPORAN SERAH MARHUN PENYELESAIAN PEMBIAYAAN diff --git a/resources/views/akaun/laporan_stokauditbackdate.blade.php b/resources/views/akaun/laporan_stokauditbackdate.blade.php index 743fb75..bab06ba 100644 --- a/resources/views/akaun/laporan_stokauditbackdate.blade.php +++ b/resources/views/akaun/laporan_stokauditbackdate.blade.php @@ -207,7 +207,7 @@ Tempoh Belum Bayar Keuntungan Belum Bayar (RM) Utg 1%(RM) Ujrah(RM)Caj-caj Lain (RM) Lanjutan
diff --git a/resources/views/exports/Ansuran/summary.blade.php b/resources/views/exports/Ansuran/summary.blade.php index 2992ae0..a4e7d7c 100644 --- a/resources/views/exports/Ansuran/summary.blade.php +++ b/resources/views/exports/Ansuran/summary.blade.php @@ -16,7 +16,7 @@
- LAPORAN ANSURAN + LAPORAN ANSURAN PEMBIAYAAN
diff --git a/resources/views/exports/gadaian/cawangan.blade.php b/resources/views/exports/gadaian/cawangan.blade.php index 44e6b5e..4346f92 100644 --- a/resources/views/exports/gadaian/cawangan.blade.php +++ b/resources/views/exports/gadaian/cawangan.blade.php @@ -16,7 +16,7 @@
- LAPORAN ANSURAN + LAPORAN ANSURAN PEMBIAYAAN
diff --git a/resources/views/exports/gadaian/summary.blade.php b/resources/views/exports/gadaian/summary.blade.php index f1ed993..ece8e9a 100644 --- a/resources/views/exports/gadaian/summary.blade.php +++ b/resources/views/exports/gadaian/summary.blade.php @@ -16,7 +16,7 @@
- LAPORAN GADAI + LAPORAN PEMBIAYAAN
diff --git a/resources/views/exports/penebusan/cawangan.blade.php b/resources/views/exports/penebusan/cawangan.blade.php index eb79e28..35ee17d 100644 --- a/resources/views/exports/penebusan/cawangan.blade.php +++ b/resources/views/exports/penebusan/cawangan.blade.php @@ -16,7 +16,7 @@
- LAPORAN GADAI + LAPORAN PEMBIAYAAN
@@ -38,15 +38,15 @@ - + - + - + diff --git a/resources/views/exports/penebusan/summary.blade.php b/resources/views/exports/penebusan/summary.blade.php index 1e8c3e1..033e3bb 100644 --- a/resources/views/exports/penebusan/summary.blade.php +++ b/resources/views/exports/penebusan/summary.blade.php @@ -16,7 +16,7 @@
- LAPORAN GADAI + LAPORAN PEMBIAYAAN
No rujukan Nama No KPTarikh GadaiTarikh Pembiayaan JBG Nilai Pinjaman(RM) Baki Pinjaman(RM) Kos Keuntungan(RM) Kos Keuntungan Rebet(RM)Bayaran Penebusan(RM)Bayaran Penyelesaian Pembiayaan(RM) Nilai Marhun(RM)Jenis TebusJenis Penyelesaian Pembiayaan
@@ -32,7 +32,7 @@ - + @foreach ($teller_with_penebusan_data as $data) diff --git a/resources/views/indexOverallReport.blade.php b/resources/views/indexOverallReport.blade.php index 10d62b3..a3e97b5 100644 --- a/resources/views/indexOverallReport.blade.php +++ b/resources/views/indexOverallReport.blade.php @@ -16,19 +16,19 @@
-

Gadaian

+

Pembiayaan
-

Penebusan

+

Penyelesaian Pembiayaan
-

Ansuran

+

Ansuran Pembiayaan
{{ $gadaian['tagkiratebus'] }}
- + diff --git a/resources/views/reports/ansuran/index.blade.php b/resources/views/reports/ansuran/index.blade.php index 2a7c8c8..bf53473 100644 --- a/resources/views/reports/ansuran/index.blade.php +++ b/resources/views/reports/ansuran/index.blade.php @@ -16,7 +16,7 @@
Laporan Ansuran
+ class="text-center mx-auto text-white font-bold">Laporan Ansuran Pembiayaan
- LAPORAN GADAI + LAPORAN PEMBIAYAAN
Baki Pinjaman(RM) Kos Keuntungan(RM) Kos Keuntungan Rebet(RM)Bayaran Penebusan(RM)Bayaran Penyelesaian Pembiayaan(RM) Nilai Marhun(RM)
tebuspenyelesaian pembiayaan {{ $gadaian['tebus'] }}
- Bil Gadai + Bil Pembiayaan diff --git a/resources/views/reports/penebusan/index.blade.php b/resources/views/reports/penebusan/index.blade.php index 1d766e3..6aedf12 100644 --- a/resources/views/reports/penebusan/index.blade.php +++ b/resources/views/reports/penebusan/index.blade.php @@ -16,7 +16,7 @@
Laporan Penebusan
+ class="text-center mx-auto text-white font-bold">Laporan Penyelesaian Pembiayaan
 - Bil Tebus + Bil Penyelesaian pembiayaan @@ -98,7 +98,7 @@ - Bayaran Penebusan(RM) + Bayaran Penyelesaian Pembiayaan(RM) diff --git a/resources/views/resit/resitansuran.blade.php b/resources/views/resit/resitansuran.blade.php index d7586aa..cea6591 100644 --- a/resources/views/resit/resitansuran.blade.php +++ b/resources/views/resit/resitansuran.blade.php @@ -421,7 +421,7 @@ hr.new5 { : RM {{ number_format($transaction['bayaran_keuntungan'],2) }}
-

* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan

+

* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penyelesaian Pembiayaan


@@ -523,7 +523,7 @@ hr.new5 { 		: RM {{ number_format($transaction['bayaran_keuntungan'],2) }}
-

* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan

+

* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penyelesaian Pembiayaan


diff --git a/resources/views/tetapan/home.blade.php b/resources/views/tetapan/home.blade.php index 1b50948..2b46f67 100644 --- a/resources/views/tetapan/home.blade.php +++ b/resources/views/tetapan/home.blade.php @@ -54,7 +54,7 @@
Windster Logo -

Ubah Status Pembayaran Ujrah

+

Ubah Status Pembayaran CAJ-CAJ LAIN

 diff --git a/resources/views/tetapan/payable-ujrah-branches.blade.php b/resources/views/tetapan/payable-ujrah-branches.blade.php index b0d5824..464fafc 100644 --- a/resources/views/tetapan/payable-ujrah-branches.blade.php +++ b/resources/views/tetapan/payable-ujrah-branches.blade.php @@ -31,7 +31,7 @@ Cawangan Code - Gadaian Ujrah Payable + Pembiayaan Ujrah Payable Tawarruq Version