diff --git a/commands/receipts/receiptCommands.js b/commands/receipts/receiptCommands.js index f3cad78..4b41581 100644 --- a/commands/receipts/receiptCommands.js +++ b/commands/receipts/receiptCommands.js @@ -61,7 +61,7 @@ module.exports = { )`).run(budget); } - await interaction.reply(`Budget set to ${budget}.`); + await interaction.reply(`Budget set to ${Number(budget).toFixed(2)}.`); break; case 'view': const currentBudget = db.prepare(` @@ -95,7 +95,7 @@ module.exports = { { name: 'Spent', value: `${totalSpentEur.toFixed(2)} €\n${(totalSpentEur * currentBudget.exchange_rate).toFixed(2)} kr`, inline: true }, { name: 'Remaining', value: `${remainingEur.toFixed(2)} €\n${remainingSek.toFixed(2)} kr`, inline: true }, ) - .setFooter({ text: `Exchange rate this week: 1 € = ${currentBudget.exchange_rate} kr` }) + .setFooter({ text: `Exchange rate this week: 1 € = ${currentBudget.exchange_rate.toFixed(2)} kr` }) .setTimestamp(); await interaction.reply({ embeds: [budgetEmbed] }); diff --git a/events/receiptsMessageCreate.js b/events/receiptsMessageCreate.js index 18a4ae3..abb1f16 100644 --- a/events/receiptsMessageCreate.js +++ b/events/receiptsMessageCreate.js @@ -97,7 +97,7 @@ module.exports = { return acc + entry.amount; }, 0); - reply = `${message.author.globalName} spent ${additionalSpent}€ / ${(additionalSpent * currentBudget.exchange_rate).toFixed(2)} kr of their budget.\nThey have ${currentBudget.budget_amount - totalSpent}€ / ${((currentBudget.budget_amount - totalSpent) * currentBudget.exchange_rate).toFixed(2)} kr remaining.`; + reply = `${message.author.globalName} spent ${additionalSpent.toFixed(2)}€ / ${(additionalSpent * currentBudget.exchange_rate).toFixed(2)} kr of their budget.\nThey have ${(currentBudget.budget_amount - totalSpent).toFixed(2)}€ / ${((currentBudget.budget_amount - totalSpent) * currentBudget.exchange_rate).toFixed(2)} kr remaining.`; await message.reply(reply); } } diff --git a/timers/receiptTimer.js b/timers/receiptTimer.js index 9d047a8..3ffc967 100644 --- a/timers/receiptTimer.js +++ b/timers/receiptTimer.js @@ -40,7 +40,7 @@ module.exports = { if (!response.ok) await channel.send(`Failed to fetch exchange rate:\n${response.statusText}`); const data = await response.json(); //await channel.send(`Fetched new exchange rate:\n${JSON.stringify(data)}`); - await channel.send(`Reset weekly budget to ${config.weekly_budget}€ / ${config.weekly_budget*data.rates.SEK} kr`); + await channel.send(`Reset weekly budget to ${config.weekly_budget.toFixed(2)}€ / ${(config.weekly_budget * data.rates.SEK).toFixed(2)} kr`); db.prepare(`