Discount denda Kabupaten Subang

CHANGES.txt

+0.4.12 2026-11-09
+-----------------
+- Discount denda Kabupaten Subang
+
 0.4.11 2026-10-27
 -----------------
 - Discount denda Kota Bekasi

pyproject.toml

@@ -3,9 +3,8 @@ requires = ['setuptools >= 64']
 
 [project]
 name = 'sismiop-models'
-version = '0.4.11'
+version = '0.4.12'
 dependencies = [ 
-    'sqlalchemy',
     'zope.sqlalchemy',
     'transaction',
     'psycopg-binary',

sismiop/services/subang.py

@@ -8,9 +8,6 @@ from .default import (
     )
 
 
-AWAL_DISC = date(2026, 2, 13)
-AKHIR_DISC = date(2026, 4, 30)
-
 AKHIR_DISC_KHUSUS = date(2025, 12, 15)
 NOP_DISC_KHUSUS = [
     '3215130008027000102020',
@@ -20,6 +17,10 @@ NOP_DISC_KHUSUS = [
     '3215130008028000102021',
     '3215130008028000102022']
 
+PERIODE_DISC = [
+    (date(2026, 11, 10), date(2026, 12, 31), '2026'),
+    (date(2026, 2, 13), date(2026, 4, 30), '2025')]
+
 
 class Inquiry(BaseInquiry):
     def get_payment_model(self):  # Override
@@ -53,19 +54,14 @@ class Inquiry(BaseInquiry):
         return 0
 
     def hitung_discount_denda(self):
-        if self.invoice.thn_pajak_sppt <= '2025':
-            return self.denda
+        for awal, akhir, tahun in PERIODE_DISC:
+            if awal <= self.tgl_bayar <= akhir and \
+                    self.invoice.thn_pajak_sppt <= tahun:
+                return self.denda
         return 0
 
     def hitung_discount(self):  # Override
-        self.discount = self.discount_denda = self.discount_pokok = 0
-        if self.tgl_bayar < AWAL_DISC:
-            return
-        if self.tgl_bayar > AKHIR_DISC:
-            return
-        if self.invoice.thn_pajak_sppt > '2025':
-            return
-        # self.discount_pokok = self.hitung_discount_pokok()
+        self.discount_pokok = self.hitung_discount_pokok()
         self.discount_denda = self.hitung_discount_denda()
         self.discount = self.discount_denda + self.discount_pokok