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

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

@@ -64,8 +64,8 @@ class Vendor(VendorClass):
             partner_id = self.invoice_det.h2h_ar_invoice.customer_id
 
         discount = PartnerProduk.get_discount(partner_id, product_id)
-        admin = self.vendor_produk.produk.harga
-        harga = "nominal" in data and data["nominal"] or 0
+        admin = int(self.vendor_produk.produk.harga)
+        harga = int(self.v_produk_kd)
         subtotal = harga + admin
         token = "token" in data and data["token"] or ""
         if "status" in data and data["status"] and data["status"] == "SUCCESS":
@@ -104,7 +104,7 @@ class Vendor(VendorClass):
             "nopel": "idpel" in data and data["idpel"] or self.id_pel,
             "nama": "nama" in data and data["nama"] or "NO-NAME",
             "rincian":{
-                "pokok": "tagihan" in data and int(data["tagihan"]) or 0,
+                "pokok": int(self.v_produk_kd),
                 "denda": "denda" in data and int(data["denda"]) or 0,
                 "admin": admin,
                 "tarif": "tarifdaya" in data and data["tarifdaya"] or "",