feat: non-commercial licences indication

backend/api/src/main/kotlin/io/tolgee/hateoas/ee/SelfHostedEePlanModel.kt

@@ -15,4 +15,5 @@ open class SelfHostedEePlanModel(
   val includedUsage: PlanIncludedUsageModel = PlanIncludedUsageModel(),
   val hasYearlyPrice: Boolean = false,
   val free: Boolean,
+  val nonCommercial: Boolean,
 ) : RepresentationModel<SelfHostedEePlanModel>()

e2e/cypress/support/dataCyType.d.ts

@@ -14,6 +14,7 @@ declare namespace DataCy {
         "administration-cloud-plan-field-included-mt-credits" |
         "administration-cloud-plan-field-included-translations" |
         "administration-cloud-plan-field-name" |
+        "administration-cloud-plan-field-non-commercial" |
         "administration-cloud-plan-field-price-monthly" |
         "administration-cloud-plan-field-price-per-thousand-mt-credits" |
         "administration-cloud-plan-field-price-per-thousand-translations" |

ee/backend/tests/src/test/kotlin/io/tolgee/ee/EeLicensingMockRequestUtil.kt

@@ -35,6 +35,7 @@ class EeLicensingMockRequestUtil {
           subscriptionMonthly = 200.toBigDecimal(),
         ),
       free = false,
+      nonCommercial = false,
     )
 
   final val mockedSubscriptionResponse =

webapp/src/component/billing/Plan/Plan.tsx

@@ -16,7 +16,8 @@ import { PlanType } from './types';
 import { IncludedUsage } from './IncludedUsage';
 import { ContactUsButton } from './ContactUsButton';
 import { isPlanLegacy } from './plansTools';
-import { Box, useTheme } from '@mui/material';
+import { Box, Chip, Tooltip, useTheme } from '@mui/material';
+import { useTranslate } from '@tolgee/react';
 
 type Features = PlanType['enabledFeatures'];
 
