sync: master to develop

sync: master to develop

packages/manager/apps/telecom/src/app/telecom/pack/migration/confirm/pack-migration-confirm.html

@@ -304,6 +304,17 @@ <h3 data-translate="telecom_pack_migration_doing"></h3>
             </div>
         </div>
 
+        <oui-message
+            type="info"
+            data-ng-if="$ctrl.process.selectedOffer.changeTechno"
+        >
+            <p
+                class="mb-0"
+                data-ng-repeat="line in [1,2,3] track by $index"
+                data-translate="{{ 'telecom_pack_migration_confirm_temporary_pack_creation_line_' + line}}"
+            ></p>
+        </oui-message>
+
         <div class="widget-presentation" data-ng-if="!$ctrl.loading.migrate">
             <h2
                 class="widget-presentation-title"

packages/manager/apps/telecom/src/app/telecom/pack/migration/offers/pack-migration-offers.controller.js

@@ -176,14 +176,15 @@ export default class TelecomPackMigrationOffersCtrl {
       }
     });
 
-    // Update meeting flag if xDSL => fiber offer
+    // Update meeting flag and techno change if xDSL => fiber offer
     if (
       this.process.pack.offerDescription
         .toLowerCase()
         .includes(this.OFFER_XDSL) &&
       selectedOffer.offerName.toLowerCase().includes(this.OFFER_FIBER)
     ) {
       set(selectedOffer, 'needMeeting', true);
+      set(selectedOffer, 'changeTechno', true);
     }
 
     this.loading.init = true;

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_de_DE.json

@@ -207,5 +207,8 @@
   "telecom_pack_migration_ont_shipping_explain": "Optical Network Termination (NT) ist ein Netzwerkgerät, mit dem Ihr Modem an die PTO angeschlossen werden kann.",
   "telecom_pack_migration_ont_shipping_contact": "Lieferkontakt",
   "telecom_pack_migration_ont_shipping_confirm": "Diesen Lieferkontakt bestätigen",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Beim Laden Ihrer Kontakte ist ein Fehler aufgetreten. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Beim Laden Ihrer Kontakte ist ein Fehler aufgetreten. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Während des Übergangs zu Ihrem neuen Angebot wird ein temporäres Paket erstellt, um die Kontinuität der Dienstleistung sicherzustellen",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Dieses Paket wird automatisch gelöscht, sobald Ihre Fibre-Bestellung abgeschlossen ist.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Es ist keine Änderung oder Löschung Ihrerseits erforderlich: der Wechsel zu Ihrem Fibre-Zugang erfolgt vollautomatisch."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_en_GB.json

@@ -209,5 +209,8 @@
   "telecom_pack_migration_ont_shipping_explain": "ONT (Optical Network Termination) is a network device that connects your modem to the FTP.",
   "telecom_pack_migration_ont_shipping_contact": "Delivery contact",
   "telecom_pack_migration_ont_shipping_confirm": "Confirm this shipping contact",
-  "telecom_pack_migration_ont_shipping_addresses_error": "An error has occurred loading your contacts. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "An error has occurred loading your contacts. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "During the transition to your new solution, a temporary pack will be created to ensure continuity of service",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "This pack will be automatically deleted once your Fiber order is finalized.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "No modification or deletion action is necessary on your part: the switch to your Fiber access will be fully automated."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_es_ES.json

@@ -207,5 +207,8 @@
   "telecom_pack_migration_ont_shipping_explain": "El ONT (Optical Network Termination) es un dispositivo de red que permite conectar el módem a la PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Contacto de entrega",
   "telecom_pack_migration_ont_shipping_confirm": "Confirmar este contacto de entrega",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Se ha producido un error al cargar los contactos. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Se ha producido un error al cargar los contactos. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Durante la transición a su nuevo producto, se creará un pack temporal para garantizar la continuidad del servicio",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Este pack se eliminará automáticamente una vez finalizado el pedido de Fibra.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "No es necesario que realice ninguna acción de modificación o eliminación: el paso a su acceso de fibra se realizará de forma totalmente automatizada."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_CA.json

@@ -209,5 +209,8 @@
   "telecom_pack_migration_ont_shipping_explain": "L'ONT (Optical Network Termination) est un équipement réseau qui permet de raccorder votre modem à la PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Contact de livraison",
   "telecom_pack_migration_ont_shipping_confirm": "Confirmer ce contact de livraison",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Durant la transition vers votre nouvelle offre, un pack temporaire sera créé pour assurer la continuité du service",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Ce pack sera automatiquement supprimé une fois votre commande Fibre finalisée.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Aucune action de modification ou de suppression de votre part n'est nécessaire : le passage vers votre accès Fibre se fera de manière entièrement automatisée."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_FR.json

