Commit 828f31b3 by Solo Group

pln

1 parent a0946b8c
...@@ -252,14 +252,17 @@ class Vendor(VendorClass): ...@@ -252,14 +252,17 @@ class Vendor(VendorClass):
result['total'] = data["total"] result['total'] = data["total"]
if "tarif" in data and data["tariff"]: if "tarif" in data and data["tariff"]:
result['tarif'] = data["tariff"] result['tarif'] = data["tariff"]
rincian = {}
if "number" in data: if "number" in data:
result['no_meter'] = data["number"] rincian['no_meter'] = data["number"]
if "power" in data: if "power" in data:
result['daya'] = data["power"] rincian['daya'] = data["power"]
inquiries = 'inquiries' in data and data['inquiries'] \ inquiries = 'inquiries' in data and data['inquiries'] \
or 'inquiry' in data and data['inquiry'] or {} or 'inquiry' in data and data['inquiry'] or {}
if not inquiries: if not inquiries:
result["rincian"] = rincian
return result return result
if self.v_produk_kd=="PLNPASCA" or self.v_produk_kd[:3]=="PAM": if self.v_produk_kd=="PLNPASCA" or self.v_produk_kd[:3]=="PAM":
...@@ -278,11 +281,11 @@ class Vendor(VendorClass): ...@@ -278,11 +281,11 @@ class Vendor(VendorClass):
if "meter_changes" in inq: if "meter_changes" in inq:
meter += inq["meter_changes"] meter += inq["meter_changes"]
result["pokok"] = pokok rincian["pokok"] = pokok
result["denda"] = denda rincian["denda"] = denda
result["admin"] = admin rincian["admin"] = admin
result["period"] = period rincian["period"] = period
result["jml_bulan"] = jml_period rincian["jml_bulan"] = jml_period
if meter: if meter:
result["meter"] = meter result["meter"] = meter
...@@ -299,85 +302,86 @@ class Vendor(VendorClass): ...@@ -299,85 +302,86 @@ class Vendor(VendorClass):
# result['daya'] = data["power"] # result['daya'] = data["power"]
# #
if "base_price" in inquiries: if "base_price" in inquiries:
if "pokok" in result: if "pokok" in rincian:
result['pokok'] += inquiries["base_price"] rincian['pokok'] += inquiries["base_price"]
else: else:
result['pokok'] = inquiries["base_price"] rincian['pokok'] = inquiries["base_price"]
if "fine" in inquiries: if "fine" in inquiries:
if "denda" in result: if "denda" in rincian:
result['denda'] += inquiries["fine"] rincian['denda'] += inquiries["fine"]
else: else:
result['denda'] = inquiries["fine"] rincian['denda'] = inquiries["fine"]
if "coll_fee" in inquiries: if "coll_fee" in inquiries:
if "coll_fee" in result: if "coll_fee" in rincian:
result['coll_fee'] += inquiries["coll_fee"] rincian['coll_fee'] += inquiries["coll_fee"]
else: else:
result['coll_fee'] = inquiries["coll_fee"] rincian['coll_fee'] = inquiries["coll_fee"]
if "bill_rest" in inquiries: if "bill_rest" in inquiries:
if "restitusi" in result: if "restitusi" in rincian:
result['restitusi'] += inquiries["bill_rest"] rincian['restitusi'] += inquiries["bill_rest"]
else: else:
result['restitusi'] = inquiries["bill_rest"] rincian['restitusi'] = inquiries["bill_rest"]
if "admin" in inquiries: if "admin" in inquiries:
if "admin" in result: if "admin" in rincian:
result['admin'] += inquiries["admin"] rincian['admin'] += inquiries["admin"]
else: else:
result['admin'] = inquiries["admin"] rincian['admin'] = inquiries["admin"]
if "admin_fee" in inquiries: if "admin_fee" in inquiries:
if "admin" in result: if "admin" in rincian:
result['admin'] += inquiries["admin_fee"] rincian['admin'] += inquiries["admin_fee"]
else: else:
result['admin'] = inquiries["admin_fee"] rincian['admin'] = inquiries["admin_fee"]
if "period" in inquiries: if "period" in inquiries:
if "period" in result: if "period" in rincian:
result['period'] += " " + inquiries["period"] rincian['period'] += " " + inquiries["period"]
else: else:
result['period'] = inquiries["period"] rincian['period'] = inquiries["period"]
if "meter_changes" in inquiries: if "meter_changes" in inquiries:
if "meter" in result: if "meter" in rincian:
result['meter'] += inquiries["meter_changes"] rincian['meter'] += inquiries["meter_changes"]
else: else:
result['meter'] = inquiries["meter_changes"] rincian['meter'] = inquiries["meter_changes"]
if "usages" in inquiries: if "usages" in inquiries:
if "penggunaan" in result: if "penggunaan" in rincian:
result['penggunaan'] += inquiries["usages"] rincian['penggunaan'] += inquiries["usages"]
else: else:
result['penggunaan'] = inquiries["usages"] rincian['penggunaan'] = inquiries["usages"]
if "installment" in inquiries: if "installment" in inquiries:
if "periode" in result: if "periode" in rincian:
result['periode'] += " "+inquiries["installment"] rincian['periode'] += " "+inquiries["installment"]
else: else:
result['periode'] = inquiries["installment"] rincian['periode'] = inquiries["installment"]
if "due_date" in inquiries: if "due_date" in inquiries:
if "jth_tempo" in result: if "jth_tempo" in rincian:
result['jth_tempo'] += " "+inquiries["due_date"] rincian['jth_tempo'] += " "+inquiries["due_date"]
else: else:
result['jth_tempo'] = inquiries["due_date"] rincian['jth_tempo'] = inquiries["due_date"]
if "branch_code" in inquiries: if "branch_code" in inquiries:
result['kd_cabang'] = inquiries["branch_code"] rincian['kd_cabang'] = inquiries["branch_code"]
if "branch_name" in inquiries: if "branch_name" in inquiries:
result['nm_cabang'] = inquiries["branch_name"] rincian['nm_cabang'] = inquiries["branch_name"]
if "month_counts" in inquiries: if "month_counts" in inquiries:
result['jml_bulan'] = inquiries["month_counts"] rincian['jml_bulan'] = inquiries["month_counts"]
if "participant_counts" in inquiries: if "participant_counts" in inquiries:
result['anggota'] = inquiries["participant_counts"] rincian['anggota'] = inquiries["participant_counts"]
i+=1 i+=1
result['jml_data'] = i result['jml_data'] = i
result['rincian'] = rincian
return result return result
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!