Bugfixed BPHTB Kabupaten Bandung

payment_report/models.py

@@ -41,7 +41,7 @@ class Pad(Base, Common):
     # pad.pad_sspd.sspdjam / log_iso.created
     # pad.pad_sspd.sspdjam / log_iso.created
     jam = Column(Time, nullable=False)
     jam = Column(Time, nullable=False)
     # Bit 61
     # Bit 61
-    nomor_bayar = Column(String(16), nullable=False)
+    nomor_bayar = Column(String(25), nullable=False)
     # pad.pad_usaha.usahanm
     # pad.pad_usaha.usahanm
     jenis_pajak = Column(String(64), nullable=False)
     jenis_pajak = Column(String(64), nullable=False)
     # pad.pad_spt.masadari
     # pad.pad_spt.masadari

payment_report/scripts/bphtb.py

@@ -113,6 +113,29 @@ class AlternativeIsoPayment(IsoPaymentMixin, Base):
     pass
     pass
 
 
 
 
+class AlternativeLog(Base):
+    __tablename__ = 'log_iso'
+    id = Column(Integer, nullable=False, primary_key=True)
+    created = Column(DateTime(timezone=True), nullable=False)
+    ip = Column(String(15))
+    mti = Column(String(4), nullable=False)
+    bit_003 = Column(Text)
+    bit_004 = Column(Text)
+    bit_011 = Column(Text)
+    bit_018 = Column(Text)
+    bit_032 = Column(Text)
+    bit_033 = Column(Text)
+    bit_037 = Column(Text)
+    bit_039 = Column(Text)
+    bit_041 = Column(Text)
+    bit_042 = Column(Text)
+    bit_043 = Column(Text)
+    bit_057 = Column(Text)
+    bit_058 = Column(Text)
+    bit_061 = Column(Text)
+    bit_062 = Column(Text)
+
+
 class SukabumiKotaLog(Base):
 class SukabumiKotaLog(Base):
     __tablename__ = 'iso_log'
     __tablename__ = 'iso_log'
     id = Column(Integer, primary_key=True)
     id = Column(Integer, primary_key=True)
@@ -164,8 +187,20 @@ class App(BaseApp):
 
 
     def get_log_model(self):
     def get_log_model(self):
         if self.is_sukabumi_kota:
         if self.is_sukabumi_kota:
+            try:
+                self.h2h_session.query(SukabumiKotaLog).first()
+            except ProgrammingError:
+                self.h2h_session.rollback()
+                return AlternativeLog
             return SukabumiKotaLog
             return SukabumiKotaLog
-        return self.is_json_log and JsonLog or Log
+        if self.is_json_log:
+            return JsonLog
+        try:
+            self.h2h_session.query(Log).first()
+        except ProgrammingError:
+            self.h2h_session.rollback()
+            return AlternativeLog
+        return Log
 
 
     def get_base_q_log(self):
     def get_base_q_log(self):
         Log = self.get_log_model()
         Log = self.get_log_model()
@@ -233,8 +268,6 @@ class App(BaseApp):
         self.is_sukabumi_kota = True
         self.is_sukabumi_kota = True
         self.Invoice = Invoice
         self.Invoice = Invoice
         self.Payment = Payment
         self.Payment = Payment
-        self.base_q_inv_kb = self.prod_session.query(Skbkb)
-        self.base_q_inv_kbt = self.prod_session.query(Skbkbt)
         self.base_q_pay = self.prod_session.query(Payment)
         self.base_q_pay = self.prod_session.query(Payment)
 
 
     def set_cartenz_models(self):
     def set_cartenz_models(self):