mirrors/spliit
1
0
Fork 0
mirror of https://github.com/spliit-app/spliit.git synced 2026-02-22 07:26:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add computed shares per expense to fix #127 (#269)

Browse Source 
* Added computed expenses per balance to fix #127

* add missing import that got lost during merge

* if we are in percentage mode or amount mode, the shares have to be multiplied by 100
This commit is contained in:
Daniel Thiem
2025-04-19 21:16:37 +02:00
committed by GitHub
parent 9fec8f9eaa
commit 728e072376
2 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/groups/[groupId]/expenses/expense-form.tsx
View File

@@ -40,6 +40,7 @@ import {
SplittingOptions,
expenseFormSchema,
} from '@/lib/schemas'
import { calculateShare } from '@/lib/totals'
import { cn } from '@/lib/utils'
import { AppRouterOutput } from '@/trpc/routers/_app'
import { zodResolver } from '@hookform/resolvers/zod'
@@ -591,6 +592,42 @@ export function ExpenseForm({
</FormControl>
<FormLabel className="text-sm font-normal flex-1">
{name}
{field.value?.some(
({ participant }) => participant === id,
) &&
!form.watch('isReimbursement') && (
<span className="text-muted-foreground ml-2">
({group.currency}{' '}
{(
calculateShare(id, {
amount:
Number(form.watch('amount')) * 100, // Convert to cents
paidFor: field.value.map(
({ participant, shares }) => ({
participant: {
id: participant,
name: '',
groupId: '',
},
shares:
form.watch('splitMode') ===
'BY_PERCENTAGE' ||
form.watch('splitMode') ===
'BY_AMOUNT'
? Number(shares) * 100 // Convert percentage to basis points (e.g., 50% -> 5000)
: shares,
expenseId: '',
participantId: '',
}),
),
splitMode: form.watch('splitMode'),
isReimbursement:
form.watch('isReimbursement'),
}) / 100
).toFixed(2)}
)
</span>
)}
</FormLabel>
</FormItem>
{form.getValues().splitMode !== 'EVENLY' && (