0d7c808 · unity8 · git.iko.soy

plugins/Ubuntu/Payments/Payments.cpp+3−5

compare with xenial

unifiedsplit

@@ -90,12 +90,12 @@ void observer(PayPackage* package, const char* /*itemid*/, PayPackageItemStatus

90 case PAY_PACKAGE_ITEM_STATUS_VERIFYING:

91 break;

92 case PAY_PACKAGE_ITEM_STATUS_PURCHASED:

93− Q_EMIT self->finished();

93+ Q_EMIT self->purchaseCompleted();

94 break;

95 case PAY_PACKAGE_ITEM_STATUS_PURCHASING:

96 break;

97 case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:

98− Q_EMIT self->error("not purchased");

98+ Q_EMIT self->purchaseError("not purchased");

99 break;

100 case PAY_PACKAGE_ITEM_STATUS_UNKNOWN:

101 break;

@@ -115,11 +115,9 @@ void Payments::start()

115 qDebug() << "after new" << ba.data();

116 pay_package_item_observer_install(package, observer, this);

117 qDebug() << "after observer install";

118+ // FIXME: Enable once verification is working in pay-service.

118 //pay_package_item_start_verification(package, ba.data());

119 //pay_package_item_start_verification(package, ba.data());

119 qDebug() << "after start verify";

120 qDebug() << "after start verify";

120 pay_package_item_start_purchase(package, ba.data());

121 pay_package_item_start_purchase(package, ba.data());

121 qDebug() << "after start purchase";

122 qDebug() << "after start purchase";

122−

123− // FIXME: remove this when the payments service starts working ok

124− finished();

125}

123}

plugins/Ubuntu/Payments/Payments.h+3−3

@@ -53,9 +53,9 @@ Q_SIGNALS:

53 void storeItemIdChanged(const QString &store_item_id);

54 void formattedPriceChanged(const QString &formatted_price);

55

56− void canceled();

56+ void purchaseCanceled();

57− void error(const QString &error);

57+ void purchaseError(const QString &error);

58− void finished();

58+ void purchaseCompleted();

59

60private:

61 QString m_currency;

qml/Dash/Previews/PreviewPayments.qml+3−5

@@ -38,8 +38,6 @@ PreviewWidget {

38 objectName: "paymentButton"

39 color: Theme.palette.selected.foreground

40 text: paymentClient.formattedPrice

41− iconSource: data && data.icon || ""

42− iconPosition: "left"

43 onClicked: paymentClient.start()

41 onClicked: paymentClient.start()

44 anchors.right: parent.right

42 anchors.right: parent.right

45 width: (root.width - units.gu(1)) / 2

43 width: (root.width - units.gu(1)) / 2

@@ -49,9 +47,9 @@ PreviewWidget {

49 price: paymentButton.source["price"]

47 price: paymentButton.source["price"]

50 currency: paymentButton.source["currency"]

48 currency: paymentButton.source["currency"]

51 storeItemId: paymentButton.source["store_item_id"]

49 storeItemId: paymentButton.source["store_item_id"]

52− onFinished: root.triggered(widgetId, "finished", data)

50+ onPurchaseCompleted: root.triggered(widgetId, "purchaseCompleted", paymentButton.source)

53− onCanceled: root.triggered(widgetId, "canceled", data)

51+ onPurchaseCanceled: root.triggered(widgetId, "purchaseCanceled", paymentButton.source)

54− onError: root.triggered(widgetId, "error", data)

52+ onPurchaseError: root.triggered(widgetId, "purchaseError", paymentButton.source)

55 }

53 }

56 }

54 }

57}

55}