Feature/make note visible

endpoints/subscription/get.php

@@ -26,6 +26,7 @@
                 $subscriptionData['category_id'] = $row['category_id'];
                 $subscriptionData['notify'] = $row['notify'];
                 $subscriptionData['url'] = $row['url'];
+                $subscriptionData['notes'] = $row['notes'];
 
                 $subscriptionJson = json_encode($subscriptionData);
                 header('Content-Type: application/json');

endpoints/subscriptions/get.php

@@ -55,6 +55,7 @@
           $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
           $print[$id]['price'] = floatval($subscription['price']);
           $print[$id]['url'] = $subscription['url'];
+          $print[$id]['notes'] = $subscription['notes'];
 
           if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
             $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

includes/i18n/en.php

@@ -44,7 +44,7 @@
     "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",

includes/list_subscriptions.php

@@ -111,6 +111,13 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n)
                 <div class="subscription-secondary">
                     <span class="name"><img src="images/siteicons/subscription.png" alt="<?= translate('subscription', $i18n) ?>" /><?= $subscription['name'] ?></span>
                     <span class="payer_user" title="<?= translate('paid_by', $i18n) ?>"><img src="images/siteicons/payment.png" alt="<?= translate('paid_by', $i18n) ?>" /><?= $members[$subscription['payer_user_id']]['name'] ?></span>
+                    <?php
+                    if (strlen($subscription['notes']) > 0) {
+                        ?>
+                        <span class="notes" title="<?= translate('notes', $i18n) ?>"><img src="images/siteicons/notepad-text.png" alt="<?= translate('notes', $i18n) ?>" /><?= $subscription['notes'] ?></span>
+                        <?php
+                    }
+                    ?>
                     <span class="category" title="<?= translate('category', $i18n) ?>" ><img src="images/siteicons/category.png" alt="<?= translate('category', $i18n) ?>" /><?= $categories[$subscription['category_id']]['name'] ?></span>
                     <?php
                         if ($subscription['url'] != "") {

index.php

@@ -88,6 +88,7 @@
             $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
             $print[$id]['price'] = floatval($subscription['price']);
             $print[$id]['url'] = $subscription['url'];
+            $print[$id]['notes'] = $subscription['notes'];
 
             if (isset($_COOKIE['convertCurrency']) && $_COOKIE['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
               $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

registration.php

@@ -132,7 +132,7 @@ function validate($value) {
                     </div>
                     <div class="form-group">
                         <label for="currency"><?= translate('main_currency', $i18n) ?>:</label>
-                        <select id="currency" name="main_currency" placeholder="Currency">
+                        <select id="currency" name="main_currency" placeholder="Currency" required>
                         <?php
                             foreach ($currencies as $currency) {
                         ?>

scripts/dashboard.js

@@ -63,8 +63,8 @@ function fillEditFormFields(subscription) {
   const payerSelect = document.querySelector("#payer_user");
   payerSelect.value = subscription.payer_user_id;
 
-  const nextPament = document.querySelector("#next_payment");
-  nextPament.value = subscription.next_payment;
+  const nextPayment = document.querySelector("#next_payment");
+  nextPayment.value = subscription.next_payment;
   const notes = document.querySelector("#notes");
   notes.value = subscription.notes;
   const url = document.querySelector("#url");
@@ -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',
     })

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: "Soll dieses Abonnement wirklich gelöscht werden?",
   // Settings
   network_response_error: "Netzwerkfehler",
   failed_add_member: "Hinzufügen von Mitglied fehlgeschlagen",

scripts/i18n/el.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: "Αποτυχία προσθήκης μέλους",

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?",
   // Settings
   network_response_error: "Network response was not ok",
   failed_add_member: "Failed to add member",

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á seguro de que desea eliminar esta suscripción?",
   // Settings
   network_response_error: "Error en la respuesta de la red",
   failed_add_member: "Error al añadir miembro",

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ètres
     network_response_error: "La réponse du réseau n'était pas correcte",
     failed_add_member: "Échec de l'ajout du membre",

scripts/i18n/jp.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: "世帯員の追加に失敗",

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 pretende apagar esta subscrição?",
     // Settings
     'network_response_error': 'Erro de resposta de rede',
     'failed_add_member': 'Falha ao adicionar membro',

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': '添加成员失败',