From b911e8912d6d4f75f89702cd9058920a92d9affd Mon Sep 17 00:00:00 2001
From: Andri Desmana <andridesmana29@gmail.com>
Date: Sun, 17 Jul 2022 22:36:35 +0700
Subject: [PATCH] Improve Pembayaran

---
 .../views/pembayaran/index.blade.php          |  8 ++++--
 Modules/SPP/Entities/DetailPaymentSpp.php     |  5 ++++
 .../SPP/Http/Controllers/SPPController.php    |  2 +-
 .../SPP/Resources/views/murid/index.blade.php | 26 +++++++++----------
 .../SPP/Resources/views/murid/show.blade.php  |  6 ++---
 database/seeders/DatabaseSeeder.php           |  3 ++-
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/Modules/Murid/Resources/views/pembayaran/index.blade.php b/Modules/Murid/Resources/views/pembayaran/index.blade.php
index 44e1913..388ef67 100644
--- a/Modules/Murid/Resources/views/pembayaran/index.blade.php
+++ b/Modules/Murid/Resources/views/pembayaran/index.blade.php
@@ -64,10 +64,14 @@
                                                     <td> {{$payments->payment->year}} </td>
                                                     <td> {{$payments->month}} </td>
                                                     <td>Rp {{number_format($payments->amount)}} </td>
-                                                    <td> {{$payments->status}} </td>
+                                                    <td> <span class="badge badge-{{$payments->status == 'paid' ? 'info' : 'warning'}}">{{$payments->status}}</span> </td>
                                                     <td> {{$payments->date_file}} </td>
                                                     <td>
-                                                        <a href="{{route('pembayaran.edit', $payments->id)}}" class="btn btn-success btn-sm">{{$payments->file != null ? 'Pembayaran Diproses' : 'Bayar'}}</a>
+                                                        @if ($payments->status == 'paid')
+                                                          <span class="badge badge-info">Pembayaran Diterima</span>
+                                                        @else
+                                                          <a href="{{route('pembayaran.edit', $payments->id)}}" class="btn btn-success btn-sm">{{$payments->file != null ? 'Pembayaran Diproses' : 'Bayar'}}</a>
+                                                        @endif
                                                     </td>
                                                 </tr>
                                             @endforeach
diff --git a/Modules/SPP/Entities/DetailPaymentSpp.php b/Modules/SPP/Entities/DetailPaymentSpp.php
index 9e271bc..908fbab 100644
--- a/Modules/SPP/Entities/DetailPaymentSpp.php
+++ b/Modules/SPP/Entities/DetailPaymentSpp.php
@@ -32,4 +32,9 @@ public function user()
     {
       return $this->belongsTo(User::class,'user_id');
     }
+
+    public function aprroveBy()
+    {
+      return $this->belongsTo(User::class, 'approve_by');
+    }
 }
diff --git a/Modules/SPP/Http/Controllers/SPPController.php b/Modules/SPP/Http/Controllers/SPPController.php
index 8cda6c6..c566dbe 100644
--- a/Modules/SPP/Http/Controllers/SPPController.php
+++ b/Modules/SPP/Http/Controllers/SPPController.php
@@ -39,7 +39,7 @@ public function murid()
     // Detail Pembayaran
     public function detail($id)
     {
-      $payment = PaymentSpp::with('detailPayment','user.muridDetail')->findOrFail($id);
+      $payment = PaymentSpp::with('detailPayment.aprroveBy','user.muridDetail')->findOrFail($id);
       return view('spp::murid.show', compact('payment'));
     }
 
diff --git a/Modules/SPP/Resources/views/murid/index.blade.php b/Modules/SPP/Resources/views/murid/index.blade.php
index 7fc5f67..3cace46 100644
--- a/Modules/SPP/Resources/views/murid/index.blade.php
+++ b/Modules/SPP/Resources/views/murid/index.blade.php
@@ -65,32 +65,32 @@
                                                     <td> {{$payments->email}} </td>
                                                     <td>
                                                       @if (Date('m') == 1)
-                                                        {{strtoupper($payments->payment->January)}}
+                                                        <span class="badge badge-{{$payments->payment->January == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->January)}}</span>
                                                       @elseif(Date('m') == 2)
-                                                        {{strtoupper($payments->payment->Febuary)}}
+                                                        <span class="badge badge-{{$payments->payment->Febuary == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->Febuary)}}</span>
                                                       @elseif(Date('m') == 3)
