Merge lp:~alecu/unity-scope-click/refunds-previews into lp:unity-scope-click

[Alejandro J. Cura]

Show the "Refund" button and call the pay-service when clicked

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/583/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/39/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/40/console

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

review: Needs Fixing (continuous-integration)

[lp:~alecu/unity-scope-click/refunds-previews]

324. By Alejandro J. Cura on 2015-04-25

Do not use the refundable time for equality comparison

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/584/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/41/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/593/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/46/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/594/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-vivid-armhf-ci/47/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

I think the branch needs to be resynced with trunk before silo.

Individual comments inline. Overall, looks good. I added a few optional suggestions but didn't see any showstoppers.

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/596/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-wily/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-wily/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/4
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/4/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~alecu/unity-scope-click/refunds-previews]

325. By Alejandro J. Cura on 2015-05-15

Merged trunk in

326. By Alejandro J. Cura on 2015-05-15

Fixes suggested by charles' review

327. By Alejandro J. Cura on 2015-05-15

Fix broken tests

[Alejandro J. Cura (alecu)]

Thanks for the thorough review!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/597/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-wily/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/7/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-wily/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/5
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-amd64/5/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[dobey (dobey)]

Some commentary in line.

review: Needs Information

[Charles Kerr (charlesk)]

Thanks for making the minor tweaks I suggested :)

Still LGTM overall, I agree with dobey's suggestion and it got me thinking about another issue, comments inline.

review: Approve

[lp:~alecu/unity-scope-click/refunds-previews]

328. By Alejandro J. Cura on 2015-05-18

Don't call parse_timestamp twice in a row.

[Alejandro J. Cura (alecu)]

Thanks for the reviews, fixed as suggested.

[dobey (dobey)]

review: Approve

[lp:~alecu/unity-scope-click/refunds-previews]

329. By Alejandro J. Cura on 2015-05-20

Fixed the type of the timestamp stored in result variant

330. By Alejandro J. Cura on 2015-05-22

Call libpay.refund() from the qt thread

331. By Alejandro J. Cura on 2015-05-26

Add more logging before and after calling libpay

332. By Alejandro J. Cura on 2015-05-26

Initialize pay package before starting a refund

333. By Alejandro J. Cura on 2015-05-29

Now correctly setting up the pay package

=== modified file 'libclickscope/click/pay.cpp'
--- libclickscope/click/pay.cpp	2015-04-10 13:13:46 +0000
+++ libclickscope/click/pay.cpp	2015-05-29 21:20:25 +0000
@@ -82,7 +82,16 @@
 namespace pay {
 
 bool operator==(const Purchase& lhs, const Purchase& rhs) {
-    return lhs.name == rhs.name && lhs.refundable_until == rhs.refundable_until;
+    return lhs.name == rhs.name;
+}
+
+Package& Package::instance() {
+    static Package the_instance;
+    return the_instance;
+}
+
+Package::Package() : impl(new Private())
+{
 }
 
 Package::Package(const QSharedPointer<click::web::Client>& client) :
@@ -101,6 +110,16 @@
     }
 }
 
+bool Package::refund(const std::string& pkg_name)
+{
+    if (!running) {
+        qDebug() << "pay service starting";
+        setup_pay_service();
+    }
+    qDebug() << "actually calling refund";
+    return pay_package_item_start_refund(impl->pay_package, pkg_name.c_str());
+}
+
 bool Package::verify(const std::string& pkg_name)
 {
     typedef std::pair<std::string, bool> _PurchasedTuple;
@@ -167,8 +186,12 @@
                                  const json::Value item = root[i];
                                  if (item[JsonKeys::state].asString() == PURCHASE_STATE_COMPLETE) {
                                      auto package_name = item[JsonKeys::package_name].asString();
+                                     qDebug() << "parsing:" << package_name.c_str();
                                      auto refundable_until_value = item[JsonKeys::refundable_until];
-                                     Purchase p(package_name, parse_timestamp(refundable_until_value));
+                                     qDebug() << "refundable until:" << refundable_until_value.asString().c_str();
+                                     auto refundable_parsed = parse_timestamp(refundable_until_value);
+                                     qDebug() << "parsed:" << refundable_parsed;
+                                     Purchase p(package_name, refundable_parsed);
                                      purchases.insert(p);
                                  }
                              }
@@ -195,10 +218,17 @@
 
 void Package::setup_pay_service()
 {
-    impl->pay_package = pay_package_new(Package::NAME);
+    qDebug() << "new package";
+    PayPackage* newpkg = pay_package_new(Package::NAME);
+    qDebug() << "got package:" << newpkg;
+    qDebug() << "about to set it on impl:" << impl.isNull();
+    fprintf(stderr, "and the package is at: %p\n", impl->pay_package);
+    impl->pay_package = newpkg;
+    qDebug() << "installing observer";
     pay_package_item_observer_install(impl->pay_package,
                                       pay_verification_observer,
                                       this);
+    qDebug() << "Flag we are running";
     running = true;
 }
 
 
=== modified file 'libclickscope/click/pay.h'
--- libclickscope/click/pay.h	2015-04-10 13:13:46 +0000
+++ libclickscope/click/pay.h	2015-05-29 21:20:25 +0000
@@ -92,21 +92,22 @@
     public:
         constexpr static const char* NAME{"click-scope"};
 
-        Package() = default;
+        Package();
         Package(const QSharedPointer<click::web::Client>& client);
         virtual ~Package();
 
         virtual bool verify(const std::string& pkg_name);
         virtual click::web::Cancellable get_purchases(std::function<void(const PurchaseSet& purchased_apps)> callback);
-
+        virtual bool refund(const std::string& pkg_name);
         static std::string get_base_url();
+	static Package& instance();
 
     protected:
         virtual void setup_pay_service();
         virtual void pay_package_verify(const std::string& pkg_name);
 
         struct Private;
-        std::shared_ptr<pay::Package::Private> impl;
+        QScopedPointer<pay::Package::Private> impl;
 
         bool running = false;
         QSharedPointer<click::web::Client> client;
 
=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2015-04-10 14:24:10 +0000
+++ libclickscope/click/preview.cpp	2015-05-29 21:20:25 +0000
@@ -36,6 +36,7 @@
 #include <click/dbus_constants.h>
 #include <click/departments-db.h>
 #include <click/utils.h>
+#include <click/pay.h>
 
 #include <boost/algorithm/string/replace.hpp>
 
@@ -148,10 +149,16 @@
                            << " given with download_url" << QString::fromStdString(download_url);
                 return new UninstalledPreview(result, client, depts, nam);
             }
+        } else if (metadict.count(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) != 0) {
+            return new CancelPurchasePreview(result, false);
+        } else if (metadict.count(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) != 0) {
+            return new CancelPurchasePreview(result, true);
         } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
             return new UninstallConfirmationPreview(result);
         } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
             return new UninstallingPreview(result, client, nam);
+        } else if (metadict.count(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE) != 0) {
+            return new CancellingPurchasePreview(result, client, nam);
         } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
             return new InstalledPreview(result, metadata, client, depts);
         } else if (metadict.count(click::Preview::Actions::SHOW_UNINSTALLED) != 0) {
@@ -522,6 +529,16 @@
     return widgets;
 }
 
+bool PreviewStrategy::isRefundable() const
+{
+    time_t refundable_until = 0;
+    if (result.contains("refundable_until")) {
+        refundable_until = result["refundable_until"].get_int64_t();
+    }
+    time_t now = time(NULL);
+    // refund button is not shown if less than ten seconds left
+    return refundable_until >= (now + 10);
+}
 
 // class DownloadErrorPreview
 
