Kota Tangerang Selatan discount denda 1 Sept - 28 Des

CHANGES.txt

+0.5.12 2024-08-29
+-----------------
+- Kota Tangerang Selatan discount denda periode 1 September - 28 Desember
+
 0.5.11 2024-08-04
 -----------------
 - Kabupaten Sukabumi discount denda periode Agustus - September.

opensipkd/pad/services/tangsel.py

@@ -25,11 +25,10 @@ from ..models.tangsel import (
 from .base import satu_kalimat
 
 
-AWAL_DISC = date(2023, 9, 1)
-AKHIR_DISC = date(2023, 12, 28)
+AWAL_DISC = date(2024, 9, 1)
+AKHIR_DISC = date(2024, 12, 28)
 
-MASA_PAJAK_NON_REKLAME = date(2023, 8, 31)
-MASA_PAJAK_REKLAME = date(2023, 8, 31)
+MAX_MASA_PAJAK = date(2024, 8, 31)
 
 
 def hitung_denda(tagihan, jatuh_tempo, persen_denda, tgl_hitung):
@@ -72,19 +71,19 @@ class Inquiry(BaseInquiry):
             tgl_bayar = self.tgl_bayar
         if tgl_bayar < AWAL_DISC or tgl_bayar > AKHIR_DISC:
             return 0
-        tgl_pajak = None
-        if self.is_reklame():
+        type_ = self.get_type_name()
+        if type_:
+            type_ = type_.strip()
+        if type_ in ('SKPDKB', 'STPD'):
+            tgl_pajak = self.invoice.masasd.date()
+        elif self.is_reklame():
             tgl_pajak = self.get_tgl_kohir()
             if not tgl_pajak:
                 return 0
-            if tgl_pajak <= MASA_PAJAK_REKLAME:
-                return self.denda
         else:
             tgl_pajak = self.invoice.masasd.date()
-            if not tgl_pajak:
-                return 0
-            if tgl_pajak <= MASA_PAJAK_NON_REKLAME:
-                return self.denda
+        if tgl_pajak <= MAX_MASA_PAJAK:
+            return self.denda
         return 0
 
     def hitung_denda_waktu(self):  # Override

pyproject.toml

@@ -3,7 +3,7 @@ requires = ['setuptools >= 64']
 
 [project]
 name = 'opensipkd-pad-models'
-version = '0.5.11'
+version = '0.5.12'
 dependencies = [ 
     'sqlalchemy',
     'zope.sqlalchemy',