Merge lp:~dobey/pay-service/merge-payui into lp:pay-service

[dobey]

Merge pay-ui into pay-service.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/pay-service-ci/146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/76/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/pay-service-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-amd64-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/pay-service-wily-armhf-ci/77/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

Reviewed the glue code, eg the packaging changes, pay-ui launcher changes etc. I didn't review the code in pay-ui/ since it's not new & is just being merged over from a different repo.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-12-11 19:49:20 +0000
+++ .bzrignore	2016-03-11 14:49:24 +0000
@@ -8,7 +8,8 @@
 *.so.*
 *.mo
 *.service
-
-
+pay-ui/pay-ui
+
+__pycache__
 build/
 builddir/

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-13 02:28:18 +0000
+++ CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -35,7 +35,6 @@
 
 pkg_check_modules (SERVICE_DEPS REQUIRED
   Qt5Core
-  click-0.4
   dbus-cpp
   dbustest-1
   gio-2.0
@@ -87,12 +86,12 @@
 add_subdirectory(common)
 add_subdirectory(libpay)
 add_subdirectory(service-ng)
-add_subdirectory(ual-helper)
 add_subdirectory(data)
 if (${enable_tests})
   add_subdirectory(tests)
 endif ()
 add_subdirectory(pay-test-app)
+add_subdirectory(pay-ui)
 add_subdirectory(po)
 
 ##

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2016-03-11 14:49:24 +0000
@@ -0,0 +1,85 @@
+pay-service hacking guide
+===============================
+
+Getting pay-service
+-------------------------
+
+To get the main branch of pay-service:
+
+    $ bzr branch lp:pay-service
+
+
+Getting dependencies
+--------------------
+
+To succesfully build pay-service extra packages are required:
+
+    $ sudo apt-get build-dep pay-service
+
+
+Building pay-service
+------------------
+
+This app is built using cmake. Here's an example on how to build it:
+
+    $ mkdir build
+    $ cd build
+    $ cmake ..
+    $ make -j 8
+
+
+Running the unit tests
+----------------------
+
+    $ make test
+
+
+Running the autopilot tests
+---------------------------
+
+To run the autopilot tests locally, you first need to build pay-service.
+
+    $ make autopilot
+
+The autopilot tests can also be run against a built debian package, under
+qemu. To do so, you will need some additional packages. Most importantly,
+you will need the latest version of the autopkgtest package. You can download
+it at https://launchpad.net/ubuntu/+source/autopkgtest by selecting the most
+recent build for the most recent version of Ubuntu. 
+
+    $ sudo dpkg -i autopkgtest*.deb
+    $ sudo apt-get install qemu
+
+After installing autopkgtest and qemu, you need to build an image for qemu
+to use. We use vivid here, as building an image to closely resemble the actual
+stable phone images is quite difficult. When this is easier in the future, we
+will switch to using stable phone images for this. The architecture argument
+should match the architecture of the debian package you are trying to test.
+We output the image to ~/ rather than the current directory, so it will be in
+a safer place to avoid rebuilding images every time. You can store it in any
+directory you wish.
+
+    $ adt-buildvm-ubuntu-cloud -r vivid -a amd64 -o ~/
+
+Then the tests may be run using adt-run with the qemu virtualization host.
+The output directory option here can be wherever you like, and is where the
+test artifacts will be placed. The ordering of the arguments to adt-run is
+important so try to keep them in this order.
+
+    $ adt-run --click-source . \
+      --source ../pay-service*.dsc \
+      -o /tmp/adt-payui-test \
+      --setup-commands "add-apt-repository \
+          ppa:ci-train-ppa-service/stable-phone-overlay" \
+      --apt-pocket proposed \
+      --setup-commands "apt-get update" \
+      --setup-commands ubuntu-touch-session \
+      --- qemu ~/adt-vivid-amd64-cloud.img
+
+To examine the test results, which are in subunit format, additional tools are
+required.
+
+    $ sudo add-apt-repository ppa:thomir/trv
+    $ sudo apt-get update
+    $ sudo apt-get install trv
+    $ trv /tmp/adt-payui-test/artifacts/autopilot.subunit

=== modified file 'debian/control'
--- debian/control	2015-12-11 22:14:01 +0000
+++ debian/control	2016-03-11 14:49:24 +0000
@@ -2,8 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: click-dev,
-               cmake,
+Build-Depends: cmake,
                cmake-extras,
                dbus,
                dbus-test-runner,
@@ -15,7 +14,6 @@
                google-mock,
                intltool,
                lcov,
-               libclick-0.4-dev,
                libdbus-1-dev,
                libdbus-cpp-dev,
                libdbustest1-dev,
@@ -26,12 +24,15 @@
                libproperties-cpp-dev,
                libtrust-store-dev,
                libubuntu-app-launch2-dev (>= 0.5),
+               libubuntuoneauth-2.0-dev,
                pkg-config,
                python3-dbusmock,
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
                sysvinit-utils,
+               xvfb,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/pay-service
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -44,6 +45,7 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         pay-ui (= ${binary:Version}),
          sysvinit-utils,
          ubuntu-push-client (>= 0.68+15.04.20151009),
 Recommends: gnupg,
@@ -54,7 +56,23 @@
  payment provider and give that money to the developer. This service
  coordinates the payment interaction with the server on the device.
  .
- This package provides a service for the Pay Service
+ This package provides a service for the Pay Service.
+
+Package: pay-ui
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ qtdeclarative5-ubuntu-web-plugin [amd64 armhf i386],
+ qtdeclarative5-online-accounts-client0.1,
+ qtdeclarative5-ubuntu-ui-toolkit-plugin,
+Description: service to allow requesting payment for an item - user interface
+ Allows applications to request an item be paid for by the user.
+ This requires interaction with the server backend to handle the
+ payment provider and give that money to the developer. This service
+ coordinates the payment interaction with the server on the device.
+ .
+ This package provides the user interface for the Pay Service.
 
 Package: libpay2
 Architecture: any

=== modified file 'debian/copyright'
--- debian/copyright	2015-12-10 22:04:32 +0000
+++ debian/copyright	2016-03-11 14:49:24 +0000
@@ -3,7 +3,7 @@
 Source: http://launchpad.net/pay-service
 
 Files: *
-Copyright: 2014-2015 Canonical, Ltd.
+Copyright: 2014-2016 Canonical, Ltd.
 License: GPL-3
 
 Files: libpay/*
@@ -27,7 +27,7 @@
 License: LGPL-3
 
 Files: service-ng/src/launchpad.net/go-mir/*
-Copyright: 2015 Canonical, Ltd.
+Copyright: 2015-2016 Canonical, Ltd.
 License: LGPL-3
 
 Files: service-ng/src/launchpad.net/go-trust-store/*

=== removed file 'debian/pay-service.click-hook'
--- debian/pay-service.click-hook	2014-07-10 13:34:44 +0000
+++ debian/pay-service.click-hook	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-Pattern: ${home}/.cache/pay-service/pay-ui/${id}.desktop
-Exec: /bin/true
-User-Level: yes
-Hook-Name: pay-ui

=== modified file 'debian/pay-service.install'
--- debian/pay-service.install	2015-12-09 18:18:45 +0000
+++ debian/pay-service.install	2016-03-11 14:49:24 +0000
@@ -1,5 +1,5 @@
 usr/lib/*/pay-service/pay-service-2
 usr/lib/*/pay-service/setup-staging.sh
-usr/lib/*/ubuntu-app-launch/pay-ui/*
+usr/share/locale/*/LC_MESSAGES/pay-service.mo
 usr/share/dbus-1/services/*.service
-usr/share/upstart/sessions/*.conf
\ No newline at end of file
+usr/share/upstart/sessions/*.conf

=== added file 'debian/pay-ui.install'
--- debian/pay-ui.install	1970-01-01 00:00:00 +0000
+++ debian/pay-ui.install	2016-03-11 14:49:24 +0000
@@ -0,0 +1,3 @@
+usr/lib/payui
+usr/lib/*/payui
+usr/share/payui

=== modified file 'debian/rules'
--- debian/rules	2015-10-14 20:53:54 +0000
+++ debian/rules	2016-03-11 14:49:24 +0000
@@ -10,4 +10,4 @@
 	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/pay-service
 
 %:
-	dh $@ --parallel --fail-missing --with click
+	dh $@ --parallel --fail-missing

=== added directory 'pay-ui'
=== added file 'pay-ui/CMakeLists.txt'
--- pay-ui/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,21 @@
+# Need xvfb-run for some tests.
+set(XVFB_CMD xvfb-run -a -s "-screen 0 540x960x24")
+
+# Standard install paths
+set(APP_NAME payui)
+
+set(QT_IMPORTS_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/payui")
+set(PAYUI_DIR "${CMAKE_INSTALL_FULL_DATADIR}/payui/qml")
+
+add_subdirectory(app)
+add_subdirectory(backend)
+
+configure_file(pay-ui.in pay-ui)
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pay-ui
+  DESTINATION lib/payui
+)
+
+add_custom_target("autopilot"
+  COMMAND PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/tests/autopilot BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} U1_DEBUG=1 ${XVFB_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/tests/autopilot/run_autopilot
+  DEPENDS payuibackend payuibackend-qmldir
+)

=== added directory 'pay-ui/app'
=== added file 'pay-ui/app/CMakeLists.txt'
--- pay-ui/app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/app/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,6 @@
+file(GLOB QML_JS_FILES *.qml *.js)
+
+install(FILES ${QML_JS_FILES} DESTINATION ${PAYUI_DIR})
+
+add_subdirectory(components)
+add_subdirectory(ui)

=== added directory 'pay-ui/app/components'
=== added file 'pay-ui/app/components/AlertDialog.qml'
--- pay-ui/app/components/AlertDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/AlertDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    objectName: "alertDialog"
+    title: i18n.dtr("webbrowser-app", "JavaScript Alert")
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        onClicked: model.accept()
+    }
+}

=== added file 'pay-ui/app/components/BeforeUnloadDialog.qml'
--- pay-ui/app/components/BeforeUnloadDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/BeforeUnloadDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    title: i18n.dtr("webbrowser-app", "Confirm Navigation")
+    objectName: "beforeUnloadDialog"
+
+    Button {
+        objectName: "leaveButton"
+        text: i18n.dtr("webbrowser-app", "Leave")
+        onClicked: model.accept()
+    }
+
+    Button {
+        objectName: "stayButton"
+        text: i18n.dtr("webbrowser-app", "Stay")
+        onClicked: model.reject()
+    }
+}

=== added file 'pay-ui/app/components/CMakeLists.txt'
--- pay-ui/app/components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,6 @@
+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(payui_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
+
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${PAYUI_DIR}/components)

=== added file 'pay-ui/app/components/ConfirmDialog.qml'
--- pay-ui/app/components/ConfirmDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/ConfirmDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    objectName: "confirmDialog"
+    title: i18n.dtr("webbrowser-app", "JavaScript Confirmation")
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        onClicked: model.accept()
+    }
+
+    Button {
+        objectName: "dialogCancelButton"
+        text: i18n.dtr("webbrowser-app", "Cancel")
+        onClicked: model.reject()
+    }
+}

=== added file 'pay-ui/app/components/ModalDialog.qml'
--- pay-ui/app/components/ModalDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/ModalDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0 as Popups
+
+Popups.Dialog {
+    text: model.message
+
+    // Set the parent at construction time, instead of letting show()
+    // set it later on, which for some reason results in the size of
+    // the dialog not being updated.
+    parent: QuickUtils.rootItem(this)
+
+    Component.onCompleted: show()
+}

=== added file 'pay-ui/app/components/PromptDialog.qml'
--- pay-ui/app/components/PromptDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/PromptDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+ModalDialog {
+    title: i18n.dtr("webbrowser-app", "JavaScript Prompt")
+
+    TextField {
+        objectName: "dialogInput"
+        id: input
+        text: model.defaultValue
+        onAccepted: model.accept(input.text)
+    }
+
+    Button {
+        objectName: "dialogOkButton"
+        text: i18n.dtr("webbrowser-app", "OK")
+        color: "green"
+        onClicked: model.accept(input.text)
+    }
+
+    Button {
+        objectName: "dialogCancelButton"
+        text: i18n.dtr("webbrowser-app", "Cancel")
+        color: UbuntuColors.coolGrey
+        onClicked: model.reject()
+    }
+
+    Binding {
+        target: model
+        property: "currentValue"
+        value: input.text
+    }
+}

