Merge lp:~diegosarmentero/pay-ui/update-production-url into lp:pay-ui

[Diego Sarmentero]

- Update production url

Unmerged revisions

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-08-22 14:31:57 +0000
+++ app/payui.qml	2014-08-27 13:32:21 +0000
@@ -126,6 +126,12 @@
 
         onNoPreferredPaymentMethod: {
             direct.hasPreferredPayment = false;
+            var values = mainView.getLastPayment();
+            var backendid = values[0];
+            var paymentid = values[1];
+            if (backendid != "" && paymentid != "") {
+                direct.hasStoredPayment = true;
+            }
         }
 
         onPasswordValid: {
@@ -201,6 +207,7 @@
             function(tx) {
                 // Create the database if it doesn't already exist
                 tx.executeSql('CREATE TABLE IF NOT EXISTS PayUI(date TEXT)');
+                tx.executeSql('CREATE TABLE IF NOT EXISTS PayUIPayment(backendid TEXT, paymentid TEXT)');
                 var rs = tx.executeSql('SELECT * FROM PayUI');
                 if (rs.rows.length == 0) {
                     // If it's empty, add initial date.
@@ -241,6 +248,36 @@
         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")
@@ -351,9 +388,14 @@
             onBuy: {
                 if (direct.hasPayments && direct.hasPreferredPayment) {
                     mainView.purchasing = true;
-                    purchase.buyItemWithPreferredPayment(email, password);
+                    purchase.buyItemWithPreferredPayment(email, password, mainView.recentLogin);
                     showLoading();
-                } else {
+                } else if (direct.hasStoredPayment) {
+                    var values = mainView.getLastPayment();
+                    var backendid = values[0];
+                    var paymentid = values[1];
+                    purchase.buyItem(email, password, paymentid, backendid, mainView.recentLogin);
+                }else {
                     mainView.state = "checkout";
                     pageStack.push(checkout);
                 }
@@ -372,6 +414,10 @@
             onBuy: {
                 mainView.purchasing = true;
                 showLoading();
+                if (!direct.hasPreferredPayment) {
+                    mainView.updatePayment(backendId, paymentId);
+                }
+
                 var password = direct.password;
                 purchase.buyItem(email, password, paymentId, backendId, mainView.recentLogin);
             }

=== modified file 'app/ui/DirectPurchase.qml'
--- app/ui/DirectPurchase.qml	2014-08-22 14:31:57 +0000
+++ app/ui/DirectPurchase.qml	2014-08-27 13:32:21 +0000
@@ -32,6 +32,7 @@
     property alias price: priceItemLabel.text
     property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
     property bool hasPreferredPayment: true
+    property bool hasStoredPayment: false
     property bool beforeTimeout: false
 
     function launchPurchase() {
@@ -245,7 +246,7 @@
                 Button {
                     id: buyButton
                     objectName: "buyButtonDirect"
-                    text: pageDirectPayment.hasPreferredPayment ? i18n.tr("Buy Now") : i18n.tr("Confirm")
+                    text: (pageDirectPayment.hasPreferredPayment || pageDirectPayment.hasStoredPayment) ? i18n.tr("Buy Now") : i18n.tr("Confirm")
                     color: UbuntuColors.orange
                     width: parent.buttonsWidth
                     enabled: (passwordField.text.length > 7 || pageDirectPayment.beforeTimeout) ? true : false

=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-08-20 20:09:06 +0000
+++ backend/modules/payui/network.cpp	2014-08-27 13:32:21 +0000
@@ -249,13 +249,17 @@
 }
 
 void Network::buyItemWithPreferredPaymentType(const QString& email, const QString& password,
-                                              const QString& appid, const QString& itemid)
+                                              const QString& appid, const QString& itemid, bool recentLogin)
 {
     m_selectedPaymentId = m_preferred->paymentId();
     m_selectedBackendId = m_preferred->backendId();
     m_selectedAppId = appid;
     m_selectedItemId = itemid;
-    updateCredentials(email, password);
+    if (recentLogin) {
+        purchaseProcess();
+    } else {
+        updateCredentials(email, password);
+    }
 }
 
 void Network::buyItem(const QString& email, const QString& password,

=== modified file 'backend/modules/payui/network.h'
--- backend/modules/payui/network.h	2014-08-20 20:09:06 +0000
+++ backend/modules/payui/network.h	2014-08-27 13:32:21 +0000
@@ -35,7 +35,7 @@
 namespace UbuntuPurchase {
 
 constexpr static const char* PAY_BASE_URL_ENVVAR{"PAY_BASE_URL"};
-constexpr static const char* PAY_BASE_URL{"https://sc.ubuntu.com"};
+constexpr static const char* PAY_BASE_URL{"https://software-center.ubuntu.com"};
 constexpr static const char* PAY_API_ROOT{"/api/2.0/click"};
 
 class RequestObject : public QObject
@@ -62,7 +62,8 @@
                  const QString& itemid, const QString& paymentId, const QString& backendId,
                  bool recentLogin);
     void buyItemWithPreferredPaymentType(const QString& email, const QString& password,
-                                         const QString& appid, const QString& itemid);
+                                         const QString& appid, const QString& itemid,
+                                         bool recentLogin);
     void getItemInfo(const QString &packagename);
     void checkPassword(const QString& email, const QString& password);
     void getCredentials();

=== modified file 'backend/modules/payui/purchase.cpp'
--- backend/modules/payui/purchase.cpp	2014-08-20 20:09:06 +0000
+++ backend/modules/payui/purchase.cpp	2014-08-27 13:32:21 +0000
@@ -101,9 +101,9 @@
     m_network.checkPassword(email, password);
 }
 
-void Purchase::buyItemWithPreferredPayment(QString email, QString password)
+void Purchase::buyItemWithPreferredPayment(QString email, QString password, bool recentLogin)
 {
-    m_network.buyItemWithPreferredPaymentType(email, password, m_appid, m_itemid);
+    m_network.buyItemWithPreferredPaymentType(email, password, m_appid, m_itemid, recentLogin);
 }
 
 void Purchase::buyItem(QString email, QString password, QString paymentId, QString backendId, bool recentLogin)

=== modified file 'backend/modules/payui/purchase.h'
--- backend/modules/payui/purchase.h	2014-08-20 20:09:06 +0000
+++ backend/modules/payui/purchase.h	2014-08-27 13:32:21 +0000
@@ -16,7 +16,7 @@
 
     Q_INVOKABLE void getItemDetails(QString packagename, QString itemid);
     Q_INVOKABLE void getPaymentTypes();
-    Q_INVOKABLE void buyItemWithPreferredPayment(QString email, QString password);
+    Q_INVOKABLE void buyItemWithPreferredPayment(QString email, QString password, bool recentLogin);
     Q_INVOKABLE void buyItem(QString email, QString password, QString paymentId, QString backendId, bool recentLogin);
     Q_INVOKABLE void checkCredentials();
     Q_INVOKABLE QString getAddPaymentUrl();

=== modified file 'backend/tests/test_network.cpp'
--- backend/tests/test_network.cpp	2014-08-20 19:30:32 +0000
+++ backend/tests/test_network.cpp	2014-08-27 13:32:21 +0000
@@ -167,7 +167,7 @@
     network.requestPaymentTypes();
     QTRY_COMPARE(spy.count(), 1);
     QSignalSpy spy2(&network, SIGNAL(buyItemSucceeded()));
-    network.buyItemWithPreferredPaymentType("email", "password", "appid", "itemid");
+    network.buyItemWithPreferredPaymentType("email", "password", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 
@@ -180,7 +180,7 @@
     QTRY_COMPARE(spy.count(), 1);
     setenv(PAY_BASE_URL_ENVVAR, "http://localhost:8000/fail/", 1);
     QSignalSpy spy2(&network, SIGNAL(buyItemFailed()));
-    network.buyItemWithPreferredPaymentType("email", "password", "appid", "itemid");
+    network.buyItemWithPreferredPaymentType("email", "password", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 
@@ -193,7 +193,7 @@
     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", "appid", "itemid");
+    network.buyItemWithPreferredPaymentType("email", "password", "appid", "itemid", false);
     QTRY_COMPARE(spy2.count(), 1);
 }
 

=== modified file 'manifest.json'
--- manifest.json	2014-08-22 14:31:57 +0000
+++ manifest.json	2014-08-27 13:32:21 +0000
@@ -11,6 +11,6 @@
             "desktop": "payui_payui.desktop"
         }
     },
-    "version": "0.3.13",
+    "version": "0.3.15",
     "maintainer": "Diego Sarmentero <[e-mail]>"
 }