@@ -747,10 +764,17 @@
     }
     if (manifest.removable)
     {
-        builder.add_tuple({
-            {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
-            {"label", scopes::Variant(_("Uninstall"))}
-        });
+        if (!isRefundable()) {
+            builder.add_tuple({
+                {"id", scopes::Variant(click::Preview::Actions::UNINSTALL_CLICK)},
+                {"label", scopes::Variant(_("Uninstall"))}
+            });
+        } else {
+            builder.add_tuple({
+                {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED)},
+                {"label", scopes::Variant(_("Cancel Purchase"))}
+            });
+        }
     }
     if (!uri.empty() || manifest.removable) {
         buttons.add_attribute_value("actions", builder.end());
@@ -852,6 +876,69 @@
     return widgets;
 }
 
+// class CancelPurchasePreview
+
+CancelPurchasePreview::CancelPurchasePreview(const unity::scopes::Result& result, bool installed)
+    : PreviewStrategy(result), installed(installed)
+{
+}
+
+CancelPurchasePreview::~CancelPurchasePreview()
+{
+}
+
+scopes::PreviewWidgetList CancelPurchasePreview::build_widgets()
+{
+    scopes::PreviewWidgetList widgets;
+
+    scopes::PreviewWidget confirmation("confirmation", "text");
+
+    std::string title = result["title"].get_string();
+    // TRANSLATORS: Do NOT translate ${title} here.
+    std::string message =
+        _("Are you sure you want to cancel the purchase of '${title}'? The app will be uninstalled.");
+
+    boost::replace_first(message, "${title}", title);
+    confirmation.add_attribute_value("text", scopes::Variant(message));
+    widgets.push_back(confirmation);
+
+    scopes::PreviewWidget buttons("buttons", "actions");
+    scopes::VariantBuilder builder;
+
+    auto action_no = installed ? click::Preview::Actions::SHOW_INSTALLED
+                               : click::Preview::Actions::SHOW_UNINSTALLED;
+
+    builder.add_tuple({
+       {"id", scopes::Variant(action_no)},
+       {"label", scopes::Variant(_("No"))}
+    });
+    builder.add_tuple({
+       {"id", scopes::Variant(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE)},
+       {"label", scopes::Variant(_("Yes, cancel purchase"))}
+    });
+
+    buttons.add_attribute_value("actions", builder.end());
+    widgets.push_back(buttons);
+
+    scopes::PreviewWidget policy("policy", "text");
+    policy.add_attribute_value("title", scopes::Variant{_("Returns and cancellation policy")});
+    policy.add_attribute_value("text", scopes::Variant{
+        _("When purchasing an app in the Ubuntu Store, you can cancel the charge within 15 minutes "
+          "after installation. If the cancel period has passed, we recommend contacting the app "
+          "developer directly for a refund.\n"
+          "You can find the developer’s contact information listed on the app’s preview page in the "
+          "Ubuntu Store.\n"
+          "Keep in mind that you cannot cancel the purchasing process of an app more than once.")});
+    widgets.push_back(policy);
+
+    return widgets;
+}
+
+void CancelPurchasePreview::run(unity::scopes::PreviewReplyProxy const& reply)
+{
+    // NOTE: no need to populateDetails() here.
+    reply->push(build_widgets());
+}
 
 // class UninstallConfirmationPreview
 
@@ -975,6 +1062,13 @@
                 {"download_url", scopes::Variant(details.download_url)},
                 {"download_sha512", scopes::Variant(details.download_sha512)},
             });
+        if (isRefundable()) {
+            builder.add_tuple(
+                {
+                    {"id", scopes::Variant(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED)},
+                    {"label", scopes::Variant(_("Cancel Purchase"))},
+                });
+        }
         buttons.add_attribute_value("actions", builder.end());
         oa_client.register_account_login_item(buttons,
                                               scopes::OnlineAccountClient::PostLoginAction::ContinueActivation,
@@ -1028,4 +1122,44 @@
 }
 
 
