Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #57

Open
wants to merge 29 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a8a684a
add ga4 tag
rolorogan Apr 28, 2023
ea44872
Merge pull request #41 from wmcadigital/nr/feat/ga
rolorogan Apr 28, 2023
fb7e62f
update packages
rolorogan Apr 28, 2023
8889a06
add container to home list
rolorogan Apr 28, 2023
7b01216
Merge pull request #42 from wmcadigital/nr/feat/package-updates
rolorogan Apr 28, 2023
01d4cdf
update packages
rolorogan May 22, 2023
fff8976
fix current time by adding a 0 if before 10
rolorogan May 23, 2023
09d0290
fix number input buttons
rolorogan May 23, 2023
2e0f03d
fix booking from check back pages
rolorogan May 23, 2023
2880580
add not provided defailt text if no reg number
rolorogan May 23, 2023
cc89aff
fix reg form check back page links
rolorogan May 23, 2023
908bc3d
update reg number example to 6 chars
rolorogan May 23, 2023
2b29b7c
replace react-helmet with react-helmet-async
rolorogan May 23, 2023
4bb5127
make email mandatory
rolorogan May 25, 2023
c1cbe83
format files
rolorogan May 25, 2023
d30c70b
fix js lint issues
rolorogan May 25, 2023
c514f9a
Merge pull request #43 from wmcadigital/nr/feat/sd-260748
rolorogan May 25, 2023
f384b61
update api email
rolorogan May 25, 2023
93bd694
remove sun disable if its a sat (#45)
rolorogan May 30, 2023
a9232d2
add user email to send responce (#47)
rolorogan Jun 26, 2023
71415b1
Merge branch 'main' into release
rolorogan Jun 26, 2023
07e8b82
add display name to email api (#49)
rolorogan Jul 6, 2023
aa1b036
Nr/feat/email displayname (#51)
rolorogan Jul 7, 2023
df0cc6f
Merge branch 'main' into release
rolorogan Jul 7, 2023
cd8f99c
update footer links (#53)
rolorogan Feb 15, 2024
1f5e8f1
update footer links
rolorogan Feb 15, 2024
d21c07e
Merge branch 'main' into release
rolorogan Feb 15, 2024
8501360
Nr/feat/sr 12457 (#56)
rolorogan Apr 26, 2024
5769ed1
Nr/feat/sr 12457 (#58)
rolorogan May 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/Booking/CheckAnswers.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ const CheckAnswers = ({
<CheckAnswerRow
label="Date of booking"
value={formValues["bookingDateDayAuto"]}
changeValueCallback={() => setGoToPage(4 + offSet1)}
changeValueCallback={() => setGoToPage(5 + offSet1)}
disableButton={submitting}
/>
<CheckAnswerRow
Expand All @@ -206,21 +206,21 @@ const CheckAnswers = ({
formValues.outwardPickup.hour,
formValues.outwardPickup.minute
)}
changeValueCallback={() => setGoToPage(5 + offSet1)}
changeValueCallback={() => setGoToPage(6 + offSet1)}
disableButton={submitting}
/>
<CheckAnswerRow
label="Collection address"
value={outWardCollectionAddress}
changeValueCallback={() => setGoToPage(6 + offSet2)}
changeValueCallback={() => setGoToPage(7 + offSet2)}
disableButton={submitting}
/>
<CheckAnswerRow
label="Destination address"
value={
<AddressFormatted addressObj={formValues["outwardDestination"]} />
}
changeValueCallback={() => setGoToPage(7 + offSet2)}
changeValueCallback={() => setGoToPage(8 + offSet2)}
disableButton={submitting}
/>
{bookingParty !== "behalfGroup" &&
Expand All @@ -230,7 +230,7 @@ const CheckAnswers = ({
bookingParty === "mySelf" ? "you" : "them"
}`}
value={`${formValues["additionalPassengerNumbers"]} other people`}
changeValueCallback={() => setGoToPage(9 + offSet2)}
changeValueCallback={() => setGoToPage(10 + offSet2)}
disableButton={submitting}
/>
) : null}
Expand Down Expand Up @@ -289,7 +289,7 @@ const CheckAnswers = ({
);
setConfirmSameAdditionalPassenger("no");
}
setGoToPage(13 + offSet5);
setGoToPage(14 + offSet5);
}}
disableButton={submitting}
/>
Expand Down
28 changes: 18 additions & 10 deletions src/Booking/journeyDetails/BookingDate.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ const BookingDate = () => {
const dayTomorrow = current.toLocaleDateString("en-GB", { weekday: "short" });
let dateTomorrow = current.toDateString();
const dateInTwoDays = current2.toDateString();
// const dateInThreeDays = current3.toDateString();
// const dateInFourDays = current4.toDateString();
// const dateInFiveDays = current5.toDateString();
// const dateInSixDays = current6.toDateString();
// const dateInSevenDays = current7.toDateString();
const dateInThreeDays = current3.toDateString();
const dateInFourDays = current4.toDateString();
const dateInFiveDays = current5.toDateString();
const dateInSixDays = current6.toDateString();
const dateInSevenDays = current7.toDateString();

// disable sunday button if today is saturday
if (dateToday.includes("Sun")) {
Expand Down Expand Up @@ -153,7 +153,7 @@ const BookingDate = () => {
value={dateInTwoDays}
fieldName="bookingDateDayAuto"
/>
{/* <RadioButton
<RadioButton
key={3}
label={dateInThreeDays}
validation={required}
Expand All @@ -167,7 +167,7 @@ const BookingDate = () => {
value={dateInFourDays}
fieldName="bookingDateDayAuto"
/>
<RadioButton
{/* <RadioButton
key={5}
label={dateInFiveDays}
validation={required}
Expand All @@ -187,14 +187,14 @@ const BookingDate = () => {
validation={required}
value={dateInSevenDays}
fieldName="bookingDateDayAuto"
/>
<RadioButton
/> */}
{/* <RadioButton
key={8}
label="other"
validation={required}
value="other"
fieldName="bookingDateDayAuto"
/> */}
/>*/}
</RadioGroup>
{/* {formValues.bookingDateDayAuto === "other" ? (
<DateInput
Expand All @@ -205,6 +205,14 @@ const BookingDate = () => {
error={error}
/>
) : null} */}
<hr />
<p>If you wish to book on any of the days below please call 0330 053 8141.</p>
<p>Alternatively download the <a href="https://www.tfwm.org.uk/plan-your-journey/ways-to-travel/buses-in-the-west-midlands/on-demand-buses-in-the-west-midlands/" target="_blank" rel="noreferrer">West Midlands Bus app</a> where you can book trips up to 7 days in advance.</p>
<ul>
<li>{dateInFiveDays}</li>
<li>{dateInSixDays}</li>
<li>{dateInSevenDays}</li>
</ul>
</FormSection>
);
};
Expand Down
6 changes: 3 additions & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,21 @@ <h3 class="wmrards-footer__heading">Stay up to date</h3>
<li>
<a
class="wmrards-footer__link"
href="https://www.ringandride.org/registration"
href="https://www.ringandride.org/registration/"
>Register</a
>
</li>
<li>
<a
class="wmrards-footer__link"
href="https://forms.ringandride.org/booking"
href="https://www.ringandride.org/request-a-journey/"
>Book a journey</a
>
</li>
<li>
<a
class="wmrards-footer__link"
href="https://forms.ringandride.org/contactUs"
href="https://www.ringandride.org/contact-us/"
>Contact us</a
>
</li>
Expand Down
Loading