Merge lp:~dobey/pay-ui/fix-card-cancel into lp:pay-ui

[dobey]

Move the pop inside the if to avoid hitting the current page changed handler.

This bug was caught by an autopilot test, so this fix should make that test past now, as well as there is a condition in the manual test plan for it. I'm not sure how this slipped through, but it did. The code could use more cleanup but this is the smallest possible change to fix it, that I can see right now.

[Alejandro J. Cura (alecu)]

Looks good, and makes the autopilot tests pass in lp:~alecu/pay-ui/increase-coverage

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://jenkins.qa.ubuntu.com/job/pay-ui-autolanding/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-autolanding/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-autolanding/8
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-autolanding/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-autolanding/8

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-vivid-i386-ci/8

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

review: Approve (continuous-integration)

=== modified file 'app/payui.qml'
--- app/payui.qml	2015-01-07 03:46:02 +0000
+++ app/payui.qml	2015-01-12 21:25:14 +0000
@@ -416,10 +416,10 @@
             }
 
             onPurchaseCancelled: {
-                pageStack.pop();
                 hideLoading();
                 if (mainView.state == "add-payment") {
                     mainView.state = "checkout";
+                    pageStack.pop();
                 } else {
                     purchase.quitCancel();
                 }

=== modified file 'manifest.json'
--- manifest.json	2014-12-05 18:47:49 +0000
+++ manifest.json	2015-01-12 21:25:14 +0000
@@ -11,6 +11,6 @@
             "pay-ui": "payui_payui.desktop"
         }
     },
-    "version": "0.4.3",
+    "version": "0.4.4",
     "maintainer": "Ubuntu Appstore Developers <[e-mail]>"
-}
\ No newline at end of file
+}