VC-3543 remove pnps survey

Author: OlegApanovich

public/components/popup/popupContainer.tsx

@@ -2,7 +2,6 @@ import React, { useState, useEffect, useCallback } from 'react'
 import { Dispatch } from 'redux' // eslint-disable-line
 import classNames from 'classnames'
 import { getStorage } from 'vc-cake'
-import VotePopup from './popups/votePopup'
 import PremiumPromoPopup from './popups/premiumPromoPopup'
 import PricingPopup from './popups/pricingPopup'
 import { connect } from 'react-redux'
@@ -62,9 +61,7 @@ const PopupContainer = ({ activePopup, allPopupsHidden, isPopupVisible, popupVis
 
   let activePopupHtml = null
 
-  if (activePopup === 'votePopup') {
-    activePopupHtml = <VotePopup {...popupProps} />
-  } else if (activePopup === 'premiumPromoPopup') {
+  if (activePopup === 'premiumPromoPopup') {
     activePopupHtml = <PremiumPromoPopup {...popupProps} />
   } else if (activePopup === 'pricingPopup') {
     activePopupHtml = <PricingPopup {...popupProps} />

public/components/popup/popups/votePopup.tsx

@@ -15,51 +15,8 @@
  */
 class Popups implements Helper
 {
-    protected static $showFeedbackPopupCache;
-
     protected static $showPremiumPromoPopupCache;
 
-    /**
-     * It a score from 1-10 rating popup survey.
-     *
-     * @note The survey should show up to all users: free and premium.
-     * @note The survey should show up to users who previously submitted answers to our previous surveys version.
-     * @note The survey should appear to the user after 5 days after activation.
-     *
-     * @return bool
-     */
-    public function showFeedbackPopup()
-    {
-        if (!is_null(self::$showFeedbackPopupCache)) {
-            return self::$showFeedbackPopupCache;
-        }
-
-        $user = wp_get_current_user();
-
-        if (empty($user->ID)) {
-            return self::$showFeedbackPopupCache;
-        }
-
-        $optionsHelper = vchelper('Options');
-        $result = false;
-        // do only if feedback not sent previously
-
-        if (!get_user_meta($user->ID, 'vcv-feedback-score', true)) {
-            // Actively used for more then 5 days
-            $isActivelyUsed = vchelper('Plugin')->isActivelyUsed();
-            // System check is OK
-            $systemStatusFailing = $optionsHelper->get('systemCheckFailing', false);
-            // Have at least 3 posts with VCWB
-            $foundPostsOk = vchelper('Plugin')->isHasCertainPostsNumber();
-
-            $result = $isActivelyUsed && !$systemStatusFailing && $foundPostsOk;
-        }
-
-        self::$showFeedbackPopupCache = $result;
-
-        return self::$showFeedbackPopupCache;
-    }
-
     public function showPremiumPromoPopup()
     {
         if (!is_null(self::$showPremiumPromoPopupCache)) {
@@ -75,14 +32,6 @@ public function showPremiumPromoPopup()
             return self::$showPremiumPromoPopupCache;
         }
 
-        // 3 days delay if feedback popup is closed
-        // 14 days delay after free license activated
-        $showFeedbackPopup = $this->showFeedbackPopup();
-        if ($showFeedbackPopup) {
-            self::$showPremiumPromoPopupCache = $result;
-            return self::$showPremiumPromoPopupCache;
-        }
-
         // Only if false (so it is not yet shown or already sent)
         $user = wp_get_current_user();
         if (!empty($user->ID)) {

visualcomposer/Helpers/Popups.php

@@ -32,10 +32,6 @@ class FeedbackController extends Container implements Module
      */
     public function __construct()
     {
-        $this->addFilter('vcv:ajax:vote:score:feedback:submit:adminNonce', 'submitScoreVote');
-
-        $this->addFilter('vcv:ajax:review:survey:submit:adminNonce', 'submitReviewSurvey');
-
         $this->addFilter(
             'vcv:ajax:license:deactivation:submit:adminNonce',
             'deactivationSubmitForm'
@@ -46,8 +42,6 @@ public function __construct()
             'activationSurveySubmitForm'
         );
 
-        $this->addFilter('vcv:editor:variables', 'addVariables');
-
         $file = plugin_basename(VCV_PLUGIN_FULL_PATH);
         $this->wpAddAction('deactivate_' . $file, 'setDeactivationPopupInterval');
     }
@@ -220,24 +214,6 @@ protected function activationSurveySubmitForm(Request $requestHelper, Url $urlHe
         return ['status' => true];
     }
 
-    /**
-     * @param $variables
-     * @param $payload
-     * @param \VisualComposer\Helpers\Popups $popupsHelper
-     *
-     * @return array
-     */
-    protected function addVariables($variables, $payload, Popups $popupsHelper)
-    {
-        $variables[] = [
-            'key' => 'VCV_SHOW_FEEDBACK_FORM',
-            'value' => $popupsHelper->showFeedbackPopup(),
-            'type' => 'constant',
-        ];
-
-        return $variables;
-    }
-
     /**
      * Set time interval for deactivation feedback popup
      */