Commit fbbcce8b by Solo Group

auto-push

1 parent 572de817
...@@ -125,12 +125,19 @@ def inquiry(request, data, **kwargs): ...@@ -125,12 +125,19 @@ def inquiry(request, data, **kwargs):
result = build_request('inquiry', vendor_produk, partner_log) result = build_request('inquiry', vendor_produk, partner_log)
if result["code"] == 0: if result["code"] == 0:
prod.update(result) prod.update(result)
discount = result["discount"] - result["jml_data"] * vendor_produk.produk.harga
prod.update(dict( # rincian = "rincian" in result and result["rincian"] or []
subtotal=result["subtotal"], # if rincian:
discount=discount, # pokok = "pokok" in rincian and rincian["pokok"] or 0
total=result["subtotal"] - discount)) # admin = result["jml_data"]*vendor_produk.produk.harga
# subtotal = pokok+admin
#
# discount = result["discount"] - result["jml_data"] * vendor_produk.produk.harga
# prod.update(dict(
# subtotal=result["subtotal"],
# discount=discount,
# total=result["subtotal"] - discount))
else: else:
prod.update(dict(status="FAILED", prod.update(dict(status="FAILED",
message=result["message"])) message=result["message"]))
......
...@@ -378,7 +378,12 @@ class Vendor(VendorClass): ...@@ -378,7 +378,12 @@ class Vendor(VendorClass):
rincian['anggota'] = inquiries["participant_counts"] rincian['anggota'] = inquiries["participant_counts"]
i += 1 i += 1
self.amt_buy = result["total"]
jual = self.vendor_produk.produk.harga*i
self.discount = rincian["admin"] - jual
self.amt_sell = rincian["subtotal"] - self.discount
result["discount"] = self.discount
result["total"] = self.amt_sell
result['jml_data'] = i result['jml_data'] = i
result['rincian'] = rincian result['rincian'] = rincian
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!