Merge pull request #91 from andes2912/Feature/export-laporan

Improve Laporan View
andes2912 · Jun 21, 2022 · a425db6 · a425db6
2 parents 119c60e + d040ba6
commit a425db6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/Http/Controllers/Karyawan/LaporanController.php b/app/Http/Controllers/Karyawan/LaporanController.php
@@ -14,7 +14,7 @@ class LaporanController extends Controller
     //Halaman Laporan
     public function laporan()
     {
-      $laporan = transaksi::where('user_id', Auth::id())->whereIn('status_order',['Done','Delivery'])->get();
+      $laporan = transaksi::where('user_id', Auth::id())->get();
       return view('karyawan.laporan.index', compact('laporan'));
     }
 

diff --git a/resources/views/karyawan/laporan/index.blade.php b/resources/views/karyawan/laporan/index.blade.php
@@ -15,6 +15,7 @@
                             <th>Nama Customer</th>
                             <th>Jenis Laundry</th>
                             <th>Jenis Pembayaran</th>
+                            <th>Status Pembayaran</th>
                             <th>Total</th>
                         </tr>
                     </thead>
@@ -26,6 +27,7 @@
                           <td>{{namaCustomer($laporans->customer_id)}}</td>
                           <td>{{$laporans->price->jenis}}</td>
                           <td>{{$laporans->jenis_pembayaran}}</td>
+                          <td>{{$laporans->status_payment}}</td>
                           <td>{{Rupiah::getRupiah($laporans->harga_akhir)}}</td>
                         </tr>
                       <?php $no++; ?>