Skip to content

Owo Sugiana / opensipkd-pad-models

Go to a project
Commit d245a67f by Owo Sugiana
Options

Backward compatibility

1 parent f1560818
Inline Side-by-side
Showing 3 changed files with 10 additions and 12 deletions
opensipkd/pad/scripts/inquiry.py
...@@ -69,7 +69,7 @@ def show(inq): ...@@ -69,7 +69,7 @@ def show(inq):
show_val('Kecamatan Objek Pajak', inq.get_kecamatan_op()) show_val('Kecamatan Objek Pajak', inq.get_kecamatan_op())
show_val('Jatuh Tempo', inq.get_jatuh_tempo()) show_val('Jatuh Tempo', inq.get_jatuh_tempo())
show_val('Jumlah Bulan Denda', inq.bln_tunggakan) show_val('Jumlah Bulan Denda', inq.bln_tunggakan)
show_rp('Tagihan', inq.tagihan) show_rp('Tagihan Pokok', inq.tagihan_pokok)
show_field(inq.invoice, 'pajak_terhutang') show_field(inq.invoice, 'pajak_terhutang')
show_field(inq.invoice, 'bunga') show_field(inq.invoice, 'bunga')
try: try:
...@@ -80,7 +80,7 @@ def show(inq): ...@@ -80,7 +80,7 @@ def show(inq):
if inq.notes: if inq.notes:
show_val('Note', inq.notes) show_val('Note', inq.notes)
show_rp('Total Bayar', inq.total_bayar) show_rp('Total Bayar', inq.total_bayar)
show_rp('Sisa Tagihan', inq.sisa_tagihan) show_rp('Sisa Tagihan', inq.tagihan)
show_rp('Total Denda', inq.denda) show_rp('Total Denda', inq.denda)
show_rp('Total Tagihan', inq.total) show_rp('Total Tagihan', inq.total)
show_field(inq.invoice, 'status_pembayaran') show_field(inq.invoice, 'status_pembayaran')
......
opensipkd/pad/services/bogor_kota.py
...@@ -18,7 +18,7 @@ class Inquiry(BaseInquiry): ...@@ -18,7 +18,7 @@ class Inquiry(BaseInquiry):
else: else:
persen_denda = self.conf['persen_denda'] persen_denda = self.conf['persen_denda']
self.bln_tunggakan, self.denda_waktu = hitung_denda( self.bln_tunggakan, self.denda_waktu = hitung_denda(
self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda, self.tagihan, self.invoice.jatuhtempotgl, persen_denda,
self.tgl_bayar.date()) self.tgl_bayar.date())
def get_discount_denda(self): # Override def get_discount_denda(self): # Override
......
opensipkd/pad/services/default.py
...@@ -302,8 +302,8 @@ class Inquiry(BaseInquiry): ...@@ -302,8 +302,8 @@ class Inquiry(BaseInquiry):
return pay.jml or 0 return pay.jml or 0
def hitung_tagihan(self): def hitung_tagihan(self):
self.tagihan = self.invoice.pajak_terhutang - self.invoice.bunga self.tagihan_pokok = self.invoice.pajak_terhutang - self.invoice.bunga
self.tagihan = round_up(self.tagihan) self.tagihan = round_up(self.tagihan_pokok)
def hitung_denda(self): def hitung_denda(self):
self.bln_tunggakan = None self.bln_tunggakan = None
...@@ -327,7 +327,7 @@ class Inquiry(BaseInquiry): ...@@ -327,7 +327,7 @@ class Inquiry(BaseInquiry):
else: else:
persen_denda = self.conf['persen_denda'] persen_denda = self.conf['persen_denda']
self.bln_tunggakan, self.denda_waktu = hitung_denda( self.bln_tunggakan, self.denda_waktu = hitung_denda(
self.sisa_tagihan, self.invoice.jatuhtempotgl, persen_denda, self.tagihan, self.invoice.jatuhtempotgl, persen_denda,
self.tgl_bayar.date()) self.tgl_bayar.date())
def get_discount_denda(self): def get_discount_denda(self):
...@@ -336,17 +336,15 @@ class Inquiry(BaseInquiry): ...@@ -336,17 +336,15 @@ class Inquiry(BaseInquiry):
def hitung_bayar(self): def hitung_bayar(self):
bayar = self.get_payment_amount() bayar = self.get_payment_amount()
self.total_bayar = round_up(bayar) self.total_bayar = round_up(bayar)
self.sisa_tagihan = self.tagihan - self.total_bayar
if self.sisa_tagihan < 1:
self.sisa_tagihan = 0
def hitung(self): def hitung(self):
self.hitung_tagihan() self.hitung_tagihan()
self.hitung_bayar() self.hitung_bayar()
self.tagihan -= self.total_bayar
if self.tagihan < 1:
self.tagihan = 0
self.hitung_denda() self.hitung_denda()
self.total = self.tagihan + self.denda - self.total_bayar self.total = self.tagihan + self.denda
if self.total < 0:
self.total = 0
def get_pay_seq(self): def get_pay_seq(self):
Payment = self.get_payment_model() Payment = self.get_payment_model()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!