From d72922fbfabe82ebd396acbcb4f5c34f50f6bda4 Mon Sep 17 00:00:00 2001
From: ajifatur <ajifatur2@gmail.com>
Date: Mon, 14 Jun 2021 15:45:37 +0700
Subject: [PATCH] Add datatable server side, update certificate

---
 resources/views/admin/email/index.blade.php   | 95 ++++++-------------
 resources/views/admin/komisi/index.blade.php  | 79 +++------------
 .../views/admin/pelatihan/create.blade.php    | 11 +--
 .../views/admin/pelatihan/detail.blade.php    |  2 +
 .../views/admin/pelatihan/edit.blade.php      | 56 ++++++-----
 .../admin/pelatihan/transaction.blade.php     |  2 +-
 resources/views/admin/pop-up/index.blade.php  | 16 +---
 resources/views/admin/user/index.blade.php    | 50 +++-------
 .../views/member/pelatihan/detail.blade.php   |  2 +
 .../views/pdf/sertifikat-peserta.blade.php    |  2 +
 resources/views/template/admin/_css.blade.php |  2 +-
 .../views/template/admin/_js-table.blade.php  | 88 ++++++++++-------
 routes/web.php                                |  3 +
 src/Console/Kernel.php                        |  6 ++
 src/Helpers/GenerateHelper.php                | 12 ++-
 src/Http/Controllers/EmailController.php      | 85 +++++++++++++++--
 src/Http/Controllers/KomisiController.php     | 89 +++++++++++++++++
 src/Http/Controllers/UserController.php       | 89 +++++++++++++++++
 src/Mails/ForgotPasswordMail.php              |  2 +-
 19 files changed, 436 insertions(+), 255 deletions(-)

diff --git a/resources/views/admin/email/index.blade.php b/resources/views/admin/email/index.blade.php
index b6b5381c..26a09c11 100644
--- a/resources/views/admin/email/index.blade.php
+++ b/resources/views/admin/email/index.blade.php
@@ -52,50 +52,6 @@
                                     <th width="80">Opsi</th>
                                 </tr>
                             </thead>
-                            <tbody>
-                                @foreach($email as $data)
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>
-                                        <a href="{{ route('admin.email.detail', ['id' => $data->id_email]) }}">{{ $data->subject }}</a>
-                                        <br>
-                                        @if(count_penerima_email($data->receiver_id)>0)
-                                            <small class="text-muted"><i class="fa fa-check-circle mr-1"></i>Sudah dikirim kepada {{ number_format(count_penerima_email($data->receiver_id),0,'.','.') }} dari total {{ number_format(count_member_aktif(),0,'.','.') }} member.</small>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        <a href="{{ route('admin.user.detail', ['id' => $data->id_user]) }}">{{ $data->nama_user }}</a>
-                                        <br>
-                                        <small><i class="fa fa-envelope mr-1"></i>{{ $data->email }}</small>
-                                        <br>
-                                        <small><i class="fa fa-phone mr-1"></i>{{ $data->nomor_hp }}</small>
-                                    </td>
-                                    <td>
-                                        @if($data->scheduled != null)
-                                            <span>Harian</span>
-                                            <br>
-                                            <small><i class="fa fa-clock-o mr-1"></i>{{ $data->scheduled }} WIB</small>
-                                        @else
-                                            <span class="badge badge-danger">Tidak</span>
-                                        @endif
-                                    </td>
-                                    <td>
-                                        <span class="d-none">{{ $data->sent_at }}</span>
-                                        {{ date('d/m/Y', strtotime($data->sent_at)) }}
-                                        <br>
-                                        <small><i class="fa fa-clock-o mr-1"></i>{{ date('H:i', strtotime($data->sent_at)) }} WIB</small>
-                                    </td>
-                                    <td>
-                                        <div class="btn-group">
-                                            <a href="{{ route('admin.email.detail', ['id' => $data->id_email]) }}" class="btn btn-info btn-sm" data-toggle="tooltip" title="Detail"><i class="fa fa-eye"></i></a>
-                                            <a href="#" class="btn btn-warning btn-sm btn-schedule" data-id="{{ $data->id_email }}" data-schedule="{{ $data->scheduled }}" data-toggle="tooltip" title="Atur Jadwal"><i class="fa fa-clock-o"></i></a>
-                                            <a href="#" class="btn btn-success btn-sm btn-forward" data-id="{{ $data->id_email }}" data-r="{{ $data->receiver_id }}" data-toggle="tooltip" title="Teruskan"><i class="fa fa-share"></i></a>
-                                            <a href="#" class="btn btn-danger btn-sm btn-delete" data-id="{{ $data->id_email }}" data-toggle="tooltip" title="Hapus"><i class="fa fa-trash"></i></a>
-                                        </div>
-                                    </td>
-                                </tr>
-                                @endforeach
-                            </tbody>
                         </table>
                         <form id="form-delete" class="d-none" method="post" action="{{ route('admin.email.delete') }}">
                             {{ csrf_field() }}
@@ -210,7 +166,18 @@
 <script type="text/javascript" src="{{ asset('assets/plugins/clockpicker/bootstrap-clockpicker.min.js') }}"></script>
 <script type="text/javascript">
     // DataTable
-    generate_datatable("#dataTable");
+    generate_datatable("#dataTable", {
+        "url": "{{ route('admin.email.data') }}",
+        "columns": [
+            {data: 'checkbox', name: 'checkbox'},
+            {data: 'email', name: 'email'},
+            {data: 'sender', name: 'sender'},
+            {data: 'scheduled', name: 'scheduled'},
+            {data: 'sent_at', name: 'sent_at'},
+            {data: 'options', name: 'options'},
+        ],
+        "order": [3, 'desc']
+    });
     
     // Button Forward
     $(document).on("click", ".btn-forward", function(e){
@@ -277,28 +244,28 @@
         e.preventDefault();
         var id = $(this).data("id");
         var schedule = $(this).data("schedule");
-		
-		// Add values
+        
+        // Add values
         $("#modal-schedule input[name=id]").val(id);
-		if(schedule != ''){
-        	$("#modal-schedule #terjadwal-1").prop("checked", true);
-			$("#modal-schedule .form-jadwal").removeClass("d-none");
-			$("#modal-schedule input[name=scheduled]").val(schedule);
-		}
-		else{
-        	$("#modal-schedule #terjadwal-0").prop("checked", true);
-			$("#modal-schedule .form-jadwal").addClass("d-none");
-			$("#modal-schedule input[name=scheduled]").val(schedule);
-		}
+        if(schedule != ''){
+            $("#modal-schedule #terjadwal-1").prop("checked", true);
+            $("#modal-schedule .form-jadwal").removeClass("d-none");
+            $("#modal-schedule input[name=scheduled]").val(schedule);
+        }
+        else{
+            $("#modal-schedule #terjadwal-0").prop("checked", true);
+            $("#modal-schedule .form-jadwal").addClass("d-none");
+            $("#modal-schedule input[name=scheduled]").val(schedule);
+        }
 
         // Show modal
         $("#modal-schedule").modal("show");
     });
