Kelurahan dan Kecamatan boleh kosong

opensipkd/pad/services/ciamis.py

@@ -17,6 +17,10 @@ INVOICE_ID = [
 class Inquiry(BaseInquiry):
 class Inquiry(BaseInquiry):
     invoice_id_structure = INVOICE_ID
     invoice_id_structure = INVOICE_ID
 
 
+    # Cekal 2024, Iwan, 4-1-2024
+    def is_available(self):  # Override
+        return super().is_available() and self.tahun_terbit < 2024
+
     def get_kohir_model(self):  # Override
     def get_kohir_model(self):  # Override
         return Kohir
         return Kohir
 
 
@@ -24,6 +28,9 @@ class Inquiry(BaseInquiry):
 class Reversal(BaseReversal):
 class Reversal(BaseReversal):
     invoice_id_structure = INVOICE_ID
     invoice_id_structure = INVOICE_ID
 
 
+    def get_kohir_model(self):  # Override
+        return Kohir
+
 
 
 class AvailableInvoice(BaseAvailableInvoice):
 class AvailableInvoice(BaseAvailableInvoice):
     invoice_id_structure = INVOICE_ID
     invoice_id_structure = INVOICE_ID

opensipkd/pad/services/default.py

@@ -137,6 +137,8 @@ class BaseInquiry:
         return q.first()
         return q.first()
 
 
     def get_kelurahan(self):
     def get_kelurahan(self):
+        if not self.objek_pajak.kelurahan_id:
+            return
         Kelurahan = self.get_kelurahan_model()
         Kelurahan = self.get_kelurahan_model()
         DBSession = get_db_session()
         DBSession = get_db_session()
         q = DBSession.query(Kelurahan).filter_by(
         q = DBSession.query(Kelurahan).filter_by(
@@ -144,6 +146,8 @@ class BaseInquiry:
         return q.first()
         return q.first()
 
 
     def get_kecamatan(self):
     def get_kecamatan(self):
+        if not self.objek_pajak.kecamatan_id:
+            return
         Kecamatan = self.get_kecamatan_model()
         Kecamatan = self.get_kecamatan_model()
         DBSession = get_db_session()
         DBSession = get_db_session()
         q = DBSession.query(Kecamatan).filter_by(
         q = DBSession.query(Kecamatan).filter_by(
@@ -238,10 +242,12 @@ class BaseInquiry:
         return upper(self.objek_pajak.opalamat)
         return upper(self.objek_pajak.opalamat)
 
 
     def get_kelurahan_op(self):
     def get_kelurahan_op(self):
-        return self.kelurahan.kelurahannm.strip().upper()
+        if self.kelurahan:
+            return self.kelurahan.kelurahannm.strip().upper()
 
 
     def get_kecamatan_op(self):
     def get_kecamatan_op(self):
-        return self.kecamatan.kecamatannm.strip().upper()
+        if self.kecamatan:
+            return self.kecamatan.kecamatannm.strip().upper()
 
 
     def get_kode_rekening(self):
     def get_kode_rekening(self):
         return self.rekening.rekeningkd.upper()
         return self.rekening.rekeningkd.upper()