Backward compatibility

opensipkd/pad/scripts/inquiry.py

@@ -69,7 +69,7 @@ def show(inq):
     show_val('Kecamatan Objek Pajak', inq.get_kecamatan_op())
     show_val('Jatuh Tempo', inq.get_jatuh_tempo())
     show_val('Jumlah Bulan Denda', inq.bln_tunggakan)
-    show_rp('Tagihan', inq.tagihan)
+    show_rp('Tagihan Pokok', inq.tagihan_pokok)
     show_field(inq.invoice, 'pajak_terhutang')
     show_field(inq.invoice, 'bunga')
     try:
@@ -80,7 +80,7 @@ def show(inq):
     if inq.notes:
         show_val('Note', inq.notes)
     show_rp('Total Bayar', inq.total_bayar)
-    show_rp('Sisa Tagihan', inq.sisa_tagihan)
+    show_rp('Sisa Tagihan', inq.tagihan)
     show_rp('Total Denda', inq.denda)
     show_rp('Total Tagihan', inq.total)
     show_field(inq.invoice, 'status_pembayaran')

opensipkd/pad/services/bogor_kota.py

@@ -18,7 +18,7 @@ class Inquiry(BaseInquiry):
         else:
             persen_denda = self.conf['persen_denda']
         self.bln_tunggakan, self.denda_waktu = hitung_denda(
-            self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda,
+            self.tagihan, self.invoice.jatuhtempotgl, persen_denda,
             self.tgl_bayar.date())
 
     def get_discount_denda(self):  # Override

opensipkd/pad/services/default.py

@@ -302,8 +302,8 @@ class Inquiry(BaseInquiry):
         return pay.jml or 0
 
     def hitung_tagihan(self):
-        self.tagihan = self.invoice.pajak_terhutang - self.invoice.bunga
-        self.tagihan = round_up(self.tagihan)
+        self.tagihan_pokok = self.invoice.pajak_terhutang - self.invoice.bunga
+        self.tagihan = round_up(self.tagihan_pokok)
 
     def hitung_denda(self):
         self.bln_tunggakan = None
@@ -327,7 +327,7 @@ class Inquiry(BaseInquiry):
         else:
             persen_denda = self.conf['persen_denda']
         self.bln_tunggakan, self.denda_waktu = hitung_denda(
-            self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda,
+            self.tagihan, self.invoice.jatuhtempotgl, persen_denda,
             self.tgl_bayar.date())
 
     def get_discount_denda(self):
@@ -336,17 +336,15 @@ class Inquiry(BaseInquiry):
     def hitung_bayar(self):
         bayar = self.get_payment_amount()
         self.total_bayar = round_up(bayar)
-        self.sisa_tagihan = self.tagihan - self.total_bayar
-        if self.sisa_tagihan < 1:
-            self.sisa_tagihan = 0
 
     def hitung(self):
         self.hitung_tagihan()
         self.hitung_bayar()
+        self.tagihan -= self.total_bayar
+        if self.tagihan < 1:
+            self.tagihan = 0
         self.hitung_denda()
-        self.total = self.tagihan + self.denda - self.total_bayar
-        if self.total < 0:
-            self.total = 0
+        self.total = self.tagihan + self.denda
 
     def get_pay_seq(self):
         Payment = self.get_payment_model()