Commit 53471145 authored by KR Moorhouse's avatar KR Moorhouse

Merge branch 'issue#4039' into 'develop'

Removing Membership section from "Apps & Integrations" tab.

Closes #4039

See merge request !3849
parents 83de805d 66864d3b
Pipeline #2837 passed with stages
in 6 minutes and 28 seconds
......@@ -112,173 +112,15 @@
<!-- Section: apps and Integrations -->
<script id="tmpl-nf-apps" type="text/template">
<?php
$saved = get_option( 'ninja_forms_memberships_feed', false );
if ( ! $saved ) {
?>
<!-- WIDGET CONTAINER -->
<div class="widget widget-memberships">
<div class="pricing-container">
<!-- Personal Membership Section -->
<div class="pricing-block widget">
<div class="pricing-header">
<div class="pricing-title"><?php _e( 'PERSONAL', 'ninja-forms' ); ?></div>
<div class="pricing-price">$99 / <?php _e( 'year', 'ninja-forms' ); ?></div>
<div class="pricing-savings"><?php _e( 'SAVE OVER $280!', 'ninja-forms' ); ?></div>
<div class="pricing-cta"><a target="_blank" href="https://ninjaforms.com/checkout/?edd_action=add_to_cart&download_id=471356&utm_source=Ninja+Forms+Plugin&utm_medium=Apps+and+Integrations&utm_campaign=Dashboard+Memberships&utm_content=Personal+Buy+Now" class="nf-button primary"><?php _e( 'Buy Now', 'ninja-forms' ); ?></a></div>
</div>
<div class="pricing-body">
<div>
<hr>
<span class="pricing-body-title"><?php _e( 'ALL THE ESSENTIALS, PLUS:', 'ninja-forms' ); ?></span>
<hr>
</div>
<div>
<i class="fa fa-user" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'SINGLE SITE', 'ninja-forms' ); ?></span>
</div>
<div>
<i class="fa fa-life-ring" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'PRIORITY SUPPORT', 'ninja-forms' ); ?></span>
</div>
<div>
<i class="fa fa-wrench" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'FORM BUILDING ESSENTIALS', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'Layout & Styles', 'ninja-forms' ); ?></li>
<li><?php _e( 'Conditional Logic', 'ninja-forms' ); ?></li>
<li><?php _e( 'File Uploads', 'ninja-forms' ); ?></li>
<li><?php _e( 'Multi-Part Forms', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-envelope" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'EMAIL MARKETING', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'MailChimp', 'ninja-forms' ); ?></li>
<li><?php _e( 'Constant Contact', 'ninja-forms' ); ?></li>
<li><?php _e( 'Campaign Monitor', 'ninja-forms' ); ?></li>
<li><?php _e( 'Emma', 'ninja-forms' ); ?></li>
<li><?php _e( 'ConvertKit', 'ninja-forms' ); ?></li>
<li><?php _e( 'EmailOctopus', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-cc-paypal" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'ACCEPT PAYMENTS', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'PayPal Express', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-percent" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'Plus ', 'ninja-forms' ); ?> 20% <?php _e( 'off Additional Add-Ons', 'ninja-forms' ); ?></span>
</div>
</div>
</div>
<!-- Professional -->
<div class="pricing-block widget highlight">
<div class="pricing-header">
<div class="pricing-title"><?php _e( 'PROFESSIONAL', 'ninja-forms' ); ?></div>
<div class="pricing-price">$199 / <?php _e( 'year', 'ninja-forms' ); ?></div>
<div class="pricing-savings"><?php _e( 'SAVE OVER', 'ninja-forms' ); ?> $1500!</div>
<div class="pricing-cta"><a target="_blank" href="https://ninjaforms.com/checkout/?edd_action=add_to_cart&download_id=471355&?utm_source=Ninja+Forms+Plugin&utm_medium=Apps+and+Integrations&utm_campaign=Dashboard+Memberships&utm_content=Professional+Buy+Now" class="nf-button primary"><?php _e( 'Buy Now', 'ninja-forms' ); ?></a></div>
</div>
<div class="pricing-body">
<div>
<hr>
<span class="pricing-body-title"><?php _e( 'EVERYTHING IN PERSONAL, PLUS:', 'ninja-forms' ); ?></span>
<hr>
</div>
<div>
<i class="fa fa-users" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( '20 SITES', 'ninja-forms' ); ?></span>
</div>
<div>
<i class="fa fa-user-plus" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'EMPOWER CLIENTS & USERS', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'Login & Registration Forms', 'ninja-forms' ); ?></li>
<li><?php _e( 'Update Profile Forms', 'ninja-forms' ); ?></li>
<li><?php _e( 'Post Creation Forms', 'ninja-forms' ); ?></li>
<li><?php _e( 'Save Form Progress', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-bolt" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'INTEGRATE ANYWHERE', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'Zapier', 'ninja-forms' ); ?></li>
<li><?php _e( 'Webhooks', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-cc-stripe" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'ACCEPT PAYMENTS', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'Stripe', 'ninja-forms' ); ?></li>
<li><?php _e( 'Recurly', 'ninja-forms' ); ?></li>
</ul>
</div>
<div>
<i class="fa fa-percent" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'Plus ', 'ninja-forms' ); ?><strong>40% </strong> <?php _e( 'off Additional Add-Ons', 'ninja-forms' ); ?></span>
</div>
</div>
</div>
<!-- AGENCY -->
<div class="pricing-block widget">
<div class="pricing-header">
<div class="pricing-title"><?php _e( 'AGENCY', 'ninja-forms' ); ?></div>
<div class="pricing-price">$499 / year</div>
<div class="pricing-savings"><?php _e( 'SAVE OVER', 'ninja-forms' ); ?> $3100!</div>
<div class="pricing-cta"><a target="_blank" href="https://ninjaforms.com/checkout/?edd_action=add_to_cart&download_id=203757&utm_source=Ninja+Forms+Plugin&utm_medium=Apps+and+Integrations&utm_campaign=Dashboard+Memberships&utm_content=Agency+Buy+Now" class="nf-button primary"><?php _e( 'Buy Now', 'ninja-forms' ); ?></a></div>
</div>
<div class="pricing-body">
<div>
<hr>
<span class="pricing-body-title"><?php _e( 'EVERYTHING IN PROFESSIONAL, PLUS:', 'ninja-forms' ); ?></span>
<hr>
</div>
<div>
<i class="fa fa-users" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'UNLIMITED SITES', 'ninja-forms' ); ?></span>
</div>
<div>
<i class="fa fa-globe" aria-hidden="true"></i>
<span class="pricing-body-title"><?php _e( 'All Ninja Forms add-ons', 'ninja-forms' ); ?></span>
<ul>
<li><?php _e( 'CRM integrations', 'ninja-forms' ); ?></li>
<li><?php _e( 'SMS and Slack notifications', 'ninja-forms' ); ?></li>
<li><?php _e( 'Advanced Analytics', 'ninja-forms' ); ?></li>
<li><?php _e( 'More email marketing', 'ninja-forms' ); ?></li>
<li><?php _e( 'So much more!', 'ninja-forms' ); ?></li>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="widget widget-plan-notice">
<p class="widget-title"><?php _e( 'What else comes with Ninja Forms?', 'ninja-forms' ); ?></p>
<a href="https://ninjaforms.com/extensions/?utm_source=Ninja+Forms+Plugin&utm_medium=Apps+and+Integrations&utm_campaign=Dashboard+Features+Link" target="_blank" class="nf-button primary feature-list-link"><?php _e( 'Checkout our full list of features!', 'ninja-forms' ); ?> <i class="fa fa-chevron-circle-right" aria-hidden="true"></i></a>
<p class="widget-title">What else comes with Ninja Forms?</p>
<a class="nf-button primary feature-list-link" href="https://ninjaforms.com/features/?utm_source=Ninja+Forms+Plugin&utm_medium=Apps+and+Integrations&utm_campaign=Dashboard+Features+Link" target="_blank" rel="noopener">We're glad you asked! Checkout our full list of features! <i class="fa fa-chevron-circle-right" aria-hidden="true"></i></a>
<div><em>All plans include a 14 day money back guarantee.</em></div>
<div>Requires a current active license and subject to our <a href="https://ninjaforms.com/terms-conditions/?utm_medium=plugin&utm_source=plugin-dashboard&utm_campaign=Ninja+Forms+Memberships&utm_content=Terms+Conditions" target="_blank" rel="noopener">Terms &amp; Conditions</a>.</div>
</div>
<?php
} else {
echo( $saved );
}
Ninja_Forms()->menus[ 'add-ons']->display();
?>
<?php Ninja_Forms()->menus[ 'add-ons']->display(); ?>
</script>
<!-- Section: Required Updates -->
......
......@@ -1306,14 +1306,6 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
* @since 3.3.17
*/
function nf_update_marketing_feed() {
// Fetch our membership data.
$data = wp_remote_get( 'http://api.ninjaforms.com/feeds/?fetch=memberships' );
// If we got a valid response...
if ( 200 == $data[ 'response' ][ 'code' ] ) {
// Save the data to our option.
$data = wp_remote_retrieve_body( $data );
update_option( 'ninja_forms_memberships_feed', $data, false );
}
// Fetch our addon data.
$data = wp_remote_get( 'http://api.ninjaforms.com/feeds/?fetch=addons' );
// If we got a valid response...
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment