Changeset 1774331

Timestamp:

11/23/2017 08:17:52 PM (8 years ago)

Author:

truvisibility

Message:

• Added available subscriptions information
• Fixed bug at new user creation

Location:

truvisibility-plagiarism-checker/trunk

Files:

• css/common.css (modified) (1 diff)
• js/settings.js (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• services/TruVisibilityPlagiarismRestApi.php (modified) (3 diffs)
• services/TruVisibilityPlagiarismSettings.php (modified) (5 diffs)
• services/clients/TruVisibilityAuthClient.php (modified) (3 diffs)
• services/clients/TruVisibilityPlagiarismClient.php (modified) (1 diff)

truvisibility-plagiarism-checker/trunk/css/common.css

@@ -24 +24 @@
     display: none;
 }
+
+td.rast-row {
+    padding: 5px 10px;
+}

truvisibility-plagiarism-checker/trunk/js/settings.js

@@ -17 +17 @@
         $("#auth-code").show();
         $("#auth-code-apply").click(function () {
-            var code = $("#auth-code-value").val();
-
-            $.get(restUrl + "auth/" + code)
-                .done(function (data, statusText, xhr) {
-                    if (xhr.status === 200) {
-                        window.location.reload();
-                    }
-                });
+            $.get(restUrl + "auth/" + $("#auth-code-value").val()).done(function() {
+                $.post(restUrl + "account/ensure").done(function() {
+                    window.location.reload();
+                });
+            });
         });
     });
@@ -39 +36 @@
                 }
             });
+    });
+
+    $.get(restUrl + "plans").done(function (plans) {
+        $("#rast-plans-loading").remove();
+        
+        var header = $("<tr>").css("font-weight", "600")
+            .append($("<td>").text("Name").addClass("rast-row"))
+            .append($("<td>").text("Checks included").addClass("rast-row"))
+            .append($("<td>").text("Price").addClass("rast-row"))
+            .append($("<td>").text("Cost of additional check").addClass("rast-row"));
+
+        var table = $("#rast-plans").append(header);
+
+        var isFreePlanActive = plans.some(function(p) { return p.code.startsWith("free") && p.isActive; });
+
+        plans = plans
+            .filter(function(p) { return p.code !== "free-12" && p.code !== "free-24" && p.code !== "free-36"; })
+            .sort(function(a, b) { return a.price - b.price; });
+        
+        for (var j = 0; j < plans.length; j++) {
+            var plan = plans[j];
+            
+            if (plan.code === "free-1") plan.isActive = isFreePlanActive;
+            if (plan.code.endsWith("-1")) plan.name += " (monthly)";
+            
+            var subscriptionUpgradeLink = "https://sites." + umbrellaRoot + "/client/purchase#plagiarism-packages:" + plan.code.replace("-", ":");
+            
+            var row = $("<tr>").css("font-weight", plan.isActive ? "600" : "normal");
+            row.append($("<td>").text(plan.name).addClass("rast-row"));
+            row.append($("<td>").text(plan.checksPerMonth + " per month").addClass("rast-row"));
+            row.append($("<td>").text("$" + plan.price.toFixed(2)).addClass("rast-row"));
+            row.append($("<td>").text("$" + getExtraCheckPrice(plan.code).toFixed(2)).addClass("rast-row"));
+            row.append($("<td>").html(plan.isActive ? 'current' : '<a href="' + subscriptionUpgradeLink + '" target="_blank">select</a>').addClass("rast-row"));
+            table.append(row);
+        }
+
+        function getExtraCheckPrice(planCode) {
+            if (planCode.startsWith("basic")) return 1.0;
+            if (planCode.startsWith("pro")) return 0.9;
+            return 1.3;
+        }
     });
 

truvisibility-plagiarism-checker/trunk/readme.txt

@@ -13 +13 @@
 TruVisibility Plagiarism Checker plugin for WordPress helps you find out which pages on the Web have quoted or copied your original content and whether they have violated your intellectual property and publishing permissions. It also helps you ensure that your content is original as well.
 
-When TruVisibility Plagiarism Checker detects a page which used your content against permitted usage, a single click enables you to obtain this user’s “WHOIS” information such as name, email, phone and address, enabling you to send a DMCA notice in order to take down that pages.
+When TruVisibility Plagiarism Checker detects a page which used your content against permitted usage, a single click enables you to obtain this user's WHOIS information such as name, email, phone and address, enabling you to send a DMCA notice in order to take down that pages.
 
 Not only does TruVisibility Plagiarism Checker help protect your content, but it also provides you with a valuable tool to track the way others react to your content in order to understand how to improve your publishing experience.
@@ -30 +30 @@
 * Disable email alerts for specific domains.
 * Ability to exclude certain categories and posts from schedule check.
-* Easily grab user’s WHOIS information for domains that contains pirated pages to help you send DMCA notification.
+* Easily grab user's WHOIS information for domains that contains pirated pages to help you send DMCA notification.
 
 == Installation ==

truvisibility-plagiarism-checker/trunk/services/TruVisibilityPlagiarismRestApi.php

