Compare commits
14 Commits
954de048c3
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 4fa2f7766b | |||
| 1249cdbb42 | |||
| 699225821d | |||
| 9c01d58bd0 | |||
| a493138304 | |||
| 3b65356fd3 | |||
| 0d9ba06af5 | |||
| 3c599ef4a6 | |||
| d908175fbf | |||
| 7d08b68179 | |||
| 105c9002dc | |||
| 6beb9b6bac | |||
| 92459a7588 | |||
| f015774d4e |
+18
-2
@@ -388,8 +388,24 @@ class Biayaformulir extends CI_Controller {
|
||||
|
||||
public function cetakberkas($no_pendaftaran)
|
||||
{
|
||||
$data['data'] = $this->db->get_where('v_rpt_trans_formulir',['no_pendaftaran'=>$no_pendaftaran])->row();
|
||||
$this->load->view('biayaformulir/cetak_berkas',$data);
|
||||
// 1. Ambil data siswanya langsung dari tabel data_siswa
|
||||
$siswa = $this->db->get_where('data_siswa', ['no_pendaftaran' => $no_pendaftaran])->row();
|
||||
|
||||
// 2. Ambil data transaksinya langsung dari tabel tr_formulir
|
||||
$transaksi = $this->db->get_where('tr_formulir', ['no_pendaftaran' => $no_pendaftaran])->row();
|
||||
|
||||
// 3. Gabungkan keduanya menjadi satu objek standar (seperti yang diharapkan oleh View cetak_berkas.php)
|
||||
// Kita menggunakan casting (object) agar formatnya tetap sama dengan hasil kembalian dari View database
|
||||
if($siswa && $transaksi) {
|
||||
$data['data'] = (object) array_merge((array) $siswa, (array) $transaksi);
|
||||
} else if ($siswa) {
|
||||
// Jaga-jaga kalau data siswanya ada tapi transaksinya kosong/belum bayar
|
||||
$data['data'] = $siswa;
|
||||
} else {
|
||||
$data['data'] = null;
|
||||
}
|
||||
|
||||
$this->load->view('biayaformulir/cetak_berkas', $data);
|
||||
}
|
||||
|
||||
|
||||
@@ -412,9 +412,17 @@ class Invoice extends CI_Controller {
|
||||
public function cetaktransaksi($no_pendaftaran)
|
||||
{
|
||||
$data['invoice'] = $this->invoice_model->detail($no_pendaftaran);
|
||||
$data['data'] = $this->db->get_where('v_rpt_trans_invoice',['no_pendaftaran'=>$no_pendaftaran])->row();
|
||||
$data['datatrx'] = $this->db->get_where('v_rpt_trans_invoice',['no_pendaftaran'=>$no_pendaftaran])->result();
|
||||
|
||||
// --- INI YANG KITA UBAH MIN ---
|
||||
// Pakai data dari invoice_model untuk memunculkan Nama, No Pendaftaran, dll
|
||||
$data['data'] = $this->invoice_model->detail($no_pendaftaran);
|
||||
|
||||
// Ambil rincian angsuran langsung dari tabel tr_invoice (bukan dari View)
|
||||
$data['datatrx'] = $this->db->get_where('tr_invoice', ['no_pendaftaran'=>$no_pendaftaran])->result();
|
||||
// ------------------------------
|
||||
|
||||
$datatrx = $this->db->get_where("tr_invoice", ["no_pendaftaran" => $no_pendaftaran])->result();
|
||||
|
||||
// Inisialisasi variabel untuk menyimpan total pembayaran
|
||||
$total_pembayaran = 0;
|
||||
|
||||
@@ -422,6 +430,7 @@ public function cetaktransaksi($no_pendaftaran)
|
||||
foreach ($datatrx as $trx) {
|
||||
$total_pembayaran += $trx->bayar;
|
||||
}
|
||||
|
||||
$data["total"] = $total_pembayaran;
|
||||
$this->load->view('invoice/cetak',$data);
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user