Merge remote-tracking branch 'origin/rebate-anggota' into explore/ismail

DONE:resolve conflict on two files

resources/views/homepage/khazanah/home.blade.php

@@ -274,11 +274,9 @@
                         <div class="row">
                             <a href="{{ route('lelong') }}" class="btn btn-info btn-lg btn-block mb-3">Lelong</a>
                         </div>
-                        @if(Auth::user()->cawangan == '011237')
                         <div class="row">
                             <a href="{{ url('panjar') }}" class="btn btn-info btn-lg btn-block mb-3">Perbelanjaan</a>
                         </div>
-                        @endif
                         <div class="row">
                             <a href="{{ url('alirantunai') }}" class="btn btn-info btn-lg btn-block  mb-3">Aliran
                                 Tunai</a>

resources/views/homepage/operasi/home.blade.php

@@ -14,6 +14,7 @@
                   </nav>
 
                 <div class="card-body text-center">
+                    <a href="{{ route('operasi.kelulusananggota') }}" class="btn btn-info btn-lg">Kelulusan Anggota</a>
                     <a href="{{ route('operasi.kelulusan') }}" class="btn btn-info btn-lg">Kelulusan</a>
                     <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
                     <a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>