Merge lp:~dobey/unity-scope-click/payments-button into lp:unity-scope-click/devel

[dobey]

Add support for using a new custom widget from Unity8 to handle payment process of purchasable apps.

[lp:~dobey/unity-scope-click/payments-button]

287. By dobey on 2014-06-17

Remove obsolete FIXME comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/95
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/94/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/94

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:287
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/96
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/95/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/95

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

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

The branch looks ok, but I think it would be safer to keep this feature behind an environ variable, so it does not break when the index starts having prices.
Please add such a check in the "if (details.package.price > double(0.00)) {".

review: Needs Fixing

[dobey (dobey)]

> The branch looks ok, but I think it would be safer to keep this feature behind
> an environ variable, so it does not break when the index starts having prices.
> Please add such a check in the "if (details.package.price > double(0.00)) {".

Can you approve without this, as we discussed in the standup? Given the timeframe of getting this feature landed in the archive, I don't see a good reason to do this. We'd have to remove such a check very soon, and if anything does break, it's better for us to know about it earlier, rather than only finding out if someone discovers how to enable the magic environment variable on their phone.

[Alejandro J. Cura (alecu)]

As discussed, let's land without the flag, since it will only work if the app has price in the store.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2014-06-16 14:09:21 +0000
+++ libclickscope/click/preview.cpp	2014-06-17 21:33:04 +0000
@@ -703,16 +703,28 @@
 scopes::PreviewWidgetList UninstalledPreview::uninstalledActionButtonWidgets(const PackageDetails &details)
 {
     scopes::PreviewWidgetList widgets;
-    scopes::PreviewWidget buttons("buttons", "actions");
-    scopes::VariantBuilder builder;
-    builder.add_tuple(
-        {
-            {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
-            {"label", scopes::Variant(_("Install"))},
-            {"download_url", scopes::Variant(details.download_url)}
-        });
-    buttons.add_attribute_value("actions", builder.end());
-    widgets.push_back(buttons);
+    if (details.package.price > double(0.00)) {
+        scopes::PreviewWidget payments("purchase", "payments");
+        scopes::VariantMap tuple;
+        tuple["currency"] = "$";
+        qDebug() << "Price is" << details.package.price;
+        tuple["price"] = scopes::Variant(details.package.price);
+        tuple["store_item_id"] = details.package.name;
+        tuple["download_url"] = details.download_url;
+        payments.add_attribute_value("source", scopes::Variant(tuple));
+        widgets.push_back(payments);
+    } else {
+        scopes::PreviewWidget buttons("buttons", "actions");
+        scopes::VariantBuilder builder;
+        builder.add_tuple(
+            {
+                {"id", scopes::Variant(click::Preview::Actions::INSTALL_CLICK)},
+                {"label", scopes::Variant(_("Install"))},
+                {"download_url", scopes::Variant(details.download_url)}
+            });
+        buttons.add_attribute_value("actions", builder.end());
+        widgets.push_back(buttons);
+    }
 
     return widgets;
 }
 
=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2014-06-12 13:59:29 +0000
+++ scope/clickstore/store-scope.cpp	2014-06-17 21:33:04 +0000
@@ -57,6 +57,8 @@
 int click::Scope::start(std::string const&, scopes::RegistryProxy const&)
 {
     setlocale(LC_ALL, "");
+    // FIXME: This is wrong, but needed for json-cpp workaround.
+    setlocale(LC_MONETARY, "C");
     bindtextdomain(GETTEXT_PACKAGE, GETTEXT_LOCALEDIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 
@@ -91,13 +93,28 @@
     return scopes::PreviewQueryBase::UPtr{new click::Preview(result, metadata, client, nam)};
 }
 
-unity::scopes::ActivationQueryBase::UPtr click::Scope::perform_action(unity::scopes::Result const& /* result */, unity::scopes::ActionMetadata const& metadata, std::string const& /* widget_id */, std::string const& action_id)
+unity::scopes::ActivationQueryBase::UPtr click::Scope::perform_action(unity::scopes::Result const& /* result */, unity::scopes::ActionMetadata const& metadata,
+                                                                      std::string const& widget_id, std::string const& _action_id)
 {
+    std::string action_id = _action_id;
     auto activation = new ScopeActivation();
-    qDebug() << "perform_action called with action_id" << QString().fromStdString(action_id);
+    qDebug() << "perform_action called with widget_id" << QString::fromStdString(widget_id) << "and action_id:" << QString::fromStdString(action_id);
 
-    // note: OPEN_CLICK and OPEN_ACCOUNTS actions are handled directly by the Dash
-    if (action_id == click::Preview::Actions::INSTALL_CLICK) {
+    // if the purchase is completed, do the install
+    if (action_id == "purchaseCompleted") {
+        qDebug() << "Yay, got finished signal";
+        qDebug() << "about to get the download_url";
+        std::string download_url = metadata.scope_data().get_dict()["download_url"].get_string();
+        qDebug() << "the download url is: " << QString::fromStdString(download_url);
+        activation->setHint("download_url", unity::scopes::Variant(download_url));
+        activation->setHint("action_id", unity::scopes::Variant(click::Preview::Actions::INSTALL_CLICK));
+        qDebug() << "returning ShowPreview";
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == "purchaseError") {
+        activation->setHint(click::Preview::Actions::DOWNLOAD_FAILED, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::INSTALL_CLICK) {
+        qDebug() << "about to get the download_url";
         std::string download_url = metadata.scope_data().get_dict()["download_url"].get_string();
         qDebug() << "the download url is: " << QString::fromStdString(download_url);
         activation->setHint("download_url", unity::scopes::Variant(download_url));