@@ -31,6 +32,7 @@ type Props = {
   featuresMinHeight?: string;
   action: React.ReactNode;
   custom?: boolean;
+  nonCommercial: boolean;
 };
 
 export const Plan: FC<Props> = ({
@@ -44,25 +46,40 @@ export const Plan: FC<Props> = ({
   featuresMinHeight,
   action,
   custom,
+  nonCommercial,
 }) => {
   const theme = useTheme();
   const highlightColor = custom
     ? theme.palette.tokens.info.main
     : theme.palette.tokens.primary.main;
+  const { t } = useTranslate();
 
   return (
     <PlanContainer className={clsx({ active })} data-cy="billing-plan">
       <PlanActiveBanner active={active} ended={ended} custom={custom} />
       <PlanContent>
-        <PlanTitle sx={{ paddingBottom: '20px', color: highlightColor }}>
+        <PlanTitle sx={{ pb: '10px', color: highlightColor }}>
           {plan.name}
         </PlanTitle>
 
+        {nonCommercial && (
+          <Box display="flex" justifyContent="center">
+            <Tooltip title={t('billing_plan_non_commercial_hint')}>
+              <Chip
+                label={t('billing_plan_non_commercial_label')}
+                size="small"
+                color="success"
+              />
+            </Tooltip>
+          </Box>
+        )}
+
         <Box
           display="flex"
           flexDirection="column"
           alignItems="stretch"
           flexGrow={1}
+          sx={{ pt: '10px' }}
         >
           <PlanFeaturesBox sx={{ gap: '18px' }}>
             <IncludedFeatures

webapp/src/ee/billing/Subscriptions/cloud/PlansCloudList.tsx

@@ -57,6 +57,7 @@ export const PlansCloudList: React.FC<BillingPlansProps> = ({
     free: false,
     hasYearlyPrice: false,
     public: true,
+    nonCommercial: false,
   });
 
   const parentForPublic: PlanType[] = [];
@@ -124,6 +125,7 @@ export const PlansCloudList: React.FC<BillingPlansProps> = ({
               filteredFeatures={filteredFeatures}
               featuresMinHeight="155px"
               custom={custom}
+              nonCommercial={plan.nonCommercial}
               topFeature={
                 parentPlan && <AllFromPlanFeature planName={parentPlan} />
               }

webapp/src/ee/billing/Subscriptions/selfHosted/PlansSelfHostedList.tsx

@@ -49,6 +49,7 @@ export const PlansSelfHostedList: React.FC<BillingPlansProps> = ({
     free: false,
     hasYearlyPrice: false,
     public: true,
+    nonCommercial: false,
   });
 
   const parentForPublic: PlanType[] = [];
@@ -87,6 +88,7 @@ export const PlansSelfHostedList: React.FC<BillingPlansProps> = ({
             period={period}
             filteredFeatures={filteredFeatures}
             featuresMinHeight="210px"
+            nonCommercial={plan.nonCommercial}
             topFeature={
               previousPlanName ? (
                 <AllFromPlanFeature planName={previousPlanName} />

webapp/src/ee/billing/administration/AdministrationCloudPlanCreateView.tsx

@@ -85,6 +85,7 @@ export const AdministrationCloudPlanCreateView = () => {
               public: true,
               forOrganizationIds: [],
               free: false,
+              nonCommercial: false,
               autoAssignOrganizationIds: [],
             }}
           />

webapp/src/ee/billing/administration/AdministrationEePlanCreateView.tsx

@@ -83,6 +83,7 @@ export const AdministrationEePlanCreateView = () => {
               enabledFeatures: [],
               public: true,
               free: false,
+              nonCommercial: false,
             }}
           />
         </Box>

webapp/src/ee/billing/administration/components/CloudPlanForm.tsx

@@ -33,6 +33,7 @@ export type CloudPlanFormData = {
   public: boolean;
   free: boolean;
   autoAssignOrganizationIds: CloudPlanModel['autoAssignOrganizationIds'];
+  nonCommercial: boolean;
 };
 
 type Props = {
@@ -309,6 +310,19 @@ export function CloudPlanForm({
               label={t('administration_cloud_plan_field_free')}
             />
 
+            <FormControlLabel
+              control={
+                <Switch
+                  checked={values.nonCommercial}
+                  onChange={() =>
+                    setFieldValue('nonCommercial', !values.nonCommercial)
+                  }
+                />
+              }
+              data-cy="administration-cloud-plan-field-non-commercial"
+              label="Non-commercial"
+            />
+
             {!values.public && (
               <Box>
                 <CloudPlanOrganizations

webapp/src/ee/billing/administration/components/EePlanForm.tsx

@@ -31,6 +31,7 @@ type FormData = {
   public: boolean;
   forOrganizationIds: number[];
   free: boolean;
+  nonCommercial: boolean;
 };
 
 type Props = {
@@ -66,6 +67,7 @@ export function EePlanForm({ planId, initialData, onSubmit, loading }: Props) {
         public: initialData.public,
         forOrganizationIds: initialData.forOrganizationIds,
         free: initialData.free,
+        nonCommercial: initialData.nonCommercial,
       }}
       enableReinitialize
       onSubmit={onSubmit}
@@ -242,6 +244,19 @@ export function EePlanForm({ planId, initialData, onSubmit, loading }: Props) {
               label={t('administration_ee_plan_field_free')}
             />
 
+            <FormControlLabel
+              control={
+                <Switch
+                  checked={values.nonCommercial}
+                  onChange={() =>
+                    setFieldValue('nonCommercial', !values.nonCommercial)
+                  }
+                />
+              }
+              data-cy="administration-cloud-plan-field-non-commercial"
+              label="Non-commercial"
+            />
+
             {!values.public && (
               <Box>
                 <EePlanOrganizations