+// class CancellingPurchasePreview : public UninstallingPreview
+
+CancellingPurchasePreview::CancellingPurchasePreview(const unity::scopes::Result& result,
+                                         const QSharedPointer<click::web::Client>& client,
+                                         const QSharedPointer<click::network::AccessManager>& nam)
+      : UninstallingPreview(result, client, nam)
+{
+}
+
+CancellingPurchasePreview::~CancellingPurchasePreview()
+{
+}
+
+void CancellingPurchasePreview::run(unity::scopes::PreviewReplyProxy const& reply)
+{
+    qDebug() << "in CancellingPurchasePreview::run, calling cancel_purchase";
+    cancel_purchase();
+    qDebug() << "in CancellingPurchasePreview::run, calling UninstallingPreview::run()";
+    UninstallingPreview::run(reply);
+}
+
+void CancellingPurchasePreview::cancel_purchase()
+{
+    auto package_name = result["name"].get_string();
+    qDebug() << "Will cancel the purchase of:" << package_name.c_str();
+
+    std::promise<bool> refund_promise;
+    std::future<bool> refund_future = refund_promise.get_future();
+
+    run_under_qt([&refund_promise, package_name]() {
+        qDebug() << "Calling refund for:" << package_name.c_str();
+        auto ret = pay::Package::instance().refund(package_name);
+        qDebug() << "Refund returned:" << ret;
+        refund_promise.set_value(ret);
+    });
+    bool finished = refund_future.get();
+    qDebug() << "Finished refund:" << finished;
+}
+
+
 } // namespace click
 
=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2015-04-10 14:24:10 +0000
+++ libclickscope/click/preview.h	2015-05-29 21:20:25 +0000
@@ -98,8 +98,11 @@
         constexpr static const char* PIN_TO_LAUNCHER{"pin_to_launcher"};
         constexpr static const char* UNINSTALL_CLICK{"uninstall_click"};
         constexpr static const char* CONFIRM_UNINSTALL{"confirm_uninstall"};
+        constexpr static const char* CANCEL_PURCHASE_UNINSTALLED{"cancel_purchase_uninstalled"};
+        constexpr static const char* CANCEL_PURCHASE_INSTALLED{"cancel_purchase_installed"};
         constexpr static const char* SHOW_UNINSTALLED{"show_uninstalled"};
         constexpr static const char* SHOW_INSTALLED{"show_installed"};
+        constexpr static const char* CONFIRM_CANCEL_PURCHASE{"confirm_cancel_purchase"};
         constexpr static const char* OPEN_ACCOUNTS{"open_accounts"};
         constexpr static const char* RATED{"rated"};
     };
@@ -151,6 +154,7 @@
     virtual scopes::PreviewWidget build_updates_table(const PackageDetails& details);
     virtual std::string build_whats_new(const PackageDetails& details);
     virtual void run_under_qt(const std::function<void ()> &task);
+    virtual bool isRefundable() const;
 
     scopes::Result result;
     QSharedPointer<click::web::Client> client;
@@ -209,10 +213,9 @@
 
 protected:
     void getApplicationUri(const Manifest& manifest, std::function<void(const std::string&)> callback);
-
+    scopes::PreviewWidgetList createButtons(const std::string& uri,
+                                            const click::Manifest& manifest);
 private:
-    static scopes::PreviewWidgetList createButtons(const std::string& uri,
-                                                   const click::Manifest& manifest);
     scopes::ActionMetadata metadata;
 };
 
@@ -236,6 +239,20 @@
     virtual scopes::PreviewWidgetList purchasingWidgets(const PackageDetails &);
 };
 
