Upstream sync

src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js

@@ -504,6 +504,8 @@ class VerticalNonLinear extends React.Component {
         }
       });
 
+      let date = new Date();
+
       let visitTime = new Date(Math.round((date.getTime() + (1 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
       let visitDate = date;
       let pickupTime = new Date(Math.round((visitTime.getTime() - (0.5 * 60 * 60 * 1000)) / roundingTime) * roundingTime);
@@ -820,7 +822,7 @@ class VerticalNonLinear extends React.Component {
 
   handlePickupChanged = (res, state) => {
     let origin = {
-      id: res.id,
+      id: res.address_uuid ? res.address_uuid : res.id,
       name: res.name,
       lat: res.lat,
       lng: res.lng,

src/routes/app/routes/tables/routes/members/components/Datatable.js

@@ -40,9 +40,11 @@ const getDTList = function (member) {
   member.forEach((r, i) => {
     list.push(
       <tr key={r.useruuid}>
-        <td><a href={"/#/app/member/" + r.useruuid}>{r.name}</a></td>
+        <td></td>
+        <td><a>{r.name}</a></td>
         <td>
           <div>
+            <a href={"/#/app/member/" + r.useruuid}> Details </a> | 
             <ContactList data={{
               driverMobile: r.mobile,
               memberMobile: r.mobile,
@@ -280,6 +282,7 @@ class DatatableComponent extends React.Component {
       <Table ref={(c) => this.example = c} className='display' cellSpacing='0' width='100%'>
         <thead>
           <tr>
+            <th> </th>
             <th>Name</th>
             <th>Action</th>
             <th>Subscriber ID</th>