=== added file 'pay-ui/app/components/SecurityCertificatePopover.qml'
--- pay-ui/app/components/SecurityCertificatePopover.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/components/SecurityCertificatePopover.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
+import payui 0.1 as Oxide
+
+Popover {
+    id: certificatePopover
+
+    property var securityStatus
+
+    Column {
+        width: parent.width - units.gu(4)
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: units.gu(0.5)
+
+        Item {
+            height: units.gu(1.5)
+            width: parent.width
+        }
+
+        Column {
+            width: parent.width
+            visible: securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelWarning
+            spacing: units.gu(0.5)
+
+            Row {
+                width: parent.width
+                spacing: units.gu(0.5)
+
+                Icon {
+                    name: "security-alert"
+                    height: units.gu(2)
+                    width: height
+                }
+
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    text: i18n.dtr("webbrowser-app", "This site has insecure content")
+                    fontSize: "x-small"
+                }
+            }
+
+            ThinDivider {
+                width: parent.width
+                anchors.leftMargin: 0
+                anchors.rightMargin: 0
+            }
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            text: i18n.dtr("webbrowser-app", "You are connected to")
+            fontSize: "x-small"
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            text: securityStatus.certificate.subjectDisplayName
+            fontSize: "x-small"
+        }
+
+        ThinDivider {
+            width: parent.width
+            anchors.leftMargin: 0
+            anchors.rightMargin: 0
+            visible: orgName.visible || localityName.visible || stateName.visible || countryName.visible
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: orgName.visible
+            text: i18n.dtr("webbrowser-app", "Which is run by")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: orgName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrOrganizationName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: localityName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrLocalityName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: stateName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrStateOrProvinceName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Label {
+            id: countryName
+            width: parent.width
+            wrapMode: Text.WordWrap
+            visible: text.length > 0
+            text: securityStatus.certificate.getSubjectInfo(Oxide.SslCertificate.PrincipalAttrCountryName).join(", ")
+            fontSize: "x-small"
+        }
+
+        Item {
+            height: units.gu(1.5)
+            width: parent.width
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: PopupUtils.close(certificatePopover)
+    }
+}

=== added file 'pay-ui/app/payui.qml'
--- pay-ui/app/payui.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/payui.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,459 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+import payui 0.1
+import "ui"
+
+/*!
+    states:
+        - add-payment
+        - buy-interaction
+        - checkout
+        - online-accounts
+        - error
+*/
+
+MainView {
+    id: mainView
+    // objectName for functional testing purposes (autopilot-qt5)
+    objectName: "payui"
+
+    // NOTE: Must match the gettext domain for translations.
+    applicationName: "pay-service"
+
+    /*
+     This property enables the application to change orientation
+     when the device is rotated. The default is false.
+    */
+    // automaticOrientation: true
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    useDeprecatedToolbar: false
+
+    property bool loading: true
+    property bool purchasing: false
+    property bool recentLogin: false
+    property bool cancellable: true
+    property string suggestedCurrency: "USD"
+
+    backgroundColor: "transparent"
+
+    onStateChanged: {
+        mainView.backgroundColor = "white";
+    }
+
+    AccountServiceModel {
+        id: accounts
+        provider: "ubuntuone"
+    }
+
+    Setup {
+        id: setup
+        applicationId: "pay-service"
+        providerId: "ubuntuone"
+
+        onFinished: {
+            mainView.recentLogin = true;
+            mainView.showLoading();
+            purchase.checkCredentials();
+        }
+    }
+
+    Purchase {
+        id: purchase
+
+        onItemDetailsObtained: {
+            suggestedCurrency = currency;
+            checkout.itemIcon = icon;
+            checkout.itemTitle = title;
+            checkout.itemSubtitle = publisher;
+            checkout.price = formatted_price;
+        }
+
+        onPaymentTypesObtained: {
+            mainView.recentLogin = mainView.recentCredentials();
+            checkout.beforeTimeout = mainView.recentLogin;
+
+            // Check for selected payment, and keep it selected if so.
+            if (checkout.hasSelectedPayment) {
+                for (var i=0; i < payments.length; i++) {
+                    if (payments[i].paymentId == checkout.paymentId &&
+                        payments[i].backendId == checkout.backendId) {
+                            payments[i].preferred = true;
+                    } else {
+                        payments[i].preferred = false;
+                    }
+                }
+            }
+            checkout.model = payments;
+            checkout.hasPayments = payments.length != 0;
+            checkout.setSelectedItem();
+
+            mainView.state = "checkout";
+            pageStack.push(checkout);
+
+            hideLoading();
+        }
+
+        onNoPreferredPaymentMethod: {
+            checkout.hasPreferredPayment = false;
+            var values = mainView.getLastPayment();
+            var backendid = values[0];
+            var paymentid = values[1];
+            if (backendid != "" && paymentid != "") {
+                checkout.hasStoredPayment = true;
+            }
+        }
+
+        onPasswordValid: {
+            hideLoading();
+            // Reset password and otp to not keep them in memory.
+            checkout.password = "";
+            checkout.otp = "";
+        }
+
+        onBuyItemFailed: {
+            hideLoading();
+            purchaseErrorDialog.open = true;
+        }
+
+        onBuyItemSucceeded: {
+            purchase.quitSuccess();
+        }
+
+        onBuyInterationRequired: {
+            mainView.purchasing = false;
+            webkit.title = i18n.tr("Finish Purchase");
+            webkit.url = url;
+            mainView.state = "buy-interaction";
+            pageStack.push(webkit);
+        }
+
+        onError: {
+            hideLoading();
+            serverErrorDialog.open = true;
+        }
+
+        onAuthenticationError: {
+            mainView.recentLogin = false;
+            if (pageStack.currentPage == checkout) {
+                mainView.hideLoading();
+                checkout.showErrorMessage(i18n.tr("Incorrect Password, please try again."));
+            } else {
+                mainView.state = "online-accounts";
+                setup.exec();
+            }
+        }
+
+        onCredentialsFound: {
+            mainView.recentLogin = mainView.recentCredentials();
+            checkout.beforeTimeout = mainView.recentLogin;
+
+            if (mainView.state == "online-accounts") {
+                purchase.checkItemPurchased();
+            } else if (mainView.state != "checkout" && !mainView.purchasing && mainView.state != "buy-interaction") {
+                purchase.getPaymentTypes(suggestedCurrency);
+            }
+            purchase.getItemDetails();
+        }
+
+        onItemNotPurchased: {
+            purchase.getPaymentTypes(suggestedCurrency);
+        }
+
+        onCredentialsNotFound: {
+            mainView.recentLogin = false;
+            if (mainView.state == "online-accounts") {
+                purchase.quitCancel();
+            } else {
+                mainView.state = "online-accounts";
+                setup.exec();
+            }
+        }
+
+        onLoginError: {
+            mainView.recentLogin = false;
+            mainView.hideLoading();
+            checkout.showErrorMessage(message);
+        }
+
+        onTwoFactorAuthRequired: {
+            mainView.hideLoading();
+            checkout.showTwoFactor();
+        }
+
+        onCertificateFound: {
+            checkout.certificate = cert
+        }
+    }
+
+    function showLoading() {
+        mainView.loading = true;
+        PopupUtils.open(loadingDialogContainer);
+    }
+
+    function hideLoading() {
+        mainView.purchasing = false;
+        mainView.loading = false;
+        mainView.cancellable = true;
+    }
+
+    function createDB() {
+        var db = LocalStorage.openDatabaseSync("PayUI", "1.0", "PayUI Credentials Date", 100);
+        db.transaction(
+            function(tx) {
+                // Create the database if it doesn't already exist
+                tx.executeSql('CREATE TABLE IF NOT EXISTS PayUIPayment(backendid TEXT, paymentid TEXT)');
+            }
+        )
+    }
+
+    function recentCredentials() {
+        var valid = false;
+        var date = purchase.getTokenUpdated();
+        var currentDate = new Date();
+        var msec = currentDate - date;
+        var mm = Math.floor(msec / 1000 / 60);
+        if (mm < 15) {
+            valid = true;
+        }
+        return valid;
+    }
+
+    function getLastPayment() {
+        var backendid = "";
+        var paymentid = "";
+        var db = LocalStorage.openDatabaseSync("PayUI", "1.0", "PayUI Credentials Date", 100);
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('SELECT * FROM PayUIPayment');
+                if (rs.rows.length > 0) {
+                    backendid = rs.rows.item(0).backendid;
+                    paymentid = rs.rows.item(0).paymentid;
+                }
+            }
+        )
+        return [backendid, paymentid];
+    }
+
+    function updatePayment(backendid, paymentid) {
+        var db = LocalStorage.openDatabaseSync("PayUI", "1.0", "PayUI Credentials Date", 100);
+        db.transaction(
+            function(tx) {
+                var rs = tx.executeSql('SELECT * FROM PayUIPayment');
+                if (rs.rows.length > 0) {
+                    tx.executeSql('UPDATE PayUIPayment SET backendid = "' + backendid + '", paymentid = "' + paymentid + '"');
+                } else {
+                    tx.executeSql('INSERT INTO PayUIPayment VALUES(?, ?)', [backendid, paymentid]);
+                }
+            }
+        )
+    }
+
+    ErrorDialog {
+        id: purchaseErrorDialog
+        title: i18n.tr("Purchase failed")
+        message: i18n.tr("The purchase couldn't be completed.")
+
+        onRetry: {
+            mainView.state = "error";
+            mainView.showLoading();
+            purchase.getItemDetails();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
+    }
+
+    ErrorDialog {
+        id: serverErrorDialog
+        title: i18n.tr("Error contacting the server")
+        message: i18n.tr("Do you want to try again?")
+
+        onRetry: {
+            mainView.state = "error";
+            mainView.showLoading();
+            purchase.getItemDetails();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
+    }
+
+    ErrorDialog {
+        id: creditCardErrorDialog
+        title: i18n.tr("Adding Credit Card failed")
+        message: i18n.tr("Do you want to try again?")
+
+        onRetry: {
+            mainView.state = "error";
+            mainView.showLoading();
+            purchase.getItemDetails();
+        }
+
+        onClose: {
+            purchase.quitCancel();
+        }
+    }
+
+    Component {
+         id: loadingDialogContainer
+
+         Dialog {
+             id: loadingDialog
+             title: mainView.purchasing ? i18n.tr("Processing Purchase") : i18n.tr("Loading")
+             text: i18n.tr("Please wait…")
+             ActivityIndicator {
+                 running: mainView.loading ? true : false
+                 width: parent.width
+
+                 onRunningChanged: {
+                     if(!running) {
+                         PopupUtils.close(loadingDialog);
+                     }
+                 }
+             }
+
+             Button {
+                 objectName: "buttonCancelLoading"
+                 text: i18n.tr("Cancel")
+                 color: UbuntuColors.orange
+                 visible: mainView.cancellable
+                 onClicked: {
+                     PopupUtils.close(loadingDialog);
+                     purchase.quitCancel();
+                 }
+             }
+         }
+    }
+
+    PageStack {
+        id: pageStack
+        objectName: "pageStack"
+
+        Component.onCompleted: {
+            showLoading();
+            mainView.createDB();
+            purchase.checkCredentials();
+        }
+
+        onCurrentPageChanged: {
+            if (pageStack.currentPage == checkout) {
+                mainView.state = "checkout";
+            }
+        }
+
+        CheckoutPage {
+            id: checkout
+            objectName: "pageCheckout"
+            visible: false
+            account: accounts
+
+            onCancel: {
+                purchase.quitCancel();
+            }
+
+            onBuy: {
+                mainView.recentLogin = mainView.recentCredentials();
+                checkout.beforeTimeout = mainView.recentLogin;
+
+                // Pass it on.
+                checkout.hasSelectedPayment = true;
+                checkout.backendId = backendId;
+                checkout.paymentId = paymentId;
+
+                mainView.purchasing = true;
+                mainView.cancellable = false;
+                showLoading();
+                if (!checkout.hasPreferredPayment) {
+                    mainView.updatePayment(backendId, paymentId);
+                }
+
+                if (mainView.recentLogin) {
+                    purchase.buyItem(email, "", "", suggestedCurrency, paymentId, backendId, mainView.recentLogin);
+                } else {
+                    purchase.buyItem(email, password, otp, suggestedCurrency, paymentId, backendId, mainView.recentLogin);
+                }
+            }
+
+            onAddCreditCard: {
+                webkit.title = i18n.tr("Add Payment");
+                webkit.url = purchase.getAddPaymentUrl(suggestedCurrency);
+                mainView.state = "add-payment";
+                pageStack.push(webkit);
+            }
+        }
+
+        UbuntuPurchaseWebkit {
+            id: webkit
+            visible: false
+
+            onPurchaseFailed: {
+                pageStack.pop();
+                hideLoading();
+                purchaseErrorDialog.open = true;
+            }
+
+            onPurchaseCancelled: {
+                hideLoading();
+                if (mainView.state == "add-payment") {
+                    mainView.state = "checkout";
+                    pageStack.pop();
+                } else {
+                    purchase.quitCancel();
+                }
+            }
+
+            onPurchaseSucceeded: {
+                if (mainView.state == "add-payment") {
+                    showLoading();
+                    purchase.getPaymentTypes(suggestedCurrency);
+                } else {
+                    purchase.quitSuccess();
+                }
+            }
+
+            onLoading: {
+                if (value) {
+                    showLoading();
+                } else {
+                    hideLoading();
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: lockIconPlace
+        width: units.gu(7)
+        height: units.gu(7)
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+        visible: false
+    }
+}

=== added directory 'pay-ui/app/tests'
=== added directory 'pay-ui/app/tests/unit'
=== added directory 'pay-ui/app/tests/unit/js'
=== added file 'pay-ui/app/tests/unit/js/unit_test.js'
--- pay-ui/app/tests/unit/js/unit_test.js	1970-01-01 00:00:00 +0000
+++ pay-ui/app/tests/unit/js/unit_test.js	2016-03-11 14:49:24 +0000
@@ -0,0 +1,17 @@
+.pragma library
+
+// Find an object with the given name in the children tree of "obj"
+function findChild(obj,objectName) {
+    var childs = new Array(0);
+    childs.push(obj)
+    while (childs.length > 0) {
+        if (childs[0].objectName == objectName) {
+            return childs[0]
+        }
+        for (var i in childs[0].children) {
+            childs.push(childs[0].children[i])
+        }
+        childs.splice(0, 1);
+    }
+    return undefined;
+}

=== added file 'pay-ui/app/tests/unit/tst_checkoutpage.qml'
--- pay-ui/app/tests/unit/tst_checkoutpage.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/tests/unit/tst_checkoutpage.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,73 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../ui"
+import "js/unit_test.js" as UT
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    id: root
+
+    property string title: "My App"
+    property string subtitle: "My App Subtitle"
+    property string price: "$ 1.99"
+    property string ubuntuid: "[e-mail]"
+    property bool called: false
+
+    // The objects
+    CheckoutPage {
+        id: checkoutPage
+        itemTitle: root.title
+        itemSubtitle: root.subtitle
+        price: root.price
+        ubuntuID: root.ubuntuid
+
+        onCancel: {
+            root.called = true;
+        }
+
+        onBuy: {
+            root.called = true;
+        }
+    }
+
+    TestCase {
+        name: "CheckoutPage"
+
+        function init() {
+            console.debug("Cleaning vars");
+            root.called = false;
+        }
+
+        function test_uiTexts() {
+            var titleLabel = UT.findChild(checkoutPage, "titleLabel");
+            var subtitleLabel = UT.findChild(checkoutPage, "subtitleLabel");
+            var priceLabel = UT.findChild(checkoutPage, "priceLabel");
+            var ubuntuIdLabel = UT.findChild(checkoutPage, "ubuntuIdLabel");
+            var ubuntuidExpected = "Ubuntu ID: " + root.ubuntuid
+
+            compare(titleLabel.text, root.title);
+            compare(subtitleLabel.text, root.subtitle);
+            compare(priceLabel.text, root.price);
+            compare(ubuntuIdLabel.text, ubuntuidExpected);
+        }
+
+        function test_cancelPressed() {
+            compare(root.called, false);
+            var cancelButton = UT.findChild(checkoutPage, "cancelButton");
+            cancelButton.clicked();
+            compare(root.called, true);
+        }
+
+        function test_buyPressed() {
+            compare(root.called, false);
+            var buyButton = UT.findChild(checkoutPage, "buyButton");
+            buyButton.clicked();
+            compare(root.called, true);
+        }
+    }
+}

=== added file 'pay-ui/app/tests/unit/tst_purchasewebkit.qml'
--- pay-ui/app/tests/unit/tst_purchasewebkit.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/tests/unit/tst_purchasewebkit.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,57 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../ui"
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    id: root
+
+    property bool succeeded: false
+    property bool failed: false
+
+    // The objects
+    UbuntuPurchaseWebkit {
+        id: purchaseWebkit
+
+        onPurchaseCanceled: {
+            root.failed = true;
+        }
+
+        onPurchaseSucceeded: {
+            root.succeeded = true;
+        }
+    }
+
+    TestCase {
+        name: "UbuntuPurchaseWebkitPage"
+
+        function init() {
+            console.debug("Cleaning vars");
+            root.succeeded = false;
+            root.failed = false;
+        }
+
+        function test_normalNavigation() {
+            purchaseWebkit.url = "http://fakepage.com";
+            compare(root.failed, false);
+            compare(root.succeeded, false);
+        }
+
+        function test_succeeded() {
+            purchaseWebkit.url = "https://sc.staging.ubuntu.com/click/succeeded";
+            compare(root.failed, false);
+            compare(root.succeeded, true);
+        }
+
+        function test_failed() {
+            purchaseWebkit.url = "https://sc.staging.ubuntu.com/click/succeeded";
+            compare(root.failed, true);
+            compare(root.succeeded, false);
+        }
+    }
+}

=== added directory 'pay-ui/app/ui'
=== added file 'pay-ui/app/ui/CMakeLists.txt'
--- pay-ui/app/ui/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/app/ui/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,6 @@
+file(GLOB UI_QML_JS_FILES *.qml *.js)
+
+# make the files visible in the qtcreator tree
+add_custom_target(payui_ui_QMlFiles ALL SOURCES ${UI_QML_JS_FILES})
+
+install(FILES ${UI_QML_JS_FILES} DESTINATION ${PAYUI_DIR}/ui)

=== added file 'pay-ui/app/ui/CheckoutPage.qml'
--- pay-ui/app/ui/CheckoutPage.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/ui/CheckoutPage.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,404 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import payui 0.1 as Oxide
+import "../components"
+
+Page {
+    id: pageCheckout
+
+    title: i18n.tr("Payment")
+
+    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+    property alias selectedItem: paymentTypes.selectedIndex
+
+    property alias itemIcon: iconImage.source
+    property alias itemTitle: titleLabel.text
+    property alias itemSubtitle: subtitleLabel.text
+    property alias price: priceLabel.text
+    property alias account: accountView.model
+    property alias model: paymentTypes.model
+    property alias password: passwordField.text
+    property alias otp: twoFactorField.text
+    property alias certificate: otherSecurityStatus.certificate
+    property alias securityStatus: otherSecurityStatus
+
+    property bool hasPayments: false
+    property bool hasPreferredPayment: true
+    property bool hasStoredPayment: false
+    property bool beforeTimeout: false
+
+    property bool hasSelectedPayment: false
+    property string backendId: ""
+    property string paymentId: ""
+
+    signal cancel
+    signal buy(string email, string password, string otp, string paymentId, string backendId)
+    signal addCreditCard
+
+    function launchPurchase() {
+        var pay = paymentTypes.model[pageCheckout.selectedItem];
+        var email = accountView.currentItem.email;
+        pageCheckout.buy(email, password, otp, pay.paymentId, pay.backendId);
+    }
+
+    function showErrorMessage(message) {
+        errorLabel.text = message;
+        errorLabel.visible = true;
+    }
+
+    function showTwoFactor() {
+        errorLabel.visible = false;
+        twoFactorUI.visible = true;
+    }
+
+    function setSelectedItem() {
+        for (var i=0; i < pageCheckout.model.length; i++) {
+            if (pageCheckout.model[i].preferred) {
+                selectedItem = i;
+            }
+        }
+    }
+
+    QtObject {
+        id: otherSecurityStatus
+        property int securityLevel: certificate == null ? Oxide.SecurityStatus.SecurityLevelNone : Oxide.SecurityStatus.SecurityLevelSecure
+        property var certificate: null
+    }
+
+    head.actions:[
+        Action {
+            id: lockAction
+            iconName: pageCheckout.securityStatus.securityLevel == Oxide.SecurityStatus.SecurityLevelSecure ? "lock" : "security-alert"
+            onTriggered: {
+                PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageCheckout.securityStatus})
+            }
+        }
+    ]
+
+    Component {
+        id: popoverComponent
+
+        SecurityCertificatePopover {
+            id: certPopover
+            securityStatus: null
+        }
+    }
+
+    Flickable {
+        id: checkoutFlickable
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        contentHeight: contentItem.childrenRect.height + pageCheckout.keyboardSize
+
+        Item {
+            id: header
+            height: units.gu(8)
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+                topMargin: units.gu(1)
+            }
+
+            UbuntuShape {
+                id: iconShape
+                objectName: "iconShape"
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    margins: units.gu(1)
+                }
+                image: Image {
+                    id: iconImage
+                    objectName: "iconImage"
+                }
+                width: units.gu(6)
+                height: units.gu(6)
+            }
+
+            Column {
+                id: col
+                spacing: units.gu(0.5)
+                anchors {
+                    left: iconShape.right
+                    top: parent.top
+                    right: priceLabel.left
+                    bottom: parent.bottom
+                    margins: units.gu(1)
+                }
+
+                Label {
+                    id: titleLabel
+                    objectName: "titleLabel"
+                    fontSize: "medium"
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    elide: Text.ElideRight
+                }
+                Label {
+                    id: subtitleLabel
+                    objectName: "subtitleLabel"
+                    fontSize: "small"
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    elide: Text.ElideRight
+                }
+            }
+
+            Label {
+                id: priceLabel
+                objectName: "priceLabel"
+                font.bold: true
+                fontSize: "large"
+                verticalAlignment: Text.AlignVCenter
+
+                anchors {
+                    right: parent.right
+                    top: parent.top
+                    bottom: parent.bottom
+                    rightMargin: units.gu(2)
+                }
+            }
+        }
+
+        Rectangle {
+            id: separator
+            height: units.dp(1)
+            color: "#d5d5d5"
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: header.bottom
+                rightMargin: units.gu(2)
+                leftMargin: units.gu(2)
+                topMargin: units.gu(1)
+            }
+        }
+
+        ListView {
+            id: accountView
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: separator.bottom
+                leftMargin: units.gu(2)
+                rightMargin: units.gu(2)
+                topMargin: units.gu(2)
+            }
+            height: units.gu(2)
+            enabled: false
+            delegate: Label {
+                id: ubuntuIdLabel
+                objectName: "ubuntuIdLabel"
+                text: model.displayName
+                elide: Text.ElideRight
+                property string email: model.displayName
+            }
+        }
+
+        TextField {
+            id: passwordField
+            objectName: "passwordField"
+            placeholderText: i18n.tr("Enter your Ubuntu One password")
+            echoMode: TextInput.Password
+            visible: !pageCheckout.beforeTimeout
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: accountView.bottom
+                margins: units.gu(2)
+            }
+
+            Keys.onReturnPressed: launchPurchase();
+        }
+
+        Label {
+            id: errorLabel
+            objectName: "errorLabel"
+            color: "red"
+            text: ""
+            wrapMode: Text.WordWrap
+            visible: false
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: passwordField.bottom
+                margins: units.gu(2)
+            }
+        }
+
+        Column {
+            id: twoFactorUI
+            spacing: units.gu(2)
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: errorLabel.visible ? errorLabel.bottom : passwordField.bottom
+                margins: units.gu(2)
+            }
+            visible: false
+
+            Label {
+                id: twoFactorLabel
+                objectName: "twoFactorLabel"
+                color: "black"
+                text: i18n.tr("Type your verification code:")
+                wrapMode: Text.WordWrap
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+            }
+
+            TextField {
+                id: twoFactorField
+                objectName: "twoFactorField"
+                placeholderText: i18n.tr("2-factor device code")
+                inputMethodHints: Qt.ImhDigitsOnly
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Keys.onReturnPressed: launchPurchase();
+            }
+        }
+
+        Rectangle {
+            id: paymentSep
+            height: units.dp(1)
+            color: "#d5d5d5"
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: twoFactorUI.visible ? twoFactorUI.bottom : (errorLabel.visible ? errorLabel.bottom : (passwordField.visible ? passwordField.bottom : accountView.bottom))
+                rightMargin: units.gu(2)
+                leftMargin: units.gu(2)
+                topMargin: units.gu(2)
+            }
+        }
+
+        OptionSelector {
+            id: paymentTypes
+            objectName: "paymentTypes"
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: paymentSep.bottom
+                margins: units.gu(2)
+            }
+            containerHeight: units.gu(24)
+            expanded: false
+            delegate: OptionSelectorDelegate {
+                Item {
+                    anchors.fill: parent
+                    Column {
+                        anchors {
+                            fill: parent
+                            leftMargin: units.gu(2)
+                            topMargin: units.gu(2)
+                            rightMargin: units.gu(5)
+                        }
+                        spacing: units.gu(0.25)
+
+                        Label {
+                            text: modelData.name
+                            elide: Text.ElideLeft
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            fontSize: "small"
+                        }
+                        Label {
+                            text: modelData.description
+                            elide: Text.ElideLeft
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                            }
+                            fontSize: "x-small"
+                        }
+                    }
+                }
+
+                height: units.gu(8)
+            }
+        }
+
+        Row {
+            id: rowButtons
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: paymentTypes.bottom
+                margins: units.gu(4)
+            }
+
+            spacing: units.gu(2)
+            property int buttonsWidth: (width / 2) - (spacing / 2)
+
+            Button {
+                id: cancelButton
+                objectName: "cancelButton"
+                text: i18n.tr("Cancel")
+                width: parent.buttonsWidth
+                color: "#797979"
+
+                onClicked: pageCheckout.cancel();
+            }
+            Button {
+                id: buyButton
+                objectName: "buyButton"
+                text: i18n.tr("Buy Now")
+                color: UbuntuColors.orange
+                width: parent.buttonsWidth
+
+                onClicked: {
+                    launchPurchase();
+                }
+            }
+        }
+
+        Label {
+            id: addCreditCardLabel
+            objectName: "addCreditCardLabel"
+            textFormat: Text.RichText
+            text: '<a href="#"><span style="color: #797979;">%1</span></a>'.arg(i18n.tr("Add credit/debit card"))
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: rowButtons.bottom
+                topMargin: units.gu(6)
+            }
+            horizontalAlignment: Text.AlignHCenter
+            onLinkActivated: pageCheckout.addCreditCard();
+        }
+    }
+}

