New release infra-network w44

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 =

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,

packages/manager/apps/telecom/src/app/telecom/pack/access-list/xdsl-access-list.html

@@ -45,7 +45,7 @@
             data-sortable
         >
             <span
-                data-translate="{{$row.accessType ===  $ctrl.ACCESS_TYPE.ftth ? 'xdsl_access_list_fiber' : 'xdsl_access_list_copper'}}"
+                data-translate="{{[$ctrl.ACCESS_TYPE.ftth, $ctrl.ACCESS_TYPE.ftte, $ctrl.ACCESS_TYPE.ftto].includes($row.accessType) ? 'xdsl_access_list_fiber' : 'xdsl_access_list_copper'}}"
             ></span>
         </oui-datagrid-column>
         <oui-datagrid-column

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

@@ -81,6 +81,18 @@ export default class TelecomPackMigrationConfirmCtrl {
       totalOfferPrice,
     );
 
+    let priceDiscount = 0;
+    this.discountPrice = null;
+
+    if (this.process.selectedOffer.promotion) {
+      priceDiscount =
+        totalOfferPrice +
+        this.process.selectedOffer.promotion.subscription.discount.value;
+      this.discountPrice = this.TucPackMigrationProcess.getPriceStruct(
+        priceDiscount,
+      );
+    }
+
     this.process.selectedOffer.subServicesToDelete.forEach((service) => {
       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'

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

@@ -101,6 +101,34 @@ <h3 data-translate="telecom_pack_migration_doing"></h3>
                                     data-title="{{ 'telecom_pack_migration_confirm_header_total' | translate }}"
                                 ></td>
                             </tr>
+                            <tr
+                                data-ng-if="$ctrl.process.selectedOffer.promotion"
+                            >
+                                <th
+                                    scope="row"
+                                    data-translate="telecom_pack_migration_confirm_promotion_table"
+                                    data-translate-values="{ duration: $ctrl.PROMO_DISPLAY[$ctrl.process.selectedOffer.promotion.subscription.duration].value }"
+                                    data-title="{{ 'telecom_pack_migration_confirm_header_entitled' | translate }}"
+                                ></th>
+
+                                <td
+                                    class="text-price text-right"
+                                    data-ng-bind="$ctrl.process.selectedOffer.promotion.subscription.discount.text"
+                                    data-title="{{ 'telecom_pack_migration_confirm_header_price' | translate }}"
+                                ></td>
+
+                                <td
+                                    class="text-right"
+                                    data-title="{{ 'telecom_pack_migration_confirm_header_quantity' | translate }}"
+                                    data-ng-bind="$ctrl.QUANTITY"
+                                ></td>
+
+                                <td
+                                    class="text-price text-right"
+                                    data-ng-bind="$ctrl.process.selectedOffer.promotion.subscription.discount.text"
+                                    data-title="{{ 'telecom_pack_migration_confirm_header_total' | translate }}"
+                                ></td>
+                            </tr>
                             <tr
                                 data-ng-if="$ctrl.MODEM_LIST.includes($ctrl.process.selectedOffer.modem)"
                             >
@@ -225,6 +253,15 @@ <h3 data-translate="telecom_pack_migration_doing"></h3>
                     <span
                         data-translate="telecom_pack_migration_confirm_resume_total"
                     ></span>
+                    <span
+                        data-ng-if="$ctrl.discountPrice"
+                        data-ng-bind-html="$ctrl.discountPrice.text | tucFormatPrice"
+                    ></span>
+                    <span
+                        data-ng-if="$ctrl.discountPrice"
+                        data-translate="telecom_pack_migration_confirm_discount_displayed"
+                        data-translate-values="{ duration: $ctrl.PROMO_DISPLAY[$ctrl.process.selectedOffer.promotion.subscription.duration].value }"
+                    ></span>
                     <span
                         data-ng-bind-html="$ctrl.process.selectedOffer.displayedPrice.text | tucFormatPrice"
                     ></span>
@@ -235,10 +272,15 @@ <h3 data-translate="telecom_pack_migration_doing"></h3>
                 <p
                     data-translate="telecom_pack_migration_confirm_new_offer_price"
                     data-translate-values="{ price : $ctrl.process.selectedOffer.displayedPrice.text }"
+                    data-ng-if="!$ctrl.process.selectedOffer.promotion"
+                ></p>
+                <p
+                    data-translate="telecom_pack_migration_confirm_new_offer_price_discount"
+                    data-translate-values="{ priceDiscount: $ctrl.discountPrice.text, duration: $ctrl.PROMO_DISPLAY[$ctrl.process.selectedOffer.promotion.subscription.duration].value, price : $ctrl.process.selectedOffer.displayedPrice.text }"
+                    data-ng-if="$ctrl.process.selectedOffer.promotion"
                 ></p>
                 <p
                     data-translate="telecom_pack_migration_confirm_promotion"
-                    data-translate-values="{ duration: $ctrl.PROMO_DISPLAY[$ctrl.process.selectedOffer.promotion.subscription.duration].value }"
                     data-ng-if="$ctrl.process.selectedOffer.promotion"
                 ></p>
                 <p

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

@@ -324,6 +324,33 @@ export default class TelecomPackMigrationOffersCtrl {
     }
   }
 
+  getPromotionSubscriptionDisplay(offer) {
+    switch (offer.promotion.id) {
+      case this.PROMO_DISPLAY.PROMO_FTTH_2020:
+        return this.$translate.instant(
+          'telecom_pack_migration_promotion_subscription_months_offered',
+
+          {
+            duration: this.PROMO_DISPLAY[offer.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.promotion.subscription.duration]
+              .value,
+          },
+        );
+
+      default:
+        return '';
+    }
+  }
+
   /* -----  End of ACTIONS  ------*/
 
   /*= ==============================

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

@@ -102,7 +102,7 @@
 
                                     <!-- Other Promotion -->
                                     <div
-                                        data-ng-if="offer.promotion && offer.promotion.id === $ctrl.PROMO_DISPLAY.PROMO_FTTH_2020"
+                                        data-ng-if="offer.promotion"
                                         class="oui-message oui-message_info mt-2"
                                     >
                                         <span
@@ -114,8 +114,7 @@
                                             data-translate-values="{ 'endDate' : (offer.promotion.endDate | date : short) }"
                                         ></div>
                                         <strong
-                                            data-translate="telecom_pack_migration_promotion_subscription_months_offered"
-                                            data-translate-values="{ 'duration' :  $ctrl.PROMO_DISPLAY[offer.promotion.subscription.duration].value }"
+                                            data-ng-bind="$ctrl.getPromotionSubscriptionDisplay(offer)"
                                         >
                                         </strong>
                                     </div>
@@ -188,13 +187,13 @@
                                     data-ng-repeat="offer in $ctrl.process.migrationOffers.result.offers track by $index"
                                 >
                                     <span
-                                        ng-if="offer.installFees && offer.promotion.id!='FTTH_MIGRATION_AND_ADRESSMOVE_2020'"
-                                        data-ng-bind-html="offer.installFees.text | tucFormatPrice"
+                                        ng-if="offer.installFees && !offer.promotion"
+                                        data-ng-bind-html="offer.installFees.text | tucFormatPrice: { withoutTax: false }"
                                     ></span>
 
                                     <!-- Other promotion -->
                                     <div
-                                        data-ng-if="offer.promotion.id=='FTTH_MIGRATION_AND_ADRESSMOVE_2020'"
+                                        data-ng-if="offer.promotion"
                                         class="oui-message oui-message_info mt-2"
                                     >
                                         <span

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

@@ -1,9 +1,14 @@
 export const PROMO_DISPLAY = {
   PROMO_FTTH_2020: 'FTTH_MIGRATION_AND_ADRESSMOVE_2020',
+  PROMO_FTTH_2025: 'FTTH_MIGRATION_AND_ADRESSMOVE_2025',
   P3M: {
     key: 'P3M',
     value: 3,
   },
+  P6M: {
+    key: 'P6M',
+    value: 6,
+  },
 };
 
 export const PROCESS_STEP = {

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

@@ -189,7 +189,7 @@
   "telecom_pack_migration_pto_yes_not_known_description": "Haben Sie wirklich überprüft, dass Sie nicht über die Referenz für die optische Steckdose (PTO) verfügen? Dies kann Auswirkungen auf die Dauer Ihres Anschlusses haben.",
   "telecom_pack_migration_promotion_description": "Angebot verfügbar bis zum {{ endDate }}",
   "telecom_pack_migration_promotion_subscription_months_offered": "{{ duration }} Monate kostenlos",
-  "telecom_pack_migration_confirm_promotion": "Die Einrichtungsgebühr und die ersten {{ duration }} Monate Ihres neuen Abos sind kostenlos (mit Ausnahme der Modem-Miete, Zusatzoptionen oder Transportkosten).",
+  "telecom_pack_migration_confirm_promotion": "Die Installationsgebühren für Ihr neues Abonnement sind kostenlos (außer Modem-Miete, zusätzlichen Optionen oder Transportkosten).",
   "telecom_pack_migration_confirm_first_year_promo": "Rabatt im ersten Jahr",
   "telecom_pack_migration_buildings_title": "An die Leitung angeschlossene Gebäude",
   "telecom_pack_migration_buildings_name": "Name",
@@ -211,5 +211,9 @@
   "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.",
-  "telecom_pack_migration_phone_call_for_new_meeting": "Die Online-Terminbuchung ist nicht verfügbar. Sie werden telefonisch kontaktiert, um einen passenden Termin mit Ihnen zu vereinbaren."
+  "telecom_pack_migration_phone_call_for_new_meeting": "Die Online-Terminbuchung ist nicht verfügbar. Sie werden telefonisch kontaktiert, um einen passenden Termin mit Ihnen zu vereinbaren.",
+  "telecom_pack_migration_promotion_subscription_months_reduces": "-50 % für {{ duration }} Monate",
+  "telecom_pack_migration_confirm_promotion_table": "Aktion ({{ duration }} Monate)",
+  "telecom_pack_migration_confirm_discount_displayed": " für {{ duration }} Monate, dann",
+  "telecom_pack_migration_confirm_new_offer_price_discount": "Ihr neues monatliches Abonnement beträgt: <span class=\"text-price\">{{ priceDiscount }}</span> <span class=\"text-infos\">zzgl. MwSt./Monat für {{duration}} Monate dann</span> <span class=\"text-price\">{{ price }}</span> <span class=\"text-infos\">zzgl. MwSt./Monat</span>, gültig ab Lieferung Ihres neuen Zugangs. Sie werden per E-Mail informiert."
 }

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: <span class=\"text-price\">{{ priceDiscount }}</span> <span class=\"text-infos\">excl. VAT/month for {{duration}} months then</span> <span class=\"text-price\">{{ price }}</span> <span class=\"text-infos\">excl. VAT</span>, applicable from the delivery of your new access. You will be informed by email."
 }

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: <span class=\"text-price\">{{ priceDiscount }}</span> <span class=\"text-infos\">sin IVA/mes durante {{duration}} meses luego</span> <span class=\"text-price\">{{ price }}</span> <span class=\"text-infos\">sin IVA/mes</span>, aplicable desde la entrega de su nuevo acceso. Se le informará por correo electrónico."
 }