Tambah field discount_denda

opensipkd/pad/models/default.py

@@ -377,6 +377,7 @@ class Payment(Base):
     denda = Column(Integer)
     denda = Column(Integer)
     jml_bayar = Column(Integer)
     jml_bayar = Column(Integer)
     is_valid = Column(Integer)
     is_valid = Column(Integer)
+    discount_denda = Column(Float)
     __table_args__ = (
     __table_args__ = (
         UniqueConstraint('tahun', 'sspdno'),
         UniqueConstraint('tahun', 'sspdno'),
         dict(schema='pad'))
         dict(schema='pad'))

opensipkd/pad/services/tangsel.py

@@ -24,10 +24,11 @@ from ..models.tangsel import (
 from .base import satu_kalimat
 from .base import satu_kalimat
 
 
 
 
-AWAL_DISC = date(2022, 8, 1)
-AKHIR_DISC = date(2022, 12, 31)
+AWAL_DISC = date(2023, 9, 1)
+AKHIR_DISC = date(2023, 12, 28)
 
 
-MASA_PAJAK = date(2022, 6, 30)
+MASA_PAJAK_NON_REKLAME = date(2023, 8, 31)
+MASA_PAJAK_REKLAME = date(2023, 8, 31)
 
 
 
 
 class Inquiry(BaseInquiry):
 class Inquiry(BaseInquiry):
@@ -58,10 +59,16 @@ class Inquiry(BaseInquiry):
         tgl_pajak = None
         tgl_pajak = None
         if self.is_reklame():
         if self.is_reklame():
             tgl_pajak = self.get_tgl_kohir()
             tgl_pajak = self.get_tgl_kohir()
+            if not tgl_pajak:
+                return 0
+            if tgl_pajak <= MASA_PAJAK_REKLAME:
+                return self.denda
         else:
         else:
             tgl_pajak = self.invoice.masasd.date()
             tgl_pajak = self.invoice.masasd.date()
-        if tgl_pajak and tgl_pajak <= MASA_PAJAK:
-            return self.denda
+            if not tgl_pajak:
+                return 0
+            if tgl_pajak <= MASA_PAJAK_NON_REKLAME:
+                return self.denda
         return 0
         return 0
 
 
     def before_save(self, pay):  # Override
     def before_save(self, pay):  # Override