huangting/th-hotel-simple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整手工开票Rate校验和夜数派生

Browse Source
This commit is contained in:
andy
2026-07-22 22:59:28 +07:00
parent 5712f03d4f
commit 68ff9e2b38
10 changed files with 226 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/i18n/locales/en-US.ts
View File

@@ -369,6 +369,7 @@ export default {
required: 'Required',
invalidEmail: 'Invalid email',
dateOrder: 'Invalid date order',
invalidNumber: 'Invalid number',
positiveNumber: 'Must be greater than 0',
nonNegativeNumber: 'Cannot be less than 0',
},
@@ -391,8 +392,10 @@ export default {
invalidEmail: 'Email format is invalid.',
dueDateBeforeBookingDate: 'Due date cannot be earlier than booking date.',
departureBeforeArrival: 'Departure date must be later than arrival date.',
invalidNumber: 'Invalid number. Check amount, quantity, or nights fields.',
extraBedNegative: 'Extra bed rate cannot be less than 0.',
chargePositive: 'Quantity, rate, and nights must be greater than 0.',
chargePositive: 'Quantity and nights must be greater than 0.',
chargeRateNonNegative: 'Rate cannot be less than 0.',
},
},
roomingList: {

5
client/src/i18n/locales/th-TH.ts
View File

@@ -369,6 +369,7 @@ export default {
required: 'จำเป็นต้องกรอก',
invalidEmail: 'รูปแบบ Email ไม่ถูกต้อง',
dateOrder: 'ลำดับวันที่ไม่ถูกต้อง',
invalidNumber: 'รูปแบบตัวเลขไม่ถูกต้อง',
positiveNumber: 'ต้องมากกว่า 0',
nonNegativeNumber: 'ต้องไม่ต่ำกว่า 0',
},
@@ -391,8 +392,10 @@ export default {
invalidEmail: 'รูปแบบ Email ไม่ถูกต้อง',
dueDateBeforeBookingDate: 'Due Date ต้องไม่เร็วกว่าวันที่ Booking',
departureBeforeArrival: 'Departure Date ต้องหลัง Arrival Date',
invalidNumber: 'รูปแบบตัวเลขไม่ถูกต้อง กรุณาตรวจจำนวนเงิน จำนวนห้อง หรือจำนวนคืน',
extraBedNegative: 'Extra Bed Rate ต้องไม่ต่ำกว่า 0',
chargePositive: 'Quantity, Rate และ Nights ต้องมากกว่า 0',
chargePositive: 'Quantity และ Nights ต้องมากกว่า 0',
chargeRateNonNegative: 'Rate ต้องไม่ต่ำกว่า 0',
},
},
roomingList: {

5
client/src/i18n/locales/zh-CN.ts
View File

@@ -369,6 +369,7 @@ export default {
required: '必填',
invalidEmail: 'Email 格式不正确',
dateOrder: '日期顺序不正确',
invalidNumber: '数字格式不正确',
positiveNumber: '必须大于 0',
nonNegativeNumber: '不能小于 0',
},
@@ -391,8 +392,10 @@ export default {
invalidEmail: 'Email 格式不正确。',
dueDateBeforeBookingDate: 'Due Date 不能早于 Booking 日期。',
departureBeforeArrival: 'Departure Date 必须晚于 Arrival Date。',
invalidNumber: '数字格式不正确，请检查金额、数量或夜数字段。',
extraBedNegative: '加床价格不能小于 0。',
chargePositive: '费用明细的 Quantity、Rate、Nights 必须大于 0。',
chargePositive: '费用明细的 Quantity 和 Nights 必须大于 0。',
chargeRateNonNegative: '费用明细的 Rate 不能小于 0。',
},
},
roomingList: {

45
client/src/tests/manualInvoiceView.spec.ts
View File

@@ -347,7 +347,7 @@ describe('ReservationManualInvoiceView', () => {
await wrapper.find('[data-testid="recipient-email"]').setValue('bad-email')
await wrapper.find('[data-testid="booking-departure-date"]').setValue('2026-07-19')
await wrapper.find('[data-testid="booking-extra-bed-rate"]').setValue('-1')
await wrapper.find('[data-testid="charge-rate-0"]').setValue('0')
await wrapper.find('[data-testid="charge-rate-0"]').setValue('zzz')
await wrapper.find('[data-testid="manual-invoice-submit"]').trigger('click')
await flushPromises()
@@ -366,10 +366,51 @@ describe('ReservationManualInvoiceView', () => {
)
expect(wrapper.find('[data-testid="charge-rate-0"]').classes()).toContain('is-invalid')
expect(wrapper.find('[data-testid="manual-invoice-field-error-charge-0-rate"]').text()).toBe(
zhCN.manualInvoice.fieldErrors.positiveNumber,
zhCN.manualInvoice.fieldErrors.invalidNumber,
)
})
it('allows zero room rate and charge rate while keeping rate required and numeric', async () => {
vi.mocked(service.generateManualReservationInvoice).mockResolvedValue(createResult())
const wrapper = mountView()
await wrapper.find('[data-testid="recipient-company-code"]').setValue('QBD')
await fillMinimumInvoiceForm(wrapper)
await wrapper.find('[data-testid="primary-room-rate"]').setValue('0')
await wrapper.find('[data-testid="manual-invoice-submit"]').trigger('click')
await flushPromises()
expect(wrapper.find('[data-testid="primary-room-rate"]').classes()).not.toContain('is-invalid')
expect(wrapper.find('[data-testid="manual-invoice-field-error-primary-rate"]').exists()).toBe(false)
expect(service.generateManualReservationInvoice).toHaveBeenCalledWith(
expect.objectContaining({
invoice_payload: expect.objectContaining({
charges: [
expect.objectContaining({
rate: 0,
}),
],
}),
}),
)
})
it('auto-fills primary nights from stay dates until the user edits nights manually', async () => {
const wrapper = mountView()
await wrapper.find('[data-testid="booking-arrival-date"]').setValue('2026-07-20')
await wrapper.find('[data-testid="booking-departure-date"]').setValue('2026-07-22')
expect((wrapper.find('[data-testid="primary-night-count"]').element as HTMLInputElement).value).toBe('2')
expect((wrapper.find('[data-testid="charge-nights-0"]').element as HTMLInputElement).value).toBe('2')
await wrapper.find('[data-testid="primary-night-count"]').setValue('3')
await wrapper.find('[data-testid="booking-departure-date"]').setValue('2026-07-24')
expect((wrapper.find('[data-testid="primary-night-count"]').element as HTMLInputElement).value).toBe('3')
expect((wrapper.find('[data-testid="charge-nights-0"]').element as HTMLInputElement).value).toBe('3')
})
it('does not render final-format date preview blocks', () => {
const wrapper = mountView()

138
client/src/views/reservation/ReservationManualInvoiceView.vue
View File

@@ -277,6 +277,7 @@
:invalid="Boolean(fieldError('arrival-date'))"
:described-by="fieldError('arrival-date') ? fieldErrorId('arrival-date') : undefined"
required
@update:model-value="derivePrimaryNightsFromStayDates"
/>
</div>
<p
@@ -306,6 +307,7 @@
:invalid="Boolean(fieldError('departure-date'))"
:described-by="fieldError('departure-date') ? fieldErrorId('departure-date') : undefined"
required
@update:model-value="derivePrimaryNightsFromStayDates"
/>
</div>
<p
@@ -464,6 +466,7 @@
:class="validationClass('primary-nights')"
v-bind="validationAria('primary-nights')"
required
@input="markPrimaryNightsEdited"
>
<span
class="number-suffix"
@@ -630,6 +633,7 @@
:class="validationClass(chargeFieldKey(index, 'nights'))"
v-bind="validationAria(chargeFieldKey(index, 'nights'))"
required
@input="markChargeNightsEdited(index)"
>
<span
v-if="fieldError(chargeFieldKey(index, 'nights'))"
@@ -961,6 +965,7 @@ const downloadMessageKey = ref('')
const alertTone = ref<'error' | 'success'>('error')
const generationResult = ref<ManualInvoiceGenerationResult | null>(null)
const documentDatesEdited = ref(false)
const primaryNightsEdited = ref(false)
const validationAttempted = ref(false)
const recipientContacts = computed(() => {
@@ -1176,15 +1181,38 @@ function validateForm(): string[] {
Boolean(form.booking.group_name.trim()) &&
Boolean(form.booking.arrival_date) &&
Boolean(form.booking.departure_date)
const charges = buildCharges()
const extraBedRate = optionalNumberValue(form.booking.extra_bed_rate)
const hasInvalidChargeNumber = form.charges.some(
(charge) =>
hasInvalidNumericInput(charge.quantity) || hasInvalidNumericInput(charge.rate) || hasInvalidNumericInput(charge.nights),
)
const hasInvalidExtraBedRate = hasNumericInputValue(form.booking.extra_bed_rate) && extraBedRate === null
const hasRequiredCharges =
charges.length > 0 &&
charges.every((charge) => charge.description && charge.room_type && charge.quantity > 0 && charge.rate > 0 && charge.nights > 0)
form.charges.length > 0 &&
form.charges.every(
(charge) =>
Boolean(charge.description.trim()) &&
Boolean(charge.room_type.trim()) &&
hasNumericInputValue(charge.quantity) &&
hasNumericInputValue(charge.rate) &&
hasNumericInputValue(charge.nights),
)
const hasInvalidQuantityOrNights = form.charges.some((charge) => {
const quantity = optionalNumberValue(charge.quantity)
const nights = optionalNumberValue(charge.nights)
return (quantity !== null && quantity <= 0) || (nights !== null && nights <= 0)
})
const hasNegativeRate = form.charges.some((charge) => {
const rate = optionalNumberValue(charge.rate)
return rate !== null && rate < 0
})
if (!hasRequiredDocument || !hasRequiredRecipient || !hasRequiredBooking || !hasRequiredCharges) {
errors.push(t('manualInvoice.errors.requiredFields'))
}
if (hasInvalidChargeNumber || hasInvalidExtraBedRate) {
errors.push(t('manualInvoice.errors.invalidNumber'))
}
if (form.recipient.email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(form.recipient.email)) {
errors.push(t('manualInvoice.errors.invalidEmail'))
}
@@ -1198,18 +1226,22 @@ function validateForm(): string[] {
) {
errors.push(t('manualInvoice.errors.departureBeforeArrival'))
}
if (form.booking.extra_bed_rate.trim() && (extraBedRate === null || extraBedRate < 0)) {
if (extraBedRate !== null && extraBedRate < 0) {
errors.push(t('manualInvoice.errors.extraBedNegative'))
}
if (charges.some((charge) => charge.quantity <= 0 || charge.rate <= 0 || charge.nights <= 0)) {
if (hasInvalidQuantityOrNights) {
errors.push(t('manualInvoice.errors.chargePositive'))
}
if (hasNegativeRate) {
errors.push(t('manualInvoice.errors.chargeRateNonNegative'))
}
return [...new Set(errors)]
}
function collectFieldErrors(): FieldErrorMap {
const errors: FieldErrorMap = {}
const positiveNumber = t('manualInvoice.fieldErrors.positiveNumber')
const nonNegativeNumber = t('manualInvoice.fieldErrors.nonNegativeNumber')
setRequiredError(errors, 'company', form.recipient.company)
setRequiredError(errors, 'attention', form.recipient.attention)
@@ -1237,21 +1269,24 @@ function collectFieldErrors(): FieldErrorMap {
errors['departure-date'] = t('manualInvoice.fieldErrors.dateOrder')
}
const extraBedRate = optionalNumberValue(form.booking.extra_bed_rate)
if (form.booking.extra_bed_rate.trim() && (extraBedRate === null || extraBedRate < 0)) {
errors['extra-bed-rate'] = t('manualInvoice.fieldErrors.nonNegativeNumber')
const extraBedRate = validateOptionalNumericField(errors, 'extra-bed-rate', form.booking.extra_bed_rate)
if (extraBedRate !== null && extraBedRate < 0) {
errors['extra-bed-rate'] = nonNegativeNumber
}
form.charges.forEach((charge, index) => {
setRequiredError(errors, chargeFieldKey(index, 'description'), charge.description)
setRequiredError(errors, chargeFieldKey(index, 'room-type'), charge.room_type)
if (numberValue(charge.quantity) <= 0) {
const quantity = validateRequiredNumericField(errors, chargeFieldKey(index, 'quantity'), charge.quantity)
if (quantity !== null && quantity <= 0) {
errors[chargeFieldKey(index, 'quantity')] = positiveNumber
}
if (numberValue(charge.rate) <= 0) {
errors[chargeFieldKey(index, 'rate')] = positiveNumber
const rate = validateRequiredNumericField(errors, chargeFieldKey(index, 'rate'), charge.rate)
if (rate !== null && rate < 0) {
errors[chargeFieldKey(index, 'rate')] = nonNegativeNumber
}
if (numberValue(charge.nights) <= 0) {
const nights = validateRequiredNumericField(errors, chargeFieldKey(index, 'nights'), charge.nights)
if (nights !== null && nights <= 0) {
errors[chargeFieldKey(index, 'nights')] = positiveNumber
}
})
@@ -1278,6 +1313,39 @@ function setRequiredError(errors: FieldErrorMap, fieldKey: string, value: string
}
}
function validateRequiredNumericField(errors: FieldErrorMap, fieldKey: string, value: string | number): number | null {
if (!hasNumericInputValue(value)) {
errors[fieldKey] = t('manualInvoice.fieldErrors.required')
return null
}
const parsed = optionalNumberValue(value)
if (parsed === null) {
errors[fieldKey] = t('manualInvoice.fieldErrors.invalidNumber')
return null
}
return parsed
}
function validateOptionalNumericField(errors: FieldErrorMap, fieldKey: string, value: string | number): number | null {
if (!hasNumericInputValue(value)) {
return null
}
const parsed = optionalNumberValue(value)
if (parsed === null) {
errors[fieldKey] = t('manualInvoice.fieldErrors.invalidNumber')
return null
}
return parsed
}
function hasInvalidNumericInput(value: string | number): boolean {
return hasNumericInputValue(value) && optionalNumberValue(value) === null
}
function hasNumericInputValue(value: string | number): boolean {
return String(value).trim() !== ''
}
function fieldError(fieldKey: string): string {
return fieldErrors.value[fieldKey] ?? ''
}
@@ -1382,6 +1450,27 @@ function markDocumentDatesEdited(): void {
documentDatesEdited.value = true
}
function markPrimaryNightsEdited(): void {
primaryNightsEdited.value = true
}
function markChargeNightsEdited(index: number): void {
if (index === 0) {
markPrimaryNightsEdited()
}
}
function derivePrimaryNightsFromStayDates(): void {
if (primaryNightsEdited.value) {
return
}
const nights = stayNights(form.booking.arrival_date, form.booking.departure_date)
if (nights === null) {
return
}
primaryCharge.value.nights = String(nights)
}
function applyDefaultDocumentDates(timeZone: string): void {
const dates = createDefaultDocumentDates(timeZone)
form.document.invoice_date = dates.invoiceDate
@@ -1483,6 +1572,31 @@ function addDaysToDateInputValue(dateValue: string, days: number): string {
].join('-')
}
function stayNights(arrivalDate: string, departureDate: string): number | null {
if (!arrivalDate || !departureDate || departureDate <= arrivalDate) {
return null
}
const arrival = dateInputValueToUtcDate(arrivalDate)
const departure = dateInputValueToUtcDate(departureDate)
if (!arrival || !departure) {
return null
}
const nights = Math.round((departure.getTime() - arrival.getTime()) / 86_400_000)
return nights > 0 ? nights : null
}
function dateInputValueToUtcDate(dateValue: string): Date | null {
const [year = 0, month = 0, day = 0] = dateValue.split('-').map((part) => Number(part))
if (!year || !month || !day) {
return null
}
const date = new Date(Date.UTC(year, month - 1, day))
if (date.getUTCFullYear() !== year || date.getUTCMonth() + 1 !== month || date.getUTCDate() !== day) {
return null
}
return date
}
function formatDateParts(date: Date, timeZone: string): Intl.DateTimeFormatPart[] {
return new Intl.DateTimeFormat('en-GB', {
timeZone,