Skip to content

Kunto / backoffice

Go to a project
Commit d89b175a by Solo Group
Options

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

2 parents d01a0791 186204c4
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
src/agratek/api/merchant/views/vendor_trx.py
...@@ -128,21 +128,21 @@ class AddSchema(colander.Schema): ...@@ -128,21 +128,21 @@ class AddSchema(colander.Schema):
colander.String(), title='Result', colander.String(), title='Result',
missing=colander.drop, missing=colander.drop,
oid="result", oid="result",
widget=widget.TextAreaWidget(rows=2, css_class="readonly") widget=widget.TextAreaWidget(rows=5, css_class="readonly")
) )
f_request = colander.SchemaNode( f_request = colander.SchemaNode(
colander.String(), title='Request', colander.String(), title='Request',
missing=colander.drop, missing=colander.drop,
oid="result", oid="result",
widget=widget.TextAreaWidget(rows=2, css_class="readonly") widget=widget.TextAreaWidget(rows=5, css_class="readonly")
) )
f_response = colander.SchemaNode( f_response = colander.SchemaNode(
colander.String(), title='Response', colander.String(), title='Response',
missing=colander.drop, missing=colander.drop,
oid="result", oid="result",
widget=widget.TextAreaWidget(rows=2, css_class="readonly") widget=widget.TextAreaWidget(rows=5, css_class="readonly")
) )
......
src/agratek/api/merchant/views/vsi_pulsa.py
...@@ -101,7 +101,7 @@ class Vendor(VendorClass): ...@@ -101,7 +101,7 @@ class Vendor(VendorClass):
code = "rc" in data and int(data["rc"]) or 0 code = "rc" in data and int(data["rc"]) or 0
if code==0: if code==0:
product_id = self.invoice_det.produk.id product_id = self.invoice_det.produk.id
partner_id = self.invoice_det.ar_invoice.customer_id partner_id = self.invoice_det.h2h_ar_invoice.customer_id
discount = PartnerProduk.get_discount(partner_id, product_id) discount = PartnerProduk.get_discount(partner_id, product_id)
harga = self.vendor_produk.produk.harga harga = self.vendor_produk.produk.harga
self.status = 1 self.status = 1
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!