diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.constant.js b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.constant.js index d61595232fab..780add974638 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.constant.js +++ b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.constant.js @@ -12,6 +12,8 @@ export const ACCESS_TYPE = { sdsl: 'sdsl', vdsl: 'vdsl', ftth: 'ftth', + ftto: 'ftto', + ftte: 'ftte', }; export const URL_CLOSURE_INFO = diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.controller.js b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.controller.js index 35b984e7445f..c5eac97b3558 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.controller.js +++ b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.controller.js @@ -100,9 +100,12 @@ export default class XdslAccessListCtrl { // Retrieve service info for each service const serviceList = sortedServices.map((service) => { if ( - ![this.ACCESS_TYPE.ftth, this.ACCESS_TYPE.sdsl].includes( - service.accessType, - ) + ![ + this.ACCESS_TYPE.ftth, + this.ACCESS_TYPE.ftte, + this.ACCESS_TYPE.ftto, + this.ACCESS_TYPE.sdsl, + ].includes(service.accessType) ) { return this.XdslAccessListService.getFiberEligibilityList( service.accessName, diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.html b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.html index e21f943b6258..68bcbf447bd8 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.html +++ b/packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.html @@ -45,7 +45,7 @@ data-sortable > { set( service, @@ -109,6 +121,11 @@ export default class TelecomPackMigrationConfirmCtrl { ); let firstMensuality = totalOfferPrice + gtrComfortFees + installFees; + if (this.process.selectedOffer.promotion) { + firstMensuality += this.process.selectedOffer.promotion.subscription + .discount.value; + } + if ( this.process.selectedOffer.needNewModem && this.process.shipping.mode === 'transporter' diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/confirm/pack-migration-confirm.html b/packages/manager/apps/telecom/src/app/telecom/pack/migration/confirm/pack-migration-confirm.html index 063d819eee0f..9d9cbabb097d 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/confirm/pack-migration-confirm.html +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/confirm/pack-migration-confirm.html @@ -101,6 +101,34 @@

data-title="{{ 'telecom_pack_migration_confirm_header_total' | translate }}" > + + + + + + + + + @@ -225,6 +253,15 @@

+ + @@ -235,10 +272,15 @@

+

@@ -188,13 +187,13 @@ data-ng-repeat="offer in $ctrl.process.migrationOffers.result.offers track by $index" >
{{ priceDiscount }} zzgl. MwSt./Monat für {{duration}} Monate dann {{ price }} zzgl. MwSt./Monat, gültig ab Lieferung Ihres neuen Zugangs. Sie werden per E-Mail informiert." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_en_GB.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_en_GB.json index bd9911b15d40..e58f7f6262bf 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_en_GB.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_en_GB.json @@ -152,7 +152,7 @@ "telecom_pack_migration_promotion_description": "Special offer available until {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} months included", "telecom_pack_migration_promotion_installation_fees_offered": "Setup fees included", - "telecom_pack_migration_confirm_promotion": "The setup fees and the first {{ duration }} months of your new subscription are included (excluding modem rental, additional options and transportation).", + "telecom_pack_migration_confirm_promotion": "The installation fees for your new subscription are waived (excluding modem rental, additional options, or transport fees).", "telecom_pack_migration_confirm_first_year_promo": "Reduced price for the first year", "telecom_pack_migration_confirm_modem_rental": "Modem location", "telecom_pack_migration_confirm_provider_infra": "Additional fees", @@ -213,5 +213,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "Online appointment booking is not available. We will contact you via phone to arrange a convenient date and time slot for you." + "telecom_pack_migration_phone_call_for_new_meeting": "Online appointment booking is not available. We will contact you via phone to arrange a convenient date and time slot for you.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50% for {{ duration }} months", + "telecom_pack_migration_confirm_promotion_table": "Promotion ({{ duration }} months)", + "telecom_pack_migration_confirm_discount_displayed": " for {{ duration }} months, then", + "telecom_pack_migration_confirm_new_offer_price_discount": "Your new monthly subscription is: {{ priceDiscount }} excl. VAT/month for {{duration}} months then {{ price }} excl. VAT, applicable from the delivery of your new access. You will be informed by email." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_es_ES.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_es_ES.json index 558a5b81f86c..43e685d9e55d 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_es_ES.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_es_ES.json @@ -157,7 +157,7 @@ "telecom_pack_migration_promotion_description": "Promoción disponible hasta el {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} meses gratis", "telecom_pack_migration_promotion_installation_fees_offered": "Sin gastos de instalación", - "telecom_pack_migration_confirm_promotion": "Los gastos de instalación y los {{ duration }} primeros meses de la nueva suscripción son gratuitos (sin incluir el alquiler de módem, las opciones adicionales o los gastos de transporte).", + "telecom_pack_migration_confirm_promotion": "Los costos de instalación de su nueva suscripción son gratuitos (excluyendo el alquiler del módem, opciones adicionales o costos de transporte).", "telecom_pack_migration_confirm_first_year_promo": "Descuento el primer año", "telecom_pack_migration_confirm_modem_rental": "Alquiler módem", "telecom_pack_migration_confirm_provider_infra": "Gastos adicionales", @@ -211,5 +211,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "El servicio de cita previa en línea no está disponible. Nos pondremos en contacto con usted por teléfono para ofrecerle la fecha y la franja horaria que más le convenga." + "telecom_pack_migration_phone_call_for_new_meeting": "El servicio de cita previa en línea no está disponible. Nos pondremos en contacto con usted por teléfono para ofrecerle la fecha y la franja horaria que más le convenga.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % durante {{ duration }} meses", + "telecom_pack_migration_confirm_promotion_table": "Promoción ({{ duration }} meses)", + "telecom_pack_migration_confirm_discount_displayed": " durante {{ duration }} meses, luego", + "telecom_pack_migration_confirm_new_offer_price_discount": "Su nueva suscripción mensual es de: {{ priceDiscount }} sin IVA/mes durante {{duration}} meses luego {{ price }} sin IVA/mes, aplicable desde la entrega de su nuevo acceso. Se le informará por correo electrónico." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_CA.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_CA.json index b313f9f7be85..c59043eb5116 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_CA.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_CA.json @@ -159,7 +159,7 @@ "telecom_pack_migration_promotion_description": "Promotion disponible jusqu'au {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} mois offerts", "telecom_pack_migration_promotion_installation_fees_offered": "Frais de mise en service offerts", - "telecom_pack_migration_confirm_promotion": "Les frais d'installation et les {{ duration }} premiers mois de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport).", + "telecom_pack_migration_confirm_promotion": "Les frais d'installation de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport).", "telecom_pack_migration_confirm_first_year_promo": "Réduction sur la première année", "telecom_pack_migration_confirm_modem_rental": "Location modem", "telecom_pack_migration_confirm_provider_infra": "Frais supplémentaires", @@ -213,5 +213,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent." + "telecom_pack_migration_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % pendant {{ duration }} mois", + "telecom_pack_migration_confirm_promotion_table": "Promotion ({{ duration }} mois)", + "telecom_pack_migration_confirm_discount_displayed": " pendant {{ duration }} mois, puis", + "telecom_pack_migration_confirm_new_offer_price_discount": "Votre nouvel abonnement mensuel s'élève à : {{ priceDiscount }} HT/mois pendant {{duration}} mois puis {{ price }} HT/mois, applicable dès livraison de votre nouvel accès. Vous en serez informé par e-mail." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_FR.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_FR.json index b313f9f7be85..c59043eb5116 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_FR.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_fr_FR.json @@ -159,7 +159,7 @@ "telecom_pack_migration_promotion_description": "Promotion disponible jusqu'au {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} mois offerts", "telecom_pack_migration_promotion_installation_fees_offered": "Frais de mise en service offerts", - "telecom_pack_migration_confirm_promotion": "Les frais d'installation et les {{ duration }} premiers mois de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport).", + "telecom_pack_migration_confirm_promotion": "Les frais d'installation de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport).", "telecom_pack_migration_confirm_first_year_promo": "Réduction sur la première année", "telecom_pack_migration_confirm_modem_rental": "Location modem", "telecom_pack_migration_confirm_provider_infra": "Frais supplémentaires", @@ -213,5 +213,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent." + "telecom_pack_migration_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % pendant {{ duration }} mois", + "telecom_pack_migration_confirm_promotion_table": "Promotion ({{ duration }} mois)", + "telecom_pack_migration_confirm_discount_displayed": " pendant {{ duration }} mois, puis", + "telecom_pack_migration_confirm_new_offer_price_discount": "Votre nouvel abonnement mensuel s'élève à : {{ priceDiscount }} HT/mois pendant {{duration}} mois puis {{ price }} HT/mois, applicable dès livraison de votre nouvel accès. Vous en serez informé par e-mail." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_it_IT.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_it_IT.json index 42e88696c0fa..4071a899e86d 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_it_IT.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_it_IT.json @@ -188,7 +188,7 @@ "telecom_pack_migration_pto_yes_not_known_description": "Hai verificato di non avere il codice identificativo della presa ottica (PTO)? Questa operazione potrebbe avere un impatto sulla tempistica della connessione.", "telecom_pack_migration_promotion_description": "Promozione disponibile fino al {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} mesi inclusi", - "telecom_pack_migration_confirm_promotion": "Le spese di installazione e i primi {{ duration }} mesi del nuovo abbonamento sono incluse (locazione del modem, opzioni aggiuntive o spese di trasporto escluse).", + "telecom_pack_migration_confirm_promotion": "I costi di installazione del tuo nuovo abbonamento sono offerti (escluso il noleggio del modem, opzioni aggiuntive o spese di trasporto).", "telecom_pack_migration_confirm_first_year_promo": "Sconto per il primo anno", "telecom_pack_migration_confirm_modem_rental": "Locazione modem", "telecom_pack_migration_pack_access_error": "Impossibile caricare le informazioni relative al tuo pack.", @@ -213,5 +213,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "Il servizio di presa appuntamenti online non è disponibile. Verrai contattato telefonicamente per concordare una data e un orario adatti alle tue esigenze." + "telecom_pack_migration_phone_call_for_new_meeting": "Il servizio di presa appuntamenti online non è disponibile. Verrai contattato telefonicamente per concordare una data e un orario adatti alle tue esigenze.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % per {{ duration }} mesi", + "telecom_pack_migration_confirm_promotion_table": "Promozione ({{ duration }} mesi)", + "telecom_pack_migration_confirm_discount_displayed": " per {{ duration }} mesi, poi", + "telecom_pack_migration_confirm_new_offer_price_discount": "Il tuo nuovo abbonamento mensile ammonta a: {{ priceDiscount }} IVA esclusa/mese per {{duration}} mesi poi {{ price }} IVA esclusa, applicabile dalla consegna del tuo nuovo accesso. Ne sarai informato via e-mail." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pl_PL.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pl_PL.json index b16492700094..65b90362a339 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pl_PL.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pl_PL.json @@ -159,7 +159,7 @@ "telecom_pack_migration_promotion_description": "Promocja ważna do {{endDate}}", "telecom_pack_migration_promotion_subscription_months_offered": "{{duration}} miesiąc/e gratis", "telecom_pack_migration_promotion_installation_fees_offered": "Brak opłaty instalacyjnej", - "telecom_pack_migration_confirm_promotion": "Brak opłaty instalacyjnej i {{duration}} pierwszych miesięcy gratis (z wyjątkiem dzierżawy modemu, dodatkowych opcji lub kosztów transportu).", + "telecom_pack_migration_confirm_promotion": "Koszty instalacji nowej subskrypcji są oferowane (z wyjątkiem wynajmu modemu, dodatkowych opcji lub kosztów transportu).", "telecom_pack_migration_confirm_first_year_promo": "Rabat za pierwszy rok", "telecom_pack_migration_confirm_modem_rental": "Dzierżawa modemu", "telecom_pack_migration_confirm_provider_infra": "Dodatkowe koszty", @@ -212,5 +212,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "Rezerwacja terminu spotkania online jest niedostępna. Skontaktujemy się z Tobą telefonicznie, aby zaproponować dogodną datę i godzinę spotkania." + "telecom_pack_migration_phone_call_for_new_meeting": "Rezerwacja terminu spotkania online jest niedostępna. Skontaktujemy się z Tobą telefonicznie, aby zaproponować dogodną datę i godzinę spotkania.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % przez {{ duration }} miesięcy", + "telecom_pack_migration_confirm_promotion_table": "Promocja ({{ duration }} miesięcy)", + "telecom_pack_migration_confirm_discount_displayed": " przez {{ duration }} miesięcy, a następnie", + "telecom_pack_migration_confirm_new_offer_price_discount": "Twoja nowa subskrypcja miesięczna wynosi: {{ priceDiscount }} netto/miesiąc przez {{duration}} miesięcy, a następnie {{ price }} netto/miesiąc, obowiązujące od momentu dostarczenia nowego dostępu. Zostaniesz o tym poinformowany e-mailem." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pt_PT.json b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pt_PT.json index 6c3ec35f29ca..edef4b68706c 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pt_PT.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/migration/translations/Messages_pt_PT.json @@ -188,7 +188,7 @@ "telecom_pack_migration_pto_yes_not_known_description": "Verificou que não dispõe da referência da tomada óptica (PTO)? Isto pode afetar o tempo de ligação.", "telecom_pack_migration_promotion_description": "Promoção disponível até {{ endDate }}", "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} meses oferecidos", - "telecom_pack_migration_confirm_promotion": "As taxas de instalação e os {{ duration }} primeiros meses da sua nova subscrição são oferecidos (sem locação do modem, opções suplementares ou custos de transporte).", + "telecom_pack_migration_confirm_promotion": "Os custos de instalação da sua nova assinatura são oferecidos (exceto aluguel de modem, opções adicionais ou custos de transporte).", "telecom_pack_migration_confirm_first_year_promo": "Redução no primeiro ano", "telecom_pack_migration_confirm_modem_rental": "Locação modem", "telecom_pack_migration_pack_access_error": "Não conseguimos carregar as informações relativas ao seu pack.", @@ -213,5 +213,9 @@ "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.", - "telecom_pack_migration_phone_call_for_new_meeting": "A marcação online não está disponível. Será contactado por telefone para lhe propor uma data e uma hora que lhe convém." + "telecom_pack_migration_phone_call_for_new_meeting": "A marcação online não está disponível. Será contactado por telefone para lhe propor uma data e uma hora que lhe convém.", + "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % durante {{ duration }} meses", + "telecom_pack_migration_confirm_promotion_table": "Promoção ({{ duration }} meses)", + "telecom_pack_migration_confirm_discount_displayed": " durante {{ duration }} meses, depois", + "telecom_pack_migration_confirm_new_offer_price_discount": "A sua nova assinatura mensal é de: {{ priceDiscount }} HT/mês durante {{duration}} meses depois {{ price }} HT/mês, aplicável a partir da entrega do seu novo acesso. Você será informado por e-mail." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.controller.js b/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.controller.js index a160dd92d762..8be643186825 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.controller.js +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.controller.js @@ -455,4 +455,33 @@ export default class PackMoveOffersCtrl { ); } } + + getPromotionToDisplay(offer) { + switch (offer.prices.promotion.id) { + case this.PROMO_DISPLAY.PROMO_FTTH_2020: + return this.$translate.instant( + 'pack_move_promotion_subscription_months_offered', + + { + duration: this.PROMO_DISPLAY[ + offer.prices.promotion.subscription.duration + ].value, + }, + ); + + case this.PROMO_DISPLAY.PROMO_FTTH_2025: + return this.$translate.instant( + 'telecom_pack_migration_promotion_subscription_months_reduces', + + { + duration: this.PROMO_DISPLAY[ + offer.prices.promotion.subscription.duration + ].value, + }, + ); + + default: + return ''; + } + } } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.html b/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.html index 872c4d452817..f142d1b926e0 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.html +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/offers/move-offers.html @@ -77,7 +77,7 @@
@@ -164,17 +162,17 @@ data-ng-repeat="offer in $ctrl.offers track by $index" >
- 1 - + data-ng-bind="$ctrl.QUANTITY" + > - 1 - + data-ng-bind="$ctrl.QUANTITY" + > + + + + + + @@ -111,9 +134,8 @@