=== added file 'pay-ui/app/ui/ErrorDialog.qml'
--- pay-ui/app/ui/ErrorDialog.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/ui/ErrorDialog.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+Item {
+    id: dialogErrorItem
+    property string title: ""
+    property string message: ""
+    property bool open: false
+
+    signal retry
+    signal close
+
+    onOpenChanged: {
+        if (dialogErrorItem.open) {
+            PopupUtils.open(errorDialogContainer);
+        }
+    }
+
+    Component {
+         id: errorDialogContainer
+
+         Dialog {
+             id: errorDialog
+             title: dialogErrorItem.title
+             text: dialogErrorItem.message
+
+             Button {
+                 text: i18n.tr("Retry")
+                 objectName: "retryErrorButton"
+                 color: UbuntuColors.orange
+                 onClicked: {
+                     dialogErrorItem.retry();
+                     dialogErrorItem.open = false;
+                     PopupUtils.close(errorDialog);
+                 }
+             }
+             Button {
+                 text: i18n.tr("Close")
+                 objectName: "closeErrorButton"
+                 color: UbuntuColors.coolGrey
+                 onClicked: {
+                     dialogErrorItem.close();
+                     dialogErrorItem.open = false;
+                     PopupUtils.close(errorDialog);
+                 }
+             }
+         }
+    }
+
+}

=== added file 'pay-ui/app/ui/UbuntuPurchaseWebkit.qml'
--- pay-ui/app/ui/UbuntuPurchaseWebkit.qml	1970-01-01 00:00:00 +0000
+++ pay-ui/app/ui/UbuntuPurchaseWebkit.qml	2016-03-11 14:49:24 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2013-2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Web 0.2
+import "../components"
+
+
+Page {
+    id: pageWebkit
+    objectName: "pageWebkit"
+
+    signal purchaseSucceeded()
+    signal purchaseFailed()
+    signal purchaseCancelled()
+    signal loading(bool value)
+
+    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+    property alias url: webView.url
+    property var securityStatus: webView.securityStatus
+
+    function parseQuery(url) {
+        var argsParsed = {};
+        var vars = url.split('?');
+        if(vars.length == 1) {
+            return argsParsed;
+        }
+
+        var args = vars[1].split('&');
+        for (var i=0; i < args.length; i++) {
+            var arg = decodeURI(args[i]);
+            if (arg.indexOf('=') == -1) {
+                argsParsed[arg.trim()] = true;
+            } else {
+                var keyvalue = arg.split('=');
+                argsParsed[keyvalue[0].trim()] = keyvalue[1].trim();
+            }
+        }
+
+        return argsParsed;
+    }
+
+    head.actions:[
+        Action {
+            id: lockAction
+            iconName: pageWebkit.securityStatus.securityLevel ? "lock" : "security-alert"
+            onTriggered: {
+                PopupUtils.open(popoverComponent, lockIconPlace, {"securityStatus": pageWebkit.securityStatus})
+            }
+        }
+    ]
+
+    Component {
+        id: popoverComponent
+
+        SecurityCertificatePopover {
+            id: certPopover
+            securityStatus: null
+        }
+    }
+
+    WebView {
+        id: webView
+        objectName: "webView"
+        anchors.fill: parent
+        anchors.bottomMargin: pageWebkit.keyboardSize
+
+        // We need to specify the dialogs to use for JS dialogs here.
+        alertDialog: AlertDialog {}
+        confirmDialog: ConfirmDialog {}
+        promptDialog: PromptDialog {}
+        beforeUnloadDialog: BeforeUnloadDialog {}
+
+        onLoadingChanged: {
+            pageWebkit.loading(webView.loading);
+        }
+
+        onUrlChanged: {
+            var re_succeeded = new RegExp("/click/succeeded");
+            var re_failed = new RegExp("/click/failed");
+            var re_cancelled = new RegExp("/click/cancelled");
+
+            if (re_succeeded.test(webView.url)) {
+                pageWebkit.purchaseSucceeded();
+            } else if (re_failed.test(webView.url)) {
+                pageWebkit.purchaseFailed();
+            } else if (re_cancelled.test(webView.url)) {
+                pageWebkit.purchaseCancelled();
+            }
+        }
+    }
+}

=== added directory 'pay-ui/backend'
=== added file 'pay-ui/backend/CMakeLists.txt'
--- pay-ui/backend/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,49 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+
+find_package(Qt5Core)
+find_package(Qt5Qml)
+find_package(Qt5Quick)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+pkg_check_modules(UBUNTUONEAUTH REQUIRED ubuntuoneauth-2.0)
+add_definitions(${UBUNTUONEAUTH_CFLAGS} ${UBUNTUONEAUTH_CFLAGS_OTHER})
+
+set(
+    payuibackend_SRCS
+    modules/payui/backend.cpp
+    modules/payui/purchase.cpp
+    modules/payui/network.cpp
+    modules/payui/pay_info.cpp
+    modules/payui/credentials_service.cpp
+    modules/payui/certificateadapter.cpp
+    modules/payui/oxideconstants.cpp
+)
+set(PAYUI_BACKEND payuibackend)
+
+add_library(${PAYUI_BACKEND} SHARED
+    ${payuibackend_SRCS}
+)
+
+target_link_libraries(${PAYUI_BACKEND}
+    ${UBUNTUONEAUTH_LDFLAGS}
+)
+
+set_target_properties(${PAYUI_BACKEND} PROPERTIES
+         LIBRARY_OUTPUT_DIRECTORY payui)
+
+qt5_use_modules(${PAYUI_BACKEND} Gui Qml Quick Network DBus)
+
+# Copy qmldir file to build dir for running in QtCreator
+add_custom_target(payuibackend-qmldir ALL
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/modules/payui/qmldir ${CMAKE_CURRENT_BINARY_DIR}/payui
+    DEPENDS ${QMLFILES}
+)
+
+# Install plugin file
+install(TARGETS ${PAYUI_BACKEND} DESTINATION ${QT_IMPORTS_DIR}/payui/)
+install(FILES   modules/payui/qmldir DESTINATION ${QT_IMPORTS_DIR}/payui/)
+
+add_subdirectory (tests)

=== added directory 'pay-ui/backend/modules'
=== added directory 'pay-ui/backend/modules/payui'
=== added file 'pay-ui/backend/modules/payui/backend.cpp'
--- pay-ui/backend/modules/payui/backend.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/backend.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,23 @@
+#include <QtQml>
+#include <QtQml/QQmlContext>
+#include "backend.h"
+#include "purchase.h"
+#include "certificateadapter.h"
+#include "oxideconstants.h"
+#include "pay_info.h"
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("payui"));
+
+    qmlRegisterType<UbuntuPurchase::Purchase>(uri, 0, 1, "Purchase");
+    qmlRegisterType<UbuntuPurchase::PayInfo>(uri, 0, 1, "PayInfo");
+    qmlRegisterType<CertificateAdapter>(uri, 0, 1, "CertificateAdapter");
+    qmlRegisterType<SecurityStatus>(uri, 0, 1, "SecurityStatus");
+    qmlRegisterType<SslCertificate>(uri, 0, 1, "SslCertificate");
+}
+
+void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+{
+    QQmlExtensionPlugin::initializeEngine(engine, uri);
+}

=== added file 'pay-ui/backend/modules/payui/backend.h'
--- pay-ui/backend/modules/payui/backend.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/backend.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,33 @@
+#ifndef BACKEND_PLUGIN_H
+#define BACKEND_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+/*
+ ----8<-----
+
+ import payui 0.1
+
+ Rectangle {
+   width: 200
+   height: 200
+
+   Purchase {
+      id: purchase
+   }
+ }
+
+ -----8<------
+*/
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+    void initializeEngine(QQmlEngine *engine, const char *uri);
+};
+#endif // BACKEND_PLUGIN_H
+

