auto-push

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

@@ -306,30 +306,45 @@ def advice(request, data):
                 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' or "FAILED"
-
-                    r_prod.append(dict(denom=produk.kode,
-                                       id_pel=p.id_pel,
-                                       subtotal=(p.amt_sell or 0) + (p.discount or 0),
-                                       discount=p.discount or 0,
-                                       total=p.amt_sell,
-                                       status=status,
-                                       serial_number=p.serial_number or "", )
-                                  )
+                if "produk" in dat:
+                    prods = []
+                    for p in dat["produk"]:
+                        row = qry.join(Produk, Produk.id==H2hArInvoiceDet.produk_id)\
+                            .filter(Produk.kode==p["denom"],
+                                    H2hArInvoiceDet.id_pel==p["id_pel"]).first()
+                        if not row:
+                            status = "FAILED"
+                            message = "Produk tidak ada"
+                            p.update(dict(status=status,
+                                          message=message))
+                        else:
+                            status = row.status == -1 and 'PENDING' or row.status == 1 and 'SUCCESS' \
+                                     or row.status == -2 and 'PENDING' or "FAILED"
+                            p.update(dict(
+                                subtotal=(row.amt_sell or 0) + (row.discount or 0),
+                                discount=row.discount or 0,
+                                total=row.amt_sell,
+                                status=status,
+                                serial_number=row.serial_number or "", )
+                            )
+                        r_prod.append(p)
+                else:
+                    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' or "FAILED"
+
+                        r_prod.append(dict(denom=produk.kode,
+                                           id_pel=p.id_pel,
+                                           subtotal=(p.amt_sell or 0) + (p.discount or 0),
+                                           discount=p.discount or 0,
+                                           total=p.amt_sell,
+                                           status=status,
+                                           serial_number=p.serial_number or "", )
+                                      )
 
                 dat["produk"] = r_prod
             r_data.append(dat)