pln

src/agratek/api/merchant/views/odeo.py

@@ -252,14 +252,17 @@ class Vendor(VendorClass):
             result['total'] = data["total"]
         if "tarif" in data and data["tariff"]:
             result['tarif'] = data["tariff"]
+
+        rincian = {}
         if "number" in data:
-            result['no_meter'] = data["number"]
+            rincian['no_meter'] = data["number"]
         if "power" in data:
-            result['daya'] = data["power"]
+            rincian['daya'] = data["power"]
 
         inquiries = 'inquiries' in data and data['inquiries'] \
                 or 'inquiry' in data and data['inquiry'] or {}
         if not inquiries:
+            result["rincian"] = rincian
             return result
         
         if self.v_produk_kd=="PLNPASCA" or self.v_produk_kd[:3]=="PAM":
@@ -278,11 +281,11 @@ class Vendor(VendorClass):
                 if "meter_changes" in inq:
                     meter += inq["meter_changes"]
 
-            result["pokok"] = pokok
-            result["denda"] = denda
-            result["admin"] = admin
-            result["period"] = period
-            result["jml_bulan"] = jml_period
+            rincian["pokok"] = pokok
+            rincian["denda"] = denda
+            rincian["admin"] = admin
+            rincian["period"] = period
+            rincian["jml_bulan"] = jml_period
             if meter:
                 result["meter"] = meter
 
@@ -299,85 +302,86 @@ class Vendor(VendorClass):
                 #     result['daya'] = data["power"]
                 #
                 if "base_price" in inquiries:
-                    if "pokok" in result:
-                        result['pokok'] += inquiries["base_price"]
+                    if "pokok" in rincian:
+                        rincian['pokok'] += inquiries["base_price"]
                     else:
-                        result['pokok'] = inquiries["base_price"]
+                        rincian['pokok'] = inquiries["base_price"]
 
                 if "fine" in inquiries:
-                    if "denda" in result:
-                        result['denda'] += inquiries["fine"]
+                    if "denda" in rincian:
+                        rincian['denda'] += inquiries["fine"]
                     else:
-                        result['denda'] = inquiries["fine"]
+                        rincian['denda'] = inquiries["fine"]
 
                 if "coll_fee" in inquiries:
-                    if "coll_fee" in result:
-                        result['coll_fee'] += inquiries["coll_fee"]
+                    if "coll_fee" in rincian:
+                        rincian['coll_fee'] += inquiries["coll_fee"]
                     else:
-                        result['coll_fee'] = inquiries["coll_fee"]
+                        rincian['coll_fee'] = inquiries["coll_fee"]
 
                 if "bill_rest" in inquiries:
-                    if "restitusi" in result:
-                        result['restitusi'] += inquiries["bill_rest"]
+                    if "restitusi" in rincian:
+                        rincian['restitusi'] += inquiries["bill_rest"]
                     else:
-                        result['restitusi'] = inquiries["bill_rest"]
+                        rincian['restitusi'] = inquiries["bill_rest"]
 
                 if "admin" in inquiries:
-                    if "admin" in result:
-                        result['admin'] += inquiries["admin"]
+                    if "admin" in rincian:
+                        rincian['admin'] += inquiries["admin"]
                     else:
-                        result['admin'] = inquiries["admin"]
+                        rincian['admin'] = inquiries["admin"]
 
                 if "admin_fee" in inquiries:
-                    if "admin" in result:
-                        result['admin'] += inquiries["admin_fee"]
+                    if "admin" in rincian:
+                        rincian['admin'] += inquiries["admin_fee"]
                     else:
-                        result['admin'] = inquiries["admin_fee"]
+                        rincian['admin'] = inquiries["admin_fee"]
 
                 if "period" in inquiries:
-                    if "period" in result:
-                        result['period'] += " " + inquiries["period"]
+                    if "period" in rincian:
+                        rincian['period'] += " " + inquiries["period"]
                     else:
-                        result['period'] = inquiries["period"]
+                        rincian['period'] = inquiries["period"]
 
                 if "meter_changes" in inquiries:
-                    if "meter" in result:
-                        result['meter'] += inquiries["meter_changes"]
+                    if "meter" in rincian:
+                        rincian['meter'] += inquiries["meter_changes"]
                     else:
-                        result['meter'] = inquiries["meter_changes"]
+                        rincian['meter'] = inquiries["meter_changes"]
 
                 if "usages" in inquiries:
-                    if "penggunaan" in result:
-                        result['penggunaan'] += inquiries["usages"]
+                    if "penggunaan" in rincian:
+                        rincian['penggunaan'] += inquiries["usages"]
                     else:
-                        result['penggunaan'] = inquiries["usages"]
+                        rincian['penggunaan'] = inquiries["usages"]
 
                 if "installment" in inquiries:
-                    if "periode" in result:
-                        result['periode'] += " "+inquiries["installment"]
+                    if "periode" in rincian:
+                        rincian['periode'] += " "+inquiries["installment"]
                     else:
-                        result['periode'] = inquiries["installment"]
+                        rincian['periode'] = inquiries["installment"]
 
                 if "due_date" in inquiries:
-                    if "jth_tempo" in result:
-                        result['jth_tempo'] += " "+inquiries["due_date"]
+                    if "jth_tempo" in rincian:
+                        rincian['jth_tempo'] += " "+inquiries["due_date"]
                     else:
-                        result['jth_tempo'] = inquiries["due_date"]
+                        rincian['jth_tempo'] = inquiries["due_date"]
 
                 if "branch_code" in inquiries:
-                    result['kd_cabang'] = inquiries["branch_code"]
+                    rincian['kd_cabang'] = inquiries["branch_code"]
 
                 if "branch_name" in inquiries:
-                    result['nm_cabang'] = inquiries["branch_name"]
+                    rincian['nm_cabang'] = inquiries["branch_name"]
 
                 if "month_counts" in inquiries:
-                    result['jml_bulan'] = inquiries["month_counts"]
+                    rincian['jml_bulan'] = inquiries["month_counts"]
 
                 if "participant_counts" in inquiries:
-                    result['anggota'] = inquiries["participant_counts"]
+                    rincian['anggota'] = inquiries["participant_counts"]
 
                 i+=1
 
             result['jml_data'] = i
+            result['rincian'] = rincian
 
         return result