Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from './headers/headers.component';
export * from './price/price.component';
export * from './price/price.utils';
export * from './dashboard-tile/dashboard-tile.component';
export * from './dashboard-tile/tile-block.component';
export * from './ManagerTile/manager-tile.component';
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ export function Price({
ovhSubsidiary,
locale,
isConvertIntervalUnit,
isStartingPrice,
suffix = '',
freePriceLabel,
}: Readonly<PriceProps>) {
const { t } = useTranslation('price');
const isAsiaFormat = ['ASIA', 'AU', 'IN', 'SG'].includes(ovhSubsidiary);
Expand Down Expand Up @@ -66,7 +69,7 @@ export function Price({
const components = [
{
condition: value === 0,
component: <span>{t('price_free')}</span>,
component: <span>{freePriceLabel ?? t('price_free')}</span>,
},
{
condition: isFrenchFormat && tax > 0,
Expand All @@ -81,6 +84,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
<TextPriceContent>
<span className="text-[--ods-color-neutral-500] text-[14px] leading-[18px] font-semibold">
({priceWithTax}
Expand All @@ -105,6 +113,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
</>
),
},
Expand All @@ -118,6 +131,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
</>
),
},
Expand All @@ -134,6 +152,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
</>
),
},
Expand All @@ -150,6 +173,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
<TextPriceContent>
<span className="text-[--ods-color-neutral-500] text-[14px] leading-[18px] font-semibold">
({priceWithTax}
Expand All @@ -171,6 +199,11 @@ export function Price({
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{intervalUnitText}
</span>
{suffix && (
<span className="ml-1 text-[--ods-color-text] text-[16px] leading-[20px] font-semibold">
{suffix}
</span>
)}
</>
),
},
Expand All @@ -181,7 +214,12 @@ export function Price({
return <></>;
}

return <OdsText>{matchingComponent.component}</OdsText>;
return (
<OdsText>
{isStartingPrice && value > 0 ? t('price_from_label') : ''}
{matchingComponent.component}
</OdsText>
);
}

export default Price;
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export interface PriceProps {
isConvertIntervalUnit?: boolean;
/** The locale for price formatting */
locale: string;
suffix?: string;
isStartingPrice?: boolean;
freePriceLabel?: string;
}

export const getPrice = (value: number, tax?: number): number => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "inkl. GST",
"price_per_month": "/Monat",
"price_per_year": "/Jahr",
"price_per_day": "/Tag"
"price_per_day": "/Tag",
"price_from_label": "ab "
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "incl. GST",
"price_per_month": "/month",
"price_per_year": "/year",
"price_per_day": "/day"
"price_per_day": "/day",
"price_from_label": "from "
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "GST incl.",
"price_per_month": "/mes",
"price_per_year": "/año",
"price_per_day": "/día"
"price_per_day": "/día",
"price_from_label": "desde "
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"price_ht_label": "HT",
"price_ttc_label": "TTC",
"price_from_label": "à partir de ",
"price_free": "Inclus",
"price_gst_excl_label": "ex. GST",
"price_gst_incl_label": "incl. GST",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"price_ht_label": "HT",
"price_ttc_label": "TTC",
"price_from_label": "à partir de ",
"price_free": "Inclus",
"price_gst_excl_label": "ex. GST",
"price_gst_incl_label": "incl. GST",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "GST incl.",
"price_per_month": "/mese",
"price_per_year": "/anno",
"price_per_day": "/giorno"
"price_per_day": "/giorno",
"price_from_label": "a partire da&amp;#160; "
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "z GST",
"price_per_month": "/m-c",
"price_per_year": "/rok",
"price_per_day": "/dzień"
"price_per_day": "/dzień",
"price_from_label": "od "
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"price_gst_incl_label": "incl. GST",
"price_per_month": "/mês",
"price_per_year": "/ano",
"price_per_day": "/dia"
"price_per_day": "/dia",
"price_from_label": "a partir de "
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Warschau (WAW{{micro}}) – Polen",
"region_RBX_HZ": "Roubaix (RBXHZ) – Frankreich",
"region_GSW": "(GSW) – Frankreich",
"region_YNM": "Mumbai (YNM{{micro}}) – Indien"
"region_YNM": "Mumbai (YNM{{micro}}) – Indien",
"region_YYZ": "Toronto (YYZ{{micro}}) - Kanada",
"region_PAR": "Paris (PAR{{micro}}) - Frankreich"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Warsaw (WAW{{micro}}) – Poland",
"region_RBX_HZ": "Roubaix (RBXHZ) – France",
"region_GSW": "(GSW) – France",
"region_YNM": "Mumbai (YNM{{micro}}) – India"
"region_YNM": "Mumbai (YNM{{micro}}) – India",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canada",
"region_PAR": "Paris (PAR{{micro}}) - France"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Varsovia (WAW{{micro}}) - Polonia",
"region_RBX_HZ": "Roubaix (RBXHZ) - Francia",
"region_GSW": "(GSW) - Francia",
"region_YNM": "Mumbai (YNM{{micro}}) - India"
"region_YNM": "Mumbai (YNM{{micro}}) - India",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canadá",
"region_PAR": "París (PAR{{micro}}) - Francia"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"region_ERI": "Londres (ERI{{micro}}) - Angleterre",
"region_BHS": "Beauharnois (BHS{{micro}}) - Canada",
"region_DC": "Beauharnois (DC{{micro}}) - Canada",
"region_P": "Paris (P{{micro}}) - France",
"region_GRA": "Gravelines (GRA{{micro}}) - France",
"region_HIL": "Hillsboro (HIL{{micro}}) - États-Unis",
"region_LIM": "Limburg (LIM{{micro}}) - Allemagne",
Expand All @@ -14,5 +13,7 @@
"region_WAW": "Varsovie (WAW{{micro}}) - Pologne",
"region_RBX_HZ": "Roubaix (RBXHZ) - France",
"region_GSW": "(GSW) - France",
"region_YNM": "Mumbai (YNM{{micro}}) - Inde"
"region_YNM": "Mumbai (YNM{{micro}}) - Inde",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canada",
"region_PAR": "Paris (PAR{{micro}}) - France"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"region_ERI": "Londres (ERI{{micro}}) - Angleterre",
"region_BHS": "Beauharnois (BHS{{micro}}) - Canada",
"region_DC": "Beauharnois (DC{{micro}}) - Canada",
"region_P": "Paris (P{{micro}}) - France",
"region_GRA": "Gravelines (GRA{{micro}}) - France",
"region_HIL": "Hillsboro (HIL{{micro}}) - États-Unis",
"region_LIM": "Limburg (LIM{{micro}}) - Allemagne",
Expand All @@ -14,5 +13,7 @@
"region_WAW": "Varsovie (WAW{{micro}}) - Pologne",
"region_RBX_HZ": "Roubaix (RBXHZ) - France",
"region_GSW": "(GSW) - France",
"region_YNM": "Mumbai (YNM{{micro}}) - Inde"
"region_YNM": "Mumbai (YNM{{micro}}) - Inde",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canada",
"region_PAR": "Paris (PAR{{micro}}) - France"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Varsavia (WAW{{micro}}) - Polonia",
"region_RBX_HZ": "Roubaix (RBXHZ) - Francia",
"region_GSW": "(GSW) - Francia",
"region_YNM": "Mumbai (YNM{{micro}}) - India"
"region_YNM": "Mumbai (YNM{{micro}}) - India",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canada",
"region_PAR": "Parigi (PAR{{micro}}) - Francia"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Warszawa (WAW {{micro}}) - Polska",
"region_RBX_HZ": "Roubaix (RBXHZ) - Francja",
"region_GSW": "(GSW) - Francja",
"region_YNM": "Mumbaj (YNM {{micro}}) - Indie"
"region_YNM": "Mumbaj (YNM {{micro}}) - Indie",
"region_YYZ": "Toronto (YYZ{{micro}}) - Kanada",
"region_PAR": "Paryż (PAR{{micro}}) - Francja"
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
"region_WAW": "Varsóvia (WAW{{micro}}) - Polónia",
"region_RBX_HZ": "Roubaix (RBXHZ) - França",
"region_GSW": "(GSW) - França",
"region_YNM": "Mumbai (YNM{{micro}}) - Índia"
"region_YNM": "Mumbai (YNM{{micro}}) - Índia",
"region_YYZ": "Toronto (YYZ{{micro}}) - Canadá",
"region_PAR": "Paris (PAR{{micro}}) - França"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "Nordamerika (USA – Westen – Denver)",
"region_us-east-lz-atl": "Nordamerika (USA – Osten – Atlanta)",
"region_eu-west-lz-mrs": "Europa (Frankreich – Marseille)",
"region_eu-south-mil": "Europa (Italien – Mailand)"
"region_eu-south-mil": "Europa (Italien – Mailand)",
"region_us-east-va": "Nordamerika (USA - Ost - Vinthill 2)"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "North America (US – West – Denver)",
"region_us-east-lz-atl": "North America (US – East – Atlanta)",
"region_eu-west-lz-mrs": "Europe (France – Marseille)",
"region_eu-south-mil": "Europe (Italy - Milan)"
"region_eu-south-mil": "Europe (Italy - Milan)",
"region_us-east-va": "North America (US - East - Vinthill 2)"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "Norteamérica (Estados Unidos - Oeste - Denver)",
"region_us-east-lz-atl": "Norteamérica (Estados Unidos - Este - Atlanta)",
"region_eu-west-lz-mrs": "Europa (Francia - Marsella)",
"region_eu-south-mil": "Europa (Italia - Milán)"
"region_eu-south-mil": "Europa (Italia - Milán)",
"region_us-east-va": "América del Norte (EE. UU. - Este - Vinthill 2)"
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"region_eu-central-waw": "Europe (Poland - Warsaw)",
"region_eu-west-eri": "Europe (UK - Erith)",
"region_us-east-vin": "North America (US - East - Vinthill)",
"region_us-east-va": "North America (US - East - Vinthill 2)",
"region_us-west-hil": "North America (US - West - Hillsboro)",
"region_ca-east-bhs": "North America (Canada - East - Beauharnois)",
"region_ap-southeast-sgp": "Asia Pacific (Singapore - Singapore)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"region_eu-central-waw": "Europe (Poland - Warsaw)",
"region_eu-west-eri": "Europe (UK - Erith)",
"region_us-east-vin": "North America (US - East - Vinthill)",
"region_us-east-va": "North America (US - East - Vinthill 2)",
"region_us-west-hil": "North America (US - West - Hillsboro)",
"region_ca-east-bhs": "North America (Canada - East - Beauharnois)",
"region_ap-southeast-sgp": "Asia Pacific (Singapore - Singapore)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "Nord America (Stati Uniti - Ovest - Denver)",
"region_us-east-lz-atl": "Nord America (Stati Uniti - Est - Atlanta)",
"region_eu-west-lz-mrs": "Europa (Francia - Marsiglia)",
"region_eu-south-mil": "Europa (Italia - Milano)"
"region_eu-south-mil": "Europa (Italia - Milano)",
"region_us-east-va": "Nord America (US - Est - Vinthill 2)"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "North America (US - West - Denver)",
"region_us-east-lz-atl": "Ameryka Północna (US - East - Atlanta)",
"region_eu-west-lz-mrs": "Europa (Francja - Marsylia)",
"region_eu-south-mil": "Europa (Włochy - Mediolan)"
"region_eu-south-mil": "Europa (Włochy - Mediolan)",
"region_us-east-va": "Ameryka Północna (USA - Wschód - Vinthill 2)"
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@
"region_us-west-lz-den": "América do Norte (US - West - Denver)",
"region_us-east-lz-atl": "América do Norte (US - East - Atlanta)",
"region_eu-west-lz-mrs": "Europa (França - Marselha)",
"region_eu-south-mil": "Europa (Itália - Milão)"
"region_eu-south-mil": "Europa (Itália - Milão)",
"region_us-east-va": "América do Norte (EUA - Leste - Vinthill 2)"
}
Loading