Skip to content

Owo Sugiana / sismiop-models

Go to a project
Commit de81a1a4 by Owo Sugiana
Options

Total tagihan nol jika status lunas

1 parent 6913772d
Inline Side-by-side
Showing 3 changed files with 5 additions and 2 deletions
CHANGES.txt
0.2.11 2023-08-29 0.2.11 2023-08-29
----------------- -----------------
- Jangan hitung tagihan bila status lunas - Total tagihan nol jika status lunas
- Discount Kota Tangerang Selatan - Discount Kota Tangerang Selatan
0.2.10 2023-08-16 0.2.10 2023-08-16
......
sismiop/services/base.py
...@@ -161,7 +161,6 @@ class Inquiry(Query): ...@@ -161,7 +161,6 @@ class Inquiry(Query):
self.persen_denda = persen_denda self.persen_denda = persen_denda
# Digunakan untuk ISO8583 # Digunakan untuk ISO8583
self.tagihan = self.denda = self.discount = self.total = 0 self.tagihan = self.denda = self.discount = self.total = 0
if not self.is_paid():
self.hitung() self.hitung()
def get_kelurahan_model(self): def get_kelurahan_model(self):
...@@ -291,6 +290,8 @@ class Inquiry(Query): ...@@ -291,6 +290,8 @@ class Inquiry(Query):
if self.total > 0: if self.total > 0:
self.hitung_discount() self.hitung_discount()
self.total -= self.discount self.total -= self.discount
if self.is_paid():
self.total = 0
def do_payment(self, bank_fields, nip_pencatat): def do_payment(self, bank_fields, nip_pencatat):
bayar = self.invoice2payment() bayar = self.invoice2payment()
......
sismiop/services/tangsel.py
...@@ -37,10 +37,12 @@ class Inquiry(BaseInquiry): ...@@ -37,10 +37,12 @@ class Inquiry(BaseInquiry):
func.sum(Payment.denda_sppt). func.sum(Payment.denda_sppt).
label('denda_sppt')) label('denda_sppt'))
q = self.get_filter(q) q = self.get_filter(q)
q = q.filter(Payment.jml_sppt_yg_dibayar > 0)
bayar = q.first() bayar = q.first()
self.total_bayar = bayar.jml_sppt_yg_dibayar or 0 self.total_bayar = bayar.jml_sppt_yg_dibayar or 0
if self.total_bayar < 0: if self.total_bayar < 0:
self.total_bayar = 0 self.total_bayar = 0
if self.invoice.pbb_yg_harus_dibayar_sppt > 0:
denda_lalu = bayar.denda_sppt or 0 denda_lalu = bayar.denda_sppt or 0
sisa = float(self.total_bayar - denda_lalu) sisa = float(self.total_bayar - denda_lalu)
tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa tagihan = self.invoice.pbb_yg_harus_dibayar_sppt - sisa
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!