Skip to content

Taufik Yulianto / esipkd

Go to a project
Commit 469ed17b by Taufikyu
Options

Tambahkan timezone untuk payment dan perbaiki query tgl_bayar qris, va

1 parent 37247eeb
Inline Side-by-side
Showing 3 changed files with 17 additions and 3 deletions
esipkd/tools.py
...@@ -26,6 +26,8 @@ from datetime import ( ...@@ -26,6 +26,8 @@ from datetime import (
from pyramid.threadlocal import get_current_registry from pyramid.threadlocal import get_current_registry
wib = pytz.timezone('Asia/Jakarta')
STATUS = ( STATUS = (
(1, 'Aktif'), (1, 'Aktif'),
(0, 'Inaktif'), (0, 'Inaktif'),
...@@ -193,7 +195,8 @@ def datetime_from_str(values): ...@@ -193,7 +195,8 @@ def datetime_from_str(values):
t = [0,0,0] t = [0,0,0]
if len(values) > 1: if len(values) > 1:
t = values[1].split(':') t = values[1].split(':')
return datetime(tgl.year, tgl.month, tgl.day, int(t[0]), int(t[1]), int(t[2])) dttime = datetime(tgl.year, tgl.month, tgl.day, int(t[0]), int(t[1]), int(t[2]))
return wib.localize(dttime)
def dmy_to_date(tgl): def dmy_to_date(tgl):
return datetime.strptime(tgl, '%d-%m-%Y') return datetime.strptime(tgl, '%d-%m-%Y')
......
esipkd/views/bjb_qris.py
...@@ -393,7 +393,11 @@ class view(object): ...@@ -393,7 +393,11 @@ class view(object):
query = DBSession.query(BJBQRIS.id, BJBQRIS.va_number, BJBQRIS.invoice_no, BJBQRIS.description, query = DBSession.query(BJBQRIS.id, BJBQRIS.va_number, BJBQRIS.invoice_no, BJBQRIS.description,
BJBQRIS.customer_name, BJBQRIS.amount, BJBQRIS.client_refnum, BJBQRIS.customer_name, BJBQRIS.amount, BJBQRIS.client_refnum,
func.coalesce(func.to_char(BJBQRIS.expired_date, 'DD-MM-YYYY HH24:MI:SS'),'').label('expired_date'), func.coalesce(func.to_char(BJBQRIS.expired_date, 'DD-MM-YYYY HH24:MI:SS'),'').label('expired_date'),
func.coalesce(func.to_char(ArPayment.tgl_bayar, 'DD-MM-YYYY HH24:MI:SS'),'').label('tgl_bayar'), case([
(BJBQRIS.status.in_(['1','2']),
func.coalesce(func.to_char(ArPayment.tgl_bayar, 'DD-MM-YYYY HH24:MI:SS'),''))
],
else_= literal('')).label('tgl_bayar'),
ArInvoice.jumlah.label('jml_bayar'), ArInvoice.jumlah.label('jml_bayar'),
case([ case([
(BJBQRIS.status == '0', literal('Belum Dibayar')) (BJBQRIS.status == '0', literal('Belum Dibayar'))
...@@ -505,6 +509,9 @@ def callback(request, data): ...@@ -505,6 +509,9 @@ def callback(request, data):
and data['transaction_amount'] or get_va.amount and data['transaction_amount'] or get_va.amount
get_va.transaction_date = 'transaction_date' in data and data['transaction_date']\ get_va.transaction_date = 'transaction_date' in data and data['transaction_date']\
and data['transaction_date'] or datetime.now().strftime('%Y-%m-%d %H:%M:%S') and data['transaction_date'] or datetime.now().strftime('%Y-%m-%d %H:%M:%S')
get_va.transactionDate = getattr(get_va,'transactionDate',None)
get_va.transactionAmount = getattr(get_va,'transaction_amount',None)
get_va.transactionStatus = getattr(get_va,'status',None)
pay = save_pembayaran( pay = save_pembayaran(
request, request,
......
esipkd/views/bjb_va.py
...@@ -464,7 +464,11 @@ class view(object): ...@@ -464,7 +464,11 @@ class view(object):
query = DBSession.query(BJBVA.id, BJBVA.va_number, BJBVA.invoice_no, BJBVA.description, query = DBSession.query(BJBVA.id, BJBVA.va_number, BJBVA.invoice_no, BJBVA.description,
BJBVA.customer_name, BJBVA.amount, BJBVA.client_refnum, BJBVA.customer_name, BJBVA.amount, BJBVA.client_refnum,
func.coalesce(func.to_char(BJBVA.expired_date, 'DD-MM-YYYY HH24:MI:SS'),'').label('expired_date'), func.coalesce(func.to_char(BJBVA.expired_date, 'DD-MM-YYYY HH24:MI:SS'),'').label('expired_date'),
func.coalesce(func.to_char(ArPayment.tgl_bayar, 'DD-MM-YYYY HH24:MI:SS'),'').label('tgl_bayar'), case([
(BJBVA.status.in_(['1','2']),
func.coalesce(func.to_char(ArPayment.tgl_bayar, 'DD-MM-YYYY HH24:MI:SS'),''))
],
else_= literal('')).label('tgl_bayar'),
ArInvoice.jumlah.label('jml_bayar'), ArInvoice.jumlah.label('jml_bayar'),
case([ case([
(BJBVA.status == '0', literal('Belum Dibayar')) (BJBVA.status == '0', literal('Belum Dibayar'))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!