-	
-	// Clockpicker
-	$(".clockpicker").clockpicker({
-		autoclose: true
-	});
+    
+    // Clockpicker
+    $(".clockpicker").clockpicker({
+        autoclose: true
+    });
 
     // Change Terjadwal
     $(document).on("change", "input[name=terjadwal]", function(){
@@ -309,7 +276,7 @@
     // Hide Modal Schedule
     $('#modal-schedule').on('hidden.bs.modal', function(){
         $("#modal-schedule input[name=id]").val(null);
-		$("#modal-schedule input[name=scheduled]").val(null);
+        $("#modal-schedule input[name=scheduled]").val(null);
     });
     
     // Checkbox Batch
@@ -382,7 +349,7 @@ function countChecked(array){
 </script>
 @if(count($errors)>0)
 <script type="text/javascript">
-	$("#modal-schedule").modal("show");
+    $("#modal-schedule").modal("show");
 </script>
 @endif
 
diff --git a/resources/views/admin/komisi/index.blade.php b/resources/views/admin/komisi/index.blade.php
index 7774ebec..61ba0df2 100644
--- a/resources/views/admin/komisi/index.blade.php
+++ b/resources/views/admin/komisi/index.blade.php
@@ -44,68 +44,6 @@
                                     <th width="40">Opsi</th>
                                 </tr>
                             </thead>
-                            <tbody>
-                                @foreach($komisi as $data)
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>{{ $data->inv_komisi }}</td>
-                                    <td>
-                                        @if($data->komisi_at != null)
-                                            <span class="d-none">{{ $data->komisi_at }}</span>
-                                            {{ date('d/m/Y', strtotime($data->komisi_at)) }}
-                                            <br>
-                                            <small><i class="fa fa-clock-o mr-1"></i>{{ date('H:i', strtotime($data->komisi_at)) }} WIB</small>
-                                        @else
-                                        -
-                                        @endif
-                                    </td>
-                                    <td>
-                                        <a href="{{ route('admin.user.detail', ['id' => $data->id_user ]) }}">{{ $data->nama_user }}</a>
-                                        <br>
-                                        <small><i class="fa fa-envelope mr-1"></i>{{ $data->email }}</small>
-                                        <br>
-                                        <small><i class="fa fa-phone mr-1"></i>{{ $data->nomor_hp }}</small>
-                                    </td>
-                                    <td>
-                                        <a href="{{ route('admin.user.detail', ['id' => $data->id_sponsor->id_user ]) }}">{{ $data->id_sponsor->nama_user }}</a>
-                                        <br>
-                                        <small><i class="fa fa-envelope mr-1"></i>{{ $data->id_sponsor->email }}</small>
-                                        <br>
-                                        <small><i class="fa fa-phone mr-1"></i>{{ $data->id_sponsor->nomor_hp }}</small>
-                                    </td>
-                                    <td>
-                                        <strong>Aktivasi Komisi:</strong><br>
-                                        Rp. {{ number_format($data->komisi_aktivasi,0,',',',') }}<br><br>
-                                        <strong>Hasil Komisi:</strong><br>
-                                        Rp. {{ number_format($data->komisi_hasil,0,',',',') }}
-                                    </td>
-                                    <td>
-                                        @if($data->komisi_status == 1)
-                                            <strong class="text-success">Diterima</strong>
-                                        @else
-                                            @if($data->komisi_proof != '')
-                                                <strong class="text-danger">Pembayaran Belum Diverifikasi</strong>
-                                            @else
-                                                <strong class="text-danger">User Belum Membayar</strong>
-                                            @endif
-                                        @endif
-                                    </td>
-                                    <td align="center">
-                                        <div class="btn-group"> 
-                                            @if($data->komisi_status == 1)
-                                                <a href="{{ asset('assets/images/komisi/'.$data->komisi_proof) }}" class="btn btn-sm btn-info btn-magnify-popup" data-toggle="tooltip" title="Bukti Transfer"><i class="fa fa-image"></i></a>
-                                            @else
-                                                @if($data->komisi_proof != '')
-                                                    <a href="#" class="btn btn-sm btn-success btn-verify" data-id="{{ $data->id_komisi }}" data-proof="{{ asset('assets/images/komisi/'.$data->komisi_proof) }}" data-toggle="tooltip" title="Verifikasi Pembayaran"><i class="fa fa-check"></i></a>
-                                                @else
-                                                    <a href="#" class="btn btn-sm btn-success btn-confirm" data-id="{{ $data->id_komisi }}" data-toggle="tooltip" title="Konfirmasi Pembayaran"><i class="fa fa-check"></i></a>
-                                                @endif
-                                            @endif
-                                        </div>
-                                    </td>
-                                </tr>
-                                @endforeach
-                            </tbody>
                         </table>
                     </div>
                 </div>
@@ -194,7 +132,20 @@
 
 <script type="text/javascript">
     // DataTable
-    generate_datatable("#dataTable");
+    generate_datatable("#dataTable", {
+		"url": "{{ route('admin.komisi.data') }}",
+		"columns": [
+            {data: 'checkbox', name: 'checkbox'},
+            {data: 'inv_komisi', name: 'inv_komisi'},
+            {data: 'komisi_at', name: 'komisi_at'},
+            {data: 'user_identity', name: 'user_identity'},
+            {data: 'sponsor', name: 'sponsor'},
+            {data: 'komisi', name: 'komisi'},
+            {data: 'komisi_status', name: 'komisi_status'},
+            {data: 'options', name: 'options'},
+		],
+        "order": [6, 'asc']
+	});
 
     // Button Verify
     $(document).on("click", ".btn-verify", function(e){
@@ -202,7 +153,7 @@
         var id = $(this).data("id");
         var proof = $(this).data("proof");
         $("#form-verify input[name=id_komisi]").val(id);
-        $("#form-verify img").attr("src", proof);
+        $("#form-verify img").attr("src", proof).removeClass("d-none");
         $("#modal-verify").modal("show");
     });
 
diff --git a/resources/views/admin/pelatihan/create.blade.php b/resources/views/admin/pelatihan/create.blade.php
index d3e45633..d5648de2 100644
--- a/resources/views/admin/pelatihan/create.blade.php
+++ b/resources/views/admin/pelatihan/create.blade.php
@@ -117,7 +117,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-md-2 col-form-label">Materi <span class="text-danger">*</span></label>
+                            <label class="col-md-2 col-form-label">Materi</label>
                             <div class="col-md-10">
                                 <a class="btn btn-sm btn-secondary btn-add-materi" href="#"><i class="fa fa-plus mr-2"></i>Tambah Materi</a>
                                 <div class="table-responsive-sm konten-materi mt-3 mb-3 mb-md-0">
@@ -250,15 +250,6 @@
     $(document).on("click", "button[type=submit]", function(e){
         e.preventDefault();
         
-        // Cek Materi
-        var rows = $(".konten-materi .form-row");
-        if(rows.length == 1){
-            if($(rows).find(".kode-unit").val() == '' || $(rows).find(".judul-unit").val() == '' || $(rows).find(".durasi").val() == '' ){
-                alert("Materi harus diisi minimal 1 (satu) !");
-                return;
-            }
-        }
-        
         // Get Konten di Quill Editor
         var myEditor = document.querySelector('#editor');
         var html = myEditor.children[0].innerHTML;
diff --git a/resources/views/admin/pelatihan/detail.blade.php b/resources/views/admin/pelatihan/detail.blade.php
index d0157c23..3fb0df83 100644
--- a/resources/views/admin/pelatihan/detail.blade.php
+++ b/resources/views/admin/pelatihan/detail.blade.php
@@ -78,6 +78,7 @@
                         <strong>Deskripsi:</strong>
                         <div class="ql-snow"><div class="ql-editor p-0">{!! html_entity_decode($pelatihan->deskripsi_pelatihan) !!}</div></div>
                     </div>
+                    @if(count($pelatihan->materi_pelatihan)>0)
                     <div class="mt-3">
                         <strong>Materi:</strong>
                         <div class="list-group list-group-flush">
@@ -90,6 +91,7 @@
                             @endforeach
                         </div>
                     </div>
+                    @endif
                 </div>
                 <!-- /Tile Body -->
             </div>
diff --git a/resources/views/admin/pelatihan/edit.blade.php b/resources/views/admin/pelatihan/edit.blade.php
index 69b8852d..bf7eb15c 100644
--- a/resources/views/admin/pelatihan/edit.blade.php
+++ b/resources/views/admin/pelatihan/edit.blade.php
@@ -104,26 +104,43 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label class="col-md-2 col-form-label">Materi <span class="text-danger">*</span></label>
+                            <label class="col-md-2 col-form-label">Materi</label>
                             <div class="col-md-10">
                                 <a class="btn btn-sm btn-secondary btn-add-materi" href="#"><i class="fa fa-plus mr-2"></i>Tambah Materi</a>
                                 <div class="table-responsive-sm konten-materi mt-3 mb-3 mb-md-0">
-                                    @foreach($pelatihan->materi_pelatihan as $key=>$materi)
-                                    <div class="form-row" data-id="{{ ($key+1) }}">
-                                        <div class="form-group col-4">
-                                            <input type="text" name="kode_unit[]" class="form-control kode-unit" data-id="{{ ($key+1) }}" placeholder="Kode Unit" value="{{ $materi['kode'] }}">
+                                    @if(count($pelatihan->materi_pelatihan)>0)
+                                        @foreach($pelatihan->materi_pelatihan as $key=>$materi)
+                                        <div class="form-row" data-id="{{ ($key+1) }}">
+                                            <div class="form-group col-4">
+                                                <input type="text" name="kode_unit[]" class="form-control kode-unit" data-id="{{ ($key+1) }}" placeholder="Kode Unit" value="{{ $materi['kode'] }}">
+                                            </div>
+                                            <div class="form-group col-4">
+                                                <input type="text" name="judul_unit[]" class="form-control judul-unit" data-id="{{ ($key+1) }}" placeholder="Judul Unit" value="{{ $materi['judul'] }}">
+                                            </div>
+                                            <div class="form-group col-3">
+                                                <input type="text" name="durasi[]" class="form-control number-only durasi" data-id="{{ ($key+1) }}" placeholder="Durasi (Jam)" value="{{ $materi['durasi'] }}">
+                                            </div>
+                                            <div class="form-group col-1">
+                                                <a href="#" class="btn btn-danger btn-block {{ count($pelatihan->materi_pelatihan) <= 1 ? 'btn-disabled' : 'btn-delete-materi' }}" data-id="{{ ($key+1) }}" title="Hapus"><i class="fa fa-trash"></i></a>
+                                            </div>
                                         </div>
-                                        <div class="form-group col-4">
-                                            <input type="text" name="judul_unit[]" class="form-control judul-unit" data-id="{{ ($key+1) }}" placeholder="Judul Unit" value="{{ $materi['judul'] }}">
+                                        @endforeach
+                                    @else
+                                        <div class="form-row" data-id="1">
+                                            <div class="form-group col-4">
+                                                <input type="text" name="kode_unit[]" class="form-control kode-unit" data-id="1" placeholder="Kode Unit">
+                                            </div>
+                                            <div class="form-group col-4">
+                                                <input type="text" name="judul_unit[]" class="form-control judul-unit" data-id="1" placeholder="Judul Unit">
+                                            </div>
+                                            <div class="form-group col-3">
+                                                <input type="text" name="durasi[]" class="form-control number-only durasi" data-id="1" placeholder="Durasi (Jam)">
+                                            </div>
+                                            <div class="form-group col-1">
+                                                <a href="#" class="btn btn-danger btn-block btn-disabled" data-id="1" title="Hapus"><i class="fa fa-trash"></i></a>
+                                            </div>
                                         </div>
-                                        <div class="form-group col-3">
-                                            <input type="text" name="durasi[]" class="form-control number-only durasi" data-id="{{ ($key+1) }}" placeholder="Durasi (Jam)" value="{{ $materi['durasi'] }}">
-                                        </div>
-                                        <div class="form-group col-1">
-                                            <a href="#" class="btn btn-danger btn-block {{ count($pelatihan->materi_pelatihan) <= 1 ? 'btn-disabled' : 'btn-delete-materi' }}" data-id="{{ ($key+1) }}" title="Hapus"><i class="fa fa-trash"></i></a>
-                                        </div>
-                                    </div>
-                                    @endforeach
+                                    @endif
                                 </div>
                                 <a class="btn btn-sm btn-secondary btn-add-materi" href="#"><i class="fa fa-plus mr-2"></i>Tambah Materi</a>
                             </div>
@@ -252,15 +269,6 @@
     $(document).on("click", "button[type=submit]", function(e){
         e.preventDefault();
         
-        // Cek Materi
-        var rows = $(".konten-materi .form-row");
-        if(rows.length == 1){
-            if($(rows).find(".kode-unit").val() == '' || $(rows).find(".judul-unit").val() == '' || $(rows).find(".durasi").val() == '' ){
-                alert("Materi harus diisi minimal 1 (satu) !");
-                return;
-            }
-        }
-        
         // Get Konten di Quill Editor
         var myEditor = document.querySelector('#editor');
         var html = myEditor.children[0].innerHTML;
diff --git a/resources/views/admin/pelatihan/transaction.blade.php b/resources/views/admin/pelatihan/transaction.blade.php
index aba2d551..bf2012bb 100644
--- a/resources/views/admin/pelatihan/transaction.blade.php
+++ b/resources/views/admin/pelatihan/transaction.blade.php
@@ -159,7 +159,7 @@
         var id = $(this).data("id");
         var proof = $(this).data("proof");
         $("#form-verify input[name=id]").val(id);
-        $("#form-verify img").attr("src", proof);
+        $("#form-verify img").attr("src", proof).removeClass("d-none");
         $("#modal-verify").modal("show");
     });
 </script>
diff --git a/resources/views/admin/pop-up/index.blade.php b/resources/views/admin/pop-up/index.blade.php
index b0566709..e14955c4 100644
--- a/resources/views/admin/pop-up/index.blade.php
+++ b/resources/views/admin/pop-up/index.blade.php
@@ -43,7 +43,6 @@
                                 <tr>
                                     <th width="20"><input type="checkbox"></th>
                                     <th>Judul</th>
-                                    <th width="150">Gambar / Video</th>
                                     <th width="90">Waktu Awal</th>
                                     <th width="90">Waktu Akhir</th>
                                     <th width="60">Opsi</th>
@@ -54,15 +53,6 @@
                                 <tr>
                                     <td><input type="checkbox"></td>
                                     <td>{{ $data->popup_judul }}</td>
-                                    <td>
-                                        @if($data->popup_tipe == 1)
-                                        <a href="{{ asset('assets/images/pop-up/'.$data->popup) }}" class="btn-magnify-popup" title="Gambar Pop-Up">
-                                            <img src="{{ asset('assets/images/pop-up/'.$data->popup) }}" class="img-thumbnail" style="max-width: 150px;">
-                                        </a>
-                                        @elseif($data->popup_tipe == 2)
-                                        <a href="{{ $data->popup }}" class="btn btn-sm btn-secondary btn-magnify-popup video-link" data-toggle="tooltip" title="Video Pop-Up"><i class="fa fa-video-camera"></i></a>
-                                        @endif
-                                    </td>
                                     <td>
                                         <span class="d-none">{{ $data->popup_from }}</span>
                                         {{ date('d/m/Y', strtotime($data->popup_from)) }}
@@ -73,7 +63,11 @@
                                     </td>
                                     <td>
                                         <div class="btn-group">
-                                            <a href="{{ route('admin.pop-up.detail', ['id' => $data->id_popup]) }}" class="btn btn-sm btn-info" data-toggle="tooltip" title="Detail"><i class="fa fa-eye"></i></a>
+                                            @if($data->popup_tipe == 1)
+                                            <a href="{{ asset('assets/images/pop-up/'.$data->popup) }}" class="btn btn-sm btn-info btn-magnify-popup" data-toggle="tooltip" title="Gambar Pop-Up"><i class="fa fa-image"></i></a>
+                                            @elseif($data->popup_tipe == 2)
+                                            <a href="{{ $data->popup }}" class="btn btn-sm btn-info btn-magnify-popup video-link" data-toggle="tooltip" title="Video Pop-Up"><i class="fa fa-video-camera"></i></a>
+                                            @endif
                                             <a href="{{ route('admin.pop-up.edit', ['id' => $data->id_popup]) }}" class="btn btn-sm btn-warning" data-toggle="tooltip" title="Edit"><i class="fa fa-edit"></i></a>
                                             <a href="#" class="btn btn-sm btn-danger btn-delete" data-id="{{ $data->id_popup }}" data-toggle="tooltip" title="Hapus"><i class="fa fa-trash"></i></a>
                                         </div>
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index 1a4050f8..6ba8b1d0 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -61,41 +61,6 @@
                                     <th width="60">Opsi</th>
                                 </tr>
                             </thead>
-                            <tbody>
-                                @foreach($users as $user)
-                                <tr>
-                                    <td><input type="checkbox"></td>
-                                    <td>
-                                        <a href="{{ $user->id_user == Auth::user()->id_user ? route('admin.profile') : route('admin.user.detail', ['id' => $user->id_user]) }}">{{ $user->nama_user }}</a>
-                                        <br>
-                                        <small><i class="fa fa-envelope mr-1"></i>{{ $user->email }}</small>
-                                        <br>
-                                        <small><i class="fa fa-phone mr-1"></i>{{ $user->nomor_hp }}</small>
-                                    </td>
-                                    <td>{{ $user->nama_role }}</td>
-                                    <td>{{ $user->is_admin == 0 ? number_format($user->saldo,0,',',',') : '-' }}</td>
-                                    <td>
-                                        @if($user->is_admin == 0)
-                                            <a href="{{ route('admin.user.refer', ['id' => $user->id_user]) }}" data-toggle="tooltip" title="Lihat Data Refer">{{ number_format(count_refer($user->username),0,',',',') }}</a>
-                                        @endif
-                                    </td>
-                                    <td><span class="badge {{ $user->status == 1 ? 'badge-success' : 'badge-danger' }}">{{ status($user->status) }}</span></td>
-                                    <td>
-                                        <span class="d-none">{{ $user->register_at }}</span>
-                                        {{ date('d/m/Y', strtotime($user->register_at)) }}
-                                        <br>
-                                        <small><i class="fa fa-clock-o mr-1"></i>{{ date('H:i', strtotime($user->register_at)) }} WIB</small>
-                                    </td>
-                                    <td>
-                                        <div class="btn-group">
-                                            <a href="{{ route('admin.user.detail', ['id' => $user->id_user]) }}" class="btn btn-sm btn-info" data-toggle="tooltip" title="Detail"><i class="fa fa-eye"></i></a>
-                                            <a href="{{ route('admin.user.edit', ['id' => $user->id_user]) }}" class="btn btn-sm btn-warning" data-toggle="tooltip" title="Edit"><i class="fa fa-edit"></i></a>
-                                            <a href="#" class="btn btn-sm btn-danger {{ $user->id_user > 6 ? 'btn-delete' : '' }}" data-id="{{ $user->id_user }}" style="{{ $user->id_user > 6 ? '' : 'cursor: not-allowed' }}" data-toggle="tooltip" title="{{ $user->id_user <= 6 ? $user->id_user == Auth::user()->id_user ? 'Tidak dapat menghapus akun sendiri' : 'Akun ini tidak boleh dihapus' : 'Hapus' }}"><i class="fa fa-trash"></i></a>
-                                        </div>
-                                    </td>
-                                </tr>
-                                @endforeach
-                            </tbody>
                         </table>
                         <form id="form-delete" class="d-none" method="post" action="{{ route('admin.user.delete') }}">
                             {{ csrf_field() }}
@@ -121,7 +86,20 @@
 
 <script type="text/javascript">
     // DataTable
-    generate_datatable("#dataTable");
+    generate_datatable("#dataTable", {
+		"url": "{{ route('admin.user.data', ['filter' => $filter]) }}",
+        "columns": [
+            {data: 'checkbox', name: 'checkbox'},
+            {data: 'user_identity', name: 'user_identity'},
+            {data: 'nama_role', name: 'nama_role'},
+            {data: 'saldo', name: 'saldo'},
+            {data: 'refer', name: 'refer'},
+            {data: 'status', name: 'status'},
+            {data: 'register_at', name: 'register_at'},
+            {data: 'options', name: 'options'},
+        ],
+        "order": [6, 'desc']
+	});
 
     // Filter
     $(document).on("change", "#filter", function(){
diff --git a/resources/views/member/pelatihan/detail.blade.php b/resources/views/member/pelatihan/detail.blade.php
index b5e59ee1..413ea855 100644
--- a/resources/views/member/pelatihan/detail.blade.php
+++ b/resources/views/member/pelatihan/detail.blade.php
@@ -87,6 +87,7 @@
                         <strong>Deskripsi:</strong>
                         <div class="ql-snow"><div class="ql-editor p-0">{!! html_entity_decode($pelatihan->deskripsi_pelatihan) !!}</div></div>
                     </div>
+                    @if(count($pelatihan->materi_pelatihan)>0)
                     <div class="mt-3">
                         <strong>Materi:</strong>
                         <div class="list-group list-group-flush">
@@ -99,6 +100,7 @@
                             @endforeach
                         </div>
                     </div>
+                    @endif
                 </div>
                 <!-- /Tile Body -->
             </div>
diff --git a/resources/views/pdf/sertifikat-peserta.blade.php b/resources/views/pdf/sertifikat-peserta.blade.php
index d840ca9c..eff32f09 100644
--- a/resources/views/pdf/sertifikat-peserta.blade.php
+++ b/resources/views/pdf/sertifikat-peserta.blade.php
@@ -116,6 +116,7 @@
 	<hr id="line-1">
 	<hr id="line-2">
 	
+	@if(count($pelatihan->materi_pelatihan)>0)
 	<!-- Page Break -->
 	<div class="page-break"></div>
 	
@@ -163,5 +164,6 @@
 	<!-- <img id="stempel-2" src="{{ asset('assets/images/others/stempel.png') }}"> -->
 	<div id="trainer">{{ $pelatihan->nama_user }}</div>
 	<div id="div-line"><hr id="line"></div>
+	@endif
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/template/admin/_css.blade.php b/resources/views/template/admin/_css.blade.php
index c62bc830..cf682887 100644
--- a/resources/views/template/admin/_css.blade.php
+++ b/resources/views/template/admin/_css.blade.php
@@ -100,7 +100,7 @@
     #dataTable td .btn-group a.btn:first-child {border-top-left-radius: .25rem; border-bottom-left-radius: .25rem;}
     #dataTable td .btn-group a.btn:last-child {border-top-right-radius: .25rem; border-bottom-right-radius: .25rem;}
     #dataTable td a.btn {width: 36px;}
-    div.dataTables_wrapper div.dataTables_processing {background-color: #eeeeee;}
+    div.dataTables_wrapper div.dataTables_processing {background-color: var(--primary-light); color: var(--primary-dark); box-shadow: 0 .125rem .25rem rgba(0,0,0,.375)!important;}
     .table-stretch tr th, .table-stretch tr td {padding: .25rem;}
 
     /* Anchor */
diff --git a/resources/views/template/admin/_js-table.blade.php b/resources/views/template/admin/_js-table.blade.php
index d1875cc6..60cbae9c 100644
--- a/resources/views/template/admin/_js-table.blade.php
+++ b/resources/views/template/admin/_js-table.blade.php
@@ -8,7 +8,8 @@
 
 <script type="text/javascript">
     // Generate dataTable
-    function generate_datatable(table){
+    function generate_datatable(table, setting = ''){
+        // Configs
         var config_lang = {
             "lengthMenu": "Menampilkan _MENU_ data",
             "zeroRecords": "Data tidak tersedia",
@@ -17,41 +18,62 @@ function generate_datatable(table){
             "infoFiltered": "(Terfilter dari total _MAX_ data)",
             "search": "Cari:",
             "paginate": {
-            "first": "Pertama",
-            "last": "Terakhir",
-            "previous": "<",
-            "next": ">",
+                "first": "Pertama",
+                "last": "Terakhir",
+                "previous": "<",
+                "next": ">",
             },
             "processing": "Memproses data..."
         };
-        var datatable = $(table).DataTable({
-            "language": config_lang,
-            "fnDrawCallback": function(){
-                $('.btn-magnify-popup').magnificPopup({
-                    type: 'image',
-                    closeOnContentClick: true,
-                    closeBtnInside: false,
-                    fixedContentPos: true,
-                    image: {
-                        verticalFit: true
-                    },
-                    gallery: {
-                        enabled: true
-                    },
-                    callbacks: {
-                        elementParse: function(item) {
-                            // Change type if video
-                            item.type = $(item.el).hasClass("video-link") ? "iframe" : "image";
-                        }
-                    },
-                });
-            },
-            columnDefs: [
-                {orderable: false, targets: 0},
-                {orderable: false, targets: -1},
-            ],
-            order: []
-        });
+        var configFnDrawCallback = function(){
+            $('.btn-magnify-popup').magnificPopup({
+                type: 'image',
+                closeOnContentClick: true,
+                closeBtnInside: false,
+                fixedContentPos: true,
+                image: {
+                    verticalFit: true
+                },
+                gallery: {
+                    enabled: true
+                },
+                callbacks: {
+                    elementParse: function(item) {
+                        item.type = $(item.el).hasClass("video-link") ? "iframe" : "image"; // Change type if video
+                    }
+                },
+            });
+        };
+        
+        if(typeof setting != 'object'){
+            // Server Side OFF
+            var datatable = $(table).DataTable({
+                "language": config_lang,
+                "fnDrawCallback": configFnDrawCallback,
+                columnDefs: [
+                    {orderable: false, targets: 0},
+                    {orderable: false, targets: -1},
+                ],
+                order: []
+            });
+        }
+        else{
+            // Server Side ON
+            var datatable = $(table).DataTable({
+                processing: true,
+                serverSide: true,
+                ajax: setting.url,
+                columns: setting.columns,
+                columnDefs: [
+                    {orderable: false, targets: 0},
+                    {orderable: false, targets: -1},
+                ],
+                order: [setting.order],
+                "lengthMenu": [[10, 25, 50, 100], [10, 25, 50, 100]],
+                "language": config_lang,
+                "fnDrawCallback": configFnDrawCallback,
+            });
+        }
         datatable.on('draw.dt', function(){
             $('[data-toggle="tooltip"]').tooltip();
         });
diff --git a/routes/web.php b/routes/web.php
index 4f1d3d1f..3d7f09f2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -61,6 +61,7 @@
 
 	// User
 	Route::get('/admin/user', $namespacePrefix.'UserController@index')->name('admin.user.index');
+	Route::get('/admin/user/data', $namespacePrefix.'UserController@data')->name('admin.user.data');
 	Route::get('/admin/user/create', $namespacePrefix.'UserController@create')->name('admin.user.create');
 	Route::post('/admin/user/store', $namespacePrefix.'UserController@store')->name('admin.user.store');
 	Route::get('/admin/user/detail/{id}', $namespacePrefix.'UserController@detail')->name('admin.user.detail');
@@ -107,6 +108,7 @@
 
 	// Transaksi Komisi
 	Route::get('/admin/transaksi/komisi', $namespacePrefix.'KomisiController@index')->name('admin.komisi.index');
+	Route::get('/admin/transaksi/komisi/data', $namespacePrefix.'KomisiController@data')->name('admin.komisi.data');
 	Route::post('/admin/transaksi/komisi/verify', $namespacePrefix.'KomisiController@verify')->name('admin.komisi.verify');
 	Route::post('/admin/transaksi/komisi/confirm', $namespacePrefix.'KomisiController@confirm')->name('admin.komisi.confirm');
 
@@ -120,6 +122,7 @@
 
 	// Email
 	Route::get('/admin/email', $namespacePrefix.'EmailController@index')->name('admin.email.index');
+	Route::get('/admin/email/data', $namespacePrefix.'EmailController@data')->name('admin.email.data');
 	Route::get('/admin/email/create', $namespacePrefix.'EmailController@create')->name('admin.email.create');
 	Route::post('/admin/email/store', $namespacePrefix.'EmailController@store')->name('admin.email.store');
 	Route::post('/admin/email/forward', $namespacePrefix.'EmailController@forward')->name('admin.email.forward');
diff --git a/src/Console/Kernel.php b/src/Console/Kernel.php
index 1560e6f1..37ef5e07 100644
--- a/src/Console/Kernel.php
+++ b/src/Console/Kernel.php
@@ -21,6 +21,12 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         parent::schedule($schedule);
+        
+		// Clear
+        $schedule->command('clear-compiled')->daily();
+        $schedule->command('cache:clear')->daily();
+        $schedule->command('config:clear')->daily();
+        $schedule->command('view:clear')->daily();
 
         // Broadcast scheduled emails
         // Get email
diff --git a/src/Helpers/GenerateHelper.php b/src/Helpers/GenerateHelper.php
index 95a37a6a..0f0433fe 100644
--- a/src/Helpers/GenerateHelper.php
+++ b/src/Helpers/GenerateHelper.php
@@ -8,12 +8,16 @@
 if(!function_exists('generate_materi_pelatihan')){
     function generate_materi_pelatihan($kode_unit, $judul_unit, $durasi){
         $array = [];
-        if(count($kode_unit)>0){
-            foreach($kode_unit as $key=>$kode){
-                array_push($array, ['kode' => $kode, 'judul' => $judul_unit[$key], 'durasi' => $durasi[$key]]);
+        if(empty(array_filter($kode_unit)) || empty(array_filter($judul_unit)) || empty(array_filter($durasi)))
+            return json_encode($array);
+        else{
+            if(count($kode_unit)>0){
+                foreach($kode_unit as $key=>$kode){
+                    array_push($array, ['kode' => $kode, 'judul' => $judul_unit[$key], 'durasi' => $durasi[$key]]);
+                }
             }
+            return json_encode($array);
         }
-        return json_encode($array);
     }
 }
 
diff --git a/src/Http/Controllers/EmailController.php b/src/Http/Controllers/EmailController.php
index 223482c1..30d5e861 100644
--- a/src/Http/Controllers/EmailController.php
+++ b/src/Http/Controllers/EmailController.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
+use Yajra\DataTables\Facades\DataTables;
 use Maatwebsite\Excel\Facades\Excel;
 use Ajifatur\FaturCMS\Imports\EmailImport;
 use Ajifatur\FaturCMS\Mails\MessageMail;
@@ -15,6 +16,83 @@
 
 class EmailController extends Controller
 {
+    /**
+     * Menampilkan data email (JSON)
+     *
+     * @return \Illuminate\Http\Request
+     * @return \Illuminate\Http\Response
+     */
+    public function data(Request $request)
+    {
+		if($request->ajax()){
+			// Data email
+			$email = Email::join('users','email.sender','=','users.id_user')->orderBy('scheduled','desc')->orderBy('sent_at','desc')->get();
+
+			// Return
+			return DataTables::of($email)
+			->addColumn('checkbox', '<input type="checkbox">')
+			->addColumn('email', function($data){
+				$html = '';
+				$html = '<a href="'.route('admin.email.detail', ['id' => $data->id_email]).'">'.$data->subject.'</a>';
+				$html .= '<br>';
+				if(count_penerima_email($data->receiver_id)>0){
+					$html .= '<small class="text-muted"><i class="fa fa-check-circle mr-1"></i>Sudah dikirim kepada '.number_format(count_penerima_email($data->receiver_id),0,'.','.').' dari total '.number_format(count_member_aktif(),0,'.','.').' member.</small>';
+				}
+				return $html;
+			})
+			->addColumn('sender', function($data){
+				return '
+					<td>
+						<a href="'.route('admin.user.detail', ['id' => $data->id_user]).'">'.$data->nama_user.'</a>
+						<br>
+						<small><i class="fa fa-envelope mr-1"></i>'.$data->email.'</small>
+						<br>
+						<small><i class="fa fa-phone mr-1"></i>'.$data->nomor_hp.'</small>
+					</td>
+				';
+			})
+			->addColumn('options', function($data){
+				return '
+					<div class="btn-group">
+						<a href="'.route('admin.email.detail', ['id' => $data->id_email]).'" class="btn btn-info btn-sm" data-toggle="tooltip" title="Detail"><i class="fa fa-eye"></i></a>
+						<a href="#" class="btn btn-warning btn-sm btn-schedule" data-id="'.$data->id_email.'" data-schedule="'.$data->scheduled.'" data-toggle="tooltip" title="Atur Jadwal"><i class="fa fa-clock-o"></i></a>
+						<a href="#" class="btn btn-success btn-sm btn-forward" data-id="'.$data->id_email.'" data-r="'.$data->receiver_id.'" data-toggle="tooltip" title="Teruskan"><i class="fa fa-share"></i></a>
+						<a href="#" class="btn btn-danger btn-sm btn-delete" data-id="'.$data->id_email.'" data-toggle="tooltip" title="Hapus"><i class="fa fa-trash"></i></a>
+					</div>
+				';
+			})
+			->addColumn('scheduled', function($data){
+				$html = '';
+				if($data->scheduled != null){
+					$html .= '<span>Harian</span>';
+					$html .= '<br>';
+					$html .= '<small><i class="fa fa-clock-o mr-1"></i>'.$data->scheduled.' WIB</small>';
+				}
+				else{
+					$html .= '<span class="badge badge-danger">Tidak</span>';
+				}
+				return $html;
+			})
+			->addColumn('sent_at', function($data){
+				return '
+					<span class="d-none">'.$data->sent_at.'</span>
+					'.date('d/m/Y', strtotime($data->sent_at)).'
+					<br>
+					<small><i class="fa fa-clock-o mr-1"></i>'.date('H:i', strtotime($data->sent_at)).' WIB</small>
+				';
+			})
+			->removeColumn(['password', 'tanggal_lahir', 'jenis_kelamin', 'content', 'receiver_email'])
+			->rawColumns(['checkbox', 'email', 'sender', 'scheduled', 'sent_at', 'options'])
+			->make(true);
+		}
+		else{
+			return response()->json([
+				'status' => 403,
+				'message' => 'Forbidden!'
+			]);
+		}
+    }
+	
     /**
      * Menampilkan data email
      *
@@ -24,14 +102,9 @@ public function index()
     {
         // Check Access
         has_access(generate_method(__METHOD__), Auth::user()->role);
-
-        // Data email
-        $email = Email::join('users','email.sender','=','users.id_user')->orderBy('scheduled','desc')->orderBy('sent_at','desc')->get();
 		
         // View
-        return view('faturcms::admin.email.index', [
-            'email' => $email,
-        ]);
+        return view('faturcms::admin.email.index');
     }
 
     /**
diff --git a/src/Http/Controllers/KomisiController.php b/src/Http/Controllers/KomisiController.php
index 1e94f853..0040ac66 100644
--- a/src/Http/Controllers/KomisiController.php
+++ b/src/Http/Controllers/KomisiController.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
+use Yajra\DataTables\Facades\DataTables;
 use Ajifatur\FaturCMS\Mails\ConfirmationMail;
 use Ajifatur\FaturCMS\Mails\VerificationMail;
 use Ajifatur\FaturCMS\Mails\WithdrawalMail;
@@ -17,6 +18,94 @@
 
 class KomisiController extends Controller
 {
+    /**
+     * Menampilkan data komisi (JSON)
+     *
+     * @return \Illuminate\Http\Request
+     * @return \Illuminate\Http\Response
+     */
+    public function data(Request $request)
+    {
+		if(Auth::user()->is_admin == 1){
+			// Data komisi
+			$komisi = Komisi::join('users','komisi.id_user','=','users.id_user')->orderBy('komisi_at','desc')->get();
+			
+			// Set data komisi
+			foreach($komisi as $key=>$data){
+				$komisi[$key]->id_sponsor = User::find($data->id_sponsor);
+			}
+
+			// Return
+			return DataTables::of($komisi)
+			->addColumn('checkbox', '<input type="checkbox">')
+			->addColumn('komisi_at', function($data){
+				if($data->komisi_at != null){
+					return '
+						<span class="d-none">'.$data->komisi_at.'</span>
+						'.date('d/m/Y', strtotime($data->komisi_at)).'
+						<br>
+						<small><i class="fa fa-clock-o mr-1"></i>'.date('H:i', strtotime($data->komisi_at)).' WIB</small>
+					';
+				}
+				else return '-';
+			})
+			->addColumn('user_identity', function($data){
+				return '
+				<a href="'.route('admin.user.detail', ['id' => $data->id_user ]).'">'.$data->nama_user.'</a>
+				<br>
+				<small><i class="fa fa-envelope mr-1"></i>'.$data->email.'</small>
+				<br>
+				<small><i class="fa fa-phone mr-1"></i>'.$data->nomor_hp.'</small>
+				';
+			})
+			->addColumn('sponsor', function($data){
+				return '
+				<a href="'.route('admin.user.detail', ['id' => $data->id_sponsor->id_user ]).'">'.$data->id_sponsor->nama_user.'</a>
+				<br>
+				<small><i class="fa fa-envelope mr-1"></i>'.$data->id_sponsor->email.'</small>
+				<br>
+				<small><i class="fa fa-phone mr-1"></i>'.$data->id_sponsor->nomor_hp.'</small>
+				';
+			})
+			->addColumn('komisi', function($data){
+				return '
+					<strong>Aktivasi Komisi:</strong><br>
+                    Rp. '.number_format($data->komisi_aktivasi,0,',',',').'<br><br>
+                    <strong>Hasil Komisi:</strong><br>
+                    Rp. '.number_format($data->komisi_hasil,0,',',',').'
+				';
+			})
+			->addColumn('komisi_status', function($data){
+				if($data->komisi_status == 1)
+					return '<span class="d-none">2</span><span class="badge badge-success">Diterima</span>';
+				else{
+					if($data->komisi_proof != '')
+						return '<span class="d-none">1</span><span class="badge badge-warning">Belum Diverifikasi</span>';
+					else
+						return '<span class="d-none">3</span><span class="badge badge-danger">Belum Membayar</span>';
+				}
+			})
+			->addColumn('options', function($data){
+				$html = '';
+				$html .= '<div class="btn-group">';
+				if($data->komisi_status == 1){
+					$html .= '<a href="'.asset('assets/images/komisi/'.$data->komisi_proof).'" class="btn btn-sm btn-info btn-magnify-popup" data-toggle="tooltip" title="Bukti Transfer"><i class="fa fa-image"></i></a>';
+				}
+				else{
+					if($data->komisi_proof != '')
+						$html .= '<a href="#" class="btn btn-sm btn-success btn-verify" data-id="'.$data->id_komisi.'" data-proof="'. asset('assets/images/komisi/'.$data->komisi_proof).'" data-toggle="tooltip" title="Verifikasi Pembayaran"><i class="fa fa-check"></i></a>';
+					else
+						$html .= '<a href="#" class="btn btn-sm btn-success btn-confirm" data-id="'.$data->id_komisi.'" data-toggle="tooltip" title="Konfirmasi Pembayaran"><i class="fa fa-check"></i></a>';
+				}
+				$html .= '</div>';
+				return $html;
+			})
+			->removeColumn(['password', 'tanggal_lahir', 'jenis_kelamin', 'id_sponsor.password', 'id_sponsor.tanggal_lahir', 'id_sponsor.jenis_kelamin'])
+			->rawColumns(['checkbox', 'komisi_at', 'user_identity', 'sponsor', 'komisi', 'komisi_status', 'options'])
+			->make(true);
+        }
+    }
+
     /**
      * Menampilkan data komisi
      *
diff --git a/src/Http/Controllers/UserController.php b/src/Http/Controllers/UserController.php
index 9c1b5203..fd38fe0d 100644
--- a/src/Http/Controllers/UserController.php
+++ b/src/Http/Controllers/UserController.php
@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
+use Yajra\DataTables\Facades\DataTables;
 use Maatwebsite\Excel\Facades\Excel;
 use Ajifatur\FaturCMS\Exports\UserExport;
 use App\User;
@@ -18,6 +19,94 @@
 
 class UserController extends Controller
 {
+    /**
+     * Menampilkan data user (JSON)
+     *
+     * @return \Illuminate\Http\Request
+     * @return \Illuminate\Http\Response
+     */
+    public function data(Request $request)
+    {
+		if($request->ajax()){
+			// Get data user
+			if($request->query('filter') == null){
+				$users = User::join('role','users.role','=','role.id_role')->orderBy('register_at','desc')->get();
+			}
+			else{
+				if($request->query('filter') == 'all')
+					$users = User::join('role','users.role','=','role.id_role')->orderBy('register_at','desc')->get();
+				elseif($request->query('filter') == 'admin')
+					$users = User::join('role','users.role','=','role.id_role')->where('role.is_admin','=',1)->orderBy('register_at','desc')->get();
+				elseif($request->query('filter') == 'member')
+					$users = User::join('role','users.role','=','role.id_role')->where('role.is_admin','=',0)->orderBy('register_at','desc')->get();
+				elseif($request->query('filter') == 'aktif')
+					$users = User::join('role','users.role','=','role.id_role')->where('role.is_admin','=',0)->where('status','=',1)->orderBy('register_at','desc')->get();
+				elseif($request->query('filter') == 'belum-aktif')
+					$users = User::join('role','users.role','=','role.id_role')->where('role.is_admin','=',0)->where('status','=',0)->orderBy('register_at','desc')->get();
+			}
+
+			// Return
+			return DataTables::of($users)
+			->addColumn('checkbox', '<input type="checkbox">')
+			->addColumn('user_identity', function($user){
+				$route = $user->id_user == Auth::user()->id_user ? route('admin.profile') : route('admin.user.detail', ['id' => $user->id_user]);
+				return '
+				<a href="'.$route.'">'.$user->nama_user.'</a>
+				<br>
+				<small><i class="fa fa-envelope mr-1"></i>'.$user->email.'</small>
+				<br>
+				<small><i class="fa fa-phone mr-1"></i>'.$user->nomor_hp.'</small>
+				';
+			})
+			->addColumn('saldo', function($user){
+				return $user->is_admin == 0 ? number_format($user->saldo,0,',',',') : '-';
+			})
+			->addColumn('refer', function($user){
+				if($user->is_admin == 0){
+					return '<a href="'.route('admin.user.refer', ['id' => $user->id_user]).'" data-toggle="tooltip" title="Lihat Data Refer">'.number_format(count_refer($user->username),0,',',',').'</a>';
+				}
+				else return '';
+			})
+			->addColumn('status', function($user){
+				if($user->status == 1)
+					return '<span class="badge badge-success">Aktif</span>';
+				elseif($user->status == 0 && $user->email_verified == 1)
+					return '<span class="badge badge-warning">Belum Aktif</span>';
+				elseif($user->status == 0)
+					return '<span class="badge badge-danger">Tidak Aktif</span>';
+			})
+			->addColumn('register_at', function($user){
+				return '
+					<span class="d-none">'.$user->register_at.'</span>
+					'.date('d/m/Y', strtotime($user->register_at)).'
+					<br>
+					<small><i class="fa fa-clock-o mr-1"></i>'.date('H:i', strtotime($user->register_at)).' WIB</small>
+				';
+			})
+			->addColumn('options', function($user){
+				$btn_delete_class = $user->id_user > 6 ? 'btn-delete' : '';
+				$btn_delete_style = $user->id_user > 6 ? '' : 'cursor: not-allowed';
+				$btn_delete_title = $user->id_user <= 6 ? $user->id_user == Auth::user()->id_user ? 'Tidak dapat menghapus akun sendiri' : 'Akun ini tidak boleh dihapus' : 'Hapus';
+				$html = '';
+				$html .= '<div class="btn-group">';
+				$html .= '<a href="'.route('admin.user.detail', ['id' => $user->id_user]).'" class="btn btn-sm btn-info" data-toggle="tooltip" title="Detail"><i class="fa fa-eye"></i></a>';
+				$html .= '<a href="'.route('admin.user.edit', ['id' => $user->id_user]).'" class="btn btn-sm btn-warning" data-toggle="tooltip" title="Edit"><i class="fa fa-edit"></i></a>';
+				$html .= '<a href="#" class="btn btn-sm btn-danger '.$btn_delete_class.'" data-id="'.$user->id_user.'" style="'.$btn_delete_style.'" data-toggle="tooltip" title="'.$btn_delete_title.'"><i class="fa fa-trash"></i></a>';
+				$html .= '</div>';
+				return $html;
+			})
+			->removeColumn(['password', 'tanggal_lahir', 'jenis_kelamin'])
+			->rawColumns(['checkbox', 'user_identity', 'saldo', 'refer', 'status', 'register_at', 'options'])
+			->make(true);
+		}
+		else{
+			return response()->json([
+				'status' => 403,
+				'message' => 'Forbidden!'
+			]);
+		}
+    }
+
     /**
      * Menampilkan data user
      * 
diff --git a/src/Mails/ForgotPasswordMail.php b/src/Mails/ForgotPasswordMail.php
index 219e7734..1856cc9a 100644
--- a/src/Mails/ForgotPasswordMail.php
+++ b/src/Mails/ForgotPasswordMail.php
@@ -39,7 +39,7 @@ public function build()
 		
 		// Change password
 		$new_password = Str::random(8);
-		// $user->password = bcrypt($new_password);
+		$user->password = bcrypt($new_password);
 		$user->save();
 		
         return $this->from($cs->email, setting('site.name'))->markdown('faturcms::email.forgot-password')->subject('Recovery Password '.setting('site.name'))->with([