From d774abf568d4874e539159057a0d47197692229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Guiselin?=
<jeremy.guiselin@datadoghq.com>
Date: Thu, 16 Feb 2017 18:36:30 -0500
Subject: [PATCH] Fix payment
---
www/js/modules/notification/service.js | 8 +-------
www/js/modules/purchase/service.js | 2 +-
www/js/pages/football/controller.js | 4 +---
www/js/pages/tabs/controller.js | 3 ++-
www/js/pages/tennis/controller.js | 16 ++++++++++------
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/www/js/modules/notification/service.js b/www/js/modules/notification/service.js
index e5124b1..7c0d7a7 100644
--- a/www/js/modules/notification/service.js
+++ b/www/js/modules/notification/service.js
@@ -28,12 +28,6 @@
var deviceData = ionic.Platform.device();
deviceData = Object.assign(deviceData, {locale: locale});
- window.FirebasePlugin.getToken(function (token) {
- deviceData.token = token;
- }, function (error) {
- deviceData.token = 'errorGettingToken' + error;
- });
-
window.FirebasePlugin.onTokenRefresh(function (token) {
deviceData.token = token;
}, function (error) {
@@ -42,7 +36,7 @@
if (typeof deviceData.token === 'undefined' || deviceData.token == null) {
deviceData.token = 'tokenCannotBeCreated';
- }
+ }
} else {
//Mock deviceData
diff --git a/www/js/modules/purchase/service.js b/www/js/modules/purchase/service.js
index 25bbd7f..e62ef20 100644
--- a/www/js/modules/purchase/service.js
+++ b/www/js/modules/purchase/service.js
@@ -18,7 +18,7 @@
var transactionData = {};
if (window.cordova) {
inAppPurchase
- .buy(purchaseId)
+ .subscribe(purchaseId)
.then(function (data) {
transactionData = {
transactionId: data.transactionId,
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index d1c1a29..8dee0ef 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -96,11 +96,8 @@
var ionContentObj = angular.element(document.querySelector('ion-content'));
var leagueHeight = angular.element(document.querySelector('.pack-item'))[0].scrollHeight;
- console.log('toto');
-
if (self.shouldUp && $scope.selected.length > 0) {
list.css('marginBottom', '47px');
- console.log(ionic.Platform.isIOS());
if (ionic.Platform.isIOS()) {
ionContentObj.css('marginBottom', '47px');
}
@@ -124,6 +121,7 @@
$scope.buyContent = function () {
var pack = self.findPack($scope.selected.length);
+ console.log(self.uuid);
PurchaseService.buyContent(self.uuid, pack, $scope.selected);
};
diff --git a/www/js/pages/tabs/controller.js b/www/js/pages/tabs/controller.js
index e9135c4..634bde3 100644
--- a/www/js/pages/tabs/controller.js
+++ b/www/js/pages/tabs/controller.js
@@ -55,7 +55,8 @@
$scope.buyContent = function () {
if (self.pack !== '') {
- PurchaseService.buyContent(self.uuid, self.pack, $scope.selected);
+ var uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
+ PurchaseService.buyContent(uuid, self.pack, $scope.selected);
}
};
diff --git a/www/js/pages/tennis/controller.js b/www/js/pages/tennis/controller.js
index 806d17e..cae04ef 100644
--- a/www/js/pages/tennis/controller.js
+++ b/www/js/pages/tennis/controller.js
@@ -157,13 +157,17 @@
};
$scope.parseDate = function (date) {
- var locale = window.navigator.language.split('-')[0];
- date = date.split(' ')[0].split('-');
-
- if (locale === "fr") {
- return date[2] + '/' + date[1] + '/' + date[0].substr(-2);
+ if (typeof date === 'undefined' || date == "") {
+ return "";
} else {
- return date[1] + '/' + date[2] + '/' + date[0].substr(-2);
+ var locale = window.navigator.language.split('-')[0];
+ date = date.split(' ')[0].split('-');
+
+ if (locale === "fr") {
+ return date[2] + '/' + date[1] + '/' + date[0].substr(-2);
+ } else {
+ return date[1] + '/' + date[2] + '/' + date[0].substr(-2);
+ }
}
};
--
GitLab