@@ -209,5 +209,8 @@
   "telecom_pack_migration_ont_shipping_explain": "L'ONT (Optical Network Termination) est un équipement réseau qui permet de raccorder votre modem à la PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Contact de livraison",
   "telecom_pack_migration_ont_shipping_confirm": "Confirmer ce contact de livraison",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Durant la transition vers votre nouvelle offre, un pack temporaire sera créé pour assurer la continuité du service",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Ce pack sera automatiquement supprimé une fois votre commande Fibre finalisée.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Aucune action de modification ou de suppression de votre part n'est nécessaire : le passage vers votre accès Fibre se fera de manière entièrement automatisée."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_it_IT.json

@@ -209,5 +209,8 @@
   "telecom_pack_migration_ont_shipping_explain": "L'ONT (Optical Network Termination) è un dispositivo di rete che permette di collegare il vostro modem alla PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Contatto di consegna",
   "telecom_pack_migration_ont_shipping_confirm": "Conferma il contatto di consegna",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Si è verificato un errore durante il caricamento dei tuoi contatti. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Si è verificato un errore durante il caricamento dei tuoi contatti. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Durante la transizione verso la nuova offerta, verrà creato un pack temporaneo per assicurare la continuità del servizio",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Questo pack verrà eliminato automaticamente una volta completato l'ordine Fibre.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Nessuna azione di modifica o eliminazione da parte tua è necessaria: il passaggio verso il tuo accesso Fibre sarà completamente automatizzato."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pl_PL.json

@@ -208,5 +208,8 @@
   "telecom_pack_migration_ont_shipping_explain": "ONT (Optical Network Termination) to urządzenie sieciowe, które pozwala na podłączenie modemu do PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Kontakt dostawy",
   "telecom_pack_migration_ont_shipping_confirm": "Potwierdź ten kontakt wysyłkowy",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Wystąpił błąd podczas pobierania kontaktów. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Wystąpił błąd podczas pobierania kontaktów. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "W trakcie przejścia na Twoją nową ofertę zostanie stworzony tymczasowy pakiet, który ma zapewnić ciągłość usługi",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Ten pakiet zostanie automatycznie usunięty po sfinalizowaniu zamówienia Fibre.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Nie musisz wykonywać żadnych czynności związanych z modyfikacją lub usuwaniem danych: migracja na dostęp światłowodowy zostanie wykonana w pełni automatycznie."
 }

packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pt_PT.json

@@ -209,5 +209,8 @@
   "telecom_pack_migration_ont_shipping_explain": "O ONT (Optical Network Termination) é um equipamento de rede que permite ligar o seu modem à PTO.",
   "telecom_pack_migration_ont_shipping_contact": "Contacto de entrega",
   "telecom_pack_migration_ont_shipping_confirm": "Confirmar este contacto de entrega",
-  "telecom_pack_migration_ont_shipping_addresses_error": "Ocorreu um erro aquando do carregamento dos seus contactos. {{error}}"
+  "telecom_pack_migration_ont_shipping_addresses_error": "Ocorreu um erro aquando do carregamento dos seus contactos. {{error}}",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_1": "Durante a transição para a sua nova oferta, será criado um pack temporário para assegurar a continuidade do serviço",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_2": "Este pack será automaticamente eliminado uma vez finalizada a encomenda de Fibra.",
+  "telecom_pack_migration_confirm_temporary_pack_creation_line_3": "Não é necessária nenhuma ação de modificação ou de eliminação da sua parte : a passagem para o seu acesso Fibra será efetuada de forma totalmente automatizada."
 }

packages/manager/apps/telecom/src/app/telecom/pack/move/pack-move.controller.js

