feat: allow more option in feedzy free

Author: girishpanchal30

css/settings.css

@@ -2459,7 +2459,7 @@ li.draggable-item .components-panel__body-toggle.components-button{
 	padding: 24px 0;
 }
 
-.fz-condition-control.is-upsell {
+.is-upsell {
 	opacity: 0.6;
 }
 

includes/admin/feedzy-rss-feeds-import.php

@@ -557,12 +557,11 @@ public function feedzy_import_feed_options() {
 		$inherited_thumbnail_id = ! empty( $this->free_settings['general']['default-thumbnail-id'] ) ? (int) $this->free_settings['general']['default-thumbnail-id'] : 0;
 		if ( feedzy_is_pro() ) {
 			$default_thumbnail_id = get_post_meta( $post->ID, 'default_thumbnail_id', true );
+			$import_schedule      = array(
+				'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
+			);
 		}
 
-		$import_schedule = array(
-			'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
-		);
-
 		$fz_cron_schedule = get_post_meta( $post->ID, 'fz_cron_schedule', true );
 		if ( ! empty( $fz_cron_schedule ) ) {
 			$import_schedule['fz_cron_schedule'] = $fz_cron_schedule;

includes/views/import-metabox-edit.php

@@ -106,11 +106,11 @@ class="dashicons dashicons-arrow-down-alt2"></span>
 		</div>
 		<!-- Sources configuration Step End -->
 		<!-- Filters Step Start -->
-		<div class="feedzy-accordion-item <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
+		<div class="feedzy-accordion-item">
 			<div class="feedzy-accordion-item__title" id="fz-import-filters">
 				<button type="button" class="feedzy-accordion-item__button">
 					<div class="feedzy-accordion__step-number help-text"><?php esc_html_e( 'Step 2', 'feedzy-rss-feeds' ); ?></div>
-					<div class="feedzy-accordion__step-title h2"><?php esc_html_e( 'Filters', 'feedzy-rss-feeds' ); ?><?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></div>
+					<div class="feedzy-accordion__step-title h2"><?php esc_html_e( 'Filters', 'feedzy-rss-feeds' ); ?></div>
 					<div class="feedzy-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span></div>
 				</button>
 			</div>
@@ -654,15 +654,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 								</div>
 							</div>
 
-							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'schedule-import-job', 'import' ) ); ?>
+							<div class="form-block form-block-two-column">
 								<div class="fz-left">
-									<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
+									<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?></h4>
 								</div>
 								<div class="fz-right">
 									<div class="fz-form-group">
 										<label class="form-label"><?php esc_html_e( 'Import schedule', 'feedzy-rss-feeds' ); ?></label>
-										<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]"<?php disabled( true, ! feedzy_is_pro() ); ?>>
+										<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]">
 											<?php
 											$save_schedule = ! empty( $import_schedule['fz_cron_schedule'] ) ? $import_schedule['fz_cron_schedule'] : '';
 
@@ -680,6 +679,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 												$duplicate_schedule[] = $schedule['interval'];
 												?>
 												<option data-slug="<?php echo esc_attr( $slug ); ?>" value="<?php echo esc_attr( $slug ); ?>"<?php selected( $save_schedule, $slug ); ?>
+												<?php disabled( ! feedzy_is_pro() && 'daily' !== $slug ); ?>
 												>
 													<?php echo esc_html( $schedule['display'] ); ?>
 												</option>
@@ -690,11 +690,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
 								</div>
 							</div>
 
-							<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
-								<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-image', 'import' ) ); ?>
+							<div class="form-block form-block-two-column">
 								<div class="fz-left">
 									<h4 class="h4">
-										<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?>
+										<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?>
 									</h4>
 								</div>
 								<div class="fz-right">

js/Conditions/ConditionsControl.js

@@ -17,6 +17,7 @@ import { Icon, plus } from '@wordpress/icons';
  */
 import PanelTab from './PanelTab';
 import DateTimeControl from './DateTimeControl';