+class CancelPurchasePreview : public PreviewStrategy
+{
+public:
+    CancelPurchasePreview(const unity::scopes::Result& result, bool installed);
+
+    virtual ~CancelPurchasePreview();
+
+    void run(unity::scopes::PreviewReplyProxy const& reply) override;
+
+protected:
+    scopes::PreviewWidgetList build_widgets();
+    bool installed;
+};
+
 class UninstallConfirmationPreview : public PreviewStrategy
 {
 public:
@@ -284,6 +301,21 @@
 
 };
 
+class CancellingPurchasePreview : public UninstallingPreview
+{
+public:
+    CancellingPurchasePreview(const unity::scopes::Result& result,
+                              const QSharedPointer<click::web::Client>& client,
+                              const QSharedPointer<click::network::AccessManager>& nam);
+
+    virtual ~CancellingPurchasePreview();
+
+    void run(unity::scopes::PreviewReplyProxy const& reply) override;
+
+protected:
+    void cancel_purchase();
+};
+
 } // namespace click
 
 #endif
 
=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2015-03-26 18:49:42 +0000
+++ libclickscope/tests/test_preview.cpp	2015-05-29 21:20:25 +0000
@@ -27,6 +27,8 @@
  * files in the program, then also delete it here.
  */
 
+#include <time.h>
+
 #include <unity/scopes/testing/MockPreviewReply.h>
 #include <unity/scopes/testing/Result.h>
 
@@ -34,6 +36,7 @@
 #include <click/preview.h>
 #include <fake_json.h>
 #include <click/index.h>
+#include <click/interface.h>
 #include <click/reviews.h>
 #include <boost/locale/time_zone.hpp>
 
@@ -100,6 +103,7 @@
     using click::PreviewStrategy::build_updates_table;
     using click::PreviewStrategy::build_whats_new;
     using click::PreviewStrategy::populateDetails;
+    using click::PreviewStrategy::isRefundable;
 };
 
 class PreviewsBaseTest : public Test
@@ -330,15 +334,15 @@
     }
 };
 
