advice

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

@@ -187,11 +187,11 @@ def purchase(request, data, **kwargs):
     r_data = []
     log.info("%s Payment Request: %s" % (customer.kode, data))
     for dat in data:
-        if "inv_no" not in dat or "produk" not in dat or not dat["produk"]:
+        if "invoice_no" not in dat or "produk" not in dat or not dat["produk"]:
             dat["status"] = "FAILED"
             dat["message"] = "Parameter tidak lengkap"
         else:
-            inv_no = dat["inv_no"]
+            inv_no = dat["invoice_no"]
             produk = dat["produk"]
             # todo cek apakah invoice sudah ada atau belum
             ar_invoice = H2hArInvoice.query().filter_by(cust_inv_no=inv_no).first()
@@ -288,31 +288,47 @@ def advice(request, token, data):
     customer = Partner.query_user(user)
     r_data = []
     for dat in data:
-        cust_inv = dat["inv_no"]
-        partner_log = PartnerLog.query().filter(
-            PartnerLog.cust_inv == cust_inv
-        ).all()
-        r_prod = []
-        for p in partner_log:
-            produk = PartnerProduk.query(). \
-                filter(PartnerProduk.partner_id == p.vendor_id,
-                       PartnerProduk.produk_id == p.produk_id).first()
-
-            status = p.status == 0 and 'PENDING' or p.status == 1 and 'SUCCESS' \
-                     or p.status == 2 and 'FAILED'
-
-            r_prod.append(dict(denom=produk.kode,
-                               id_pel=partner_log["id_pel"],
-                               subtotal=partner_log["amt_sell"] + partner_log["discount"],
-                               discount=partner_log["discount"],
-                               total=partner_log["amt_sell"],
-                               status=status,
-                               serial_number=partner_log.serial_number, )
-                          )
-
-        dat["produk"] = r_prod
-        r_data.append(dat)
-        i += 1
+        if "inv_no" not in dat:
+            dat["status"] = "FAILED"
+            dat["message"] = "Parameter tidak lengkap"
+        else:
+            inv_no = dat["invoice_no"]
+            invoice = H2hArInvoice.query()\
+                .filter_by(cust_inv_no = inv_no,
+                           customer_id = customer.id).first()
+            if not invoice:
+                dat["status"] = "FAILED"
+                dat["message"] = "Invoice %s Tidak Ditemukan" % inv_no
+            else:
+                qry = H2hArInvoiceDet.query().filter_by(ar_invoice_id=invoice.id)
+                if "produk" in dat:
+                    # for p in dat["produk"]:
+                    #     prods.append(p["denom"])
+                    # invoice_det = produk.q
+                    pass
+                # else:
+                #     qry.filter(H2hArInvoiceDet.status!=1)
+
+                r_prod = []
+                for p in qry.all():
+                    produk = Produk.query(). \
+                        filter(Produk.id == p.produk_id).first()
+
+                    status = p.status == -1 and 'PENDING' or p.status == 1 and 'SUCCESS' \
+                             or p.status == -2 and 'PENDING'
+
+                    r_prod.append(dict(denom=produk.kode,
+                                       id_pel=p["id_pel"],
+                                       subtotal=p["amt_sell"] + p["discount"],
+                                       discount=p["discount"],
+                                       total=p["amt_sell"],
+                                       status=status,
+                                       serial_number=p.serial_number, )
+                                  )
+
+                dat["produk"] = r_prod
+            r_data.append(dat)
+            i += 1
 
     data = is_list and r_data or r_data[0]
     return data

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

@@ -49,7 +49,7 @@ class VendorClass(object):
         self.status = invoice_det and invoice_det.status or 0
 
         self.serial_number = invoice_det and hasattr(invoice_det, 'serial_number') \
-                            and invoice_det.serial_number or None
+                             and invoice_det.serial_number or None
         self.amt_buy = 0
 
     def save_log(self, typ):
@@ -75,20 +75,19 @@ class VendorClass(object):
         if self.amt_buy:
             self.invoice_det.amt_buy = self.amt_buy
 
-
         if typ == 'inquiry':
             self.invoice_det.inquiry = dict(request=self.request,
-                                 response=self.response)
+                                            response=self.response)
         elif typ == 'payment':
             self.invoice_det.payment = dict(request=self.request,
                                             response=self.response,
                                             result=self.result)
         elif typ == 'advice':
             self.invoice_det.advice = dict(request=self.request,
-                                response=self.response)
+                                           response=self.response)
         elif typ == 'info':
             self.invoice_det.info = dict(request=self.request,
-                            response=self.response)
+                                         response=self.response)
 
         flush_row(self.invoice_det)
 
@@ -123,7 +122,6 @@ class Other(object):
     #     cust_trx_id = cust_trx_id, row = row,
     #
 
-
     def get_product(self):
         pass
 
@@ -194,12 +192,14 @@ def proses_odeo(request):
             else:
                 order.status = -2
             order.notify = dict(post=data)
+            if "sn" in "data" and data["sn"]:
+                order.serial_number = data["sn"]
             flush_row(order)
-            #todo: add to customer notify table
-            #todo: create cron for notify
-            #proses jika status 1 notify ada isinya tapi belum ada field result
-            #todo: create cron torecurring order to other vendor
-            #jika status = -2 proses vendor yang lain
+            # todo: add to customer notify table
+            # todo: create cron for notify
+            # proses jika status 1 notify ada isinya tapi belum ada field result
+            # todo: create cron torecurring order to other vendor
+            # jika status = -2 proses vendor yang lain
             #
             # customer = Partner.query_id(order.customer_id).first()
             # if customer and customer.website: