reversal

1 parent 5f373ebe
...@@ -354,35 +354,35 @@ class Doc(Transaction): ...@@ -354,35 +354,35 @@ class Doc(Transaction):
# todo: save payment # todo: save payment
# #
channel_id = self.from_iso.get_channel_id() #channel_id = self.from_iso.get_channel_id()
ntb = self.from_iso.get_ntb() #ntb = self.from_iso.get_ntb()
total_bayar = self.from_iso.get_amount() #total_bayar = self.from_iso.get_amount()
pay = models.IsoPayment() #pay = models.IsoPayment()
pay.ntb = ntb #pay.ntb = ntb
pay.ntp = ntpd #pay.ntp = ntpd
pay.invoice_no = self.invoice_id_raw[:16].strip() #pay.invoice_no = self.invoice_id_raw[:16].strip()
pay.nik = self.invoice_id_raw[16:32].strip() #pay.nik = self.invoice_id_raw[16:32].strip()
# pay.tgl_bayar = self.from_iso.get_transaction_date() ## pay.tgl_bayar = self.from_iso.get_transaction_date()
pay.amount = total_bayar #pay.amount = total_bayar
pay.channel_id = channel_id #pay.channel_id = channel_id
pay.channel_nm = self.from_iso.getBit(43) #pay.channel_nm = self.from_iso.getBit(43)
pay.bank_ip = self.get_bank_ip() #pay.bank_ip = self.get_bank_ip()
pay.biller_id = self.mod_conf['kd_biller'] #pay.biller_id = self.mod_conf['kd_biller']
# todo: mustbe transaction_date_time ## todo: mustbe transaction_date_time
pay.tgl = self.from_iso.get_transaction_date() #pay.tgl = self.from_iso.get_transaction_date()
if 'id' in self.mod_conf: #if 'id' in self.mod_conf:
pay.bank_id = self.mod_conf.get('id') # pay.bank_id = self.mod_conf.get('id')
else: #else:
pay.bank_id = int(self.from_iso.get_value(32)) # pay.bank_id = int(self.from_iso.get_value(32))
# pay.iso_request = self.from_iso.raw.upper() ## pay.iso_request = self.from_iso.raw.upper()
# pay.transmission = self.from_iso.get_transmission_datetime() ## pay.transmission = self.from_iso.get_transmission_datetime()
# pay.stan = self.from_iso.get_value(11) ## pay.stan = self.from_iso.get_value(11)
# pay.kd_wil = self.invoice_profile['Kode Wilayah'] ## pay.kd_wil = self.invoice_profile['Kode Wilayah']
# pay.settlement = self.from_iso.get_settlement_date() ## pay.settlement = self.from_iso.get_settlement_date()
# pay.bit_inv_profile = self.from_iso.get_invoice_id_raw() ## pay.bit_inv_profile = self.from_iso.get_invoice_id_raw()
self.db_profile.commit(pay) #self.db_profile.commit(pay)
self.ack() self.ack()
############ ############
...@@ -438,21 +438,22 @@ class Doc(Transaction): ...@@ -438,21 +438,22 @@ class Doc(Transaction):
def reversal_response_(self): def reversal_response_(self):
self.invoice_id_raw = self.from_iso.get_invoice_id_raw()[:16] self.invoice_id_raw = self.from_iso.get_invoice_id_raw()[:16]
ntb = self.from_iso.get_ntb() ntb = self.from_iso.get_ntb()
q = self.db_profile.query(models.IsoPayment).filter_by( pay = None
invoice_no=self.invoice_id_raw[:16].strip(), #q = self.db_profile.query(models.IsoPayment).filter_by(
# nik=self.invoice_id_raw[16:].strip(), # invoice_no=self.invoice_id_raw[:16].strip(),
ntb=ntb) # # nik=self.invoice_id_raw[16:].strip(),
# ntb=ntb)
pay = q.first() # pay = q.first()
if not pay: # if not pay:
return self.ack_payment_not_found() # return self.ack_payment_not_found()
# self.invoice_id_raw = ''.join([self.invoice_profile['Nomor Bayar'].strip(), # self.invoice_id_raw = ''.join([self.invoice_profile['Nomor Bayar'].strip(),
# self.invoice_profile['Nomor Identitas'].strip()]) # self.invoice_profile['Nomor Identitas'].strip()])
q = self.db_profile.query(models.IsoReversal).filter_by(id=pay.id) #q = self.db_profile.query(models.IsoReversal).filter_by(id=pay.id)
rev = q.first() #rev = q.first()
if rev: #if rev:
return self.ack_reversal_done() # return self.ack_reversal_done()
result = self.execute_reversal() result = self.execute_reversal()
...@@ -473,14 +474,14 @@ class Doc(Transaction): ...@@ -473,14 +474,14 @@ class Doc(Transaction):
f.close() f.close()
def save_reversal(self, pay, ntpd): def save_reversal(self, pay, ntpd):
rev = models.IsoReversal() #rev = models.IsoReversal()
rev.id = pay.id #rev.id = pay.id
# rev.iso_request = self.from_iso.raw.upper() # rev.iso_request = self.from_iso.raw.upper()
# todo: seharusnya trnsaction_date_time # todo: seharusnya trnsaction_date_time
rev.tgl = self.from_iso.get_transaction_date() #rev.tgl = self.from_iso.get_transaction_date()
rev.ntp = ntpd #rev.ntp = ntpd
self.db_profile.commit(rev) #self.db_profile.commit(rev)
self.ack() self.ack()
################### ###################
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!