Merge lp:~dobey/unity-scope-click/search-show-price into lp:unity-scope-click/devel

[dobey]

Show the price in search results for apps that have prices.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/194
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/194/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/194

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/220/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

This assumes the currency is always USD $? Is this the right assumption?

review: Needs Information

[dobey (dobey)]

On Fri, 2014-07-18 at 14:35 +0000, Pawel Stolowski wrote:
> Review: Needs Information
>
> This assumes the currency is always USD $? Is this the right assumption?

It is currently correct, and we are always sending the "$" in the
preview for the payment button as well.

This is because the QtLocale.toCurrencyString is actually quite dumb,
and doesn't know how to convert "USD" to "$" for example, or when not to
(when showing USD to users in .ar for example). I think we'll have to
write some code to do all that work in the future, so we can show the
correct symbol or currency acronym depending on the user's location,
language, and related settings.

[Paweł Stołowski (stolowski)]

Ok then. +1

review: Approve

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-07-17 21:42:24 +0000
+++ scope/clickstore/store-query.cpp	2014-07-17 21:42:24 +0000
@@ -49,6 +49,8 @@
 #include<sstream>
 #include <cassert>
 
+#include <QLocale>
+
 #include <click/click-i18n.h>
 
 using namespace click;
@@ -289,7 +291,12 @@
         } else {
             res[click::Query::ResultKeys::INSTALLED] = false;
             res[click::Query::ResultKeys::PURCHASED] = false;
-            res["subtitle"] = _("FREE");
+            if (pkg.price > 0.00f) {
+                QLocale locale;
+                res["subtitle"] = locale.toCurrencyString(pkg.price, "$").toUtf8().data();
+            } else {
+                res["subtitle"] = _("FREE");
+            }
             // TODO: get the real price from the webservice (upcoming branch)
         }