-
-
-
-
+
+ 0) { ?>
@@ -401,4 +452,4 @@ class="subscription-item-logo" title="">
\ No newline at end of file
+?>
diff --git a/migrations/000045.php b/migrations/000045.php
index dcfa05c97..dcf224a2e 100644
--- a/migrations/000045.php
+++ b/migrations/000045.php
@@ -1,4 +1,23 @@
+<<<<<<< HEAD
+query("SELECT * FROM pragma_table_info('notification_settings') WHERE name='period_summary_at_period_start'");
+if ($columnQuery->fetchArray(SQLITE3_ASSOC) === false) {
+ $db->exec('ALTER TABLE notification_settings ADD COLUMN period_summary_at_period_start INTEGER DEFAULT 0');
+}
+
+$db->exec('UPDATE notification_settings
+ SET period_summary_at_period_start = 0
+ WHERE period_summary_at_period_start IS NULL');
+
+?>
+=======
exec("UPDATE user SET language = 'ja' WHERE language = 'jp'");
\ No newline at end of file
+$db->exec("UPDATE user SET language = 'ja' WHERE language = 'jp'");
+>>>>>>> upstream/main
diff --git a/migrations/000046.php b/migrations/000046.php
new file mode 100644
index 000000000..db4b51440
--- /dev/null
+++ b/migrations/000046.php
@@ -0,0 +1,22 @@
+format('Y-m-d');
+
+$periodTypeColumn = $db->query("SELECT * FROM pragma_table_info('user') WHERE name='budget_period_type'");
+if ($periodTypeColumn->fetchArray(SQLITE3_ASSOC) === false) {
+ $db->exec('ALTER TABLE user ADD COLUMN budget_period_type TEXT DEFAULT "monthly"');
+}
+
+$anchorDateColumn = $db->query("SELECT * FROM pragma_table_info('user') WHERE name='budget_period_anchor_date'");
+if ($anchorDateColumn->fetchArray(SQLITE3_ASSOC) === false) {
+ $db->exec('ALTER TABLE user ADD COLUMN budget_period_anchor_date TEXT DEFAULT "' . $defaultAnchorDate . '"');
+}
+
+$db->exec("UPDATE user SET budget_period_type = 'monthly' WHERE budget_period_type IS NULL OR budget_period_type = ''");
+$db->exec("UPDATE user SET budget_period_anchor_date = '" . $defaultAnchorDate . "' WHERE budget_period_anchor_date IS NULL OR budget_period_anchor_date = '' OR budget_period_anchor_date = '1970-01-01'");
+
+?>
diff --git a/migrations/000047.php b/migrations/000047.php
new file mode 100644
index 000000000..fac8fb4db
--- /dev/null
+++ b/migrations/000047.php
@@ -0,0 +1,15 @@
+query("SELECT * FROM pragma_table_info('user') WHERE name='period_budget'");
+if ($periodBudgetColumn->fetchArray(SQLITE3_ASSOC) === false) {
+ $db->exec('ALTER TABLE user ADD COLUMN period_budget REAL DEFAULT 0');
+}
+
+// Seed period_budget from existing budget for existing users
+$db->exec("UPDATE user SET period_budget = budget WHERE (period_budget IS NULL OR period_budget = 0) AND budget > 0");
+
+?>
diff --git a/migrations/000048.php b/migrations/000048.php
new file mode 100644
index 000000000..3b1100682
--- /dev/null
+++ b/migrations/000048.php
@@ -0,0 +1,70 @@
+query("PRAGMA table_info(admin)");
+$allowlistColumnExists = false;
+
+while ($adminQuery && ($row = $adminQuery->fetchArray(SQLITE3_ASSOC))) {
+ if ($row['name'] === 'local_webhook_notifications_allowlist') {
+ $allowlistColumnExists = true;
+ break;
+ }
+}
+
+if (!$allowlistColumnExists) {
+ $db->exec("ALTER TABLE admin ADD COLUMN local_webhook_notifications_allowlist TEXT DEFAULT ''");
+}
+
+// Ensure uploaded_avatars table exists
+$avatarsTableExists = $db->querySingle("SELECT name FROM sqlite_master WHERE type='table' AND name='uploaded_avatars'");
+if (!$avatarsTableExists) {
+ $db->exec("
+ CREATE TABLE IF NOT EXISTS uploaded_avatars (
+ id INTEGER PRIMARY KEY AUTOINCREMENT,
+ user_id INTEGER NOT NULL,
+ path TEXT NOT NULL
+ )
+ ");
+
+ $userCount = (int) $db->querySingle("SELECT COUNT(*) FROM user");
+
+ if ($userCount === 1) {
+ $userId = (int) $db->querySingle("SELECT id FROM user LIMIT 1");
+ $avatarDir = '../../images/uploads/logos/avatars';
+
+ if (is_dir($avatarDir)) {
+ $files = scandir($avatarDir);
+ $stmt = $db->prepare("INSERT INTO uploaded_avatars (user_id, path) VALUES (:user_id, :path)");
+
+ foreach ($files as $file) {
+ if ($file !== '.' && $file !== '..' && is_file($avatarDir . '/' . $file)) {
+ $relativePath = 'images/uploads/logos/avatars/' . $file;
+ $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);
+ $stmt->bindValue(':path', $relativePath, SQLITE3_TEXT);
+ $stmt->execute();
+ }
+ }
+ }
+ } elseif ($userCount > 1) {
+ $users = $db->query("SELECT id, avatar FROM user");
+ $stmt = $db->prepare("INSERT INTO uploaded_avatars (user_id, path) VALUES (:user_id, :path)");
+
+ while ($users && ($row = $users->fetchArray(SQLITE3_ASSOC))) {
+ $userId = (int) $row['id'];
+ $avatarPath = $row['avatar'] ?? '';
+
+ if (strpos($avatarPath, 'images/uploads/logos/avatars/') === 0) {
+ $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);
+ $stmt->bindValue(':path', $avatarPath, SQLITE3_TEXT);
+ $stmt->execute();
+ }
+ }
+ }
+}
+
+?>
diff --git a/migrations/000049.php b/migrations/000049.php
new file mode 100644
index 000000000..4f7682124
--- /dev/null
+++ b/migrations/000049.php
@@ -0,0 +1,4 @@
+exec("UPDATE user SET language = 'ja' WHERE language = 'jp'");
diff --git a/profile.php b/profile.php
index 0e7e5bc01..dce57bdd1 100644
--- a/profile.php
+++ b/profile.php
@@ -1,17 +1,23 @@
prepare("SELECT path FROM uploaded_avatars WHERE user_id = :user_id");
-$stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);
-$result = $stmt->execute();
-
-while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
- $uploadedAvatars[] = $row['path'];
-}
-?>
+// Fetch the avatars belonging to the logged-in user
+$uploadedAvatars = [];
+
+// Keep profile page functional even if avatar migration has not run yet.
+$uploadedAvatarsTableExists = $db->querySingle("SELECT name FROM sqlite_master WHERE type='table' AND name='uploaded_avatars'");
+if ($uploadedAvatarsTableExists) {
+ $stmt = $db->prepare("SELECT path FROM uploaded_avatars WHERE user_id = :user_id");
+ if ($stmt !== false) {
+ $stmt->bindValue(':user_id', $userId, SQLITE3_INTEGER);
+ $result = $stmt->execute();
+
+ while ($result && ($row = $result->fetchArray(SQLITE3_ASSOC))) {
+ $uploadedAvatars[] = $row['path'];
+ }
+ }
+}
+?>
diff --git a/scripts/i18n/en.js b/scripts/i18n/en.js
index e7493f7fe..a2d1aeacb 100644
--- a/scripts/i18n/en.js
+++ b/scripts/i18n/en.js
@@ -31,8 +31,11 @@ let i18n = {
failed_remove_currency: "Failed to remove currency",
failed_save_currency: "Failed to save currency",
cant_disable_payment_in_use: "Can't disable payment in use",
- failed_save_payment_method: "Failed to save payment method",
- unknown_error: "Unknown error, please try again.",
+ failed_save_payment_method: "Failed to save payment method",
+ invalid_budget: "Budget must be a non-negative number",
+ invalid_budget_period: "Invalid budget period selected",
+ invalid_budget_anchor_date: "Anchor date must be a valid date",
+ unknown_error: "Unknown error, please try again.",
error_saving_notification_data: "Error saving notification data",
error_sending_notification: "Error sending notification",
delete_account_confirmation: "Are you sure you want to delete your account?",
diff --git a/scripts/notifications.js b/scripts/notifications.js
index 03387fbea..4a29cd831 100644
--- a/scripts/notifications.js
+++ b/scripts/notifications.js
@@ -48,9 +48,13 @@ function saveNotifications() {
const button = document.getElementById("saveNotifications");
button.disabled = true;
const days = document.querySelector('#days').value;
+ const periodSummaryAtPeriodStart = document.getElementById("period_summary_at_period_start").checked ? 1 : 0;
const url = 'endpoints/notifications/savenotificationsettings.php';
- const data = { days: days };
+ const data = {
+ days: days,
+ period_summary_at_period_start: periodSummaryAtPeriodStart,
+ };
makeFetchCall(url, data, button);
}
@@ -434,4 +438,4 @@ function saveNotificationsServerchanButton() {
};
makeFetchCall('endpoints/notifications/saveserverchannotifications.php', data, button);
-}
\ No newline at end of file
+}
diff --git a/scripts/settings.js b/scripts/settings.js
index ad5307da1..c04730871 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -18,11 +18,78 @@ const editSvgContent = `
`;
-function saveBudget() {
- const button = document.getElementById("saveBudget");
+function saveMonthlyBudget() {
+ const button = document.getElementById("saveMonthlyBudget");
button.disabled = true;
- const budget = document.getElementById("budget").value;
+ const budget = Number(document.getElementById("monthly_budget").value || 0);
+
+ if (Number.isNaN(budget) || budget < 0) {
+ showErrorMessage(translate("invalid_budget"));
+ button.disabled = false;
+ return;
+ }
+
+ fetch('endpoints/user/budget.php', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRF-Token': window.csrfToken,
+ },
+ body: JSON.stringify({ monthly_budget: budget }),
+ })
+ .then(response => response.json())
+ .then(data => {
+ if (data.success) {
+ showSuccessMessage(data.message);
+ } else {
+ showErrorMessage(data.message);
+ }
+ })
+ .catch(error => {
+ console.error(error);
+ showErrorMessage(translate('unknown_error'));
+ })
+ .finally(() => {
+ button.disabled = false;
+ });
+}
+
+function savePeriodBudget() {
+ const button = document.getElementById("savePeriodBudget");
+ button.disabled = true;
+
+ const budget = Number(document.getElementById("period_budget").value || 0);
+ const budgetPeriodType = document.getElementById("budget_period_type").value;
+ const budgetPeriodAnchorDateInput = document.getElementById("budget_period_anchor_date");
+ let budgetPeriodAnchorDate = budgetPeriodAnchorDateInput.value;
+ const validPeriodTypes = ["weekly", "fortnightly", "monthly"];
+
+ if (!budgetPeriodAnchorDate || budgetPeriodAnchorDate === "1970-01-01") {
+ const today = new Date();
+ const month = `${today.getMonth() + 1}`.padStart(2, "0");
+ const day = `${today.getDate()}`.padStart(2, "0");
+ budgetPeriodAnchorDate = `${today.getFullYear()}-${month}-${day}`;
+ budgetPeriodAnchorDateInput.value = budgetPeriodAnchorDate;
+ }
+
+ if (Number.isNaN(budget) || budget < 0) {
+ showErrorMessage(translate("invalid_budget"));
+ button.disabled = false;
+ return;
+ }
+
+ if (!validPeriodTypes.includes(budgetPeriodType)) {
+ showErrorMessage(translate("invalid_budget_period"));
+ button.disabled = false;
+ return;
+ }
+
+ if (!/^\d{4}-\d{2}-\d{2}$/.test(budgetPeriodAnchorDate)) {
+ showErrorMessage(translate("invalid_budget_anchor_date"));
+ button.disabled = false;
+ return;
+ }
fetch('endpoints/user/budget.php', {
method: 'POST',
@@ -30,7 +97,11 @@ function saveBudget() {
'Content-Type': 'application/json',
'X-CSRF-Token': window.csrfToken,
},
- body: JSON.stringify({budget: budget}),
+ body: JSON.stringify({
+ period_budget: budget,
+ budget_period_type: budgetPeriodType,
+ budget_period_anchor_date: budgetPeriodAnchorDate,
+ }),
})
.then(response => response.json())
.then(data => {
@@ -1200,4 +1271,4 @@ function runAiRecommendations() {
spinner.classList.add("hidden");
});
-}
\ No newline at end of file
+}
diff --git a/scripts/stats.js b/scripts/stats.js
index 50c0baa90..4eb98bf55 100644
--- a/scripts/stats.js
+++ b/scripts/stats.js
@@ -168,6 +168,19 @@ document.querySelectorAll('.filter-item').forEach(function(item) {
urlParams.set('payment', paymentId);
}
+ newUrl += urlParams.toString();
+ window.location.href = newUrl;
+ } else if (this.hasAttribute('data-budgettype')) {
+ const budgetType = this.getAttribute('data-budgettype');
+ const urlParams = new URLSearchParams(window.location.search);
+ let newUrl = 'stats.php?';
+
+ if (urlParams.get('budget') === budgetType) {
+ urlParams.delete('budget');
+ } else {
+ urlParams.set('budget', budgetType);
+ }
+
newUrl += urlParams.toString();
window.location.href = newUrl;
}
diff --git a/settings.php b/settings.php
index 9bba17af5..a44485d19 100644
--- a/settings.php
+++ b/settings.php
@@ -11,16 +11,72 @@
$currencies[$currencyId] = $row;
}
$userData['currency_symbol'] = $currencies[$main_currency]['symbol'];
+$budgetPeriodType = $userData['budget_period_type'] ?? 'monthly';
+$budgetPeriodAnchorDate = $userData['budget_period_anchor_date'] ?? date('Y-m-d');
+if ($budgetPeriodAnchorDate === '1970-01-01' || !preg_match('/^\d{4}-\d{2}-\d{2}$/', $budgetPeriodAnchorDate)) {
+ $budgetPeriodAnchorDate = date('Y-m-d');
+}
?>
-
+