pln

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

@@ -236,6 +236,10 @@ 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"]
+        if "number" in data:
+            result['no_meter'] = data["number"]
+        if "power" in data:
+            result['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 {}
@@ -269,49 +273,89 @@ class Vendor(VendorClass):
         else:
         else:
             inquirieses = type(inquiries) is list and inquiries or [inquiries]
             inquirieses = type(inquiries) is list and inquiries or [inquiries]
             for inquiries in inquirieses:
             for inquiries in inquirieses:
-                if "name" in inquiries:
-                    result['nama'] = inquiries["name"]
-
-                if "tariff" in inquiries:
-                    result['tarif'] = inquiries["tariff"]
-
-                if "number" in inquiries:
-                    result['no_meter'] = inquiries["number"]
-                if "power" in inquiries:
-                    result['daya'] = inquiries["power"]
-
+                # if "name" in inquiries:
+                #     result['nama'] = inquiries["name"]
+                #
+                # if "tariff" in inquiries:
+                #     result['tarif'] = inquiries["tariff"]
+                # if "power" in data:
+                #     result['daya'] = data["power"]
+                #
                 if "base_price" in inquiries:
                 if "base_price" in inquiries:
-                    result['pokok'] = inquiries["subscriber_id"]
+                    if "pokok" in result:
+                        result['pokok'] += inquiries["base_price"]
+                    else:
+                        result['pokok'] = inquiries["base_price"]
+
                 if "fine" in inquiries:
                 if "fine" in inquiries:
-                    result['denda'] = inquiries["fine"]
+                    if "denda" in result:
+                        result['denda'] += inquiries["fine"]
+                    else:
+                        result['denda'] = inquiries["fine"]
+
                 if "coll_fee" in inquiries:
                 if "coll_fee" in inquiries:
-                    result['coll_fee'] = inquiries["coll_fee"]
+                    if "coll_fee" in result:
+                        result['coll_fee'] += inquiries["coll_fee"]
+                    else:
+                        result['coll_fee'] = inquiries["coll_fee"]
+
                 if "bill_rest" in inquiries:
                 if "bill_rest" in inquiries:
-                    result['restitusi'] = inquiries["bill_rest"]
-                if "coll_fee" in inquiries:
-                    result['coll_fee'] = inquiries["coll_fee"]
+                    if "restitusi" in result:
+                        result['restitusi'] += inquiries["bill_rest"]
+                    else:
+                        result['restitusi'] = inquiries["bill_rest"]
+
                 if "admin" in inquiries:
                 if "admin" in inquiries:
-                    result['admin'] = inquiries["admin"]
+                    if "admin" in result:
+                        result['admin'] += inquiries["admin"]
+                    else:
+                        result['admin'] = inquiries["admin"]
+
                 if "admin_fee" in inquiries:
                 if "admin_fee" in inquiries:
-                    result['admin'] = inquiries["admin_fee"]
+                    if "admin" in result:
+                        result['admin'] += inquiries["admin_fee"]
+                    else:
+                        result['admin'] = inquiries["admin_fee"]
+
                 if "period" in inquiries:
                 if "period" in inquiries:
-                    result['period'] = inquiries["period"]
-                if "admin_fee" in inquiries:
-                    result['admin'] = inquiries["admin_fee"]
+                    if "period" in result:
+                        result['period'] += " " + inquiries["period"]
+                    else:
+                        result['period'] = inquiries["period"]
+
                 if "meter_changes" in inquiries:
                 if "meter_changes" in inquiries:
-                    result['meter'] = inquiries["meter_changes"]
+                    if "meter" in result:
+                        result['meter'] += inquiries["meter_changes"]
+                    else:
+                        result['meter'] = inquiries["meter_changes"]
+
                 if "usages" in inquiries:
                 if "usages" in inquiries:
-                    result['penggunaan'] = inquiries["usages"]
+                    if "penggunaan" in result:
+                        result['penggunaan'] += inquiries["usages"]
+                    else:
+                        result['penggunaan'] = inquiries["usages"]
+
                 if "installment" in inquiries:
                 if "installment" in inquiries:
-                    result['periode'] = inquiries["installment"]
+                    if "periode" in result:
+                        result['periode'] += " "+inquiries["installment"]
+                    else:
+                        result['periode'] = inquiries["installment"]
+
                 if "due_date" in inquiries:
                 if "due_date" in inquiries:
-                    result['jth_tempo'] = inquiries["due_date"]
+                    if "jth_tempo" in result:
+                        result['jth_tempo'] += " "+inquiries["due_date"]
+                    else:
+                        result['jth_tempo'] = inquiries["due_date"]
+
                 if "branch_code" in inquiries:
                 if "branch_code" in inquiries:
                     result['kd_cabang'] = inquiries["branch_code"]
                     result['kd_cabang'] = inquiries["branch_code"]
+
                 if "branch_name" in inquiries:
                 if "branch_name" in inquiries:
                     result['nm_cabang'] = inquiries["branch_name"]
                     result['nm_cabang'] = inquiries["branch_name"]
+
                 if "month_counts" in inquiries:
                 if "month_counts" in inquiries:
                     result['jml_bulan'] = inquiries["month_counts"]
                     result['jml_bulan'] = inquiries["month_counts"]
+
                 if "participant_counts" in inquiries:
                 if "participant_counts" in inquiries:
                     result['anggota'] = inquiries["participant_counts"]
                     result['anggota'] = inquiries["participant_counts"]