Merge lp:~alecu/pay-ui/euro-and-more into lp:pay-ui

[Alejandro J. Cura]

Support for currencies other than USD

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/94/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/94/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

review: Needs Fixing

[lp:~alecu/pay-ui/euro-and-more]

71. By Alejandro J. Cura on 2014-10-02

Make the pay-ui handle suggested currencies just like the click scope

72. By Alejandro J. Cura on 2014-10-02

Update maintainer

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/92

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/95/rebuild

review: Approve (continuous-integration)

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-09-29 22:27:29 +0000
+++ app/payui.qml	2014-10-02 18:57:25 +0000
@@ -56,6 +56,7 @@
     property bool purchasing: false
     property bool recentLogin: false
     property bool cancellable: true
+    property string suggestedCurrency: "USD"
 
     backgroundColor: "transparent"
 
@@ -88,20 +89,17 @@
         id: purchase
 
         onItemDetailsObtained: {
-            var loc_c = Qt.locale("C");
-            // This string comes from a json double, and must be parsed with C locale
-            var pnum = Number.fromLocaleString(loc_c, price);
-
-            var loc = Qt.locale();
+            suggestedCurrency = currency;
             checkout.itemTitle = title;
             checkout.itemSubtitle = publisher;
-            checkout.price = pnum.toLocaleCurrencyString(loc, "US$");
+            checkout.price = formatted_price;
             payment.itemTitle = title;
             payment.itemSubtitle = publisher;
-            payment.price = pnum.toLocaleCurrencyString(loc, "US$");
+            payment.price = formatted_price;
             direct.itemTitle = title;
             direct.itemSubtitle = publisher;
-            direct.price = pnum.toLocaleCurrencyString(loc, "US$");
+            direct.price = formatted_price;
+            checkCredentials();
         }
 
         onPaymentTypesObtained: {
@@ -190,10 +188,14 @@
             if (mainView.state == "online-accounts") {
                 purchase.checkItemPurchased();
             } else if (mainView.state != "checkout" && !mainView.purchasing && mainView.state != "buy-interaction") {
-                purchase.getPaymentTypes();
+                purchase.getPaymentTypes(suggestedCurrency);
             }
         }
 
