pars odeo

src/agratek/api/merchant/views/odeo.py

@@ -26,7 +26,6 @@ class Vendor(VendorClass):
         headers = {'Authorization': 'Bearer {key}'.format(key=self.auth)}
         data = json.dumps(params)
         self.url = url and self.url + url or self.url
-        resp = None
         with requests.session():
             resp = requests.post(self.url, data=data,
                                  verify=False, headers=headers)
@@ -62,29 +61,25 @@ class Vendor(VendorClass):
             resp = self.request_get(params, '/postpaid/inquiry')
 
         try:
-            content = json.loads(resp.text)
+            result = json.loads(resp.text)
         except:
-            content = resp.text
+            result = resp.text
 
         if resp.ok:
             self.status = 1  # sukses
-            result = content
-            parsd = self.pars_data(result)
+            data = "data" in result and result["data"] or None
+            parsd = self.pars_data(data)
 
         elif resp.status_code == 400:
             self.status = -3
-            try:
-                msg = json.loads(resp.text)
-            except:
-                msg = resp.text
             parsd = dict(code=resp.status_code,
-                         message=msg)
+                         message=result)
         else:
             self.status = -4
             parsd = dict(code=500,
                          message="Other Error")
 
-        self.response = content
+        self.response = result
         self.save_log('inquiry')
         return parsd
 
@@ -101,24 +96,28 @@ class Vendor(VendorClass):
         self.save_log("payment")
         resp = self.request_post(params, '/prepaid/purchase')
         try:
-            content = json.loads(resp.text)
+            result = json.loads(resp.text)
         except:
-            content = resp.text
+            result = resp.text
 
         if resp.ok:
             self.status = 1  # sukses
-            result = content
-            parsd = self.pars_data(result)
+            data = "data" in result and result["data"] or None
+            if data:
+                self.vend_trx = "order_id" in data and data["order_id"] or None
+
+            parsd = self.pars_data(data)
+
         elif resp.status_code==400:
             self.status = -3
             parsd = dict(code=resp.status_code,
-                           message=resp.text)
+                           message=result)
         else:
             self.status = -4
             parsd = dict(code=500,
                          message="Other Error")
 
-        self.response = content
+        self.response = result
         self.save_log('payment')
         return parsd
 
@@ -128,7 +127,6 @@ class Vendor(VendorClass):
                         message='Parameter tidak lengkap')
 
         if self.kategori == 'e-payment':
-
             order_id = self.partner_log.vend_trx
             url = '/order/{order_id}'.format(order_id=order_id)
             params = None
@@ -144,39 +142,38 @@ class Vendor(VendorClass):
             self.request = params
             self.save_log("advice")
             resp = self.request_get(params, '/prepaid/purchase-get')
-            content = None
+        try:
+            result = json.loads(resp.text)
+        except:
+            result = resp.text
 
-        content = resp.text
         if resp.ok:
             self.status = 1  # sukses
-            result = content
-            parsd = self.pars_data(result)
+            data = "data" in result and result["data"] or None
+            parsd = self.pars_data(data)
+
         elif resp.status_code==400:
             self.status = -3
-            result = dict(code=resp.status_code,
+            parsd = dict(code=resp.status_code,
                            message=resp.text)
         else:
             self.status = -4
             parsd = dict(code=500,
                          message="Other Error")
 
-        self.response = content
+        self.response = result
         self.save_log('advice')
         return parsd
 
-    def pars_data(self, params):
+    def pars_data(self, data):
         result = {}
         result["trx_id"] = self.partner_log_id
         result["bill_no"] = self.bill_no
         result["cust_trx"] = self.cust_trx
-        data = 'data' in params and params['data'] or None
+        result["vend_trx"] = self.vend_trx
         if not data:
             return result
 
-        if data:
-            self.vend_trx = 'order_id' in data and data['order_id'] \
-                            or self.partner_log_id
-
         if "rc" in data:
             if data["rc"] == "13":
                 self.status = -1
@@ -185,9 +182,6 @@ class Vendor(VendorClass):
             elif data["rc"] == "67":
                 self.status = -2  # Gagal Karena Pernah Transaksi
 
-        if "order_id" in data:
-            result["vend_trx"] = data["order_id"] or self.partner_log_id
-
         if "subscriber_id" in data and data["subscriber_id"]:
             result['nopel'] = data["subscriber_id"]