update rpc qris, va

esipkd/views/rpc.py

@@ -300,7 +300,7 @@ def create_qris(request, data):
                customer_name=cekQr.customer_name,
                customer_email=cekQr.customer_email and cekQr.customer_email or '-',
                customer_phone=cekQr.customer_phone and cekQr.customer_phone or '-',
-               expired_date=ymdhms(datetime.combine(cekQr.expired_date,time(23,59,59))),
+               expired_date=ymdhms(datetime.combine(cekQr.expired_date,time(20,59,59))),
                amount=cekQr.amount,
                qrcode=cekQr.qrcode,
                qris_id=cekQr.va_number)
@@ -357,12 +357,14 @@ def create_qris(request, data):
             return dict(code=-1, message="Failed Create Qris {}".format(row_qris['error']['message']))
     except:
         pass
-    log.error(row_qris)
-    Qqris=DBSession.query(BJBQRIS).filter(BJBQRIS.invoice_no==data['kd_bayar']).first()
-    dt_qris['qrcode']=Qqris.qrcode
-    dt_qris['qris_id']=Qqris.va_number
     if row_qris:
-        return dict(code=0, message="Success Create Qris", data=dt_qris)
+        dt_qrisupdated = {}
+        for k,v in dt_qris.items():
+            dt_qrisupdated.update({k:getattr(row_qris,k,'')})
+        dt_qrisupdated.update({'qrcode':getattr(row_qris,'qrcode',''),
+                        'qris_id':getattr(row_qris,'va_number','')})
+        log.error(dt_qrisupdated)
+        return dict(code=0, message="Success Create Qris", data=dt_qrisupdated)
     else:
         return dict(code=-1, message="Failed Create Qris")
 
@@ -392,7 +394,7 @@ def create_va(request, data):
                customer_name=cekVa.customer_name,
                customer_email=cekVa.customer_email and cekVa.customer_email or '-',
                customer_phone=cekVa.customer_phone and cekVa.customer_phone or '-',
-               expired_date=ymdhms(datetime.combine(cekVa.expired_date,time(23,59,59))),
+               expired_date=ymdhms(datetime.combine(cekVa.expired_date,time(20,59,59))),
                amount=cekVa.amount,
                va_number=cekVa.va_number)
 
@@ -448,10 +450,12 @@ def create_va(request, data):
             return dict(code=-1, message="Failed Create Va {}".format(row_va['error']['message']))
     except:
         pass
-    log.error(row_va)
-    Qva=DBSession.query(BJBVA).filter(BJBVA.invoice_no==data['kd_bayar']).first()
-    dt_va['va_number']=Qva.va_number
     if row_va:
-        return dict(code=0, message="Success Create Va", data=dt_va)
+        dt_vaupdated = {}
+        for k,v in dt_va.items():
+            dt_vaupdated.update({k:getattr(row_va,k,'')})
+        dt_vaupdated.update({'va_number':getattr(row_va,'va_number','')})
+        log.error(dt_vaupdated)
+        return dict(code=0, message="Success Create Va", data=dt_vaupdated)
     else:
         return dict(code=-1, message="Failed Create Va")