Merge pull request #788 from Autofleet/AUT-16841-max-future-ride

add default max days
Autofleet · Oct 19, 2023 · fbfb0a2 · fbfb0a2
2 parents 7e4df3f + b73e276
commit fbfb0a2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/examples/client/Locomotion/src/Components/BsPages/index.tsx b/examples/client/Locomotion/src/Components/BsPages/index.tsx
@@ -284,6 +284,8 @@ export const ConfirmPickupTime = (props: any) => {
     chosenService,
     defaultService,
     setChosenService,
+    loadFutureBookingDays,
+    futureBookingDays,
   } = useContext(MewRidePageContext);
   const {
     changeBsPage,
@@ -300,9 +302,12 @@ export const ConfirmPickupTime = (props: any) => {
     const minutes = await getSettingByKey(SETTINGS_KEYS.MIN_MINUTES_BEFORE_FUTURE_RIDE);
     setMinMinutesBeforeFutureRide(minutes);
   };
+
   useEffect(() => {
     checkMinutesBeforeFutureRideSetting();
+    loadFutureBookingDays();
   }, []);
+
   useEffect(() => {
     setTempSelectedDate(startDate);
   }, [minMinutesBeforeFutureRide]);
@@ -361,7 +366,7 @@ export const ConfirmPickupTime = (props: any) => {
         textColor="black"
         isVisible={isDatePickerOpen}
         date={tempSelectedDate}
-        maximumDate={getFutureRideMaxDate()}
+        maximumDate={getFutureRideMaxDate(futureBookingDays)}
         minimumDate={getFutureRideMinDate((minMinutesBeforeFutureRide || 0))}
         mode="datetime"
         title={renderDatePickerTitle()}

diff --git a/examples/client/Locomotion/src/context/newRideContext/index.tsx b/examples/client/Locomotion/src/context/newRideContext/index.tsx
@@ -158,6 +158,8 @@ interface RidePageContextInterface {
   numberOfPassengers: number,
   setNumberOfPassengers: (num: number) => void,
   setLastAcknowledgedRideCompletionTimestampToNow: () => void
+  loadFutureBookingDays: () => void;
+  futureBookingDays: number;
 }
 
 export const RidePageContext = createContext<RidePageContextInterface>({
@@ -215,6 +217,8 @@ export const RidePageContext = createContext<RidePageContextInterface>({
   numberOfPassengers: null,
   setNumberOfPassengers: () => undefined,
   setLastAcknowledgedRideCompletionTimestampToNow: () => undefined,
+  loadFutureBookingDays: () => undefined,
+  futureBookingDays: 0,
 });
 
 const HISTORY_RECORDS_NUM = 10;
@@ -253,6 +257,8 @@ const RidePageContextProvider = ({ children }: {
   const getRouteName = () => navigationService?.getNavigator()?.getCurrentRoute().name;
   const [numberOfPassengers, setNumberOfPassengers] = useState<number | null>(null);
   const [addressSearchLabel, setAddressSearchLabel] = useState<string | null>(null);
+  const [futureBookingDays, setfutureBookingDays] = useState(0);
+
 
   const intervalRef = useRef<any>();
 
@@ -463,6 +469,11 @@ const RidePageContextProvider = ({ children }: {
 
   const getRidesByParams = async (params: any) => rideApi.fetchRides(params);
 
+  const loadFutureBookingDays = async () => {
+    const maxDaysFromSettings = await getSettingByKey(SETTINGS_KEYS.MAX_DAYS_FOR_FUTURE_RIDE);
+    setfutureBookingDays(maxDaysFromSettings);
+  };
+
   const getLastCompletedRide = async () => {
     let lastTimestamp = await StorageService.get('lastCompletedRideTimestamp');
     if (!lastTimestamp) {
@@ -1344,6 +1355,8 @@ const RidePageContextProvider = ({ children }: {
         formatStationsList,
         clearRequestSp,
         setLastAcknowledgedRideCompletionTimestampToNow,
+        loadFutureBookingDays,
+        futureBookingDays,
       }}
     >
       {children}

diff --git a/examples/client/Locomotion/src/context/newRideContext/utils.ts b/examples/client/Locomotion/src/context/newRideContext/utils.ts
@@ -26,7 +26,7 @@ export const FEEDBACK_TYPES = {
 export const RIDER_APP_SOURCE = 'RIDER_APP';
 
 export const getFutureRideMinDate = (minutesBefore: number) => moment().add(minutesBefore, 'minutes').toDate();
-export const getFutureRideMaxDate = () => moment().add(7, 'days').toDate();
+export const getFutureRideMaxDate = (daysAfter: number) => moment().add(daysAfter, 'days').toDate();
 
 export const TAG_OPTIONS = {
   FASTEST: i18n.t('services.tags.fastest'),

diff --git a/examples/client/Locomotion/src/context/settings/keys.ts b/examples/client/Locomotion/src/context/settings/keys.ts
@@ -16,5 +16,6 @@ export default {
   MEASURE_SYSTEM: 'riderApp.measureSystem',
   MULTI_SP: 'riderApp.showMultiStopPoint',
   DISABLE_CAPTCHA_UI: 'riderApp.disableCaptchaUi',
+  MAX_DAYS_FOR_FUTURE_RIDE: 'riderApp.daysForFutureRideBooking',
   OFFLINE_PAYMENT_TEXT: 'riderApp.offlinePaymentText',
 };
diff --git a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/index.tsx b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/RideButtons/index.tsx
@@ -57,6 +57,8 @@ const RideButtons = ({
     unconfirmedPickupTime,
     setNumberOfPassengers,
     defaultService,
+    loadFutureBookingDays,
+    futureBookingDays,
   } = useContext(RidePageContext);
 
 
@@ -81,6 +83,7 @@ const RideButtons = ({
   const [passengersCounterError, setPassengersCounterError] = useState(false);
   const firstDate = () => moment(ride?.scheduledTo || undefined).add(ride?.scheduledTo ? 0 : (minMinutesBeforeFutureRide || 0) + 1, 'minutes').toDate();
   const [tempSelectedDate, setTempSelectedDate] = useState(firstDate());
+
   const paymentMethodNotAllowedOnService = chosenService && ride?.paymentMethodId
     && !chosenService.allowedPaymentMethods.includes(getPaymentMethod(ride.paymentMethodId));
 
@@ -103,6 +106,7 @@ const RideButtons = ({
   useEffect(() => {
     checkFutureRidesSetting();
     checkMinutesBeforeFutureRideSetting();
+    loadFutureBookingDays();
   }, []);
 
   const [animatedOpacity] = useState(new Animated.Value(0));
@@ -172,7 +176,7 @@ const RideButtons = ({
           textColor="black"
           isVisible={isDatePickerOpen}
           date={tempSelectedDate}
-          maximumDate={getFutureRideMaxDate()}
+          maximumDate={getFutureRideMaxDate(futureBookingDays)}
           minimumDate={getFutureRideMinDate((minMinutesBeforeFutureRide || 0))}
           mode="datetime"
           title={renderDatePickerTitle()}