Discount pokok dan denda Kota Tangerang

CHANGES.txt

+0.3.35 2025-07-31
+-----------------
+- Discount pokok dan denda Kota Tangerang
+
 0.3.34 2025-07-16
 0.3.34 2025-07-16
 -----------------
 -----------------
 - Discount denda Kabupaten Tasikmalaya
 - Discount denda Kabupaten Tasikmalaya

pyproject.toml

@@ -3,7 +3,7 @@ requires = ['setuptools >= 64']
 
 
 [project]
 [project]
 name = 'sismiop-models'
 name = 'sismiop-models'
-version = '0.3.34'
+version = '0.3.35'
 dependencies = [ 
 dependencies = [ 
     'sqlalchemy',
     'sqlalchemy',
     'zope.sqlalchemy',
     'zope.sqlalchemy',

sismiop/services/tangkota.py

@@ -15,8 +15,8 @@ from .tangsel import (
 
 
 
 
 MAX_BULAN_DENDA = 24
 MAX_BULAN_DENDA = 24
-AWAL_DISC = date(2025, 1, 17)
-AKHIR_DISC = date(2025, 3, 31)
+AWAL_DISC = date(2025, 8, 1)
+AKHIR_DISC = date(2025, 8, 29)
 
 
 
 
 def hitung_denda(tagihan, jatuh_tempo, tgl_hitung):
 def hitung_denda(tagihan, jatuh_tempo, tgl_hitung):
@@ -75,26 +75,14 @@ class Inquiry(BaseInquiry):
         self.discount = self.discount_pokok + self.discount_denda
         self.discount = self.discount_pokok + self.discount_denda
 
 
     def hitung_discount_pokok(self):
     def hitung_discount_pokok(self):
-        thn = self.invoice.thn_pajak_sppt
-        if '1994' <= thn <= '2014':
-            disc = 0.25
-        elif thn == '2025':
-            if self.tagihan <= 100000:
-                disc = 0.2
-            elif self.tagihan <= 500000:
-                disc = 0.1
-            elif self.tagihan <= 2000000:
-                disc = 0.06
-            elif self.tagihan <= 5000000:
-                disc = 0.04
-            else:
-                disc = 0.03
-        else:
-            disc = 0
-        return round(disc * self.tagihan)
+        if '1990' <= self.invoice.thn_pajak_sppt <= '2014':
+            return round(0.2 * self.tagihan)
+        return 0
 
 
     def hitung_discount_denda(self):
     def hitung_discount_denda(self):
-        return self.denda
+        if '1990' <= self.invoice.thn_pajak_sppt <= '2024':
+            return self.denda
+        return 0
 
 
 
 
 class AvailableInvoice(BaseAvailableInvoice):
 class AvailableInvoice(BaseAvailableInvoice):