From fa71543d9d20fc87a88ad10b99c040d6b65c9f35 Mon Sep 17 00:00:00 2001 From: Anoop N Date: Tue, 8 Aug 2023 12:35:10 +0530 Subject: [PATCH 1/2] fix(dedicated.server): order private bandwidth upgrade (#9815) ref: DTRSD-118479 Signed-off-by: Anoop N --- .../bandwidth/private-order/private-order.component.js | 2 +- .../bandwidth/private-order/private-order.routing.js | 8 +++++++- .../server/bandwidth/private-order/template.html | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.component.js b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.component.js index 5cf496004cc0..0e4a6c843cf5 100644 --- a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.component.js +++ b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.component.js @@ -4,11 +4,11 @@ export default { template, bindings: { alertError: '<', - atTrack: '<', goBack: '<', hasDefaultPaymentMethod: '<', serverName: '<', specifications: '<', + trackClick: '<', trackingPrefix: '<', user: '<', handleError: '<', diff --git a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.routing.js b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.routing.js index a3739bda2fcc..e600e698d130 100644 --- a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.routing.js +++ b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/private-order.routing.js @@ -33,7 +33,13 @@ export default /* @ngInject */ ($stateProvider) => { ), )?.serviceId, ), - trackingPrefix: () => + trackClick: /* @ngInject */ (atInternet) => (name) => + atInternet.trackClick({ + name, + type: 'action', + chapter1: 'dedicated', + }), + trackingPrefix: /* @ngInject */ () => 'dedicated::server::interfaces::bandwidth-private-order::', }, }); diff --git a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/template.html b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/template.html index f9046f16bff1..887ca9a9bc0c 100644 --- a/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/template.html +++ b/packages/manager/apps/dedicated/client/app/dedicated/server/bandwidth/private-order/template.html @@ -2,7 +2,7 @@ service-name="{{ $ctrl.server.name }}" on-error="$ctrl.handleError(error)" on-success="$ctrl.handleSuccess(message)" - at-track="$ctrl.atTrack" + track-click="$ctrl.trackClick" go-back="$ctrl.goBack" has-default-payment-method="$ctrl.hasDefaultPaymentMethod" server-name="$ctrl.serverName" From cf7bc67a7f0984ec6bacfd9d7073d0449174b480 Mon Sep 17 00:00:00 2001 From: JacquesLarique <134954692+JacquesLarique@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:06:42 +0200 Subject: [PATCH 2/2] feat(web.hosting): hide contracts list when empty (#9760) ref: MANAGER-11980 Signed-off-by: Jacques Larique Co-authored-by: CDS Translator Agent --- .../app/hosting/dashboard/translations/Messages_de_DE.json | 3 ++- .../app/hosting/dashboard/translations/Messages_en_GB.json | 3 ++- .../app/hosting/dashboard/translations/Messages_es_ES.json | 3 ++- .../app/hosting/dashboard/translations/Messages_fr_CA.json | 1 + .../app/hosting/dashboard/translations/Messages_fr_FR.json | 1 + .../app/hosting/dashboard/translations/Messages_it_IT.json | 3 ++- .../app/hosting/dashboard/translations/Messages_pl_PL.json | 3 ++- .../app/hosting/dashboard/translations/Messages_pt_PT.json | 3 ++- .../app/hosting/offer/upgrade/hosting-offer-upgrade.html | 7 ++++++- 9 files changed, 20 insertions(+), 7 deletions(-) diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json index 23871a6a9dd9..18ffa426c63c 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_de_DE.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "Mit Ihrem aktuellen Angebot verfügen Sie über eine einzige Datenbank. Wählen Sie ein höheres Angebot, um zusätzliche Datenbanken nutzen zu können.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Mit Ihrem aktuellen Angebot können Sie nur eine Website erstellen. Wählen Sie ein höheres Angebot, um eine weitere Website einrichten zu können.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Angebot wechseln", - "hosting_order_upgrade_modal_header_description": "Ihr Projekt entwickelt sich weiter? Ob Blog, professionelle Website, E-Commerce-Plattform oder Webanwendung: Wählen Sie das Angebot, das Ihren neuen Anforderungen am besten entspricht." + "hosting_order_upgrade_modal_header_description": "Ihr Projekt entwickelt sich weiter? Ob Blog, professionelle Website, E-Commerce-Plattform oder Webanwendung: Wählen Sie das Angebot, das Ihren neuen Anforderungen am besten entspricht.", + "hosting_order_upgrade_no_contract": "Keine neuen Verträge zur Validierung vorhanden" } diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json index 9515ca48b51c..ab5183021336 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_en_GB.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "You only have one database with your current solution. To get additional databases, upgrade to one of our higher plans.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "With your current plan, you can install only one website. To get an additional website, upgrade to one of our higher plans.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Change plan", - "hosting_order_upgrade_modal_header_description": "Is your project growing? From blogs and business websites to online shops and web applications, you can choose the best plan for your new needs." + "hosting_order_upgrade_modal_header_description": "Is your project growing? From blogs and business websites to online shops and web applications, you can choose the best plan for your new needs.", + "hosting_order_upgrade_no_contract": "No new contracts to validate" } diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json index dd876858bd63..b62882c72ebf 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_es_ES.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "Solo dispone de una base de datos con su solución actual. Para disfrutar de bases de datos adicionales, elija una de nuestras ofertas superiores.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Su solución actual solo le permite instalar un sitio web. Para disfrutar de un sitio web adicional, elija uno de nuestros planes de hosting superiores.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Cambiar de plan", - "hosting_order_upgrade_modal_header_description": "¿Su proyecto está cambiando? Blog, sitio web profesional, plataforma de e-commerce o aplicación web: elija el producto más adaptado a sus nuevas necesidades." + "hosting_order_upgrade_modal_header_description": "¿Su proyecto está cambiando? Blog, sitio web profesional, plataforma de e-commerce o aplicación web: elija el producto más adaptado a sus nuevas necesidades.", + "hosting_order_upgrade_no_contract": "No hay ningún contrato pendiente de validación." } diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json index 9faf636ab36e..f69cd063a94b 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_CA.json @@ -1073,6 +1073,7 @@ "hosting_order_upgrade_start_time_info": "Tout changement d’offre Cloud Web entraîne une coupure de service de 15 minutes au maximum après le début de l’opération. Nous vous conseillons donc d’opter pour une migration durant la nuit pour limiter les pertes de trafic.", "hosting_order_upgrade_start_time_summary_today": "Mise à jour prévue à {{time}} aujourd'hui.", "hosting_order_upgrade_start_time_summary_tomorrow": "Mise à jour prévue à {{time}} demain.", + "hosting_order_upgrade_no_contract": "Pas de nouveaux contrats à valider", "hosting_migrate_my_ovh_org_success": "La migration de votre domaine ovh.org a bien été prise en compte. Vous recevrez un e-mail lorsqu'elle sera terminée.", "hosting_migrate_my_ovh_org_error": "Une erreur est survenue lors de la migration de votre domaine ovh.org.", "hosting_tab_DATABASES_configuration_order_title_button_public": "Commander une base de données", diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json index 9faf636ab36e..f69cd063a94b 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json @@ -1073,6 +1073,7 @@ "hosting_order_upgrade_start_time_info": "Tout changement d’offre Cloud Web entraîne une coupure de service de 15 minutes au maximum après le début de l’opération. Nous vous conseillons donc d’opter pour une migration durant la nuit pour limiter les pertes de trafic.", "hosting_order_upgrade_start_time_summary_today": "Mise à jour prévue à {{time}} aujourd'hui.", "hosting_order_upgrade_start_time_summary_tomorrow": "Mise à jour prévue à {{time}} demain.", + "hosting_order_upgrade_no_contract": "Pas de nouveaux contrats à valider", "hosting_migrate_my_ovh_org_success": "La migration de votre domaine ovh.org a bien été prise en compte. Vous recevrez un e-mail lorsqu'elle sera terminée.", "hosting_migrate_my_ovh_org_error": "Une erreur est survenue lors de la migration de votre domaine ovh.org.", "hosting_tab_DATABASES_configuration_order_title_button_public": "Commander une base de données", diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json index 2f48555bb43d..d60408043765 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_it_IT.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "Con la soluzione attuale disponi di un solo database. Per usufruire di database aggiuntivi, scegli un piano superiore.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "La soluzione attuale permette di installare un solo sito. Per usufruire di un sito aggiuntivo, scegli un piano superiore.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Modificare soluzione", - "hosting_order_upgrade_modal_header_description": "Il tuo progetto si evolve? Blog, sito professionale, piattaforma e-commerce o applicazione Web: scegli la soluzione più adatta alle tue nuove esigenze." + "hosting_order_upgrade_modal_header_description": "Il tuo progetto si evolve? Blog, sito professionale, piattaforma e-commerce o applicazione Web: scegli la soluzione più adatta alle tue nuove esigenze.", + "hosting_order_upgrade_no_contract": "Nessun nuovo contratto da convalidare" } diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json index c68fc31be036..7130ca70751a 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pl_PL.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "Dysponujesz jedną bazą danych w ramach aktualnej oferty. Aby korzystać z dodatkowych baz danych, wybierz jedną z naszych usług.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "Aktualna oferta pozwala na zainstalowanie jednej strony. Aby skorzystać z dodatkowej strony, wybierz jedną z wyższych ofert.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Zmień ofertę", - "hosting_order_upgrade_modal_header_description": "Twój projekt dynamicznie się rozwija? Blog, profesjonalna strona WWW, platforma e-commerce lub aplikacja internetowa: wybierz ofertę najlepiej dopasowaną do Twoich nowych potrzeb." + "hosting_order_upgrade_modal_header_description": "Twój projekt dynamicznie się rozwija? Blog, profesjonalna strona WWW, platforma e-commerce lub aplikacja internetowa: wybierz ofertę najlepiej dopasowaną do Twoich nowych potrzeb.", + "hosting_order_upgrade_no_contract": "Brak nowych regulaminów do zatwierdzenia" } diff --git a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json index 8efb56075ac2..b0dbd18ba3a4 100644 --- a/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json +++ b/packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_pt_PT.json @@ -1367,5 +1367,6 @@ "hosting_dashboard_service_change_offer_explanation_only_one": "Com a sua oferta atual, dispõe de uma única base de dados. Para beneficiar de bases de dados suplementares, escolha uma das nossas ofertas superiores.", "hosting_tab_DOMAINS_configuration_add_step1_only_one_db_and_no_left": "A sua oferta atual permite-lhe instalar um único site. Para beneficiar de um site suplementar, escolha uma das nossas ofertas superiores.", "hosting_tab_DOMAINS_configuration_add_buttom_update_offer": "Mudar de oferta", - "hosting_order_upgrade_modal_header_description": "O seu projeto precisa de evoluir? Blogue, site profissional, plataforma de e-commerce ou aplicação web: escolha a oferta mais adaptada às suas novas necessidades." + "hosting_order_upgrade_modal_header_description": "O seu projeto precisa de evoluir? Blogue, site profissional, plataforma de e-commerce ou aplicação web: escolha a oferta mais adaptada às suas novas necessidades.", + "hosting_order_upgrade_no_contract": "Não há novos contratos a validar" } diff --git a/packages/manager/apps/web/client/app/hosting/offer/upgrade/hosting-offer-upgrade.html b/packages/manager/apps/web/client/app/hosting/offer/upgrade/hosting-offer-upgrade.html index bd617e92eb58..7fbafaa5062e 100644 --- a/packages/manager/apps/web/client/app/hosting/offer/upgrade/hosting-offer-upgrade.html +++ b/packages/manager/apps/web/client/app/hosting/offer/upgrade/hosting-offer-upgrade.html @@ -113,14 +113,19 @@ +