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

Fix rounding and conversion issues on statistics

Browse Source
This commit is contained in:
ellite 2023-11-12 11:07:17 +01:00
parent cce3b0f85c
commit 74d851ea7a
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
endpoints/subscriptions/get.php
View File

@ -51,7 +51,7 @@
$print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name']; $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
$print[$id]['category_id'] = $subscription['category_id']; $print[$id]['category_id'] = $subscription['category_id'];
$print[$id]['payer_user_id'] = $subscription['payer_user_id']; $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = $subscription['price']; $print[$id]['price'] = floatval($subscription['price']);
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
$print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db); $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

13
includes/list_subscriptions.php
View File

@ -50,11 +50,11 @@
return $price; return $price;
} else { } else {
$fromRate = $exchangeRate['rate']; $fromRate = $exchangeRate['rate'];
return number_format($price / $fromRate, 2); return $price / $fromRate;
} }
} }
function printSubscriptons($subscriptions, $sort, $categories) { function printSubscriptons($subscriptions, $sort, $categories, $members) {
if ($sort === "price") { if ($sort === "price") {
usort($subscriptions, function($a, $b) { usort($subscriptions, function($a, $b) {
return $a['price'] < $b['price'] ? 1 : -1; return $a['price'] < $b['price'] ? 1 : -1;
@ -62,6 +62,7 @@
} }
$currentCategory = 0; $currentCategory = 0;
$currentPayerUserId = 0;
foreach ($subscriptions as $subscription) { foreach ($subscriptions as $subscription) {
if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) { if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) {
?> ?>
@ -71,6 +72,14 @@
<?php <?php
$currentCategory = $subscription['category_id']; $currentCategory = $subscription['category_id'];
} }
if ($sort == "payer_user_id" && $subscription['payer_user_id'] != $currentPayerUserId) {
?>
<div class="subscription-list-title">
<?= $members[$subscription['payer_user_id']]['name'] ?>
</div>
<?php
$currentPayerUserId = $subscription['payer_user_id'];
}
?> ?>
<div class="subscription"> <div class="subscription">
<span class="logo <?= $subscription['hidelogo'] ?>"><img src="<?= $subscription['logo'] ?>"></span> <span class="logo <?= $subscription['hidelogo'] ?>"><img src="<?= $subscription['logo'] ?>"></span>

2
index.php
View File

@ -79,7 +79,7 @@
$print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name']; $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
$print[$id]['category_id'] = $subscription['category_id']; $print[$id]['category_id'] = $subscription['category_id'];
$print[$id]['payer_user_id'] = $subscription['payer_user_id']; $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = $subscription['price']; $print[$id]['price'] = floatval($subscription['price']);
if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
$print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db); $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

4
stats.php
View File

@ -38,7 +38,7 @@
return $price; return $price;
} else { } else {
$fromRate = $exchangeRate['rate']; $fromRate = $exchangeRate['rate'];
return number_format($price * $fromRate, 2, ".", ""); return $price / $fromRate;
} }
} }
@ -173,7 +173,7 @@ if ($result) {
<div class="title">Most Expensive Subscription Cost</div> <div class="title">Most Expensive Subscription Cost</div>
</div> </div>
<div class="statistic"> <div class="statistic">
<span><?= $amountDueThisMonth ?><?= $symbol ?></span> <span><?= number_format($amountDueThisMonth, 2, ".", "") ?><?= $symbol ?></span>
<div class="title">Amount due this month</div> <div class="title">Amount due this month</div>
</div> </div>
<?php <?php