inquiry.py tambah opsi --tgl-bayar

CHANGES.txt

+0.2.3 2020-09-04
+----------------
+- inquiry.py tambah opsi --tgl-bayar
+- available_invoice.py tambah opsi --jatuh-tempo-min dan --jatuh-tempo-max
+
 0.2.2 2020-08-25
 ----------------
 - Tambah get_jenis_usaha()

opensipkd/pad/scripts/available_invoice.py

@@ -15,8 +15,8 @@ def get_option(argv):
     pars.add_argument('conf')
     pars.add_argument('--jenis', help=help_jenis)
     pars.add_argument('--tahun', type=int)
-    pars.add_argument('--belum-jatuh-tempo', action='store_true')
-    pars.add_argument('--lewat-jatuh-tempo', action='store_true')
+    pars.add_argument('--jatuh-tempo-min')
+    pars.add_argument('--jatuh-tempo-max')
     pars.add_argument('--nominal-min', type=int)
     pars.add_argument('--nominal-max', type=int)
     pars.add_argument(

opensipkd/pad/scripts/inquiry.py

@@ -41,6 +41,7 @@ def get_option(argv):
     pars.add_argument('--invoice-id')
     pars.add_argument('--payment', action='store_true')
     pars.add_argument('--reversal', action='store_true')
+    pars.add_argument('--tgl-bayar')
     return pars.parse_args(argv)
 
 
@@ -59,6 +60,7 @@ def show(inq):
     show_val('Alamat Objek Pajak', inq.get_alamat_op())
     show_val('Kelurahan Objek Pajak', inq.get_kelurahan_op())
     show_val('Kecamatan Objek Pajak', inq.get_kecamatan_op())
+    show_val('Jatuh Tempo', inq.get_jatuh_tempo())
     show_rp('Tagihan', inq.tagihan)
     show_rp('Denda', inq.denda)
     show_rp('Total Bayar', inq.total_bayar)
@@ -84,10 +86,19 @@ def error(s):
     sys.exit()
 
 
+def date_from_str(s):
+    d, m, y = s.split('-')
+    return datetime(int(y), int(m), int(d))
+
+
 def main(argv=sys.argv):
     option = get_option(argv[1:])
     conf_file = option.conf
     invoice_id = option.invoice_id
+    if option.tgl_bayar:
+        tgl_bayar = date_from_str(option.tgl_bayar)
+    else:
+        tgl_bayar = None
     conf = ConfigParser()
     conf.read(conf_file)
     module_name = conf.get('main', 'module')
@@ -100,7 +111,8 @@ def main(argv=sys.argv):
     module.pad.services.base.DBSession = session_factory()
     register(module.pad.services.base.DBSession)
     inq = services.Inquiry(
-            invoice_id, rekening_notes, conf.getfloat('main', 'persen_denda'))
+            invoice_id, rekening_notes, conf.getfloat('main', 'persen_denda'),
+            tgl_bayar=tgl_bayar)
     if not inq.invoice:
         error('Invoice ID {} tidak ada.'.format(invoice_id))
     show(inq)

opensipkd/pad/services/default/__init__.py

 from time import time
 from textwrap import wrap
-from datetime import datetime
+from datetime import (
+    datetime,
+    date,
+    )
 from sqlalchemy import (
     func,
     exists,
@@ -76,6 +79,9 @@ class BaseInquiry:
     def is_available(self):
         return self.invoice.status_pembayaran == 0
 
+    def get_jatuh_tempo(self):
+        return self.invoice.jatuhtempotgl
+
     def get_objek_pajak(self):
         CustomerUsaha = self.get_customer_usaha_model()
         DBSession = get_db_session()
@@ -232,10 +238,12 @@ class Inquiry(BaseInquiry):
             return
         self.denda = self.bunga
         if self.invoice.jatuhtempotgl:
-            bulan, self.denda_waktu = hitung_denda(
+            self.bln_tunggakan, self.denda_waktu = hitung_denda(
                 self.tagihan, self.invoice.jatuhtempotgl, self.persen_denda,
                 self.tgl_bayar.date())
             self.denda += self.denda_waktu
+        else:
+            self.bln_tunggakan = None
         self.denda = round_up(self.denda)
         self.total += self.denda
 
@@ -299,6 +307,11 @@ class Reversal(BaseInquiry):
         return q.first()
 
 
+def date_from_str(s):
+    d, m, y = [int(x) for x in s.split('-')]
+    return date(y, m, d)
+
+
 class AvailableInvoice:
     def __init__(self, persen_denda=2, option=None):
         self.option = option
@@ -371,6 +384,12 @@ class AvailableInvoice:
             q = q.filter(
                     Invoice.pajak_terhutang - Invoice.bunga <= 
                     self.option.nominal_max)
+        if self.option.jatuh_tempo_min:
+            tgl = date_from_str(self.option.jatuh_tempo_min)
+            q = q.filter(Invoice.jatuhtempotgl >= tgl)
+        if self.option.jatuh_tempo_max:
+            tgl = date_from_str(self.option.jatuh_tempo_max)
+            q = q.filter(Invoice.jatuhtempotgl <= tgl)
         return q
 
     def get_message(self, row):
@@ -381,6 +400,10 @@ class AvailableInvoice:
         inq = Inquiry(invoice_id.get_raw(), persen_denda=self.persen_denda)
         if not inq.total:
             return
-        return '{} {} {} Rp {}'.format(
-                invoice_id.get_raw(), row.rekeningkd, row.rekeningnm,
-                thousand(inq.total))
+        s = f'{invoice_id.get_raw()} {inq.get_kode_rekening()}'\
+            f' {inq.get_nama_rekening()} Rp {thousand(inq.total)}'
+        jatuh_tempo = inq.get_jatuh_tempo()
+        if not jatuh_tempo:
+            return s
+        jatuh_tempo = jatuh_tempo.date().strftime('%d-%m-%Y')
+        return f'{s} jatuh tempo {jatuh_tempo}'