change entrys, url and add feedback service

src/js/controllers/feedback/sendFeedback.js

@@ -1,7 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $log, $http, $httpParamSerializer, $stateParams, gettextCatalog, popupService, configService, lodash) {
+angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $log, $stateParams, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
-  var URL = "https://docs.google.com/forms/d/e/1FAIpQLSfHHAKb-CKjQnsuC_36IFaXlGsqLd5tZh79ywNfSADoVsw-gQ/formResponse";
   $scope.score = parseInt($stateParams.score);
   switch ($scope.score) {
     case 1:
@@ -29,20 +28,20 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func
   $scope.sendFeedback = function(feedback, skip) {
 
     var config = configService.getSync();
+
     var dataSrc = {
-      "entry.490635314": lodash.values(config.emailFor)[0] || ' ',
+      "Email": lodash.values(config.emailFor)[0] || ' ',
-      "entry.1447064148": skip ? ' ' : feedback,
+      "Feedback": skip ? ' ' : feedback,
-      "entry.2142850951": $stateParams.score
+      "Score": $stateParams.score
     };
 
-    $http(_post(dataSrc)).then(function(data) {
+    ongoingProcess.set('sendingFeedback', true);
-      $log.info("SUCCESS: Feedback sent");
+    feedbackService.send(dataSrc, function(err) {
-      $state.go('feedback.thanks', {
+      ongoingProcess.set('sendingFeedback', false);
-        score: $stateParams.score,
+      if (err) {
-        skipped: skip
+        popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not send feedback'));
-      });
+        return;
-    }, function(data) {
+      }
-      $log.info("ERROR: Feedback sent anyway.");
       $state.go('feedback.thanks', {
         score: $stateParams.score,
         skipped: skip
@@ -50,15 +49,4 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func
     });
   };
 
-  var _post = function(dataSrc) {
-    return {
-      method: 'POST',
-      url: URL,
-      headers: {
-        'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
-      },
-      data: $httpParamSerializer(dataSrc)
-    };
-  };
-
 });

src/js/services/configService.js

@@ -25,6 +25,9 @@ angular.module('copayApp.services').factory('configService', function(storageSer
       wp: ''
     },
 
+    feedback: {
+      url: 'https://script.google.com/macros/s/AKfycbybtvNSQKUfgzgXcj3jYLlvCKrcBoktjiJ1V8_cwd2yVkpUBGe3/exec'
+    },
     // wallet default config
     wallet: {
       requiredCopayers: 2,

src/js/services/feedbackService.js

@@ -0,0 +1,29 @@
+'use strict';
+angular.module('copayApp.services').factory('feedbackService', function($http, $log, $httpParamSerializer, configService) {
+  var root = {};
+  root.send = function(dataSrc, cb) {
+    $http(_post(dataSrc)).then(function() {
+      $log.info("SUCCESS: Feedback sent");
+      return cb();
+    }, function(err) {
+      $log.info("ERROR: Feedback sent anyway.");
+      return cb(err);
+    });
+  };
+
+  var _post = function(dataSrc) {
+
+    var config = configService.getSync();
+    var url = config.feedback.url;
+    return {
+      method: 'POST',
+      url: url,
+      headers: {
+        'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'
+      },
+      data: $httpParamSerializer(dataSrc)
+    };
+  };
+
+  return root;
+});

src/js/services/onGoingProcess.js

@@ -33,6 +33,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
     'validatingWallet': gettext('Validating wallet integrity...'),
     'validatingWords': gettext('Validating recovery phrase...'),
     'loadingTxInfo': gettext('Loading transaction info...'),
+    'sendingFeedback': gettext('Sending feedback...'),
   };
 
   root.clear = function() {
@@ -64,7 +65,7 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti
 
     var showName = $filter('translate')(processNames[name] || name);
 
-    if(customHandler) {
+    if (customHandler) {
       customHandler(processName, showName, isOn);
     } else if (root.onGoingProcessName) {
       if (isCordova) {