@@ -18 +18 @@
         register_rest_route('truvisibility/plagiarism/v1', '/auth/(?P<code>[\\w\\d]+)', array('methods' => 'GET', 'callback' => array($this, 'complete_authorization')));
         register_rest_route('truvisibility/plagiarism/v1', '/auth/clean', array('methods' => 'POST', 'callback' => array($this, 'clean_authorization')));
+        register_rest_route('truvisibility/plagiarism/v1', '/plans', array('methods' => 'GET', 'callback' => array($this, 'get_plans')));
         register_rest_route('truvisibility/plagiarism/v1', '/account', array('methods' => 'GET', 'callback' => array($this, 'get_account')));
+        register_rest_route('truvisibility/plagiarism/v1', '/account/ensure', array('methods' => 'POST', 'callback' => array($this, 'ensure_account')));
         register_rest_route('truvisibility/plagiarism/v1', '/history', array('methods' => 'GET', 'callback' => array($this, 'get_history')));
         register_rest_route('truvisibility/plagiarism/v1', '/checks/quota', array('methods' => 'GET', 'callback' => array($this, 'get_quota')));
@@ -29 +31 @@
     }
 
+    function get_plans()
+    {
+        return $this->plagiarism_client->get_plans();
+    }
+
     function get_account()
     {
@@ -36 +43 @@
 
         return $account;
+    }
+
+    function ensure_account()
+    {
+        return $this->auth_client->ensure_account();
     }
 

truvisibility-plagiarism-checker/trunk/services/TruVisibilityPlagiarismSettings.php

@@ -33 +33 @@
         register_setting('plagiarism', 'truvisibility_plagiarism_usage', array($this, 'sanitize_settings'));
  
-        add_settings_section('plagiarism_section_account', 'Account', array($this, 'plagiarism_section_account_cb'), 'truvisibility_plagiarism_settings');
+        add_settings_section('section_account', 'Account', array($this, 'section_account_cb'), 'truvisibility_plagiarism_settings');
 
         if (get_option('truvisibility_plagiarism_account') != false)
         {
-            add_settings_section('plagiarism_section_usage', 'Usage', array($this, 'plagiarism_section_usage_cb'), 'truvisibility_plagiarism_settings');
+            add_settings_section('section_usage', 'Usage', array($this, 'section_usage_cb'), 'truvisibility_plagiarism_settings');
 
             $usage = get_option('truvisibility_plagiarism_usage');
 
             add_settings_field(
-                'plagiarism_field_enabled',
+                'field_enabled',
                 'Plagiarism checking is enabled',
-                array($this, 'plagiarism_field_enabled_cb'),
-                'truvisibility_plagiarism_settings',
-                'plagiarism_section_usage',
+                array($this, 'field_enabled_cb'),
+                'truvisibility_plagiarism_settings',
+                'section_usage',
                 $usage);
 
             add_settings_field(
-                'plagiarism_field_send_notif',
+                'field_send_notif',
                 'Send notification to site owner',
-                array($this, 'plagiarism_field_send_notif_cb'),
-                'truvisibility_plagiarism_settings',
-                'plagiarism_section_usage', 
+                array($this, 'field_send_notif_cb'),
+                'truvisibility_plagiarism_settings',
+                'section_usage', 
                 $usage);
 
             add_settings_field(
-                'plagiarism_field_stop_limit',
+                'field_stop_limit',
                 'Minimum acceptable uniqueness',
-                array($this, 'plagiarism_field_stop_limit_cb'),
-                'truvisibility_plagiarism_settings',
-                'plagiarism_section_usage',
+                array($this, 'field_stop_limit_cb'),
+                'truvisibility_plagiarism_settings',
+                'section_usage',
                 $usage);
 
-            add_settings_field(
-                'plagiarism_field_quota',
-                'Quota usage',
-                array($this, 'plagiarism_field_quota_cb'),
-                'truvisibility_plagiarism_settings',
-                'plagiarism_section_usage');
+            add_settings_section('section_subscription', 'Subscription', array($this, 'section_subscription_cb'), 'truvisibility_plagiarism_settings');
+            
+            add_settings_field(
+                'field_quota',
+                'Current usage',
+                array($this, 'field_quota_cb'),
+                'truvisibility_plagiarism_settings',
+                'section_subscription');
+
+            add_settings_field(
+                'field_plans',
+                'Available subscriptions',
+                array($this, 'field_plans_cb'),
+                'truvisibility_plagiarism_settings',
+                'section_subscription');
+
+            
         }
     }
@@ -82 +93 @@
     }
 
-    public function plagiarism_section_usage_cb( $args ) {}
-    public function plagiarism_section_account_cb($args) 
+    public function section_usage_cb( $args ) {}
+    public function section_subscription_cb($args) {}
+    public function section_account_cb($args) 
     {
         $account = get_option('truvisibility_plagiarism_account');
@@ -103 +115 @@
             <b><?php echo $account['name']; ?></b> <i>(<?php echo $account['email']; ?>)</i><br/>
             <div style="padding: 10px 0;">
-                <a href="https://auth.<?php echo TruVisibilityPlagiarismConfig::$TvUmbrellaRoot ?>/account/profile#products" target="_blank" class="button button-primary">Manage Subscriptions</a>
                 <div id="clean-auth-button" class="button">Sign Out</div>
             </div>
@@ -109 +120 @@
         }
     }