=== added file 'pay-ui/backend/modules/payui/certificateadapter.cpp'
--- pay-ui/backend/modules/payui/certificateadapter.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/certificateadapter.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QStringList>
+#include "certificateadapter.h"
+
+CertificateAdapter::CertificateAdapter()
+{
+}
+
+CertificateAdapter::CertificateAdapter(const CertificateAdapter &other)
+{
+    m_cert = other.m_cert;
+}
+
+CertificateAdapter::~CertificateAdapter()
+{
+}
+
+CertificateAdapter::CertificateAdapter(QSslCertificate cert, QObject *parent) :
+    QObject(parent), m_cert(cert)
+{
+}
+
+QString CertificateAdapter::subjectDisplayName() {
+    return m_cert.subjectInfo(QSslCertificate::CommonName).join(", ");
+}
+
+QStringList CertificateAdapter::getSubjectInfo(int subject) {
+    return m_cert.subjectInfo((QSslCertificate::SubjectInfo)subject);
+}

=== added file 'pay-ui/backend/modules/payui/certificateadapter.h'
--- pay-ui/backend/modules/payui/certificateadapter.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/certificateadapter.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef CERTIFICATEADAPTER_H
+#define CERTIFICATEADAPTER_H
+
+#include <QObject>
+#include <QSslCertificate>
+#include <QMetaType>
+
+/*
+ * Adapt a QSSlCertificate to the interface that oxide uses for certs.
+ */
+class CertificateAdapter : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString subjectDisplayName READ subjectDisplayName)
+public:
+    CertificateAdapter(QSslCertificate cert, QObject *parent = 0);
+    CertificateAdapter(const CertificateAdapter& other);
+    CertificateAdapter();
+    ~CertificateAdapter();
+
+signals:
+
+public slots:
+    QStringList getSubjectInfo(int subject);
+
+protected:
+    QString subjectDisplayName();
+    QSslCertificate m_cert;
+};
+
+Q_DECLARE_METATYPE(CertificateAdapter);
+
+#endif // CERTIFICATEADAPTER_H

=== added file 'pay-ui/backend/modules/payui/credentials_service.cpp'
--- pay-ui/backend/modules/payui/credentials_service.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/credentials_service.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "credentials_service.h"
+
+#include <errormessages.h>
+#include <token.h>
+#include <QProcessEnvironment>
+
+
+namespace UbuntuPurchase {
+
+bool useFakeCredentials()
+{
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    QString getcreds = environment.value("GET_CREDENTIALS", "1");
+    return getcreds != "1";
+}
+
+CredentialsService::CredentialsService(QObject *parent) :
+    SSOService(parent)
+{
+    connect(this, &SSOService::requestFailed,
+            this, &CredentialsService::handleRequestFailed);
+}
+
+void CredentialsService::getCredentials()
+{
+    if (useFakeCredentials()) {
+        Token token("tokenkey", "tokensecret", "consumerkey", "consumersecret");
+        Q_EMIT credentialsFound(token);
+    } else {
+        if (!m_token.isValid()) {
+            SSOService::getCredentials();
+        } else {
+            Q_EMIT credentialsFound(m_token);
+        }
+    }
+}
+
+void CredentialsService::setCredentials(Token token)
+{
+    m_token = token;
+}
+
+void CredentialsService::login(const QString email,
+                               const QString password,
+                               const QString otp)
+{
+    if (m_token.isValid() || useFakeCredentials()) {
+        Q_EMIT SSOService::credentialsStored();
+    } else {
+        SSOService::login(email, password, otp);
+    }
+}
+
+void CredentialsService::handleRequestFailed(const ErrorResponse& error)
+{
+    if (error.httpStatus() == 0 || error.httpReason() == NO_HTTP_REASON) {
+        emit loginError("Network error, please try again.");
+    } else {
+        emit loginError(error.message());
+    }
+}
+
+}

=== added file 'pay-ui/backend/modules/payui/credentials_service.h'
--- pay-ui/backend/modules/payui/credentials_service.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/credentials_service.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef CREDENTIALS_SERVICE_H
+#define CREDENTIALS_SERVICE_H
+
+#include <QObject>
+#include <ssoservice.h>
+#include <token.h>
+
+using namespace UbuntuOne;
+
+namespace UbuntuPurchase {
+
+class CredentialsService : public SSOService
+{
+    Q_OBJECT
+
+public:
+    explicit CredentialsService(QObject *parent = 0);
+
+    void getCredentials();
+    void setCredentials(Token token);
+    void login(const QString email, const QString password,
+               const QString otp = QString());
+
+Q_SIGNALS:
+    void loginError(const QString& message);
+
+private Q_SLOTS:
+    void handleRequestFailed(const ErrorResponse& error);
+
+private:
+    Token m_token;
+};
+}
+
+#endif // CREDENTIALS_SERVICE_H

=== added file 'pay-ui/backend/modules/payui/network.cpp'
--- pay-ui/backend/modules/payui/network.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/network.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,512 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "network.h"
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QByteArray>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QDebug>
+#include <QFile>
+#include <QProcessEnvironment>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include <QDBusConnection>
+
+#include "certificateadapter.h"
+
+#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 DEVICE_ID_HEADER "X-Device-Id"
+
+#define PARTNER_ID_HEADER "X-Partner-ID"
+#define PARTNER_ID_FILE "/custom/partner-id"
+
+#define PREFERED_PAYMENT_TYPE "0"
+#define PAYMENT_TYPES "1"
+#define BUY_ITEM "2"
+#define ITEM_INFO "3"
+#define UPDATE_CREDENTIALS "4"
+#define CHECK_PASSWORD "5"
+#define CHECK_PURCHASED "6"
+
+#define BUY_COMPLETE "Complete"
+#define BUY_IN_PROGRESS "InProgress"
+
+namespace UbuntuPurchase {
+
+Network::Network(QObject *parent) :
+    QObject(parent),
+    m_nam(this),
+    m_service(this),
+    m_preferred(nullptr)
+{
+    connect(&m_nam, SIGNAL(finished(QNetworkReply*)),
+                     this, SLOT(onReply(QNetworkReply*)));
+    // SSO SERVICE
+    connect(&m_service, &CredentialsService::credentialsFound,
+                     this, &Network::handleCredentialsFound);
+    connect(&m_service, &CredentialsService::credentialsNotFound,
+                     this, &Network::credentialsNotFound);
+    connect(&m_service, &SSOService::credentialsStored,
+                     this, &Network::handleCredentialsStored);
+    connect(&m_service, &CredentialsService::loginError,
+            this, &Network::loginError);
+    connect(&m_service, &SSOService::twoFactorAuthRequired,
+            this, &Network::twoFactorAuthRequired);
+}
+
+void Network::getCredentials()
+{
+    qDebug() << "getting credentials";
+    m_service.getCredentials();
+}
+
+void Network::setCredentials(Token token)
+{
+    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);
+}
+
+QString Network::sanitizeUrl(const QUrl& url)
+{
+    static QRegExp regexp("\\b\\/\\/+");
+    return url.toString().replace(regexp, "/");
+}
+
+QString Network::encodeQuerySlashes(const QString& query)
+{
+    static QRegExp regexp("\\b\\/");
+    QString temp(query);
+    return temp.replace(regexp, "%2F");
+}
+
+void Network::onReply(QNetworkReply *reply)
+{
+    QVariant statusAttr = reply->attribute(
+                            QNetworkRequest::HttpStatusCodeAttribute);
+    if (!statusAttr.isValid()) {
+        QString message("Invalid reply status");
+        qWarning() << message;
+        Q_EMIT error(message);
+        return;
+    }
+
+    RequestObject* state = qobject_cast<RequestObject*>(reply->request().originatingObject());
+    if (state->operation.isEmpty()) {
+        QString message("Reply received for non valid state.");
+        qWarning() << message;
+        Q_EMIT error(message);
+        return;
+    }
+
+    int httpStatus = statusAttr.toInt();
+    qDebug() << "Reply status:" << httpStatus;
+    if (httpStatus == 200 || httpStatus == 201) {
+        QByteArray payload = reply->readAll();
+        qDebug() << payload;
+        QJsonDocument document = QJsonDocument::fromJson(payload);
+
+        if (state->operation.contains(PAYMENT_TYPES) && document.isArray()) {
+            qDebug() << "Reply state: PAYMENT_TYPES";
+            QVariantList listPays;
+            QJsonArray array = document.array();
+            for (int i = 0; i < array.size(); i++) {
+                QJsonObject object = array.at(i).toObject();
+                QString description = object.value("description").toString();
+                QString backend = object.value("id").toString();
+                bool preferredBackend = object.value("preferred").toBool();
+                QJsonArray choices = object.value("choices").toArray();
+                for (int j = 0; j < choices.size(); j++) {
+                    QJsonObject choice = choices.at(j).toObject();
+                    QString name = choice.value("description").toString();
+                    QString paymentId = QString::number(choice.value("id").toInt());
+                    bool requiresInteracion = choice.value("requires_interaction").toBool();
+                    bool preferred = choice.value("preferred").toBool() && preferredBackend;
+                    PayInfo* pay = new PayInfo();
+                    pay->setPayData(name, description, paymentId, backend, requiresInteracion, preferred);
+                    listPays.append(qVariantFromValue((QObject*)pay));
+                    if (preferred) {
+                        m_preferred = pay;
+                    }
+                }
+            }
+            qDebug() << "Emit signal paymentTypesObtained";
+            Q_EMIT paymentTypesObtained(listPays);
+            if (m_preferred == nullptr) {
+                Q_EMIT noPreferredPaymentMethod();
+            }
+            qDebug() << "Emit signal certificateFound";
+            CertificateAdapter* cert = new CertificateAdapter(reply->sslConfiguration().peerCertificate());
+            Q_EMIT certificateFound(cert);
+        } else if (state->operation.contains(BUY_ITEM) && document.isObject()) {
+            qDebug() << "Reply state: BUY_ITEM";
+            QJsonObject object = document.object();
+            QString state = object.value("state").toString();
+
+            if (state == BUY_COMPLETE) {
+                qDebug() << "BUY STATE: complete";
+                Q_EMIT buyItemSucceeded();
+            } else if (state == BUY_IN_PROGRESS) {
+                QUrl url(getPayApiUrl(object.value("redirect_to").toString()));
+                qDebug() << "BUY STATE: in progress";
+                qDebug() << "BUY Redirect URL:" << url.toString();
+                QString sign = m_token.signUrl(url.toString(), "GET", true);
+                url.setQuery(encodeQuerySlashes(sign));
+                Q_EMIT buyInteractionRequired(url.toString());
+            } else {
+                qDebug() << "BUY STATE: failed";
+                Q_EMIT buyItemFailed();
+            }
+        } else if (state->operation.contains(ITEM_INFO) && document.isObject()) {
+            qDebug() << "Reply state: ITEM_INFO";
+            QJsonObject object = document.object();
+            QString icon;
+            QString publisher;
+            if (object.contains("publisher")) {
+                publisher = object.value("publisher").toString();
+            }
+            if (object.contains("icon_url")) {
+                icon = object.value("icon_url").toString();
+            } else if (object.contains("icon")) {
+                icon = object.value("icon").toString();
+            }
+
+            QString title = object.value("title").toString();
+
+            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 = 0.00;
+            if (prices[currency].isDouble()) {
+                    price = prices[currency].toDouble();
+            } else if (prices[currency].isString()) {
+                price = prices[currency].toString().toDouble();
+            }
+            QLocale locale;
+            QString formatted_price = locale.toCurrencyString(price, getSymbolForCurrency(currency));
+            qDebug() << "Sending signal: itemDetailsObtained: " << title << " " << formatted_price;
+            Q_EMIT itemDetailsObtained(title, publisher, currency, formatted_price, icon);
+        } else if (state->operation.contains(CHECK_PURCHASED)) {
+            QJsonObject object = document.object();
+            auto state = object.value("state").toString();
+            if (state == "Complete" || state == "purchased "||
+                state == "approved") {
+                Q_EMIT buyItemSucceeded();
+            } else {
+                Q_EMIT itemNotPurchased();
+            }
+        } else {
+            QString message("Reply received for non valid state.");
+            qWarning() << message;
+            Q_EMIT error(message);
+        }
+
+    } else if (httpStatus == 401 || httpStatus == 403) {
+        qWarning() << "Credentials no longer valid. Invalidating.";
+        m_service.invalidateCredentials();
+        Q_EMIT authenticationError();
+    } else if (httpStatus == 404 && state->operation.contains(CHECK_PURCHASED)) {
+        Q_EMIT itemNotPurchased();
+    } else {
+        QString message(QString::number(httpStatus));
+        message += ": ";
+        message += reply->readAll().data();
+        qWarning() << message;
+        Q_EMIT error(message);
+    }
+    reply->deleteLater();
+}
+
+void Network::requestPaymentTypes(const QString& currency)
+{
+    QNetworkRequest request;
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    QUrl url(getPayApiUrl(QString(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(url);
+    RequestObject* reqObject = new RequestObject(QString(PAYMENT_TYPES));
+    request.setOriginatingObject(reqObject);
+    m_nam.get(request);
+}
+
+void Network::checkPassword(const QString& email, const QString& password,
+                            const QString& otp, bool purchasing)
+{
+    m_startPurchase = purchasing;
+    m_service.login(email, password, otp);
+}
+
+void Network::buyItemWithPreferredPaymentType(const QString& email, const QString& password, const QString& otp,
+                                              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 {
+        checkPassword(email, password, otp, true);
+    }
+}
+
+void Network::buyItem(const QString& email, const QString& password,
+                      const QString& otp,
+                      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 {
+        checkPassword(email, password, otp, true);
+    }
+}
+
+void Network::purchaseProcess()
+{
+    QUrl url(getPayApiUrl(QString(PAY_API_ROOT) + PAY_PURCHASES_PATH + "/"));
+    qDebug() << "Request Purchase:" << url;
+    qDebug() << "Payment" << m_selectedAppId << m_selectedBackendId << m_selectedPaymentId;
+    QJsonObject serializer;
+
+    serializer.insert("name", m_selectedAppId);
+    if (!m_selectedItemId.isEmpty()) {
+        serializer.insert("item_sku", m_selectedItemId);
+    }
+    serializer.insert("backend_id", m_selectedBackendId);
+    serializer.insert("method_id", m_selectedPaymentId);
+    serializer.insert("currency", m_currency);
+    QJsonDocument doc(serializer);
+
+    QByteArray content = doc.toJson();
+
+    QNetworkRequest request;
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setRawHeader(DEVICE_ID_HEADER, getDeviceId().toUtf8().data());
+
+    // Get the partner ID and add it to the request.
+    QByteArray partner_id = getPartnerId();
+    if (!partner_id.isEmpty()) {
+        request.setRawHeader(PARTNER_ID_HEADER, partner_id);
+    }
+    request.setUrl(url);
+    signRequestUrl(request, url.toString(), QString("POST"));
+    RequestObject* reqObject = new RequestObject(QString(BUY_ITEM));
+    request.setOriginatingObject(reqObject);
+    m_nam.post(request, content);
+}
+
+QByteArray Network::getPartnerId()
+{
+    QByteArray id;
+
+    if (QFile::exists(PARTNER_ID_FILE)) {
+        QFile pid_file(PARTNER_ID_FILE);
+        if (pid_file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            // Always use lowercase, and trim whitespace.
+            id = pid_file.readLine().toLower().trimmed();
+            qDebug() << "Found partner ID:" << id;
+        } else {
+            qWarning() << "Failed to open partner ID file.";
+        }
+    } else {
+        qDebug() << "No partner ID file found.";
+    }
+
+    return id;
+}
+
+QString Network::getDeviceId()
+{
+    QDBusInterface iface("com.ubuntu.WhoopsiePreferences",
+                         "/com/ubuntu/WhoopsiePreferences",
+                         "com.ubuntu.WhoopsiePreferences",
+                         QDBusConnection::systemBus(), 0);
+    QDBusReply<QString> reply = iface.call("GetIdentifier");
+    return reply.value();
+}
+
+void Network::getItemInfo(const QString& packagename, const QString& sku)
+{
+    QUrl url;
+
+    if (sku.isEmpty()) {
+        url = getSearchApiUrl(QString(SEARCH_API_ROOT) + "/package/" + packagename);
+        qDebug() << "Request Item Info:" << url;
+        QUrlQuery query;
+        query.addQueryItem("fields", "title,description,price,icon_url");
+        url.setQuery(query);
+    } else {
+        url = getPayApiUrl(QString(IAP_API_ROOT) + "/packages/" + packagename + "/items/by-sku/" + sku);
+    }
+    qDebug() << "Request Item Info:" << url;
+
+    QNetworkRequest request;
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    request.setUrl(url);
+    signRequestUrl(request, url.toString(), QStringLiteral("GET"));
+    RequestObject* reqObject = new RequestObject(QString(ITEM_INFO));
+    request.setOriginatingObject(reqObject);
+    m_nam.get(request);
+}
+
+QString Network::getEnvironmentValue(const QString& key,
+                                     const QString& defaultValue)
+{
+    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
+    QString result = environment.value(key, defaultValue);
+    return result;
+}
+
+QString Network::getPayApiUrl(const QString& path)
+{
+    QUrl url(getEnvironmentValue(PAY_BASE_URL_ENVVAR, PAY_BASE_URL).append(path));
+    return sanitizeUrl(url);
+}
+
+QString Network::getSearchApiUrl(const QString& path)
+{
+    QUrl url(getEnvironmentValue(SEARCH_BASE_URL_ENVVAR, SEARCH_BASE_URL).append(path));
+    return sanitizeUrl(url);
+}
+
+void Network::signRequestUrl(QNetworkRequest& request, QString url, QString method)
+{
+    QString sign = m_token.signUrl(url, method);
+    request.setRawHeader("Authorization", sign.toUtf8());
+}
+
+QString Network::getAddPaymentUrl(const QString& currency)
+{
+    QUrl payUrl(getPayApiUrl(QString(PAY_API_ROOT) + PAY_PAYMENTMETHODS_ADD_PATH + "/"));
+    QUrlQuery query;
+    query.addQueryItem("currency", currency);
+    payUrl.setQuery(query);
+    qDebug() << "Get Add Payment URL:" << payUrl;
+    QString sign = m_token.signUrl(payUrl.toString(),
+                                   QStringLiteral("GET"), true);
+    payUrl.setQuery(encodeQuerySlashes(sign));
+    return payUrl.toString();
+}
+
+QDateTime Network::getTokenUpdated()
+{
+    return m_token.updated();
+}
+
+void Network::checkItemPurchased(const QString& appid, const QString& sku)
+{
+    QUrl url;
+    if (sku.isEmpty()) {
+        url = getPayApiUrl(QString(PAY_API_ROOT) + PAY_PURCHASES_PATH + "/" + appid + "/");
+    } else {
+        url = getPayApiUrl(QString(IAP_API_ROOT) + "/packages/" + appid + "/items/by-sku/" + sku);
+    }
+
+    qDebug() << "Checking for previous purchase:" << url;
+    QNetworkRequest request;
+    request.setUrl(url);
+    signRequestUrl(request, url.toString(), QStringLiteral("GET"));
+    RequestObject* reqObject = new RequestObject(QString(CHECK_PURCHASED));
+    request.setOriginatingObject(reqObject);
+    m_nam.get(request);
+}
+
+void Network::handleCredentialsFound(Token token)
+{
+    m_token = token;
+    Q_EMIT credentialsFound();
+}
+
+void  Network::handleCredentialsStored()
+{
+    // Get credentials again to update token object.
+    getCredentials();
+    if (m_startPurchase) {
+        purchaseProcess();
+    } else {
+        Q_EMIT passwordValid();
+    }
+}
+
+}

=== added file 'pay-ui/backend/modules/payui/network.h'
--- pay-ui/backend/modules/payui/network.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/network.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014-2015 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef NETWORK_H
+#define NETWORK_H
+
+#include <QDateTime>
+#include <QObject>
+#include <QtNetwork/QNetworkReply>
+#include <QStringList>
+#include <QVariantList>
+#include <QUrl>
+#include <QtNetwork/QNetworkAccessManager>
+#include <token.h>
+#include "credentials_service.h"
+
+#include "certificateadapter.h"
+#include "pay_info.h"
+
+using namespace UbuntuOne;
+
+namespace UbuntuPurchase {
+
+constexpr static const char* PAY_BASE_URL_ENVVAR{"PAY_BASE_URL"};
+constexpr static const char* PAY_BASE_URL{"https://myapps.developer.ubuntu.com"};
+constexpr static const char* PAY_API_ROOT{"/api/2.0/click"};
+constexpr static const char* IAP_API_ROOT{"/inventory/api/v1"};
+constexpr static const char* CURRENCY_ENVVAR {"U1_SEARCH_CURRENCY"};
+constexpr static const char* SEARCH_BASE_URL_ENVVAR{"U1_SEARCH_BASE_URL"};
+constexpr static const char* SEARCH_BASE_URL{"https://search.apps.ubuntu.com"};
+constexpr static const char* SEARCH_API_ROOT{"/api/v1"};
+
+class RequestObject : public QObject
+{
+    Q_OBJECT
+public:
+    explicit RequestObject(QString oper, QObject *parent = 0) :
+        QObject(parent)
+    {
+        operation = oper;
+    }
+
+    QString operation;
+};
+
+class Network : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Network(QObject *parent = 0);
+
+    void requestPaymentTypes(const QString& currency);
+    void buyItem(const QString& email, const QString& password,
+                 const QString& otp, const QString& appid,
+                 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& currency,
+                                         bool recentLogin);
+    void getItemInfo(const QString& packagename, const QString& sku);
+    void checkPassword(const QString& email, const QString& password,
+                       const QString& otp, bool purchasing=false);
+    void getCredentials();
+    void setCredentials(Token token);
+    QString getAddPaymentUrl(const QString& currency);
+    QDateTime getTokenUpdated();
+    void checkItemPurchased(const QString& appid, const QString& sku);
+    static QString getSymbolForCurrency(const QString& currency_code);
+    static bool isSupportedCurrency(const QString& currency_code);
+    static QString sanitizeUrl(const QUrl& url);
+    static QString encodeQuerySlashes(const QString& query);
+    virtual QString getEnvironmentValue(const QString& key,
+                                        const QString& defaultValue);
+    virtual QString getPayApiUrl(const QString& path);
+    virtual QString getSearchApiUrl(const QString& path);
+
+Q_SIGNALS:
+    void itemDetailsObtained(QString title, QString publisher, QString currency, QString formatted_price, QString icon);
+    void paymentTypesObtained(QVariantList payments);
+    void buyItemSucceeded();
+    void buyItemFailed();
+    void buyInteractionRequired(QString url);
+    void error(QString message);
+    void authenticationError();
+    void credentialsNotFound();
+    void credentialsFound();
+    void passwordValid();
+    void noPreferredPaymentMethod();
+    void loginError(const QString& message);
+    void twoFactorAuthRequired();
+    void itemNotPurchased();
+    void certificateFound(QObject* cert);
+
+private Q_SLOTS:
+    void onReply(QNetworkReply*);
+    void handleCredentialsFound(Token token);
+    void handleCredentialsStored();
+    void purchaseProcess();
+
+private:
+    QNetworkAccessManager m_nam;
+    QNetworkRequest m_request;
+    CredentialsService m_service;
+    Token m_token;
+    PayInfo* m_preferred;
+    QString m_selectedPaymentId;
+    QString m_selectedBackendId;
+    QString m_selectedAppId;
+    QString m_selectedItemId;
+    QString m_currency;
+    bool m_startPurchase = false;
+
+    void signRequestUrl(QNetworkRequest& request, QString url, QString method="GET");
+    QString getDeviceId();
+    QByteArray getPartnerId();
+};
+
+}
+
+#endif // NETWORK_H

=== added file 'pay-ui/backend/modules/payui/oxideconstants.cpp'
--- pay-ui/backend/modules/payui/oxideconstants.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/oxideconstants.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "oxideconstants.h"

=== added file 'pay-ui/backend/modules/payui/oxideconstants.h'
--- pay-ui/backend/modules/payui/oxideconstants.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/oxideconstants.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef OXIDECONSTANTS_H
+#define OXIDECONSTANTS_H
+
+#include <QObject>
+
+class SecurityStatus : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(SecurityLevel)
+public:
+    enum SecurityLevel {
+      SecurityLevelNone,
+      SecurityLevelSecure,
+      SecurityLevelSecureEV,
+      SecurityLevelWarning,
+      SecurityLevelError
+    };
+};
+
+class SslCertificate : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(PrincipalAttr)
+public:
+    enum PrincipalAttr {
+      PrincipalAttrOrganizationName,
+      PrincipalAttrCommonName,
+      PrincipalAttrLocalityName,
+      PrincipalAttrOrganizationUnitName,
+      PrincipalAttrCountryName,
+      PrincipalAttrStateOrProvinceName
+    };
+};
+
+#endif // OXIDECONSTANTS_H

