From 038a737802501350e53df93cdc2979f9cb08ad15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Wed, 24 Dec 2025 01:58:52 -0300 Subject: [PATCH] add abbr --- .../routes/_.$orgid.enrollments.buy/bulk.tsx | 38 ++++++++++++------- .../_.$orgid.enrollments.buy/discount.tsx | 7 ++-- 2 files changed, 29 insertions(+), 16 deletions(-) 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 34d5d73..16dc37f 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 @@ -20,6 +20,8 @@ import { Cell } from '../_.$orgid.enrollments.add/route' import { CoursePicker } from '../_.$orgid.enrollments.add/course-picker' import { MAX_ITEMS, type Course } from '../_.$orgid.enrollments.add/data' import { Discount } from './discount' +import { Kbd } from '@repo/ui/components/ui/kbd' +import { Abbr } from '@repo/ui/components/abbr' const emptyRow = { course: undefined @@ -49,7 +51,7 @@ const formSchema = z.object({ items: z.array(item).min(1).max(MAX_ITEMS), coupon: z .object({ - coupon: z.string(), + code: z.string(), type: z.enum(['FIXED', 'PERCENT']), amount: z.number().positive() }) @@ -219,7 +221,7 @@ export function Bulk({ courses, onSubmit }: BulkProps) { tabIndex={-1} className="pointer-events-none" readOnly - value={currency.format(course?.unit_price || 0)} + value={currency(course?.unit_price || 0)} /> @@ -233,7 +235,7 @@ export function Bulk({ courses, onSubmit }: BulkProps) { tabIndex={-1} className="pointer-events-none" readOnly - value={currency.format( + value={currency( (course?.unit_price || 0) * (Number.isFinite(quantity) && quantity > 0 ? quantity @@ -288,7 +290,7 @@ export function Bulk({ courses, onSubmit }: BulkProps) { @@ -298,7 +300,16 @@ export function Bulk({ courses, onSubmit }: BulkProps) { {/* Discount */} <>
- {coupon ? <>Descontos : <>Cupom} + {coupon ? ( + + Descontos + + {coupon.code} + + + ) : ( + <>Cupom + )}
@@ -308,7 +319,7 @@ export function Bulk({ courses, onSubmit }: BulkProps) { { setValue('coupon', { - coupon: sk, + code: sk, amount: discount_amount, type: discount_type }) @@ -354,7 +365,7 @@ export function Bulk({ courses, onSubmit }: BulkProps) { @@ -377,11 +388,12 @@ export function Bulk({ courses, onSubmit }: BulkProps) { ) } -const currency = new Intl.NumberFormat('pt-BR', { - style: 'currency', - currency: 'BRL' -}) - +function currency(value: number) { + return new Intl.NumberFormat('pt-BR', { + style: 'currency', + currency: 'BRL' + }).format(value) +} function applyDiscount( subtotal: number, discountAmount: number, diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/discount.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/discount.tsx index 633b110..4ae1af3 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/discount.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.buy/discount.tsx @@ -1,4 +1,4 @@ -import type { InputHTMLAttributes } from 'react' +import type { ButtonHTMLAttributes } from 'react' import { useRequest, useToggle } from 'ahooks' import { useForm } from 'react-hook-form' import { zodResolver } from '@hookform/resolvers/zod' @@ -28,10 +28,11 @@ export const formSchema = z.object({ export type Schema = z.infer interface DiscountProps extends Omit< - InputHTMLAttributes, - 'value' | 'onChange' + ButtonHTMLAttributes, + 'onChange' > { onChange?: (value: any) => void + disabled?: boolean } export function Discount({ onChange, ...props }: DiscountProps) {