-    
-    public function plagiarism_field_enabled_cb($usage) 
+
+    public function field_enabled_cb($usage) 
     {
         echo '<input type="checkbox" '.checked($usage['checking_enabled'], 'on', false).' name="truvisibility_plagiarism_usage[checking_enabled]" />';
     }
 
-    public function plagiarism_field_send_notif_cb($usage) 
+    public function field_send_notif_cb($usage) 
     {
         echo '<input type="checkbox" '.checked($usage['notification_enabled'], 'on', false).' name="truvisibility_plagiarism_usage[notification_enabled]" style="position: relative; top: -2px;" /> ';
@@ -122 +133 @@
     }
 
-    public function plagiarism_field_stop_limit_cb($usage) 
+    public function field_stop_limit_cb($usage) 
     {
         echo '<input type="number" min="0", max="100" name="truvisibility_plagiarism_usage[min_uniqueness]" value="'.esc_attr($usage['min_uniqueness']).'" /> %';
     }
 
-    public function plagiarism_field_quota_cb($args) 
+    public function field_plans_cb($args) 
+    {
+        ?>
+        <img id="rast-plans-loading" src="<?php echo get_admin_url(); ?>images/loading.gif" />
+        <table id="rast-plans" style="margin: 0 0 0 -10px;"></table>
+        <?php
+    }
+
+    public function field_quota_cb($args) 
     {
         ?>
-        <div id="rast-quota-loading">Loading...</div>
+        <img id="rast-quota-loading" src="<?php echo get_admin_url(); ?>images/loading.gif" />
         <div id="rast-quota-view" style="display: none;">
             <span id="rast-quota-used"></span> of <span id="rast-quota-limit"></span> checks used. <span id="rast-purchase-info"></span>
             <p id="rast-purchasing-ok" class="description" style="display: none;">
-                You can <a href="javascript:void()" id="rast-upgrade"><strong>upgrade</strong></a> your quota by purchasing an additional checks.
+                You can <a href="javascript:void()" id="rast-upgrade"><strong>increase</strong></a> your quota by purchasing additional checks.
             </p>
             <p id="rast-purchasing-no-card" class="description" style="display: none;">
-                For purchasing an additional checks you should enter credit card into your <a href="https://auth.<?php echo TruVisibilityPlagiarismConfig::$TvUmbrellaRoot; ?>/account/profile#credit-card" target="_blank">TruVisibility account</a>.
+                Please update your <a href="https://auth.<?php echo TruVisibilityPlagiarismConfig::$TvUmbrellaRoot; ?>/account/profile#credit-card" target="_blank">TruVisibility account</a> with credit card information to unblock additional checks.
             </p>
         </div>

truvisibility-plagiarism-checker/trunk/services/clients/TruVisibilityAuthClient.php

@@ -5 +5 @@
 
     private $redirect_uri;
+
+    private $api_endpoint;
 
     private $client_id = '6202f4a6-c009-4ff8-8cec-60b120119577';
@@ -14 +16 @@
         $this->auth_token_endpoint = 'https://auth.'.TruVisibilityPlagiarismConfig::$TvUmbrellaRoot.'/oauth/token';
         $this->redirect_uri = 'https://auth.'.TruVisibilityPlagiarismConfig::$TvUmbrellaRoot.'/oauth/authorization-code';
+        $this->api_endpoint = 'https://auth.'.TruVisibilityPlagiarismConfig::$TvUmbrellaRoot.'/account/api';
+    }
+
+    public function ensure_account()
+    {
+        $response = wp_remote_post($this->api_endpoint.'/charge/customer/ensure', $this->default_args());
+
+        return self::parse($response);
     }
 
@@ -83 +93 @@
         return json_decode($response['body']); ;
     }
+
+    private static function parse($response)
+    {
+        return (is_wp_error($response) || wp_remote_retrieve_response_code($response) != 200) ? $response : json_decode($response['body']);
+    }
+
+    private function default_args()
+    {
+        return array(
+            'timeout' => 30, 
+            'sslverify' => TruVisibilityPlagiarismConfig::$SslVerify, 
+            'headers' => array('Authorization' => 'Bearer '.get_option('truvisibility_plagiarism_account')['access-token']));
+    }
 }
 ?>

truvisibility-plagiarism-checker/trunk/services/clients/TruVisibilityPlagiarismClient.php

@@ -88 +88 @@
     }
 
+    public function get_plans()
+    {
+        $this->auth_client->update_access_if_expired();
+
+        $response = wp_remote_get($this->plagiarism_endpoint.'/plans', $this->default_args());
+
+        return self::parse($response);
+    }
+
     public function notify_about_plagiarized_post($email, $title, $url, $uniqueness, $min_uniqueness)
     {