+import { cond } from 'lodash';
 
 const SUPPORTED_FIELDS = [
 	{
@@ -70,6 +71,10 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 	};
 
 	const addCondition = () => {
+		if (!isPro && 1 <= conditions.conditions.length) {
+			return;
+		}
+
 		const conditionsCopy = [...conditions.conditions];
 
 		conditionsCopy.push({
@@ -122,9 +127,7 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 
 	return (
 		<div
-			className={classNames('fz-condition-control', {
-				'is-upsell': !isPro,
-			})}
+			className='fz-condition-control'
 		>
 			<SelectControl
 				label={__('Include If', 'feedzy-rss-feeds')}
@@ -140,7 +143,6 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 					},
 				]}
 				onChange={onChangeMatch}
-				disabled={!isPro}
 			/>
 
 			{conditions.conditions.map((condition, index) => {
@@ -165,7 +167,6 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 							onChange={(value) =>
 								onChangeCondition(index, value, 'field')
 							}
-							disabled={!isPro}
 						/>
 
 						<SelectControl
@@ -190,7 +191,6 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 							onChange={(value) =>
 								onChangeCondition(index, value, 'operator')
 							}
-							disabled={!isPro}
 						/>
 
 						{!['has_value', 'empty'].includes(
@@ -209,7 +209,6 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 												'value'
 											)
 										}
-										disabled={!isPro}
 									/>
 								) : (
 									<TextControl
@@ -222,7 +221,6 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 												'value'
 											)
 										}
-										disabled={!isPro}
 									/>
 								)}
 							</>
@@ -231,7 +229,10 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 				);
 			})}
 
-			<div className="fz-action-btn mt-24">
+			<div className={classNames("fz-action-btn mt-24", {
+				'is-upsell': !isPro && 1 <= conditions.conditions.length
+			})}
+			>
 				<Button
 					variant="secondary"
 					onClick={addCondition}

js/FeedzyBlock/inspector.js

@@ -258,21 +258,14 @@ class Inspector extends Component {
 						<PanelBody
 							title={[
 								__('Filter items', 'feedzy-rss-feeds'),
-								!window.feedzyjs.isPro && (
-									<span className="fz-pro-label">Pro</span>
-								),
 							]}
 							initialOpen={false}
-							className={
-								window.feedzyjs.isPro
-									? 'feedzy-item-filter'
-									: 'feedzy-item-filter fz-locked'
-							}
+							className='feedzy-item-filter'
 						>
 							{!window.feedzyjs.isPro && (
 								<div className="fz-upsell-notice">
 									{__(
-										'Unlock this feature and more advanced options with',
+										'Unlock more advanced options with',
 										'feedzy-rss-feeds'
 									)}{' '}
 									<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=keywordsfilter&utm_content=feedzy-rss-feeds">
@@ -307,13 +300,15 @@ class Inspector extends Component {
 									{
 										label: __('Author', 'feedzy-rss-feeds'),
 										value: 'author',
+										disabled: !window.feedzyjs.isPro,
 									},
 									{
 										label: __(
 											'Description',
 											'feedzy-rss-feeds'
 										),
 										value: 'description',
+										disabled: !window.feedzyjs.isPro,
 									},
 								]}
 								onChange={this.props.edit.onKeywordsIncludeOn}
@@ -345,35 +340,45 @@ class Inspector extends Component {
 									{
 										label: __('Author', 'feedzy-rss-feeds'),
 										value: 'author',
+										disabled: !window.feedzyjs.isPro,
 									},
 									{
 										label: __(
 											'Description',
 											'feedzy-rss-feeds'
 										),
 										value: 'description',
+										disabled: !window.feedzyjs.isPro,
 									},
 								]}
 								onChange={this.props.edit.onKeywordsExcludeOn}
 							/>
-							<p className="fz-main-label">
-								{__(
-									'Filter feed item by date range.',
-									'feedzy-rss-feeds'
-								)}
-							</p>
-							<TextControl
-								type="datetime-local"
-								label={__('From:', 'feedzy-rss-feeds')}
-								value={this.props.attributes.from_datetime}
-								onChange={this.props.edit.onFromDateTime}
-							/>
-							<TextControl
-								type="datetime-local"
-								label={__('To:', 'feedzy-rss-feeds')}
-								value={this.props.attributes.to_datetime}
-								onChange={this.props.edit.onToDateTime}
-							/>
+							
+							<div className={
+								!window.feedzyjs.isPro
+									? 'fz-locked'
+									: ''
+								}
+							>
+								<p className="fz-main-label">
+									{__(
+										'Filter feed item by date range.',
+										'feedzy-rss-feeds'
+									)}
+								</p>
+								<TextControl
+									type="datetime-local"
+									label={__('From:', 'feedzy-rss-feeds')}
+									value={this.props.attributes.from_datetime}
+									onChange={this.props.edit.onFromDateTime}
+								/>
+								<TextControl
+									type="datetime-local"
+									label={__('To:', 'feedzy-rss-feeds')}
+									value={this.props.attributes.to_datetime}
+									onChange={this.props.edit.onToDateTime}
+								/>
+							</div>
 						</PanelBody>
 					</Fragment>
 				)}

