partner log

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

@@ -64,14 +64,33 @@ def build_request(typ, values):
     cls_module = modules.Vendor(vendor_product, bill_no, customer_id,
                                 cust_trx_id, row)
     if typ=='inquiry':
-        return cls_module.inquiry()
+        result = hasattr(cls_module, typ) and cls_module.inquiry() or None
+        if result:
+            result["f_request"] = cls_module.request
+            result["f_response"] = cls_module.response
+
+        return result
 
     elif typ=='payment':
-        return cls_module.payment()
+        result =  cls_module.payment()
+        if result:
+            result["f_request"] = cls_module.request
+            result["f_response"] = cls_module.response
+        return result
+
     elif typ == 'advice':
-        return hasattr(cls_module, typ) and cls_module.advice()
+        result = hasattr(cls_module, typ) and cls_module.advice() or None
+        if result :
+            result["f_request"] = cls_module.request
+            result["f_response"] = cls_module.response
+        return result
+
     elif typ == 'info':
-        return hasattr(cls_module, typ) and cls_module.info()
+        result = hasattr(cls_module, typ) and cls_module.info() or None
+        if result:
+            result["f_request"] = cls_module.request
+            result["f_response"] = cls_module.reesponse
+        return result
     else:
         return dict(error='Function %s tidak ditemukan' % typ)
 
@@ -100,30 +119,57 @@ class AddSchema(colander.Schema):
         oid="produk_id", widget=deferred_produk)
 
     destination = colander.SchemaNode(
-        colander.Integer(), title='No.Tujuan/ID Pelanggan',
+        colander.String(), title='No.Tujuan/ID Pelanggan',
         oid="destination", widget=widget.TextInputWidget())
 
     vendor_id = colander.SchemaNode(
         colander.Integer(), title='Vendor',
         oid="vendor_id", widget=deferred_vendor)
     trx_id = colander.SchemaNode(
-        colander.Integer(), title='TRX ID',
+        colander.String(), title='TRX ID',
         missing=colander.drop,
         oid="trx_id",
-        # widget=widget.HiddenWidget()
+        widget=widget.TextInputWidget(css_class="readonly")
     )
     ref_no = colander.SchemaNode(
         colander.String(), title='REF. NO',
         missing=colander.drop,
         oid="ref_no",
-        # widget=widget.HiddenWidget()
+        widget=widget.TextInputWidget(css_class="readonly")
+    )
+
+    vend_trx = colander.SchemaNode(
+        colander.String(), title='TRX Vendor',
+        missing=colander.drop,
+        oid="vend_trx",
+        widget=widget.TextInputWidget(css_class="readonly")
+    )
+    cust_trx = colander.SchemaNode(
+        colander.String(), title='TRX Customer',
+        missing=colander.drop,
+        oid="cust_trx",
+        widget=widget.TextInputWidget(css_class="readonly")
     )
 
-    result = colander.SchemaNode(
+    f_result = colander.SchemaNode(
         colander.String(), title='Result',
         missing=colander.drop,
         oid="result",
-        widget=widget.TextAreaWidget(rows=10)
+        widget=widget.TextAreaWidget(rows=10, css_class="readonly")
+    )
+
+    f_request = colander.SchemaNode(
+        colander.String(), title='Request',
+        missing=colander.drop,
+        oid="result",
+        widget=widget.TextAreaWidget(rows=10, css_class="readonly")
+    )
+
+    f_response = colander.SchemaNode(
+        colander.String(), title='Response',
+        missing=colander.drop,
+        oid="result",
+        widget=widget.TextAreaWidget(rows=10, css_class="readonly")
     )
 
 class EditSchema(AddSchema):
@@ -150,21 +196,6 @@ def get_form(request, class_form, buttons=None, row=None):
     return Form(schema, buttons=buttons)
 
 
-def upload_form(request, values, form):
-    docs = PartnerDocs.query() \
-        .filter(PartnerDocs.partner_id == values['partner_id'])
-    uploads = []
-    preview_url = "{host}/simkel/api_download?partner_id={partner_id}&jdoc_id={jdoc_id}"
-    for doc in docs:
-        uploads.append(dict(jdoc_id=doc.jdoc_id,
-                            upload=dict(filename=doc.doc_name,
-                                        uid=doc.id, )))
-
-    values['uploads'] = uploads
-    form = form.render(values)
-    return render_to_response('templates/form-upload.pt', dict(form=form),
-                              request=request)
-
 
 def route_list(request):
     return HTTPFound(location=request.route_url('simkel-permohonan'))
@@ -188,21 +219,6 @@ def save(values, row):
     return row
 
 
-def save_permohonan(values, partner, row=None):
-    if not row:
-        row = Permohonan()
-        row.partner_id = partner.id
-        row.jenis_id = values['jenis_id']
-        row.tgl_permohonan = datetime.now()
-        row.create_uid = values['uid']
-        row.created = datetime.now()
-    else:
-        row.update_uid = values['uid']
-        row.updated = datetime.now()
-
-    flush(row)
-    return row
-
 
 def save_request(request, values, row=None):
     values['tgl_lahir'] = date_from_str(values['tgl_lahir'])
@@ -224,20 +240,14 @@ form_params_edit = dict(scripts="""
 $(document).ready(function(){
     $(".tanggal").datepicker({format:"dd-mm-yyyy"});
     $(".tanggal").attr("readonly", true);
-    $("#trx_id").attr("readonly", true);
-    $("#ref_no").attr("readonly", true);
-    $("#result").attr("readonly", true);
-    
-
+    $(".readonly").attr("readonly", true);
 });
 """)
 
 form_params_view = dict(scripts="""
 $(document).ready(function(){
     $("#nip_penerima, #nopel").attr("readonly", true);
-    $("#trx_id").attr("readonly", true);
-    $("#ref_no").attr("readonly", true);
-    $("#result").attr("readonly", true);
+    $(".readonly").attr("readonly", true);
 });
 """)
 
@@ -309,6 +319,7 @@ class VendorClass(object):
         :param cid:
             merupakan customer id seperti MSN dan atu id pelanggaan
         """
+
         self.settings = get_settings()
         self.vendor_id = vendor_produk.id
         self.produk_id = vendor_produk.produk_id
@@ -320,6 +331,7 @@ class VendorClass(object):
         self.partner_log = row
         self.partner_log_id = None
         self.v_produk_kd = vendor_produk.kode
+        self.kategori = vendor_produk.produk.kategori.nama
 
     def save_log(self, typ):
         # if not self.partner_log: