From d6847aae3307c921c2de88ca23ce590a53fe03b3 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Thu, 17 May 2018 09:55:40 +0200 Subject: [PATCH 1/2] set pickup address id to valid uuid --- .../forms/routes/steppers/components/VerticalNonLinear.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index 480b70d..36fcd0c 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js @@ -820,7 +820,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, -- 2.47.3 From d2b12e11ee320c641a4ff810d19ce62b6d717792 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Thu, 17 May 2018 09:56:06 +0200 Subject: [PATCH 2/2] add missing date variable --- .../forms/routes/steppers/components/VerticalNonLinear.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js index 36fcd0c..ae4784d 100644 --- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js +++ b/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); -- 2.47.3