Revert revertion on fixing canceller bug, also rename to deferrer

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_user.jsp

@@ -37,16 +37,16 @@
         .controller('OrderController', function ($scope, $q, ConverseService) {
             let account = new ConverseService.Driver(2)
 
-            let canceller
+            let deferrer
 
             $scope.activateFind = function () {
                 $scope.textFind = true;
                 $scope.buttonClose = true;
                 $scope.buttonFind = true;
 
-                canceller = $q.defer()
+                deferrer = $q.defer()
 
-                account.waitAsync(canceller)
+                account.waitAsync(deferrer.promise)
                     .then(function (userId) {
                         alert(userId)
                     })
@@ -57,8 +57,8 @@
                 $scope.buttonFind = false;
                 $scope.buttonClose = false;
 
-                if (canceller) {
-                    canceller.resolve()
+                if (deferrer) {
+                    deferrer.resolve()
                 }
             }
         })

TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js

@@ -63,7 +63,7 @@ let converse = function ($http) {
   class Driver extends Account {
     async waitAsync (timeout) {
       let response = await $http.post(`${apiUrl}/driver/${this.id}/wait`, '', {
-        timeout: timeout.promise
+        timeout: timeout
       })
 
       return response.data.user_id