perbaiki untuk pembayaran kurang bayar

esipkd/views/bjb_qris.py

@@ -254,12 +254,11 @@ def cekqris(values,request):
         request.session.flash(msg, 'error')
         raise route_list(request)
 
-def cekbayar(invoice_no, request, responfor):
-    tagihan = DBSession.query(func.max(BJBQRIS.amount)).\
-        filter(BJBQRIS.invoice_no==invoice_no,BJBQRIS.status.in_(['0','1','2'])).group_by(BJBQRIS.va_number).scalar()
-    cekbayar = DBSession.query(func.sum(ArPayment.bayar)).join(ArInvoice,ArInvoice.id==ArPayment.arinvoice_id).\
-        filter(ArInvoice.kode==invoice_no).scalar()
-    if cekbayar >= tagihan:
+def cekbayar(invoice_no, request, responfor, add=True):
+    cekbayar = DBSession.query(ArPayment).\
+        join(ArInvoice, ArInvoice.id==ArPayment.ar_invoice_id).\
+        filter(ArInvoice.kode==invoice_no, ArInvoice.status==1).first()
+    if cekbayar:
         if responfor == 0:
             msg = 'BJBQRIS No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
             request.session.flash(msg, 'error')

esipkd/views/bjb_va.py

@@ -252,12 +252,11 @@ def cekva(values,request):
         request.session.flash(msg, 'error')
         raise route_list(request)
         
-def cekbayar(invoice_no, request, responfor):
-    tagihan = DBSession.query(func.max(BJBVA.amount)).\
-        filter(BJBVA.invoice_no==invoice_no,BJBVA.status.in_(['0','1','2'])).group_by(BJBVA.va_number).scalar()
-    cekbayar = DBSession.query(func.sum(ArPayment.bayar)).join(ArInvoice,ArInvoice.id==ArPayment.arinvoice_id).\
-        filter(ArInvoice.kode==invoice_no).scalar()
-    if cekbayar >= tagihan:
+def cekbayar(invoice_no, request, responfor, add=True):
+    cekbayar = DBSession.query(ArPayment).\
+        join(ArInvoice, ArInvoice.id==ArPayment.ar_invoice_id).\
+        filter(ArInvoice.kode==invoice_no, ArInvoice.status==1).first()
+    if cekbayar:
         if responfor == 0:
             msg = 'BJBVA No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
             request.session.flash(msg, 'error')
@@ -266,6 +265,7 @@ def cekbayar(invoice_no, request, responfor):
             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   #
 ###########