Commit f15a445c by aagusti

Merge branch 'master' of https://git.opensipkd.com/taufik/esipkd

2 parents 05f24fe2 ce14575c
...@@ -153,13 +153,15 @@ class BJBQRIS(KodeModel, Base): ...@@ -153,13 +153,15 @@ class BJBQRIS(KodeModel, Base):
def send_rpc(parameter, method, data): def send_rpc(parameter, method, data):
headers = json_rpc_header(parameter['bjbqris_user'],parameter['bjbqris_key']) headers = json_rpc_header(parameter['bjbqris_user'],parameter['bjbqris_key'])
params = get_jsonrpc(method, dict(data=data)) params = get_jsonrpc(method, dict(data=data))
log.error("REQ TO QRIS")
log.error(json.dumps(params))
try: try:
resp = requests.post(url=parameter['bjbqris_url'], resp = requests.post(url=parameter['bjbqris_url'],
data=json.dumps(params), data=json.dumps(params),
headers=headers) headers=headers)
try: try:
datava = json.loads(resp.content) datava = json.loads(resp.content)
log.error("RESPONSE FROM VA") log.error("RESPONSE FROM QRIS")
log.error(resp.text) log.error(resp.text)
if 'error' in datava: if 'error' in datava:
log.error(resp.content) log.error(resp.content)
......
...@@ -210,6 +210,8 @@ class BJBVA(KodeModel, Base): ...@@ -210,6 +210,8 @@ class BJBVA(KodeModel, Base):
def send_rpc(parameter, method, data): def send_rpc(parameter, method, data):
headers = json_rpc_header(parameter['bjbva_user'],parameter['bjbva_key']) headers = json_rpc_header(parameter['bjbva_user'],parameter['bjbva_key'])
params = get_jsonrpc(method, dict(data=data)) params = get_jsonrpc(method, dict(data=data))
log.error("REQ TO VA")
log.error(json.dumps(params))
try: try:
resp = requests.post(url=parameter['bjbva_url'], resp = requests.post(url=parameter['bjbva_url'],
data=json.dumps(params), data=json.dumps(params),
......
...@@ -22,6 +22,7 @@ from .bjb_qris import (BJBQRIS, cekqris, calculate_tagihan, rpc_params as rpc_qr ...@@ -22,6 +22,7 @@ from .bjb_qris import (BJBQRIS, cekqris, calculate_tagihan, rpc_params as rpc_qr
from .bjb_va import (BJBVA, cekva, calculate_tagihan, rpc_params as rpc_va) from .bjb_va import (BJBVA, cekva, calculate_tagihan, rpc_params as rpc_va)
import logging import logging
log = logging.getLogger('RPC ESIPKD') log = logging.getLogger('RPC ESIPKD')
from time import sleep
########################################################################### ###########################################################################
...@@ -284,6 +285,7 @@ def create_qris(request, data): ...@@ -284,6 +285,7 @@ def create_qris(request, data):
:return: :return:
- -
""" """
sleep(0.75)
auth_from_rpc(request) auth_from_rpc(request)
get_mandatory(data, ['kd_bayar','unit_kode']) get_mandatory(data, ['kd_bayar','unit_kode'])
...@@ -328,9 +330,9 @@ def create_qris(request, data): ...@@ -328,9 +330,9 @@ def create_qris(request, data):
pokok, denda = calculate_tagihan(dict(pokok=row.jumlah,jatuh_tempo=row.jatuh_tempo)) pokok, denda = calculate_tagihan(dict(pokok=row.jumlah,jatuh_tempo=row.jatuh_tempo))
if row.jatuh_tempo < date.today(): if row.jatuh_tempo < date.today():
jatuh_tempo = ymdhms(datetime.combine(date.today(),time(23,59,59))) jatuh_tempo = ymdhms(datetime.combine(date.today(),time(23,55,00)))
else: else:
jatuh_tempo = ymdhms(datetime.combine(row.jatuh_tempo,time(23,59,59))) jatuh_tempo = ymdhms(datetime.combine(row.jatuh_tempo,time(23,55,00)))
expired_date = jatuh_tempo expired_date = jatuh_tempo
dt_qris = dict(client_type ="3", dt_qris = dict(client_type ="3",
...@@ -366,6 +368,7 @@ def create_va(request, data): ...@@ -366,6 +368,7 @@ def create_va(request, data):
:return: :return:
- -
""" """
sleep(0.75)
auth_from_rpc(request) auth_from_rpc(request)
get_mandatory(data, ['kd_bayar','unit_kode']) get_mandatory(data, ['kd_bayar','unit_kode'])
...@@ -410,9 +413,9 @@ def create_va(request, data): ...@@ -410,9 +413,9 @@ def create_va(request, data):
pokok, denda = calculate_tagihan(dict(pokok=row.jumlah,jatuh_tempo=row.jatuh_tempo)) pokok, denda = calculate_tagihan(dict(pokok=row.jumlah,jatuh_tempo=row.jatuh_tempo))
if row.jatuh_tempo < date.today(): if row.jatuh_tempo < date.today():
jatuh_tempo = ymdhms(datetime.combine(date.today(),time(23,59,59))) jatuh_tempo = ymdhms(datetime.combine(date.today(),time(23,55,00)))
else: else:
jatuh_tempo = ymdhms(datetime.combine(row.jatuh_tempo,time(23,59,59))) jatuh_tempo = ymdhms(datetime.combine(row.jatuh_tempo,time(23,55,00)))
expired_date = jatuh_tempo expired_date = jatuh_tempo
dt_va = dict(client_type ="3", dt_va = dict(client_type ="3",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!