- 1 - + data-ng-bind="$ctrl.QUANTITY" + > - 1 - + data-ng-bind="$ctrl.QUANTITY" + > - 1 - + data-ng-bind="$ctrl.QUANTITY" + > + + @@ -218,10 +247,15 @@

+

{{ priceDiscount }} zzgl. MwSt./Monat für {{duration}} Monate dann {{ price }} zzgl. MwSt./Monat, gültig ab Lieferung Ihres neuen Zugangs. Sie werden per E-Mail informiert.", + "pack_move_confirm_promotion": "Die Installationsgebühren für Ihr neues Abonnement entfallen (außer für die Modemvermietung, zusätzliche Optionen oder Transportkosten)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_en_GB.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_en_GB.json index a902c22265e7..96c050fcc5d9 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_en_GB.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_en_GB.json @@ -296,5 +296,10 @@ "pack_move_confirm_temporary_pack_creation_line_1": "During the transition to your new solution, a temporary pack will be created to ensure continuity of service.", "pack_move_confirm_temporary_pack_creation_line_2": "This pack will be automatically deleted once your Fiber order is finalized.", "pack_move_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.", - "pack_move_phone_call_for_new_meeting": "Online appointment booking is not available. We will contact you via phone to arrange a convenient date and time slot for you." + "pack_move_phone_call_for_new_meeting": "Online appointment booking is not available. We will contact you via phone to arrange a convenient date and time slot for you.", + "pack_move_promotion_subscription_months_reduces": "-50% for {{ duration }} months", + "pack_move_confirm_promotion_table": "Promotion ({{ duration }} months)", + "pack_move_confirm_discount_displayed": " for {{ duration }} months, then", + "pack_move_confirm_new_offer_price_discount": "Your new monthly subscription is: {{ priceDiscount }} excl. VAT/month for {{duration}} months then {{ price }} excl. VAT/month, applicable from the delivery of your new access. You will be informed by email.", + "pack_move_confirm_promotion": "The installation fees for your new subscription are waived (excluding modem rental, additional options, or transport fees)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_es_ES.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_es_ES.json index 9e1ebee87191..6f9011c59fb3 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_es_ES.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_es_ES.json @@ -294,5 +294,10 @@ "pack_move_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.", "pack_move_confirm_temporary_pack_creation_line_2": "Este pack se eliminará automáticamente una vez finalizado el pedido de Fibra.", "pack_move_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.", - "pack_move_phone_call_for_new_meeting": "El servicio de cita previa en línea no está disponible. Nos pondremos en contacto con usted por teléfono para ofrecerle la fecha y la franja horaria que más le convenga." + "pack_move_phone_call_for_new_meeting": "El servicio de cita previa en línea no está disponible. Nos pondremos en contacto con usted por teléfono para ofrecerle la fecha y la franja horaria que más le convenga.", + "pack_move_promotion_subscription_months_reduces": "-50 % durante {{ duration }} meses", + "pack_move_confirm_promotion_table": "Promoción ({{ duration }} meses)", + "pack_move_confirm_discount_displayed": " durante {{ duration }} meses, luego", + "pack_move_confirm_new_offer_price_discount": "Su nueva suscripción mensual es de: {{ priceDiscount }} sin IVA/mes durante {{duration}} meses luego {{ price }} sin IVA/mes, aplicable desde la entrega de su nuevo acceso. Se le informará por correo electrónico.", + "pack_move_confirm_promotion": "Los gastos de instalación de su nueva suscripción son gratuitos (excluyendo el alquiler de módem, opciones adicionales o gastos de transporte)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_CA.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_CA.json index c7af5bac2595..71ecca4c4fbf 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_CA.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_CA.json @@ -296,5 +296,10 @@ "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.", - "pack_move_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent." + "pack_move_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent.", + "pack_move_promotion_subscription_months_reduces": "-50 % pendant {{ duration }} mois", + "pack_move_confirm_promotion_table": "Promotion ({{ duration }} mois)", + "pack_move_confirm_discount_displayed": " pendant {{ duration }} mois, puis", + "pack_move_confirm_new_offer_price_discount": "Votre nouvel abonnement mensuel s'élève à : {{ priceDiscount }} HT/mois pendant {{duration}} mois puis {{ price }} HT/mois, applicable dès livraison de votre nouvel accès. Vous en serez informé par e-mail.", + "pack_move_confirm_promotion": "Les frais d'installation de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_FR.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_FR.json index c7af5bac2595..71ecca4c4fbf 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_FR.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_fr_FR.json @@ -296,5 +296,10 @@ "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.", - "pack_move_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent." + "pack_move_phone_call_for_new_meeting": "La prise de rendez-vous en ligne n'est pas disponible. Vous serez contacté par téléphone pour vous proposer une date et un créneau horaire qui vous conviennent.", + "pack_move_promotion_subscription_months_reduces": "-50 % pendant {{ duration }} mois", + "pack_move_confirm_promotion_table": "Promotion ({{ duration }} mois)", + "pack_move_confirm_discount_displayed": " pendant {{ duration }} mois, puis", + "pack_move_confirm_new_offer_price_discount": "Votre nouvel abonnement mensuel s'élève à : {{ priceDiscount }} HT/mois pendant {{duration}} mois puis {{ price }} HT/mois, applicable dès livraison de votre nouvel accès. Vous en serez informé par e-mail.", + "pack_move_confirm_promotion": "Les frais d'installation de votre nouvel abonnement sont offerts (hors location de modem, options supplémentaires ou frais de transport)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_it_IT.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_it_IT.json index 60210f78ac27..7217fced10c6 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_it_IT.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_it_IT.json @@ -294,5 +294,10 @@ "pack_move_confirm_temporary_pack_creation_line_1": "Durante la transizione verso la nuova offerta, verrà creato un pack temporaneo per assicurare la continuità del servizio.", "pack_move_confirm_temporary_pack_creation_line_2": "Questo pack verrà eliminato automaticamente una volta completato l'ordine Fibre.", "pack_move_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.", - "pack_move_phone_call_for_new_meeting": "Il servizio di presa appuntamenti online non è disponibile. Verrai contattato telefonicamente per concordare una data e un orario adatti alle tue esigenze." + "pack_move_phone_call_for_new_meeting": "Il servizio di presa appuntamenti online non è disponibile. Verrai contattato telefonicamente per concordare una data e un orario adatti alle tue esigenze.", + "pack_move_promotion_subscription_months_reduces": "-50 % per {{ duration }} mesi", + "pack_move_confirm_promotion_table": "Promozione ({{ duration }} mesi)", + "pack_move_confirm_discount_displayed": " per {{ duration }} mesi, poi", + "pack_move_confirm_new_offer_price_discount": "Il tuo nuovo abbonamento mensile ammonta a : {{ priceDiscount }} IVA esclusa/mese per {{duration}} mesi poi {{ price }} IVA esclusa, applicabile dalla consegna del tuo nuovo accesso. Ne sarai informato via e-mail.", + "pack_move_confirm_promotion": "I costi di installazione del tuo nuovo abbonamento sono gratuiti (escluso il noleggio del modem, opzioni aggiuntive o spese di trasporto)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pl_PL.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pl_PL.json index 9fd79335f52b..6e14221802b0 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pl_PL.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pl_PL.json @@ -296,5 +296,10 @@ "pack_move_confirm_temporary_pack_creation_line_1": "W trakcie przejścia na Twoją nową ofertę zostanie stworzony tymczasowy pakiet, aby zapewnić ciągłość usługi.", "pack_move_confirm_temporary_pack_creation_line_2": "Ten pakiet zostanie automatycznie usunięty po sfinalizowaniu zamówienia Fibre.", "pack_move_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.", - "pack_move_phone_call_for_new_meeting": "Rezerwacja terminu spotkania online jest niedostępna. Skontaktujemy się z Tobą telefonicznie, aby zaproponować dogodną datę i godzinę spotkania." + "pack_move_phone_call_for_new_meeting": "Rezerwacja terminu spotkania online jest niedostępna. Skontaktujemy się z Tobą telefonicznie, aby zaproponować dogodną datę i godzinę spotkania.", + "pack_move_promotion_subscription_months_reduces": "-50 % przez {{ duration }} miesięcy", + "pack_move_confirm_promotion_table": "Promocja ({{ duration }} miesięcy)", + "pack_move_confirm_discount_displayed": " przez {{ duration }} miesięcy, a następnie", + "pack_move_confirm_new_offer_price_discount": "Twoja nowa miesięczna subskrypcja wynosi: {{ priceDiscount }} HT/miesiąc przez {{duration}} miesięcy, a następnie {{ price }} HT/miesiąc, obowiązujące od momentu dostarczenia dostępu do nowej usługi. Zostaniesz o tym poinformowany e-mailem.", + "pack_move_confirm_promotion": "Opłata za instalację nowej subskrypcji jest zwolniona (z wyjątkiem wynajmu modemu, dodatkowych opcji lub kosztów transportu)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pt_PT.json b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pt_PT.json index 9d558f80cdee..8a8e1359885a 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pt_PT.json +++ b/packages/manager/apps/telecom/src/app/telecom/pack/move/translations/Messages_pt_PT.json @@ -294,5 +294,10 @@ "pack_move_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.", "pack_move_confirm_temporary_pack_creation_line_2": "Este pack será automaticamente eliminado uma vez finalizada a encomenda de Fibra.", "pack_move_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.", - "pack_move_phone_call_for_new_meeting": "A marcação online não está disponível. Será contactado por telefone para lhe propor uma data e uma hora que lhe convém." + "pack_move_phone_call_for_new_meeting": "A marcação online não está disponível. Será contactado por telefone para lhe propor uma data e uma hora que lhe convém.", + "pack_move_promotion_subscription_months_reduces": "-50 % durante {{ duration }} meses", + "pack_move_confirm_promotion_table": "Promoção ({{ duration }} meses)", + "pack_move_confirm_discount_displayed": " durante {{ duration }} meses, depois", + "pack_move_confirm_new_offer_price_discount": "A sua nova assinatura mensal é de: {{ priceDiscount }} HT/mês durante {{duration}} meses depois {{ price }} HT/mês, aplicável a partir da entrega do seu novo acesso. Você será informado por e-mail.", + "pack_move_confirm_promotion": "Os custos de instalação da sua nova assinatura são oferecidos (exceto aluguer de modem, opções adicionais ou custos de transporte)." } diff --git a/packages/manager/apps/telecom/src/app/telecom/pack/slots/informations/informations.constants.js b/packages/manager/apps/telecom/src/app/telecom/pack/slots/informations/informations.constants.js index fd4084f27acd..978295cac95a 100644 --- a/packages/manager/apps/telecom/src/app/telecom/pack/slots/informations/informations.constants.js +++ b/packages/manager/apps/telecom/src/app/telecom/pack/slots/informations/informations.constants.js @@ -1,9 +1,8 @@ export const IG_MAP_URL = { - FR: 'https://www.ovhtelecom.fr/xdsl/incident/#/', + FR: 'https://status.isp.ovh.net/', }; -export const TRAVAUX_URL = - 'http://travaux.ovh.net/?project=20&status=all&perpage=50'; +export const TRAVAUX_URL = 'https://web-cloud.status-ovhcloud.com/'; export const GUIDES_URL = { FR: 'https://docs.ovh.com/fr/xdsl/', diff --git a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.constant.js b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.constant.js index 83c7db49476c..579f74a17ddd 100644 --- a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.constant.js +++ b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.constant.js @@ -10,6 +10,8 @@ export const ACCESS_TYPE = { sdsl: 'sdsl', vdsl: 'vdsl', ftth: 'ftth', + ftto: 'ftto', + ftte: 'ftte', }; export const CLOSURE_DETAIL_URL = diff --git a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.controller.js b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.controller.js index 55f8561ecf0f..ff28993ef74a 100644 --- a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.controller.js +++ b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.controller.js @@ -93,7 +93,13 @@ export default class FtthEligibilityCtrl { createServiceList(services) { // Retrieve service info for each service const list = services.map((service) => { - if (service.accessType !== this.ACCESS_TYPE.ftth) { + if ( + ![ + this.ACCESS_TYPE.ftth, + this.ACCESS_TYPE.ftte, + this.ACCESS_TYPE.ftto, + ].includes(service.accessType) + ) { return this.FtthEligibilityService.getFiberEligibilities( service.accessName, ).then((data) => diff --git a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.html b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.html index bc96b03bac6e..dbd79a1d284d 100644 --- a/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.html +++ b/packages/manager/modules/telecom-dashboard/src/ftth-eligibility/telecom-dashboard-ftth-eligibility.html @@ -43,7 +43,7 @@ data-sortable >