Pay Service

Merge lp:~dobey/pay-service/nonus-methods into lp:pay-service

  1. nonus-methods
  2. Merge into trunk.15.10
Proposed by dobey
Status: Merged
Approved by: Charles Kerr
Approved revision: 127
Merged at revision: 101
Proposed branch: lp:~dobey/pay-service/nonus-methods
Merge into: lp:pay-service
Prerequisite: lp:~dobey/pay-service/addcard-page
Diff against target: 29 lines (+4/-4)
1 file modified
pay-ui/app/payui.qml (+4/-4)
To merge this branch: bzr merge lp:~dobey/pay-service/nonus-methods
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+289112@code.launchpad.net

Commit message

Get the item details before payment methods, to get correct payment types.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
lp:~dobey/pay-service/nonus-methods updated
127. By dobey

Only get item details if we're not already in a purchasing state.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pay-ui/app/payui.qml'
2--- pay-ui/app/payui.qml 2016-03-16 18:45:32 +0000
3+++ pay-ui/app/payui.qml 2016-03-16 18:45:33 +0000
4@@ -89,6 +89,7 @@
5 checkout.itemTitle = title;
6 checkout.itemSubtitle = publisher;
7 checkout.price = formatted_price;
8+ purchase.getPaymentTypes(currency);
9 }
10
11 onPaymentTypesObtained: {
12@@ -172,14 +173,13 @@
13
14 if (mainView.state == "online-accounts") {
15 purchase.checkItemPurchased();
16- } else if (mainView.state != "checkout" && !mainView.purchasing && mainView.state != "buy-interaction") {
17- purchase.getPaymentTypes(suggestedCurrency);
18+ } else if (!mainView.purchasing && mainView.state != "buy-interaction") {
19+ purchase.getItemDetails();
20 }
21- purchase.getItemDetails();
22 }
23
24 onItemNotPurchased: {
25- purchase.getPaymentTypes(suggestedCurrency);
26+ purchase.getItemDetails();
27 }
28
29 onCredentialsNotFound: {

Subscribers

People subscribed via source and target branches

to all changes: