diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index ebe5b61..7944973 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -351,7 +351,6 @@ - {{-- Sudah Tebus --}} @@ -408,8 +407,8 @@ if(check_komuditi == 0){ Swal.fire({ icon: 'error', - title: 'Unit Komuditi Berbaki Minumum', - text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi' + title: 'Unit Komoditi Berbaki Minima', + text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi' }); event.preventDefault(); return false; @@ -417,8 +416,8 @@ if(Number(data['unit_komuditi']) < 10000){ Swal.fire({ icon: 'error', - title: 'Unit Komuditi Berbaki Minumum', - text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi' + title: 'Unit Komoditi Berbaki Minumum', + text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi' }); event.preventDefault(); return false; @@ -494,7 +493,6 @@ if(jenistebus == "belum_tebus"){ var urlroute = '{{ route("penebusan", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); - console.log(gadai_detail['bakihargajualan']); if(gadai_detail["bakihargajualan"] == null){ xtawarruq.row.add([ '', @@ -720,7 +718,6 @@ urlroute = urlroute.replace(':id', tebusaz['norujukan']); break; case 'T': - console.log("tebusan" + tebusaz['norujukan']); var urlroute = '{{ route("resit.tebus", ":id") }}'; urlroute = urlroute.replace(':id', tebusaz['norujukan']); break; @@ -756,27 +753,27 @@ if($("input[name='options']:checked").val() == 'belum_tebus'){ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - // if(+harini !== +tarikhgadai2){ - // Swal.fire({ - // icon: 'error', - // title: 'Amaran', - // text: 'Ubah Gadai Tidak Dibenarkan' - // }); - // return false; - // } + if(+harini !== +tarikhgadai2){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Ubah Gadai Tidak Dibenarkan' + }); + return false; + } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); - // if(+harini !== +tarikhgadai1){ - // Swal.fire({ - // icon: 'error', - // title: 'Amaran', - // text: 'Ubah Gadai Tidak Dibenarkan' - // }); - // return false; - // } + if(+harini !== +tarikhgadai1){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Ubah Gadai Tidak Dibenarkan' + }); + return false; + } } if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ @@ -856,9 +853,6 @@ var channel = pusher.subscribe('notice-ubahhapus'); channel.bind('my-ubahhapus', function(data) { - console.log(data); - - if(data.norujukan == ubahid) { if(data.kelulusan == 'lulus') @@ -927,26 +921,26 @@ if($("input[name='options']:checked").val() == 'belum_tebus'){ let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0); - // if(+harini !== +tarikhgadai2){ - // Swal.fire({ - // icon: 'error', - // title: 'Amaran', - // text: 'Hapus Gadai Tidak Dibenarkan' - // }); - // return false; - // } + if(+harini !== +tarikhgadai2){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Hapus Gadai Tidak Dibenarkan' + }); + return false; + } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text(); let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0); - // if(+harini !== +tarikhgadai1){ - // Swal.fire({ - // icon: 'error', - // title: 'Amaran', - // text: 'Hapus Gadai Tidak Dibenarkan' - // }); - // return false; - // } + if(+harini !== +tarikhgadai1){ + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Hapus Gadai Tidak Dibenarkan' + }); + return false; + } } const swalWithBootstrapButtons = Swal.mixin({ diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index 40aa4bb..0f79a2f 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -198,7 +198,7 @@ Lelong
- Panjar + Perbelanjaan
Aliran Tunai diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 2999622..21dde55 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -22,8 +22,6 @@
- - {{-- {{ dd($ringkasanharian) }} --}} {{-- First Column --}}
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 4e80d87..f8ad3e3 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -8,7 +8,7 @@
-
{{ __('Dashboard') }}
+
{{ __('Perbelanjaan') }}
diff --git a/resources/views/test.blade.php b/resources/views/test.blade.php deleted file mode 100644 index 859bc1b..0000000 --- a/resources/views/test.blade.php +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - SISTEM AR-RAHN - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{-- Pusher --}} - - - {{-- jquery validation --}} - - - - - - - - -

Pusher Test

-

- Try publishing an event to channel my-channel - with event name my-event. -

- - - - - - diff --git a/resources/views/testing.blade.php b/resources/views/testing.blade.php deleted file mode 100644 index 56cb084..0000000 --- a/resources/views/testing.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -
-

Team A Score

-
-
- - \ No newline at end of file diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index 625e7ab..2c82218 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -7,22 +7,24 @@

maklumat pengguna

- User Image -
+
-
NAMA
-
-
NOMBOR KAD PENGENALAN
-
-
JAWATAN
-
-
NO TELEFON
-
-
KATALALUAN BARU
-
-
ULANG KATALALUAN
-
-
+
+
+
NAMA
+
+
NO TELEFON
+
+
+
+
+
+
NO KP
+
+
JAWATAN
+
+
+
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index ba4b0ba..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - Laravel - - - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - - - - -
-
- - - -