Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add better message when plugin is not installed

Browse Source 
[MAILPOET-3719]
This commit is contained in:
Jan Lysý
2021-10-01 16:41:39 +02:00
committed by Veljko V
parent 44ed494198
commit 67d11c9eed
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx
View File

@@ -14,6 +14,18 @@ type PremiumNotActiveMessageProps = {
url?: string;
}
const PremiumNotActiveMessage = (props: PremiumNotActiveMessageProps) => (
<>
<div className="mailpoet_error mailpoet_install_premium_message">
{MailPoet.I18n.t('premiumTabPremiumNotActivatedMessage')}
</div>
{props.url && (
<Button href={props.url}>
{MailPoet.I18n.t('premiumTabPremiumActivateMessage')}
</Button>
)}
</>
);
const PremiumNotInstalledMessage = (props: PremiumNotActiveMessageProps) => (
<>
<div className="mailpoet_error mailpoet_install_premium_message">
{MailPoet.I18n.t('premiumTabPremiumNotInstalledMessage')}
@@ -40,7 +52,7 @@ type Props = {
keyMessage?: string;
}
export default function PremiumMessages(props: Props) {
const { premiumStatus: status, downloadUrl } = useSelector('getKeyActivationState')();
const { premiumStatus: status, downloadUrl, activationUrl } = useSelector('getKeyActivationState')();
switch (status) {
case PremiumStatus.VALID_PREMIUM_PLUGIN_ACTIVE:
@@ -49,10 +61,16 @@ export default function PremiumMessages(props: Props) {
<ActiveMessage />
</>
);
case PremiumStatus.VALID_PREMIUM_PLUGIN_NOT_INSTALLED:
return (
<>
<PremiumNotInstalledMessage url={downloadUrl} />
</>
);
case PremiumStatus.VALID_PREMIUM_PLUGIN_NOT_ACTIVE:
return (
<>
<PremiumNotActiveMessage url={downloadUrl} />
<PremiumNotActiveMessage url={activationUrl} />
</>
);
case PremiumStatus.INVALID:

2
views/settings.html
View File

@@ -184,7 +184,9 @@
'learnMore': __('Learn more'),
'premiumTabPremiumActiveMessage': __('MailPoet Premium is active', 'mailpoet'),
'premiumTabPremiumNotInstalledMessage': __('MailPoet Premium is not installed.', 'mailpoet'),
'premiumTabPremiumNotActivatedMessage': __('MailPoet Premium is installed but not activated.', 'mailpoet'),
'premiumTabPremiumDownloadMessage': __('Download MailPoet Premium plugin', 'mailpoet'),
'premiumTabPremiumActivateMessage': __('Activate MailPoet Premium plugin', 'mailpoet'),
'premiumTabPremiumInstallationInstallingMessage': __('downloading MailPoet Premium…', 'mailpoet'),
'premiumTabPremiumInstallationActivatingMessage': __('activating MailPoet Premium…', 'mailpoet'),
'premiumTabPremiumInstallationActiveMessage': __('MailPoet Premium is active!', 'mailpoet'),