perbaiki response rpc

esipkd/views/bjb_qris.py

@@ -247,13 +247,15 @@ def id_expired(request):
     request.session.flash(msg, 'error')
     return route_list(request)
     
-def cekqris(values,request):
+def cekqris(values,request, response=False):
     cekqris = DBSession.query(BJBQRIS).\
         filter(BJBQRIS.invoice_no==values['invoice_no'],BJBQRIS.expired_date>datetime.now()).first()
     if cekqris:
         msg = 'BJBQRIS No. Billing %s sudah ada.' % cekqris.va_number
+        if not response:
             request.session.flash(msg, 'error')
             raise route_list(request)
+        return msg
 
 def cekbayar(invoice_no, request, responfor, add=True):
     cekbayar = DBSession.query(ArPayment).\

esipkd/views/bjb_va.py

@@ -245,13 +245,15 @@ def id_expired(request):
     request.session.flash(msg, 'error')
     return route_list(request)
     
-def cekva(values,request):
+def cekva(values,request, response=False):
     cekva = DBSession.query(BJBVA).\
         filter(BJBVA.invoice_no==values['invoice_no'],BJBVA.expired_date>datetime.now()).first()
     if cekva:
         msg = 'BJBVA No. VA %s sudah ada.' % cekva.va_number
+        if not response:
             request.session.flash(msg, 'error')
             raise route_list(request)
+        return msg
         
 def cekbayar(invoice_no, request, responfor, add=True):
     cekbayar = DBSession.query(ArPayment).\

esipkd/views/rpc.py

@@ -356,7 +356,7 @@ def create_qris(request, data):
                    expired_date=expired_date,
                    amount=(pokok + denda))
 
-    cekqris(dt_qris, request)
+    cekqris(dt_qris, request, response= True)
     val = dt_qris
     val['amount'] = (pokok+denda)
     row_qris = BJBQRIS.create_va(val, rpc_qris())
@@ -458,7 +458,7 @@ def create_va(request, data):
                    expired_date=expired_date,
                    amount=(pokok + denda))
 
-    cekva(dt_va, request)
+    cekva(dt_va, request, response= True)
     val = dt_va
     val['amount'] = (pokok+denda)
     row_va = BJBVA.create_va(val, rpc_va())