Fix/supp ag fb (#1023)
* fix: prevent credit notes from entering payment flow * fix: persist and display customer personal numbers * feat: configure automatic invoice reminder days * fix: issue credit notes through send flow * chore: add repository agent guidance * feat(mcp): route tools across user companies * fix(articles): delete unused register entries * feat(invoices): improve issued invoice actions * feat(supplier-invoices): retain uploaded source documents * docs: record implementation decisions * feat: enhance customer personal number handling and validation - Updated CustomerForm to allow personal numbers in the format of "********-1234" for individual customers. - Added validation to ensure personal numbers are only accepted for individual customers in CreateCustomerSchema. - Implemented masking and encryption for personal numbers to enhance data protection. - Introduced new utility functions for masking and encrypting personal numbers. - Added database migration to enforce unique constraints on credit note relationships and prevent duplicate entries. - Enhanced error handling and logging for credit note issuance and invoice processing. - Updated tests to cover new credit note creation guards and personal number handling. * test: enhance list companies test with supabase query mocks
This commit is contained in:
@@ -25,7 +25,7 @@ import { formatCurrency } from '@/lib/utils'
|
||||
import { getVatRules, getAvailableVatRates } from '@/lib/invoices/vat-rules'
|
||||
import { getAmountToPay } from '@/lib/invoices/rounding'
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog'
|
||||
import { Loader2, Plus, Trash2, ArrowLeft, Send, Eye, Landmark, Lock, AlertTriangle, MoreVertical, CalendarClock, Tags } from 'lucide-react'
|
||||
import { Loader2, Plus, Trash2, ArrowLeft, Send, Eye, Landmark, Lock, AlertTriangle, MoreVertical, CalendarClock, Tags, Copy } from 'lucide-react'
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuTrigger,
|
||||
@@ -60,6 +60,7 @@ import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
||||
import LineDimensionFields from '@/components/dimensions/LineDimensionFields'
|
||||
import { DEFAULT_DEFERRED_REVENUE_ACCOUNT } from '@/lib/bookkeeping/accruals/account-suggestions'
|
||||
import { countCalendarMonths } from '@/lib/bookkeeping/accruals/compute'
|
||||
import type { InvoiceCopyInitial } from '@/lib/invoices/copy-invoice'
|
||||
import type { Customer, Currency, CreateInvoiceInput, CreateCustomerInput, InvoiceDocumentType, Article, Invoice, InvoiceItem, BASAccount } from '@/types'
|
||||
|
||||
const currencies: Currency[] = ['SEK', 'EUR', 'USD', 'GBP', 'NOK', 'DKK']
|
||||
@@ -77,6 +78,7 @@ export type InvoiceForEdit = Invoice & { items: InvoiceItem[] }
|
||||
export type InvoiceEditorProps = (
|
||||
| { mode?: 'create' }
|
||||
| { mode: 'edit'; initial: InvoiceForEdit }
|
||||
| { mode: 'copy'; initial: InvoiceCopyInitial }
|
||||
) & { bare?: boolean }
|
||||
|
||||
// Subset of Article fields the line picker needs to pre-fill a row.
|
||||
@@ -106,7 +108,10 @@ function compactDims(dims: Record<string, string>): string {
|
||||
export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'create' }) {
|
||||
// Edit mode pre-fills the form from an existing draft and saves via PATCH.
|
||||
const isEditMode = props.mode === 'edit'
|
||||
const isCopyMode = props.mode === 'copy'
|
||||
const initial = props.mode === 'edit' ? props.initial : null
|
||||
const copyInitial = props.mode === 'copy' ? props.initial : null
|
||||
const initialOreRounding = initial?.ore_rounding ?? copyInitial?.ore_rounding
|
||||
const bare = props.bare === true
|
||||
const router = useRouter()
|
||||
const { toast } = useToast()
|
||||
@@ -271,7 +276,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
// Öresavrundning is display-only. In edit mode the draft's stored flag wins;
|
||||
// otherwise it defaults to the company-wide setting (loaded below).
|
||||
const [oreRounding, setOreRounding] = useState<boolean>(
|
||||
typeof initial?.ore_rounding === 'boolean' ? initial.ore_rounding : true,
|
||||
typeof initialOreRounding === 'boolean' ? initialOreRounding : true,
|
||||
)
|
||||
const [vatRegistered, setVatRegistered] = useState<boolean>(true)
|
||||
const [numberPreview, setNumberPreview] = useState<string | null>(null)
|
||||
@@ -291,7 +296,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
// open/close bookkeeping as accountOverrideRows).
|
||||
const [dimensionsEnabled, setDimensionsEnabled] = useState(false)
|
||||
const [defaultDims, setDefaultDims] = useState<Record<string, string>>(
|
||||
initial?.default_dimensions ?? {},
|
||||
initial?.default_dimensions ?? copyInitial?.default_dimensions ?? {},
|
||||
)
|
||||
const [dimensionOverrideRows, setDimensionOverrideRows] = useState<Set<number>>(new Set())
|
||||
// True only when the user had zero invoices when this page loaded. The
|
||||
@@ -362,6 +367,26 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
dimensions: hasDimensionValues(item.dimensions) ? item.dimensions ?? null : null,
|
||||
})),
|
||||
}
|
||||
: copyInitial
|
||||
? {
|
||||
customer_id: copyInitial.customer_id,
|
||||
invoice_date: '',
|
||||
due_date: '',
|
||||
delivery_date: '',
|
||||
currency: copyInitial.currency,
|
||||
document_type: 'invoice' as InvoiceDocumentType,
|
||||
your_reference: '',
|
||||
our_reference: copyInitial.our_reference,
|
||||
notes: copyInitial.notes,
|
||||
payment_link_url: '',
|
||||
payment_link_auto: true,
|
||||
external_invoice_number: '',
|
||||
self_billing_agreement_ref: '',
|
||||
received_date: '',
|
||||
deduction_personnummer: '',
|
||||
deduction_housing_designation: '',
|
||||
items: copyInitial.items,
|
||||
}
|
||||
: {
|
||||
customer_id: '',
|
||||
invoice_date: '',
|
||||
@@ -542,11 +567,13 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
.single()
|
||||
if (data?.invoice_default_notes) {
|
||||
setDefaultNotes(data.invoice_default_notes)
|
||||
setValue('notes', data.invoice_default_notes)
|
||||
if (!isEditMode && !isCopyMode) {
|
||||
setValue('notes', data.invoice_default_notes)
|
||||
}
|
||||
}
|
||||
// Pre-fill "Vår referens" from the company default: only when creating a
|
||||
// fresh invoice, so an edited draft's own reference is never overwritten.
|
||||
if (!isEditMode && data?.default_our_reference) {
|
||||
if (!isEditMode && !isCopyMode && data?.default_our_reference) {
|
||||
setValue('our_reference', data.default_our_reference)
|
||||
}
|
||||
setHasBankDetails(
|
||||
@@ -557,7 +584,7 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
}
|
||||
// An explicit per-invoice flag (edit mode) wins; only fall back to the
|
||||
// company-wide setting when creating or when the draft never set one.
|
||||
if (typeof data?.ore_rounding === 'boolean' && (!isEditMode || initial?.ore_rounding == null)) {
|
||||
if (typeof data?.ore_rounding === 'boolean' && initialOreRounding == null) {
|
||||
setOreRounding(data.ore_rounding)
|
||||
}
|
||||
setLogoUrl(data?.logo_url ?? null)
|
||||
@@ -1266,6 +1293,8 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
|
||||
const titleText = isEditMode
|
||||
? t('title_edit')
|
||||
: isCopyMode
|
||||
? t('title_copy')
|
||||
: isSelfBilled
|
||||
? ts('title')
|
||||
: watchDocumentType === 'proforma'
|
||||
@@ -1275,6 +1304,8 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
: t('title_invoice')
|
||||
const subtitleText = isEditMode
|
||||
? t('subtitle_edit')
|
||||
: isCopyMode
|
||||
? t('subtitle_copy')
|
||||
: isSelfBilled
|
||||
? ts('subtitle')
|
||||
: watchDocumentType === 'proforma'
|
||||
@@ -1314,7 +1345,16 @@ export default function InvoiceEditor(props: InvoiceEditorProps = { mode: 'creat
|
||||
/>
|
||||
</div>
|
||||
|
||||
{!isEditMode && (
|
||||
{isCopyMode && copyInitial && (
|
||||
<div className="flex items-start gap-3 rounded-lg border border-border/60 bg-muted/30 px-4 py-3 text-sm">
|
||||
<Copy className="mt-0.5 h-4 w-4 shrink-0 text-muted-foreground" />
|
||||
<p className="text-muted-foreground">
|
||||
{t('copy_notice', { number: copyInitial.source_invoice_number })}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!isEditMode && !isCopyMode && (
|
||||
<Tabs value={mode} onValueChange={(v) => setMode(v as 'invoice' | 'self_billed')}>
|
||||
<TabsList>
|
||||
<TabsTrigger value="invoice">{t('mode_invoice')}</TabsTrigger>
|
||||
|
||||
@@ -1,12 +1,23 @@
|
||||
'use client'
|
||||
|
||||
import dynamic from 'next/dynamic'
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog'
|
||||
import { Skeleton } from '@/components/ui/skeleton'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { createClient } from '@/lib/supabase/client'
|
||||
import { useCompany } from '@/contexts/CompanyContext'
|
||||
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
||||
import {
|
||||
buildInvoiceCopyInitial,
|
||||
canCopyInvoice,
|
||||
type InvoiceCopyInitial,
|
||||
type InvoiceCopySource,
|
||||
} from '@/lib/invoices/copy-invoice'
|
||||
|
||||
// Deferred: the editor (and its framer-motion dependency) is a large chunk
|
||||
// that would otherwise ship with the invoice LIST bundle — it's only needed
|
||||
// that would otherwise ship with the invoice LIST bundle: it is only needed
|
||||
// once this dialog actually opens.
|
||||
const InvoiceEditor = dynamic(() => import('@/components/invoices/InvoiceEditor'), {
|
||||
ssr: false,
|
||||
@@ -22,6 +33,7 @@ const InvoiceEditor = dynamic(() => import('@/components/invoices/InvoiceEditor'
|
||||
interface Props {
|
||||
open: boolean
|
||||
onOpenChange: (open: boolean) => void
|
||||
copyFromId?: string | null
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -35,8 +47,70 @@ interface Props {
|
||||
* shows the invoice-number preview: a static DialogTitle would duplicate or
|
||||
* contradict it.
|
||||
*/
|
||||
export default function NewInvoiceDialog({ open, onOpenChange }: Props) {
|
||||
export default function NewInvoiceDialog({ open, onOpenChange, copyFromId = null }: Props) {
|
||||
const t = useTranslations('invoice_editor')
|
||||
const { company } = useCompany()
|
||||
const supabase = useMemo(() => createClient(), [])
|
||||
const [copyLoad, setCopyLoad] = useState<{
|
||||
sourceId: string | null
|
||||
initial: InvoiceCopyInitial | null
|
||||
failed: boolean
|
||||
}>({ sourceId: null, initial: null, failed: false })
|
||||
|
||||
useEffect(() => {
|
||||
if (!open || !copyFromId) return
|
||||
if (!company?.id) return
|
||||
|
||||
let cancelled = false
|
||||
|
||||
const loadCopySource = async () => {
|
||||
const { data, error } = await supabase
|
||||
.from('invoices')
|
||||
.select('*')
|
||||
.eq('id', copyFromId)
|
||||
.eq('company_id', company.id)
|
||||
.single()
|
||||
|
||||
let items: Record<string, unknown>[] = []
|
||||
if (!error && data) {
|
||||
try {
|
||||
items = await fetchAllRows<Record<string, unknown>>(({ from, to }) =>
|
||||
supabase
|
||||
.from('invoice_items')
|
||||
.select('*')
|
||||
.eq('invoice_id', copyFromId)
|
||||
.eq('company_id', company.id)
|
||||
.order('id', { ascending: true })
|
||||
.range(from, to),
|
||||
)
|
||||
} catch {
|
||||
if (!cancelled) setCopyLoad({ sourceId: copyFromId, initial: null, failed: true })
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if (cancelled) return
|
||||
const source = data ? { ...data, items } : null
|
||||
if (error || !source || !canCopyInvoice(source)) {
|
||||
setCopyLoad({ sourceId: copyFromId, initial: null, failed: true })
|
||||
return
|
||||
}
|
||||
setCopyLoad({
|
||||
sourceId: copyFromId,
|
||||
initial: buildInvoiceCopyInitial(source as InvoiceCopySource),
|
||||
failed: false,
|
||||
})
|
||||
}
|
||||
|
||||
void loadCopySource()
|
||||
|
||||
return () => {
|
||||
cancelled = true
|
||||
}
|
||||
}, [company?.id, copyFromId, open, supabase])
|
||||
|
||||
const copyInitial = copyLoad.sourceId === copyFromId ? copyLoad.initial : null
|
||||
const copyLoadFailed = copyLoad.sourceId === copyFromId && copyLoad.failed
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
@@ -50,8 +124,30 @@ export default function NewInvoiceDialog({ open, onOpenChange }: Props) {
|
||||
onPointerDownOutside={(e) => e.preventDefault()}
|
||||
onInteractOutside={(e) => e.preventDefault()}
|
||||
>
|
||||
<DialogTitle className="sr-only">{t('title_invoice')}</DialogTitle>
|
||||
<InvoiceEditor mode="create" bare />
|
||||
<DialogTitle className="sr-only">
|
||||
{copyFromId ? t('title_copy') : t('title_invoice')}
|
||||
</DialogTitle>
|
||||
{copyFromId ? (
|
||||
copyLoadFailed ? (
|
||||
<div className="space-y-4 p-6 text-center">
|
||||
<p className="font-medium">{t('copy_load_failed_title')}</p>
|
||||
<p className="text-sm text-muted-foreground">{t('copy_load_failed_description')}</p>
|
||||
<Button variant="outline" onClick={() => onOpenChange(false)}>
|
||||
{t('close')}
|
||||
</Button>
|
||||
</div>
|
||||
) : copyInitial ? (
|
||||
<InvoiceEditor key={copyFromId} mode="copy" initial={copyInitial} bare />
|
||||
) : (
|
||||
<div className="space-y-4 p-6">
|
||||
<Skeleton className="h-8 w-1/3" />
|
||||
<Skeleton className="h-32 w-full" />
|
||||
<Skeleton className="h-32 w-full" />
|
||||
</div>
|
||||
)
|
||||
) : (
|
||||
<InvoiceEditor mode="create" bare />
|
||||
)}
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useEffect, useMemo } from 'react'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { useLocale, useTranslations } from 'next-intl'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
@@ -16,8 +16,10 @@ import { JournalEntryReviewContent } from '@/components/bookkeeping/JournalEntry
|
||||
import { proposeSendLines } from '@/lib/bookkeeping/propose-send-lines'
|
||||
import { formatCurrency } from '@/lib/utils'
|
||||
import { createClient } from '@/lib/supabase/client'
|
||||
import { getResponseErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import { useCompany, useCapability } from '@/contexts/CompanyContext'
|
||||
import { CAPABILITY } from '@/lib/entitlements/keys'
|
||||
import { creditNoteNeedsJournalEntry } from '@/lib/invoices/issue-credit-note'
|
||||
import { Loader2, Mail, Send } from 'lucide-react'
|
||||
import type { Invoice, InvoiceItem, Customer, EntityType } from '@/types'
|
||||
|
||||
@@ -47,12 +49,16 @@ export default function SendInvoiceDialog({
|
||||
const { company, isSandbox } = useCompany()
|
||||
const canEmail = useCapability(CAPABILITY.email_send)
|
||||
const t = useTranslations('invoice_send_dialog')
|
||||
const locale = useLocale() as 'sv' | 'en'
|
||||
const isCreditNote = !!invoice.credited_invoice_id
|
||||
const isCreditRepair = isCreditNote && invoice.status === 'sent'
|
||||
|
||||
const [isSubmitting, setIsSubmitting] = useState(false)
|
||||
const [accountingMethod, setAccountingMethod] = useState<'accrual' | 'cash'>('accrual')
|
||||
const [entityType, setEntityType] = useState<EntityType>('enskild_firma')
|
||||
const [periodName, setPeriodName] = useState('')
|
||||
const [isInitialized, setIsInitialized] = useState(false)
|
||||
const [shouldBookOnIssue, setShouldBookOnIssue] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
@@ -66,30 +72,44 @@ export default function SendInvoiceDialog({
|
||||
try {
|
||||
if (!company?.id) throw new Error(t('no_active_company'))
|
||||
|
||||
// Fetch company settings
|
||||
const { data: settings, error } = await supabase
|
||||
.from('company_settings')
|
||||
.select('accounting_method, entity_type')
|
||||
.eq('company_id', company.id)
|
||||
.maybeSingle()
|
||||
const [settingsResult, periodResult, originalResult] = await Promise.all([
|
||||
supabase
|
||||
.from('company_settings')
|
||||
.select('accounting_method, entity_type')
|
||||
.eq('company_id', company.id)
|
||||
.maybeSingle(),
|
||||
supabase
|
||||
.from('fiscal_periods')
|
||||
.select('name')
|
||||
.eq('company_id', company.id)
|
||||
.lte('start_date', invoice.invoice_date)
|
||||
.gte('end_date', invoice.invoice_date)
|
||||
.maybeSingle(),
|
||||
invoice.credited_invoice_id
|
||||
? supabase
|
||||
.from('invoices')
|
||||
.select('id, invoice_number, status, journal_entry_id, paid_at, paid_amount, total')
|
||||
.eq('id', invoice.credited_invoice_id)
|
||||
.eq('company_id', company.id)
|
||||
.maybeSingle()
|
||||
: Promise.resolve({ data: null, error: null }),
|
||||
])
|
||||
|
||||
if (error) throw new Error(t('company_settings_failed'))
|
||||
if (cancelled) return
|
||||
|
||||
// Fetch fiscal period for the invoice date
|
||||
const { data: period } = await supabase
|
||||
.from('fiscal_periods')
|
||||
.select('name')
|
||||
.eq('company_id', company.id)
|
||||
.lte('start_date', invoice.invoice_date)
|
||||
.gte('end_date', invoice.invoice_date)
|
||||
.maybeSingle()
|
||||
if (settingsResult.error) throw new Error(t('company_settings_failed'))
|
||||
if (periodResult.error) throw new Error(t('fiscal_period_failed'))
|
||||
if (originalResult.error) throw new Error(t('original_invoice_failed'))
|
||||
|
||||
if (cancelled) return
|
||||
|
||||
setAccountingMethod((settings?.accounting_method || 'accrual') as 'accrual' | 'cash')
|
||||
setEntityType((settings?.entity_type as EntityType) || 'enskild_firma')
|
||||
setPeriodName(period?.name || '')
|
||||
const method = (settingsResult.data?.accounting_method || 'accrual') as 'accrual' | 'cash'
|
||||
setAccountingMethod(method)
|
||||
setEntityType((settingsResult.data?.entity_type as EntityType) || 'enskild_firma')
|
||||
setPeriodName(periodResult.data?.name || '')
|
||||
setShouldBookOnIssue(
|
||||
invoice.credited_invoice_id && originalResult.data
|
||||
? creditNoteNeedsJournalEntry(method, originalResult.data)
|
||||
: method === 'accrual',
|
||||
)
|
||||
setIsInitialized(true)
|
||||
} catch (err) {
|
||||
if (cancelled) return
|
||||
@@ -107,7 +127,7 @@ export default function SendInvoiceDialog({
|
||||
}, [open, invoice.id, invoice.invoice_date, company?.id])
|
||||
|
||||
const proposedLines = useMemo(() => {
|
||||
if (!isInitialized || accountingMethod !== 'accrual') return []
|
||||
if (!isInitialized || !shouldBookOnIssue) return []
|
||||
|
||||
return proposeSendLines({
|
||||
invoice: {
|
||||
@@ -121,12 +141,13 @@ export default function SendInvoiceDialog({
|
||||
currency: invoice.currency,
|
||||
exchange_rate: invoice.exchange_rate,
|
||||
vat_treatment: invoice.vat_treatment,
|
||||
credited_invoice_id: invoice.credited_invoice_id,
|
||||
items: invoice.items,
|
||||
default_dimensions: invoice.default_dimensions,
|
||||
},
|
||||
entityType,
|
||||
})
|
||||
}, [isInitialized, accountingMethod, entityType, invoice])
|
||||
}, [isInitialized, shouldBookOnIssue, entityType, invoice])
|
||||
|
||||
const { totalDebit, totalCredit } = useMemo(() => {
|
||||
let totalDebit = 0
|
||||
@@ -147,33 +168,62 @@ export default function SendInvoiceDialog({
|
||||
: `/api/invoices/${invoice.id}/mark-sent`
|
||||
|
||||
const response = await fetch(url, { method: 'POST' })
|
||||
const data = await response.json()
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(data.error || t('send_failed_fallback'))
|
||||
throw new Error(await getResponseErrorMessage(response, 'invoice', locale))
|
||||
}
|
||||
const data = await response.json()
|
||||
|
||||
onSuccess()
|
||||
|
||||
if (mode === 'email') {
|
||||
onOpenChange(false)
|
||||
const successMessage = data.message || t('send_success_default', { email: invoice.customer.email ?? '' })
|
||||
toast({
|
||||
title: t('send_success_title'),
|
||||
description: data.message || t('send_success_default', { email: invoice.customer.email ?? '' }),
|
||||
title: t(
|
||||
shouldBookOnIssue && !data.partial
|
||||
? isCreditNote
|
||||
? 'credit_send_book_success_title'
|
||||
: 'send_book_success_title'
|
||||
: isCreditNote
|
||||
? 'credit_send_success_title'
|
||||
: 'send_success_title',
|
||||
),
|
||||
description: data.partial
|
||||
? t('partial_success', { message: successMessage })
|
||||
: isCreditNote
|
||||
? t('credit_send_success', { email: invoice.customer.email ?? '' })
|
||||
: successMessage,
|
||||
})
|
||||
} else {
|
||||
// For manual send, just close: no email to confirm
|
||||
onOpenChange(false)
|
||||
toast({
|
||||
title: t('mark_success_title'),
|
||||
description: accountingMethod === 'accrual'
|
||||
? t('mark_success_voucher_created')
|
||||
: undefined,
|
||||
title: t(
|
||||
isCreditRepair
|
||||
? 'credit_repair_success_title'
|
||||
: shouldBookOnIssue && !data.partial
|
||||
? isCreditNote
|
||||
? 'credit_mark_book_success_title'
|
||||
: 'mark_book_success_title'
|
||||
: isCreditNote
|
||||
? 'credit_mark_success_title'
|
||||
: 'mark_success_title',
|
||||
),
|
||||
description: data.partial
|
||||
? t('mark_partial_success')
|
||||
: isCreditNote
|
||||
? shouldBookOnIssue
|
||||
? t('credit_mark_success_voucher_created')
|
||||
: t('credit_mark_success_no_voucher')
|
||||
: accountingMethod === 'accrual'
|
||||
? t('mark_success_voucher_created')
|
||||
: undefined,
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
toast({
|
||||
title: t('send_failed_title'),
|
||||
title: t(isCreditNote ? 'credit_send_failed_title' : 'send_failed_title'),
|
||||
description: error instanceof Error ? error.message : t('try_again'),
|
||||
variant: 'destructive',
|
||||
})
|
||||
@@ -186,14 +236,25 @@ export default function SendInvoiceDialog({
|
||||
onOpenChange(false)
|
||||
}
|
||||
|
||||
const showJournalPreview = accountingMethod === 'accrual' && proposedLines.length > 0
|
||||
const showJournalPreview = shouldBookOnIssue && proposedLines.length > 0
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent className="sm:max-w-[600px]">
|
||||
<DialogHeader>
|
||||
<DialogTitle>
|
||||
{mode === 'email' ? t('title_email') : t('title_manual')}{invoice.invoice_number ? t('title_suffix', { number: invoice.invoice_number }) : ''}
|
||||
{t(
|
||||
isCreditRepair
|
||||
? 'title_credit_repair'
|
||||
: isCreditNote
|
||||
? mode === 'email'
|
||||
? 'title_credit_email'
|
||||
: 'title_credit_manual'
|
||||
: mode === 'email'
|
||||
? 'title_email'
|
||||
: 'title_manual',
|
||||
)}
|
||||
{invoice.invoice_number ? t('title_suffix', { number: invoice.invoice_number }) : ''}
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
{formatCurrency(invoice.total, invoice.currency)}
|
||||
@@ -236,7 +297,7 @@ export default function SendInvoiceDialog({
|
||||
<JournalEntryReviewContent
|
||||
periodName={periodName}
|
||||
entryDate={invoice.invoice_date}
|
||||
description={t('voucher_description', {
|
||||
description={t(isCreditNote ? 'credit_voucher_description' : 'voucher_description', {
|
||||
numberSpace: invoice.invoice_number ? ` ${invoice.invoice_number}` : '',
|
||||
customerSuffix: invoice.customer.name ? `, ${invoice.customer.name}` : '',
|
||||
})}
|
||||
@@ -249,8 +310,8 @@ export default function SendInvoiceDialog({
|
||||
</>
|
||||
) : (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{accountingMethod === 'cash'
|
||||
? t('explain_cash')
|
||||
{!shouldBookOnIssue
|
||||
? t(isCreditNote ? 'explain_credit_cash' : 'explain_cash')
|
||||
: mode === 'email'
|
||||
? t('explain_email', { email: invoice.customer.email ?? '' })
|
||||
: t('explain_manual')}
|
||||
@@ -266,7 +327,7 @@ export default function SendInvoiceDialog({
|
||||
disabled={isSubmitting}
|
||||
className="w-full sm:w-auto min-h-11"
|
||||
>
|
||||
{t('cancel')}
|
||||
{t(isCreditNote ? 'later' : 'cancel')}
|
||||
</Button>
|
||||
<Button
|
||||
onClick={handleConfirm}
|
||||
@@ -287,7 +348,25 @@ export default function SendInvoiceDialog({
|
||||
) : (
|
||||
<Send className="mr-2 h-4 w-4" />
|
||||
)}
|
||||
{mode === 'email' ? t('send_invoice') : t('mark_as_sent')}
|
||||
{t(
|
||||
isCreditRepair
|
||||
? 'complete_credit_bookkeeping'
|
||||
: isCreditNote
|
||||
? mode === 'email'
|
||||
? shouldBookOnIssue
|
||||
? 'send_credit_note_and_book'
|
||||
: 'send_credit_note'
|
||||
: shouldBookOnIssue
|
||||
? 'mark_credit_note_sent_and_book'
|
||||
: 'mark_credit_note_sent'
|
||||
: mode === 'email'
|
||||
? shouldBookOnIssue
|
||||
? 'send_invoice_and_book'
|
||||
: 'send_invoice'
|
||||
: shouldBookOnIssue
|
||||
? 'mark_as_sent_and_book'
|
||||
: 'mark_as_sent',
|
||||
)}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
|
||||
Reference in New Issue
Block a user