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
@@ -189,6 +189,10 @@
                                    <a href="{{ route('laporan.notisperingatan') }}"
                                        class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Notis Peringatan</a>
                                </div>
+                                <div class="row">
+                                    <a href="{{ route('laporan.imbangduga') }}"
+                                        class="btn btn-dark btn-lg btn-block mb-3 custom-btn">Imbang Duga</a>
+                                </div>
                            </div>
                        </div>
                    </div>