@@ -122,6 +122,11 @@ export default class PackMoveCtrl {
       this.offer.selected.eligibilityReference = this.eligibilityReference;
       this.offer.selected.product = this.offersEligible[0].product;
       this.offer.selected.isOfferFTTH = this.isOfferFTTH;
+
+      // Check if techno changed (from xDSL to Fiber)
+      this.offer.selected.technoChange =
+        !this.offer.current.isFTTH && this.isOfferFTTH;
+
       if (this.isOfferFTTH) {
         // Retrieve multi OTP flag
         const selectedLineOffer = this.selectedLine.offers.filter(

packages/manager/apps/telecom/src/app/telecom/pack/move/resume/move-resume.html

@@ -333,6 +333,14 @@ <h3 data-translate="pack_move_doing"></h3>
             </div>
         </div>
 
+        <oui-message type="info" data-ng-if="$ctrl.offer.selected.technoChange">
+            <p
+                class="mb-0"
+                data-ng-repeat="line in [1,2,3] track by $index"
+                data-translate="{{ 'pack_move_confirm_temporary_pack_creation_line_' + line}}"
+            ></p>
+        </oui-message>
+
         <div class="widget-presentation">
             <h2
                 class="widget-presentation-title"

packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_FR.json

@@ -293,5 +293,8 @@
   "pack_move_ont_shipping_explain": "L'ONT (Optical Network Termination) est un équipement réseau qui permet de raccorder votre modem à la PTO.",
   "pack_move_ont_shipping_contact": "Contact de livraison",
   "pack_move_ont_shipping_confirm": "Confirmer ce contact de livraison",
-  "pack_move_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}"
+  "pack_move_ont_shipping_addresses_error": "Une erreur est survenue lors du chargement de vos contacts. {{error}}",
+  "pack_move_confirm_temporary_pack_creation_line_1": "Durant la transition vers votre nouvelle offre, un pack temporaire sera créé pour assurer la continuité du service.",
+  "pack_move_confirm_temporary_pack_creation_line_2": "Ce pack sera automatiquement supprimé une fois votre commande Fibre finalisée.",
+  "pack_move_confirm_temporary_pack_creation_line_3": "Aucune action de modification ou de suppression de votre part n'est nécessaire : le passage vers votre accès Fibre se fera de manière entièrement automatisée."
 }

packages/manager/apps/telecom/src/components/telecom/telephony/scheduler/scheduler.directive.js

@@ -117,6 +117,7 @@ export default /* @ngInject */ ($compile, $locale, coreConfig) => ({
           const { x, y } = element[0].getBoundingClientRect();
           const nearFromBottomBorder = y >= (3 * window.screen.height) / 4;
           const nearFromRightBorder = x >= (3 * window.screen.width) / 4;
+          const nearFromTopBorder = y <= window.screen.height / 4;
 
           if (nearFromRightBorder) {
             return 'auto right';
@@ -125,7 +126,11 @@ export default /* @ngInject */ ($compile, $locale, coreConfig) => ({
             return 'top left';
           }
 
-          return 'auto left';
+          if (nearFromTopBorder) {
+            return 'bottom auto';
+          }
+
+          return 'top auto';
         },
         'data-popover-is-open': 'event.inEdition',
         'data-popover-class': 'pretty-popover telephony-scheduler-events-popup',

packages/manager/apps/web/client/app/configuration/configuration.html

@@ -8,7 +8,7 @@
             href="{{ :: $ctrl.banner2024.url }}"
         >
             <img
-                src="{{ :: $ctrl.banner2024.banner }}"
+                data-ng-src="{{ :: $ctrl.banner2024.banner }}"
                 alt="{{'common_offers_banner_alt' | translate}}"
                 class="img-responsive"
             />

packages/manager/apps/web/client/app/hosting/dashboard/hosting.controller.js

@@ -41,7 +41,6 @@ export default class {
     emailOptionIds,
     emailOptionDetachInformation,
     envvarsLink,
-    freedomLink,
     ftpLink,
     isEmailDomainAvailable,
     isLocalSeoAvailable,
@@ -53,7 +52,6 @@ export default class {
     WucUser,
     HostingDatabase,
     HostingDomain,
-    HostingFreedom,
     HostingIndy,
     HostingOvhConfig,
     HostingTask,
@@ -112,7 +110,6 @@ export default class {
     this.emailOptionIds = emailOptionIds;
     this.emailOptionDetachInformation = emailOptionDetachInformation;
     this.envvarsLink = envvarsLink;
-    this.freedomLink = freedomLink;
     this.ftpLink = ftpLink;
     this.isEmailDomainAvailable = isEmailDomainAvailable;
     this.isLocalSeoAvailable = isLocalSeoAvailable;
@@ -123,7 +120,6 @@ export default class {
     this.WucUser = WucUser;
     this.HostingDatabase = HostingDatabase;
     this.HostingDomain = HostingDomain;
-    this.HostingFreedom = HostingFreedom;
     this.HostingIndy = HostingIndy;
     this.HostingOvhConfig = HostingOvhConfig;
     this.HostingTask = HostingTask;
@@ -441,17 +437,12 @@ export default class {
           : this.$q.all({
               email: this.getAssociatedEmail(),
               indys: this.HostingIndy.getIndys(this.$stateParams.productId),
-              freedoms: this.HostingFreedom.getFreedoms(
-                this.$stateParams.productId,
-                { forceRefresh: false },
-              ),
               hosting,
             }),
       )
-      .then(({ indys, freedoms, hosting }) => {
+      .then(({ indys, hosting }) => {
         this.hosting = hosting;
         this.indys = indys;
-        this.freedoms = freedoms;
       });
   }
 

packages/manager/apps/web/client/app/hosting/dashboard/hosting.html

@@ -237,11 +237,6 @@ <h1 class="d-inline-block mb-0 word-break">
             >
                 <span data-translate="hosting_tab_INDY"></span>
             </oui-header-tabs-item>
-            <oui-header-tabs-item
-                data-ng-if="$ctrl.freedoms.length > 0"
-                href="{{ $ctrl.freedomLink }}"
-                active="$ctrl.currentActiveLink() === $ctrl.freedomLink"
-            ></oui-header-tabs-item>
             <oui-header-tabs-divider
                 data-ng-if="!$ctrl.hosting.isCloudWeb && $ctrl.isEmailDomainAvailable"
             ></oui-header-tabs-divider>

packages/manager/apps/web/client/app/hosting/dashboard/hosting.module.js

@@ -7,7 +7,6 @@ import cron from '../cron/cron.module';
 import database from '../database/hosting-database.module';
 import envvars from '../envvars/envvars.module';
 import generalInformations from '../general-informations/general-informations.module';
-import freedom from '../freedom/freedom.module';
 import ftp from '../ftp/ftp.module';
 import hostingModule from '../module/hosting-module.module';
 import indy from '../indy/indy.module';
@@ -30,7 +29,6 @@ angular
     cron,
     database,
     envvars,
-    freedom,
     ftp,
     generalInformations,
     hostingModule,

packages/manager/apps/web/client/app/hosting/dashboard/hosting.routes.js

@@ -87,8 +87,6 @@ export default /* @ngInject */ ($stateProvider) => {
         $state.href('app.hosting.dashboard.boost', $transition$.params()),
       indyLink: /* @ngInject */ ($state, $transition$) =>
         $state.href('app.hosting.dashboard.indy', $transition$.params()),
-      freedomLink: /* @ngInject */ ($state, $transition$) =>
-        $state.href('app.hosting.dashboard.freedom', $transition$.params()),
       goToEmails: /* @ngInject */ ($state) => (email) => {
         return $state.go('app.email.domain.mailing-list', {
           productId: email.domain,

packages/manager/apps/web/client/app/hosting/dashboard/translations/Messages_fr_FR.json

@@ -1302,22 +1302,6 @@
   "hosting_tab_INDY_error": "Une erreur est survenue :",
   "hosting_tab_INDY_state_rw": "Actif (rw)",
   "hosting_tab_INDY_state_off": "Désactivé",
-  "hosting_tab_FREEDOM": "Freedom",
-  "hosting_tab_FREEDOM_table_header_domain": "Domaine",
-  "hosting_tab_FREEDOM_table_header_type": "Type",
-  "hosting_tab_FREEDOM_table_header_status": "État",
-  "hosting_tab_FREEDOM_status_filter": "État du freedom :",
-  "hosting_tab_FREEDOM_status_ok": "OK",
-  "hosting_tab_FREEDOM_status_preset": "Prédéfini",
-  "hosting_tab_FREEDOM_status_blockedByCustomer": "Bloqué par le client",
-  "hosting_tab_FREEDOM_status_blockedBySystem": "Bloqué par le système",
-  "hosting_tab_FREEDOM_table_empty": "Aucun freedom.",
-  "hosting_tab_FREEDOM_error": "Une erreur est survenue :",
-  "hosting_dashboard_service_delete_freedom_title": "Supprimer un freedom",
-  "hosting_dashboard_service_delete_freedom_confirm": "Êtes-vous sûr de vouloir supprimer le freedom <strong>{{t0}}</strong> ?",
-  "hosting_dashboard_service_delete_freedom_success": "Le freedom {{t0}} a été supprimé avec succès.",
-  "hosting_dashboard_service_delete_freedom_warning": "Attention, la suppression de ce freedom sera irréversible.",
-  "hosting_dashboard_service_delete_freedom_info": "Le renouvellement de votre hébergement ne renouvellera plus gratuitement ce domaine.",
   "hosting_common_no_filter": "Aucun filtre",
   "hosting_tab_DOMAINS_ovhcontrol_token": "token ovhcontrol",
   "hosting_tab_DOMAINS_ovhcontrol_token_help": "Valeur à renseigner dans un champ TXT chez le fournisseur possédant le nom de domaine afin de l'ajouter à votre hébergement.",