sergio/saladeaula.digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timezone

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2025-12-14 18:27:27 -03:00
parent cd88d92bbd
commit 41ae02f178
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/data.ts
View File

@@ -19,3 +19,5 @@ export const labels: Record<string, string> = {
PENDING: 'Em aberto', PENDING: 'Em aberto',
CLOSED: 'Fechado' CLOSED: 'Fechado'
} }
export const tz = 'America/Sao_Paulo'

6
apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/range-period.tsx
View File

@@ -1,12 +1,14 @@
import { useSearchParams } from 'react-router'
import { ChevronRightIcon, ChevronLeftIcon } from 'lucide-react' import { ChevronRightIcon, ChevronLeftIcon } from 'lucide-react'
import { subMonths, addMonths } from 'date-fns' import { subMonths, addMonths } from 'date-fns'
import { DateTime } from 'luxon'
import { Button } from '@repo/ui/components/ui/button' import { Button } from '@repo/ui/components/ui/button'
import { ButtonGroup } from '@repo/ui/components/ui/button-group' import { ButtonGroup } from '@repo/ui/components/ui/button-group'
import { Badge } from '@repo/ui/components/ui/badge' import { Badge } from '@repo/ui/components/ui/badge'
import { formatDate, billingPeriod } from './util' import { formatDate, billingPeriod } from './util'
import { useSearchParams } from 'react-router' import { tz } from './data'
type RangePeriodProps = { type RangePeriodProps = {
startDate: Date startDate: Date
@@ -19,7 +21,7 @@ export function RangePeriod({
endDate, endDate,
billingDay billingDay
}: RangePeriodProps) { }: RangePeriodProps) {
const today = new Date() const today = DateTime.now().setZone(tz).toJSDate()
const [, setSearchParams] = useSearchParams() const [, setSearchParams] = useSearchParams()
const prevPeriod = billingPeriod(billingDay, subMonths(startDate, 1)) const prevPeriod = billingPeriod(billingDay, subMonths(startDate, 1))
const nextPeriod = billingPeriod(billingDay, addMonths(startDate, 1)) const nextPeriod = billingPeriod(billingDay, addMonths(startDate, 1))

8
apps/admin.saladeaula.digital/app/routes/_.$orgid.billing._index/route.tsx
View File

@@ -33,7 +33,7 @@ import { Kbd } from '@repo/ui/components/ui/kbd'
import { billingPeriod, formatDate } from './util' import { billingPeriod, formatDate } from './util'
import { RangePeriod } from './range-period' import { RangePeriod } from './range-period'
import { statuses } from './data' import { tz, statuses } from './data'
export function meta({}) { export function meta({}) {
return [{ title: 'Resumo de cobranças' }] return [{ title: 'Resumo de cobranças' }]
@@ -49,7 +49,7 @@ export async function loader({ context, request, params }: Route.LoaderArgs) {
const [startDate, endDate] = billingPeriod( const [startDate, endDate] = billingPeriod(
subscription?.billing_day || 1, subscription?.billing_day || 1,
new Date() DateTime.now().setZone(tz).toJSDate()
) )
const start = searchParams.get('start') || formatDate(startDate) const start = searchParams.get('start') || formatDate(startDate)
const end = searchParams.get('end') || formatDate(endDate) const end = searchParams.get('end') || formatDate(endDate)
@@ -63,8 +63,8 @@ export async function loader({ context, request, params }: Route.LoaderArgs) {
return { return {
subscription, subscription,
billing, billing,
startDate: DateTime.fromISO(start).toJSDate(), startDate: DateTime.fromISO(start, { zone: tz }).toJSDate(),
endDate: DateTime.fromISO(end).toJSDate() endDate: DateTime.fromISO(end, { zone: tz }).toJSDate()
} }
} }