Skip to content

Commit e92bf7e

Browse files
feat: add free tier improvements (#1143)
- RSS Importer: Allow 1 filter condition (e.g., keyword, category) and setting a fallback image - Recurring Imports: Allow only "daily" schedule (other options remain Pro), keep settings accessible with unavailable options marked as locked - RSS Classic Block: Enable simple title keyword filter - RSS Loop Block: Allow use of 1 condition for filtering
1 parent 38d0231 commit e92bf7e

File tree

11 files changed

+296
-200
lines changed

11 files changed

+296
-200
lines changed

css/settings.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2512,7 +2512,7 @@ li.draggable-item .components-panel__body-toggle.components-button{
25122512
padding: 24px 0;
25132513
}
25142514

2515-
.fz-condition-control.is-upsell {
2515+
.is-upsell {
25162516
opacity: 0.6;
25172517
}
25182518

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ function closeModal(e) {
485485
jQuery(document).on('keyup', function (e) {
486486
if (e.key === "Escape") closeModal();
487487
});
488+
488489
});
489490
</script>
490491
<div id="feedzy-add-new-import" class="wp-core-ui feedzy-modal" style="display:none;">
@@ -726,8 +727,10 @@ class="button button-primary button-large"
726727
font-weight: 500;
727728
}
728729

729-
.feedzy-modal .modal-header h2 {
730+
:is( .feedzy-modal, #poststuff ) .modal-header h2 {
730731
font-size: 20px;
732+
margin: 0;
733+
padding: 0;
731734
}
732735

733736
.feedzy-modal .close-modal {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -563,12 +563,11 @@ public function feedzy_import_feed_options() {
563563
$inherited_thumbnail_id = ! empty( $this->free_settings['general']['default-thumbnail-id'] ) ? (int) $this->free_settings['general']['default-thumbnail-id'] : 0;
564564
if ( feedzy_is_pro() ) {
565565
$default_thumbnail_id = get_post_meta( $post->ID, 'default_thumbnail_id', true );
566+
$import_schedule = array(
567+
'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
568+
);
566569
}
567570

568-
$import_schedule = array(
569-
'fz_cron_schedule' => ! empty( $this->free_settings['general']['fz_cron_schedule'] ) ? $this->free_settings['general']['fz_cron_schedule'] : '',
570-
);
571-
572571
$fz_cron_schedule = get_post_meta( $post->ID, 'fz_cron_schedule', true );
573572
if ( ! empty( $fz_cron_schedule ) ) {
574573
$import_schedule['fz_cron_schedule'] = $fz_cron_schedule;

includes/util/feedzy-rss-feeds-conditions.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@ public function is_condition_met( $condition, $value ): bool {
247247
* @return bool True if the conditions are met, false otherwise.
248248
*/
249249
public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $index ): bool {
250-
if ( feedzy_is_new() && ! feedzy_is_pro() ) {
251-
return $default_value;
252-
}
253-
254250
if ( ! isset( $attrs['filters'] ) || empty( $attrs['filters'] ) ) {
255251
return $default_value;
256252
}

includes/views/import-metabox-edit.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ class="dashicons dashicons-arrow-down-alt2"></span>
106106
</div>
107107
<!-- Sources configuration Step End -->
108108
<!-- Filters Step Start -->
109-
<div class="feedzy-accordion-item <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
109+
<div class="feedzy-accordion-item">
110110
<div class="feedzy-accordion-item__title" id="fz-import-filters">
111111
<button type="button" class="feedzy-accordion-item__button">
112112
<div class="feedzy-accordion__step-number help-text"><?php esc_html_e( 'Step 2', 'feedzy-rss-feeds' ); ?></div>
113-
<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>
113+
<div class="feedzy-accordion__step-title h2"><?php esc_html_e( 'Filters', 'feedzy-rss-feeds' ); ?></div>
114114
<div class="feedzy-accordion__icon"><span class="dashicons dashicons-arrow-down-alt2"></span></div>
115115
</button>
116116
</div>
@@ -119,9 +119,6 @@ class="dashicons dashicons-arrow-down-alt2"></span>
119119

120120
<input type="hidden" name="feedzy_meta_data[filter_conditions]" id="feed-post-filters-conditions" value="<?php echo esc_attr( $filter_conditions ); ?>">
121121
<div class="fz-conditions" id="fz-conditions"></div>
122-
<?php if ( ! feedzy_is_pro() ) : ?>
123-
<div class="fdz-upgrade-link"><span class="dashicons dashicons-lock"></span> <a href="<?php echo esc_url( feedzy_upgrade_link( 'filters', 'import' ) ); ?>" target="_blank"><?php _e( 'Upgrade to Unlock Advanced Filtering', 'feedzy-rss-feeds' ); ?> </a></div>
124-
<?php endif; ?>
125122
</div>
126123
</div>
127124
</div>
@@ -630,15 +627,14 @@ class="fz-switch-toggle" type="checkbox" value="yes"
630627
</div>
631628
</div>
632629

633-
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
634-
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'schedule-import-job', 'import' ) ); ?>
630+
<div class="form-block form-block-two-column">
635631
<div class="fz-left">
636-
<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?></h4>
632+
<h4 class="h4"><?php esc_html_e( 'Schedule', 'feedzy-rss-feeds' ); ?></h4>
637633
</div>
638634
<div class="fz-right">
639635
<div class="fz-form-group">
640636
<label class="form-label"><?php esc_html_e( 'Import schedule', 'feedzy-rss-feeds' ); ?></label>
641-
<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]"<?php disabled( true, ! feedzy_is_pro() ); ?>>
637+
<select id="fz-event-schedule" class="form-control fz-select-control" name="feedzy_meta_data[fz_cron_schedule]">
642638
<?php
643639
$save_schedule = ! empty( $import_schedule['fz_cron_schedule'] ) ? $import_schedule['fz_cron_schedule'] : '';
644640

@@ -662,6 +658,7 @@ class="fz-switch-toggle" type="checkbox" value="yes"
662658
}
663659
?>
664660
<option data-slug="<?php echo esc_attr( $slug ); ?>" value="<?php echo esc_attr( $slug ); ?>"<?php selected( $save_schedule, $slug ); ?>
661+
<?php disabled( ! feedzy_is_pro() && 'daily' !== $slug ); ?>
665662
>
666663
<?php echo esc_html( $display_text ); ?>
667664
</option>
@@ -674,11 +671,10 @@ class="fz-switch-toggle" type="checkbox" value="yes"
674671
</div>
675672
</div>
676673

677-
<div class="form-block form-block-two-column <?php echo esc_attr( apply_filters( 'feedzy_upsell_class', '' ) ); ?>">
678-
<?php echo wp_kses_post( apply_filters( 'feedzy_upsell_content', '', 'fallback-image', 'import' ) ); ?>
674+
<div class="form-block form-block-two-column">
679675
<div class="fz-left">
680676
<h4 class="h4">
681-
<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?> <?php echo ! feedzy_is_pro() ? ' <span class="pro-label">PRO</span>' : ''; ?>
677+
<?php esc_html_e( 'Fallback Image', 'feedzy-rss-feeds' ); ?>
682678
</h4>
683679
</div>
684680
<div class="fz-right">

0 commit comments

Comments
 (0)