Merge branch 'master' of http://git.opensipkd.com/pasar/api-merchant

src/agratek/api/merchant/views/vsi/pln_pre.py

@@ -58,7 +58,11 @@ class Vendor(VendorClass):
         power = "tarifdaya" in data and data["tarifdaya"].split("/") or [""]
         power = "tarifdaya" in data and data["tarifdaya"].split("/") or [""]
         power = len(power)>1 and power[-1:][0] or power[0]
         power = len(power)>1 and power[-1:][0] or power[0]
         product_id = self.invoice_det.produk.id
         product_id = self.invoice_det.produk.id
+        if hasattr(self.invoice_det,"customer_id"):
+            partner_id = self.invoice_det.customer_id
+        else:
             partner_id = self.invoice_det.h2h_ar_invoice.customer_id
             partner_id = self.invoice_det.h2h_ar_invoice.customer_id
+
         discount = PartnerProduk.get_discount(partner_id, product_id)
         discount = PartnerProduk.get_discount(partner_id, product_id)
         admin = self.vendor_produk.produk.harga
         admin = self.vendor_produk.produk.harga
         harga = "nominal" in data and data["nominal"] or 0
         harga = "nominal" in data and data["nominal"] or 0
@@ -80,7 +84,8 @@ class Vendor(VendorClass):
                 message = "GAGAL"
                 message = "GAGAL"
             else:
             else:
                 message = "PENDING"
                 message = "PENDING"
-
+            return dict(code=code,
+                        message=message)
 
 
         return {
         return {
             "code": code,
             "code": code,
@@ -129,15 +134,18 @@ class Vendor(VendorClass):
                 data = dict(message=resp.text,
                 data = dict(message=resp.text,
                             code=resp.status_code)
                             code=resp.status_code)
             self.response = data
             self.response = data
-            log.info("REsponse: %s" % data )
+            log.info("Response: %s" % data )
         except requests.exceptions.RequestException as e:
         except requests.exceptions.RequestException as e:
             data = dict(message = e.strerror,
             data = dict(message = e.strerror,
                         code = e.errno)
                         code = e.errno)
-            return self.save_result(data)
+            return self.set_failed()
 
 
 
 
         data = self.pars_data(data)
         data = self.pars_data(data)
-        return self.save_result(data)
+        if data["code"]!=0:
+            return self.set_failed()
+
+        return self.set_success(data)
 
 
     def payment(self):
     def payment(self):
         params = self.get_params(cmd='PAY', modul='PRE')
         params = self.get_params(cmd='PAY', modul='PRE')
@@ -188,6 +196,8 @@ class Vendor(VendorClass):
                         message="No Response From Biller")
                         message="No Response From Biller")
 
 
         data = self.pars_data(data)
         data = self.pars_data(data)
+        if data["code"] != 0:
+            return self.set_failed()
+
         self.result = data
         self.result = data
-        self.save_log('advice')
-        return data
+        return self.set_success(data)