feat: add cancelation reminders (#425)

ellite · Jul 5, 2024 · c393146 · c393146
1 parent 911de4c
commit c393146
Show file tree

Hide file tree

Showing 32 changed files with 600 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ See instructions to run Wallos below.
 ```bash
 0 1 * * * php /var/www/html/endpoints/cronjobs/updatenextpayment.php >> /var/log/cron/updatenextpayment.log 2>&1
 0 2 * * * php /var/www/html/endpoints/cronjobs/updateexchange.php >> /var/log/cron/updateexchange.log 2>&1
+0 8 * * * php /var/www/html/endpoints/cronjobs/sendcancellationnotifications.php >> /var/log/cron/sendcancellationnotifications.log 2>&1
 0 9 * * * php /var/www/html/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1
 */2 * * * * php /var/www/html/endpoints/cronjobs/sendverificationemails.php >> /var/log/cron/sendverificationemail.log 2>&1
 */2 * * * * php /var/www/html/endpoints/cronjobs/sendresetpasswordemails.php >> /var/log/cron/sendresetpasswordemails.log 2>&1
@@ -138,6 +139,8 @@ If you want to trigger an Update of the exchange rates, change your main currenc
 
 ![Screenshot](screenshots/wallos-stats.png)
 
+![Screenshot](screenshots/wallos-calendar.png)
+
 ![Screenshot](screenshots/wallos-form.png)
 
 ![Screenshot](screenshots/wallos-dashboard-mobile-light.png) ![Screenshot](screenshots/wallos-dashboard-mobile-dark.png)

diff --git a/cronjobs b/cronjobs
@@ -1,6 +1,7 @@
 # Run the scripts every day
 0 1 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/updatenextpayment.php >> /var/log/cron/updatenextpayment.log 2>&1
 0 2 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/updateexchange.php >> /var/log/cron/updateexchange.log 2>&1
+0 8 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendcancellationnotifications.php >> /var/log/cron/sendcancellationnotifications.log 2>&1
 0 9 * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1
 */2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendverificationemails.php >> /var/log/cron/sendverificationemails.log 2>&1
 */2 * * * * /usr/local/bin/php /var/www/html/endpoints/cronjobs/sendresetpasswordemails.php >> /var/log/cron/sendresetpasswordemails.log 2>&1
diff --git a/endpoints/cronjobs/sendcancellationnotifications.php b/endpoints/cronjobs/sendcancellationnotifications.php
diff --git a/endpoints/cronjobs/sendnotifications.php b/endpoints/cronjobs/sendnotifications.php
@@ -105,7 +105,7 @@
         $pushover['token'] = $row["token"];
     }
 
-    // Check if Nrfy notifications are enabled and get the settings
+    // Check if Ntfy notifications are enabled and get the settings
     $query = "SELECT * FROM ntfy_notifications WHERE user_id = :userId";
     $stmt = $db->prepare($query);
     $stmt->bindValue(':userId', $userId, SQLITE3_INTEGER);

diff --git a/endpoints/subscription/add.php b/endpoints/subscription/add.php
@@ -172,6 +172,7 @@ function resizeAndUploadLogo($uploadedFile, $uploadDir, $name, $settings)
         $notify = isset($_POST['notifications']) ? true : false;
         $notifyDaysBefore = $_POST['notify_days_before'];
         $inactive = isset($_POST['inactive']) ? true : false;
+        $cancellationDate = $_POST['cancellation_date'] ?? null;
 
         if ($logoUrl !== "") {
             $logo = getLogoFromUrl($logoUrl, '../../images/uploads/logos/', $name, $settings, $i18n);
@@ -188,21 +189,21 @@ function resizeAndUploadLogo($uploadedFile, $uploadDir, $name, $settings)
 
         if (!$isEdit) {
             $sql = "INSERT INTO subscriptions (name, logo, price, currency_id, next_payment, cycle, frequency, notes, 
-                        payment_method_id, payer_user_id, category_id, notify, inactive, url, notify_days_before, user_id) 
+                        payment_method_id, payer_user_id, category_id, notify, inactive, url, notify_days_before, user_id, cancellation_date) 
                         VALUES (:name, :logo, :price, :currencyId, :nextPayment, :cycle, :frequency, :notes, 
-                        :paymentMethodId, :payerUserId, :categoryId, :notify, :inactive, :url, :notifyDaysBefore, :userId)";
+                        :paymentMethodId, :payerUserId, :categoryId, :notify, :inactive, :url, :notifyDaysBefore, :userId, :cancellationDate)";
         } else {
             $id = $_POST['id'];
             if ($logo != "") {
                 $sql = "UPDATE subscriptions SET name = :name, logo = :logo, price = :price, currency_id = :currencyId,
                      next_payment = :nextPayment, cycle = :cycle, frequency = :frequency, notes = :notes, payment_method_id = :paymentMethodId,
                      payer_user_id = :payerUserId, category_id = :categoryId, notify = :notify, inactive = :inactive, 
-                     url = :url, notify_days_before = :notifyDaysBefore WHERE id = :id AND user_id = :userId";
+                     url = :url, notify_days_before = :notifyDaysBefore, camcelation_date = :cancellationDate WHERE id = :id AND user_id = :userId";
             } else {
                 $sql = "UPDATE subscriptions SET name = :name, price = :price, currency_id = :currencyId, next_payment = :nextPayment,
                     cycle = :cycle, frequency = :frequency, notes = :notes, payment_method_id = :paymentMethodId, payer_user_id = :payerUserId,
-                    category_id = :categoryId, notify = :notify, inactive = :inactive, url = :url,notify_days_before = :notifyDaysBefore
-                     WHERE id = :id AND user_id = :userId";
+                    category_id = :categoryId, notify = :notify, inactive = :inactive, url = :url, notify_days_before = :notifyDaysBefore, 
+                    cancellation_date = :cancellationDate WHERE id = :id AND user_id = :userId";
             }
         }
 
@@ -228,6 +229,7 @@ function resizeAndUploadLogo($uploadedFile, $uploadDir, $name, $settings)
         $stmt->bindParam(':url', $url, SQLITE3_TEXT);
         $stmt->bindParam(':notifyDaysBefore', $notifyDaysBefore, SQLITE3_INTEGER);
         $stmt->bindParam(':userId', $userId, SQLITE3_INTEGER);
+        $stmt->bindParam(':cancellationDate', $cancellationDate, SQLITE3_TEXT);
 
         if ($stmt->execute()) {
             $success['status'] = "Success";

diff --git a/endpoints/subscription/clone.php b/endpoints/subscription/clone.php
@@ -17,7 +17,7 @@
                 ]));
             }
 
-            $query = "INSERT INTO subscriptions (name, logo, price, currency_id, next_payment, cycle, frequency, notes, payment_method_id, payer_user_id, category_id, notify, url, inactive, notify_days_before, user_id) VALUES (:name, :logo, :price, :currency_id, :next_payment, :cycle, :frequency, :notes, :payment_method_id, :payer_user_id, :category_id, :notify, :url, :inactive, :notify_days_before, :user_id)";
+            $query = "INSERT INTO subscriptions (name, logo, price, currency_id, next_payment, cycle, frequency, notes, payment_method_id, payer_user_id, category_id, notify, url, inactive, notify_days_before, user_id, cancellation_date) VALUES (:name, :logo, :price, :currency_id, :next_payment, :cycle, :frequency, :notes, :payment_method_id, :payer_user_id, :category_id, :notify, :url, :inactive, :notify_days_before, :user_id, :cancellation_date)";
             $cloneStmt = $db->prepare($query);
             $cloneStmt->bindValue(':name', $subscriptionToClone['name'], SQLITE3_TEXT);
             $cloneStmt->bindValue(':logo', $subscriptionToClone['logo'], SQLITE3_TEXT);
@@ -35,6 +35,7 @@
             $cloneStmt->bindValue(':inactive', $subscriptionToClone['inactive'], SQLITE3_INTEGER);
             $cloneStmt->bindValue(':notify_days_before', $subscriptionToClone['notify_days_before'], SQLITE3_INTEGER);
             $cloneStmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);
+            $cloneStmt->bindValue(':cancellation_date', $subscriptionToClone['cancellation_date'], SQLITE3_TEXT);
 
             if ($cloneStmt->execute()) {
                 $response = [

diff --git a/endpoints/subscription/get.php b/endpoints/subscription/get.php
@@ -29,6 +29,7 @@
             $subscriptionData['inactive'] = $row['inactive'];
             $subscriptionData['url'] = htmlspecialchars_decode($row['url'] ?? "");
             $subscriptionData['notify_days_before'] = $row['notify_days_before'];
+            $subscriptionData['cancellation_date'] = $row['cancellation_date'];
 
             $subscriptionJson = json_encode($subscriptionData);
             header('Content-Type: application/json');

diff --git a/includes/i18n/de.php b/includes/i18n/de.php
@@ -83,6 +83,7 @@
     "notes" => "Notizen",
     "enable_notifications" => "Benachrichtigungen für dieses Abonnement aktivieren",
     "default_value_from_settings" => "Standardwert aus den Einstellungen",
+    "cancellation_notification" => "Benachrichtigung bei Kündigung",
     "delete" => "Löschen",
     "cancel" => "Abbrechen",
     "upload_logo" => "Logo hochladen",

diff --git a/includes/i18n/el.php b/includes/i18n/el.php
@@ -83,6 +83,7 @@
     "notes" => "Σημειώσεις",
     "enable_notifications" => "Ενεργοποίηση ειδοποιήσεων για αυτή τη συνδρομή",
     "default_value_from_settings" => "Προεπιλεγμένη τιμή από τις ρυθμίσεις",
+    "cancellation_notification" => "Ειδοποίηση ακύρωσης",
     "delete" => "Διαγραφή",
     "cancel" => "Ακύρωση",
     "upload_logo" => "Φόρτωση λογότυπου",

diff --git a/includes/i18n/en.php b/includes/i18n/en.php
@@ -83,6 +83,7 @@
     "notes" => "Notes",
     "enable_notifications" => "Enable Notifications for this subscription",
     "default_value_from_settings" => "Default value from settings",
+    "cancellation_notification" => "cancellation Notification",
     "delete" => "Delete",
     "cancel" => "Cancel",
     "upload_logo" => "Upload Logo",

diff --git a/includes/i18n/es.php b/includes/i18n/es.php
@@ -83,6 +83,7 @@
     "notes" => "Notas",
     "enable_notifications" => "Habilitar notificaciones para esta suscripción",
     "default_value_from_settings" => "Valor predeterminado de la configuración",
+    "cancellation_notification" => "Notificación de cancelación",
     "delete" => "Eliminar",
     "cancel" => "Cancelar",
     "upload_logo" => "Cargar Logotipo",

diff --git a/includes/i18n/fr.php b/includes/i18n/fr.php
@@ -83,6 +83,7 @@
     "notes" => "Notes",
     "enable_notifications" => "Activer les notifications pour cet abonnement",
     "default_value_from_settings" => "Valeur par défaut des paramètres",
+    "cancellation_notification" => "Notification d'annulation",
     "delete" => "Supprimer",
     "cancel" => "Annuler",
     "upload_logo" => "Télécharger le logo",

diff --git a/includes/i18n/it.php b/includes/i18n/it.php
@@ -88,6 +88,7 @@
     'notes' => 'Note',
     'enable_notifications' => 'Abilita notifiche per questo abbonamento',
     'default_value_from_settings' => 'Valore predefinito dalle impostazioni',
+    "cancellation_notification" => "Notifica di cancellazione",
     'delete' => 'Cancella',
     'cancel' => 'Annulla',
     'upload_logo' => 'Carica logo',

diff --git a/includes/i18n/jp.php b/includes/i18n/jp.php
@@ -83,6 +83,7 @@
     "notes" => "注釈",
     "enable_notifications" => "この定期購入の通知を有効にする",
     "default_value_from_settings" => "設定からデフォルト値を使用",
+    "cancellation_notification" => "キャンセル通知",
     "delete" => "削除",
     "cancel" => "キャンセル",
     "upload_logo" => "ロゴのアップロード",

diff --git a/includes/i18n/ko.php b/includes/i18n/ko.php
@@ -83,6 +83,7 @@
     "notes" => "메모",
     "enable_notifications" => "이 구독에 대한 알림을 활성화합니다.",
     "default_value_from_settings" => "설정에서 기본값 사용",
+    "cancellation_notification" => "구독 취소 알림",
     "delete" => "삭제",
     "cancel" => "취소",
     "upload_logo" => "로고 업로드",

diff --git a/includes/i18n/pl.php b/includes/i18n/pl.php
@@ -83,6 +83,7 @@
     "notes" => "Notatki",
     "enable_notifications" => "Włącz powiadomienia dla tej subskrypcji",
     "default_value_from_settings" => "Wartość domyślna z ustawień",
+    "cancellation_notification" => "Powiadomienie o anulowaniu",
     "delete" => "Usuń",
     "cancel" => "Anuluj",
     "upload_logo" => "Prześlij logo",

diff --git a/includes/i18n/pt.php b/includes/i18n/pt.php
@@ -83,6 +83,7 @@
     "notes" => "Notas",
     "enable_notifications" => "Activar notificações para esta subscrição",
     "default_value_from_settings" => "Valor por defeito das definições",
+    "cancellation_notification" => "Notificação de cancelamento",
     "delete" => "Remover",
     "cancel" => "Cancelar",
     "upload_logo" => "Enviar Logo",

diff --git a/includes/i18n/pt_br.php b/includes/i18n/pt_br.php
@@ -83,6 +83,7 @@
     "notes" => "Anotações",
     "enable_notifications" => "Ativar notificações para essa assinatura",
     "default_value_from_settings" => "Valor padrão das configurações",
+    "cancellation_notification" => "Notificação de cancelamento",
     "delete" => "Excluir",
     "cancel" => "Cancelar",
     "upload_logo" => "Enviar Logo",

diff --git a/includes/i18n/ru.php b/includes/i18n/ru.php
@@ -83,6 +83,7 @@
     "notes" => "Примечания",
     "enable_notifications" => "Включить уведомления для этой подписки",
     "default_value_from_settings" => "Значение по умолчанию из настроек",
+    "cancellation_notification" => "Уведомление об отмене",
     "delete" => "Удалить",
     "cancel" => "Отмена",
     "upload_logo" => "Загрузить логотип",

diff --git a/includes/i18n/sl.php b/includes/i18n/sl.php
@@ -83,6 +83,7 @@
     "notes" => "Opombe",
     "enable_notifications" => "Omogoči obvestila za to naročnino",
     "default_value_from_settings" => "Privzeta vrednost iz nastavitev",
+    "cancellation_notification" => "Obvestilo o preklicu",
     "delete" => "Izbriši",
     "cancel" => "Prekliči",
     "upload_logo" => "Naloži logotip",

diff --git a/includes/i18n/sr.php b/includes/i18n/sr.php
@@ -82,6 +82,8 @@
     "url" => "URL",
     "notes" => "Напомене",
     "enable_notifications" => "Омогући обавештења за ову претплату",
+    "default_value_from_settings" => "Подразумевана вредност из подешавања",
+    "cancellation_notification" => "Обавештење о отказивању",
     "delete" => "Обриши",
     "cancel" => "Откажи",
     "upload_logo" => "Постави логотип",

diff --git a/includes/i18n/sr_lat.php b/includes/i18n/sr_lat.php
@@ -83,6 +83,7 @@
     "notes" => "Beleške",
     "enable_notifications" => "Omogući obaveštenja za ovu pretplatu",
     "default_value_from_settings" => "Podrazumevana vrednost iz podešavanja",
+    "cancellation_notification" => "Obaveštenje o otkazivanju",
     "delete" => "Izbriši",
     "cancel" => "Otkaži",
     "upload_logo" => "Učitaj logo",

diff --git a/includes/i18n/tr.php b/includes/i18n/tr.php
@@ -83,6 +83,7 @@
     "notes" => "Notlar",
     "enable_notifications" => "Bu abonelik için bildirimleri etkinleştir",
     "default_value_from_settings" => "Ayarlar'dan varsayılan değeri al",
+    "cancellation_notification" => "İptal Bildirimi",
     "delete" => "Sil",
     "cancel" => "İptal",
     "upload_logo" => "Logo Yükle",

diff --git a/includes/i18n/zh_cn.php b/includes/i18n/zh_cn.php
@@ -88,6 +88,7 @@
     "notes" => "备注",
     "enable_notifications" => "为此订阅启用通知",
     "default_value_from_settings" => "默认值从设置中获取",
+    "cancellation_notification" => "取消通知",
     "delete" => "删除",
     "cancel" => "取消",
     "upload_logo" => "上传 Logo",

diff --git a/includes/i18n/zh_tw.php b/includes/i18n/zh_tw.php
@@ -83,6 +83,7 @@
     "notes" => "備註",
     "enable_notifications" => "為該訂閱開啟通知",
     "default_value_from_settings" => "從設定中取得預設值",
+    "cancellation_notification" => "取消通知",
     "delete" => "刪除",
     "cancel" => "取消",
     "upload_logo" => "上傳圖示",

diff --git a/includes/version.php b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v2.13.0";
+$version = "v2.14.0";
 ?>