Skip to content

Commit dd42cdd

Browse files
Merge branch 'master' into fix/6946-event-details-overlap
2 parents 7b5e10f + 84e2e97 commit dd42cdd

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

src/components/CookieConsent/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Stack,
99
} from "@mui/material";
1010

11-
import {Link} from "gatsby";
11+
import { Link } from "gatsby";
1212
import Button from "../../reusecore/Button";
1313
import styled from "styled-components";
1414

src/components/Pricing/PricingAddons/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,8 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
345345
if (targetSubAddon?.pricing && targetSubAddon.pricing[value]) {
346346
const option = targetSubAddon.pricing[value];
347347
const pricePerUser = isYearly ? option.yearlyPerUser : option.monthlyPerUser;
348-
const totalPrice = pricePerUser * option.learners;
348+
const multiplier = selectedSubAddOns["academy-practical"] ? 2 : 1;
349+
const totalPrice = pricePerUser * option.learners * multiplier;
349350
const period = isYearly ? "/year" : "/month";
350351
return `${option.learners} learners - ${formatPrice(totalPrice)}${period}`;
351352
}
@@ -386,7 +387,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
386387
}
387388
}}
388389
>
389-
{formatSliderPrice(option.yearlyPerUser / 12, currency)}<br/>{targetSubAddon.unitLabelSingular}/month
390+
{formatSliderPrice((option.yearlyPerUser / 12) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/month
390391
</Box>
391392
)}
392393
<Box
@@ -398,7 +399,7 @@ export const PricingAddons = ({ isYearly = false, setIsYearly, currency, enterpr
398399
sm: "0.9rem",
399400
}
400401
}}>
401-
{formatSliderPrice(isYearly ? option.yearlyPerUser : option.monthlyPerUser, currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
402+
{formatSliderPrice((isYearly ? option.yearlyPerUser : option.monthlyPerUser) * (selectedSubAddOns["academy-practical"] ? 2 : 1), currency)}<br/>{targetSubAddon.unitLabelSingular}/{isYearly ? "year" : "month"}
402403
</Box>
403404
</Box>
404405
),

src/theme/app/themeStyles.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ export const darktheme = {
418418
linearToGreen: "linear-gradient(90.2deg, rgba(0, 0, 0, 0.2) 0.16%, rgba(0, 179, 159, 0.74) 99.81%)",
419419
linearToWhite: "linear-gradient(to right, #666666, #444444)",
420420
radialToWhite: "radial-gradient( circle 100px at 50% 50%, rgba(167,173,180,0.78) 0%, rgba(103,110,118,0.79) 80%, rgba(103,110,118,1) 100% )",
421-
radialToBlue: "linear-gradient(135deg, rgba(15, 20, 30, 0.9) 0%, rgba(25, 30, 40, 0.9) 70%, rgba(45, 55, 70, 0.9) 100%), url('data:image/svg+xml,%3Csvg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 100\"%3E%3Cpath d=\"M0 0 L50 50 L0 100 L100 50 Z\" fill=\"none\" stroke=\"rgba(255, 255, 255, 0.1)\" stroke-width=\"1\ \"/%3E%3C/svg%3E') repeat center",
421+
radialToBlue: "linear-gradient(135deg, rgba(15, 20, 30, 0.9) 0%, rgba(25, 30, 40, 0.9) 70%, rgba(45, 55, 70, 0.9) 100%), url('data:image/svg+xml,%3Csvg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 100\"%3E%3Cpath d=\"M0 0 L50 50 L0 100 L100 50 Z\" fill=\"none\" stroke=\"rgba(255, 255, 255, 0.1)\" stroke-width=\"1 \"/%3E%3C/svg%3E') repeat center",
422422
linearDarkToLinearLight: "linear-gradient(180deg, rgba(0, 0, 0, 0.2) 0%, rgba(0, 179, 159, 0.58) 46.87%, rgba(0, 179, 159, 0.034) 100%), linear-gradient(179.39deg, rgba(0, 179, 159, 0) 0.58%, #000000 99.54%)",
423423
whiteEightToBlack: "rgb(255 255 255 / 0.8)",
424424
whiteEightToBlackEight: "rgb(255 255 255 / 0.8)",

0 commit comments

Comments
 (0)