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

DONE:resolve conflict on two files
2026-08-09 10:56:50 +08:00
parent 87e2aaad50 a825b0b467
commit af15880b0c
24 changed files with 5487 additions and 3583 deletions
@@ -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>