-class FakeUninstalledPreview : public click::UninstalledPreview {
+class FakeBaseUninstalledPreview : public click::UninstalledPreview {
     std::string object_path;
 public:
     std::unique_ptr<FakeDownloader> fake_downloader;
-    FakeUninstalledPreview(const std::string& object_path,
-                           const unity::scopes::Result& result,
-                           const QSharedPointer<click::web::Client>& client,
-                           const std::shared_ptr<click::DepartmentsDb>& depts,
-                           const QSharedPointer<click::network::AccessManager>& nam)
+    FakeBaseUninstalledPreview(const std::string& object_path,
+                               const unity::scopes::Result& result,
+                               const QSharedPointer<click::web::Client>& client,
+                               const std::shared_ptr<click::DepartmentsDb>& depts,
+                               const QSharedPointer<click::network::AccessManager>& nam)
         : click::UninstalledPreview(result, client, depts, nam), object_path(object_path),
           fake_downloader(new FakeDownloader(object_path, nam))
     {
@@ -356,10 +360,22 @@
         details_callback(details);
         reviews_callback({}, click::Reviews::Error::NoError);
     }
+};
+
+class FakeUninstalledPreview : public FakeBaseUninstalledPreview {
+public:
     MOCK_METHOD1(uninstalledActionButtonWidgets, scopes::PreviewWidgetList (const click::PackageDetails &details));
     MOCK_METHOD1(progressBarWidget, scopes::PreviewWidgetList(const std::string& object_path));
+    FakeUninstalledPreview(const std::string& object_path,
+                           const unity::scopes::Result& result,
+                           const QSharedPointer<click::web::Client>& client,
+                           const std::shared_ptr<click::DepartmentsDb>& depts,
+                           const QSharedPointer<click::network::AccessManager>& nam)
+        : FakeBaseUninstalledPreview(object_path, result, client, depts, nam) {
+    }
 };
 
+
 TEST_F(UninstalledPreviewTest, testDownloadInProgress) {
     std::string fake_object_path = "/fake/object/path";
 
@@ -385,3 +401,180 @@
     preview.run(replyptr);
     preview.fake_downloader->activate_callback();
 }
+
+class FakeUninstalledRefundablePreview : FakeBaseUninstalledPreview {
+public:
+    FakeUninstalledRefundablePreview(const unity::scopes::Result& result,
+                          const QSharedPointer<click::web::Client>& client,
+                          const std::shared_ptr<click::DepartmentsDb>& depts,
+                          const QSharedPointer<click::network::AccessManager>& nam)
+        : FakeBaseUninstalledPreview(std::string{""}, result, client, depts, nam){
+    }
+    using click::UninstalledPreview::uninstalledActionButtonWidgets;
+    MOCK_CONST_METHOD0(isRefundable, bool());
+};
+
+unity::scopes::VariantArray get_actions_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number) {
+    auto widget = *std::next(widgets.begin(), widget_number);
+    return widget.attribute_values()["actions"].get_array();
+}
+
+std::string get_action_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number, int action_number) {
+    auto actions = get_actions_from_widgets(widgets, widget_number);
+    auto selected_action = actions.at(action_number).get_dict();
+    return selected_action["id"].get_string();
+}
+
+TEST_F(UninstalledPreviewTest, testIsRefundableButtonShown) {
+    result["name"] = "fake_app_name";
+    result["price"] = 2.99;
+    result["purchased"] = true;
+    FakeUninstalledRefundablePreview preview(result, client, depts, nam);
+
+    click::PackageDetails pkgdetails;
+    EXPECT_CALL(preview, isRefundable()).Times(1)
+            .WillOnce(Return(true));
+    auto widgets = preview.uninstalledActionButtonWidgets(pkgdetails);
+    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "cancel_purchase_uninstalled");
+}
+
+TEST_F(UninstalledPreviewTest, testIsRefundableButtonNotShown) {
+    result["name"] = "fake_app_name";
+    result["price"] = 2.99;
+    result["purchased"] = true;
+    FakeUninstalledRefundablePreview preview(result, client, depts, nam);
+
+    click::PackageDetails pkgdetails;
+    EXPECT_CALL(preview, isRefundable()).Times(1)
+            .WillOnce(Return(false));
+    auto widgets = preview.uninstalledActionButtonWidgets(pkgdetails);
+    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 1);
+}
+
+class InstalledPreviewTest : public Test {
+protected:
+    unity::scopes::testing::Result result;
+    unity::scopes::ActionMetadata metadata;
+    unity::scopes::VariantMap metadict;
+    QSharedPointer<click::web::Client> client;
+    QSharedPointer<click::network::AccessManager> nam;
+    std::shared_ptr<click::DepartmentsDb> depts;
+
+public:
+    InstalledPreviewTest() : metadata("en_EN", "phone") {
+    }
+};
+
+class FakeInstalledRefundablePreview : public click::InstalledPreview  {
+public:
+    FakeInstalledRefundablePreview(const unity::scopes::Result& result,
+                                   const unity::scopes::ActionMetadata& metadata,
+                                   const QSharedPointer<click::web::Client> client,
+                                   const std::shared_ptr<click::DepartmentsDb> depts)
+        : click::InstalledPreview(result, metadata, client, depts) {
+
+    }
+    using click::InstalledPreview::createButtons;
+    MOCK_CONST_METHOD0(isRefundable, bool());
+};
+
+TEST_F(InstalledPreviewTest, testIsRefundableButtonShown) {
+    FakeInstalledRefundablePreview preview(result, metadata, client, depts);
+    EXPECT_CALL(preview, isRefundable()).Times(1)
+            .WillOnce(Return(true));
+    click::Manifest manifest;
+    manifest.removable = true;
+    auto widgets = preview.createButtons("fake uri", manifest);
+    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
+    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "cancel_purchase_installed");
+}
+
+TEST_F(InstalledPreviewTest, testIsRefundableButtonNotShown) {
+    FakeInstalledRefundablePreview preview(result, metadata, client, depts);
+    EXPECT_CALL(preview, isRefundable()).Times(1)
+            .WillOnce(Return(false));
+    click::Manifest manifest;
+    manifest.removable = true;
+    auto widgets = preview.createButtons("fake uri", manifest);
+    ASSERT_EQ(get_actions_from_widgets(widgets, 0).size(), 2);
+    ASSERT_EQ(get_action_from_widgets(widgets, 0, 1), "uninstall_click");
+}
+
+
+class RefundableTest : public PreviewStrategyTest {
+
+};
+
+TEST_F(RefundableTest, testIsNotRefundableWhenFieldMissing) {
+    FakeResult result{vm};
+    FakePreview preview{result};
+    ASSERT_FALSE(preview.isRefundable());
+}
+
+TEST_F(RefundableTest, testIsNotRefundableWhenExpired) {
+    FakeResult result{vm};
+    time_t now = time(NULL);
+    result["refundable_until"] = (int64_t) (now - 300);
+    FakePreview preview{result};
+    ASSERT_FALSE(preview.isRefundable());
+}
+
+TEST_F(RefundableTest, testIsRefundable) {
+    FakeResult result{vm};
+    time_t now = time(NULL);
+    result["refundable_until"] = (int64_t) (now + 300);
+    FakePreview preview{result};
+    ASSERT_TRUE(preview.isRefundable());
+}
+
+TEST_F(RefundableTest, testIsNotRefundableWhenExpiringRealSoon) {
+    FakeResult result{vm};
+    time_t now = time(NULL);
+    result["refundable_until"] = (int64_t) (now + 8);
+    FakePreview preview{result};
+    ASSERT_FALSE(preview.isRefundable());
+}
+
+
+class FakeCancelPurchasePreview : public click::CancelPurchasePreview  {
+public:
+    FakeCancelPurchasePreview(const unity::scopes::Result& result, bool installed)
+        : click::CancelPurchasePreview(result, installed) {
+
+    }
+    using click::CancelPurchasePreview::build_widgets;
+};
+
+class CancelPurchasePreviewTest : public PreviewsBaseTest {
+
+};
+
+TEST_F(CancelPurchasePreviewTest, testNoShowsInstalled)
+{
+    FakeResult result{vm};
+    result["title"] = "fake app";
+    FakeCancelPurchasePreview preview(result, true);
+    auto widgets = preview.build_widgets();
+    auto action = get_action_from_widgets(widgets, 1, 0);
+    ASSERT_EQ(action, "show_installed");
+}
+
+TEST_F(CancelPurchasePreviewTest, testNoShowsUninstalled)
+{
+    FakeResult result{vm};
+    result["title"] = "fake app";
+    FakeCancelPurchasePreview preview(result, false);
+    auto widgets = preview.build_widgets();
+    auto action = get_action_from_widgets(widgets, 1, 0);
+    ASSERT_EQ(action, "show_uninstalled");
+}
+
+TEST_F(CancelPurchasePreviewTest, testYesCancelsPurchase)
+{
+    FakeResult result{vm};
+    result["title"] = "fake app";
+    FakeCancelPurchasePreview preview(result, false);
+    auto widgets = preview.build_widgets();
+    auto action = get_action_from_widgets(widgets, 1, 1);
+    ASSERT_EQ(action, "confirm_cancel_purchase");
+}
 
