scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(SW-449): Re-added YYYY-MM-DD

Browse Source
This commit is contained in:
Pontus Dreij
2024-11-13 08:30:43 +01:00
parent 169751c5a6
commit cf8585a3df
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
View File

@@ -49,11 +49,11 @@ export default async function SelectRatePage({
searchParams.fromDate && searchParams.fromDate &&
dt(searchParams.fromDate).isAfter(dt().subtract(1, "day")) dt(searchParams.fromDate).isAfter(dt().subtract(1, "day"))
? searchParams.fromDate ? searchParams.fromDate
: dt().utc().format("YYYY-MM-D") : dt().utc().format("YYYY-MM-DD")
const validToDate = const validToDate =
searchParams.toDate && dt(searchParams.toDate).isAfter(validFromDate) searchParams.toDate && dt(searchParams.toDate).isAfter(validFromDate)
? searchParams.toDate ? searchParams.toDate
: dt().utc().add(1, "day").format("YYYY-MM-D") : dt().utc().add(1, "day").format("YYYY-MM-DD")
const adults = selectRoomParamsObject.room[0].adults || 1 // TODO: Handle multiple rooms const adults = selectRoomParamsObject.room[0].adults || 1 // TODO: Handle multiple rooms
const childrenCount = selectRoomParamsObject.room[0].child?.length const childrenCount = selectRoomParamsObject.room[0].child?.length
const children = selectRoomParamsObject.room[0].child const children = selectRoomParamsObject.room[0].child

10
components/DatePicker/index.tsx
View File

@@ -47,7 +47,7 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
if (!dt(selected).isBefore(dt(), "day")) { if (!dt(selected).isBefore(dt(), "day")) {
if (isSelectingFrom) { if (isSelectingFrom) {
setValue(name, { setValue(name, {
fromDate: dt(selected).format("YYYY-MM-D"), fromDate: dt(selected).format("YYYY-MM-DD"),
toDate: undefined, toDate: undefined,
}) })
setIsSelectingFrom(false) setIsSelectingFrom(false)
@@ -57,11 +57,11 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
if (toDate.isAfter(fromDate)) { if (toDate.isAfter(fromDate)) {
setValue(name, { setValue(name, {
fromDate: selectedDate.fromDate, fromDate: selectedDate.fromDate,
toDate: toDate.format("YYYY-MM-D"), toDate: toDate.format("YYYY-MM-DD"),
}) })
} else { } else {
setValue(name, { setValue(name, {
fromDate: toDate.format("YYYY-MM-D"), fromDate: toDate.format("YYYY-MM-DD"),
toDate: selectedDate.fromDate, toDate: selectedDate.fromDate,
}) })
} }
@@ -75,7 +75,9 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
if (!selectedDate.toDate) { if (!selectedDate.toDate) {
setValue(name, { setValue(name, {
fromDate: selectedDate.fromDate, fromDate: selectedDate.fromDate,
toDate: dt(selectedDate.fromDate).add(1, "day").format("YYYY-MM-D"), toDate: dt(selectedDate.fromDate)
.add(1, "day")
.format("YYYY-MM-DD"),
}) })
setIsSelectingFrom(true) setIsSelectingFrom(true)
} }

2
components/TempDesignSystem/Form/Date/index.tsx
View File

@@ -83,7 +83,7 @@ export default function DateSelect({ name, registerOptions = {} }: DateProps) {
.date(Number(day)) .date(Number(day))
if (newDate.isValid()) { if (newDate.isValid()) {
setValue(name, newDate.format("YYYY-MM-D"), { setValue(name, newDate.format("YYYY-MM-DD"), {
shouldDirty: true, shouldDirty: true,
shouldTouch: true, shouldTouch: true,
shouldValidate: true, shouldValidate: true,

4
server/routers/hotels/query.ts
View File

@@ -982,8 +982,8 @@ export const hotelQueryRouter = router({
const apiLang = toApiLang(lang) const apiLang = toApiLang(lang)
const params = { const params = {
Adults: input.adults, Adults: input.adults,
EndDate: dt(input.toDate).format("YYYY-MM-D"), EndDate: dt(input.toDate).format("YYYY-MM-DD"),
StartDate: dt(input.fromDate).format("YYYY-MM-D"), StartDate: dt(input.fromDate).format("YYYY-MM-DD"),
language: apiLang, language: apiLang,
} }