Merge pull request amituuush#10 from amituuush/geolocation-fix

Geolocation fix

Author: amituuush

app/methods/create.js

@@ -1,10 +1,10 @@
 var Orders = require('../models/orders');
 
-var create = function(order, callback) {
-    Orders.create(order, function(err, result) {
+var create = function (order, callback) {
+    Orders.create(order, function (err, result) {
         if (err || !order) {
             console.error("Could not create order", order);
-            console.log(err);
+            console.log('err', err);
             return;
         }
         callback(null, result);

business-admin/components/BusinessAdminView/BAOrder/BAOrder.jsx

@@ -32,19 +32,19 @@ var BAOrder = React.createClass({
     },
 
 
-    _handleCompleteOrder: function() {
+    _handleCompleteOrder: function () {
         console.log('completing order');
         this.props.completeOrder(this.props.order._id);
     },
 
-    render: function() {
+    render: function () {
 
         var orderDetails = this.props.order.items.map(
-            function(item, i) {
+            function (item, i) {
                 return <BAOrderDetails
-                            key={i}
-                            item={item} />
-        });
+                    key={i}
+                    item={item} />
+            });
 
         if (this.props.order.specialInstructions) {
             var specialInstructions = <div className="special-instructions">"{this.props.order.specialInstructions}"</div>
@@ -59,11 +59,12 @@ var BAOrder = React.createClass({
                         {specialInstructions}
                     </div>
                     <div className="ba-order-right">
-                        <Timer
+                        { /*<Timer
                             secondsUntilArrival={this.props.order.secondsUntilArrival}
                             timeSelectedForPickup={this.props.order.timeSelectedForPickup}
                             expectedPickupTime={this.props.order.expectedPickupTime} />
                          <p>ETA:</p>
+                        */ }
                         <button onClick={this._handleCompleteOrder}>
                             Complete
                             <i className="fa fa-check-circle fa-2x" aria-hidden="true"></i>

customer/api.es6

@@ -1,15 +1,20 @@
 module.exports = {
 
-    getLocation: function(callback, callback2) {
+    getLocation: function (callback, callback2) {
         if (navigator.geolocation) {
-            navigator.geolocation.getCurrentPosition(callback);
-            navigator.geolocation.getCurrentPosition(callback2);
+            debugger;
+            navigator.geolocation.getCurrentPosition(callback, function (error) {
+                console.log(error);
+            }, { maximumAge: Infinity, enableHighAccuracy: true, timeout: 10000 });
+            navigator.geolocation.getCurrentPosition(callback2, function (error) {
+                console.log(error);
+            }, { maximumAge: Infinity, enableHighAccuracy: true, timeout: 10000 });
         } else {
             alert("Geolocation is not supported by this browser.");
         }
     },
 
-    getShops: function(position, callback) {
+    getShops: function (position, callback) {
         var currentLocation = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
 
         // Specify location, radius and place types for your Places API search.
@@ -22,33 +27,33 @@ module.exports = {
         // Handle the callback with an anonymous function.
         var service = new google.maps.places.PlacesService(map);
 
-        service.nearbySearch(request, function(results, status) {
+        service.nearbySearch(request, function (results, status) {
             if (status == google.maps.places.PlacesServiceStatus.OK) {
                 callback(results);
             }
         });
     },
 
-    getDetails: function(placeId, callback) {
+    getDetails: function (placeId, callback) {
         var service = new google.maps.places.PlacesService(map);
 
         service.getDetails({
             placeId: placeId
-        }, function(place, status) {
-              if (status === google.maps.places.PlacesServiceStatus.OK) {
-                  callback(place);
-              }
+        }, function (place, status) {
+            if (status === google.maps.places.PlacesServiceStatus.OK) {
+                callback(place);
+            }
         });
     },
 
-    calculateTravelTime: function(userLocation, selectedShopLocation, methodOfTrans, callback) {
+    calculateTravelTime: function (userLocation, selectedShopLocation, methodOfTrans, callback) {
         var bounds = new google.maps.LatLngBounds;
 
         var origin1 = userLocation;
         var destinationA = selectedShopLocation;
         var methodOfTrans;
 
-        switch(methodOfTrans) {
+        switch (methodOfTrans) {
             case 'walking':
                 methodOfTrans = google.maps.TravelMode.WALKING;
                 break;
@@ -71,14 +76,14 @@ module.exports = {
             unitSystem: google.maps.UnitSystem.IMPERIAL,
             avoidHighways: false,
             avoidTolls: false
-        }, function(response, status) {
+        }, function (response, status) {
             if (status !== google.maps.DistanceMatrixStatus.OK) {
                 alert('Error was: ' + status);
             } else {
                 var originList = response.originAddresses;
                 var destinationList = response.destinationAddresses;
-            callback(response);
-        }
-      });
+                callback(response);
+            }
+        });
     }
 }