=== added file 'pay-ui/backend/modules/payui/pay_info.cpp'
--- pay-ui/backend/modules/payui/pay_info.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/pay_info.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "pay_info.h"
+namespace UbuntuPurchase {
+
+PayInfo::PayInfo(QObject *parent) :
+    QObject(parent)
+{
+}
+
+void PayInfo::setPayData(QString name, QString description, QString payment, QString backend, bool requiresInteracion, bool preferred)
+{
+    m_name = name;
+    m_paymentId = payment;
+    m_description = description;
+    m_backendId = backend;
+    m_requiresInteracion = requiresInteracion;
+    m_preferred = preferred;
+}
+
+}

=== added file 'pay-ui/backend/modules/payui/pay_info.h'
--- pay-ui/backend/modules/payui/pay_info.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/pay_info.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PAY_INFO_H
+#define PAY_INFO_H
+
+#include <QObject>
+#include <QString>
+
+namespace UbuntuPurchase {
+
+class PayInfo : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString paymentId READ paymentId NOTIFY paymentIdChanged)
+    Q_PROPERTY(QString backendId READ backendId NOTIFY backendIdChanged)
+    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
+    Q_PROPERTY(bool requiresInteracion READ requiresInteracion NOTIFY requiresInteracionChanged)
+    Q_PROPERTY(bool preferred READ preferred WRITE setPreferred NOTIFY preferredChanged)
+
+public:
+    explicit PayInfo(QObject *parent = 0);
+
+    QString name() { return m_name; }
+    QString paymentId() { return m_paymentId; }
+    QString backendId() { return m_backendId; }
+    QString description() { return m_description; }
+    bool requiresInteracion() { return m_requiresInteracion; }
+    bool preferred() { return m_preferred; }
+
+    void setPayData(QString name, QString description, QString payment, QString backend, bool steps, bool preferred);
+    void setName(const QString& name) { m_name = name; Q_EMIT nameChanged(); }
+    void setDescription(const QString& description) { m_description = description; Q_EMIT descriptionChanged(); }
+    void setPaymentId(const QString& paymentId) { m_paymentId = paymentId; Q_EMIT paymentIdChanged(); }
+    void setbackendId(const QString& backendId) { m_backendId = backendId; Q_EMIT backendIdChanged(); }
+    void setRequiresInteracion(bool requiresInteracion) { m_requiresInteracion = requiresInteracion; Q_EMIT requiresInteracionChanged(); }
+    void setPreferred(bool preferred) { m_preferred = preferred; Q_EMIT preferredChanged(); }
+
+Q_SIGNALS:
+    void nameChanged();
+    void paymentIdChanged();
+    void backendIdChanged();
+    void descriptionChanged();
+    void requiresInteracionChanged();
+    void preferredChanged();
+
+private:
+    QString m_name;
+    QString m_paymentId;
+    QString m_backendId;
+    QString m_description;
+    bool m_requiresInteracion;
+    bool m_preferred;
+};
+}
+
+#endif // PAY_INFO_H

=== added file 'pay-ui/backend/modules/payui/purchase.cpp'
--- pay-ui/backend/modules/payui/purchase.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/purchase.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "purchase.h"
+#include <QUrl>
+#include <QUrlQuery>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QtDebug>
+
+#include <logging.h>
+
+namespace UbuntuPurchase {
+
+Purchase::Purchase(QObject *parent) :
+    QObject(parent),
+    m_network(this)
+{
+    connect(&m_network, &Network::itemDetailsObtained,
+                     this, &Purchase::itemDetailsObtained);
+    connect(&m_network, &Network::paymentTypesObtained,
+                     this, &Purchase::paymentTypesObtained);
+    connect(&m_network, &Network::buyItemSucceeded,
+                     this, &Purchase::buyItemSucceeded);
+    connect(&m_network, &Network::buyItemFailed,
+                     this, &Purchase::buyItemFailed);
+    connect(&m_network, &Network::buyInteractionRequired,
+                     this, &Purchase::buyInterationRequired);
+    connect(&m_network, &Network::error,
+                     this, &Purchase::error);
+    connect(&m_network, &Network::authenticationError,
+                     this, &Purchase::authenticationError);
+    connect(&m_network, &Network::credentialsNotFound,
+                     this, &Purchase::credentialsNotFound);
+    connect(&m_network, &Network::credentialsFound,
+                     this, &Purchase::credentialsFound);
+    connect(&m_network, &Network::passwordValid,
+                     this, &Purchase::passwordValid);
+    connect(&m_network, &Network::noPreferredPaymentMethod,
+                     this, &Purchase::noPreferredPaymentMethod);
+    connect(&m_network, &Network::loginError,
+            this, &Purchase::loginError);
+    connect(&m_network, &Network::twoFactorAuthRequired,
+            this, &Purchase::twoFactorAuthRequired);
+    connect(&m_network, &Network::itemNotPurchased,
+                     this, &Purchase::itemNotPurchased);
+    connect(&m_network, &Network::certificateFound,
+                     this, &Purchase::certificateFound);
+
+    QCoreApplication* instance = QCoreApplication::instance();
+
+    // Set up logging
+    UbuntuOne::AuthLogger::setupLogging();
+    const char* u1_debug = getenv("U1_DEBUG");
+    if (u1_debug != NULL && strcmp(u1_debug, "") != 0) {
+        UbuntuOne::AuthLogger::setLogLevel(QtDebugMsg);
+    }
+
+    // Handle the purchase: URI
+    for (int i = 0; i < instance->arguments().size(); i++) {
+        QString argument = instance->arguments().at(i);
+        if (argument.startsWith("purchase://")) {
+            QUrl data(argument);
+            m_appid = data.host();
+            m_itemid = data.fileName();
+            qDebug() << "Purchase requested for" << m_itemid << "by app" << m_appid;
+            break;
+        }
+    }
+}
+
+Purchase::~Purchase()
+{
+    UbuntuOne::AuthLogger::stopLogging();
+}
+
+void Purchase::quitCancel()
+{
+    qDebug() << "Purchase Canceled: exit code 1";
+    QCoreApplication::exit(1);
+}
+
+void Purchase::quitSuccess()
+{
+    qDebug() << "Purchase Succeeded: exit code 0";
+    QCoreApplication::exit(0);
+}
+
+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()) {
+        qCritical() << "AppId or ItemId not provided";
+        quitCancel();
+    }
+    qDebug() << "Getting Item Details";
+    m_network.getItemInfo(m_appid, m_itemid);
+}
+
+void Purchase::getPaymentTypes(const QString& currency)
+{
+    m_network.requestPaymentTypes(currency);
+}
+
+void Purchase::checkWallet(QString email, QString password, QString otp)
+{
+    m_network.checkPassword(email, password, otp);
+}
+
+void Purchase::buyItemWithPreferredPayment(QString email, QString password, QString otp, QString currency, bool recentLogin)
+{
+    m_network.buyItemWithPreferredPaymentType(email, password, otp, m_appid, m_itemid, currency, 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, currency, paymentId, backendId, recentLogin);
+}
+
+QDateTime Purchase::getTokenUpdated()
+{
+    return m_network.getTokenUpdated();
+}
+
+void Purchase::checkItemPurchased()
+{
+    m_network.checkItemPurchased(m_appid, m_itemid);
+}
+
+}

