Merge pull request #14001 from ovh/develop

New release

Author: anooparveti

packages/manager-react-components/src/components/content/price/translations/Messages_en_GB.json

@@ -1,6 +1,6 @@
 {
   "price_ht_label": "ex. VAT",
-  "price_ttc_label": "{0} INCL. VAT",
+  "price_ttc_label": "INCL. VAT",
   "price_free": "Included",
   "price_gst_excl_label": "ex. GST",
   "price_gst_incl_label": "incl. GST",

packages/manager-react-components/src/hooks/useCatalogPrice.test.ts

@@ -0,0 +1,10 @@
+import { HOUR_IN_MONTH, convertHourlyPriceToMonthly } from './useCatalogPrice';
+
+describe('Pricing Function', () => {
+  describe('convertHourlyPriceToMonthly', () => {
+    it('should convert hourly price to monthly price', () => {
+      expect(convertHourlyPriceToMonthly(1)).toBe(HOUR_IN_MONTH);
+      expect(convertHourlyPriceToMonthly(0.5)).toBe(365);
+    });
+  });
+});

packages/manager-react-components/src/hooks/useCatalogPrice.ts

@@ -17,12 +17,20 @@ const FRENCH_FORMAT = [
   'TN',
 ];
 export const GERMAN_FORMAT = ['DE', 'FI', 'SN'];
+export const HOUR_IN_MONTH = 730;
 
 export interface CatalogPriceOptions {
   hideTaxLabel?: boolean;
   exclVat?: boolean;
 }
 
+/**
+ * Handle the conversion on the frontend side from hourly price to monthly.
+ * In the future, this conversion should be handled on the backend to improve efficiency and maintainability.
+ * */
+export const convertHourlyPriceToMonthly = (hourlyPrice: number) =>
+  hourlyPrice * HOUR_IN_MONTH;
+
 export const useCatalogPrice = (
   maximumFractionDigits?: number,
   options?: CatalogPriceOptions,

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_de_DE.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "Loadbalancing-IP",
   "ip_servicetype_cloudProject": "Cloud Projekt",
   "ip_servicetype_vRack": "vRACK",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "Sie haben das maximale Quota an IPs für diesen Server erreicht.",
   "ip_order_noservices": "Sie haben keine Dienste zur Bestellung verfügbar.",
   "ip_order_step1_question": "Bitte wählen Sie: Für welchen Dienst möchten Sie ",

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_en_GB.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "Load balancing IP",
   "ip_servicetype_cloudProject": "Cloud project ",
   "ip_servicetype_vRack": "vRack",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "You have reached the maximum quota of IPs for this server.",
   "ip_order_noservices": "You don't have any services available to order.",
   "ip_order_step1_question": "Select the service for which you want to order ",

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_es_ES.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "IP Load Balancing",
   "ip_servicetype_cloudProject": "Proyecto cloud",
   "ip_servicetype_vRack": "vRack",
-  "ip_servicetype__PARK": "Aparcamiento",
   "ip_order_quota_full": "Ha alcanzado la cantidad máxima de direcciones IP en este servidor.",
   "ip_order_noservices": "No hay ningún servicio disponible para contratar.",
   "ip_order_step1_question": "Seleccione el servicio para el que quiere adquirir ",

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_fr_CA.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "IP Load Balancing",
   "ip_servicetype_cloudProject": "Projet Cloud",
   "ip_servicetype_vRack": "VRACK",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "Le quota maximal d'IPs a été atteint pour ce serveur.",
   "ip_order_noservices": "Vous n'avez aucun service disponible à la commande.",
   "ip_order_step1_question": "Sélectionnez le service pour lequel vous désirez acheter des ",
@@ -248,4 +247,4 @@
   "dedicatedCloud_premier_sbg_order_warning": "Nous ne sommes pas en mesure de prendre de nouvelles commandes sur notre site de SBG. Nos équipes sont pleinement mobilisées et nous mettons tout en œuvre pour rétablir cette possibilité de commande dans un avenir proche.",
   "dedicatedCloud_banner_new_product": "Vous pouvez désormais commander des datacenters correspondants à des packs logiciels VMware différents au sein d'un même environnement Private Cloud.",
   "dedicatedCloud_banner_new_product_link": "En savoir plus"
-}
+}

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_it_IT.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "IP Load Balancing",
   "ip_servicetype_cloudProject": "Progetto Cloud",
   "ip_servicetype_vRack": "vRack",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "Hai raggiunto la quota massima di indirizzi IP per questo server.",
   "ip_order_noservices": "Non ci sono servizi disponibili per l'ordine",
   "ip_order_step1_question": "Seleziona il servizio per cui vuoi acquistare ",

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_pl_PL.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "IP Load Balancing",
   "ip_servicetype_cloudProject": "Projekt Cloud",
   "ip_servicetype_vRack": "vRack",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "Maksymalna liczba adresów IP dla tego serwera została osiągnięta.",
   "ip_order_noservices": "Nie masz możliwości zamówienia usługi.",
   "ip_order_step1_question": "Wybierz usługę, dla której chcesz kupić ",

packages/manager/apps/dedicated/client/app/components/dedicated-cloud/translations/Messages_pt_PT.json

@@ -188,7 +188,6 @@
   "ip_servicetype_ipLoadbalancing": "IP Load Balancer",
   "ip_servicetype_cloudProject": "Projeto cloud",
   "ip_servicetype_vRack": "vRack",
-  "ip_servicetype__PARK": "Parking",
   "ip_order_quota_full": "O limite máximo de endereços IP para este servidor foi atingido.",
   "ip_order_noservices": "Nenhum serviço está disponível na encomenda.",
   "ip_order_step1_question": "Escolha o serviço para o qual deseja comprar ",