diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json index 581979d146e6..b5c7b20700df 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_de_DE.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Ort ändern", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Diese Option ist nicht verfügbar, wenn mehrere Instanzen konfiguriert werden. Gehen Sie zu „Public IPs“, um Ihren Instanzen eine Floating-IP zuzuweisen.", "pci_project_instances_instance_add_region_savings_plan_info": "Die Local Zones kommen für Savings Plans nicht infrage.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Profitieren Sie von günstigen monatlichen Preisen mit den Savings Plans und behalten Sie die Flexibilität der Instanzen auf Stundenbasis bei.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Ihre Savings Plans konfigurieren", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Profitieren Sie von günstigen monatlichen Preisen mit den Savings Plans und behalten Sie die Flexibilität der Instanzen auf Stundenbasis bei. Beachten Sie, dass die Windows-Lizenzkosten nicht in den Savings Plans enthalten sind.", "pci_projects_project_instances_add_windows_gen3_license_unit": "inkl. MwSt./Stunde", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "inkl. MwSt./vCore/Stunde", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json index 7a540c39707e..65b4c4fe1c0a 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_en_GB.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Select another location", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Option not available when configuring multiple instances. Please go to Public IPs to link a Floating IP to your instances.", "pci_project_instances_instance_add_region_savings_plan_info": "Local Zones are not eligible for Savings Plans.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Take advantage of low monthly rates with Savings Plans — save money without sacrificing the flexibility to use instances whenever you need them.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Set up your Savings Plan", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Take advantage of low monthly rates with Savings Plans—save money without sacrificing the flexibility to use instances whenever you need them. Please note that Windows licensing costs are not included in Savings Plans", "pci_projects_project_instances_add_windows_gen3_license_unit": "ex. VAT/hour", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "ex. VAT/vCore/hour", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json index 18c2e1467e3b..5b0680d2d773 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_es_ES.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Cambiar la localización", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Opción no disponible durante la configuración de varias instancias. Acceda a «Public IP» para asociar una Floating IP a sus instancias.", "pci_project_instances_instance_add_region_savings_plan_info": "Las Local Zones no son compatibles con los Savings Plans.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Disfrute de tarifas mensuales más económicas gracias a los Savings Plans, manteniendo la flexibilidad de las instancias por horas.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Configure sus Savings Plans", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Disfrute de tarifas mensuales más económicas gracias a los Savings Plans, manteniendo la flexibilidad de las instancias por horas. Tenga en cuenta que los costes de las licencias Windows no se incluyen en los Savings Plans.", "pci_projects_project_instances_add_windows_gen3_license_unit": "/hora + IVA", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "/hora + IVA por vCore", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json index d5477b1fff03..54d451487d7f 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_CA.json @@ -87,9 +87,7 @@ "pci_projects_project_instances_add_billing_short_period_message": "Pour une utilisation sur de courtes périodes, il est recommandé de choisir la facturation à l'heure et de basculer au forfait mensuel par la suite.", "pci_projects_project_instances_add_billing_monthly_label": "Mensuel", "pci_projects_project_instances_add_billing_hourly_label": "Horaire", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Bénéficiez de tarifs mensuels avantageux grâce aux Savings Plans, tout en gardant la flexibilité des instances à l'heure.", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Bénéficiez de tarifs mensuels avantageux grâce aux Savings Plans, tout en gardant la flexibilité des instances à l'heure. Notez que les coûts de licence Windows ne sont pas inclus dans les Savings Plans", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Configurez vos Savings Plans", "pci_projects_project_instances_add_billing_gateway_info": "Nous avons détecté des composants manquants : Gateway", "pci_projects_project_instances_add_billing_gateway_detail": "La flavor sélectionnée est :", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json index d5477b1fff03..54d451487d7f 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_fr_FR.json @@ -87,9 +87,7 @@ "pci_projects_project_instances_add_billing_short_period_message": "Pour une utilisation sur de courtes périodes, il est recommandé de choisir la facturation à l'heure et de basculer au forfait mensuel par la suite.", "pci_projects_project_instances_add_billing_monthly_label": "Mensuel", "pci_projects_project_instances_add_billing_hourly_label": "Horaire", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Bénéficiez de tarifs mensuels avantageux grâce aux Savings Plans, tout en gardant la flexibilité des instances à l'heure.", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Bénéficiez de tarifs mensuels avantageux grâce aux Savings Plans, tout en gardant la flexibilité des instances à l'heure. Notez que les coûts de licence Windows ne sont pas inclus dans les Savings Plans", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Configurez vos Savings Plans", "pci_projects_project_instances_add_billing_gateway_info": "Nous avons détecté des composants manquants : Gateway", "pci_projects_project_instances_add_billing_gateway_detail": "La flavor sélectionnée est :", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json index a0902bc47fb0..0e9933c81622 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_it_IT.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Modificare la localizzazione", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Opzione non disponibile durante la configurazione di più istanze. Accedi a “Public IP” per associare un Floating IP alle tue istanze.", "pci_project_instances_instance_add_region_savings_plan_info": "Le Local Zone non sono compatibili con i Savings Plan.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Usufruisci di tariffe mensili vantaggiose grazie ai Savings Plan, conservando la flessibilità delle istanze all’ora.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Configura i tuoi Savings Plan", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Usufruisci di tariffe mensili vantaggiose grazie ai Savings Plan, conservando la flessibilità delle istanze all’ora. Ti ricordiamo che i costi delle licenze Windows non sono inclusi nei Savings Plan", "pci_projects_project_instances_add_windows_gen3_license_unit": "+IVA/ora", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "+IVA/vCore/ora", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json index 53175da8c481..d9e24794ed88 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pl_PL.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Zmień lokalizację", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Opcja niedostępna podczas konfiguracji wielu instancji. Przejdź do adresów Public IP, aby przypisać floating IP do instancji.", "pci_project_instances_instance_add_region_savings_plan_info": "W przypadku Local Zones Savings Plans nie ma zastosowania.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Dzięki Savings Plan zyskujesz korzystne opłaty miesięczne, a jednocześnie zachowujesz możliwość płatności za instancje w trybie za godzinę.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Skonfiguruj Savings Plans", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Dzięki Savings Plan zyskujesz korzystne opłaty miesięczne, a jednocześnie zachowujesz możliwość płatności za instancje w trybie za godzinę. Koszty licencji systemu Windows nie są zawarte w Savings Plans", "pci_projects_project_instances_add_windows_gen3_license_unit": "netto/godz.", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "netto/vCore/godz.", diff --git a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json index 401be881e02d..834ae15cbc75 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json +++ b/packages/manager/modules/pci/src/projects/project/instances/add/translations/Messages_pt_PT.json @@ -124,8 +124,6 @@ "pci_projects_project_instances_add_attch_floating_ip_banner_localzone_description3": "Modificar a localização", "pci_projects_project_instances_add_attch_floating_ip_checkbox_label_tooltip": "Opção indisponível durante a configuração de várias instâncias. Sugerimos que aceda a “Public IP” para associar um Floating IP às suas instâncias.", "pci_project_instances_instance_add_region_savings_plan_info": "As Local Zones não são elegíveis para os Savings Plans.", - "pci_projects_project_instances_add_billing_savings_plan_banner": "Graças aos Savings Plans, beneficie de preços mensais vantajosos, enquanto conserva a flexibilidade das instâncias à hora.", - "pci_projects_project_instances_add_billing_savings_plan_cta": "Configure os seus Savings Plans", "pci_projects_project_instances_add_billing_savings_plan_banner_windows_gen_3": "Graças aos Savings Plans, beneficie de preços mensais vantajosos, enquanto conserva a flexibilidade das instâncias à hora. Tenha em conta que os custos da licença Windows não estão incluídos nos Savings Plans", "pci_projects_project_instances_add_windows_gen3_license_unit": "/hora + IVA", "pci_projects_project_instances_add_windows_gen3_license_unit_w_core": "/vCore /hora + IVA", diff --git a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.component.js b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.component.js index 9f429fc2d422..8abd1f205928 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.component.js +++ b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.component.js @@ -20,5 +20,6 @@ export default { customerRegions: '<', imageInformation: '<', hourlyPriceInformation: '<', + getUAppUrl: '<', }, }; diff --git a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.controller.js b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.controller.js index af5c9997035e..4a45f37dbd69 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.controller.js +++ b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.controller.js @@ -5,6 +5,7 @@ import Flavor from '../../../../../components/project/flavors-list/flavor.class' import Instance from '../../../../../components/project/instance/instance.class'; import { EDIT_PAGE_SECTIONS } from '../instance.constants'; import { INSTANCE_PRICING_LINKS } from '../../instances.constants'; +import { PCI_FEATURES } from '../../../project.constants'; export default class PciInstanceEditController { /* @ngInject */ @@ -55,6 +56,12 @@ export default class PciInstanceEditController { this.loadMessages(); this.updateInstanceFlavor(); + this.getUAppUrl( + 'public-cloud', + `#/pci/projects/${this.projectId}/savings-plan`, + ).then((url) => { + this.savingsPlanUrl = url; + }); } updateInstanceFlavor() { @@ -63,6 +70,13 @@ export default class PciInstanceEditController { )?.blobs?.tags; } + get isSavingsPlanAvailable() { + return ( + this.pciFeatures.isFeatureAvailable(PCI_FEATURES.PRODUCTS.SAVINGS_PLAN) && + !this.instance.isLocalZone + ); + } + loadMessages() { this.messageHandlers = reduce( this.messageContainers, diff --git a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.html b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.html index 082d807f26c5..2b92bd6802ae 100644 --- a/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.html +++ b/packages/manager/modules/pci/src/projects/project/instances/instance/edit/edit.html @@ -366,14 +366,24 @@

-

+ + + +