joshuacoles/wallos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove duplicate category.

Browse Source 
Fix changing main currency.
Fix currency conversion.
Pre-Select main currency when adding a new subscription.
This commit is contained in:
ellite 2023-11-10 23:29:16 +01:00
parent eee998c93d
commit 7e4ca23811
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/commands.sql
View File

@ -108,7 +108,7 @@ INSERT INTO categories (id, name) VALUES
(11, 'Insurance'), (11, 'Insurance'),
(12, 'Gaming'), (12, 'Gaming'),
(13, 'News & Magazines'), (13, 'News & Magazines'),
(14, 'Productivity'), (14, 'Software'),
(15, 'Technology'), (15, 'Technology'),
(16, 'Charity & Donations:'); (16, 'Charity & Donations:');

2
endpoints/cronjobs/createdatabase.php
View File

@ -119,7 +119,7 @@ if (!file_exists($databaseFile)) {
(11, 'Insurance'), (11, 'Insurance'),
(12, 'Gaming'), (12, 'Gaming'),
(13, 'News & Magazines'), (13, 'News & Magazines'),
(14, 'Productivity'), (14, 'Software'),
(15, 'Technology'), (15, 'Technology'),
(16, 'Cloud Services'), (16, 'Cloud Services'),
(17, 'Charity & Donations')"); (17, 'Charity & Donations')");

3
endpoints/user/save_user.php
View File

@ -27,7 +27,7 @@
$mainCurrencyCode = $row['code']; $mainCurrencyCode = $row['code'];
$mainCurrencyId = $row['main_currency']; $mainCurrencyId = $row['main_currency'];
$api_url = "http://data.fixer.io/api/latest?access_key=". $apiKey . "&base=" . $mainCurrencyCode . "&symbols=" . $codes; $api_url = "http://data.fixer.io/api/latest?access_key=". $apiKey . "&base=EUR&symbols=" . $codes;
$response = file_get_contents($api_url); $response = file_get_contents($api_url);
$apiData = json_decode($response, true); $apiData = json_decode($response, true);
@ -131,6 +131,7 @@
$_SESSION['avatar'] = $avatar; $_SESSION['avatar'] = $avatar;
if ($main_currency != $mainCurrencyId) { if ($main_currency != $mainCurrencyId) {
$_SESSION['main_currency'] = $main_currency;
update_exchange_rate($db); update_exchange_rate($db);
} }

2
includes/list_subscriptions.php
View File

@ -50,7 +50,7 @@
return $price; return $price;
} else { } else {
$fromRate = $exchangeRate['rate']; $fromRate = $exchangeRate['rate'];
return number_format($price * $fromRate, 2); return number_format($price / $fromRate, 2);
} }
} }

3
index.php
View File

@ -147,8 +147,9 @@
<select id="currency" name="currency_id" placeholder="Currency"> <select id="currency" name="currency_id" placeholder="Currency">
<?php <?php
foreach ($currencies as $currency) { foreach ($currencies as $currency) {
$selected = ($currency['id'] == $main_currency) ? 'selected' : '';
?> ?>
<option value="<?= $currency['id'] ?>"><?= $currency['name'] ?></option> <option value="<?= $currency['id'] ?>" <?= $selected ?>><?= $currency['name'] ?></option>
<?php <?php
} }
?> ?>