diff --git a/CHANGELOG.md b/CHANGELOG.md index eadff743a..4c6a676dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added the dividend and fees to the position detail dialog +- Added support to link a (wealth) item to an account + +### Changed + +- Improved the language localization for German (`de`) ## 1.230.0 - 2023-01-29 diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.ts index 2a71042c8..b85c13ab5 100644 --- a/apps/api/src/app/account/account.controller.ts +++ b/apps/api/src/app/account/account.controller.ts @@ -37,8 +37,7 @@ export class AccountController { private readonly accountService: AccountService, private readonly impersonationService: ImpersonationService, private readonly portfolioService: PortfolioService, - @Inject(REQUEST) private readonly request: RequestWithUser, - private readonly userService: UserService + @Inject(REQUEST) private readonly request: RequestWithUser ) {} @Delete(':id') diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index c91332785..077f2227b 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -76,23 +76,21 @@ export class OrderService { userId: string; } ): Promise { - const defaultAccount = ( - await this.accountService.getAccounts(data.userId) - ).find((account) => { - return account.isDefault === true; - }); + let Account; + + if (data.accountId) { + Account = { + connect: { + id_userId: { + userId: data.userId, + id: data.accountId + } + } + }; + } const tags = data.tags ?? []; - let Account = { - connect: { - id_userId: { - userId: data.userId, - id: data.accountId ?? defaultAccount?.id - } - } - }; - if (data.type === 'ITEM') { const assetClass = data.assetClass; const assetSubClass = data.assetSubClass; @@ -101,7 +99,6 @@ export class OrderService { const id = uuidv4(); const name = data.SymbolProfile.connectOrCreate.create.symbol; - Account = undefined; data.id = id; data.SymbolProfile.connectOrCreate.create.assetClass = assetClass; data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index e104b1fcd..6b8783f00 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -573,7 +573,6 @@ export class PortfolioService { const cashPositions = await this.getCashPositions({ cashDetails, userCurrency, - investment: totalInvestmentInBaseCurrency, value: filteredValueInBaseCurrency }); @@ -599,7 +598,6 @@ export class PortfolioService { const cashPositions = await this.getCashPositions({ cashDetails, userCurrency, - investment: totalInvestmentInBaseCurrency, value: filteredValueInBaseCurrency }); @@ -1230,12 +1228,10 @@ export class PortfolioService { private async getCashPositions({ cashDetails, - investment, userCurrency, value }: { cashDetails: CashDetails; - investment: Big; userCurrency: string; value: Big; }) { @@ -1713,6 +1709,14 @@ export class PortfolioService { userId: string; withExcludedAccounts?: boolean; }) { + const ordersOfTypeItem = await this.orderService.getOrders({ + filters, + userCurrency, + userId, + withExcludedAccounts, + types: ['ITEM'] + }); + const accounts: PortfolioDetails['accounts'] = {}; let currentAccounts: (Account & { @@ -1743,10 +1747,18 @@ export class PortfolioService { }); for (const account of currentAccounts) { - const ordersByAccount = orders.filter(({ accountId }) => { + let ordersByAccount = orders.filter(({ accountId }) => { return accountId === account.id; }); + const ordersOfTypeItemByAccount = ordersOfTypeItem.filter( + ({ accountId }) => { + return accountId === account.id; + } + ); + + ordersByAccount = ordersByAccount.concat(ordersOfTypeItemByAccount); + accounts[account.id] = { balance: account.balance, currency: account.currency, @@ -1766,7 +1778,9 @@ export class PortfolioService { for (const order of ordersByAccount) { let currentValueOfSymbolInBaseCurrency = order.quantity * - portfolioItemsNow[order.SymbolProfile.symbol]?.marketPrice ?? 0; + (portfolioItemsNow[order.SymbolProfile.symbol]?.marketPrice ?? + order.unitPrice ?? + 0); let originalValueOfSymbolInBaseCurrency = this.exchangeRateDataService.toCurrency( order.quantity * order.unitPrice, diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html index 6262a65d3..e5b215fbc 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html @@ -18,12 +18,14 @@ -
+
Account + {{ account.name }} diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index ec563d409..e3b223fd8 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -822,7 +822,7 @@ Registrieren apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -1676,10 +1676,22 @@ Allocations Allokationen + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + By Account @@ -1863,7 +1875,7 @@ Item - Wertsache + Wertsache apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html 16,18 @@ -2018,7 +2030,7 @@ Ghostfolio verschafft Ihnen den Überblick über Ihr Vermögen. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2374,7 +2386,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2386,7 +2398,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2398,7 +2410,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2502,7 +2514,7 @@ Filtern nach Konto oder Tag... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -3099,7 +3111,7 @@ Lower Risk - Geringeres Risiko + Geringeres Risiko libs/ui/src/lib/i18n.ts 11 @@ -3145,6 +3157,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Bist du ein ambitionierter Investor, der den kompletten Überblick benötigt? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + Wenn du auf Ghostfolio Premium upgradest, erhältst du diese zusätzlichen Funktionen: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Zusammenfassung + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Rechner + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + und weitere Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Überspringen + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Abonnement abschliessen + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + Für technisch versierte Anleger, die Ghostfolio auf der eigenen Infrastruktur betreiben möchten. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimitierte Transaktionen + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimitierte Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Selbst gehostet, manuelles Update. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Kostenlos + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + Für Einsteiger, die gerade mit dem Börsenhandel beginnen. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Vollständig verwaltetes Ghostfolio Cloud-Angebot. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + Für ambitionierte Anleger, die den vollständigen Überblick über ihr Anlagevermögen benötigen. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Abonnement abschliessen + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + Einmalige Zahlung, keine automatische Erneuerung. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Jetzt loslegen + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + Es ist kostenlos. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index b590c22d1..aaf57db83 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -823,7 +823,7 @@ Empezar apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -1677,10 +1677,22 @@ Allocations Distribución + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + By Account @@ -2019,7 +2031,7 @@ Ghostfolio te permite hacer un seguimiento de tu riqueza. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2299,7 +2311,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2347,7 +2359,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2359,7 +2371,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2495,7 +2507,7 @@ Filtrar por cuenta o etiqueta... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -3146,6 +3158,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index a37146092..64e19e688 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -2214,7 +2214,7 @@ Filtrer par compte ou étiquette... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -2228,10 +2228,22 @@ Allocations Répartitions + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + Proportion of Net Worth @@ -2318,7 +2330,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2330,7 +2342,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2342,7 +2354,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2522,7 +2534,7 @@ Ghostfolio vous aide à garder un aperçu de votre patrimoine. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2530,7 +2542,7 @@ Démarrer apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -3144,6 +3156,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index 3556e46d8..5cf2f74c9 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -823,7 +823,7 @@ Iniziare apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -1677,10 +1677,22 @@ Allocations Allocazioni + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + By Account @@ -2019,7 +2031,7 @@ Ghostfolio ti permette di tenere traccia della tua ricchezza. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2299,7 +2311,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2347,7 +2359,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2359,7 +2371,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2495,7 +2507,7 @@ Filtra per account o tag... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -3146,6 +3158,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 2b14a8b8b..154be3b87 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -822,7 +822,7 @@ Aan de slag apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -1676,10 +1676,22 @@ Allocations Toewijzingen + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + By Account @@ -2018,7 +2030,7 @@ Ghostfolio stelt u in staat om uw vermogen bij te houden. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2298,7 +2310,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2346,7 +2358,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2358,7 +2370,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2494,7 +2506,7 @@ Filter op account of tag... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -3145,6 +3157,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index aa0037b3d..348aef54c 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -2158,7 +2158,7 @@ Filter by account or tag... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -2172,10 +2172,22 @@ Allocations Allocations + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + Proportion of Net Worth @@ -2262,7 +2274,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2274,7 +2286,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2286,7 +2298,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2446,7 +2458,7 @@ Ghostfolio empowers you to keep track of your wealth. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2454,7 +2466,7 @@ Get Started apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -3145,6 +3157,238 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + Portfolio Summary + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Performance Benchmarks + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + FIRE Calculator + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + and more Features... + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Skip + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + Unlimited Transactions + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Unlimited Accounts + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + Portfolio Performance + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Self-hosted, update manually. + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + Free + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + For new investors who are just getting started with trading. + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + Fully managed Ghostfolio cloud offering. + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + + + + For ambitious investors who need the full picture of their financial assets. + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Upgrade Plan + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + One-time payment, no auto-renewal. + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + Get Started + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + It’s free. + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index 8270e5505..fa70949b8 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -750,7 +750,7 @@ Get Started apps/client/src/app/pages/public/public-page.html - 137 + 138 @@ -1513,10 +1513,22 @@ Allocations + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 23 + apps/client/src/app/pages/portfolio/allocations/allocations-page.html 4 + + apps/client/src/app/pages/pricing/pricing-page.html + 79 + + + apps/client/src/app/pages/pricing/pricing-page.html + 255 + By Account @@ -1819,7 +1831,7 @@ Ghostfolio empowers you to keep track of your wealth. apps/client/src/app/pages/public/public-page.html - 132,134 + 133,135 @@ -2066,7 +2078,7 @@ apps/client/src/app/pages/public/public-page.html - 90 + 91 @@ -2110,7 +2122,7 @@ apps/client/src/app/pages/public/public-page.html - 108 + 109 @@ -2121,7 +2133,7 @@ apps/client/src/app/pages/public/public-page.html - 99 + 100 @@ -2242,7 +2254,7 @@ Filter by account or tag... apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts - 132 + 133 apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts @@ -2816,6 +2828,217 @@ 245,247 + + Are you an ambitious investor who needs the full picture? + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 6,8 + + + + For ambitious investors who need the full picture of their financial assets. + + apps/client/src/app/pages/pricing/pricing-page.html + 210,213 + + + + Free + + apps/client/src/app/pages/pricing/pricing-page.html + 98 + + + apps/client/src/app/pages/pricing/pricing-page.html + 180 + + + + Upgrade Plan + + apps/client/src/app/pages/pricing/pricing-page.html + 299,301 + + + + Unlimited Transactions + + apps/client/src/app/pages/pricing/pricing-page.html + 44 + + + apps/client/src/app/pages/pricing/pricing-page.html + 131 + + + apps/client/src/app/pages/pricing/pricing-page.html + 220 + + + + Self-hosted, update manually. + + apps/client/src/app/pages/pricing/pricing-page.html + 97 + + + + For tech-savvy investors who prefer to run Ghostfolio on their own infrastructure. + + apps/client/src/app/pages/pricing/pricing-page.html + 34,37 + + + + FIRE Calculator + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 27 + + + apps/client/src/app/pages/pricing/pricing-page.html + 86 + + + apps/client/src/app/pages/pricing/pricing-page.html + 262 + + + + Portfolio Performance + + apps/client/src/app/pages/pricing/pricing-page.html + 58 + + + apps/client/src/app/pages/pricing/pricing-page.html + 145 + + + apps/client/src/app/pages/pricing/pricing-page.html + 234 + + + + Upgrade Plan + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 39 + + + + Performance Benchmarks + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 19 + + + apps/client/src/app/pages/pricing/pricing-page.html + 72 + + + apps/client/src/app/pages/pricing/pricing-page.html + 248 + + + + Unlimited Accounts + + apps/client/src/app/pages/pricing/pricing-page.html + 51 + + + apps/client/src/app/pages/pricing/pricing-page.html + 138 + + + apps/client/src/app/pages/pricing/pricing-page.html + 227 + + + + By upgrading to Ghostfolio Premium, you will get these additional features: + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 9,11 + + + + For new investors who are just getting started with trading. + + apps/client/src/app/pages/pricing/pricing-page.html + 122,124 + + + + It’s free. + + apps/client/src/app/pages/pricing/pricing-page.html + 316 + + + + One-time payment, no auto-renewal. + + apps/client/src/app/pages/pricing/pricing-page.html + 303 + + + + and more Features... + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 31 + + + apps/client/src/app/pages/pricing/pricing-page.html + 93 + + + apps/client/src/app/pages/pricing/pricing-page.html + 269 + + + + Get Started + + apps/client/src/app/pages/pricing/pricing-page.html + 313,315 + + + + Portfolio Summary + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 15 + + + apps/client/src/app/pages/pricing/pricing-page.html + 65 + + + apps/client/src/app/pages/pricing/pricing-page.html + 241 + + + + Skip + + apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html + 37 + + + + Fully managed Ghostfolio cloud offering. + + apps/client/src/app/pages/pricing/pricing-page.html + 179 + + + apps/client/src/app/pages/pricing/pricing-page.html + 273 + +