Perubahan rumus pada PBB

CHANGES.txt

+3.2 2024-05-17
+--------------
+- Perubahan rumus pada PBB
+- Penambahan field kecamatan_nm pada PAD
+
 3.1.4 2024-05-07
 ----------------
 - Tambah PBB H2H Only

payment_report/models.py

@@ -64,6 +64,8 @@ class Pad(Base, Common):
     channel_id = Column(String(4), nullable=False)
     # Bit 41 / 42 / 43
     channel_name = Column(String(32), nullable=False)
+    # pad.kecamatan.kecamatan_nm
+    kecamatan_nm = Column(String(50))
     # pad_reversal.tgl
     tgl_batal = Column(DateTime(timezone=True))
 

payment_report/pad/default.py

@@ -37,14 +37,16 @@ class App(BaseApp):
         CustomerUsaha = self.models.CustomerUsaha
         Invoice = self.models.Invoice
         Payment = self.models.Payment
+        Kecamatan = self.models.Kecamatan
         self.base_q_pay = self.prod_session.query(Payment)
         self.base_q_inv = self.prod_session.query(
-                Invoice, Pajak, Customer, Usaha)
+                Invoice, Pajak, Customer, Usaha, Kecamatan)
         self.base_q_inv = self.base_q_inv.filter(
                 Invoice.pajak_id == Pajak.id,
                 Invoice.customer_usaha_id == CustomerUsaha.id,
                 CustomerUsaha.customer_id == Customer.id,
-                Usaha.id == Pajak.usaha_id,)
+                Usaha.id == Pajak.usaha_id,
+                Kecamatan.id == CustomerUsaha.kecamatan_id)
         self.base_q_log = self.prod_session.query(Log).filter_by(
                 mti='0210', bit_003=PAYMENT_CODE, bit_039='00')
         try:
@@ -113,7 +115,7 @@ class App(BaseApp):
     def create_data(self, pay):  # Override
         Invoice = self.models.Invoice
         q_inv = self.base_q_inv.filter(Invoice.id == pay.spt_id)
-        inv, pajak, cust, usaha = q_inv.first()
+        inv, pajak, cust, usaha, kecamatan = q_inv.first()
         invoice_id = FixLength(self.service.INVOICE_ID)
         invoice_id['Tahun'] = inv.tahun
         invoice_id['SptNo'] = inv.sptno
@@ -143,6 +145,6 @@ class App(BaseApp):
             jam=pay.sspdtgl.time(), nomor_bayar=invoice_id.get_raw(),
             jenis_pajak=usaha.usahanm.strip(), masa_pajak=inv.masadari,
             npwpd=cust.npwpd, nama_wp=cust.customernm.strip(),
-            pokok=pay.jml_bayar-pay.denda, denda=pay.denda, bunga=pay.bunga,
-            jml_bayar=pay.jml_bayar, channel_id=channel_id,
-            channel_name=channel_name, bank_id=bank_id)
+            kecamatan_nm=kecamatan.kecamatannm, pokok=pay.jml_bayar-pay.denda,
+            denda=pay.denda, bunga=pay.bunga, jml_bayar=pay.jml_bayar,
+            channel_id=channel_id, channel_name=channel_name, bank_id=bank_id)

payment_report/pbb/default.py

@@ -284,7 +284,7 @@ class App(BaseApp):
                     channel_nama = self.get_va_channel(tgl)
                     if not channel_nama:
                         kd_tp = psppt.kd_tp.strip()
-                        channel_nama = self.kd_tp.get(kd_tp, 'MANUAL')
+                        channel_nama = self.kd_tp.get(kd_tp, 'LAINNYA')
         return channel_kode, channel_nama, stan, ntb, bank_id, user_id, \
             tgl_inquiry
 
@@ -314,7 +314,7 @@ class App(BaseApp):
             kd_blok=psppt.kd_blok, no_urut=psppt.no_urut,
             kd_jns_op=psppt.kd_jns_op, thn_pajak_sppt=psppt.thn_pajak_sppt,
             pembayaran_sppt_ke=psppt.pembayaran_sppt_ke, stan=stan, ntb=ntb,
-            jml_sppt_yg_dibayar=bayar, denda_sppt=denda or 0,
+            jml_sppt_yg_dibayar=pokok+denda, denda_sppt=denda or 0,
             discount=discount or 0, tgl_pembayaran_sppt=tgl,
             tgl_inquiry=tgl_inquiry,
             tgl_rekam_byr_sppt=psppt.tgl_rekam_byr_sppt,