From fbd26bdfec99796274f6f13576ef0d1f5a3fa3ca Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Tue, 29 Jan 2019 14:48:08 +0200
Subject: [PATCH] SearchPage.duck.js: endDate should not expand end date for
 night DateRangeController: unittype day should allow 0 night
 EditListingPage.duck.js booking state should be passed to query

---
 .../FieldDateRangeController/DateRangeController.js           | 2 +-
 src/containers/EditListingPage/EditListingPage.duck.js        | 4 ++--
 src/containers/SearchPage/SearchPage.duck.js                  | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/FieldDateRangeController/DateRangeController.js b/src/components/FieldDateRangeController/DateRangeController.js
index 92e86d73..391b87ab 100644
--- a/src/components/FieldDateRangeController/DateRangeController.js
+++ b/src/components/FieldDateRangeController/DateRangeController.js
@@ -55,7 +55,7 @@ const defaultProps = {
   renderDayContents: day => {
     return <span className="renderedDay">{day.format('D')}</span>;
   },
-  minimumNights: 1,
+  minimumNights: config.bookingUnitType === 'line-item/night' ? 1 : 0,
   enableOutsideDays: false,
   isDayBlocked: () => false,
 
diff --git a/src/containers/EditListingPage/EditListingPage.duck.js b/src/containers/EditListingPage/EditListingPage.duck.js
index 096a8a39..5fa7a2f4 100644
--- a/src/containers/EditListingPage/EditListingPage.duck.js
+++ b/src/containers/EditListingPage/EditListingPage.duck.js
@@ -517,13 +517,13 @@ export function requestImageUpload(actionPayload) {
 }
 
 export const requestFetchBookings = fetchParams => (dispatch, getState, sdk) => {
-  const { listingId, start, end } = fetchParams;
+  const { listingId, start, end, state } = fetchParams;
   const monthId = monthIdString(start);
 
   dispatch(fetchBookingsRequest({ ...fetchParams, monthId }));
 
   return sdk.bookings
-    .query({ listingId, start, end }, { expand: true })
+    .query({ listingId, start, end, state }, { expand: true })
     .then(response => {
       const bookings = denormalisedResponseEntities(response);
       return dispatch(fetchBookingsSuccess({ data: { monthId, bookings } }));
diff --git a/src/containers/SearchPage/SearchPage.duck.js b/src/containers/SearchPage/SearchPage.duck.js
index 27a4a626..27c90f2b 100644
--- a/src/containers/SearchPage/SearchPage.duck.js
+++ b/src/containers/SearchPage/SearchPage.duck.js
@@ -136,7 +136,9 @@ export const searchListings = searchParams => (dispatch, getState, sdk) => {
     const values = datesParam ? datesParam.split(',') : [];
     const hasValues = datesParam && values.length === 2;
     const startDate = hasValues ? values[0] : null;
-    const endDate = hasValues ? getExclusiveEndDate(values[1]) : null;
+    const isNightlyBooking = config.bookingUnitType === 'line-item/night';
+    const endDate =
+      hasValues && isNightlyBooking ? values[1] : hasValues ? getExclusiveEndDate(values[1]) : null;
 
     return hasValues
       ? {