-                                                        {{strtoupper($payments->payment->March)}}
+                                                       <span class="badge badge-{{$payments->payment->March == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->March)}}</span>
                                                       @elseif(Date('m') == 4)
-                                                        {{strtoupper($payments->payment->April)}}
+                                                       <span class="badge badge-{{$payments->payment->April == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->April)}}</span>
                                                       @elseif(Date('m') == 5)
-                                                        {{strtoupper($payments->payment->Mey)}}
+                                                        <span class="badge badge-{{$payments->payment->Mey == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->Mey)}}</span>
                                                       @elseif(Date('m') == 6)
-                                                        {{strtoupper($payments->payment->Juny)}}
+                                                        <span class="badge badge-{{$payments->payment->Juny == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->Juny)}}</span>
                                                       @elseif(Date('m') == 7)
-                                                        {{ strtoupper($payments->payment->July) }}
+                                                        <span class="badge badge-{{$payments->payment->July == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->July)}}</span>
                                                       @elseif(Date('m') == 8)
-                                                        {{strtoupper($payments->payment->August)}}
+                                                        <span class="badge badge-{{$payments->payment->August == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->August)}}</span>
                                                       @elseif(Date('m') == 9)
-                                                        {{strtoupper($payments->payment->September)}}
+                                                        <span class="badge badge-{{$payments->payment->September == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->September)}}</span>
                                                       @elseif(Date('m') == 10)
-                                                        {{strtoupper($payments->payment->October)}}
+                                                        <span class="badge badge-{{$payments->payment->October == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->October)}}</span>
                                                       @elseif(Date('m') == 11)
-                                                        {{strtoupper($payments->payment->November)}}
+                                                        <span class="badge badge-{{$payments->payment->November == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->November)}}</span>
                                                       @elseif(Date('m') == 12)
-                                                        {{strtoupper($payments->payment->December)}}
+                                                        <span class="badge badge-{{$payments->payment->December == 'paid' ? 'info' : 'warning'}}">{{strtoupper($payments->payment->December)}}</span>
                                                       @endif
                                                     </td>
-                                                    <td> {{$payments->payment->is_active == 1 ? 'ACTIVE' : 'SUSPEND'}} </td>
+                                                    <td> <span class="badge badge-info">{{$payments->payment->is_active == 1 ? 'ACTIVE' : 'SUSPEND'}}</span></td>
                                                     <td>
                                                         <a href="{{route('spp.murid.detail', $payments->payment->id)}}" class="btn btn-success btn-sm">Detail</a>
                                                     </td>
diff --git a/Modules/SPP/Resources/views/murid/show.blade.php b/Modules/SPP/Resources/views/murid/show.blade.php
index 594ef67..2309a22 100644
--- a/Modules/SPP/Resources/views/murid/show.blade.php
+++ b/Modules/SPP/Resources/views/murid/show.blade.php
@@ -62,11 +62,11 @@
                                               <td> {{$key+1}} </td>
                                               <td>{{$detail->month}}</td>
                                               <td>Rp {{number_format($detail->amount)}}</td>
-                                              <td>{{$detail->status}}</td>
-                                              <td>{{$detail->approve_by ?? '-'}}</td>
+                                              <td><span class="badge badge-{{$detail->status == 'paid' ? 'info' : 'warning'}}">{{$detail->status}}</span></td>
+                                              <td>{{$detail->aprroveBy->name ?? '-'}}</td>
                                               <td>{{$detail->approve_date ?? '-'}}</td>
                                               <td>
-                                                @if ($detail->file != null && $detail->statua == 'unpaid')
+                                                @if ($detail->file != null && $detail->status == 'unpaid')
                                                   <a href="" class="btn btn-success btn-sm" data-toggle="modal" id="klikModal" data-target="#modalPembayaran"
                                                   data-id="{{$detail->id}}"
                                                   data-name="{{$detail->user->name}}"
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 43479b1..db4fa72 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -18,7 +18,8 @@ public function run()
            RoleSeeder::class,
            AddRoleSeeder::class,
            UserSeeder::class,
-           AddRoleBendaharaSeederTableSeeder::class
+           AddRoleBendaharaSeederTableSeeder::class,
+           IndoBankSeeder::class
         ]);
 
     }