Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.
feat: new statistics per payment method (#124)
Miguel Ribeiro6200fa5e87d3
diff --git a/includes/i18n/de.php b/includes/i18n/de.phpindex d0f7e71..7322836 100644--- a/includes/i18n/de.php+++ b/includes/i18n/de.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Aufgeteilte Ansichten",'category_split' => "Kategorien",'household_split' => "Haushalt",+ 'payment_method_split' => "Zahlungsmethode",// About page'about_and_credits' => "Informationen und Danksagungen",'license' => "Lizenz",diff --git a/includes/i18n/el.php b/includes/i18n/el.phpindex a956ca3..f87082b 100644--- a/includes/i18n/el.php+++ b/includes/i18n/el.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Διαχωρισμένες προβολές",'category_split' => "Διαχωρισμός κατηγορίας",'household_split' => "Διαχωρισμός νοικοκυριού",+ 'payment_method_split' => "Διαχωρισμός τρόπου πληρωμής",// About page'about_and_credits' => "Σχετικά και Credits",'license' => "License",diff --git a/includes/i18n/en.php b/includes/i18n/en.phpindex 29deea1..5371fe1 100644--- a/includes/i18n/en.php+++ b/includes/i18n/en.php@@ -44,7 +44,7 @@ $i18n = ["weeks" => "weeks","months" => "months","years" => "years",- "external_url" => "Visit Externarl URL",+ "external_url" => "Visit External URL","empty_page" => "Empty Page",// Subscription form"add_subscription" => "Add subscription",@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Split Views",'category_split' => "Category Split",'household_split' => "Household Split",+ 'payment_method_split' => "Payment Method Split",// About page'about_and_credits' => "About and Credits",'license' => "License",diff --git a/includes/i18n/es.php b/includes/i18n/es.phpindex aa889d4..81630fc 100644--- a/includes/i18n/es.php+++ b/includes/i18n/es.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Vistas Divididas",'category_split' => "División por Categoría",'household_split' => "División por Hogar",+ 'payment_method_split' => "División por Método de Pago",// About page'about_and_credits' => "Acerca de y Créditos",'license' => "Licencia",diff --git a/includes/i18n/fr.php b/includes/i18n/fr.phpindex efe84aa..c237a07 100644--- a/includes/i18n/fr.php+++ b/includes/i18n/fr.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Vues partagées",'category_split' => "Répartition par catégorie",'household_split' => "Répartition du ménage",+ 'payment_method_split' => "Répartition par méthode de paiement",// Page À propos'about_and_credits' => "À propos et crédits",'license' => "Licence",diff --git a/includes/i18n/jp.php b/includes/i18n/jp.phpindex 3e68705..da1ac48 100644--- a/includes/i18n/jp.php+++ b/includes/i18n/jp.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "分割表示",'category_split' => "カテゴリ別",'household_split' => "世帯別",+ 'payment_method_split' => "支払い方法別",// About page'about_and_credits' => "概要とクレジット",'license' => "License",diff --git a/includes/i18n/pt.php b/includes/i18n/pt.phpindex c34b3e0..7297c8b 100644--- a/includes/i18n/pt.php+++ b/includes/i18n/pt.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Vistas Divididas",'category_split' => "Por Categoria",'household_split' => "Por Membro",+ 'payment_method_split' => "Por Método de Pagamento",// About page'about_and_credits' => "Sobre e Créditos",'license' => "Licença",diff --git a/includes/i18n/tr.php b/includes/i18n/tr.phpindex 018ad1d..1053b76 100644--- a/includes/i18n/tr.php+++ b/includes/i18n/tr.php@@ -78,6 +78,7 @@ $i18n = ['split_views' => "Bölünmüş Görünümler",'category_split' => "Kategori Bölümü",'household_split' => "Hane Bölümü",+ 'payment_method_split' => "Ödeme Yöntemi Bölümü",// About page'about_and_credits' => "Hakkında ve Teşekkürler",'license' => "Lisans",diff --git a/includes/i18n/zh_cn.php b/includes/i18n/zh_cn.phpindex 611a3f3..ade6f2a 100644--- a/includes/i18n/zh_cn.php+++ b/includes/i18n/zh_cn.php@@ -83,6 +83,7 @@ $i18n = ['split_views' => "拆分视图",'category_split' => "分类视图",'household_split' => "家庭视图",+ 'payment_method_split' => "支付方式视图",// 关于页面'about_and_credits' => "关于和鸣谢",diff --git a/includes/i18n/zh_tw.php b/includes/i18n/zh_tw.phpindex 3c2b79b..c17d080 100644--- a/includes/i18n/zh_tw.php+++ b/includes/i18n/zh_tw.php@@ -83,6 +83,7 @@ $i18n = ['split_views' => "分割表示",'category_split' => "類別表示",'household_split' => "家庭表示",+ 'payment_method_split' => "付款方式表示",// 關於頁面'about_and_credits' => "關於和致謝",diff --git a/scripts/dashboard.js b/scripts/dashboard.jsindex d56626f..cf08b08 100644--- a/scripts/dashboard.js+++ b/scripts/dashboard.js@@ -145,7 +145,7 @@ function handleFileSelect(event) {}function deleteSubscription(id) {- if (confirm("Are you sure you want to delete this subscription?")) {+ if (confirm(translate('confirm_delete_subscription'))) {fetch(`endpoints/subscription/delete.php?id=${id}`, {method: 'DELETE',})diff --git a/scripts/i18n/de.js b/scripts/i18n/de.jsindex c696605..e9616f7 100644--- a/scripts/i18n/de.js+++ b/scripts/i18n/de.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Fehler beim Laden des Abonnements",edit_subscription: "Abonnement bearbeiten",add_subscription: "Abonnement hinzufügen",+ confirm_delete_subscription: "Sind Sie sicher, dass Sie dieses Abonnement löschen möchten?",// Settingsnetwork_response_error: "Netzwerkfehler",failed_add_member: "Hinzufügen von Mitglied fehlgeschlagen",diff --git a/scripts/i18n/el.js b/scripts/i18n/el.jsindex 1a7461d..b6e1196 100644--- a/scripts/i18n/el.js+++ b/scripts/i18n/el.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Απέτυχε η φόρτωση της συνδρομής",edit_subscription: "Επεξεργασία συνδρομής",add_subscription: "Προσθήκη συνδρομής",+ confirm_delete_subscription: "Είστε σίγουρος ότι θέλετε να διαγράψετε αυτή τη συνδρομή;",// Settingsnetwork_response_error: "Η ανταπόκριση του δικτύου δεν ήταν εντάξει",failed_add_member: "Αποτυχία προσθήκης μέλους",diff --git a/scripts/i18n/en.js b/scripts/i18n/en.jsindex aac61c9..d84bdfb 100644--- a/scripts/i18n/en.js+++ b/scripts/i18n/en.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Failed to load subscription",edit_subscription: "Edit subscription",add_subscription: "Add subscription",+ confirm_delete_subscription: "Are you sure you want to delete this subscription?",// Settingsnetwork_response_error: "Network response was not ok",failed_add_member: "Failed to add member",diff --git a/scripts/i18n/es.js b/scripts/i18n/es.jsindex a2eb639..d1dc3e3 100644--- a/scripts/i18n/es.js+++ b/scripts/i18n/es.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Error al cargar la suscripción",edit_subscription: "Editar suscripción",add_subscription: "Añadir suscripción",+ confirm_delete_subscription: "¿Estás seguro de que quieres eliminar esta suscripción?",// Settingsnetwork_response_error: "Error en la respuesta de la red",failed_add_member: "Error al añadir miembro",diff --git a/scripts/i18n/fr.js b/scripts/i18n/fr.jsindex cadc6ce..fb1406c 100644--- a/scripts/i18n/fr.js+++ b/scripts/i18n/fr.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Impossible de charger l'abonnement",edit_subscription: "Modifier l'abonnement",add_subscription: "Ajouter un abonnement",+ confirm_delete_subscription: "Êtes-vous sûr de vouloir supprimer cet abonnement ?",// Paramètresnetwork_response_error: "La réponse du réseau n'était pas correcte",failed_add_member: "Échec de l'ajout du membre",diff --git a/scripts/i18n/jp.js b/scripts/i18n/jp.jsindex 47fae72..bb0d14d 100644--- a/scripts/i18n/jp.js+++ b/scripts/i18n/jp.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "定期購入の読み込みに失敗しました",edit_subscription: "定期購入の編集",add_subscription: "定期購入の追加",+ confirm_delete_subscription: "この定期購入を削除してもよろしいですか?",// Settingsnetwork_response_error: "ネットワークの応答異常",failed_add_member: "世帯員の追加に失敗",diff --git a/scripts/i18n/pt.js b/scripts/i18n/pt.jsindex 4e4f337..ca2ae51 100644--- a/scripts/i18n/pt.js+++ b/scripts/i18n/pt.js@@ -7,6 +7,7 @@ let i18n = {'failed_to_load_subscription': 'Falha ao carregar a subscrição','edit_subscription': 'Editar subscrição','add_subscription': 'Adicionar subscrição',+ 'confirm_delete_subscription': 'Tem a certeza de que deseja eliminar esta subscrição?',// Settings'network_response_error': 'Erro de resposta de rede','failed_add_member': 'Falha ao adicionar membro',diff --git a/scripts/i18n/tr.js b/scripts/i18n/tr.jsindex 7fd8042..98140c2 100644--- a/scripts/i18n/tr.js+++ b/scripts/i18n/tr.js@@ -7,6 +7,7 @@ let i18n = {failed_to_load_subscription: "Abonelik yüklenemedi",edit_subscription: "Aboneliği Düzenle",add_subscription: "Abonelik Ekle",+ confirm_delete_subscription: "Bu aboneliği silmek istediğinizden emin misiniz?",// Ayarlarnetwork_response_error: "Ağ yanıtı kabul edilmedi",failed_add_member: "Üye eklenemedi",diff --git a/scripts/i18n/zh_cn.js b/scripts/i18n/zh_cn.jsindex 9658d5c..b0bdcea 100644--- a/scripts/i18n/zh_cn.js+++ b/scripts/i18n/zh_cn.js@@ -7,6 +7,7 @@ let i18n = {'failed_to_load_subscription': "加载订阅失败",'edit_subscription': "编辑订阅",'add_subscription': "添加订阅",+ 'confirm_delete_subscription': "您确定要删除此订阅吗?",// Settings'network_response_error': "网络响应不正常",'failed_add_member': '添加成员失败',diff --git a/scripts/i18n/zh_tw.js b/scripts/i18n/zh_tw.jsindex ed8488e..aae6724 100644--- a/scripts/i18n/zh_tw.js+++ b/scripts/i18n/zh_tw.js@@ -7,6 +7,7 @@ let i18n = {'failed_to_load_subscription': "讀取訂閱失敗",'edit_subscription': "編輯訂閱",'add_subscription': "新增訂閱",+ 'confirm_delete_subscription': "您確定要刪除此訂閱嗎?",// Settings'network_response_error': "網路無回應",'failed_add_member': '新增成員失敗',diff --git a/scripts/stats.js b/scripts/stats.jsindex 98bbc62..d67db30 100644--- a/scripts/stats.js+++ b/scripts/stats.js@@ -8,7 +8,13 @@ function loadGraph(container, dataPoints, currency, run) {datasets: [{data: dataPoints.map(point => point.y),}],- labels: dataPoints.map(point => `${point.label} (${new Intl.NumberFormat(navigator.language, { style: 'currency', currency }).format(point.y)})`),+ labels: dataPoints.map(point => {+ if (currency) {+ return `${point.label} (${new Intl.NumberFormat(navigator.language, { style: 'currency', currency }).format(point.y)})`;+ } else {+ return `${point.label} (${new Intl.NumberFormat(navigator.language).format(point.y)})`;+ }+ }),},options: {animation: {diff --git a/stats.php b/stats.phpindex 7ab1262..2c6f67a 100644--- a/stats.php+++ b/stats.php@@ -60,6 +60,17 @@ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {$categoryCost[$categoryId]['name'] = $row['name'];}+// Get payment methods+$categories = array();+$query = "SELECT * FROM payment_methods WHERE enabled = 1";+$result = $db->query($query);+while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $paymentMethodId = $row['id'];+ $paymentMethodCount[$paymentMethodId] = $row;+ $paymentMethodCount[$paymentMethodId]['count'] = 0;+ $paymentMethodCount[$paymentMethodId]['name'] = $row['name'];+}+// Get code of main currency to display on statistics$query = "SELECT c.codeFROM currencies c@@ -84,7 +95,7 @@ $mostExpensiveSubscription = 0;$amountDueThisMonth = 0;$totalCostPerMonth = 0;-$query = "SELECT name, price, frequency, cycle, currency_id, next_payment, payer_user_id, category_id FROM subscriptions";+$query = "SELECT name, price, frequency, cycle, currency_id, next_payment, payer_user_id, category_id, payment_method_id FROM subscriptions";$result = $db->query($query);if ($result) {while ($row = $result->fetchArray(SQLITE3_ASSOC)) {@@ -100,11 +111,13 @@ if ($result) {$next_payment = $subscription['next_payment'];$payerId = $subscription['payer_user_id'];$categoryId = $subscription['category_id'];+ $paymentMethodId = $subscription['payment_method_id'];$originalSubscriptionPrice = getPriceConverted($price, $currency, $db);$price = getPricePerMonth($cycle, $frequency, $originalSubscriptionPrice);$totalCostPerMonth += $price;$memberCost[$payerId]['cost'] += $price;$categoryCost[$categoryId]['cost'] += $price;+ $paymentMethodCount[$paymentMethodId]['count'] += 1;if ($price > $mostExpensiveSubscription) {$mostExpensiveSubscription = $price;}@@ -207,6 +220,18 @@ if ($result) {$showMemberCostGraph = count($memberDataPoints) > 1;+ $paymentMethodDataPoints = [];+ foreach ($paymentMethodCount as $paymentMethod) {+ if ($paymentMethod['count'] != 0) {+ $paymentMethodDataPoints[] = [+ "label" => $paymentMethod['name'],+ "y" => $paymentMethod["count"],+ ];+ }+ }++ $showPaymentMethodCountGraph = count($paymentMethodDataPoints) > 1;+if ($showMemberCostGraph) {?><section class="graph">@@ -231,6 +256,17 @@ if ($result) {<?php}+ if ($showPaymentMethodCountGraph) {+ ?>+ <section class="graph">+ <header>+ <?= translate('payment_method_split', $i18n) ?>+ </header>+ <canvas id="paymentMethidSplitChart" style="height: 370px; width: 100%;"></canvas>+ </section>+ <?php+ }+?></div></section>@@ -242,6 +278,7 @@ if ($result) {window.onload = function() {loadGraph("categorySplitChart", <?php echo json_encode($categoryDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showCategoryCostGraph ?>);loadGraph("memberSplitChart", <?php echo json_encode($memberDataPoints, JSON_NUMERIC_CHECK); ?>, "<?= $code ?>", <?= $showMemberCostGraph ?>);+ loadGraph("paymentMethidSplitChart", <?php echo json_encode($paymentMethodDataPoints, JSON_NUMERIC_CHECK); ?>, "", <?= $showPaymentMethodCountGraph ?>);}</script><?php