update dummy

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

@@ -9,7 +9,7 @@ from opensipkd.pasar.models import PartnerProduk, H2hArInvoiceDet
 
 from ..vendor import VendorClass
 
-from .dummy import Lolable
+from .dummy import Lolable, kirim_notify
 
 import logging
 
@@ -25,6 +25,9 @@ timeout = 30
 class Vendor(VendorClass):
     def __init__(self, vendor_produk, invoice_det):
         VendorClass.__init__(self, vendor_produk, invoice_det=invoice_det)
+
+        print('masuk vendor odeo >>')
+
         # id_pel, customer_id, cust_trx, row
         settings = get_settings()
         self.mid = 'odeo_mid' in settings and settings['odeo_mid'] or None
@@ -40,6 +43,7 @@ class Vendor(VendorClass):
         return url and self.url + url or self.url
 
     def _inquiry(self):
+        print('masuk inquiry odeo>>>')
         if self.v_produk_kd[:3] == 'PLN' and self.v_produk_kd != 'PLNPASCA':
             params = dict(
                 number=self.id_pel,
@@ -57,12 +61,30 @@ class Vendor(VendorClass):
         log.info("Inquiry Request: url: %s params %s" % (url, params))
         self.save_log("inquiry")
 
-        try:
-            resp = requests.get(url, params=params, verify=False,
-                                headers=self.get_headers())
-        except Exception as e:
-            log.info(e)
-            return
+        # try:
+        #     lolable = Lolable(self.vendor_produk, self.invoice_det)
+        #     # resp = lolable.stupeed(json.dumps(params))
+
+        #     resp = lolable.inquat(json.dumps(params))
+
+        #     print('resp_inquat >>')
+        #     print(resp_dummy)
+
+        #     # resp = requests.get(url, params=params, verify=False,
+        #     #                     headers=self.get_headers())
+        # except Exception as e:
+        #     log.info(e)
+        #     print('error lolable >>')
+        #     print(e)
+        #     return
+
+        lolable = Lolable(self.vendor_produk, self.invoice_det)
+
+        resp = lolable.inquat(json.dumps(params))
+
+        print('resp_inquat >>')
+        print(resp)
+
         return resp
 
     def inquiry(self):
@@ -107,7 +129,10 @@ class Vendor(VendorClass):
     def payment(self):
         # Jika kategory bukan e-pulsa Call Inquiry First
         parsd = None
+        print('masuk payment odeo >>')
         if self.vendor_produk.produk.kategori.kode != "e-pulsa":
+            print('bukan kategori odeo e-pulsa >>')
+
             resp = self._inquiry()
             if resp is None or not resp.text:
                 log.info("Resp Tidak Ada, {}".format(resp))
@@ -139,8 +164,9 @@ class Vendor(VendorClass):
                 return self.set_pending(typ="inquiry")
 
             if not parsd:
-                return self.set_pending(typ="inquiru")
+                return self.set_pending(typ="inquiry")
 
+        print('kategori odeo e-pulsa >>')
         params = dict(
             data=dict(
                 denom=self.v_produk_kd,
@@ -158,16 +184,10 @@ class Vendor(VendorClass):
             # resp = requests.post(url, data=json.dumps(params), verify=False,
                                  # headers=self.get_headers(), timeout=timeout)
 
-
-            lolable = Lolable(self.vendor_produk.produk.kategori.kode)
+            lolable = Lolable(self.vendor_produk, self.invoice_det)
             resp = lolable.stupeed(json.dumps(params))
-
-            print('resp_dummy.text >>')
-            print(resp_dummy.text)
-
-            print('resp_beneran.text >>')
-            print(resp.text)
-        except:
+        except Exception as e:
+            print(e)
             resp = None
 
         if resp is None or not resp.text:
@@ -203,8 +223,11 @@ class Vendor(VendorClass):
                 elif data["rc"] == "68":  # Pending
                     return self.set_pending(parsd, typ="payment")
             else:
-                self.serial_number = 'serial_number' in data and data["serial_numner"] \
+                self.serial_number = 'serial_number' in data and data["serial_number"] \
                                      or self.serial_number
+
+            kirim_notify(self.invoice_det.h2h_ar_invoice.cust_inv_no)
+            
             return self.set_success(parsd, typ="payment")
         elif resp.status_code == 400:
             data = "data" in result and result["data"] or None
@@ -279,6 +302,8 @@ class Vendor(VendorClass):
 
     def pars_data(self, data):
         result = dict()
+        print('pars_data, data >>')
+        print(data)
         if not data:
             return result
 

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

@@ -187,7 +187,10 @@ class Result(object):
     def __init__(self, values, **kwargs):
         self.values = values
         if "rincian" in values:
-            discount = int(self.values["discount"])
+            discount = 'discount' in self.values and self.values['discount'] or '0' 
+            discount = int(discount)
+            print ("======================>>>>>>>>>>>>")
+            print (values["rincian"])
             subtotal = int(values["rincian"]["total"])
             self.values["subtotal"] = subtotal
             self.values["discount"] = discount