Merge branch 'master' of http://git.opensipkd.com/pasar/api-merchant

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

@@ -40,6 +40,7 @@ def build_request(typ, vendor_produk, partner_log=None):
         result["f_response"] = cls_module.response
         result["f_result"] = cls_module.result
         result["f_request"] = cls_module.request
+        result["id"] =cls_module.trx_id
     else:
         log.info("Module %s Not Found" % vendor_produk.modules)
         data = dict(message='Fungsi %s tidak ada' % typ,

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

@@ -54,6 +54,7 @@ class VendorClass(object):
         self.amt_buy = 0
         self.amt_sell = 0
         self.discount = 0
+        self.trx_id = 0
         
     def set_response(self, data=None, message=None, code=999, typ="inquiry"):
         if not data and message:

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

@@ -135,9 +135,9 @@ $(document).ready(function(){
 """)
 
 
-def query_id(request):
-    id = request.matchdict['id']
-    return PartnerLog.query_id(id)
+def query_id(id):
+    #id = request.matchdict['id']
+    return H2hArInvoiceDet.query_id(id)
 
 
 def save_ar_invoice(values, vendor_produk):
@@ -198,15 +198,15 @@ class ViewHome(BaseView):
                 return dict(form=form, params=form_params_view)
 
             if 'inquiry' in request.POST:
-                partner_log = save_partner_log(values, vendor_produk)
-                result = build_request('inquiry', vendor_produk, partner_log)
+                invoice_det = save_partner_log(values, vendor_produk)
+                result = build_request('inquiry', vendor_produk, invoice_det)
 
             elif 'purchase' in request.POST:
                 invoice_det = save_ar_invoice(values, vendor_produk)
                 result = build_request('payment', vendor_produk, invoice_det)
 
             elif 'advice' in request.POST:
-                invoice_det = save_ar_invoice(values, vendor_produk)
+                invoice_det = query_id(id)
                 result = build_request('advice', vendor_produk, invoice_det)
 
             elif 'register' in request.POST:
@@ -217,6 +217,7 @@ class ViewHome(BaseView):
 
             if result:
                 values.update(result)
+                values["id"] = invoice_det.id
                 if result["f_result"]["code"] == 0:
                     session.flash(result["f_result"]["message"])
                 else:
@@ -224,6 +225,8 @@ class ViewHome(BaseView):
             else:
                 session.flash("No Result Found", "error")
 
+            get_form(request, EditSchema, (btn_inquiry, btn_purchase,
+                                          btn_payment, btn_advice, btn_next))
             form.render(values)
             return dict(form=form, params=form_params_view)
         values = dict(