Wallos: Open-source, self-hostable personal subscription tracker. Visualize your recurring expenses, manage your budget, and save money.
fix: show email field on adding household member
Miguel Ribeiroec25d4bc5a35
diff --git a/includes/version.php b/includes/version.phpindex da7e6a3..01bc67c 100644--- a/includes/version.php+++ b/includes/version.php@@ -1,3 +1,3 @@<?php- $version = "v1.9.0";+ $version = "v1.9.1";?>\ No newline at end of filediff --git a/index.php b/index.phpindex 766a05b..a1420f8 100644--- a/index.php+++ b/index.php@@ -195,6 +195,17 @@</div></div>+ <?php+ if ($notificationsEnabled) {+ ?>+ <div class="form-group-inline">+ <input type="checkbox" id="notifications" name="notifications">+ <label for="notifications"><?= translate('enable_notifications', $i18n) ?></label>+ </div>+ <?php+ }+ ?>+<div class="form-group"><label for="payment_method"><?= translate('payment_method', $i18n) ?></label><select id="payment_method" name="payment_method_id">@@ -252,17 +263,6 @@<label for="inactive"><?= translate('inactive', $i18n) ?></label></div>- <?php- if ($notificationsEnabled) {- ?>- <div class="form-group-inline">- <input type="checkbox" id="notifications" name="notifications">- <label for="notifications"><?= translate('enable_notifications', $i18n) ?></label>- </div>- <?php- }- ?>-<div class="buttons"><input type="button" value="<?= translate('delete', $i18n) ?>" class="warning-button left" id="deletesub" style="display: none"><input type="button" value="<?= translate('cancel', $i18n) ?>" class="secondary-button" onClick="closeAddSubscription()">diff --git a/scripts/i18n/de.js b/scripts/i18n/de.jsindex e9616f7..22eeeb7 100644--- a/scripts/i18n/de.js+++ b/scripts/i18n/de.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "Netzwerkfehler",failed_add_member: "Hinzufügen von Mitglied fehlgeschlagen",member: "Mitglied",+ email: "E-Mail",save_member: "Mitglied speichern",delete_member: "Mitglied löschen",failed_remove_member: "Mitglied konnte nicht gelöscht werden",diff --git a/scripts/i18n/el.js b/scripts/i18n/el.jsindex b6e1196..5b89763 100644--- a/scripts/i18n/el.js+++ b/scripts/i18n/el.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "Η ανταπόκριση του δικτύου δεν ήταν εντάξει",failed_add_member: "Αποτυχία προσθήκης μέλους",member: "Μέλος",+ email: "Email",save_member: "Αποθήκευση μέλους",delete_member: "Διαγραφή μέλους",failed_remove_member: "Αποτυχία διαγραφής μέλους",diff --git a/scripts/i18n/en.js b/scripts/i18n/en.jsindex d84bdfb..605ce41 100644--- a/scripts/i18n/en.js+++ b/scripts/i18n/en.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "Network response was not ok",failed_add_member: "Failed to add member",member: "Member",+ email: "Email",save_member: "Save member",delete_member: "Delete member",failed_remove_member: "Failed to remove member",diff --git a/scripts/i18n/es.js b/scripts/i18n/es.jsindex d1dc3e3..bf702d8 100644--- a/scripts/i18n/es.js+++ b/scripts/i18n/es.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "Error en la respuesta de la red",failed_add_member: "Error al añadir miembro",member: "Miembro",+ email: "Correo electrónico",save_member: "Guardar miembro",delete_member: "Eliminar miembro",failed_remove_member: "Error al eliminar miembro",diff --git a/scripts/i18n/fr.js b/scripts/i18n/fr.jsindex fb1406c..d490540 100644--- a/scripts/i18n/fr.js+++ b/scripts/i18n/fr.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "La réponse du réseau n'était pas correcte",failed_add_member: "Échec de l'ajout du membre",member: "Membre",+ email: "Courriel",save_member: "Enregistrer le membre",delete_member: "Supprimer le membre",failed_remove_member: "Échec de la suppression du membre",diff --git a/scripts/i18n/jp.js b/scripts/i18n/jp.jsindex bb0d14d..db4dcb9 100644--- a/scripts/i18n/jp.js+++ b/scripts/i18n/jp.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "ネットワークの応答異常",failed_add_member: "世帯員の追加に失敗",member: "世帯員",+ email: "メール",save_member: "世帯員の保存",delete_member: "世帯員の削除",failed_remove_member: "世帯員の削除に失敗",diff --git a/scripts/i18n/pt.js b/scripts/i18n/pt.jsindex ca2ae51..e321502 100644--- a/scripts/i18n/pt.js+++ b/scripts/i18n/pt.js@@ -12,6 +12,7 @@ let i18n = {'network_response_error': 'Erro de resposta de rede','failed_add_member': 'Falha ao adicionar membro','member': 'Membro',+ 'email': 'Email','save_member': 'Guardar membro','delete_member': 'Remover membro','failed_remove_member': 'Erro ao remover membro',diff --git a/scripts/i18n/tr.js b/scripts/i18n/tr.jsindex 98140c2..a6afed8 100644--- a/scripts/i18n/tr.js+++ b/scripts/i18n/tr.js@@ -12,6 +12,7 @@ let i18n = {network_response_error: "Ağ yanıtı kabul edilmedi",failed_add_member: "Üye eklenemedi",member: "Üye",+ email: "E-posta",save_member: "Üyeyi Kaydet",delete_member: "Üyeyi Sil",failed_remove_member: "Üye silinmedi",diff --git a/scripts/i18n/zh_cn.js b/scripts/i18n/zh_cn.jsindex b0bdcea..853a9c5 100644--- a/scripts/i18n/zh_cn.js+++ b/scripts/i18n/zh_cn.js@@ -12,6 +12,7 @@ let i18n = {'network_response_error': "网络响应不正常",'failed_add_member': '添加成员失败','member': '成员',+ 'email': '电子邮箱','save_member': '保存成员','delete_member': '删除成员','failed_remove_member': '移除成员失败',diff --git a/scripts/i18n/zh_tw.js b/scripts/i18n/zh_tw.jsindex aae6724..8333b9f 100644--- a/scripts/i18n/zh_tw.js+++ b/scripts/i18n/zh_tw.js@@ -12,6 +12,7 @@ let i18n = {'network_response_error': "網路無回應",'failed_add_member': '新增成員失敗','member': '成員',+ 'email': '電子信箱','save_member': '保存成員','delete_member': '刪除成員','failed_remove_member': '移除成員失敗',diff --git a/scripts/settings.js b/scripts/settings.jsindex 1708f51..d33cd46 100644--- a/scripts/settings.js+++ b/scripts/settings.js@@ -43,6 +43,12 @@ function addMemberButton(memberId) {input.name = "member";input.value = translate('member');+ let emailInput = document.createElement("input");+ emailInput.type = "text";+ emailInput.placeholder = translate('email');+ emailInput.name = "email";+ emailInput.value = "";+let editLink = document.createElement("button");editLink.className = "image-button medium"editLink.name = "save";@@ -70,6 +76,7 @@ function addMemberButton(memberId) {deleteLink.appendChild(deleteImage);div.appendChild(input);+ div.appendChild(emailInput);div.appendChild(editLink);div.appendChild(deleteLink);diff --git a/settings.php b/settings.phpindex 44bea3a..4d03bb4 100644--- a/settings.php+++ b/settings.php@@ -298,18 +298,6 @@</div></section>- <?php- $sql = "SELECT * FROM payment_methods";- $result = $db->query($sql);-- if ($result) {- $payments = array();- while ($row = $result->fetchArray(SQLITE3_ASSOC)) {- $payments[] = $row;- }- }- ?>-<?php$sql = "SELECT * FROM currencies";$result = $db->query($sql);@@ -470,7 +458,57 @@<input type="submit" value="<?= translate('save', $i18n) ?>" id="addFixerKey" onClick="addFixerKeyButton()"/></div></div>- </section>+ </section>++ <?php+ $sql = "SELECT * FROM payment_methods";+ $result = $db->query($sql);++ if ($result) {+ $payments = array();+ while ($row = $result->fetchArray(SQLITE3_ASSOC)) {+ $payments[] = $row;+ }+ }+ ?>++ <section class="account-section">+ <header>+ <h2><?= translate('payment_methods', $i18n) ?></h2>+ </header>+ <div class="payments-list">+ <?php+ $paymentsInUseQuery = $db->query('SELECT id FROM payment_methods WHERE id IN (SELECT DISTINCT payment_method_id FROM subscriptions)');+ $paymentsInUse = [];+ while ($row = $paymentsInUseQuery->fetchArray(SQLITE3_ASSOC)) {+ $paymentsInUse[] = $row['id'];+ }++ foreach ($payments as $payment) {+ $inUse = in_array($payment['id'], $paymentsInUse);+ ?>+ <div class="payments-payment"+ data-enabled="<?= $payment['enabled']; ?>"+ data-in-use="<?= $inUse ? 'yes' : 'no' ?>"+ data-paymentid="<?= $payment['id'] ?>"+ title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>"+ onClick="togglePayment(<?= $payment['id'] ?>)">+ <img src="images/uploads/icons/<?= $payment['icon'] ?>" alt="Logo" />+ <span class="payment-name">+ <?= $payment['name'] ?>+ </span>+ </div>+ <?php+ }+ ?>+ </div>+ <div class="settings-notes">+ <p>+ <i class="fa-solid fa-circle-info"></i>+ <?= translate('payment_methods_info', $i18n) ?>+ </p>+ </div>+ </section><section class="account-section"><header>@@ -513,44 +551,6 @@<?= translate('experimental_info', $i18n) ?></p></div>- </section>-- <section class="account-section">- <header>- <h2><?= translate('payment_methods', $i18n) ?></h2>- </header>- <div class="payments-list">- <?php- $paymentsInUseQuery = $db->query('SELECT id FROM payment_methods WHERE id IN (SELECT DISTINCT payment_method_id FROM subscriptions)');- $paymentsInUse = [];- while ($row = $paymentsInUseQuery->fetchArray(SQLITE3_ASSOC)) {- $paymentsInUse[] = $row['id'];- }-- foreach ($payments as $payment) {- $inUse = in_array($payment['id'], $paymentsInUse);- ?>- <div class="payments-payment"- data-enabled="<?= $payment['enabled']; ?>"- data-in-use="<?= $inUse ? 'yes' : 'no' ?>"- data-paymentid="<?= $payment['id'] ?>"- title="<?= $inUse ? translate('cant_delete_payment_method_in_use', $i18n) : ($payment['enabled'] ? translate('disable', $i18n) : translate('enable', $i18n)) ?>"- onClick="togglePayment(<?= $payment['id'] ?>)">- <img src="images/uploads/icons/<?= $payment['icon'] ?>" alt="Logo" />- <span class="payment-name">- <?= $payment['name'] ?>- </span>- </div>- <?php- }- ?>- </div>- <div class="settings-notes">- <p>- <i class="fa-solid fa-circle-info"></i>- <?= translate('payment_methods_info', $i18n) ?>- </p>- </div></section><section class="account-section">