Skip to content

Kunto / backoffice

Go to a project
Commit d07dca9c by solo
Options

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

2 parents 3e4b42cd 37962b6d
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/agratek/api/merchant/views/vsi/pln_pre.py
...@@ -64,8 +64,8 @@ class Vendor(VendorClass): ...@@ -64,8 +64,8 @@ class Vendor(VendorClass):
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 = int(self.vendor_produk.produk.harga)
harga = "nominal" in data and data["nominal"] or 0 harga = int(self.v_produk_kd)
subtotal = harga + admin subtotal = harga + admin
token = "token" in data and data["token"] or "" token = "token" in data and data["token"] or ""
if "status" in data and data["status"] and data["status"] == "SUCCESS": if "status" in data and data["status"] and data["status"] == "SUCCESS":
...@@ -104,7 +104,7 @@ class Vendor(VendorClass): ...@@ -104,7 +104,7 @@ class Vendor(VendorClass):
"nopel": "idpel" in data and data["idpel"] or self.id_pel, "nopel": "idpel" in data and data["idpel"] or self.id_pel,
"nama": "nama" in data and data["nama"] or "NO-NAME", "nama": "nama" in data and data["nama"] or "NO-NAME",
"rincian":{ "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, "denda": "denda" in data and int(data["denda"]) or 0,
"admin": admin, "admin": admin,
"tarif": "tarifdaya" in data and data["tarifdaya"] or "", "tarif": "tarifdaya" in data and data["tarifdaya"] or "",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!