Total tagihan nol jika status lunas

CHANGES.txt

 0.2.11 2023-08-29
 -----------------
-- Jangan hitung tagihan bila status lunas
+- Total tagihan nol jika status lunas
 - Discount Kota Tangerang Selatan
 
 0.2.10 2023-08-16

sismiop/services/base.py

@@ -161,8 +161,7 @@ class Inquiry(Query):
         self.persen_denda = persen_denda
         # Digunakan untuk ISO8583
         self.tagihan = self.denda = self.discount = self.total = 0
-        if not self.is_paid():
-            self.hitung()
+        self.hitung()
 
     def get_kelurahan_model(self):
         pass
@@ -291,6 +290,8 @@ class Inquiry(Query):
         if self.total > 0:
             self.hitung_discount()
             self.total -= self.discount
+            if self.is_paid():
+                self.total = 0
 
     def do_payment(self, bank_fields, nip_pencatat):
         bayar = self.invoice2payment()

sismiop/services/tangsel.py

@@ -37,14 +37,16 @@ class Inquiry(BaseInquiry):
                 func.sum(Payment.denda_sppt).
                 label('denda_sppt'))
         q = self.get_filter(q)
+        q = q.filter(Payment.jml_sppt_yg_dibayar > 0)
         bayar = q.first()
         self.total_bayar = bayar.jml_sppt_yg_dibayar or 0
         if self.total_bayar < 0:
             self.total_bayar = 0
-        denda_lalu = bayar.denda_sppt or 0
-        sisa = float(self.total_bayar - denda_lalu)
-        tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa
-        self.tagihan = round_up(tagihan)
+        if self.invoice.pbb_yg_harus_dibayar_sppt > 0:
+            denda_lalu = bayar.denda_sppt or 0
+            sisa = float(self.total_bayar - denda_lalu)
+            tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa
+            self.tagihan = round_up(tagihan)
 
     def hitung_denda(self):  # Override
         super().hitung_denda()