live

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

@@ -218,26 +218,32 @@ def callback_merchant(order):
                  or order.status > -2 and "FAILED" \
                  or order.status > -2 and "FAILED" \
                  or "PENDING"
                  or "PENDING"
         key = invoice.cust_inv_no + users.user_name + users.api_key + status
         key = invoice.cust_inv_no + users.user_name + users.api_key + status
-        signature = sha256(key.encode()).decode()
-        data = produk = []
+        signature = sha256(key)
+        data = []
+        produk = []
         dat = dict(
         dat = dict(
             invoice_no=invoice.cust_inv_no,
             invoice_no=invoice.cust_inv_no,
             signature=signature)
             signature=signature)
+
+        discount = order.discount and order.discount or 0
         produk.append(dict(
         produk.append(dict(
             denom=order.produk.kode,
             denom=order.produk.kode,
             id_pel=order.id_pel,
             id_pel=order.id_pel,
-            subtotal=order.amt_sell + order.discount,
-            discount=order.discount,
+            subtotal=order.amt_sell + discount,
+            discount=discount,
             total=order.amt_sell,
             total=order.amt_sell,
             status=status,
             status=status,
             serial_number=order.serial_number
             serial_number=order.serial_number
         ))
         ))
         dat.update(produk=produk)
         dat.update(produk=produk)
         data.append(dat)
         data.append(dat)
-        js = get_jsonrpc(method="notify", params=data)
+        js = get_jsonrpc(method="notify", params=dict(data=data))
         log.info("Notify: %s %s" %(url, js))
         log.info("Notify: %s %s" %(url, js))
+        try:
             with requests.session():
             with requests.session():
-            requests.post(url, data=data, timeout=15)
+                requests.post(url, data=data, timeout=10)
+        except:
+            pass
 
 
 
 
 @view_config(route_name='api-vendor-notify', renderer='json')
 @view_config(route_name='api-vendor-notify', renderer='json')