diff --git a/public/locales/bg/campaigns.json b/public/locales/bg/campaigns.json index 9897862ce..729a2fcdb 100644 --- a/public/locales/bg/campaigns.json +++ b/public/locales/bg/campaigns.json @@ -182,17 +182,13 @@ "corporate-donor": "Корпоративен дарител" }, "campaign-status": { - "initial": "В начален етап", "draft": "Чернова", - "pending-validation": "Чакаща валидация", - "approved": "Одобрена", - "rejected": "Отхвърлена", "active": "Активна", - "active-pending-validation": "Активна чака валидиране", - "suspended": "Спряна", - "complete": "Завършена", - "disabled": "Деактивирана", - "error": "Грешна", + "paused": "На пауза", + "suspended": "Спряна от организатор", + "partially_financed": "Частично финансирана", + "blocked": "Спряна", + "complete": "Успешнa", "deleted": "Изтрита" }, "campaignTypesFields": { diff --git a/public/locales/en/campaigns.json b/public/locales/en/campaigns.json index 73944bb2c..98aa64097 100644 --- a/public/locales/en/campaigns.json +++ b/public/locales/en/campaigns.json @@ -182,17 +182,13 @@ "corporate-donor": "Corporate Donor" }, "campaign-status": { - "initial": "Initial", "draft": "Draft", - "pending-validation": "Pending validation", - "approved": "Approved", - "rejected": "Rejected", "active": "Active", - "active-pending-validation": "Active pending validation", - "suspended": "Suspended", - "complete": "Complete", - "disabled": "Disabled", - "error": "Error", + "suspended": "Suspended by organizer", + "complete": "Succeeded", + "paused": "Paused", + "partially_financed": "Partially financed", + "blocked": "Suspended", "deleted": "Deleted" }, "campaignTypesFields": { diff --git a/src/components/admin/campaigns/grid/EditForm.tsx b/src/components/admin/campaigns/grid/EditForm.tsx index 431325513..44a4772f1 100644 --- a/src/components/admin/campaigns/grid/EditForm.tsx +++ b/src/components/admin/campaigns/grid/EditForm.tsx @@ -85,11 +85,8 @@ const validationSchema: yup.SchemaOf }) const statesForDisableCurrencySelect = [ - CampaignState.rejected, CampaignState.suspended, CampaignState.complete, - CampaignState.disabled, - CampaignState.error, CampaignState.deleted, CampaignState.active, ] diff --git a/src/components/client/campaigns/CampaignCard/CampaignCard.tsx b/src/components/client/campaigns/CampaignCard/CampaignCard.tsx index d5c7b81ef..b2ec1ede3 100644 --- a/src/components/client/campaigns/CampaignCard/CampaignCard.tsx +++ b/src/components/client/campaigns/CampaignCard/CampaignCard.tsx @@ -10,7 +10,7 @@ import theme from 'common/theme' import Link from 'components/common/Link' import CampaignProgress from 'components/client/campaigns/CampaignProgress' import SuccessfullCampaignTag from '../SuccessfullCampaignTag' -import { CampaignState } from '../helpers/campaign.enums' +import { CampaignState, canAcceptDonationState } from '../helpers/campaign.enums' import { Root } from './CampaignCard.styled' import { @@ -92,7 +92,8 @@ export default function ActiveCampaignCard({ campaign, index }: Props) { - {(campaignState === CampaignState.complete && !allowDonationOnComplete) || ( + {(campaignState === CampaignState.active || + (canAcceptDonationState.has(campaignState) && allowDonationOnComplete)) && (