Bug fixed rumus denda Kabupaten Tangerang

opensipkd/pad/scripts/inquiry.py

@@ -17,7 +17,7 @@ def show_val(label, value):
 
 
 
 
 def show_rp(label, value):
 def show_rp(label, value):
-    show_val(label, 'Rp {}'.format(thousand(value)))
+    show_val(label, 'Rp {}'.format(thousand(value, 2)))
 
 
 
 
 def show_field(t, fieldname):
 def show_field(t, fieldname):

opensipkd/pad/services/default.py

@@ -303,10 +303,7 @@ class Inquiry(BaseInquiry):
             self.denda = round_up(self.invoice.bunga)
             self.denda = round_up(self.invoice.bunga)
         elif self.invoice.jatuhtempotgl:
         elif self.invoice.jatuhtempotgl:
             if self.invoice.status_pembayaran == 0:
             if self.invoice.status_pembayaran == 0:
-                self.bln_tunggakan, self.denda_waktu = hitung_denda(
-                    self.tagihan, self.invoice.jatuhtempotgl,
-                    self.conf['persen_denda'],
-                    self.tgl_bayar.date())
+                self.hitung_denda_waktu()
             else:
             else:
                 self.bln_tunggakan = self.denda_waktu = 0
                 self.bln_tunggakan = self.denda_waktu = 0
             self.denda = self.denda_waktu + self.invoice.bunga
             self.denda = self.denda_waktu + self.invoice.bunga
@@ -314,6 +311,12 @@ class Inquiry(BaseInquiry):
         self.discount_denda = self.get_discount_denda()
         self.discount_denda = self.get_discount_denda()
         self.denda -= self.discount_denda
         self.denda -= self.discount_denda
 
 
+    def hitung_denda_waktu(self):
+        self.bln_tunggakan, self.denda_waktu = hitung_denda(
+            self.tagihan, self.invoice.jatuhtempotgl,
+            self.conf['persen_denda'],
+            self.tgl_bayar.date())
+
     def get_discount_denda(self):
     def get_discount_denda(self):
         return 0
         return 0
 
 

opensipkd/pad/services/tangerang_kab.py

@@ -30,6 +30,17 @@ NOTE_TGL_BAYAR = 'Tanggal bayar {tgl} <= ' + dmy(AKHIR_TGL_BAYAR)
 
 
 
 
 class Inquiry(BaseInquiry):
 class Inquiry(BaseInquiry):
+    def hitung_denda_waktu(self):  # Override
+        super().hitung_denda_waktu()
+        if self.invoice.bunga < 1:
+            return
+        denda_per_bln = self.denda_waktu / self.bln_tunggakan
+        max_denda = 24 * denda_per_bln
+        denda = self.denda_waktu + self.invoice.bunga
+        if denda >= max_denda:
+            self.bln_tunggakan = 24
+            self.denda_waktu = max_denda - self.invoice.bunga
+
     def get_discount_denda(self):  # Override
     def get_discount_denda(self):  # Override
         tgl_bayar = self.tgl_bayar.date()
         tgl_bayar = self.tgl_bayar.date()
         masa_pajak = self.invoice.masadari.date()
         masa_pajak = self.invoice.masadari.date()