perbaikan bjb_qris dan bjb_va

esipkd/views/bjb_qris.py

@@ -254,6 +254,21 @@ def cekqris(values,request):
         request.session.flash(msg, 'error')
         raise route_list(request)
 
+def cekbayar(invoice_no, request, responfor):
+    id_bayar = DBSession.query(ArInvoice.id).\
+        filter(ArInvoice.kode==invoice_no).scalar()
+    cekbayar = DBSession.query(ArPayment).\
+        filter(ArPayment.arinvoice_id==id_bayar).first()
+    if cekbayar:
+        if responfor == 0:
+            msg = 'BJBQRIS No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
+            request.session.flash(msg, 'error')
+            raise route_list(request)
+        else:
+            return render_to_response('json',
+            dict(response_code='-1',response_message='Already Paid'))
+            log.error('CALLBACK BJBQRIS RESPONSE ALREADY PAID FOR INVOICE_NO %s' % invoice_no)
+            
 ###########
 #  List   #
 ###########
@@ -477,6 +492,7 @@ def callback(request, data):
     if not get_va:
         return render_to_response('json',
             dict(response_code='-1',response_message='VA Number not Found'))
+    cekbayar(get_va.invoice_no,request, 1)
     get_va.status = 'status' in data and data['status']\
         and str(data['status']) or get_va.status
     get_va.transaction_amount = 'transaction_amount' in data and data['transaction_amount']\
@@ -521,7 +537,7 @@ def save_pembayaran(request, values):
     values.update(invoice.to_dict())
     
     values['tgl_bayar'] = datetime_from_str(values['transaction_date'])
-    values['ntb'] = 'BJBQRIS'
+    values['ntb'] = values['va_number']
     values['bayar'] = int(values['transaction_amount'])
     values['tahun'] = values['tgl_bayar'].strftime('%Y')
     values['status'] = 2

esipkd/views/bjb_va.py

@@ -252,6 +252,20 @@ def cekva(values,request):
         request.session.flash(msg, 'error')
         raise route_list(request)
         
+def cekbayar(invoice_no, request, responfor):
+    id_bayar = DBSession.query(ArInvoice.id).\
+        filter(ArInvoice.kode==invoice_no).scalar()
+    cekbayar = DBSession.query(ArPayment).\
+        filter(ArPayment.arinvoice_id==id_bayar).first()
+    if cekbayar:
+        if responfor == 0:
+            msg = 'BJBVA No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
+            request.session.flash(msg, 'error')
+            raise route_list(request)
+        else:
+            return render_to_response('json',
+            dict(response_code='-1',response_message='Already Paid'))
+            log.error('CALLBACK BJBVA RESPONSE ALREADY PAID FOR INVOICE_NO %s' % invoice_no)
 ###########
 #  List   #
 ###########
@@ -560,6 +574,7 @@ def callback(request, data):
     if not get_va:
         return render_to_response('json',
             dict(response_code='-1',response_message='VA Number not Found'))
+    cekbayar(get_va.invoice_no,request, 1)
     get_va.status = 'status' in data and data['status']\
         and str(data['status']) or get_va.status
     get_va.transaction_amount = 'transaction_amount' in data and data['transaction_amount']\
@@ -618,7 +633,7 @@ def save_pembayaran(request, values):
     values.update(invoice.to_dict())
     
     values['tgl_bayar'] = datetime_from_str(values['transaction_date'])
-    values['ntb'] = 'BJBVA'
+    values['ntb'] = values['va_number']
     values['bayar'] = int(values['transaction_amount'])
     values['tahun'] = values['tgl_bayar'].strftime('%Y')
     values['status'] = 2