Commit 0c59c039 by taufikyu

perbaiki untuk pembayaran kurang bayar

1 parent 918ffb5e
...@@ -254,12 +254,11 @@ def cekqris(values,request): ...@@ -254,12 +254,11 @@ def cekqris(values,request):
request.session.flash(msg, 'error') request.session.flash(msg, 'error')
raise route_list(request) raise route_list(request)
def cekbayar(invoice_no, request, responfor): def cekbayar(invoice_no, request, responfor, add=True):
tagihan = DBSession.query(func.max(BJBQRIS.amount)).\ cekbayar = DBSession.query(ArPayment).\
filter(BJBQRIS.invoice_no==invoice_no,BJBQRIS.status.in_(['0','1','2'])).group_by(BJBQRIS.va_number).scalar() join(ArInvoice, ArInvoice.id==ArPayment.ar_invoice_id).\
cekbayar = DBSession.query(func.sum(ArPayment.bayar)).join(ArInvoice,ArInvoice.id==ArPayment.arinvoice_id).\ filter(ArInvoice.kode==invoice_no, ArInvoice.status==1).first()
filter(ArInvoice.kode==invoice_no).scalar() if cekbayar:
if cekbayar >= tagihan:
if responfor == 0: if responfor == 0:
msg = 'BJBQRIS No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no msg = 'BJBQRIS No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
request.session.flash(msg, 'error') request.session.flash(msg, 'error')
......
...@@ -252,12 +252,11 @@ def cekva(values,request): ...@@ -252,12 +252,11 @@ def cekva(values,request):
request.session.flash(msg, 'error') request.session.flash(msg, 'error')
raise route_list(request) raise route_list(request)
def cekbayar(invoice_no, request, responfor): def cekbayar(invoice_no, request, responfor, add=True):
tagihan = DBSession.query(func.max(BJBVA.amount)).\ cekbayar = DBSession.query(ArPayment).\
filter(BJBVA.invoice_no==invoice_no,BJBVA.status.in_(['0','1','2'])).group_by(BJBVA.va_number).scalar() join(ArInvoice, ArInvoice.id==ArPayment.ar_invoice_id).\
cekbayar = DBSession.query(func.sum(ArPayment.bayar)).join(ArInvoice,ArInvoice.id==ArPayment.arinvoice_id).\ filter(ArInvoice.kode==invoice_no, ArInvoice.status==1).first()
filter(ArInvoice.kode==invoice_no).scalar() if cekbayar:
if cekbayar >= tagihan:
if responfor == 0: if responfor == 0:
msg = 'BJBVA No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no msg = 'BJBVA No. Billing %s sudah di bayar. Cek menu pembayaran.' % invoice_no
request.session.flash(msg, 'error') request.session.flash(msg, 'error')
...@@ -266,6 +265,7 @@ def cekbayar(invoice_no, request, responfor): ...@@ -266,6 +265,7 @@ def cekbayar(invoice_no, request, responfor):
return render_to_response('json', return render_to_response('json',
dict(response_code='-1',response_message='Already Paid')) dict(response_code='-1',response_message='Already Paid'))
log.error('CALLBACK BJBVA RESPONSE ALREADY PAID FOR INVOICE_NO %s' % invoice_no) log.error('CALLBACK BJBVA RESPONSE ALREADY PAID FOR INVOICE_NO %s' % invoice_no)
########### ###########
# List # # List #
########### ###########
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!