Perubahan rumus bogor_kota

CHANGES.txt

+0.1.12 2020-09-29
+-----------------
+- Perubahan rumus bogor_kota
+
 0.1.11 2020-09-28
 0.1.11 2020-09-28
 -----------------
 -----------------
 - Tambah modul bekasi_kab
 - Tambah modul bekasi_kab

sismiop/services/bekasi_kab/__init__.py

@@ -13,6 +13,7 @@ AKHIR_DISC = date(2020, 10, 30)
 class Inquiry(BaseInquiry):
 class Inquiry(BaseInquiry):
     def hitung_discount_denda(self):  # Override
     def hitung_discount_denda(self):  # Override
         if self.denda < 1 or self.tgl_bayar < AWAL_DISC or \
         if self.denda < 1 or self.tgl_bayar < AWAL_DISC or \
-                self.tgl_bayar > AKHIR_DISC or self.invoice.thn_pajak_sppt > '2020':
+                self.tgl_bayar > AKHIR_DISC or \
+                self.invoice.thn_pajak_sppt > '2020':
             return 0
             return 0
         return self.denda
         return self.denda

sismiop/services/bogor_kota/__init__.py

@@ -19,6 +19,10 @@ from ..default import (
     )
     )
 
 
 
 
+OKTOBER_1 = date(2020, 10, 1)
+DESEMBER_18 = date(2020, 12, 18)
+
+
 class Common(Query):
 class Common(Query):
     def get_pengurangan_covid(self, pay):
     def get_pengurangan_covid(self, pay):
         DBSession = get_db_session()
         DBSession = get_db_session()
@@ -39,13 +43,18 @@ class Inquiry(BaseInquiry, Common):
         if self.invoice.thn_pajak_sppt < '2013':
         if self.invoice.thn_pajak_sppt < '2013':
             self.discount = self.denda
             self.discount = self.denda
 
 
-    def rumus_discount_denda_2020(self):
+    def rumus_discount_denda_2020_07_08(self):
         if self.invoice.thn_pajak_sppt < '2020':
         if self.invoice.thn_pajak_sppt < '2020':
             self.discount = self.denda
             self.discount = self.denda
 
 
+    def rumus_discount_denda_2020_10_12(self):
+        self.discount = self.denda
+
     def hitung_discount(self):  # Override
     def hitung_discount(self):  # Override
-        if self.tgl_bayar.year == 2020 and self.tgl_bayar.month in (7, 8):
-            self.rumus_discount_denda_2020()
+        if self.tgl_bayar >= OKTOBER_1 and self.tgl_bayar <= DESEMBER_18:
+            self.rumus_discount_denda_2020_10_12()
+        elif self.tgl_bayar.year == 2020 and self.tgl_bayar.month in (7, 8):
+            self.rumus_discount_denda_2020_07_08()
         else:
         else:
             self.rumus_discount_denda_2017()
             self.rumus_discount_denda_2017()