=== added file 'pay-ui/backend/modules/payui/purchase.h'
--- pay-ui/backend/modules/payui/purchase.h	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/purchase.h	2016-03-11 14:49:24 +0000
@@ -0,0 +1,59 @@
+#ifndef PURCHASE_H
+#define PURCHASE_H
+
+#include <QDateTime>
+#include <QObject>
+#include <QString>
+
+#include "network.h"
+#include "certificateadapter.h"
+
+namespace UbuntuPurchase {
+
+class Purchase : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit Purchase(QObject *parent = 0);
+    ~Purchase();
+
+    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(QString currency);
+    Q_INVOKABLE void checkWallet(QString email, QString password, QString otp);
+
+    Q_INVOKABLE void quitSuccess();
+    Q_INVOKABLE void quitCancel();
+    Q_INVOKABLE QDateTime getTokenUpdated();
+    Q_INVOKABLE void checkItemPurchased();
+
+Q_SIGNALS:
+    void itemDetailsObtained(QString title, QString publisher, QString currency, QString formatted_price, QString icon);
+    void paymentTypesObtained(QVariantList payments);
+    void buyItemSucceeded();
+    void buyItemFailed();
+    void buyInterationRequired(QString url);
+    void error(QString message);
+    void authenticationError();
+    void credentialsNotFound();
+    void credentialsFound();
+    void passwordValid();
+    void noPreferredPaymentMethod();
+    void loginError(const QString& message);
+    void twoFactorAuthRequired();
+    void itemNotPurchased();
+    void certificateFound(QObject* cert);
+
+private:
+    Network m_network;
+    QString m_appid;
+    QString m_itemid;
+};
+
+}
+
+#endif // PURCHASE_H

=== added file 'pay-ui/backend/modules/payui/qmldir'
--- pay-ui/backend/modules/payui/qmldir	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/modules/payui/qmldir	2016-03-11 14:49:24 +0000
@@ -0,0 +1,2 @@
+module payui
+plugin payuibackend

=== added directory 'pay-ui/backend/tests'
=== added file 'pay-ui/backend/tests/CMakeLists.txt'
--- pay-ui/backend/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/tests/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -0,0 +1,30 @@
+
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../payui)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+find_package(Qt5Core REQUIRED)
+
+set(PURCHASE_TESTS_TARGET test-purchase-ui)
+
+add_executable(${PURCHASE_TESTS_TARGET}
+    test_network.cpp
+)
+target_link_libraries(${PURCHASE_TESTS_TARGET}
+    -Wl,-rpath,${CMAKE_CURRENT_BINARY_DIR}/../payui
+    -L${CMAKE_CURRENT_BINARY_DIR}/../payui
+    ${PAYUI_BACKEND}
+)
+qt5_use_modules(${PURCHASE_TESTS_TARGET} Qml Quick Core DBus Xml Network Test)
+
+add_custom_target(payui-cppunit-tests
+  COMMAND env LANGUAGE=en_US.UTF-8 LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/${PURCHASE_TESTS_TARGET}
+  DEPENDS ${PURCHASE_TESTS_TARGET} mock_click_server.py
+)
+
+add_test(NAME payui-cppunit-tests
+  COMMAND make payui-cppunit-tests
+)
+
+add_custom_target(mock_click_server.py
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/mock_click_server.py ${CMAKE_CURRENT_BINARY_DIR}/mock_click_server.py
+)

=== added file 'pay-ui/backend/tests/mock_click_server.py'
--- pay-ui/backend/tests/mock_click_server.py	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/tests/mock_click_server.py	2016-03-11 14:49:24 +0000
@@ -0,0 +1,162 @@
+import json
+import threading
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+
+KEEP_ALIVE = True
+
+
+class MyHandler(BaseHTTPRequestHandler):
+
+    def do_HEAD(self):
+        self.send_response(200)
+        self.send_header("X-Click-Token", "X-Click-Token")
+        self.end_headers()
+
+    def response_payment_types(self, fail=False):
+        types = [
+            {
+                "description": "PayPal",
+                "id": "paypal",
+                "preferred": False,
+                "choices": [
+                    {
+                        "currencies": [
+                            "USD",
+                            "GBP",
+                            "EUR"
+                        ],
+                        "id": 532,
+                        "requires_interaction": False,
+                        "preferred": False,
+                        "description": "PayPal Preapproved Payment (exp. 2014-04-12)"
+                    }
+                ]
+            },
+            {
+                "description": "Credit or Debit Card",
+                "id": "credit_card",
+                "preferred": True,
+                "choices": [
+                    {
+                        "currencies": [
+                            "USD"
+                        ],
+                        "id": 1767,
+                        "requires_interaction": False,
+                        "preferred": False,
+                        "description": "**** **** **** 1111 (Visa, exp. 02/2015)"
+                    },
+                    {
+                        "currencies": [
+                            "USD"
+                        ],
+                        "id": 1726,
+                        "requires_interaction": False,
+                        "preferred": True,
+                        "description": "**** **** **** 1111 (Visa, exp. 03/2015)"
+                    }
+                ]
+            }
+        ]
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(types), 'UTF-8'))
+
+    def response_buy_item(self, fail=False, interaction=False):
+        state = "Complete" if not interaction else "InProgress"
+        response = {
+            "state": state,
+        }
+        if interaction:
+            # Real server returns path starting with / here.
+            response["redirect_to"] = "/redirect.url?currency=USD"
+        if fail:
+            response = {}
+
+        if self.path.find("/notpurchased/") != -1:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
+
+    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:
+            self.send_response(404)
+        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'))
+
+    def response_auth_error(self):
+        self.send_response(401)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(dict()), 'UTF-8'))
+
+    def do_POST(self):
+        """Respond to a POST request."""
+        #content = self.rfile.read(int(self.headers.get('content-length')))
+        #structure = json.loads(content.decode('utf-8'))
+        self.do_GET()
+
+    def do_GET(self):
+        """Respond to a GET request."""
+        if self.path.find("/authError/") != -1:
+            self.response_auth_error()
+        elif self.path.find("shutdown") != -1:
+            global KEEP_ALIVE
+            KEEP_ALIVE = False
+        elif self.path.find("paymentmethods/") != -1:
+            fail = self.path.find("/fail/") != -1
+            self.response_payment_types(fail)
+        elif self.path.find("purchases/") != -1:
+            fail = self.path.find("/fail/") != -1
+            interaction = self.path.find("/interaction/") != -1
+            self.response_buy_item(fail=fail, interaction=interaction)
+        elif self.path.find("iteminfo/") != -1:
+            fail = self.path.find("/fail/") != -1
+            eurozone = self.path.find("/eurozone/") != -1
+            dotar = self.path.find("/dotar/") != -1
+            self.response_item_info(fail, eurozone, dotar)
+
+
+def run_click_server():
+    server_address = ('', 8000)
+    httpd = HTTPServer(server_address, MyHandler)
+    global KEEP_ALIVE
+    print('start')
+    while KEEP_ALIVE:
+        httpd.handle_request()
+
+
+def run_mocked_settings():
+    t = threading.Thread(target=run_click_server)
+    t.start()
+
+
+run_mocked_settings()

=== added file 'pay-ui/backend/tests/test_network.cpp'
--- pay-ui/backend/tests/test_network.cpp	1970-01-01 00:00:00 +0000
+++ pay-ui/backend/tests/test_network.cpp	2016-03-11 14:49:24 +0000
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+
+#include <QObject>
+#include <QProcess>
+#include <QProcessEnvironment>
+#include <QDebug>
+#include <QVariant>
+#include <QUrlQuery>
+#include <QString>
+#include <QDir>
+#include <QTest>
+#include <QTimer>
+#include <QSignalSpy>
+#include <QVariant>
+#include <QVariantList>
+
+#include <modules/payui/network.h>
+#include <modules/payui/pay_info.h>
+
+using namespace UbuntuPurchase;
+
+class TestNetwork: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void testNetworkAuthenticationError();
+    void testNetworkGetPaymentTypes();
+    void testNetworkGetPaymentTypesFail();
+    void testNetworkBuyItem();
+    void testNetworkBuyItemInProgress();
+    void testNetworkBuyItemFail();
+    void testNetworkButItemWithPaymentType();
+    void testNetworkButItemWithPaymentTypeFail();
+    void testNetworkButItemWithPaymentTypeInProgress();
+    void testNetworkGetItemInfo();
+    void testNetworkGetItemInfoEurozone();
+    void testNetworkGetItemInfoOtherCoins();
+    void testNetworkGetItemInfoOverride();
+    void testNetworkGetItemInfoOverrideOther();
+    void testNetworkGetItemInfoFail();
+    void testUseExistingCredentials();
+    void testCheckAlreadyPurchased();
+    void testCheckAlreadyPurchasedFail();
+    void testSanitizeUrl();
+    void testEncodeQuerySlashes();
+    void cleanupTestCase();
+
+private:
+    UbuntuPurchase::Network network;
+    QProcess* process;
+};
+
+void TestNetwork::initTestCase()
+{
+    setenv("SSO_AUTH_BASE_URL", "http://localhost:8000/", 1);
+    qDebug() << "Starting Server";
+    network.setCredentials(Token("token_key", "token_secret", "consumer_key", "consumer_secret"));
+    process = new QProcess(this);
+    QSignalSpy spy(process, SIGNAL(started()));
+    process->setWorkingDirectory(QDir::currentPath() + "/backend/tests/");
+    qDebug() << process->workingDirectory();
+    QString program = "python3";
+    QString script = "mock_click_server.py";
+    process->start(program, QStringList() << script);
+    QTRY_COMPARE(spy.count(), 1);
+    // Wait for server to start
+    QTimer timer;
+    QSignalSpy spy2(&timer, SIGNAL(timeout()));
+    timer.setInterval(2000);
+    timer.setSingleShot(true);
+    timer.start();
+    QTRY_COMPARE(spy2.count(), 1);
+}
+
+void TestNetwork::testNetworkAuthenticationError()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/authError/", 1);
+    QSignalSpy spy(&network, SIGNAL(authenticationError()));
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
+    // WTF DOES THIS HAPPEN TWICE
+    QTRY_COMPARE(spy.count(), 2);
+}
+
+void TestNetwork::testNetworkGetPaymentTypes()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);    
+    QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
+    network.requestPaymentTypes("USD");
+    QTRY_COMPARE(spy.count(), 1);
+    QList<QVariant> arguments = spy.takeFirst();
+    QVERIFY(arguments.at(0).toList().count() == 3);
+    QVariantList listPays = arguments.at(0).toList();
+    for (int i = 0; i < listPays.count(); i++) {
+        QVariant var = listPays.at(i);
+        PayInfo* info = var.value<PayInfo*>();
+        if (i == 2) {
+            QVERIFY(info->preferred() == true);
+        } else {
+            QVERIFY(info->preferred() == false);
+        }
+    }
+}
+
+void TestNetwork::testNetworkGetPaymentTypesFail()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
+    QSignalSpy spy(&network, SIGNAL(error(QString)));
+    network.requestPaymentTypes("USD");
+    // WTF DOES THIS HAPPEN TWICE
+    QTRY_COMPARE(spy.count(), 2);
+    QList<QVariant> arguments = spy.takeFirst();
+    QVERIFY(arguments.at(0).toString().startsWith("404:"));
+}
+
+void TestNetwork::testNetworkBuyItem()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(buyItemSucceeded()));
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
+    QTRY_COMPARE(spy.count(), 1);
+}
+
+void TestNetwork::testNetworkBuyItemInProgress()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/interaction/", 1);
+    QSignalSpy spy(&network, SIGNAL(buyInteractionRequired(QString)));
+    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());
+    QString expected("http://localhost:8000/interaction/redirect.url?currency=USD");
+    QVERIFY(url.startsWith(expected));
+}
+
+void TestNetwork::testNetworkBuyItemFail()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
+    QSignalSpy spy(&network, SIGNAL(buyItemFailed()));
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", false);
+    QTRY_COMPARE(spy.count(), 1);
+}
+
+void TestNetwork::testNetworkButItemWithPaymentType()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
+    network.requestPaymentTypes("USD");
+    QTRY_COMPARE(spy.count(), 1);
+    QSignalSpy spy2(&network, SIGNAL(buyItemSucceeded()));
+    network.buyItemWithPreferredPaymentType("email", "password", "otp", "USD", "appid", "itemid", false);
+    QTRY_COMPARE(spy2.count(), 1);
+}
+
+void TestNetwork::testNetworkButItemWithPaymentTypeFail()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
+    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", "USD", "appid", "itemid", false);
+    QTRY_COMPARE(spy2.count(), 1);
+}
+
+void TestNetwork::testNetworkButItemWithPaymentTypeInProgress()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(paymentTypesObtained(QVariantList)));
+    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", "USD", "appid", "itemid", false);
+    QTRY_COMPARE(spy2.count(), 1);
+}
+
+void TestNetwork::testNetworkGetItemInfo()
+{
+     setenv(SEARCH_BASE_URL_ENVVAR, "http://localhost:8000/iteminfo/", 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(SEARCH_BASE_URL_ENVVAR, "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(SEARCH_BASE_URL_ENVVAR, "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(SEARCH_BASE_URL_ENVVAR, "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(SEARCH_BASE_URL_ENVVAR, "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(SEARCH_BASE_URL_ENVVAR, "http://localhost:8000/fail/iteminfo/", 1);
+    unsetenv(CURRENCY_ENVVAR);
+    QSignalSpy spy(&network, SIGNAL(error(QString)));
+    network.getItemInfo("packagename", "");
+    // WTF DOES THIS HAPPEN TWICE
+    QTRY_COMPARE(spy.count(), 2);
+}
+
+void TestNetwork::testUseExistingCredentials()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(buyItemSucceeded()));
+    network.buyItem("email", "password", "otp", "USD", "appid", "itemid", "paymentid", "backendid", true);
+    QTRY_COMPARE(spy.count(), 1);
+}
+
+void TestNetwork::testCheckAlreadyPurchased()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(buyItemSucceeded()));
+    network.checkItemPurchased("com.example.fakeapp", "");
+    QTRY_COMPARE(spy.count(), 1);
+}
+
+void TestNetwork::testCheckAlreadyPurchasedFail()
+{
+    setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/notpurchased/", 1);
+    QSignalSpy spy(&network, SIGNAL(itemNotPurchased()));
+    network.checkItemPurchased("com.example.fakeapp", "");
+    // WTF DOES THIS HAPPEN TWICE
+    QTRY_COMPARE(spy.count(), 2);
+}
+
+void TestNetwork::testSanitizeUrl()
+{
+    QUrl url("https://example.com//test/this/heavily///really%2f/");
+    QUrl expected("https://example.com/test/this/heavily/really%2f/");
+    QString result = network.sanitizeUrl(url);
+    QTRY_COMPARE(result, expected.toString());
+}
+
+void TestNetwork::testEncodeQuerySlashes()
+{
+    QString query("abcdef/01235%3D");
+    QTRY_COMPARE(network.encodeQuerySlashes(query),
+                 QStringLiteral("abcdef%2F01235%3D"));
+}
+
+void TestNetwork::cleanupTestCase()
+{
+    process->close();
+    process->deleteLater();
+}
+
+QTEST_MAIN(TestNetwork)
+#include "test_network.moc"

