diff --git a/src/locales/de.json b/src/locales/de.json index 1f6a6ce3..c8ad8b89 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Nicht unterstützter Kartenanbieter", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Bitte aktualisieren Sie die Seite und versuchen Sie es erneut. Wenn der Fehler weiterhin besteht, stellen Sie sicher, dass die Karteneinstellungen des Servers korrekt konfiguriert sind.", "Import Transactions": "Transaktionen importieren", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Datei hochladen", "Upload Transaction Data File": "Transaktionsdatendatei hochladen", "Define Column": "Define Column", diff --git a/src/locales/en.json b/src/locales/en.json index fd523a58..c946a38b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Unsupported Map Provider", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.", "Import Transactions": "Import Transactions", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Upload File", "Upload Transaction Data File": "Upload Transaction Data File", "Define Column": "Define Column", diff --git a/src/locales/es.json b/src/locales/es.json index 78284965..f66c6639 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Proveedor de mapas no compatible", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Actualice la página e inténtelo de nuevo. Si el error persiste, asegúrese de que la configuración del mapa del servidor esté configurada correctamente.", "Import Transactions": "Importar Transacciones", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Cargar Archivo", "Upload Transaction Data File": "Cargar Archivo de Datos", "Define Column": "Definir Columna", diff --git a/src/locales/fr.json b/src/locales/fr.json index 7f680916..7951e2c9 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Fournisseur de cartes non pris en charge", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Veuillez actualiser la page et réessayer. Si l'erreur persiste, assurez-vous que les paramètres de carte du serveur sont correctement configurés.", "Import Transactions": "Importer des transactions", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Télécharger un fichier", "Upload Transaction Data File": "Télécharger un fichier de données de transaction", "Define Column": "Définir les colonnes", diff --git a/src/locales/it.json b/src/locales/it.json index 9f28ed78..7b20b7f7 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Fornitore mappa non supportato", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Aggiorna la pagina e riprova. Se l'errore persiste, assicurati che le impostazioni della mappa del server siano configurate correttamente.", "Import Transactions": "Importa transazioni", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Carica file", "Upload Transaction Data File": "Carica file dati transazione", "Define Column": "Definisci colonna", diff --git a/src/locales/ja.json b/src/locales/ja.json index a63b23ff..c0cf4010 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "サポートされていないマッププロバイダーです", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "ページを更新してもう一度やり直してください。エラーが続く場合はサーバーのマップ設定が正しく構成されていることを確認してください。", "Import Transactions": "取引をインポート", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "ファイルをアップロード", "Upload Transaction Data File": "取引データファイルをアップロードします", "Define Column": "列の定義", diff --git a/src/locales/kn.json b/src/locales/kn.json index 548954ce..63c9cca6 100644 --- a/src/locales/kn.json +++ b/src/locales/kn.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "ಬೆಂಬಲಿಸದ ನಕ್ಷೆ ಪೂರೈಕೆದಾರ", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "ದಯವಿಟ್ಟು ಪುಟವನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ. ದೋಷ ಮುಂದುವರೆದರೆ, ಸರ್ವರ್‌ನ ನಕ್ಷೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಯಾಗಿ ಸಂರಚಿಸಲಾಗಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.", "Import Transactions": "ವಹಿವಾಟುಗಳನ್ನು ಆಮದು ಮಾಡಿ", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "ಫೈಲ್ ಅಪ್ಲೋಡ್ ಮಾಡಿ", "Upload Transaction Data File": "ವಹಿವಾಟು ಡೇಟಾ ಫೈಲ್ ಅಪ್ಲೋಡ್ ಮಾಡಿ", "Define Column": "ಕಾಲಮ್ ವ್ಯಾಖ್ಯಾನಿಸಿ", diff --git a/src/locales/ko.json b/src/locales/ko.json index c254f95d..1e3a361b 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "지원되지 않는 지도 제공업체", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "페이지를 새로 고치고 다시 시도하십시오. 오류가 지속되면 서버의 지도 설정이 올바르게 구성되었는지 확인하십시오.", "Import Transactions": "거래 가져오기", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "파일 업로드", "Upload Transaction Data File": "거래 데이터 파일 업로드", "Define Column": "열 정의", diff --git a/src/locales/nl.json b/src/locales/nl.json index 08cf76a1..14436c13 100644 --- a/src/locales/nl.json +++ b/src/locales/nl.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Niet-ondersteunde kaartprovider", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Vernieuw de pagina en probeer het opnieuw. Blijft de fout optreden, controleer dan of de kaartinstellingen op de server correct zijn geconfigureerd.", "Import Transactions": "Transacties importeren", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Bestand uploaden", "Upload Transaction Data File": "Bestand met transactiegegevens uploaden", "Define Column": "Kolommen definiëren", diff --git a/src/locales/pt_BR.json b/src/locales/pt_BR.json index 86e54de5..588a46a7 100644 --- a/src/locales/pt_BR.json +++ b/src/locales/pt_BR.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Provedor de Mapa Não Suportado", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Por favor, atualize a página e tente novamente. Se o erro persistir, verifique se as configurações de mapa do servidor estão corretamente configuradas.", "Import Transactions": "Importar Transações", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Enviar Arquivo", "Upload Transaction Data File": "Enviar Arquivo de Dados de Transação", "Define Column": "Definir Coluna", diff --git a/src/locales/ru.json b/src/locales/ru.json index fd95adff..04fc6f36 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Неподдерживаемый поставщик карт", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Пожалуйста, обновите страницу и попробуйте снова. Если ошибка сохраняется, убедитесь, что настройки карты на сервере настроены правильно.", "Import Transactions": "Импорт транзакций", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Загрузить файл", "Upload Transaction Data File": "Загрузить файл данных транзакций", "Define Column": "Define Column", diff --git a/src/locales/sl.json b/src/locales/sl.json index e093941c..ddccca94 100644 --- a/src/locales/sl.json +++ b/src/locales/sl.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Nepodprt ponudnik zemljevidov", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Osvežite stran in poskusite znova. Če se napaka ponavlja, preverite, ali so nastavitve zemljevida na strežniku pravilno konfigurirane.", "Import Transactions": "Uvozi transakcije", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Naloži datoteko", "Upload Transaction Data File": "Naloži datoteko s podatki o transakcijah", "Define Column": "Določi stolpec", diff --git a/src/locales/ta.json b/src/locales/ta.json index 4decdea1..0ff1d2d8 100644 --- a/src/locales/ta.json +++ b/src/locales/ta.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "ஆதரிக்கப்படாத வரைபடம் வழங்குநர்", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "தயவுசெய்து பக்கம்வை புதுப்பி செய் மீண்டும் முயற்சிக்கவும். பிழை தொடர்ந்தால், சேவையகம்‌ வரைபடம் அமைப்பு‌களை சரிஆக உள்ளமைக்கப்பட்டது என்று உறுதிசெய்யவும்.", "Import Transactions": "பரிவர்த்தனைகளை இறக்குமதி செய்", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "கோப்பு பதிவேற்று செய்", "Upload Transaction Data File": "பரிவர்த்தனை தரவு கோப்பு பதிவேற்று செய்", "Define Column": "நெடுவரிசையை வரையறு", diff --git a/src/locales/th.json b/src/locales/th.json index 493d2be7..d48c6d50 100644 --- a/src/locales/th.json +++ b/src/locales/th.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "ผู้ให้บริการแผนที่ไม่รองรับ", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "กรุณารีเฟรชหน้าและลองอีกครั้ง หากเกิดข้อผิดพลาดซ้ำ ตรวจสอบการตั้งค่าแผนที่บนเซิร์ฟเวอร์ให้ถูกต้อง", "Import Transactions": "นำเข้าธุรกรรม", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "อัปโหลดไฟล์", "Upload Transaction Data File": "อัปโหลดไฟล์ข้อมูลธุรกรรม", "Define Column": "กำหนดคอลัมน์", diff --git a/src/locales/tr.json b/src/locales/tr.json index 16238080..e0f09fcb 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Desteklenmeyen Harita Sağlayıcısı", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Lütfen sayfayı yenileyin ve tekrar deneyin. Hata devam ederse, sunucunun harita ayarlarının doğru yapılandırıldığından emin olun.", "Import Transactions": "İşlemleri İçe Aktar", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Dosya Yükle", "Upload Transaction Data File": "İşlem Veri Dosyası Yükle", "Define Column": "Sütun Tanımla", diff --git a/src/locales/uk.json b/src/locales/uk.json index 020cc27e..809c3b93 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Непідтримуваний провайдер карт", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Оновіть сторінку та спробуйте ще раз. Якщо помилка не зникає, перевірте налаштування мап на сервері.", "Import Transactions": "Імпортувати транзакції", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Завантажити файл", "Upload Transaction Data File": "Завантажити файл з даними транзакцій", "Define Column": "Визначити стовпець", diff --git a/src/locales/vi.json b/src/locales/vi.json index 6ae408fd..f6133d44 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "Nhà cung cấp bản đồ không được hỗ trợ", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "Vui lòng làm mới trang và thử lại. Nếu lỗi vẫn tiếp diễn, hãy đảm bảo rằng cài đặt bản đồ của máy chủ được định cấu hình chính xác.", "Import Transactions": "Nhập giao dịch", + "Refresh Accounts, Categories and Tags": "Refresh Accounts, Categories and Tags", "Upload File": "Tải lên tệp", "Upload Transaction Data File": "Tải lên tệp dữ liệu giao dịch", "Define Column": "Define Column", diff --git a/src/locales/zh_Hans.json b/src/locales/zh_Hans.json index 8458ac9e..2c2a70d1 100644 --- a/src/locales/zh_Hans.json +++ b/src/locales/zh_Hans.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "不支持的地图提供方", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "请刷新页面并重试。如果仍然显示错误，请确保正确设置了服务器地图设置。", "Import Transactions": "导入交易", + "Refresh Accounts, Categories and Tags": "刷新账户、分类和标签", "Upload File": "上传文件", "Upload Transaction Data File": "上传交易数据文件", "Define Column": "定义列", diff --git a/src/locales/zh_Hant.json b/src/locales/zh_Hant.json index 17ba098f..26d1c48b 100644 --- a/src/locales/zh_Hant.json +++ b/src/locales/zh_Hant.json @@ -1952,6 +1952,7 @@ "Unsupported Map Provider": "不支援的地圖提供者", "Please refresh the page and try again. If the error persists, ensure that the server's map settings are correctly configured.": "請重新載入頁面並重試。如果仍然顯示錯誤，請確保正確設定了伺服器地圖設定。", "Import Transactions": "匯入交易", + "Refresh Accounts, Categories and Tags": "重新載入帳戶、分類和標籤", "Upload File": "上傳檔案", "Upload Transaction Data File": "上傳交易資料檔案", "Define Column": "定義欄位", diff --git a/src/views/desktop/transactions/import/ImportDialog.vue b/src/views/desktop/transactions/import/ImportDialog.vue index ac6318f9..34daf32e 100644 --- a/src/views/desktop/transactions/import/ImportDialog.vue +++ b/src/views/desktop/transactions/import/ImportDialog.vue @@ -5,7 +5,18 @@

