* revisi jmlbayar di form pembayaran

application/controllers/pbb/Pembayaran.php

@@ -61,7 +61,7 @@ class Pembayaran extends Core_Controller{
 				$arr_row['pokok'] = (int)$rs->pbb_yg_harus_dibayar_sppt;
 				$arr_row['denda'] = (int)$rs->last_denda; 
 				$arr_row['admin'] = (int)$rs->last_admin; 
-				$arr_row['total'] = (int)$rs->pbb_yg_harus_dibayar_sppt;
+				$arr_row['total'] = (int)$rs->pbb_yg_harus_dibayar_sppt + ((int)$rs->last_denda+(int)$rs->last_admin);
 				$arr_row['telahbayar'] = (int)$rs->pbb_yg_harus_dibayar_sppt + ((int)$rs->last_denda+(int)$rs->last_admin);
 				$arr_row['tgl_jatuh_tempo_sppt'] = $rs->tgl_jatuh_tempo_sppt;
 				$arr_row['month'] = $month;
@@ -112,7 +112,7 @@ class Pembayaran extends Core_Controller{
 					'nm_kecamatan' => 	$data[$i]->nm_kecamatan,
 					'nm_kelurahan' => 	$data[$i]->nm_kelurahan,
 					'tahun' => 			$data[$i]->tahun,
-					'pbb' => 			number_format(($data[$i]->jmlbayar - ($data[$i]->denda + $data[$i]->admin)),2,',','.'),
+					'pbb' => 			number_format(($data[$i]->jmlbayar - ($data[$i]->denda)),2,',','.'),
 					'denda' => 			number_format($data[$i]->denda,2,',','.'),
 					'admin' => 			number_format($data[$i]->admin,2,',','.'),
 					'jmlbayar' => 		number_format($data[$i]->jmlbayar,2,',','.'),
@@ -134,7 +134,7 @@ class Pembayaran extends Core_Controller{
         $no_urut = $this->input->post('kdurut');
         $kd_jns_op = $this->input->post('kdjns');
         $tahun = $this->input->post('tahun');
-        $jmlbayar = $this->input->post('jmlbayar');
+        $jmlbayar = $this->input->post('jmlbayar')- $this->input->post('admin');
         $denda = $this->input->post('denda');
         $admin = $this->input->post('admin');
         $tempatbayar = $this->input->post('tempatbayar');

application/views/pbb/konsolidasi/grid.php

@@ -57,7 +57,7 @@
                 <td><?php echo $rs->nm_kecamatan?></td>
                 <td><?php echo $rs->nm_kelurahan?></td>
                 <td><?php echo $rs->tahun?></td>
-                <td align="right"><?php echo number_format($rs->jmlbayar - $rs->admin)?></td>
+                <td align="right"><?php echo number_format($rs->jmlbayar)?></td>
                 <td align="right"><?php echo number_format($rs->denda)?></td>
 				<td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td>
                 <td><?php echo $rs->nm_tp?></td>

application/views/pbb/laporan/grid.php

@@ -46,7 +46,7 @@
                 <td><?php echo $rs->nm_kecamatan?></td>
                 <td><?php echo $rs->nm_kelurahan?></td>
                 <td><?php echo $rs->tahun?></td>
-                <td align="right"><?php echo number_format($rs->jmlbayar - $rs->admin)?></td>
+                <td align="right"><?php echo number_format($rs->jmlbayar)?></td>
                 <td align="right"><?php echo number_format($rs->denda)?></td>
                 <td><?php echo date('d-m-Y', strtotime($rs->createdtime))?></td>
                 <td><?php echo $rs->nm_tp?></td>