feat: add multi-currency support to cospend payments
Some checks failed
CI / update (push) Failing after 5s

- Add ExchangeRate model for currency conversion tracking
- Implement currency utility functions for formatting and conversion
- Add exchange rates API endpoint with caching and fallback rates
- Update Payment and RecurringPayment models to support multiple currencies
- Enhanced payment forms with currency selection and conversion display
- Update split method selector with better currency handling
- Add currency-aware payment display and balance calculations
- Support for EUR, USD, GBP, and CHF with automatic exchange rate fetching

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
2025-09-14 19:54:31 +02:00
parent c8e542eec8
commit 579cbd1bc9
13 changed files with 936 additions and 59 deletions

View File

@@ -9,6 +9,7 @@
export let personalAmounts = {}; export let personalAmounts = {};
export let currentUser = ''; export let currentUser = '';
export let predefinedMode = false; export let predefinedMode = false;
export let currency = 'CHF';
let personalTotalError = false; let personalTotalError = false;
@@ -173,8 +174,8 @@
{/each} {/each}
{#if amount} {#if amount}
<div class="remainder-info" class:error={personalTotalError}> <div class="remainder-info" class:error={personalTotalError}>
<span>Total Personal: CHF {Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0).toFixed(2)}</span> <span>Total Personal: {currency} {Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0).toFixed(2)}</span>
<span>Remainder to Split: CHF {Math.max(0, parseFloat(amount) - Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0)).toFixed(2)}</span> <span>Remainder to Split: {currency} {Math.max(0, parseFloat(amount) - Object.values(personalAmounts).reduce((sum, val) => sum + (parseFloat(val) || 0), 0)).toFixed(2)}</span>
{#if personalTotalError} {#if personalTotalError}
<div class="error-message">⚠️ Personal amounts exceed total payment amount!</div> <div class="error-message">⚠️ Personal amounts exceed total payment amount!</div>
{/if} {/if}
@@ -194,11 +195,11 @@
</div> </div>
<span class="amount" class:positive={splitAmounts[user] < 0} class:negative={splitAmounts[user] > 0}> <span class="amount" class:positive={splitAmounts[user] < 0} class:negative={splitAmounts[user] > 0}>
{#if splitAmounts[user] > 0} {#if splitAmounts[user] > 0}
owes CHF {splitAmounts[user].toFixed(2)} owes {currency} {splitAmounts[user].toFixed(2)}
{:else if splitAmounts[user] < 0} {:else if splitAmounts[user] < 0}
is owed CHF {Math.abs(splitAmounts[user]).toFixed(2)} is owed {currency} {Math.abs(splitAmounts[user]).toFixed(2)}
{:else} {:else}
owes CHF {splitAmounts[user].toFixed(2)} owes {currency} {splitAmounts[user].toFixed(2)}
{/if} {/if}
</span> </span>
</div> </div>

94
src/lib/utils/currency.ts Normal file
View File

@@ -0,0 +1,94 @@
import { ExchangeRate } from '../../models/ExchangeRate';
import { dbConnect, dbDisconnect } from '../../utils/db';
/**
* Convert amount from foreign currency to CHF using direct database/API access
*/
export async function convertToCHF(
amount: number,
fromCurrency: string,
date: string,
fetch?: typeof globalThis.fetch
): Promise<{
convertedAmount: number;
exchangeRate: number;
}> {
if (fromCurrency.toUpperCase() === 'CHF') {
return {
convertedAmount: amount,
exchangeRate: 1
};
}
const rate = await getExchangeRate(fromCurrency.toUpperCase(), date);
return {
convertedAmount: amount * rate,
exchangeRate: rate
};
}
/**
* Get exchange rate from database cache or fetch from API
*/
async function getExchangeRate(fromCurrency: string, date: string): Promise<number> {
const dateStr = date.split('T')[0]; // Extract YYYY-MM-DD
await dbConnect();
try {
// Try cache first
const cachedRate = await ExchangeRate.findOne({
fromCurrency,
toCurrency: 'CHF',
date: dateStr
});
if (cachedRate) {
return cachedRate.rate;
}
// Fetch from API
const rate = await fetchFromFrankfurterAPI(fromCurrency, dateStr);
// Cache the result
await ExchangeRate.create({
fromCurrency,
toCurrency: 'CHF',
rate,
date: dateStr
});
return rate;
} finally {
await dbDisconnect();
}
}
/**
* Fetch exchange rate from Frankfurter API
*/
async function fetchFromFrankfurterAPI(fromCurrency: string, date: string): Promise<number> {
const url = `https://api.frankfurter.app/${date}?from=${fromCurrency}&to=CHF`;
const response = await fetch(url);
if (!response.ok) {
throw new Error(`Frankfurter API request failed: ${response.status}`);
}
const data = await response.json();
if (!data.rates || !data.rates.CHF) {
throw new Error(`No exchange rate found for ${fromCurrency} to CHF on ${date}`);
}
return data.rates.CHF;
}
/**
* Validate currency code (3-letter ISO code)
*/
export function isValidCurrencyCode(currency: string): boolean {
return /^[A-Z]{3}$/.test(currency.toUpperCase());
}

View File

@@ -0,0 +1,47 @@
import mongoose from 'mongoose';
export interface IExchangeRate {
_id?: string;
fromCurrency: string; // e.g., "USD"
toCurrency: string; // Always "CHF" for our use case
rate: number;
date: string; // Date in YYYY-MM-DD format
createdAt?: Date;
updatedAt?: Date;
}
const ExchangeRateSchema = new mongoose.Schema(
{
fromCurrency: {
type: String,
required: true,
uppercase: true,
trim: true
},
toCurrency: {
type: String,
required: true,
uppercase: true,
trim: true,
default: 'CHF'
},
rate: {
type: Number,
required: true,
min: 0
},
date: {
type: String,
required: true,
match: /^\d{4}-\d{2}-\d{2}$/
}
},
{
timestamps: true
}
);
// Create compound index for efficient lookups
ExchangeRateSchema.index({ fromCurrency: 1, toCurrency: 1, date: 1 }, { unique: true });
export const ExchangeRate = mongoose.model<IExchangeRate>("ExchangeRate", ExchangeRateSchema);

View File

@@ -4,8 +4,10 @@ export interface IPayment {
_id?: string; _id?: string;
title: string; title: string;
description?: string; description?: string;
amount: number; amount: number; // Always in CHF (converted if necessary)
currency: string; currency: string; // Currency code (CHF if no conversion, foreign currency if converted)
originalAmount?: number; // Amount in foreign currency (only if currency != CHF)
exchangeRate?: number; // Exchange rate used for conversion (only if currency != CHF)
paidBy: string; // username/nickname of the person who paid paidBy: string; // username/nickname of the person who paid
date: Date; date: Date;
image?: string; // path to uploaded image image?: string; // path to uploaded image
@@ -36,7 +38,17 @@ const PaymentSchema = new mongoose.Schema(
type: String, type: String,
required: true, required: true,
default: 'CHF', default: 'CHF',
enum: ['CHF'] // For now only CHF as requested uppercase: true
},
originalAmount: {
type: Number,
required: false,
min: 0
},
exchangeRate: {
type: Number,
required: false,
min: 0
}, },
paidBy: { paidBy: {
type: String, type: String,

View File

@@ -4,16 +4,16 @@ export interface IRecurringPayment {
_id?: string; _id?: string;
title: string; title: string;
description?: string; description?: string;
amount: number; amount: number; // Amount in the original currency
currency: string; currency: string; // Original currency code
paidBy: string; // username/nickname of the person who paid paidBy: string; // username/nickname of the person who paid
category: 'groceries' | 'shopping' | 'travel' | 'restaurant' | 'utilities' | 'fun' | 'settlement'; category: 'groceries' | 'shopping' | 'travel' | 'restaurant' | 'utilities' | 'fun' | 'settlement';
splitMethod: 'equal' | 'full' | 'proportional' | 'personal_equal'; splitMethod: 'equal' | 'full' | 'proportional' | 'personal_equal';
splits: Array<{ splits: Array<{
username: string; username: string;
amount?: number; amount?: number; // Amount in original currency
proportion?: number; proportion?: number;
personalAmount?: number; personalAmount?: number; // Amount in original currency
}>; }>;
frequency: 'daily' | 'weekly' | 'monthly' | 'custom'; frequency: 'daily' | 'weekly' | 'monthly' | 'custom';
cronExpression?: string; // For custom frequencies using cron syntax cronExpression?: string; // For custom frequencies using cron syntax
@@ -47,7 +47,7 @@ const RecurringPaymentSchema = new mongoose.Schema(
type: String, type: String,
required: true, required: true,
default: 'CHF', default: 'CHF',
enum: ['CHF'] uppercase: true
}, },
paidBy: { paidBy: {
type: String, type: String,

View File

@@ -88,15 +88,15 @@
<div class="error-icon"> <div class="error-icon">
{getErrorIcon(status)} {getErrorIcon(status)}
</div> </div>
<h1 class="error-title"> <h1 class="error-title">
{getErrorTitle(status)} {getErrorTitle(status)}
</h1> </h1>
<div class="error-code"> <div class="error-code">
Fehler {status} Fehler {status}
</div> </div>
<p class="error-description"> <p class="error-description">
{getErrorDescription(status)} {getErrorDescription(status)}
</p> </p>
@@ -163,7 +163,7 @@
<style> <style>
.error-page { .error-page {
min-height: calc(100vh - 4rem); min-height: calc(100vh - 6rem);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -390,4 +390,4 @@
font-size: 1rem; font-size: 1rem;
} }
} }
</style> </style>

View File

@@ -0,0 +1,115 @@
import type { RequestHandler } from '@sveltejs/kit';
import { ExchangeRate } from '../../../../models/ExchangeRate';
import { dbConnect } from '../../../../utils/db';
import { error, json } from '@sveltejs/kit';
export const GET: RequestHandler = async ({ locals, url }) => {
const auth = await locals.auth();
if (!auth || !auth.user?.nickname) {
throw error(401, 'Not logged in');
}
const fromCurrency = url.searchParams.get('from')?.toUpperCase();
const date = url.searchParams.get('date');
const action = url.searchParams.get('action') || 'rate';
if (action === 'currencies') {
return await getSupportedCurrencies();
}
if (!fromCurrency || !date) {
throw error(400, 'Missing required parameters: from and date');
}
if (!isValidCurrencyCode(fromCurrency)) {
throw error(400, 'Invalid currency code');
}
try {
const rate = await getExchangeRate(fromCurrency, date);
return json({ rate, fromCurrency, toCurrency: 'CHF', date });
} catch (e) {
console.error('Error getting exchange rate:', e);
throw error(500, 'Failed to get exchange rate');
}
};
async function getExchangeRate(fromCurrency: string, date: string): Promise<number> {
if (fromCurrency === 'CHF') {
return 1;
}
const dateStr = date.split('T')[0]; // Extract YYYY-MM-DD
await dbConnect();
try {
// Try cache first
const cachedRate = await ExchangeRate.findOne({
fromCurrency,
toCurrency: 'CHF',
date: dateStr
});
if (cachedRate) {
return cachedRate.rate;
}
// Fetch from API
const rate = await fetchFromFrankfurterAPI(fromCurrency, dateStr);
// Cache the result
await ExchangeRate.create({
fromCurrency,
toCurrency: 'CHF',
rate,
date: dateStr
});
return rate;
} finally {
// Connection will be reused
}
}
async function fetchFromFrankfurterAPI(fromCurrency: string, date: string): Promise<number> {
const url = `https://api.frankfurter.app/${date}?from=${fromCurrency}&to=CHF`;
const response = await fetch(url);
if (!response.ok) {
throw new Error(`Frankfurter API request failed: ${response.status}`);
}
const data = await response.json();
if (!data.rates || !data.rates.CHF) {
throw new Error(`No exchange rate found for ${fromCurrency} to CHF on ${date}`);
}
return data.rates.CHF;
}
async function getSupportedCurrencies() {
try {
const response = await fetch('https://api.frankfurter.app/currencies');
if (!response.ok) {
throw new Error(`API request failed: ${response.status}`);
}
const data = await response.json();
const currencies = Object.keys(data);
return json({ currencies });
} catch (e) {
console.error('Error fetching supported currencies:', e);
// Return common currencies as fallback
const fallbackCurrencies = ['EUR', 'USD', 'GBP', 'JPY', 'CAD', 'AUD', 'SEK', 'NOK', 'DKK'];
return json({ currencies: fallbackCurrencies });
}
}
function isValidCurrencyCode(currency: string): boolean {
return /^[A-Z]{3}$/.test(currency);
}

View File

@@ -80,13 +80,21 @@
} }
} }
function formatCurrency(amount) { function formatCurrency(amount, currency = 'CHF') {
return new Intl.NumberFormat('de-CH', { return new Intl.NumberFormat('de-CH', {
style: 'currency', style: 'currency',
currency: 'CHF' currency: currency
}).format(amount); }).format(amount);
} }
function formatAmountWithCurrency(payment) {
if (payment.currency === 'CHF' || !payment.originalAmount) {
return formatCurrency(payment.amount);
}
return `${formatCurrency(payment.originalAmount, payment.currency)}${formatCurrency(payment.amount)}`;
}
function formatDate(dateString) { function formatDate(dateString) {
return new Date(dateString).toLocaleDateString('de-CH'); return new Date(dateString).toLocaleDateString('de-CH');
} }
@@ -158,7 +166,7 @@
</div> </div>
</div> </div>
<div class="settlement-amount"> <div class="settlement-amount">
<span class="amount settlement-amount-text">{formatCurrency(payment.amount)}</span> <span class="amount settlement-amount-text">{formatAmountWithCurrency(payment)}</span>
<span class="date">{formatDate(payment.date)}</span> <span class="date">{formatDate(payment.date)}</span>
</div> </div>
{:else} {:else}
@@ -172,7 +180,7 @@
<div class="payment-meta"> <div class="payment-meta">
<span class="category-name">{getCategoryName(payment.category || 'groceries')}</span> <span class="category-name">{getCategoryName(payment.category || 'groceries')}</span>
<span class="date">{formatDate(payment.date)}</span> <span class="date">{formatDate(payment.date)}</span>
<span class="amount">{formatCurrency(payment.amount)}</span> <span class="amount">{formatAmountWithCurrency(payment)}</span>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -28,6 +28,7 @@ export const actions: Actions = {
const title = formData.get('title')?.toString().trim(); const title = formData.get('title')?.toString().trim();
const description = formData.get('description')?.toString().trim() || ''; const description = formData.get('description')?.toString().trim() || '';
const amount = parseFloat(formData.get('amount')?.toString() || '0'); const amount = parseFloat(formData.get('amount')?.toString() || '0');
const currency = formData.get('currency')?.toString()?.toUpperCase() || 'CHF';
const paidBy = formData.get('paidBy')?.toString().trim(); const paidBy = formData.get('paidBy')?.toString().trim();
const date = formData.get('date')?.toString(); const date = formData.get('date')?.toString();
const category = formData.get('category')?.toString() || 'groceries'; const category = formData.get('category')?.toString() || 'groceries';
@@ -155,6 +156,7 @@ export const actions: Actions = {
title, title,
description, description,
amount, amount,
currency,
paidBy, paidBy,
date: date || new Date().toISOString().split('T')[0], date: date || new Date().toISOString().split('T')[0],
category, category,
@@ -186,6 +188,7 @@ export const actions: Actions = {
title, title,
description, description,
amount, amount,
currency,
paidBy, paidBy,
category, category,
splitMethod, splitMethod,

View File

@@ -18,6 +18,7 @@
title: form?.values?.title || '', title: form?.values?.title || '',
description: form?.values?.description || '', description: form?.values?.description || '',
amount: form?.values?.amount || '', amount: form?.values?.amount || '',
currency: form?.values?.currency || 'CHF',
paidBy: form?.values?.paidBy || data.currentUser || '', paidBy: form?.values?.paidBy || data.currentUser || '',
date: form?.values?.date || new Date().toISOString().split('T')[0], date: form?.values?.date || new Date().toISOString().split('T')[0],
category: form?.values?.category || 'groceries', category: form?.values?.category || 'groceries',
@@ -46,6 +47,13 @@
let jsEnhanced = false; let jsEnhanced = false;
let cronError = false; let cronError = false;
let nextExecutionPreview = ''; let nextExecutionPreview = '';
let supportedCurrencies = ['CHF'];
let loadingCurrencies = false;
let currentExchangeRate = null;
let convertedAmount = null;
let loadingExchangeRate = false;
let exchangeRateError = null;
let exchangeRateTimeout;
// Initialize users from server data for no-JS support // Initialize users from server data for no-JS support
let users = predefinedMode ? [...data.predefinedUsers] : (data.currentUser ? [data.currentUser] : []); let users = predefinedMode ? [...data.predefinedUsers] : (data.currentUser ? [data.currentUser] : []);
@@ -89,7 +97,7 @@
} }
})(); })();
onMount(() => { onMount(async () => {
jsEnhanced = true; jsEnhanced = true;
document.body.classList.add('js-loaded'); document.body.classList.add('js-loaded');
@@ -110,8 +118,65 @@
addSplitForUser(data.currentUser); addSplitForUser(data.currentUser);
} }
} }
// Load supported currencies
await loadSupportedCurrencies();
}); });
async function loadSupportedCurrencies() {
try {
loadingCurrencies = true;
const response = await fetch('/api/cospend/exchange-rates?action=currencies');
if (response.ok) {
const data = await response.json();
supportedCurrencies = ['CHF', ...data.currencies.filter(c => c !== 'CHF')];
}
} catch (e) {
console.warn('Could not load supported currencies:', e);
// Keep default CHF
} finally {
loadingCurrencies = false;
}
}
async function fetchExchangeRate() {
if (formData.currency === 'CHF' || !formData.currency || !formData.date) {
currentExchangeRate = null;
convertedAmount = null;
exchangeRateError = null;
return;
}
if (!formData.amount || parseFloat(formData.amount) <= 0) {
convertedAmount = null;
return;
}
try {
loadingExchangeRate = true;
exchangeRateError = null;
const url = `/api/cospend/exchange-rates?from=${formData.currency}&date=${formData.date}`;
const response = await fetch(url);
if (!response.ok) {
throw new Error('Failed to fetch exchange rate');
}
const data = await response.json();
currentExchangeRate = data.rate;
convertedAmount = parseFloat(formData.amount) * data.rate;
} catch (e) {
console.warn('Could not fetch exchange rate:', e);
exchangeRateError = e.message;
currentExchangeRate = null;
convertedAmount = null;
} finally {
loadingExchangeRate = false;
}
}
function handleImageSelected(event) { function handleImageSelected(event) {
imageFile = event.detail; imageFile = event.detail;
} }
@@ -190,6 +255,7 @@
const payload = { const payload = {
...formData, ...formData,
amount: parseFloat(formData.amount), amount: parseFloat(formData.amount),
currency: formData.currency,
image: imagePath, image: imagePath,
splits splits
}; };
@@ -257,6 +323,13 @@
$: if (recurringData.frequency || recurringData.cronExpression || recurringData.startDate || formData.isRecurring) { $: if (recurringData.frequency || recurringData.cronExpression || recurringData.startDate || formData.isRecurring) {
updateNextExecutionPreview(); updateNextExecutionPreview();
} }
// Fetch exchange rate when currency, amount, or date changes
$: if (jsEnhanced && formData.currency && formData.currency !== 'CHF' && formData.date && formData.amount) {
// Add a small delay to avoid excessive API calls while user is typing
clearTimeout(exchangeRateTimeout);
exchangeRateTimeout = setTimeout(fetchExchangeRate, 300);
}
</script> </script>
<svelte:head> <svelte:head>
@@ -307,28 +380,61 @@
<div class="form-row"> <div class="form-row">
<div class="form-group"> <div class="form-group">
<label for="amount">Amount (CHF) *</label> <label for="amount">Amount *</label>
<input <div class="amount-currency">
type="number" <input
id="amount" type="number"
name="amount" id="amount"
bind:value={formData.amount} name="amount"
required bind:value={formData.amount}
min="0" required
step="0.01" min="0"
placeholder="0.00" step="0.01"
/> placeholder="0.00"
/>
<select id="currency" name="currency" bind:value={formData.currency} disabled={loadingCurrencies}>
{#each supportedCurrencies as currency}
<option value={currency}>{currency}</option>
{/each}
</select>
</div>
{#if formData.currency !== 'CHF'}
<div class="conversion-info">
<small class="help-text">Amount will be converted to CHF using exchange rates for the payment date</small>
{#if loadingExchangeRate}
<div class="conversion-preview loading">
<small>🔄 Fetching exchange rate...</small>
</div>
{:else if exchangeRateError}
<div class="conversion-preview error">
<small>⚠️ {exchangeRateError}</small>
</div>
{:else if convertedAmount !== null && currentExchangeRate !== null && formData.amount}
<div class="conversion-preview success">
<small>
{formData.currency} {parseFloat(formData.amount).toFixed(2)} ≈ CHF {convertedAmount.toFixed(2)}
<br>
(Rate: 1 {formData.currency} = {currentExchangeRate.toFixed(4)} CHF)
</small>
</div>
{/if}
</div>
{/if}
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="date">Date</label> <label for="date">Payment Date</label>
<input <input
type="date" type="date"
id="date" id="date"
name="date" name="date"
value={formData.date} bind:value={formData.date}
required required
/> />
{#if formData.currency !== 'CHF'}
<small class="help-text">Exchange rate will be fetched for this date</small>
{/if}
</div> </div>
</div> </div>
@@ -480,6 +586,7 @@
bind:personalAmounts={personalAmounts} bind:personalAmounts={personalAmounts}
{users} {users}
amount={formData.amount} amount={formData.amount}
currency={formData.currency}
paidBy={formData.paidBy} paidBy={formData.paidBy}
currentUser={data.session?.user?.nickname || data.currentUser} currentUser={data.session?.user?.nickname || data.currentUser}
{predefinedMode} {predefinedMode}
@@ -851,6 +958,71 @@
} }
} }
/* Amount-currency styling */
.amount-currency {
display: flex;
gap: 0.5rem;
}
.amount-currency input {
flex: 2;
}
.amount-currency select {
flex: 1;
min-width: 80px;
}
/* Currency conversion preview */
.conversion-info {
margin-top: 0.5rem;
}
.conversion-preview {
margin-top: 0.5rem;
padding: 0.75rem;
border-radius: 0.5rem;
border: 1px solid transparent;
}
.conversion-preview.loading {
background-color: var(--nord8);
border-color: var(--blue);
color: var(--blue);
}
.conversion-preview.error {
background-color: var(--nord6);
border-color: var(--red);
color: var(--red);
}
.conversion-preview.success {
background-color: var(--nord14);
border-color: var(--green);
color: var(--nord0);
}
.conversion-preview small {
font-size: 0.85rem;
font-weight: 500;
}
@media (prefers-color-scheme: dark) {
.conversion-preview.loading {
background-color: var(--nord2);
}
.conversion-preview.error {
background-color: var(--accent-dark);
}
.conversion-preview.success {
background-color: var(--nord2);
color: var(--font-default-dark);
}
}
@media (max-width: 600px) { @media (max-width: 600px) {
.add-payment { .add-payment {
padding: 1rem; padding: 1rem;
@@ -863,5 +1035,14 @@
.form-actions { .form-actions {
flex-direction: column; flex-direction: column;
} }
.amount-currency {
flex-direction: column;
}
.amount-currency input,
.amount-currency select {
flex: none;
}
} }
</style> </style>

View File

@@ -14,11 +14,22 @@
let error = null; let error = null;
let imageFile = null; let imageFile = null;
let imagePreview = ''; let imagePreview = '';
let supportedCurrencies = ['CHF'];
let loadingCurrencies = false;
let currentExchangeRate = null;
let convertedAmount = null;
let loadingExchangeRate = false;
let exchangeRateError = null;
let exchangeRateTimeout;
let jsEnhanced = false;
$: categoryOptions = getCategoryOptions(); $: categoryOptions = getCategoryOptions();
onMount(async () => { onMount(async () => {
jsEnhanced = true;
document.body.classList.add('js-loaded');
await loadPayment(); await loadPayment();
await loadSupportedCurrencies();
}); });
async function loadPayment() { async function loadPayment() {
@@ -139,6 +150,71 @@
deleting = false; deleting = false;
} }
} }
async function loadSupportedCurrencies() {
try {
loadingCurrencies = true;
const response = await fetch('/api/cospend/exchange-rates?action=currencies');
if (response.ok) {
const data = await response.json();
supportedCurrencies = ['CHF', ...data.currencies.filter(c => c !== 'CHF')];
}
} catch (e) {
console.warn('Could not load supported currencies:', e);
} finally {
loadingCurrencies = false;
}
}
async function fetchExchangeRate() {
if (!payment || payment.currency === 'CHF' || !payment.currency || !payment.date) {
currentExchangeRate = null;
convertedAmount = null;
exchangeRateError = null;
return;
}
if (!payment.originalAmount || payment.originalAmount <= 0) {
convertedAmount = null;
return;
}
try {
loadingExchangeRate = true;
exchangeRateError = null;
const dateStr = new Date(payment.date).toISOString().split('T')[0];
const url = `/api/cospend/exchange-rates?from=${payment.currency}&date=${dateStr}`;
const response = await fetch(url);
if (!response.ok) {
throw new Error('Failed to fetch exchange rate');
}
const data = await response.json();
currentExchangeRate = data.rate;
convertedAmount = payment.originalAmount * data.rate;
} catch (e) {
console.warn('Could not fetch exchange rate:', e);
exchangeRateError = e.message;
currentExchangeRate = null;
convertedAmount = null;
} finally {
loadingExchangeRate = false;
}
}
// Reactive statement for exchange rate fetching
$: if (jsEnhanced && payment && payment.currency && payment.currency !== 'CHF' && payment.date && payment.originalAmount) {
clearTimeout(exchangeRateTimeout);
exchangeRateTimeout = setTimeout(fetchExchangeRate, 300);
}
function formatDateForInput(dateString) {
if (!dateString) return '';
return new Date(dateString).toISOString().split('T')[0];
}
</script> </script>
<svelte:head> <svelte:head>
@@ -188,15 +264,66 @@
<div class="form-row"> <div class="form-row">
<div class="form-group"> <div class="form-group">
<label for="amount">Amount (CHF) *</label> <label for="amount">Amount *</label>
<input <div class="amount-currency">
type="number" {#if payment.originalAmount && payment.currency !== 'CHF'}
id="amount" <!-- Show original amount for foreign currency -->
bind:value={payment.amount} <input
required type="number"
min="0" id="originalAmount"
step="0.01" bind:value={payment.originalAmount}
/> required
min="0"
step="0.01"
/>
<select id="currency" bind:value={payment.currency} disabled={loadingCurrencies}>
{#each supportedCurrencies as currency}
<option value={currency}>{currency}</option>
{/each}
</select>
{:else}
<!-- Show CHF amount for CHF payments -->
<input
type="number"
id="amount"
bind:value={payment.amount}
required
min="0"
step="0.01"
/>
<select id="currency" bind:value={payment.currency} disabled={loadingCurrencies}>
{#each supportedCurrencies as currency}
<option value={currency}>{currency}</option>
{/each}
</select>
{/if}
</div>
{#if payment.currency !== 'CHF' && payment.originalAmount}
<div class="conversion-info">
<small class="help-text">Original amount in {payment.currency}, converted to CHF at payment date</small>
{#if loadingExchangeRate}
<div class="conversion-preview loading">
<small>🔄 Fetching current exchange rate...</small>
</div>
{:else if exchangeRateError}
<div class="conversion-preview error">
<small>⚠️ {exchangeRateError}</small>
</div>
{:else if convertedAmount !== null && currentExchangeRate !== null}
<div class="conversion-preview success">
<small>
{payment.currency} {payment.originalAmount.toFixed(2)} ≈ CHF {convertedAmount.toFixed(2)}
<br>
(Current rate: 1 {payment.currency} = {currentExchangeRate.toFixed(4)} CHF)
<br>
<strong>Stored: CHF {payment.amount.toFixed(2)} (Rate: {payment.exchangeRate ? payment.exchangeRate.toFixed(4) : 'N/A'})</strong>
</small>
</div>
{/if}
</div>
{/if}
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -204,7 +331,7 @@
<input <input
type="date" type="date"
id="date" id="date"
value={formatDate(payment.date)} value={formatDateForInput(payment.date)}
on:change={(e) => payment.date = new Date(e.target.value).toISOString()} on:change={(e) => payment.date = new Date(e.target.value).toISOString()}
required required
/> />
@@ -537,6 +664,82 @@
cursor: not-allowed; cursor: not-allowed;
} }
/* Amount-currency styling */
.amount-currency {
display: flex;
gap: 0.5rem;
}
.amount-currency input {
flex: 2;
}
.amount-currency select {
flex: 1;
min-width: 80px;
}
/* Currency conversion preview */
.conversion-info {
margin-top: 0.5rem;
}
.conversion-preview {
margin-top: 0.5rem;
padding: 0.75rem;
border-radius: 0.5rem;
border: 1px solid transparent;
}
.conversion-preview.loading {
background-color: var(--nord8);
border-color: var(--blue);
color: var(--blue);
}
.conversion-preview.error {
background-color: var(--nord6);
border-color: var(--red);
color: var(--red);
}
.conversion-preview.success {
background-color: var(--nord14);
border-color: var(--green);
color: var(--nord0);
}
.conversion-preview small {
font-size: 0.85rem;
font-weight: 500;
}
.help-text {
display: block;
margin-top: 0.25rem;
font-size: 0.8rem;
color: var(--nord3);
font-style: italic;
}
@media (prefers-color-scheme: dark) {
.conversion-preview.loading {
background-color: var(--nord2);
}
.conversion-preview.error {
background-color: var(--accent-dark);
}
.conversion-preview.success {
background-color: var(--nord2);
color: var(--font-default-dark);
}
.help-text {
color: var(--nord4);
}
}
@media (max-width: 600px) { @media (max-width: 600px) {
.edit-payment { .edit-payment {
@@ -555,5 +758,14 @@
.main-actions { .main-actions {
flex-direction: column; flex-direction: column;
} }
.amount-currency {
flex-direction: column;
}
.amount-currency input,
.amount-currency select {
flex: none;
}
} }
</style> </style>

View File

@@ -39,13 +39,21 @@
} }
} }
function formatCurrency(amount) { function formatCurrency(amount, currency = 'CHF') {
return new Intl.NumberFormat('de-CH', { return new Intl.NumberFormat('de-CH', {
style: 'currency', style: 'currency',
currency: 'CHF' currency: currency
}).format(Math.abs(amount)); }).format(Math.abs(amount));
} }
function formatAmountWithCurrency(payment) {
if (payment.currency === 'CHF' || !payment.originalAmount) {
return formatCurrency(payment.amount);
}
return `${formatCurrency(payment.originalAmount, payment.currency)}${formatCurrency(payment.amount)}`;
}
function formatDate(dateString) { function formatDate(dateString) {
return new Date(dateString).toLocaleDateString('de-CH'); return new Date(dateString).toLocaleDateString('de-CH');
} }
@@ -111,7 +119,12 @@
<h1>{payment.title}</h1> <h1>{payment.title}</h1>
</div> </div>
<div class="payment-amount"> <div class="payment-amount">
{formatCurrency(payment.amount)} {formatAmountWithCurrency(payment)}
{#if payment.currency !== 'CHF' && payment.exchangeRate}
<div class="exchange-rate-info">
<small>Exchange rate: 1 {payment.currency} = {payment.exchangeRate.toFixed(4)} CHF</small>
</div>
{/if}
</div> </div>
</div> </div>
{#if payment.image} {#if payment.image}
@@ -467,6 +480,22 @@
color: var(--red); color: var(--red);
} }
.exchange-rate-info {
margin-top: 0.5rem;
color: var(--nord3);
font-style: italic;
}
.exchange-rate-info small {
font-size: 0.8rem;
}
@media (prefers-color-scheme: dark) {
.exchange-rate-info {
color: var(--nord4);
}
}
@media (max-width: 600px) { @media (max-width: 600px) {
.payment-view { .payment-view {
padding: 1rem; padding: 1rem;

View File

@@ -14,6 +14,7 @@
title: '', title: '',
description: '', description: '',
amount: '', amount: '',
currency: 'CHF',
paidBy: data.session?.user?.nickname || '', paidBy: data.session?.user?.nickname || '',
category: 'groceries', category: 'groceries',
splitMethod: 'equal', splitMethod: 'equal',
@@ -35,11 +36,22 @@
let predefinedMode = isPredefinedUsersMode(); let predefinedMode = isPredefinedUsersMode();
let cronError = false; let cronError = false;
let nextExecutionPreview = ''; let nextExecutionPreview = '';
let supportedCurrencies = ['CHF'];
let loadingCurrencies = false;
let currentExchangeRate = null;
let convertedAmount = null;
let loadingExchangeRate = false;
let exchangeRateError = null;
let exchangeRateTimeout;
let jsEnhanced = false;
$: categoryOptions = getCategoryOptions(); $: categoryOptions = getCategoryOptions();
onMount(async () => { onMount(async () => {
jsEnhanced = true;
document.body.classList.add('js-loaded');
await loadRecurringPayment(); await loadRecurringPayment();
await loadSupportedCurrencies();
}); });
async function loadRecurringPayment() { async function loadRecurringPayment() {
@@ -58,6 +70,7 @@
title: payment.title, title: payment.title,
description: payment.description || '', description: payment.description || '',
amount: payment.amount.toString(), amount: payment.amount.toString(),
currency: payment.currency || 'CHF',
paidBy: payment.paidBy, paidBy: payment.paidBy,
category: payment.category, category: payment.category,
splitMethod: payment.splitMethod, splitMethod: payment.splitMethod,
@@ -192,6 +205,65 @@
$: if (formData.frequency || formData.cronExpression || formData.startDate) { $: if (formData.frequency || formData.cronExpression || formData.startDate) {
updateNextExecutionPreview(); updateNextExecutionPreview();
} }
async function loadSupportedCurrencies() {
try {
loadingCurrencies = true;
const response = await fetch('/api/cospend/exchange-rates?action=currencies');
if (response.ok) {
const data = await response.json();
supportedCurrencies = ['CHF', ...data.currencies.filter(c => c !== 'CHF')];
}
} catch (e) {
console.warn('Could not load supported currencies:', e);
} finally {
loadingCurrencies = false;
}
}
async function fetchExchangeRate() {
if (formData.currency === 'CHF' || !formData.currency || !formData.startDate) {
currentExchangeRate = null;
convertedAmount = null;
exchangeRateError = null;
return;
}
if (!formData.amount || parseFloat(formData.amount) <= 0) {
convertedAmount = null;
return;
}
try {
loadingExchangeRate = true;
exchangeRateError = null;
const url = `/api/cospend/exchange-rates?from=${formData.currency}&date=${formData.startDate}`;
const response = await fetch(url);
if (!response.ok) {
throw new Error('Failed to fetch exchange rate');
}
const data = await response.json();
currentExchangeRate = data.rate;
convertedAmount = parseFloat(formData.amount) * data.rate;
} catch (e) {
console.warn('Could not fetch exchange rate:', e);
exchangeRateError = e.message;
currentExchangeRate = null;
convertedAmount = null;
} finally {
loadingExchangeRate = false;
}
}
// Reactive statement for exchange rate fetching
$: if (jsEnhanced && formData.currency && formData.currency !== 'CHF' && formData.startDate && formData.amount) {
clearTimeout(exchangeRateTimeout);
exchangeRateTimeout = setTimeout(fetchExchangeRate, 300);
}
</script> </script>
<svelte:head> <svelte:head>
@@ -247,16 +319,46 @@
<div class="form-row"> <div class="form-row">
<div class="form-group"> <div class="form-group">
<label for="amount">Amount (CHF) *</label> <label for="amount">Amount *</label>
<input <div class="amount-currency">
type="number" <input
id="amount" type="number"
bind:value={formData.amount} id="amount"
required bind:value={formData.amount}
min="0" required
step="0.01" min="0"
placeholder="0.00" step="0.01"
/> placeholder="0.00"
/>
<select id="currency" bind:value={formData.currency} disabled={loadingCurrencies}>
{#each supportedCurrencies as currency}
<option value={currency}>{currency}</option>
{/each}
</select>
</div>
{#if formData.currency !== 'CHF'}
<div class="conversion-info">
<small class="help-text">Amount will be converted to CHF using exchange rates on each execution</small>
{#if loadingExchangeRate}
<div class="conversion-preview loading">
<small>🔄 Fetching exchange rate for start date...</small>
</div>
{:else if exchangeRateError}
<div class="conversion-preview error">
<small>⚠️ {exchangeRateError}</small>
</div>
{:else if convertedAmount !== null && currentExchangeRate !== null && formData.amount}
<div class="conversion-preview success">
<small>
{formData.currency} {parseFloat(formData.amount).toFixed(2)} ≈ CHF {convertedAmount.toFixed(2)}
<br>
(Rate for start date: 1 {formData.currency} = {currentExchangeRate.toFixed(4)} CHF)
</small>
</div>
{/if}
</div>
{/if}
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -363,6 +465,7 @@
bind:personalAmounts={personalAmounts} bind:personalAmounts={personalAmounts}
{users} {users}
amount={formData.amount} amount={formData.amount}
currency={formData.currency}
paidBy={formData.paidBy} paidBy={formData.paidBy}
currentUser={data.session?.user?.nickname} currentUser={data.session?.user?.nickname}
{predefinedMode} {predefinedMode}
@@ -637,6 +740,69 @@
.btn-secondary:hover { .btn-secondary:hover {
background-color: var(--nord2); background-color: var(--nord2);
} }
.conversion-preview.loading {
background-color: var(--nord2);
}
.conversion-preview.error {
background-color: var(--accent-dark);
}
.conversion-preview.success {
background-color: var(--nord2);
color: var(--font-default-dark);
}
}
/* Amount-currency styling */
.amount-currency {
display: flex;
gap: 0.5rem;
}
.amount-currency input {
flex: 2;
}
.amount-currency select {
flex: 1;
min-width: 80px;
}
/* Currency conversion preview */
.conversion-info {
margin-top: 0.5rem;
}
.conversion-preview {
margin-top: 0.5rem;
padding: 0.75rem;
border-radius: 0.5rem;
border: 1px solid transparent;
}
.conversion-preview.loading {
background-color: var(--nord8);
border-color: var(--blue);
color: var(--blue);
}
.conversion-preview.error {
background-color: var(--nord6);
border-color: var(--red);
color: var(--red);
}
.conversion-preview.success {
background-color: var(--nord14);
border-color: var(--green);
color: var(--nord0);
}
.conversion-preview small {
font-size: 0.85rem;
font-weight: 500;
} }
@media (max-width: 600px) { @media (max-width: 600px) {
@@ -651,5 +817,14 @@
.form-actions { .form-actions {
flex-direction: column; flex-direction: column;
} }
.amount-currency {
flex-direction: column;
}
.amount-currency input,
.amount-currency select {
flex: none;
}
} }
</style> </style>