{{ tt('Import Transactions') }}

- + + + + + {{ tt('Refresh Accounts, Categories and Tags') }} +
{ + loading.value = false; + + const isAllUpToDate = results.length === 3 + && results[0].status === 'rejected' && results[0].reason?.isUpToDate + && results[1].status === 'rejected' && results[1].reason?.isUpToDate + && results[2].status === 'rejected' && results[2].reason?.isUpToDate; + + // show info if all up to date + if (isAllUpToDate) { + snackbar.value?.showMessage('Data is up to date'); + return; + } + + // show error if any + for (const result of results) { + if (result.status === 'rejected' && !result.reason?.isUpToDate) { + snackbar.value?.showError(result.reason); + return; + } + } + + // show info if one of them updated + for (const result of results) { + if (result.status === 'fulfilled') { + snackbar.value?.showMessage('Data has been updated'); + importTransactionCheckDataTab.value?.updateAllTransactionsIsValid(); + return; + } + } + }); +} + function parseData(): void { let uploadFile: File; let type: string = fileType.value; diff --git a/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue b/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue index d93c807d..74783e81 100644 --- a/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue +++ b/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue @@ -1634,14 +1634,43 @@ function updateTransactionData(transaction: ImportTransaction): void { if (transaction.categoryId && allCategoriesMap.value[transaction.categoryId]) { transaction.actualCategoryName = allCategoriesMap.value[transaction.categoryId]!.name; + } else { + if (transaction.type !== TransactionType.ModifyBalance) { + transaction.valid = false; + } } if (transaction.sourceAccountId && allAccountsMap.value[transaction.sourceAccountId]) { transaction.actualSourceAccountName = allAccountsMap.value[transaction.sourceAccountId]!.name; + } else { + transaction.valid = false; } if (transaction.destinationAccountId && allAccountsMap.value[transaction.destinationAccountId]) { transaction.actualDestinationAccountName = allAccountsMap.value[transaction.destinationAccountId]!.name; + } else { + if (transaction.type === TransactionType.Transfer) { + transaction.valid = false; + } + } + + if (transaction.tagIds && transaction.tagIds.length) { + for (const tagId of transaction.tagIds) { + if (!tagId || !allTagsMap.value[tagId]) { + transaction.valid = false; + break; + } + } + } +} + +function updateAllTransactionsIsValid(): void { + if (!props.importTransactions || props.importTransactions.length < 1) { + return; + } + + for (const importTransaction of props.importTransactions) { + updateTransactionData(importTransaction); } } @@ -2227,6 +2256,7 @@ defineExpose({ toolMenus, isEditing, canImport, + updateAllTransactionsIsValid, reset, setCountPerPage });