=== added file 'pay-ui/pay-ui.in'
--- pay-ui/pay-ui.in	1970-01-01 00:00:00 +0000
+++ pay-ui/pay-ui.in	2016-03-11 14:49:24 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Copyright © 2016 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+env QML2_IMPORT_PATH=${QML2_IMPORT_PATH}:@QT_IMPORTS_DIR@ qmlscene @PAYUI_DIR@/payui.qml $@

=== added directory 'pay-ui/tests'
=== added directory 'pay-ui/tests/autopilot'
=== added directory 'pay-ui/tests/autopilot/pay_ui'
=== added file 'pay-ui/tests/autopilot/pay_ui/__init__.py'
--- pay-ui/tests/autopilot/pay_ui/__init__.py	1970-01-01 00:00:00 +0000
+++ pay-ui/tests/autopilot/pay_ui/__init__.py	2016-03-11 14:49:24 +0000
@@ -0,0 +1,106 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import ubuntuuitoolkit as uitk
+
+from autopilot import logging as autopilot_logging
+
+logger = logging.getLogger(__name__)
+
+
+class MainView(uitk.MainView):
+
+    def _tap(self, objectName):
+        """Find a widget and tap on it."""
+        item = self.wait_select_single(objectName=objectName)
+        if item.enabled:
+            self.pointing_device.click_object(item)
+
+    def _type_text(self, objectName, text):
+        """Find a text widget and enter some text in it."""
+        item = self.wait_select_single(
+            uitk.TextField, objectName=objectName)
+        item.write(text)
+
+    @autopilot_logging.log_action(logger.info)
+    def cancel(self):
+        """Tap on the 'Cancel' button."""
+        self._tap('cancelButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def buy(self):
+        """Tap on the 'Buy Now' button."""
+        self._tap('buyButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def enter_password(self, password):
+        """Type the password into the entry field."""
+        self._type_text('passwordField', password)
+
+    @autopilot_logging.log_action(logger.info)
+    def tap_on_webview(self):
+        """Tap in the center of the web view."""
+        self._tap('webView')
+
+    @autopilot_logging.log_action(logger.info)
+    def open_add_card_page(self):
+        """Open the 'Add Credit/Debit Card' page.
+
+        :return the Add Credit/Debit Card page.
+        """
+        self._tap('addCreditCardLabel')
+        return self.wait_select_single(objectName='pageWebkit')
+
+    @autopilot_logging.log_action(logger.info)
+    def get_payment_types(self):
+        """Get the payment types option selector widget.
+
+        :return the Payment Types option selector widget.
+        """
+        return self.wait_select_single(objectName='paymentTypes')
+
+    @autopilot_logging.log_action(logger.info)
+    def get_checkout_page(self):
+        """Get the widget for the Checkout page.
+
+        :return the Checkout page widget."""
+        return self.wait_select_single(objectName='pageCheckout')
+
+    @autopilot_logging.log_action(logger.info)
+    def tap_dialog_ok_button(self):
+        """Tap the 'OK' button in the dialog."""
+        self._tap('dialogOkButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def tap_dialog_cancel_button(self):
+        """Tap the 'Cancel' button in the dialog."""
+        self._tap('dialogCancelButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def tap_dialog_leave_button(self):
+        """Tap the 'Leave' button in the dialog."""
+        self._tap('leaveButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def tap_dialog_stay_button(self):
+        """Tap the 'Stay' button in the dialog."""
+        self._tap('stayButton')
+
+    @autopilot_logging.log_action(logger.info)
+    def input_dialog_text(self, text):
+        """Type the text into the dialog text entry field."""
+        self._type_text('dialogInput', text)

=== added directory 'pay-ui/tests/autopilot/pay_ui/tests'
=== added file 'pay-ui/tests/autopilot/pay_ui/tests/__init__.py'
--- pay-ui/tests/autopilot/pay_ui/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ pay-ui/tests/autopilot/pay_ui/tests/__init__.py	2016-03-11 14:49:24 +0000
@@ -0,0 +1,77 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014-2016 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import fixtures
+import json
+import os
+import shutil
+import subprocess
+import tempfile
+import ubuntuuitoolkit as uitk
+
+import pay_ui
+
+
+class BasePayUITestCase(uitk.base.UbuntuUIToolkitAppTestCase):
+    """Base Autopilot test case for the Pay UI project."""
+
+    dirpath = None
+
+    def setUp(self):
+        super().setUp()
+        build_dir = os.environ.get('BUILD_DIR', None)
+        source_dir = os.environ.get('SOURCE_DIR', None)
+        self.app = self.launch_application(build_dir, source_dir)
+
+    def create_config_dir(self):
+        self.dirpath = tempfile.mkdtemp()
+        self.useFixture(fixtures.EnvironmentVariable(
+            'XDG_DATA_HOME', self.dirpath))
+
+    def clean_config_dir(self):
+        if self.dirpath:
+            shutil.rmtree(self.dirpath)
+
+    def launch_application(self, build_dir=None, source_dir=None):
+        if build_dir is None:
+            return self.launch_installed_app()
+        else:
+            return self.launch_built_application(build_dir, source_dir)
+
+    def launch_installed_app(self):
+        return self.launch_test_application(
+            '/usr/lib/payui/pay-ui',
+            app_type='qt',
+            emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase)
+
+    def launch_built_application(self, build_dir, source_dir):
+        built_import_path = os.path.join(build_dir, 'backend')
+        self.useFixture(
+            fixtures.EnvironmentVariable(
+                'QML2_IMPORT_PATH', newvalue=built_import_path))
+        main_qml_path = os.path.join(source_dir, 'app', 'payui.qml')
+        return self.launch_test_application(
+            uitk.base.get_qmlscene_launch_command(),
+            main_qml_path,
+            '--transparent',
+            'purchase://com.example.testapp',
+            app_type='qt',
+            emulator_base=uitk.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @property
+    def main_view(self):
+        """Return main view"""
+        return self.app.select_single(pay_ui.MainView)

=== added file 'pay-ui/tests/autopilot/pay_ui/tests/mock_server.py'
--- pay-ui/tests/autopilot/pay_ui/tests/mock_server.py	1970-01-01 00:00:00 +0000
+++ pay-ui/tests/autopilot/pay_ui/tests/mock_server.py	2016-03-11 14:49:24 +0000
@@ -0,0 +1,337 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import json
+import socket
+import threading
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+
+html_success = """
+<html>
+    <body bgcolor="green" onClick="window.location.assign('/paymentmethods/completeadd')">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click anywhere to proceed</p>
+    </body>
+</html>"
+"""
+
+html_cancel = """
+<html>
+    <body bgcolor="red" onClick="window.location.assign('/api/2.0/click/cancelled')">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click anywhere to cancel</p>
+    </body>
+</html>"
+"""
+
+html_completed = """
+<html>
+    <body onLoad="window.location.assign('/click/succeeded')">
+    </body>
+</html>
+"""
+
+html_beforeunload = """
+<html>
+    <script language="javascript">
+        window.onbeforeunload = function() {
+            return 'Really want to add your card?'
+        }
+        window.onload = function() {
+            window.location.assign('/click/cancelled')
+        }
+        window.onclick = function() {
+            window.onbeforeunload = null;
+            window.location.assign('/paymentmethods/completeadd')
+        }
+    </script>
+    <body bgcolor="yellow">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click 'Stay' and then anywhere to proceed.</p>
+    </body>
+</html>
+"""
+
+html_alert = """
+<html>
+    <body onClick="window.location.assign('/paymentmethods/completeadd')"
+          onLoad="alert('Click OK to add your card.')">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click anywhere to proceed</p>
+     </body>
+</html>
+"""
+
+html_confirm = """
+<html>
+    <script language="javascript">
+        window.onload = function() {
+            if (window.confirm('Do you want to add your card?')) {
+                window.location.assign('/paymentmethods/completeadd')
+            } else {
+                window.location.assign('/click/cancelled')
+            }
+        }
+    </script>
+    <body bgcolor="pink">
+        <h1>Placeholder for web interaction</h1>
+        <p>Click ok to add card, or cancel to not.</p>
+    </body>
+</html>
+"""
+
+html_prompt = """
+<html>
+    <script language="javascript">
+        window.onload = function() {
+            if (window.prompt('Speak friend and enter') == 'friend') {
+                window.location.assign('/paymentmethods/completeadd')
+            } else {
+                window.location.assign('/click/cancelled')
+            }
+        }
+    </script>
+    <body bgcolor="pink">
+        <h1>Placeholder for web interaction</h1>
+        <p>Type friend and ok to add card.</p>
+    </body>
+</html>
+"""
+
+
+class MyHandler(BaseHTTPRequestHandler):
+
+    def do_HEAD(self):
+        self.send_response(200)
+        self.send_header("X-Click-Token", "X-Click-Token")
+        self.end_headers()
+
+    def response_payment_types(self, fail=False):
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(self.server.payment_types), 'UTF-8'))
+
+    def interaction_html(self):
+        return html_cancel if self.server.interaction_cancel else html_success
+
+    def response_cc_interaction(self, fail=False):
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "text/html")
+        self.end_headers()
+        self.wfile.write(bytes(self.interaction_html(), 'UTF-8'))
+
+    def response_payment_add(self, fail=False):
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "text/html")
+        self.end_headers()
+        test = self.path.split('/')[1]
+        if test.find('js_alert') != -1:
+            self.wrile.write(bytes(html_alert, 'UTF-8'))
+        elif test.find('js_beforeunload') != -1:
+            self.wfile.write(bytes(html_beforeunload, 'UTF-8'))
+        elif test.find('js_confirm') != -1:
+            self.wfile.write(bytes(html_confirm, 'UTF-8'))
+        elif test.find('js_prompt') != -1:
+            self.wfile.write(bytes(html_prompt, 'UTF-8'))
+        else:
+            self.wfile.write(bytes(self.interaction_html(), 'UTF-8'))
+
+    def response_payment_add_complete(self):
+        """Add the new payment info to the list."""
+        self.server.payment_types[1]["choices"].append({
+            "currencies": ["USD"],
+            "id": 1999,
+            "requires_interaction": False,
+            "preferred": False,
+            "description": "Yet another payment method"
+        })
+        self.send_response(200)
+        self.send_header("Content-type", "text/html")
+        self.end_headers()
+        self.wfile.write(bytes(html_completed, 'UTF-8'))
+
+    def response_buy_item(self):
+        response = {
+            "state": "Complete",
+        }
+        if self.server.buy_cc_interaction:
+            response["state"] = "InProgress"
+            response["redirect_to"] = self.server.buy_cc_interaction
+        if self.server.fail:
+            response = {}
+        self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        try:
+            self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
+        except socket.error:
+            pass
+
+    def response_update_credentials(self, fail=False):
+        response = {
+            "token_key": "token_key",
+            "token_secret": "token_secret",
+            "consumer_key": "consumer_key",
+            "consumer_secret": "consumer_secret",
+        }
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
+
+    def response_item_info(self, fail=False):
+        response = {
+            "title": "title",
+            "publisher": "publisher",
+            "icon_url": "icon_url",
+            "prices": {
+                "USD": 2.99,
+                "EUR": 2.49,
+                "GBP": 1.99,
+            },
+        }
+        if fail:
+            self.send_response(404)
+        else:
+            self.send_response(200)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
+
+    def response_auth_error(self):
+        self.send_response(401)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(dict()), 'UTF-8'))
+
+    def do_POST(self):
+        """Respond to a POST request."""
+        #content = self.rfile.read(int(self.headers.get('content-length')))
+        #structure = json.loads(content.decode('utf-8'))
+        if self.path.find("purchases/") != -1:
+            self.response_buy_item()
+
+    def do_GET(self):
+        """Respond to a GET request."""
+        fail = self.path.find("/fail/") != -1
+        if self.path.find("paymentmethods/add/") != -1:
+            self.response_payment_add()
+        elif self.path.find("paymentmethods/completeadd") != -1:
+            self.response_payment_add_complete()
+        elif self.path.find("paymentmethods/") != -1:
+            self.response_payment_types(fail)
+        elif self.path.find("creditcard_interaction/") != -1:
+            self.response_cc_interaction()
+        elif self.path.find("purchases/") != -1:
+            self.response_buy_item()
+        elif self.path.find("creds/") != -1 or self.path.find("wallet/") != -1:
+            self.response_update_credentials(fail)
+        elif self.path.find("iteminfo/") != -1:
+            self.response_item_info(fail)
+        elif self.path.find("/authError/") != -1:
+            self.response_auth_error()
+
+
+def initial_payment_types():
+    return [
+        {
+            "description": "PayPal",
+            "id": "paypal",
+            "preferred": False,
+            "choices": [
+                {
+                    "currencies": [
+                        "USD",
+                        "GBP",
+                        "EUR"
+                    ],
+                    "id": 532,
+                    "requires_interaction": False,
+                    "preferred": False,
+                    "description": ("PayPal Preapproved Payment "
+                                    "(exp. 2014-04-12)")
+                }
+            ]
+        },
+        {
+            "description": "Credit or Debit Card",
+            "id": "credit_card",
+            "preferred": True,
+            "choices": [
+                {
+                    "currencies": [
+                        "USD"
+                    ],
+                    "id": 1767,
+                    "requires_interaction": False,
+                    "preferred": False,
+                    "description": ("**** **** **** 1111 "
+                                    "(Visa, exp. 02/2015)")
+                },
+                {
+                    "currencies": [
+                        "USD"
+                    ],
+                    "id": 1726,
+                    "requires_interaction": False,
+                    "preferred": True,
+                    "description": ("**** **** **** 1111 "
+                                    "(Visa, exp. 03/2015)")
+                }
+            ]
+        }
+    ]
+
+
+class MockServer:
+    def __init__(self):
+        server_address = ('', 0)
+        self.server = HTTPServer(server_address, MyHandler)
+        tcp_port = self.server.socket.getsockname()[1]
+        self.base_url = "http://127.0.0.1:%d/" % tcp_port
+        server_thread = threading.Thread(target=self.server.serve_forever)
+        server_thread.start()
+        self.server.payment_types = initial_payment_types()
+        self.server.fail = False
+        self.server.buy_cc_interaction = None
+        self.server.interaction_cancel = False
+
+    def set_purchase_needs_cc_interaction(self):
+        # Real server returns path starting with / here, not full URL.
+        self.server.buy_cc_interaction = "/creditcard_interaction"
+
+    def set_interaction_result_cancelled(self):
+        self.server.interaction_cancel = True
+
+    def url(self, tail=""):
+        return self.base_url + tail
+
+    def shutdown(self):
+        self.server.shutdown()