=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2015-04-10 14:24:10 +0000
+++ scope/clickapps/apps-scope.cpp	2015-05-29 21:20:25 +0000
@@ -118,6 +118,12 @@
     if (action_id == click::Preview::Actions::UNINSTALL_CLICK) {
         activation->setHint(click::Preview::Actions::UNINSTALL_CLICK, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) {
+        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) {
+        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == click::Preview::Actions::SHOW_INSTALLED) {
         activation->setHint(click::Preview::Actions::SHOW_INSTALLED, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
 
=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2015-03-18 14:00:53 +0000
+++ scope/clickstore/store-query.cpp	2015-05-29 21:20:25 +0000
@@ -293,7 +293,8 @@
         ss << "☆ " << pkg.rating;
         std::string rating{ss.str()};
 
-        bool purchased = false;
+        bool was_purchased = false;
+        time_t refundable_until = 0;
         double cur_price{0.00};
         auto suggested = impl->index.get_suggested_currency();
         std::string currency = Configuration::get_currency(suggested);
@@ -307,20 +308,27 @@
         res["price"] = scopes::Variant(cur_price);
         res[click::Query::ResultKeys::VERSION] = pkg.version;
 
+
+        qDebug() << "App:" << pkg.name.c_str() << ", price:" << cur_price;
         if (cur_price > 0.00f) {
             if (!Configuration::get_purchases_enabled()) {
                 // Don't show priced apps if flag not set
                 return;
             }
             // Check if the priced app was already purchased.
-            purchased = purchased_apps.count({pkg.name}) != 0;
+            auto purchased = purchased_apps.find({pkg.name});
+            was_purchased = purchased != purchased_apps.end();
+            if (was_purchased) {
+                refundable_until = purchased->refundable_until;
+            }
+            qDebug() << "was purchased?" << was_purchased << ", refundable_until:" << refundable_until;
         }
         if (installed != installedPackages.end()) {
             res[click::Query::ResultKeys::INSTALLED] = true;
-            res[click::Query::ResultKeys::PURCHASED] = purchased;
+            res[click::Query::ResultKeys::PURCHASED] = was_purchased;
             price = _("✔ INSTALLED");
             res[click::Query::ResultKeys::VERSION] = installed->version;
-        } else if (purchased) {
+        } else if (was_purchased) {
             res[click::Query::ResultKeys::PURCHASED] = true;
             res[click::Query::ResultKeys::INSTALLED] = false;
             price = _("✔ PURCHASED");
@@ -336,6 +344,7 @@
             }
         }
 
+        res[click::Query::ResultKeys::REFUNDABLE_UNTIL] = unity::scopes::Variant((int64_t)refundable_until);
         res["price_area"] = price;
         res["rating"] = rating;
 
 
=== modified file 'scope/clickstore/store-query.h'
--- scope/clickstore/store-query.h	2015-04-10 13:13:46 +0000
+++ scope/clickstore/store-query.h	2015-05-29 21:20:25 +0000
@@ -64,6 +64,7 @@
         constexpr static const char* MAIN_SCREENSHOT{"main_screenshot"};
         constexpr static const char* INSTALLED{"installed"};
         constexpr static const char* PURCHASED{"purchased"};
+        constexpr static const char* REFUNDABLE_UNTIL{"refundable_until"};
         constexpr static const char* VERSION{"version"};
     };
 
 
=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2015-04-10 14:24:10 +0000
+++ scope/clickstore/store-scope.cpp	2015-05-29 21:20:25 +0000
@@ -145,6 +145,12 @@
     } else if (action_id == click::Preview::Actions::DOWNLOAD_COMPLETED) {
         activation->setHint(click::Preview::Actions::DOWNLOAD_COMPLETED, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) {
+        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) {
+        activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == click::Preview::Actions::UNINSTALL_CLICK) {
         activation->setHint(click::Preview::Actions::UNINSTALL_CLICK, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
@@ -157,6 +163,9 @@
     } else if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
         activation->setHint(click::Preview::Actions::CONFIRM_UNINSTALL, unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
+    } else if (action_id == click::Preview::Actions::CONFIRM_CANCEL_PURCHASE) {
+        activation->setHint(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE, unity::scopes::Variant(true));
+        activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == click::Preview::Actions::RATED) {
         scopes::VariantMap rating_info = metadata.scope_data().get_dict();
         // Cast to int because widget gives us double, which is wrong.