Commit cd456be6 by taufikyu

perbaiki bjb qris, bjb va

1 parent 3571b142
...@@ -277,7 +277,6 @@ def save(request, values, row=None): ...@@ -277,7 +277,6 @@ def save(request, values, row=None):
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.no_id = 1 row.no_id = 1
else: else:
......
...@@ -275,7 +275,6 @@ def save(request, values, row=None): ...@@ -275,7 +275,6 @@ def save(request, values, row=None):
#ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), #ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.no_id = 1 row.no_id = 1
else: else:
......
...@@ -323,7 +323,6 @@ def save(request, values, row=None): ...@@ -323,7 +323,6 @@ def save(request, values, row=None):
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
print "--tahun--",row.tahun_id print "--tahun--",row.tahun_id
print "--wilayah--",row.wilayah_id print "--wilayah--",row.wilayah_id
print "--tanggal--",tgl_tetap_new print "--tanggal--",tgl_tetap_new
......
...@@ -276,7 +276,6 @@ def save(request, values, row=None): ...@@ -276,7 +276,6 @@ def save(request, values, row=None):
#ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), #ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.no_id = 1 row.no_id = 1
else: else:
......
...@@ -297,7 +297,6 @@ def save(request, values, row=None): ...@@ -297,7 +297,6 @@ def save(request, values, row=None):
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
print "--tahun--",row.tahun_id print "--tahun--",row.tahun_id
print "--wilayah--",row.wilayah_id print "--wilayah--",row.wilayah_id
print "--tanggal--",tgl_tetap_new print "--tanggal--",tgl_tetap_new
......
...@@ -277,7 +277,6 @@ def save(request, values, row=None): ...@@ -277,7 +277,6 @@ def save(request, values, row=None):
filter(ARSspd.tahun_id==ref.tahun_id, filter(ARSspd.tahun_id==ref.tahun_id,
ARSspd.arinvoice_id==ref.id).\ ARSspd.arinvoice_id==ref.id).\
scalar() scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.pembayaran_ke = 1 row.pembayaran_ke = 1
else: else:
......
...@@ -269,7 +269,6 @@ def save(request, values, row=None): ...@@ -269,7 +269,6 @@ def save(request, values, row=None):
filter(ARSspd.tahun_id==row.tahun_id, filter(ARSspd.tahun_id==row.tahun_id,
ARSspd.arinvoice_id==row.arinvoice_id).\ ARSspd.arinvoice_id==row.arinvoice_id).\
scalar() scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.pembayaran_ke = 1 row.pembayaran_ke = 1
else: else:
......
...@@ -641,14 +641,12 @@ def view_posting(request): ...@@ -641,14 +641,12 @@ def view_posting(request):
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
elif prefix == '21': elif prefix == '21':
invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\ invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\
filter(ARInvoice.tahun_id==i.tahun_id, filter(ARInvoice.tahun_id==i.tahun_id,
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
i.no_id = 1 i.no_id = 1
......
...@@ -622,14 +622,12 @@ def view_posting(request): ...@@ -622,14 +622,12 @@ def view_posting(request):
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
elif prefix == '21': elif prefix == '21':
invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\ invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\
filter(ARInvoice.tahun_id==i.tahun_id, filter(ARInvoice.tahun_id==i.tahun_id,
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
i.no_id = 1 i.no_id = 1
......
...@@ -521,13 +521,13 @@ def callback(request, data): ...@@ -521,13 +521,13 @@ def callback(request, data):
if int(get_va.status) == 2 and not pay.status: if int(get_va.status) == 2 and not pay.status:
get_va.status = '1' get_va.status = '1'
if DBSession.add(get_va): try:
DBSession.add(get_va):
DBSession.flush() DBSession.flush()
if not sendrpc(request, get_va.invoice_no): sendrpc(request, get_va.invoice_no)
log.error('Error send BJBQRIS to pemda')
return render_to_response('json', return render_to_response('json',
dict(response_code='0000',response_message='Success')) dict(response_code='0000',response_message='Success'))
else: except:
return render_to_response('json', return render_to_response('json',
dict(response_code='-1',response_message='Failed to update')) dict(response_code='-1',response_message='Failed to update'))
...@@ -573,6 +573,7 @@ def calculate_tagihan(values): ...@@ -573,6 +573,7 @@ def calculate_tagihan(values):
return pokok, denda return pokok, denda
def sendrpc(request, kd_bayar): def sendrpc(request, kd_bayar):
log.info('STARTING RPC QRIS CALLBACK PEMDA')
settings = get_settings() settings = get_settings()
request = self.req request = self.req
headers = {'Content-Type':'application/json'} headers = {'Content-Type':'application/json'}
...@@ -593,5 +594,5 @@ def sendrpc(request, kd_bayar): ...@@ -593,5 +594,5 @@ def sendrpc(request, kd_bayar):
log.info('Response RPC CALLBACK PEMDA : {}'.format(resp.content)) log.info('Response RPC CALLBACK PEMDA : {}'.format(resp.content))
return True return True
except requests.exceptions.RequestException as err: except requests.exceptions.RequestException as err:
log.error('Gagal membuat koneksi, silakan coba lagi beberapa saat') log.error('Error send BJBQRIS to pemda : {}'.format(err))
return return
...@@ -603,13 +603,14 @@ def callback(request, data): ...@@ -603,13 +603,14 @@ def callback(request, data):
if int(get_va.status) == 2 and not pay.status: if int(get_va.status) == 2 and not pay.status:
get_va.status = '1' get_va.status = '1'
if DBSession.add(get_va):
try:
DBSession.add(get_va):
DBSession.flush() DBSession.flush()
if not sendrpc(request, get_va.invoice_no): sendrpc(request, get_va.invoice_no)
log.error('Error send BJBVA to pemda')
return render_to_response('json', return render_to_response('json',
dict(response_code='0000',response_message='Success')) dict(response_code='0000',response_message='Success'))
else: except:
return render_to_response('json', return render_to_response('json',
dict(response_code='-1',response_message='Failed to update')) dict(response_code='-1',response_message='Failed to update'))
...@@ -668,6 +669,7 @@ def calculate_tagihan(values): ...@@ -668,6 +669,7 @@ def calculate_tagihan(values):
return pokok, denda return pokok, denda
def sendrpc(request, kd_bayar): def sendrpc(request, kd_bayar):
log.info('STARTING RPC VA CALLBACK PEMDA')
settings = get_settings() settings = get_settings()
request = self.req request = self.req
headers = {'Content-Type':'application/json'} headers = {'Content-Type':'application/json'}
...@@ -688,5 +690,5 @@ def sendrpc(request, kd_bayar): ...@@ -688,5 +690,5 @@ def sendrpc(request, kd_bayar):
log.info('Response RPC CALLBACK PEMDA : {}'.format(resp.content)) log.info('Response RPC CALLBACK PEMDA : {}'.format(resp.content))
return True return True
except requests.exceptions.RequestException as err: except requests.exceptions.RequestException as err:
log.error('Gagal membuat koneksi, silakan coba lagi beberapa saat') log.error('Error send BJBVA to pemda : {}'.format(err))
return return
\ No newline at end of file \ No newline at end of file
...@@ -267,14 +267,12 @@ def save(request, values, row=None): ...@@ -267,14 +267,12 @@ def save(request, values, row=None):
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
elif prefix == '21': elif prefix == '21':
invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\ invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\
filter(ARInvoice.tahun_id==row.tahun_id, filter(ARInvoice.tahun_id==row.tahun_id,
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
row.no_id = 1 row.no_id = 1
......
...@@ -288,7 +288,6 @@ def save(request, values, row=None): ...@@ -288,7 +288,6 @@ def save(request, values, row=None):
ARInvoice.wilayah_id==row.wilayah_id, ARInvoice.wilayah_id==row.wilayah_id,
ARInvoice.tgl_tetap==tgl_tetap_new, ARInvoice.tgl_tetap==tgl_tetap_new,
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
print "--tahun--",row.tahun_id print "--tahun--",row.tahun_id
print "--wilayah--",row.wilayah_id print "--wilayah--",row.wilayah_id
print "--tanggal--",tgl_tetap_new print "--tanggal--",tgl_tetap_new
......
...@@ -84,7 +84,6 @@ def view_act(request): ...@@ -84,7 +84,6 @@ def view_act(request):
if url_dict['act']=='grid': if url_dict['act']=='grid':
u = request.user.id u = request.user.id
print '--------user--------',u
columns = [] columns = []
columns.append(ColumnDT('id')) columns.append(ColumnDT('id'))
columns.append(ColumnDT('kode')) columns.append(ColumnDT('kode'))
...@@ -819,21 +818,18 @@ def view_posting(request): ...@@ -819,21 +818,18 @@ def view_posting(request):
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='20').scalar() func.substr(ARInvoice.kode,1,2)=='20').scalar()
print "--------- Invoice No ---------- ",invoice_no
elif prefix == '21': elif prefix == '21':
invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\ invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\
filter(ARInvoice.tahun_id==i.tahun_id, filter(ARInvoice.tahun_id==i.tahun_id,
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='21').scalar() func.substr(ARInvoice.kode,1,2)=='21').scalar()
print "--------- Invoice No ---------- ",invoice_no
elif prefix == '22': elif prefix == '22':
invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\ invoice_no = DBSession.query(func.max(ARInvoice.no_id)).\
filter(ARInvoice.tahun_id==i.tahun_id, filter(ARInvoice.tahun_id==i.tahun_id,
ARInvoice.wilayah_id==i.wilayah_id, ARInvoice.wilayah_id==i.wilayah_id,
ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'), ARInvoice.tgl_tetap==datetime.now().strftime('%Y-%m-%d'),
func.substr(ARInvoice.kode,1,2)=='22').scalar() func.substr(ARInvoice.kode,1,2)=='22').scalar()
print "--------- Invoice No ---------- ",invoice_no
if not invoice_no: if not invoice_no:
i.no_id = 1 i.no_id = 1
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!