Tambah field pembayaran_sppt.discount_denda untuk modul tangsel

CHANGES.txt

+0.1.6 2020-07-03
+----------------
+- Tambah field pembayaran_sppt.discount_denda di modul tangsel
+
 0.1.5 2020-07-01
 0.1.5 2020-07-01
 ----------------
 ----------------
 - Tambah Kota Tangerang yaitu modul tangkota
 - Tambah Kota Tangerang yaitu modul tangkota

sismiop/scripts/inquiry.py

@@ -56,16 +56,8 @@ def show(inq):
     show_val('Nama Wajib Pajak', inq.get_nama_wp())
     show_val('Nama Wajib Pajak', inq.get_nama_wp())
     show_rp('Tagihan', inq.tagihan)
     show_rp('Tagihan', inq.tagihan)
     show_rp('Denda', inq.denda)
     show_rp('Denda', inq.denda)
-    try:
-        n = getattr(inq, 'discount_pokok')
-        show_rp('Discount Pokok', n)
-    except AttributeError:
-        pass
-    try:
-        n = getattr(inq, 'discount_denda')
-        show_rp('Discount Denda', n)
-    except AttributeError:
-        pass
+    show_attr(inq, 'discount_pokok', 'Discount Pokok')
+    show_attr(inq, 'discount_denda', 'Discount Denda')
     show_rp('Discount', inq.discount)
     show_rp('Discount', inq.discount)
     show_rp('Total Bayar Sebelumnya', inq.total_bayar)
     show_rp('Total Bayar Sebelumnya', inq.total_bayar)
     show_rp('Total Bayar', inq.total)
     show_rp('Total Bayar', inq.total)
@@ -82,15 +74,27 @@ def show(inq):
         show_val('Tempat Pembayaran', pay.kd_tp)
         show_val('Tempat Pembayaran', pay.kd_tp)
     show_field(pay, 'tgl_rekam_byr_sppt')
     show_field(pay, 'tgl_rekam_byr_sppt')
     show_field(pay, 'discount_pokok')
     show_field(pay, 'discount_pokok')
+    show_field(pay, 'discount_denda')
 
 
 
 
 def show_fields(row, fieldnames):
 def show_fields(row, fieldnames):
     for fieldname in fieldnames:
     for fieldname in fieldnames:
         label = 'Field ' + fieldname
         label = 'Field ' + fieldname
+        try:
             value = getattr(row, fieldname)
             value = getattr(row, fieldname)
+        except AttributeError:
+            continue
         show_rp(label, value)
         show_rp(label, value)
 
 
 
 
+def show_attr(obj, attr, label):
+    try:
+        n = getattr(obj, attr)
+    except AttributeError:
+        return
+    show_rp(label, n)
+
+
 def show_payment(module_name, inq, pay):
 def show_payment(module_name, inq, pay):
     print(
     print(
         'Berhasil dibayar pada urutan ke-{}'.format(
         'Berhasil dibayar pada urutan ke-{}'.format(

sismiop/services/tangsel/__init__.py

@@ -104,6 +104,7 @@ class Inquiry(BaseInquiry):
         payment.discount = self.discount_pokok + self.discount_denda
         payment.discount = self.discount_pokok + self.discount_denda
 
 
         payment.discount_pokok = self.discount_pokok
         payment.discount_pokok = self.discount_pokok
+        payment.discount_denda = self.discount_denda
         tagihan_netto = self.tagihan - self.discount_pokok
         tagihan_netto = self.tagihan - self.discount_pokok
         denda_netto = self.denda - self.discount_denda
         denda_netto = self.denda - self.discount_denda
 
 
@@ -119,7 +120,7 @@ class Reversal(BaseReversal):
 
 
     def before_save(self):
     def before_save(self):
         self.set_faktor_pengurang_sppt()
         self.set_faktor_pengurang_sppt()
-        self.payment.discount_pokok = 0
+        self.payment.discount_pokok = self.payment.discount_denda = 0
 
 
 
 
 class AvailableInvoice(BaseAvailableInvoice):
 class AvailableInvoice(BaseAvailableInvoice):

sismiop/services/tangsel/models.py

@@ -8,3 +8,4 @@ from sismiop.models.default import PembayaranSppt as BasePembayaranSppt
 class PembayaranSppt(BasePembayaranSppt):
 class PembayaranSppt(BasePembayaranSppt):
     __table_args__ = dict(extend_existing=True)
     __table_args__ = dict(extend_existing=True)
     discount_pokok = Column(Float)
     discount_pokok = Column(Float)
+    discount_denda = Column(Float)