js/FeedzyLoop/controls.js

@@ -195,9 +195,6 @@ const Controls = ({
 				<PanelBody
 					title={[
 						__('Filter items', 'feedzy-rss-feeds'),
-						!window.feedzyData.isPro && (
-							<span className="fz-pro-label">Pro</span>
-						),
 					]}
 					initialOpen={false}
 					key="filters"
@@ -206,7 +203,7 @@ const Controls = ({
 					{!window.feedzyData.isPro && (
 						<div className="fz-upsell-notice">
 							{__(
-								'Unlock this feature and more advanced options with',
+								'Unlock more advanced options with',
 								'feedzy-rss-feeds'
 							)}{' '}
 							<ExternalLink href="https://themeisle.com/plugins/feedzy-rss-feeds/upgrade/?utm_source=wpadmin&utm_medium=blockeditor&utm_campaign=keywordsfilter&utm_content=feedzy-rss-feeds">
@@ -222,7 +219,7 @@ const Controls = ({
 										conditions: [],
 										match: 'all',
 									}
-								: {
+								: attributes?.conditions || {
 										match: 'all',
 										conditions: [
 											{

js/FeedzyLoop/editor.scss

@@ -13,10 +13,6 @@
 .fz-condition-control {
     padding: 0;
 
-    &.is-upsell {
-        opacity: 0.6;
-    }
-
     .components-button {
         width: 100%;
         margin: 0;
@@ -25,6 +21,10 @@
     }
 }
 
+.is-upsell {
+    opacity: 0.6;
+}
+
 .fz-panel-tab {
     z-index: 999999;
     margin: 24px 0;

tests/e2e/specs/upsell.spec.js

@@ -20,31 +20,33 @@ test.describe( 'Upsell', () => {
         // Hover over text named Filter by Keyword
         const filtersTab = page.locator('#feedzy-import-form > div.feedzy-accordion > div:nth-child(2)');
 
-        // It should have 1 elements with .only-pro-content class.
-        await expect( filtersTab.locator('.pro-label').count() ).resolves.toBe(1);
+        // It should have 1 elements with .fz-panel-tab class.
+        await expect( filtersTab.locator('.fz-panel-tab').count() ).resolves.toBe(1);
+
+        // 'Add condition' action button has .is-upsell class.
+        await expect(filtersTab.locator('.fz-action-btn.is-upsell')).toHaveCount(1);
 
     } );
 
 
     test( 'general settings', async({ editor, page }) => {
         await page.getByRole('button', { name: 'Step 4 General feed settings' }).click({ force: true });
 
+        await page.locator('.fz-form-group:has( #fz-event-schedule )').scrollIntoViewIfNeeded()
 
+        // check all the option expect daily is disabled.
+        const otherOptions = page.locator('#fz-event-schedule option:not([value="daily"])');
+        const count = await otherOptions.count();
 
-        await page.locator('.fz-form-group:has( #feed-post-default-thumbnail )').hover({ force: true });
-        let upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=fallback-image"]');
-        await expect( upgradeAlert ).toBeVisible();
-
-        await page.locator('.fz-form-group:has( #fz-event-schedule )').scrollIntoViewIfNeeded()
-        await page.locator('.fz-form-group:has( #fz-event-schedule )').hover({ force: true });
-        upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=schedule-import-job"]');
-        await expect( upgradeAlert ).toBeVisible();
+        for (let i = 0; i < count; i++) {
+            await expect(otherOptions.nth(i)).toBeDisabled();
+        }
 
         // Click the advanced settings tab.
         await page.click('[data-id="fz-advanced-settings"]');
 
         await page.locator('.fz-form-group:has( #feedzy_mark_duplicate )').hover({ force: true });
-        upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=remove-duplicates"]');
+        const upgradeAlert = page.locator('#feedzy-import-form a[href*="utm_campaign=remove-duplicates"]');
         await expect( upgradeAlert ).toBeVisible();
     } );
 });