=== added file 'pay-ui/tests/autopilot/pay_ui/tests/test_pay_ui.py'
--- pay-ui/tests/autopilot/pay_ui/tests/test_pay_ui.py	1970-01-01 00:00:00 +0000
+++ pay-ui/tests/autopilot/pay_ui/tests/test_pay_ui.py	2016-03-11 14:49:24 +0000
@@ -0,0 +1,186 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014-2016 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import fixtures
+import testtools
+
+from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
+
+from pay_ui import tests
+from pay_ui.tests import mock_server
+
+
+class PayUITestCase(tests.BasePayUITestCase):
+
+    def setUp(self):
+        self.clean_config_dir()
+        self.mock_server = mock_server.MockServer()
+        self.addCleanup(self.mock_server.shutdown)
+        self.useFixture(fixtures.EnvironmentVariable(
+            'PAY_BASE_URL',
+            self.mock_server.url() + '/' + self.id().split('.')[-1]))
+        self.useFixture(fixtures.EnvironmentVariable(
+            'U1_SEARCH_BASE_URL', self.mock_server.url('iteminfo/')))
+        self.useFixture(fixtures.EnvironmentVariable(
+            'SSO_AUTH_BASE_URL', self.mock_server.url('login/')))
+        self.useFixture(fixtures.EnvironmentVariable('GET_CREDENTIALS', '0'))
+        self.create_config_dir()
+        self.addCleanup(self.clean_config_dir)
+        super().setUp()
+
+    def app_returncode(self):
+        return self.app.process.wait(timeout=30)
+
+    def test_ui_initialized(self):
+        main = self.main_view
+        self.assertThat(main, NotEquals(None))
+
+    def test_cancel_purchase(self):
+        self.main_view.cancel()
+        self.assertThat(self.app_returncode(), Equals(1))
+
+    def test_basic_purchase(self):
+        self.skipTest('Mouse clicks on buyButton not registering.')
+        self.main_view.enter_password('password123')
+        self.main_view.buy()
+        self.assertThat(self.app_returncode(), Equals(0))
+
+    def test_add_credit_card_completed(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_on_webview()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_returns_on_cancel(self):
+        self.mock_server.set_interaction_result_cancelled()
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_on_webview()
+        checkout_page = self.main_view.get_checkout_page()
+        self.assertThat(checkout_page.get_properties()["active"],
+                        Eventually(Equals(True)))
+
+    def test_add_credit_card_cancelled(self):
+        self.mock_server.set_interaction_result_cancelled()
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_on_webview()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    @testtools.skip('JS Alert dialog seems to not work.')
+    def test_add_credit_card_js_alert(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_ok_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_beforeunload(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_stay_button()
+        self.main_view.tap_on_webview()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    @testtools.skip('Clicking add card link second seems to not work.')
+    def test_add_credit_card_js_beforeunload_twice(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_leave_button()
+        self.take_screenshot('beforeunload_left')
+        self.main_view.open_add_card_page()
+        self.take_screenshot('beforeunload_back')
+        self.main_view.tap_dialog_stay_button()
+        self.main_view.tap_on_web_view()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_beforeunload_cancelled(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_leave_button()
+        self.take_screenshot('beforeunload_cancelled')
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_confirm_ok(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_ok_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_confirm_cancel(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_cancel_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_prompt_ok(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.input_dialog_text('friend')
+        self.main_view.tap_dialog_ok_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(4)))
+
+    def test_add_credit_card_js_prompt_ok_wrong_text(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.input_dialog_text('amigo')
+        self.main_view.tap_dialog_ok_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_add_credit_card_js_prompt_cancel(self):
+        payment_types = self.main_view.get_payment_types()
+        self.assertThat(payment_types.get_option_count(), Equals(3))
+        self.main_view.open_add_card_page()
+        self.take_screenshot('add_card_page')
+        self.main_view.tap_dialog_cancel_button()
+        self.assertThat(payment_types.get_option_count, Eventually(Equals(3)))
+
+    def test_purchase_with_web_interaction_completed(self):
+        self.skipTest('Mouse clicks on buyButton not registering.')
+        self.mock_server.set_purchase_needs_cc_interaction()
+        self.main_view.buy()
+        self.main_view.tap_on_webview()
+        self.assertThat(self.app_returncode(), Equals(0))
+
+    def test_purchase_with_web_interaction_cancelled(self):
+        self.skipTest('Mouse clicks on buyButton not registering.')
+        self.mock_server.set_purchase_needs_cc_interaction()
+        self.mock_server.set_interaction_result_cancelled()
+        self.main_view.buy()
+        self.main_view.tap_on_webview()
+        self.assertThat(self.app_returncode(), Equals(1))

=== added file 'pay-ui/tests/autopilot/run_autopilot'
--- pay-ui/tests/autopilot/run_autopilot	1970-01-01 00:00:00 +0000
+++ pay-ui/tests/autopilot/run_autopilot	2016-03-11 14:49:24 +0000
@@ -0,0 +1,1 @@
+GET_CREDENTIALS=0 autopilot3 run -v pay_ui

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-12-11 19:49:20 +0000
+++ po/CMakeLists.txt	2016-03-11 14:49:24 +0000
@@ -15,7 +15,7 @@
 # Creates the .pot file containing the translations template
 set(INTLTOOL_ENV
     XGETTEXT="${GETTEXT_XGETTEXT_EXECUTABLE}"
-    XGETTEXT_ARGS="--keyword=Gettext;--keyword=NGettext:1,2"
+    XGETTEXT_ARGS="--keyword=Gettext;--keyword=NGettext:1,2;--keyword=tr;--keyword=tr:1,2;--keyword=N_"
     srcdir="${CMAKE_CURRENT_SOURCE_DIR}"
 )
 add_custom_target(${POT_FILE}

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2015-12-11 19:49:20 +0000
+++ po/POTFILES.in	2016-03-11 14:49:24 +0000
@@ -1,1 +1,9 @@
+pay-ui/app/components/ConfirmDialog.qml
+pay-ui/app/components/PromptDialog.qml
+pay-ui/app/components/BeforeUnloadDialog.qml
+pay-ui/app/components/SecurityCertificatePopover.qml
+pay-ui/app/components/AlertDialog.qml
+pay-ui/app/ui/CheckoutPage.qml
+pay-ui/app/ui/ErrorDialog.qml
+pay-ui/app/payui.qml
 service-ng/src/pay-service-2/service/pay_service.go

=== added file 'po/aa.po'
--- po/aa.po	1970-01-01 00:00:00 +0000
+++ po/aa.po	2016-03-11 14:49:24 +0000
@@ -0,0 +1,106 @@
+# Afar translation for pay-ui
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the pay-ui package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pay-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-02-19 15:01-0500\n"
+"PO-Revision-Date: 2015-04-26 13:56+0000\n"
+"Last-Translator: Charif AYFARAH <[e-mail]>\n"
+"Language-Team: Afar <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-12-25 05:38+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
+
+#: ../app/payui.qml:148
+msgid "Finish Purchase"
+msgstr "Limok gaba kal"
+
+#: ../app/payui.qml:163
+msgid "Incorrect Password, please try again."
+msgstr "Cuumiti makot yan,  maganak kaadu gabbat."
+
+#: ../app/payui.qml:276
+msgid "Purchase failed"
+msgstr "Limo makkinna"
+
+#: ../app/payui.qml:277
+msgid "The purchase couldn't be completed."
+msgstr "limo ma duuduminna."
+
+#: ../app/payui.qml:292
+msgid "Error contacting the server"
+msgstr "Yayfaayi angaaraw soka le"
+
+#: ../app/payui.qml:293 ../app/payui.qml:309
+msgid "Do you want to try again?"
+msgstr "Kaadu gabbattam maay faxxa?"
+
+#: ../app/payui.qml:308
+msgid "Adding Credit Card failed"
+msgstr "Abuúd Karti edde osisaanam makkinna"
+
+#: ../app/payui.qml:327
+msgid "Processing Purchase"
+msgstr "Limô gexso"
+
+#: ../app/payui.qml:327
+msgid "Loading"
+msgstr "Qulluumah"
+
+#: ../app/payui.qml:328
+msgid "Please wait…"
+msgstr "Maganak qambal..."
+
+#: ../app/payui.qml:342 ../app/ui/CheckoutPage.qml:370
+msgid "Cancel"
+msgstr "Bayis"
+
+#: ../app/payui.qml:401
+msgid "Add Payment"
+msgstr "Mekla edde osis"
+
+#: ../app/ui/CheckoutPage.qml:27
+msgid "Payment"
+msgstr "Mekla"
+
+#: ../app/ui/CheckoutPage.qml:228
+msgid "Enter your Ubuntu One password"
+msgstr "Ubuntu One cuumita culus"
+
+#: ../app/ui/CheckoutPage.qml:271
+msgid "Type your verification code:"
+msgstr "Mudenti diggoyso culus:"
+
+#: ../app/ui/CheckoutPage.qml:282
+msgid "2-factor device code"
+msgstr "2-afeetah aalatih mudenta"
+
+#: ../app/ui/CheckoutPage.qml:379
+msgid "Buy Now"
+msgstr "Away xaamit"
+
+#: ../app/ui/CheckoutPage.qml:393
+msgid "Add credit/debit card"
+msgstr "Abuú/Raci karti edde osis"
+
+#: ../app/ui/ErrorDialog.qml:45
+msgid "Retry"
+msgstr "Qagis"
+
+#: ../app/ui/ErrorDialog.qml:55
+msgid "Close"
+msgstr "Alif"
+
+#: payui_payui.desktop.in.in.h:1
+msgid "Pay UI"
+msgstr "UI mekel"
+
+#: payui_payui.desktop.in.in.h:2
+msgid "The application for completing a purchase."
+msgstr "Limô duddoh abnisso"

=== added file 'po/am.po'
--- po/am.po	1970-01-01 00:00:00 +0000
+++ po/am.po	2016-03-11 14:49:24 +0000
@@ -0,0 +1,106 @@
+# Amharic translation for pay-ui
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the pay-ui package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pay-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-02-19 15:01-0500\n"
+"PO-Revision-Date: 2015-03-03 14:18+0000\n"
+"Last-Translator: samson <Unknown>\n"
+"Language-Team: Amharic <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-12-25 05:38+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
+
+#: ../app/payui.qml:148
+msgid "Finish Purchase"
+msgstr "ግዢውን መጨረሻ"
+
+#: ../app/payui.qml:163
+msgid "Incorrect Password, please try again."
+msgstr "የተሳሳተ የመግቢያ ቃል እባክዎን እንደገና ይሞክሩ"
+
+#: ../app/payui.qml:276
+msgid "Purchase failed"
+msgstr "ግዢው አልተሳካም"
+
+#: ../app/payui.qml:277
+msgid "The purchase couldn't be completed."
+msgstr "ግዢውን መፈጸም አልተቻለም"
+
+#: ../app/payui.qml:292
+msgid "Error contacting the server"
+msgstr "ስህተት ተፈጥሯል ሰርቨሩን በመገናኘት ላይ እንዳለ"
+
+#: ../app/payui.qml:293 ../app/payui.qml:309
+msgid "Do you want to try again?"
+msgstr "እንደገና መሞከር ይፈልጋሉ?"
+
+#: ../app/payui.qml:308
+msgid "Adding Credit Card failed"
+msgstr "የ ክሬዲር ካርድ መጨመር አልተቻለም"
+
+#: ../app/payui.qml:327
+msgid "Processing Purchase"
+msgstr "ግዢውን በማካሄድ ላይ"
+
+#: ../app/payui.qml:327
+msgid "Loading"
+msgstr "በመጫን ላይ"
+
+#: ../app/payui.qml:328
+msgid "Please wait…"
+msgstr "እባክዎን ይጠብቁ…"
+
+#: ../app/payui.qml:342 ../app/ui/CheckoutPage.qml:370
+msgid "Cancel"
+msgstr "መሰረዣ"
+
+#: ../app/payui.qml:401
+msgid "Add Payment"
+msgstr "ክፍያውን መጨመሪያ"
+
+#: ../app/ui/CheckoutPage.qml:27
+msgid "Payment"
+msgstr "ክፍያ"
+
+#: ../app/ui/CheckoutPage.qml:228
+msgid "Enter your Ubuntu One password"
+msgstr "የ እርስዎን የ ኡቡንቱ ዋን የ መግቢያ ቃል ያስገቡ"
+
+#: ../app/ui/CheckoutPage.qml:271
+msgid "Type your verification code:"
+msgstr "የ እርስዎን ማረጋገጫ ኮድ ይጻፉ:"
+
+#: ../app/ui/CheckoutPage.qml:282
+msgid "2-factor device code"
+msgstr "2-ፋክተር የ አካል ኮድ"
+
+#: ../app/ui/CheckoutPage.qml:379
+msgid "Buy Now"
+msgstr "አሁን መግዣ"
+
+#: ../app/ui/CheckoutPage.qml:393
+msgid "Add credit/debit card"
+msgstr "ክሬዲት/ዴቢት ካርድ መጨመሪያ"
+
+#: ../app/ui/ErrorDialog.qml:45
+msgid "Retry"
+msgstr "እንደገና ይሞክሩ"
+
+#: ../app/ui/ErrorDialog.qml:55
+msgid "Close"
+msgstr "መዝጊያ"
+
+#: payui_payui.desktop.in.in.h:1
+msgid "Pay UI"
+msgstr "መክፈያ UI"
+
+#: payui_payui.desktop.in.in.h:2
+msgid "The application for completing a purchase."
+msgstr "መተግበሪያ ግዢውን ለመፈጸም"

=== added file 'po/ast.po'
--- po/ast.po	1970-01-01 00:00:00 +0000
+++ po/ast.po	2016-03-11 14:49:24 +0000
@@ -0,0 +1,106 @@
+# Asturian translation for pay-ui
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the pay-ui package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pay-service\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2015-02-19 15:01-0500\n"
+"PO-Revision-Date: 2015-06-09 15:40+0000\n"
+"Last-Translator: enolp <[e-mail]>\n"
+"Language-Team: Asturian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-12-25 05:38+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
+
+#: ../app/payui.qml:148
+msgid "Finish Purchase"
+msgstr "Acabar la compra"
+
+#: ../app/payui.qml:163
+msgid "Incorrect Password, please try again."
+msgstr "La contraseña ye incorreuta. Inténtalo de nueves."
+
+#: ../app/payui.qml:276
+msgid "Purchase failed"
+msgstr "Falló la compra"
+
+#: ../app/payui.qml:277
+msgid "The purchase couldn't be completed."
+msgstr "Nun pudo completase la compra"
+
+#: ../app/payui.qml:292
+msgid "Error contacting the server"
+msgstr "Fallu al contautar col sirvidor"
+
+#: ../app/payui.qml:293 ../app/payui.qml:309
+msgid "Do you want to try again?"
+msgstr "¿Quies intentalo otra vegada?"
+
+#: ../app/payui.qml:308
+msgid "Adding Credit Card failed"
+msgstr "Fallu al amestar tarxeta de creitu"
+
+#: ../app/payui.qml:327
+msgid "Processing Purchase"
+msgstr "Procesando la compra"
+
+#: ../app/payui.qml:327
+msgid "Loading"
+msgstr "Cargando"
+
+#: ../app/payui.qml:328
+msgid "Please wait…"
+msgstr "Espera, por favor..."
+
+#: ../app/payui.qml:342 ../app/ui/CheckoutPage.qml:370
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../app/payui.qml:401
+msgid "Add Payment"
+msgstr "Amestar pagu"
+
+#: ../app/ui/CheckoutPage.qml:27
+msgid "Payment"
+msgstr "Pagu"
+
+#: ../app/ui/CheckoutPage.qml:228
+msgid "Enter your Ubuntu One password"
+msgstr "Introduz la to contraseña d'Ubuntu One"
+
+#: ../app/ui/CheckoutPage.qml:271
+msgid "Type your verification code:"
+msgstr "Escribi'l códigu de comprobación:"
+
+#: ../app/ui/CheckoutPage.qml:282
+msgid "2-factor device code"
+msgstr "códigu de preséu 2-factor"
+
+#: ../app/ui/CheckoutPage.qml:379
+msgid "Buy Now"
+msgstr "Mercar Agora"