diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/bulk.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/bulk.tsx index d378c94..bd1edfd 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/bulk.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/bulk.tsx @@ -6,13 +6,7 @@ import { Trash2Icon, XIcon } from 'lucide-react' -import { - useForm, - useFieldArray, - Controller, - useWatch, - type UseFormSetValue -} from 'react-hook-form' +import { useForm, useFieldArray, Controller, useWatch } from 'react-hook-form' import { ErrorMessage } from '@hookform/error-message' import { zodResolver } from '@hookform/resolvers/zod' import { z } from 'zod' diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx index f563a78..7e702b6 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/review.tsx @@ -3,6 +3,7 @@ import { PatternFormat } from 'react-number-format' import { ExternalLinkIcon, PencilIcon, SearchIcon } from 'lucide-react' import { Controller, useForm } from 'react-hook-form' import { zodResolver } from '@hookform/resolvers/zod' +import { formatCEP } from '@brazilian-utils/brazilian-utils' import { z } from 'zod' import valid from 'card-validator' @@ -41,7 +42,6 @@ import { paymentMethods } from '@repo/ui/routes/orders/data' import { useWizard } from '@/components/wizard' import { type WizardState } from './store' -import { applyDiscount } from './discount' import { Field, FieldDescription, @@ -61,7 +61,7 @@ import { import { useWizardStore } from './store' type ReviewProps = { - onSubmit: (value: WizardState) => void | Promise + onSubmit: () => void | Promise } export function Review({ onSubmit }: ReviewProps) { @@ -78,7 +78,7 @@ export function Review({ onSubmit }: ReviewProps) { onSubmit={async (e) => { e.preventDefault() set(true) - // await onSubmit(state) + await onSubmit() }} className="space-y-4" > @@ -176,7 +176,7 @@ export function Review({ onSubmit }: ReviewProps) { } export function Summary() { - const { summary, credit_card, payment_method, installments } = + const { summary, credit_card, payment_method, installments, address } = useWizardStore() const { total } = summary() const numberValidation = valid.number(credit_card?.number) @@ -186,15 +186,18 @@ export function Summary() { Endereço de cobrança -
    - Rua Monsenhor Ivo Zanlorenzi, nº 5190, ap 1802 -
    - Cidade Industrial -
    - Curitiba, Paraná -
    - 81280-350 -
+ {address && ( +
    + {address?.address1} + {address?.address2 ? <>, {address?.address2} : null} +
    + {address?.neighborhood} +
    + {address?.city}, {address?.state} +
    + {formatCEP(address?.postcode)} +
+ )} @@ -236,17 +239,19 @@ const formSchema = z.object({ state: z.string().min(1, 'Digite o estado') }) -type Address = z.infer +export type Address = z.infer export function AddressDialog() { - const [open, { toggle, set }] = useToggle() + const [open, { toggle, set: setOpen }] = useToggle() + const { update, address } = useWizardStore() const { handleSubmit, control, reset } = useForm({ + defaultValues: address, resolver: zodResolver(formSchema) }) - const onSubmit = async (data: Address) => { - set(false) - console.log(data) + const onSubmit = async (address: Address) => { + setOpen(false) + update({ address }) } return ( @@ -317,69 +322,69 @@ export function AddressDialog() { )} /> - -
- {/* Neighborhood */} - ( - - Bairro - + + {/* Neighborhood */} + ( + + Bairro + - {fieldState.invalid && ( - - )} - - )} - /> - {/* City */} - ( - - Cidade - + {fieldState.invalid && ( + + )} + + )} + /> + {/* City */} + ( + + Cidade + - {fieldState.invalid && ( - - )} - - )} - /> - {/* State */} - ( - - Estado - + {fieldState.invalid && ( + + )} + + )} + /> + {/* State */} + ( + + Estado + - {fieldState.invalid && ( - - )} - - )} - /> + {fieldState.invalid && ( + + )} + + )} + /> +
@@ -414,8 +419,10 @@ function PostcodeForm({ onChange }: PostcodeFormProps) { type Schema = z.infer + const { address } = useWizardStore() const { control, handleSubmit, setError, formState } = useForm({ - resolver: zodResolver(formSchema) + resolver: zodResolver(formSchema), + defaultValues: address }) const { runAsync, loading } = useRequest( diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/route.tsx index a3b42f2..44629c6 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/route.tsx @@ -65,13 +65,14 @@ export default function Route({ }: Route.ComponentProps) { const fetcher = useFetcher() const [mounted, setMounted] = useState(false) - const { index, kind, setIndex, setKind } = useWizardStore() + const { index, kind, setIndex, setKind, reset, ...state } = useWizardStore() - const onSubmit = async (data: WizardState) => { - await fetcher.submit(JSON.stringify(data), { + const onSubmit = async () => { + await fetcher.submit(JSON.stringify(state), { method: 'post', encType: 'application/json' }) + // reset() } useMount(() => { diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/store.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/store.tsx index 210475e..3729cc8 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/store.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/store.tsx @@ -5,6 +5,7 @@ import { calcInterest, type CreditCard } from './payment' import type { PaymentMethod } from '@repo/ui/routes/orders/data' import type { Enrollment } from '../_.$orgid.enrollments.add/data' import type { Item } from './bulk' +import type { Address } from './review' export type WizardState = { index: number @@ -15,6 +16,7 @@ export type WizardState = { installments?: number payment_method?: PaymentMethod credit_card?: CreditCard + address?: Address } type Summary = { @@ -36,7 +38,12 @@ const emptyWizard: WizardState = { index: 0, kind: 'bulk', items: [], - enrollments: [] + enrollments: [], + address: undefined, + coupon: undefined, + installments: undefined, + payment_method: undefined, + credit_card: undefined } export const useWizardStore = create()( diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx index f5495b4..0c0a521 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.scheduled/route.tsx @@ -136,8 +136,8 @@ export default function Route({ } const scheduled = grouping(filtering(items, undefined)) - const executed = grouping(filtering(items, 'EXECUTED')) - const failed = grouping(filtering(items, 'FAILED')) + const executed = sorting(grouping(filtering(items, 'EXECUTED'))) + const failed = sorting(grouping(filtering(items, 'FAILED'))) return (
@@ -330,7 +330,7 @@ function Executed({ items = [] }) { ) : null} - {items.map(({ course, user, created_at }, index) => ( + {sorting(items).map(({ course, user, created_at }, index) => ( @@ -554,3 +554,9 @@ function grouping(items) { ) return newItems.sort((x, y) => x[0].localeCompare(y[0])) } + +function sorting(items) { + return items.sort((a, b) => { + return new Date(b[0]).getTime() - new Date(a[0]).getTime() + }) +} diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx index ce6ab2e..f3e511d 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.users.add/route.tsx @@ -34,9 +34,9 @@ import { } from '@repo/ui/components/ui/form' import { Input } from '@repo/ui/components/ui/input' import { Spinner } from '@repo/ui/components/ui/spinner' +import { HttpMethod, request as req } from '@repo/util/request' import { useWorksapce } from '@/components/workspace-switcher' -import { HttpMethod, request as req } from '@repo/util/request' import { formSchema, type Schema } from './data' export function meta({}: Route.MetaArgs) {