live

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

@@ -47,9 +47,7 @@ class Vendor(VendorClass):
 
         if self.v_produk_kd[:3] =='PLN' and self.v_produk_kd != 'PLNPASCA':
             params = dict(
-                data=dict(
                     number=self.bill_no
-                )
             )
             self.request = params
             self.save_log("inquiry")
@@ -70,12 +68,17 @@ class Vendor(VendorClass):
 
         if resp.ok:
             self.status = 1  # sukses
-            result = json.loads(content)
+            result = content
             parsd = self.pars_data(result)
+
         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=resp.text)
+                         message=msg)
         else:
             self.status = -4
             parsd = dict(code=500,
@@ -104,7 +107,7 @@ class Vendor(VendorClass):
 
         if resp.ok:
             self.status = 1  # sukses
-            result = json.loads(content)
+            result = content
             parsd = self.pars_data(result)
         elif resp.status_code==400:
             self.status = -3
@@ -146,7 +149,7 @@ class Vendor(VendorClass):
         content = resp.text
         if resp.ok:
             self.status = 1  # sukses
-            result = json.loads(content)
+            result = content
             parsd = self.pars_data(result)
         elif resp.status_code==400:
             self.status = -3
@@ -205,15 +208,12 @@ class Vendor(VendorClass):
             result['total'] = data["total"]
         if "tariff" in data and data["tariff"]:
             result['tarif'] = data["tariff"]
-        if "number" in data and data["number"]:
-            result['no_meter'] = data["number"]
-        if "power" in data and data["power"]:
-            result['daya'] = data["power"]
 
-        if "inquiries" not in data:
+        inquiries = 'inquiries' in data and data['inquiries'] \
+                or 'inquiry' in data and data['inquiry'] or None
+        if not inquiries:
             return result
-
-        inquiries = data['inquiries']
+        
         if self.v_produk_kd=="PLNPASCA" or self.v_produk_kd[:3]=="PAM":
             pokok = denda = admin = 0
             period = meter = ""
@@ -236,6 +236,17 @@ class Vendor(VendorClass):
                 result["meter"] = meter
 
         else:
+            if "name" in inquiries:
+                result['nama'] = inquiries["name"]
+
+            if "tariff" in inquiries:
+                result['tarif'] = inquiries["tariff"]
+
+            if "number" in inquiries:
+                result['no_meter'] = inquiries["number"]
+            if "power" in inquiries:
+                result['daya'] = inquiries["power"]
+
             if "base_price" in inquiries:
                 result['pokok'] = inquiries["subscriber_id"]
             if "fine" in inquiries: