Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[enhancement] automatic exchange rates via jsonrates

Browse Source
This commit is contained in:
Rushabh Mehta 2015-05-07 12:25:33 +05:30
parent 43a7b36fcf
commit 66fa1ff878
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/public/js/controllers/transaction.js
View File

@ -245,10 +245,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}, },
get_exchange_rate: function(from_currency, to_currency, callback) { get_exchange_rate: function(from_currency, to_currency, callback) {
var exchange_name = from_currency + "-" + to_currency; frappe.call({
frappe.model.with_doc("Currency Exchange", exchange_name, function(name) { method: "erpnext.setup.utils.get_exchange_rate",
var exchange_doc = frappe.get_doc("Currency Exchange", exchange_name); args: {
callback(exchange_doc ? flt(exchange_doc.exchange_rate) : 0); from_currency: from_currency,
to_currency: to_currency
},
callback: function(r) {
callback(flt(r.message));
}
}); });
}, },

1
erpnext/setup/doctype/currency_exchange/currency_exchange.py
View File

@ -9,7 +9,6 @@ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
class CurrencyExchange(Document): class CurrencyExchange(Document):
def autoname(self): def autoname(self):
self.name = self.from_currency + "-" + self.to_currency self.name = self.from_currency + "-" + self.to_currency

18
erpnext/setup/utils.py
View File

@ -58,6 +58,20 @@ def before_tests():
frappe.db.sql("delete from `tabItem Price`") frappe.db.sql("delete from `tabItem Price`")
frappe.db.commit() frappe.db.commit()
@frappe.whitelist()
def get_exchange_rate(from_currency, to_currency): def get_exchange_rate(from_currency, to_currency):
exchange = "%s-%s" % (from_currency, to_currency) if frappe.conf.jsonrates_api_key:
return flt(frappe.db.get_value("Currency Exchange", exchange, "exchange_rate")) cache = frappe.cache()
key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
value = cache.get(key)
if not value:
import requests
response = requests.get("http://jsonrates.com/get/?from={0}&to={1}&apiKey={2}".format(from_currency,
to_currency, frappe.conf.jsonrates_api_key))
# expire in 24 hours
value = response.json().get("rate")
cache.setex(key, value, 24 * 60 * 60)
return flt(value)
else:
exchange = "%s-%s" % (from_currency, to_currency)
return flt(frappe.db.get_value("Currency Exchange", exchange, "exchange_rate"))