+        onItemNotPurchased: {
+            purchase.getPaymentTypes(suggestedCurrency);
+        }
+
         onCredentialsNotFound: {
             mainView.recentLogin = false;
             if (mainView.state == "online-accounts") {
@@ -286,7 +288,7 @@
 
         onRetry: {
             mainView.showLoading();
-            purchase.checkCredentials();
+            purchase.getItemDetails();
         }
 
         onClose: {
@@ -301,7 +303,7 @@
 
         onRetry: {
             mainView.showLoading();
-            purchase.checkCredentials();
+            purchase.getItemDetails();
         }
 
         onClose: {
@@ -316,7 +318,7 @@
 
         onRetry: {
             mainView.showLoading();
-            purchase.checkCredentials();
+            purchase.getItemDetails();
         }
 
         onClose: {
@@ -360,7 +362,7 @@
         Component.onCompleted: {
             showLoading();
             mainView.createDB();
-            purchase.checkCredentials();
+            purchase.getItemDetails();
         }
 
         onCurrentPageChanged: {
@@ -400,17 +402,17 @@
                     mainView.purchasing = true;
                     mainView.cancellable = false;
                     showLoading();
-                    purchase.buyItem(email, password, otp, direct.paymentId, direct.backendId, mainView.recentLogin);
+                    purchase.buyItem(email, password, otp, suggestedCurrency, direct.paymentId, direct.backendId, mainView.recentLogin);
                 } else if (direct.hasPayments && direct.hasPreferredPayment) {
                     mainView.purchasing = true;
                     mainView.cancellable = false;
                     showLoading();
-                    purchase.buyItemWithPreferredPayment(email, password, otp, mainView.recentLogin);
+                    purchase.buyItemWithPreferredPayment(email, password, otp, suggestedCurrency, mainView.recentLogin);
                 } else if (direct.hasStoredPayment) {
                     var values = mainView.getLastPayment();
                     var backendid = values[0];
                     var paymentid = values[1];
-                    purchase.buyItem(email, password, otp, paymentid, backendid, mainView.recentLogin);
+                    purchase.buyItem(email, password, otp, suggestedCurrency, paymentid, backendid, mainView.recentLogin);
                 } else {
                     mainView.state = "checkout";
                     pageStack.push(checkout);
@@ -439,7 +441,7 @@
                 }
 
                 if (mainView.recentLogin) {
-                    purchase.buyItem(email, "", "", paymentId, backendId, mainView.recentLogin);
+                    purchase.buyItem(email, "", "", suggestedCurrency, paymentId, backendId, mainView.recentLogin);
                 } else {
                     mainView.cancellable = true;
                     mainView.purchasing = false;
@@ -458,7 +460,7 @@
 
             onAddCreditCard: {
                 webkit.title = i18n.tr("Add Payment");
-                webkit.url = purchase.getAddPaymentUrl();
+                webkit.url = purchase.getAddPaymentUrl(suggestedCurrency);
                 mainView.state = "add-payment";
                 pageStack.push(webkit);
             }
@@ -494,7 +496,7 @@
             onPurchaseSucceeded: {
                 if (mainView.state == "add-payment") {
                     showLoading();
-                    purchase.getPaymentTypes();
+                    purchase.getPaymentTypes(suggestedCurrency);
                 } else {
                     purchase.quitSuccess();
                 }
 
=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-09-25 20:46:48 +0000
+++ backend/modules/payui/network.cpp	2014-10-02 18:57:25 +0000
@@ -36,6 +36,7 @@
 #define PAY_PURCHASES_PATH "/purchases"
 #define PAY_PAYMENTMETHODS_PATH "/paymentmethods"
 #define PAY_PAYMENTMETHODS_ADD_PATH PAY_PAYMENTMETHODS_PATH + "/add"
+#define SUGGESTED_CURRENCY_HEADER_NAME "X-Suggested-Currency"
 
 #define PREFERED_PAYMENT_TYPE "0"
 #define PAYMENT_TYPES "1"
@@ -90,6 +91,42 @@
     m_service.setCredentials(token);
 }
 
+QMap<QString, QString> buildCurrencyMap()
+{
+    /* NOTE: The list of currencies we need to handle mapping symbols of.
+     * Please keep this list in A-Z order.
+     */
+    QMap<QString, QString> currencies_map {
+        { "CNY", "RMB"},
+        { "EUR", "€"},
+        { "GBP", "₤"},
+        { "HKD", "HK$"},
+        { "TWD", "TW$"},
+        { "USD", "US$"},
+    };
+    return currencies_map;
+}
+
+const QString DEFAULT_CURRENCY {"USD"};
+
+QString Network::getSymbolForCurrency(const QString &currency_code)
+{
+    static QMap<QString, QString> currency_map = buildCurrencyMap();
+
+    if (currency_map.contains(currency_code)) {
+        return currency_map[currency_code];
+    } else{
+        return currency_code;
+    }
+}
+
+bool Network::isSupportedCurrency(const QString& currency_code)
+{
+    static QMap<QString, QString> currency_map = buildCurrencyMap();
+
+    return currency_map.contains(currency_code);
+}
+
 void Network::onReply(QNetworkReply *reply)
 {
     QVariant statusAttr = reply->attribute(
@@ -167,10 +204,26 @@
             QJsonObject object = document.object();
             QString title = object.value("title").toString();
             QString publisher = object.value("publisher").toString();
-            QString price = QString::number(object.value("price").toDouble());
             QString icon = object.value("icon_url").toString();
 
-            Q_EMIT itemDetailsObtained(title, publisher, price, icon);
+            QJsonObject prices = object.value("prices").toObject();
+            QString suggested_currency = DEFAULT_CURRENCY;
+            QString currency = DEFAULT_CURRENCY;
+            if (reply->hasRawHeader(SUGGESTED_CURRENCY_HEADER_NAME)) {
+                suggested_currency = reply->rawHeader(SUGGESTED_CURRENCY_HEADER_NAME);
+            }
+            const char* env_value = std::getenv(CURRENCY_ENVVAR);
+            if (env_value != NULL) {
+                suggested_currency = env_value;
+            }
+
+            if (isSupportedCurrency(suggested_currency) && prices.contains(suggested_currency)) {
+                currency = suggested_currency;
+            }
+            double price = prices[currency].toDouble();
+            QLocale locale;
+            QString formatted_price = locale.toCurrencyString(price, getSymbolForCurrency(currency));
+            Q_EMIT itemDetailsObtained(title, publisher, currency, formatted_price, icon);
         } else if (state->operation.contains(CHECK_PURCHASED)) {
             Q_EMIT buyItemSucceeded();  
         } else {
@@ -182,22 +235,25 @@
     } else if (httpStatus == 401 || httpStatus == 403) {
         Q_EMIT authenticationError();
     } else if (httpStatus == 404 && state->operation.contains(CHECK_PURCHASED)) {
-        requestPaymentTypes();
+        Q_EMIT itemNotPurchased();
     } else {
         Q_EMIT error(QString::number(httpStatus));
     }
     reply->deleteLater();
 }
 
-void Network::requestPaymentTypes()
+void Network::requestPaymentTypes(const QString& currency)
 {
     QNetworkRequest request;
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    QString url = getAPIUrl(PAY_BASE_URL_ENVVAR, QString(PAY_BASE_URL)) + PAY_API_ROOT + PAY_PAYMENTMETHODS_PATH + "/";
-    qDebug() << "Request Payment Types:" << url;
-    signRequestUrl(request, url);
+    QUrl url(getAPIUrl(PAY_BASE_URL_ENVVAR, QString(PAY_BASE_URL)) + PAY_API_ROOT + PAY_PAYMENTMETHODS_PATH + "/");
+    QUrlQuery query;
+    query.addQueryItem("currency", currency);
+    url.setQuery(query);
+    qDebug() << "Request Payment Types:" << url.toString();
+    signRequestUrl(request, url.toString());
     request.setRawHeader("Accept", "application/json");
-    request.setUrl(QUrl(url));
+    request.setUrl(url);
     RequestObject* reqObject = new RequestObject(QString(PAYMENT_TYPES));
     request.setOriginatingObject(reqObject);
     m_nam.get(request);
@@ -210,12 +266,14 @@
 }
 
 void Network::buyItemWithPreferredPaymentType(const QString& email, const QString& password, const QString& otp,
-                                              const QString& appid, const QString& itemid, bool recentLogin)
+                                              const QString& appid, const QString& itemid, const QString& currency,
+                                              bool recentLogin)
 {
     m_selectedPaymentId = m_preferred->paymentId();
     m_selectedBackendId = m_preferred->backendId();
     m_selectedAppId = appid;
     m_selectedItemId = itemid;
+    m_currency = currency;
     if (recentLogin) {
         purchaseProcess();
     } else {
@@ -226,13 +284,14 @@
 
 void Network::buyItem(const QString& email, const QString& password,
                       const QString& otp,
-                      const QString& appid, const QString& itemid,
+                      const QString& appid, const QString& itemid, const QString& currency,
                       const QString& paymentId, const QString& backendId, bool recentLogin)
 {
     m_selectedPaymentId = paymentId;
     m_selectedBackendId = backendId;
     m_selectedAppId = appid;
     m_selectedItemId = itemid;
+    m_currency = currency;
     if (recentLogin) {
         purchaseProcess();
     } else {
@@ -252,6 +311,7 @@
     serializer.insert("name", m_selectedAppId);
     serializer.insert("backend_id", m_selectedBackendId);
     serializer.insert("method_id", m_selectedPaymentId);
+    serializer.insert("currency", m_currency);
     QJsonDocument doc(serializer);
 
     QByteArray content = doc.toJson();
@@ -304,14 +364,16 @@
     request.setRawHeader("Authorization", sign.toUtf8());
 }
 
-QString Network::getAddPaymentUrl()
+QString Network::getAddPaymentUrl(const QString& currency)
 {
-    QString baseUrl = getAPIUrl(PAY_BASE_URL_ENVVAR, QString(PAY_BASE_URL)) + PAY_API_ROOT + PAY_PAYMENTMETHODS_ADD_PATH + "/";
+    QUrl baseUrl(getAPIUrl(PAY_BASE_URL_ENVVAR, QString(PAY_BASE_URL)) + PAY_API_ROOT + PAY_PAYMENTMETHODS_ADD_PATH + "/");
+    QUrlQuery query;
+    query.addQueryItem("currency", currency);
+    baseUrl.setQuery(query);
     qDebug() << "Get Add Payment URL:" << baseUrl;
-    QString sign = m_token.signUrl(baseUrl, QStringLiteral("GET"), true);
+    QString sign = m_token.signUrl(baseUrl.toString(), QStringLiteral("GET"), true);
     QUrl signedUrl(baseUrl);
     signedUrl.setQuery(sign);
-
     return signedUrl.toString();
 }
 
 
=== modified file 'backend/modules/payui/network.h'
--- backend/modules/payui/network.h	2014-09-11 03:10:25 +0000
+++ backend/modules/payui/network.h	2014-10-02 18:57:25 +0000
@@ -38,6 +38,7 @@
 constexpr static const char* PAY_BASE_URL_ENVVAR{"PAY_BASE_URL"};
 constexpr static const char* PAY_BASE_URL{"https://software-center.ubuntu.com"};
 constexpr static const char* PAY_API_ROOT{"/api/2.0/click"};
+constexpr static const char* CURRENCY_ENVVAR {"U1_SEARCH_CURRENCY"};
 
 class RequestObject : public QObject
 {
@@ -58,26 +59,28 @@
 public:
     explicit Network(QObject *parent = 0);
 
-    void requestPaymentTypes();
+    void requestPaymentTypes(const QString& currency);
     void buyItem(const QString& email, const QString& password,
                  const QString& otp, const QString& appid,
-                 const QString& itemid, const QString& paymentId,
+                 const QString& itemid, const QString& currency, const QString& paymentId,
                  const QString& backendId, bool recentLogin);
     void buyItemWithPreferredPaymentType(const QString& email, const QString& password,
                                          const QString& otp,
-                                         const QString& appid, const QString& itemid,
+                                         const QString& appid, const QString& itemid, const QString& currency,
                                          bool recentLogin);
     void getItemInfo(const QString &packagename);
     void checkPassword(const QString& email, const QString& password,
                        const QString& otp);
     void getCredentials();
     void setCredentials(Token token);
-    QString getAddPaymentUrl();
+    QString getAddPaymentUrl(const QString& currency);
     QDateTime getTokenUpdated();
     void checkItemPurchased(const QString& appid);
+    static QString getSymbolForCurrency(const QString& currency_code);
+    static bool isSupportedCurrency(const QString& currency_code);
 
 Q_SIGNALS:
-    void itemDetailsObtained(QString title, QString publisher, QString price, QString icon);
+    void itemDetailsObtained(QString title, QString publisher, QString currency, QString formatted_price, QString icon);
     void paymentTypesObtained(QVariantList payments);
     void buyItemSucceeded();
     void buyItemFailed();
@@ -90,6 +93,7 @@
     void noPreferredPaymentMethod();
     void loginError(const QString& message);
     void twoFactorAuthRequired();
+    void itemNotPurchased();
 
 private Q_SLOTS:
     void onReply(QNetworkReply*);
@@ -107,6 +111,7 @@
     QString m_selectedBackendId;
     QString m_selectedAppId;
     QString m_selectedItemId;
+    QString m_currency;
     bool m_startPurchase = false;
 
     QString getAPIUrl(QString urlKey, QString defaultValue);
 
=== modified file 'backend/modules/payui/purchase.cpp'
--- backend/modules/payui/purchase.cpp	2014-09-11 03:10:25 +0000
+++ backend/modules/payui/purchase.cpp	2014-10-02 18:57:25 +0000
@@ -38,6 +38,8 @@
             this, &Purchase::loginError);
     connect(&m_network, &Network::twoFactorAuthRequired,
             this, &Purchase::twoFactorAuthRequired);
+    connect(&m_network, &Network::itemNotPurchased,
+                     this, &Purchase::itemNotPurchased);
 
     QCoreApplication* instance = QCoreApplication::instance();
     Logger::setupLogging();
@@ -74,30 +76,27 @@
 
 void Purchase::checkCredentials()
 {
+    m_network.getCredentials();
+}
+
+QString Purchase::getAddPaymentUrl(QString currency)
+{
+    return m_network.getAddPaymentUrl(currency);
+}
+
+void Purchase::getItemDetails()
+{
     if (m_appid.isEmpty() && m_itemid.isEmpty()) {
         qDebug() << "AppId or ItemId not provided";
         quitCancel();
-    } else {
-        qDebug() << "Getting Item Details";
-        getItemDetails(m_appid, m_itemid);
     }
-    m_network.getCredentials();
-}
-
-QString Purchase::getAddPaymentUrl()
-{
-    return m_network.getAddPaymentUrl();
-}
-
-void Purchase::getItemDetails(QString packagename, QString itemid)
-{
-    Q_UNUSED(itemid);
-    m_network.getItemInfo(packagename);
-}
-
-void Purchase::getPaymentTypes()
-{
-    m_network.requestPaymentTypes();
+    qDebug() << "Getting Item Details";
+    m_network.getItemInfo(m_appid);
+}
+
+void Purchase::getPaymentTypes(const QString& currency)
+{
+    m_network.requestPaymentTypes(currency);
 }
 
 void Purchase::checkWallet(QString email, QString password, QString otp)
@@ -105,14 +104,14 @@
     m_network.checkPassword(email, password, otp);
 }
 
-void Purchase::buyItemWithPreferredPayment(QString email, QString password, QString otp, bool recentLogin)
+void Purchase::buyItemWithPreferredPayment(QString email, QString password, QString otp, QString currency, bool recentLogin)
 {
-    m_network.buyItemWithPreferredPaymentType(email, password, otp, m_appid, m_itemid, recentLogin);
+    m_network.buyItemWithPreferredPaymentType(email, password, otp, m_appid, m_itemid, currency, recentLogin);
 }
 
-void Purchase::buyItem(QString email, QString password, QString otp, QString paymentId, QString backendId, bool recentLogin)
+void Purchase::buyItem(QString email, QString password, QString otp, QString currency, QString paymentId, QString backendId, bool recentLogin)
 {
-    m_network.buyItem(email, password, otp, m_appid, m_itemid, paymentId, backendId, recentLogin);
+    m_network.buyItem(email, password, otp, m_appid, m_itemid, currency, paymentId, backendId, recentLogin);
 }
 
 QDateTime Purchase::getTokenUpdated()
 
=== modified file 'backend/modules/payui/purchase.h'
--- backend/modules/payui/purchase.h	2014-09-11 03:10:25 +0000
+++ backend/modules/payui/purchase.h	2014-10-02 18:57:25 +0000
@@ -17,12 +17,12 @@
     explicit Purchase(QObject *parent = 0);
     ~Purchase();
 
-    Q_INVOKABLE void getItemDetails(QString packagename, QString itemid);
-    Q_INVOKABLE void getPaymentTypes();
-    Q_INVOKABLE void buyItemWithPreferredPayment(QString email, QString password, QString otp, bool recentLogin);
-    Q_INVOKABLE void buyItem(QString email, QString password, QString otp, QString paymentId, QString backendId, bool recentLogin);
+    Q_INVOKABLE void getItemDetails();
+    Q_INVOKABLE void getPaymentTypes(const QString &currency);
+    Q_INVOKABLE void buyItemWithPreferredPayment(QString email, QString password, QString otp, QString currency, bool recentLogin);
+    Q_INVOKABLE void buyItem(QString email, QString password, QString otp, QString currency, QString paymentId, QString backendId, bool recentLogin);
     Q_INVOKABLE void checkCredentials();
-    Q_INVOKABLE QString getAddPaymentUrl();
+    Q_INVOKABLE QString getAddPaymentUrl(QString currency);
     Q_INVOKABLE void checkWallet(QString email, QString password, QString otp);
 
     Q_INVOKABLE void quitSuccess();
@@ -31,7 +31,7 @@
     Q_INVOKABLE void checkItemPurchased();
 
 Q_SIGNALS:
-    void itemDetailsObtained(QString title, QString publisher, QString price, QString icon);
+    void itemDetailsObtained(QString title, QString publisher, QString currency, QString formatted_price, QString icon);
     void paymentTypesObtained(QVariantList payments);
     void buyItemSucceeded();
     void buyItemFailed();
@@ -44,6 +44,7 @@
     void noPreferredPaymentMethod();
     void loginError(const QString& message);
     void twoFactorAuthRequired();
+    void itemNotPurchased();
 
 private:
     Network m_network;
 
=== modified file 'backend/tests/mock_click_server.py'
--- backend/tests/mock_click_server.py	2014-09-12 19:21:55 +0000
+++ backend/tests/mock_click_server.py	2014-10-02 18:57:25 +0000
@@ -1,8 +1,5 @@
-import sys
-import os
 import json
 import threading
-import subprocess
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
 
@@ -89,11 +86,17 @@
         self.end_headers()
         self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
 
-    def response_item_info(self, fail=False):
+    def response_item_info(self, fail, eurozone, dotar):
         response = {
             "title": "title",
             "publisher": "publisher",
             "price": 9.99,
+            "prices": {
+                "USD": 1.99,
+                "EUR": 1.69,
+                "GBP": 1.29,
+                "ARS": 18.05,
+                },
             "icon_url": "icon_url",
         }
         if fail:
@@ -101,6 +104,10 @@
         else:
             self.send_response(200)
         self.send_header("Content-type", "application/json")
+        if eurozone:
+            self.send_header("X-Suggested-Currency", "EUR")
+        if dotar:
+            self.send_header("X-Suggested-Currency", "ARS")
         self.end_headers()
         self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
 
@@ -132,7 +139,9 @@
             self.response_buy_item(fail=fail, interaction=interaction)
         elif self.path.find("iteminfo/") != -1:
             fail = self.path.find("/fail/") != -1
-            self.response_item_info(fail)
+            eurozone = self.path.find("/eurozone/") != -1
+            dotar = self.path.find("/dotar/") != -1
+            self.response_item_info(fail, eurozone, dotar)
 
 
 def run_click_server():
 
=== modified file 'backend/tests/test_network.cpp'
--- backend/tests/test_network.cpp	2014-09-12 19:21:55 +0000
+++ backend/tests/test_network.cpp	2014-10-02 18:57:25 +0000
@@ -53,6 +53,10 @@
     void testNetworkButItemWithPaymentTypeFail();
     void testNetworkButItemWithPaymentTypeInProgress();
     void testNetworkGetItemInfo();
+    void testNetworkGetItemInfoEurozone();
+    void testNetworkGetItemInfoOtherCoins();
+    void testNetworkGetItemInfoOverride();
+    void testNetworkGetItemInfoOverrideOther();
     void testNetworkGetItemInfoFail();
     void testUseExistingCredentials();
     void testCheckAlreadyPurchased();
@@ -89,7 +93,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/authError/", 1);
     QSignalSpy spy(&network, SIGNAL(authenticationError()));
-    network.buyItem("email", "password", "otp", "appid", "itemid", "paymentid", "backendid", false);
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
     QTRY_COMPARE(spy.count(), 1);
 }
 
@@ -97,7 +101,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);    
     QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
-    network.requestPaymentTypes();
+    network.requestPaymentTypes("USD");
     QTRY_COMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
     QVERIFY(arguments.at(0).toList().count() == 3);
@@ -117,7 +121,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
     QSignalSpy spy(&network, SIGNAL(error(QString)));
-    network.requestPaymentTypes();
+    network.requestPaymentTypes("USD");
     QTRY_COMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
     QVERIFY(arguments.at(0).toString() == "404");
@@ -127,7 +131,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
     QSignalSpy spy(&network, SIGNAL(buyItemSucceeded()));
-    network.buyItem("email", "password", "otp", "appid", "itemid", "paymentid", "backendid", false);
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
     QTRY_COMPARE(spy.count(), 1);
 }
 
@@ -135,7 +139,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/interaction/", 1);
     QSignalSpy spy(&network, SIGNAL(buyInteractionRequired(QString)));
-    network.buyItem("email", "password", "otp", "appid", "itemid", "paymentid", "backendid", false);
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
     QTRY_COMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
     QString url(arguments.at(0).toString());
@@ -147,7 +151,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
     QSignalSpy spy(&network, SIGNAL(buyItemFailed()));
-    network.buyItem("email", "password", "otp", "appid", "itemid", "paymentid", "backendid", false);
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
     QTRY_COMPARE(spy.count(), 1);
 }
 
@@ -155,10 +159,10 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
     QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
-    network.requestPaymentTypes();
+    network.requestPaymentTypes("USD");
     QTRY_COMPARE(spy.count(), 1);
     QSignalSpy spy2(&network, SIGNAL(buyItemSucceeded()));
-    network.buyItemWithPreferredPaymentType("email", "password", "otp", "appid", "itemid", false);
+    network.buyItemWithPreferredPaymentType("email", "password", "otp", "USD", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 
@@ -166,11 +170,11 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
     QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
-    network.requestPaymentTypes();
+    network.requestPaymentTypes("USD");
     QTRY_COMPARE(spy.count(), 1);
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
     QSignalSpy spy2(&network, SIGNAL(buyItemFailed()));
-    network.buyItemWithPreferredPaymentType("email", "password", "otp", "appid", "itemid", false);
+    network.buyItemWithPreferredPaymentType("email", "password", "otp", "USD", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 
@@ -178,25 +182,80 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
     QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
-    network.requestPaymentTypes();
+    network.requestPaymentTypes("USD""USD");
     QTRY_COMPARE(spy.count(), 1);
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/interaction/", 1);
     QSignalSpy spy2(&network, SIGNAL(buyInteractionRequired(QString)));
-    network.buyItemWithPreferredPaymentType("email", "password", "otp", "appid", "itemid", false);
+    network.buyItemWithPreferredPaymentType("email", "password", "otp", "USD", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 
 void TestNetwork::testNetworkGetItemInfo()
 {
      setenv("URL_PACKAGE_INFO", "http://localhost:8000/iteminfo/", 1);
-     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString)));
-     network.getItemInfo("packagename");
-     QTRY_COMPARE(spy.count(), 1);
+     unsetenv(CURRENCY_ENVVAR);
+     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString,QString)));
+     network.getItemInfo("packagename");
+     QTRY_COMPARE(spy.count(), 1);
+     QList<QVariant> arguments = spy.takeFirst();
+     QCOMPARE(arguments.at(2).toString(), QStringLiteral("USD"));
+     QCOMPARE(arguments.at(3).toString(), QStringLiteral("US$1.99"));
+}
+
+void TestNetwork::testNetworkGetItemInfoEurozone()
+{
+     setenv("URL_PACKAGE_INFO", "http://localhost:8000/iteminfo/eurozone/", 1);
+     unsetenv(CURRENCY_ENVVAR);
+     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString,QString)));
+     network.getItemInfo("packagename");
+     QTRY_COMPARE(spy.count(), 1);
+     QList<QVariant> arguments = spy.takeFirst();
+     QCOMPARE(arguments.at(2).toString(), QStringLiteral("EUR"));
+     QCOMPARE(arguments.at(3).toString(), QStringLiteral("€1.69"));
+}
+
+void TestNetwork::testNetworkGetItemInfoOtherCoins()
+{
+     setenv("URL_PACKAGE_INFO", "http://localhost:8000/iteminfo/dotar/", 1);
+     unsetenv(CURRENCY_ENVVAR);
+     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString,QString)));
+     network.getItemInfo("packagename");
+     QTRY_COMPARE(spy.count(), 1);
+     QList<QVariant> arguments = spy.takeFirst();
+     QCOMPARE(arguments.at(2).toString(), QStringLiteral("USD"));
+     QCOMPARE(arguments.at(3).toString(), QStringLiteral("US$1.99"));
+}
+
+void TestNetwork::testNetworkGetItemInfoOverride()
+{
+     setenv("URL_PACKAGE_INFO", "http://localhost:8000/iteminfo/", 1);
+     setenv(CURRENCY_ENVVAR, "EUR", true);
+     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString,QString)));
+     network.getItemInfo("packagename");
+     QTRY_COMPARE(spy.count(), 1);
+     QList<QVariant> arguments = spy.takeFirst();
+     QCOMPARE(arguments.at(2).toString(), QStringLiteral("EUR"));
+     QCOMPARE(arguments.at(3).toString(), QStringLiteral("€1.69"));
+     unsetenv(CURRENCY_ENVVAR);
+}
+
+void TestNetwork::testNetworkGetItemInfoOverrideOther()
+{
+     setenv("URL_PACKAGE_INFO", "http://localhost:8000/iteminfo/dotar/", 1);
+     setenv(CURRENCY_ENVVAR, "EUR", true);
+     QSignalSpy spy(&network, SIGNAL(itemDetailsObtained(QString,QString,QString,QString,QString)));
+     network.getItemInfo("packagename");
+     QTRY_COMPARE(spy.count(), 1);
+     QList<QVariant> arguments = spy.takeFirst();
+     QCOMPARE(arguments.at(2).toString(), QStringLiteral("EUR"));
+     QCOMPARE(arguments.at(3).toString(), QStringLiteral("€1.69"));
+     unsetenv(CURRENCY_ENVVAR);
 }
 
 void TestNetwork::testNetworkGetItemInfoFail()
 {
     setenv("URL_PACKAGE_INFO", "http://localhost:8000/fail/iteminfo/", 1);
+    unsetenv(CURRENCY_ENVVAR);
     QSignalSpy spy(&network, SIGNAL(error(QString)));
     network.getItemInfo("packagename");
     QTRY_COMPARE(spy.count(), 1);
@@ -206,7 +265,7 @@
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
     QSignalSpy spy(&network, SIGNAL(buyItemSucceeded()));
-    network.buyItem("email", "password", "otp", "appid", "itemid", "paymentid", "backendid", true);
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", true);
     QTRY_COMPARE(spy.count(), 1);
 }
 
@@ -221,7 +280,7 @@
 void TestNetwork::testCheckAlreadyPurchasedFail()
 {
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/notpurchased/", 1);
-    QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
+    QSignalSpy spy(&network, SIGNAL(itemNotPurchased()));
     network.checkItemPurchased("com.example.fakeapp");
     QTRY_COMPARE(spy.count(), 1);
 }
 
=== modified file 'manifest.json'
--- manifest.json	2014-09-30 16:45:24 +0000
+++ manifest.json	2014-10-02 18:57:25 +0000
@@ -11,6 +11,6 @@
             "pay-ui": "payui_payui.desktop"
         }
     },
-    "version": "0.3.26",
-    "maintainer": "Diego Sarmentero <[e-mail]>"
+    "version": "0.4.0",
+    "maintainer": "Ubuntu Appstore Developers <[e-mail]>"
 }
 \ No newline at end of file