Fix rounding and conversion issues on statistics

ellite · Nov 12, 2023 · 74d851e · 74d851e
1 parent cce3b0f
commit 74d851e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
@@ -51,7 +51,7 @@
           $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
           $print[$id]['category_id'] = $subscription['category_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) {
             $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.php
@@ -50,18 +50,19 @@ function getPriceConverted($price, $currency, $database) {
             return $price;
         } else {
             $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") {
             usort($subscriptions, function($a, $b) {
                 return $a['price'] < $b['price'] ? 1 : -1;
             });
         }
 
         $currentCategory = 0;
+        $currentPayerUserId = 0;
         foreach ($subscriptions as $subscription) {
             if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) {
                 ?>
@@ -71,6 +72,14 @@ function printSubscriptons($subscriptions, $sort, $categories) {
                 <?php
                 $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">
                 <span class="logo <?= $subscription['hidelogo'] ?>"><img src="<?= $subscription['logo'] ?>"></span>

diff --git a/index.php b/index.php
@@ -79,7 +79,7 @@
             $print[$id]['payment_method_name'] = $payment_methods[$paymentMethodId]['name'];
             $print[$id]['category_id'] = $subscription['category_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) {
               $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

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