diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php index 84c2a92..605866c 100644 --- 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 index bdeb423..a4b4e34 100644 --- a/includes/list_subscriptions.php +++ b/includes/list_subscriptions.php @@ -50,11 +50,11 @@ 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; @@ -62,6 +62,7 @@ } $currentCategory = 0; + $currentPayerUserId = 0; foreach ($subscriptions as $subscription) { if ($sort == "category_id" && $subscription['category_id'] != $currentCategory) { ?> @@ -71,6 +72,14 @@ +