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
@@ -1026,7 +1026,7 @@
                    'harga' : harga_edit,
                    'n_marhun' : nilai_marhun_edit,
                    'marhun' : marhun_edit,
-                    // 'nota' : nota,
+                    'nota' : nota,
                    'tag_permata' : tagpermata_edit,
                    'berat_batu_permata' : beratpermata_edit,
                    "teller": "{{ Auth::user()->name }}",