Changeset 3395155

Timestamp:

11/13/2025 03:52:21 PM (3 months ago)

Author:

2wstechnologies

Message:

version 2 of plugin with new export method and annual payment and many others optimizations

Location:

askeet/trunk

Files:

• README.txt (modified) (4 diffs)
• askeet.php (modified) (11 diffs)
• assets/css/style.css (modified) (3 diffs)
• assets/js/script.js (modified) (5 diffs)

askeet/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 6.2
 Tested up to: 6.8
-Stable tag: 1.0
+Stable tag: 2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -223 +223 @@
 * Export functionality (Pro)
 
+= 2.0 =
+  * NEW: Modern subscription management page with pricing cards and one-click upgrades
+  * NEW: Smart pagination - display 50 rows, export up to 1,500 rows per page
+  * IMPROVED: Export limit increased to 10,000 rows with "Export All" button
+  * IMPROVED: Dynamic rows per page selector (20, 50, 100, 500, 1,500)
+  * IMPROVED: Performance notifications for large datasets
+  * FIXED: Upgrade modal display when reaching plan limits
+  * UPDATED: Community links (Discord + Slack)
+  * UPDATED: UI/UX design optimization with better responsiveness
+  * NEW: Add annual payment and date renew
+
 = Upcoming Features =
 
@@ -237 +248 @@
 Initial release. Install now to start getting instant insights from your WooCommerce data!
 
+= 2.0 =
+  * NEW: Modern subscription management page with pricing cards and one-click upgrades
+  * NEW: Smart pagination - display 50 rows, export up to 1,500 rows per page
+  * IMPROVED: Export limit increased to 10,000 rows with "Export All" button
+  * IMPROVED: Dynamic rows per page selector (20, 50, 100, 500, 1,500)
+  * IMPROVED: Performance notifications for large datasets
+  * FIXED: Upgrade modal display when reaching plan limits
+  * UPDATED: Community links (Discord + Slack)
+  * UPDATED: UI/UX design optimization with better responsiveness
+
 == Source Code ==
 The unminified source code for JavaScript and CSS is included in the /assets/js/ and /assets/css/ folders of this plugin. If you use a minified file, the original source is present alongside it.
@@ -251 +272 @@
 * **Website:** [https://www.askeet.ai/](https://www.askeet.ai/)
 * **Support Email:** [email protected]
+* **Slack Community:** [https://reach-technologies.slack.com/archives/C09S953P6MD](https://reach-technologies.slack.com/archives/C09S953P6MD)
+* **Discord Server:** [https://discord.com/channels/1438540885758443570/1438540942973079766](https://discord.com/channels/1438540885758443570/1438540942973079766)
 
 == Why Choose Askeet? ==

askeet/trunk/askeet.php

@@ -3 +3 @@
  * Plugin Name: Askeet
  * Description: Askeet is your AI assistant for WooCommerce: generate, run, and analyze SQL queries securely, no code needed, with a modern multilingual interface.
- * Version: 1.0
+ * Version: 2.0
  * Author: Reach Technologies
  * License: GPL-2.0+
@@ -37 +37 @@
         update_option('askeet_install_id', wp_generate_password(24, false));
     }
-    define('ASKEET_VERSION', '1.0');
+    define('ASKEET_VERSION', '2.0');
 
     $install_id = get_option('askeet_install_id');
@@ -105 +105 @@
         add_action('wp_ajax_askeet_process_query_request', array($this, 'askeet_process_query_request'));
         add_action('wp_ajax_askeet_execute_sql_query', array($this, 'askeet_execute_sql_query'));
+        add_action('wp_ajax_askeet_export_all_results', array($this, 'askeet_export_all_results'));
         add_action('wp_ajax_askeet_save_query_history', array($this, 'askeet_save_query_history'));
         add_action('wp_ajax_askeet_delete_query_history', array($this, 'askeet_delete_query_history'));
@@ -163 +164 @@
         }
         wp_enqueue_style('askeet-style', plugins_url('assets/css/style.css', __FILE__));
-        wp_enqueue_script('askeet-script', plugins_url('assets/js/script.js', __FILE__), array('jquery'), '1.0', true);
+        wp_enqueue_script('askeet-script', plugins_url('assets/js/script.js', __FILE__), array('jquery'), '2.0', true);
         $current_plan = '';
         $install_id = get_option('askeet_install_id');
@@ -446 +447 @@
         }
         $page = isset($_POST['page']) ? max(1, intval(wp_unslash($_POST['page']))) : 1;
-        $per_page = 20;
+        $per_page = isset($_POST['per_page']) ? max(1, min(1500, intval(wp_unslash($_POST['per_page'])))) : 20;
         $offset = ($page - 1) * $per_page;
+        $export_mode = isset($_POST['export_mode']) && $_POST['export_mode'];
         $disable_pagination = false;
         $results = [];
         $total_count = 0;
+        $actual_rows = $per_page; // Actual rows fetched (before display limit)
+        $display_limited = false;
         $start_time = microtime(true);
 
@@ -459 +463 @@
             $execution_time = round(microtime(true) - $start_time, 4);
             $total_count = count($results);
+            $actual_rows = count($results);
         } else {
             // Toujours retirer LIMIT/OFFSET existant
@@ -468 +473 @@
             $results = $wpdb->get_results($paginated_query, ARRAY_A);
             $execution_time = round(microtime(true) - $start_time, 4);
+            $actual_rows = is_array($results) ? count($results) : 0;
+
+            // Smart display limit: only show first 50 rows if per_page is 500 or 1500 (unless export mode)
+            if (!$export_mode && $per_page >= 500 && count($results) > 50) {
+                $results = array_slice($results, 0, 50);
+                $display_limited = true;
+            }
+
             // Compter le total (sans LIMIT)
             $count_query = $sql_query_no_limit ?? $sql_query;
@@ -513 +526 @@
             'page' => $page,
             'per_page' => $per_page,
+            'actual_rows' => $actual_rows,
+            'display_limited' => $display_limited,
             'disable_pagination' => $disable_pagination
+        ));
+        exit;
+    }
+
+    public function askeet_export_all_results() {
+        // Nonce and permission check
+        if (!isset($_REQUEST['nonce']) || !wp_verify_nonce(sanitize_text_field(wp_unslash($_REQUEST['nonce'])), 'askeet_query_assistant_nonce')) {
+            wp_send_json_error(['message' => 'Invalid nonce.']);
+            exit;
+        }
+        if (!current_user_can('manage_options')) {
+            wp_send_json_error(['message' => 'Insufficient permissions.']);
+            exit;
+        }
+
+        global $wpdb;
+        $sql_query = isset($_POST['sql_query']) ? sanitize_text_field(wp_unslash($_POST['sql_query'])) : '';
+        if (!empty($sql_query)) {
+            $sql_query = preg_replace('/\s+/', ' ', $sql_query);
+        }
+
+        // Security check: only SELECT queries allowed
+        if (!$this->askeet_is_safe_query($sql_query)) {
+            wp_send_json_error(['message' => 'Only SELECT queries are allowed.']);
+            exit;
+        }
+
+        // Get max rows (default 10000, max 10000 for performance)
+        $max_rows = isset($_POST['max_rows']) ? min(10000, max(1, intval(wp_unslash($_POST['max_rows'])))) : 10000;
+
+        $start_time = microtime(true);
+
+        // Remove any existing LIMIT/OFFSET from the query
+        $sql_query_no_limit = preg_replace('/LIMIT\s+\d+(\s*,\s*\d+)?(\s+OFFSET\s+\d+)?/i', '', $sql_query);
+        $sql_query_no_limit = preg_replace('/OFFSET\s+\d+/i', '', $sql_query_no_limit);
+        $sql_query_no_limit = rtrim($sql_query_no_limit, " ;\n\r");
+
+        // Add LIMIT for export (no OFFSET, start from beginning)
+        $export_query = $sql_query_no_limit . " LIMIT $max_rows";
+
+        // Execute query
+        $results = $wpdb->get_results($export_query, ARRAY_A);
+        $execution_time = round(microtime(true) - $start_time, 4);
+
+        if ($wpdb->last_error) {
+            wp_send_json_error(array('message' => __('SQL Error: ', 'askeet') . $wpdb->last_error));
+            exit;
+        }
+
+        $row_count = is_array($results) ? count($results) : 0;
+
+        wp_send_json_success(array(
+            'results' => $results,
+            'row_count' => $row_count,
+            'execution_time' => $execution_time,
+            'max_rows' => $max_rows
         ));
         exit;
@@ -735 +806 @@
           </div>
           <div class="button-group" style="display: flex!important;">
-            <a class="btn" href="https://discord.gg/yourlink" target="_blank" id="btn-discord"><?php echo esc_html__('Join Discord', 'askeet'); ?></a>
-            <a class="btn" href="https://slack.com/yourlink" target="_blank" id="btn-slack"><?php echo esc_html__('Join Slack', 'askeet'); ?></a>
+            <a class="btn" href="https://discord.com/channels/1438540885758443570/1438540942973079766" target="_blank" id="btn-discord"><?php echo esc_html__('Join Discord', 'askeet'); ?></a>
+            <a class="btn" href="https://reach-technologies.slack.com/archives/C09S953P6MD" target="_blank" id="btn-slack"><?php echo esc_html__('Join Slack', 'askeet'); ?></a>
             <a class="btn" href="mailto:[email protected]" id="btn-support"><?php echo esc_html__('Contact Support', 'askeet'); ?></a>
           </div>
@@ -919 +990 @@
         return;
     }
+
+    // Get current plan
     $api_url = askeet_get_api_url() . '/get-plan';
     $response = wp_remote_post($api_url, [
@@ -925 +998 @@
         'timeout' => 15,
     ]);
-    $plan = $next_payment = $price = '';
+
+    $plan_code = 'free';
+    $free_queries_left = 10;
+    $subscription_end_date = null;
     if (!is_wp_error($response)) {
         $body = json_decode(wp_remote_retrieve_body($response), true);
-        $plan_code = isset($body['plan']) ? $body['plan'] : (isset($body['current_plan']) ? $body['current_plan'] : '');
-        $plan = ($plan_code == '20') ? __('Pro', 'askeet') : (($plan_code == '100') ? __('Unlimited', 'askeet') : '');
-        $next_payment = isset($body['next_payment']) ? $body['next_payment'] : '';
-        $price = ($plan_code == '20') ? '20€' : (($plan_code == '100') ? '100€' : '');
-    }
-    // Get Stripe portal URL
+        $plan_code = isset($body['plan']) ? $body['plan'] : (isset($body['current_plan']) ? $body['current_plan'] : 'free');
+        $free_queries_left = isset($body['free_queries_left']) ? $body['free_queries_left'] : 0;
+        $subscription_end_date = isset($body['subscription_end_date']) ? $body['subscription_end_date'] : null;
+
+        // Debug: Log what we received
+        error_log('[ASKEET DEBUG] Plan: ' . $plan_code);
+        error_log('[ASKEET DEBUG] Subscription end date from API: ' . ($subscription_end_date ? $subscription_end_date : 'NULL'));
+    }
+
+    // Get Stripe portal URL for manage billing
     $portal_url = '';
-    $stripe_api_url = askeet_get_api_url() . '/stripe-portal-url';
-    $return_url = admin_url('admin.php?page=askeet');
-    $stripe_body = [
-        'install_id' => $install_id,
-        'return_url' => $return_url
-    ];
-    $stripe_response = wp_remote_post($stripe_api_url, [
-        'body' => json_encode($stripe_body),
-        'headers' => ['Content-Type' => 'application/json'],
-        'timeout' => 15,
-    ]);
-    if (!is_wp_error($stripe_response)) {
-        $stripe_data = json_decode(wp_remote_retrieve_body($stripe_response), true);
-        $portal_url = !empty($stripe_data['portal_url']) ? $stripe_data['portal_url'] : (!empty($stripe_data['url']) ? $stripe_data['url'] : '');
-    }
-    echo '<div style="max-width:480px;margin:40px auto 0 auto;padding:32px 24px 24px 24px;background:#fff;border-radius:12px;box-shadow:0 2px 16px rgba(0,0,0,0.07);text-align:center;">';
-    echo '<h2 style="margin-bottom:24px;">' . esc_html(__('Your current plan', 'askeet')) . '</h2>';
-    if ($plan) {
-        echo '<div style="font-size:1.2em;margin-bottom:12px;"><b>' . esc_html($plan) . '</b></div>';
-        if ($price) {
-            echo '<div style="margin-bottom:8px;">' . esc_html(__('Price', 'askeet')) . ': <b>' . esc_html($price) . '/month</b></div>';
-        }
-        if ($next_payment) {
-            echo '<div style="margin-bottom:18px;">' . esc_html(__('Next payment date', 'askeet')) . ': <b>' . esc_html($next_payment) . '</b></div>';
-        }
-    } else {
-        echo '<div style="margin-bottom:18px;color:#c00;">' . esc_html(__('No active plan found.', 'askeet')) . '</div>';
-    }
-    if ($portal_url) {
-        echo '<a href="' . esc_url($portal_url) . '" target="_blank" style="font-size:1.1em;padding:12px 28px;background:#005a9e;color:#fff;border-radius:8px;text-decoration:none;display:inline-block;margin-top:18px;">' . esc_html(__('Manage billing & invoices', 'askeet')) . '</a>';
-    }
-    echo '</div>';
+    if (in_array($plan_code, ['20', '20_yearly', '100', '100_yearly', 'premium', 'unlimited'])) {
+        $stripe_api_url = askeet_get_api_url() . '/stripe-portal-url';
+        $return_url = admin_url('admin.php?page=askeet-manage-subscription-redirect');
+        $stripe_response = wp_remote_post($stripe_api_url, [
+            'body' => json_encode(['install_id' => $install_id, 'return_url' => $return_url]),
+            'headers' => ['Content-Type' => 'application/json'],
+            'timeout' => 15,
+        ]);
+        if (!is_wp_error($stripe_response)) {
+            $stripe_data = json_decode(wp_remote_retrieve_body($stripe_response), true);
+            $portal_url = !empty($stripe_data['portal_url']) ? $stripe_data['portal_url'] : (!empty($stripe_data['url']) ? $stripe_data['url'] : '');
+        }
+    }
+
+    $success_url = admin_url('admin.php?page=askeet-manage-subscription-redirect&payment=success');
+    $cancel_url = admin_url('admin.php?page=askeet-manage-subscription-redirect&payment=cancel');
+    ?>
+    <div class="askeet-subscription-page">
+        <div class="askeet-sub-header">
+            <h1><?php echo esc_html(__('Manage Your Subscription', 'askeet')); ?></h1>
+            <p><?php echo esc_html(__('Choose the plan that fits your needs', 'askeet')); ?></p>
+
+            <?php if ($subscription_end_date && $plan_code !== 'free'): ?>
+                <div class="askeet-subscription-info">
+                    <div class="subscription-info-badge">
+                        <span class="info-icon">📅</span>
+                        <div class="info-content">
+                            <span class="info-label"><?php echo esc_html(__('Subscription Renews On', 'askeet')); ?></span>
+                            <span class="info-value">
+                                <?php
+                                try {
+                                    $date = new DateTime($subscription_end_date);
+                                    $now = new DateTime();
+
+                                    // Calculate days until renewal
+                                    $interval = $now->diff($date);
+                                    $days_left = $interval->days;
+
+                                    echo esc_html($date->format('F j, Y'));
+
+                                    // Show days left if in the future
+                                    if ($date > $now && $days_left > 0) {
+                                        echo ' <span style="font-size: 0.8em; color: #4caf50;">(' . $days_left . ' days left)</span>';
+                                    }
+                                } catch (Exception $e) {
+                                    echo esc_html($subscription_end_date);
+                                }
+                                ?>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            <?php endif; ?>
+        </div>
+
+        <!-- Billing Toggle: Monthly / Yearly -->
+        <div class="askeet-billing-toggle-wrapper">
+            <div class="askeet-billing-toggle">
+                <button class="billing-option active" data-billing="monthly">
+                    <span><?php echo esc_html(__('Monthly', 'askeet')); ?></span>
+                </button>
+                <button class="billing-option" data-billing="yearly">
+                    <span><?php echo esc_html(__('Yearly', 'askeet')); ?></span>
+                    <span class="save-badge"><?php echo esc_html(__('Save 17%', 'askeet')); ?></span>
+                </button>
+            </div>
+        </div>
+
+        <div class="askeet-pricing-cards">
+            <!-- Free Plan -->
+            <div class="askeet-price-card <?php echo ($plan_code === 'free') ? 'current-plan' : ''; ?>" data-plan="free">
+                <div class="plan-badge"><?php echo ($plan_code === 'free') ? __('Current Plan', 'askeet') : __('Free', 'askeet'); ?></div>
+                <h2 class="plan-name"><?php echo esc_html(__('Free', 'askeet')); ?></h2>
+                <div class="plan-price">
+                    <span class="price">$0</span>
+                    <span class="period">/month</span>
+                </div>
+                <ul class="plan-features">
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('10 queries per day', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Basic analytics', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Email support', 'askeet')); ?></li>
+                </ul>
+                <?php if ($plan_code === 'free'): ?>
+                    <div class="queries-remaining"><?php echo esc_html(sprintf(__('%d queries left today', 'askeet'), $free_queries_left)); ?></div>
+                    <button class="plan-button current" disabled><?php echo esc_html(__('Current Plan', 'askeet')); ?></button>
+                <?php else: ?>
+                    <button class="plan-button downgrade" disabled><?php echo esc_html(__('Downgrade to Free', 'askeet')); ?></button>
+                <?php endif; ?>
+            </div>
+
+            <!-- Pro Plan (20€) -->
+            <?php
+            // Determine if this card represents the current plan
+            $is_current_pro = (in_array($plan_code, ['20', '20_yearly', 'premium']));
+            ?>
+            <div class="askeet-price-card <?php echo $is_current_pro ? 'current-plan' : ''; ?>" data-plan="20" data-plan-yearly="20_yearly">
+                <div class="plan-badge popular"><?php echo $is_current_pro ? __('Current Plan', 'askeet') : __('Popular', 'askeet'); ?></div>
+                <h2 class="plan-name"><?php echo esc_html(__('Pro', 'askeet')); ?></h2>
+                <div class="plan-price">
+                    <div class="price-row">
+                        <span class="price monthly-price">$20</span>
+                        <span class="period monthly-period">/month</span>
+                    </div>
+                    <div class="yearly-price-wrapper" style="display: none;">
+                        <span class="price-compare">$240</span>
+                        <div class="price-row">
+                            <span class="price yearly-price">$200</span>
+                            <span class="period yearly-period">/year</span>
+                        </div>
+                    </div>
+                </div>
+                <ul class="plan-features">
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('50 queries per day', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Advanced analytics', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Priority support', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Export up to 10K rows', 'askeet')); ?></li>
+                </ul>
+
+                <!-- Monthly Button -->
+                <button class="plan-button upgrade askeet-upgrade-btn monthly-btn <?php echo ($plan_code === '20' || $plan_code === 'premium') ? 'current' : ''; ?>"
+                        data-plan="20"
+                        data-plan-yearly="20_yearly"
+                        <?php echo ($plan_code === '20' || $plan_code === 'premium') ? 'disabled' : ''; ?>>
+                    <?php
+                    if ($plan_code === '20' || $plan_code === 'premium') {
+                        echo esc_html(__('Current Plan', 'askeet'));
+                    } elseif ($plan_code === 'free') {
+                        echo esc_html(__('Upgrade to Pro', 'askeet'));
+                    } else {
+                        echo esc_html(__('Switch to Pro', 'askeet'));
+                    }
+                    ?>
+                </button>
+
+                <!-- Yearly Button (hidden by default) -->
+                <button class="plan-button upgrade askeet-upgrade-btn yearly-btn <?php echo ($plan_code === '20_yearly') ? 'current' : ''; ?>"
+                        style="display: none;"
+                        data-plan="20"
+                        data-plan-yearly="20_yearly"
+                        <?php echo ($plan_code === '20_yearly') ? 'disabled' : ''; ?>>
+                    <?php
+                    if ($plan_code === '20_yearly') {
+                        echo esc_html(__('Current Plan', 'askeet'));
+                    } elseif ($plan_code === 'free') {
+                        echo esc_html(__('Upgrade to Pro', 'askeet'));
+                    } else {
+                        echo esc_html(__('Switch to Pro', 'askeet'));
+                    }
+                    ?>
+                </button>
+            </div>
+
+            <!-- Unlimited Plan (100€) -->
+            <?php
+            // Determine if this card represents the current plan
+            $is_current_unlimited = (in_array($plan_code, ['100', '100_yearly', 'unlimited']));
+            ?>
+            <div class="askeet-price-card <?php echo $is_current_unlimited ? 'current-plan' : ''; ?>" data-plan="100" data-plan-yearly="100_yearly">
+                <div class="plan-badge premium"><?php echo $is_current_unlimited ? __('Current Plan', 'askeet') : __('Best Value', 'askeet'); ?></div>
+                <h2 class="plan-name"><?php echo esc_html(__('Unlimited', 'askeet')); ?></h2>
+                <div class="plan-price">
+                    <div class="price-row">
+                        <span class="price monthly-price">$100</span>
+                        <span class="period monthly-period">/month</span>
+                    </div>
+                    <div class="yearly-price-wrapper" style="display: none;">
+                        <span class="price-compare">$1200</span>
+                        <div class="price-row">
+                            <span class="price yearly-price">$1000</span>
+                            <span class="period yearly-period">/year</span>
+                        </div>
+                    </div>
+                </div>
+                <ul class="plan-features">
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Unlimited queries', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Advanced analytics', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('24/7 Priority support', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Export unlimited rows', 'askeet')); ?></li>
+                    <li><span class="feature-icon">✓</span> <?php echo esc_html(__('Custom integrations', 'askeet')); ?></li>
+                </ul>
+
+                <!-- Monthly Button -->
+                <button class="plan-button upgrade askeet-upgrade-btn monthly-btn <?php echo ($plan_code === '100' || $plan_code === 'unlimited') ? 'current' : ''; ?>"
+                        data-plan="100"
+                        data-plan-yearly="100_yearly"
+                        <?php echo ($plan_code === '100' || $plan_code === 'unlimited') ? 'disabled' : ''; ?>>
+                    <?php
+                    if ($plan_code === '100' || $plan_code === 'unlimited') {
+                        echo esc_html(__('Current Plan', 'askeet'));
+                    } else {
+                        echo esc_html(__('Upgrade to Unlimited', 'askeet'));
+                    }
+                    ?>
+                </button>
+
+                <!-- Yearly Button (hidden by default) -->
+                <button class="plan-button upgrade askeet-upgrade-btn yearly-btn <?php echo ($plan_code === '100_yearly') ? 'current' : ''; ?>"
+                        style="display: none;"
+                        data-plan="100"
+                        data-plan-yearly="100_yearly"
+                        <?php echo ($plan_code === '100_yearly') ? 'disabled' : ''; ?>>
+                    <?php
+                    if ($plan_code === '100_yearly') {
+                        echo esc_html(__('Current Plan', 'askeet'));
+                    } else {
+                        echo esc_html(__('Upgrade to Unlimited', 'askeet'));
+                    }
+                    ?>
+                </button>
+            </div>
+        </div>
+
+        <?php if ($portal_url && in_array($plan_code, ['20', '20_yearly', '100', '100_yearly', 'premium', 'unlimited'])): ?>
+            <div class="askeet-manage-billing">
+                <a href="<?php echo esc_url($portal_url); ?>" target="_blank" class="manage-billing-btn">
+                    <span class="icon">💳</span>
+                    <?php echo esc_html(__('Manage Billing & Invoices', 'askeet')); ?>
+                </a>
+            </div>
+        <?php endif; ?>
+
+        <div class="askeet-sub-footer">
+            <p>🔒 <?php echo esc_html(__('Secure payment powered by Stripe', 'askeet')); ?></p>
+            <p><?php echo esc_html(__('Cancel anytime. No questions asked.', 'askeet')); ?></p>
+        </div>
+    </div>
+
+    <script>
+    jQuery(document).ready(function($) {
+        // Track current billing mode (monthly or yearly)
+        let currentBillingMode = 'monthly';
+
+        // Handle billing toggle (monthly/yearly)
+        $('.billing-option').on('click', function() {
+            const billingMode = $(this).data('billing');
+
+            // Update button states
+            $('.billing-option').removeClass('active');
+            $(this).addClass('active');
+
+            // Update billing mode
+            currentBillingMode = billingMode;
+
+            // Toggle price visibility
+            if (billingMode === 'yearly') {
+                $('.price-row:has(.monthly-price)').hide();
+                $('.yearly-price-wrapper').show();
+                // Toggle buttons
+                $('.monthly-btn').hide();
+                $('.yearly-btn').show();
+            } else {
+                $('.price-row:has(.monthly-price)').show();
+                $('.yearly-price-wrapper').hide();
+                // Toggle buttons
+                $('.monthly-btn').show();
+                $('.yearly-btn').hide();
+            }
+
+            console.log('Billing mode changed to:', billingMode);
+        });
+
+        // Handle upgrade button clicks
+        $('.askeet-upgrade-btn').on('click', function() {
+            const btn = $(this);
+            const originalText = btn.html();
+
+            // Get the correct plan based on billing mode
+            let plan;
+            if (currentBillingMode === 'yearly') {
+                plan = btn.data('plan-yearly'); // e.g., "20_yearly" or "100_yearly"
+            } else {
+                plan = btn.data('plan'); // e.g., "20" or "100"
+            }
+
+            console.log('Selected plan:', plan, 'Billing mode:', currentBillingMode);
+
+            btn.prop('disabled', true).html('<?php echo esc_js(__('Processing...', 'askeet')); ?>');
+
+            $.ajax({
+                url: '<?php echo esc_js(askeet_get_api_url()); ?>/create-checkout-session',
+                type: 'POST',
+                contentType: 'application/json',
+                data: JSON.stringify({
+                    install_id: '<?php echo esc_js($install_id); ?>',
+                    plan: plan.toString(),
+                    success_url: '<?php echo esc_js($success_url); ?>',
+                    cancel_url: '<?php echo esc_js($cancel_url); ?>'
+                }),
+                success: function(response) {
+                    if (response.checkout_url) {
+                        window.location.href = response.checkout_url;
+                    } else {
+                        alert('<?php echo esc_js(__('Error: No checkout URL received.', 'askeet')); ?>');
+                        btn.prop('disabled', false).html(originalText);
+                    }
+                },
+                error: function() {
+                    alert('<?php echo esc_js(__('Error creating checkout session. Please try again.', 'askeet')); ?>');
+                    btn.prop('disabled', false).html(originalText);
+                }
+            });
+        });
+    });
+    </script>
+    <?php
 }
 

askeet/trunk/assets/css/style.css

@@ -48 +48 @@
   color: white;
   border: none;
-  padding: 32px 34px;
+  padding: 17px 34px;
   cursor: pointer;
   font-weight: 600;
@@ -56 +56 @@
   transition: background 0.3s ease;
   border-radius: 10px;
-  background: linear-gradient(180deg, rgba(0, 90, 158, 0.74) 0%, #005A9E 100%);
+  background: linear-gradient(180deg, rgb(61 63 66 / 74%) 0%, #13191e 100%);
 }
 
 .btn:hover {
-  background: linear-gradient(90deg, #004d8c 74%, #004d8c 100%);
+  background: #004d8c;
+  color: white!important;
 }
 
@@ -528 +529 @@
     margin-bottom: 8px;
 }
+
+/* Top controls bar - compact and attractive */
+.wcqa-top-controls {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
+    padding: 10px 16px;
+    border-radius: 8px;
+    margin-bottom: 12px;
+    border: 1px solid #e3e8ef;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+}
+
+.wcqa-rows-selector {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+}
+
+.wcqa-rows-selector label {
+    font-weight: 600;
+    color: #555;
+    font-size: 0.85em;
+    white-space: nowrap;
+}
+
+.wcqa-per-page-dropdown {
+    padding: 5px 10px;
+    border: 1.5px solid #d0d5dd;
+    border-radius: 5px;
+    font-size: 0.85em;
+    background: white;
+    cursor: pointer;
+    min-width: 70px;
+    font-weight: 600;
+    color: #444;
+    transition: all 0.2s;
+}
+
+.wcqa-per-page-dropdown:hover {
+    border-color: #005a9e;
+    background: #f0f7ff;
+}
+
+.wcqa-per-page-dropdown:focus {
+    outline: none;
+    border-color: #005a9e;
+    box-shadow: 0 0 0 2px rgba(0, 90, 158, 0.1);
+}
+
+.wcqa-export-controls-top {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+}
+
+.wcqa-export-btn-compact {
+    display: inline-flex !important;
+    align-items: center;
+    gap: 5px;
+    padding: 6px 12px !important;
+    font-size: 0.80em !important;
+    font-weight: 600 !important;
+    border-radius: 5px !important;
+    transition: all 0.2s ease;
+    white-space: nowrap;
+    height: auto !important;
+    line-height: 1.2 !important;
+}
+
+.wcqa-export-btn-compact .dashicons {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+    margin-right: 0;
+}
+
+.wcqa-export-btn-compact {
+    background: white !important;
+    border: 1.5px solid #005a9e !important;
+    color: #005a9e !important;
+}
+
+.wcqa-export-btn-compact:hover {
+    background: #005a9e !important;
+    color: white !important;
+    transform: translateY(-1px);
+    box-shadow: 0 2px 6px rgba(0, 90, 158, 0.2);
+}
+
+.wcqa-export-all-btn {
+    background: #005a9e !important;
+    border: 1.5px solid #005a9e !important;
+    color: white !important;
+}
+
+.wcqa-export-all-btn:hover {
+    background: #003d6b !important;
+    border-color: #003d6b !important;
+    box-shadow: 0 3px 8px rgba(0, 90, 158, 0.3);
+}
+
+.wcqa-export-btn-compact:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+    transform: none !important;
+}
+
+.wcqa-export-warning-top {
+    background: #fff8e1;
+    border-left: 3px solid #ffc107;
+    color: #856404;
+    padding: 8px 12px;
+    border-radius: 4px;
+    font-size: 0.85em;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    gap: 6px;
+}
+
+/* Performance notice - beautiful and clear */
+.wcqa-performance-notice {
+    background: linear-gradient(135deg, #e8f5e9 0%, #f1f8e9 100%);
+    border-left: 4px solid #4caf50;
+    border-radius: 8px;
+    padding: 14px 40px 14px 16px;
+    margin-bottom: 16px;
+    display: flex;
+    align-items: flex-start;
+    gap: 12px;
+    box-shadow: 0 2px 8px rgba(76, 175, 80, 0.15);
+    animation: slideInFromTop 0.4s ease-out;
+    position: relative;
+}
+
+@keyframes slideInFromTop {
+    from {
+        opacity: 0;
+        transform: translateY(-10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.wcqa-notice-icon {
+    font-size: 1.5em;
+    line-height: 1;
+    flex-shrink: 0;
+}
+
+.wcqa-notice-content {
+    flex: 1;
+    font-size: 0.9em;
+    line-height: 1.5;
+    color: #2e7d32;
+}
+
+.wcqa-notice-content strong {
+    font-weight: 700;
+    color: #1b5e20;
+}
+
+.wcqa-notice-close {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    background: none;
+    border: none;
+    font-size: 1.5em;
+    line-height: 1;
+    color: #4caf50;
+    cursor: pointer;
+    padding: 4px 8px;
+    border-radius: 4px;
+    transition: all 0.2s;
+}
+
+.wcqa-notice-close:hover {
+    background: rgba(76, 175, 80, 0.15);
+    color: #2e7d32;
+}
+
+/* Responsive design */
+@media (max-width: 768px) {
+    .wcqa-top-controls {
+        flex-direction: column;
+        gap: 10px;
+        align-items: stretch;
+    }
+
+    .wcqa-rows-selector {
+        justify-content: space-between;
+        width: 100%;
+    }
+
+    .wcqa-export-controls-top {
+        width: 100%;
+        justify-content: space-between;
+    }
+
+    .wcqa-export-btn-compact {
+        flex: 1;
+        justify-content: center;
+    }
+
+    .wcqa-performance-notice {
+        padding: 12px 14px;
+    }
+
+    .wcqa-notice-content {
+        font-size: 0.85em;
+    }
+}
+
+@media (max-width: 480px) {
+    .wcqa-export-controls-top {
+        flex-direction: column;
+        gap: 6px;
+    }
+
+    .wcqa-export-btn-compact {
+        width: 100%;
+    }
+
+    .wcqa-performance-notice {
+        padding: 10px 12px;
+        gap: 8px;
+    }
+
+    .wcqa-notice-icon {
+        font-size: 1.2em;
+    }
+
+    .wcqa-notice-content {
+        font-size: 0.8em;
+    }
+}
+
+/* Subscription Page - Modern Pricing Cards */
+.askeet-subscription-page {
+    max-width: 1200px;
+    margin: 30px auto;
+    padding: 0 20px;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
+}
+
+.askeet-sub-header {
+    text-align: center;
+    margin-bottom: 50px;
+}
+
+.askeet-sub-header h1 {
+    font-size: 2.5em;
+    font-weight: 700;
+    color: #1a1a2e;
+    margin-bottom: 12px;
+}
+
+.askeet-sub-header p {
+    font-size: 1.2em;
+    color: #666;
+}
+
+/* Subscription Info Badge */
+.askeet-subscription-info {
+    display: flex;
+    justify-content: center;
+    margin-top: 24px;
+}
+
+.subscription-info-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 12px;
+    background: linear-gradient(135deg, #e3f2fd 0%, #f3e5f5 100%);
+    border: 2px solid #005a9e;
+    border-radius: 16px;
+    padding: 16px 28px;
+    box-shadow: 0 4px 12px rgba(0, 90, 158, 0.15);
+}
+
+.info-icon {
+    font-size: 2em;
+    line-height: 1;
+}
+
+.info-content {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+
+.info-label {
+    font-size: 0.85em;
+    color: #666;
+    font-weight: 500;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+.info-value {
+    font-size: 1.3em;
+    color: #005a9e;
+    font-weight: 700;
+}
+
+/* Billing Toggle (Monthly/Yearly) */
+.askeet-billing-toggle-wrapper {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 40px;
+}
+
+.askeet-billing-toggle {
+    display: inline-flex;
+    background: #f5f7fa;
+    border-radius: 12px;
+    padding: 6px;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.billing-option {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 12px 24px;
+    border: none;
+    background: transparent;
+    color: #666;
+    font-size: 16px;
+    font-weight: 600;
+    border-radius: 8px;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    position: relative;
+}
+
+.billing-option:hover {
+    color: #005a9e;
+}
+
+.billing-option.active {
+    background: white;
+    color: #005a9e;
+    box-shadow: 0 2px 6px rgba(0, 90, 158, 0.15);
+}
+
+.save-badge {
+    display: inline-block;
+    background: linear-gradient(135deg, #4caf50 0%, #45a049 100%);
+    color: white;
+    font-size: 11px;
+    font-weight: 700;
+    padding: 3px 8px;
+    border-radius: 12px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    box-shadow: 0 2px 4px rgba(76, 175, 80, 0.3);
+}
+
+.askeet-pricing-cards {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    gap: 30px;
+    margin-bottom: 50px;
+}
+
+.askeet-price-card {
+    background: white;
+    border: 2px solid #e0e6ed;
+    border-radius: 16px;
+    padding: 32px 28px;
+    position: relative;
+    transition: all 0.3s ease;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+    display: flex;
+    flex-direction: column;
+    min-height: 100%;
+}
+
+.askeet-price-card:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 12px 24px rgba(0, 90, 158, 0.15);
+    border-color: #005a9e;
+}
+
+.askeet-price-card.current-plan {
+    border: 3px solid #4caf50;
+    background: linear-gradient(135deg, #f8fff9 0%, #ffffff 100%);
+}
+
+.askeet-price-card.current-plan:hover {
+    transform: none;
+    box-shadow: 0 8px 16px rgba(76, 175, 80, 0.2);
+}
+
+.plan-badge {
+    display: inline-block;
+    padding: 6px 16px;
+    background: #e0e6ed;
+    color: #555;
+    font-size: 0.85em;
+    font-weight: 700;
+    border-radius: 20px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+    margin-bottom: 20px;
+}
+
+.plan-badge.popular {
+    background: linear-gradient(135deg, #4f8cff 0%, #6f6fff 100%);
+    color: white;
+}
+
+.plan-badge.premium {
+    background: linear-gradient(135deg, #ff7e5f 0%, #feb47b 100%);
+    color: white;
+}
+
+.current-plan .plan-badge {
+    background: #4caf50;
+    color: white;
+}
+
+.plan-name {
+    font-size: 1.8em;
+    font-weight: 700;
+    color: #1a1a2e;
+    margin: 16px 0;
+}
+
+.plan-price {
+    margin: 20px 0 30px 0;
+}
+
+.plan-price .price {
+    font-size: 3em;
+    font-weight: 800;
+    color: #1a1a2e;
+    line-height: 1;
+}
+
+.plan-price .period {
+    font-size: 1.1em;
+    color: #888;
+    font-weight: 500;
+}
+
+/* Price Row - keeps price and period inline */
+.price-row {
+    display: inline-flex;
+    align-items: baseline;
+    gap: 4px;
+}
+
+/* Yearly Price Comparison */
+.yearly-price-wrapper {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+}
+
+.price-compare {
+    font-size: 1.4em;
+    font-weight: 600;
+    color: #999;
+    text-decoration: line-through;
+    opacity: 0.7;
+}
+
+.yearly-price-wrapper .price.yearly-price {
+    font-size: 3em;
+    font-weight: 800;
+    color: #4caf50;
+}
+
+.yearly-price-wrapper .period.yearly-period {
+    font-size: 1.1em;
+    color: #888;
+    font-weight: 500;
+}
+
+.plan-features {
+    list-style: none;
+    padding: 0;
+    margin: 0 0 30px 0;
+    flex-grow: 1;
+}
+
+.plan-features li {
+    padding: 12px 0;
+    border-bottom: 1px solid #f0f0f0;
+    color: #444;
+    font-size: 1em;
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.plan-features li:last-child {
+    border-bottom: none;
+}
+
+.feature-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 24px;
+    height: 24px;
+    background: #e8f5e9;
+    color: #4caf50;
+    border-radius: 50%;
+    font-weight: 900;
+    font-size: 0.9em;
+    flex-shrink: 0;
+}
+
+.queries-remaining {
+    background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
+    padding: 12px 16px;
+    border-radius: 8px;
+    text-align: center;
+    font-weight: 700;
+    color: #e65100;
+    margin-bottom: 20px;
+    font-size: 0.95em;
+    margin-top: auto;
+}
+
+.plan-button {
+    width: 100%;
+    padding: 16px 24px;
+    font-size: 1.1em;
+    font-weight: 700;
+    border: none;
+    border-radius: 10px;
+    cursor: pointer;
+    transition: all 0.3s ease;
+    font-family: inherit;
+    margin-top: auto;
+}
+
+.plan-button.upgrade {
+    background: linear-gradient(135deg, #005a9e 0%, #003d6b 100%);
+    color: white;
+}
+
+.plan-button.upgrade:hover {
+    background: linear-gradient(135deg, #003d6b 0%, #002a4a 100%);
+    transform: translateY(-2px);
+    box-shadow: 0 6px 16px rgba(0, 90, 158, 0.3);
+}
+
+.plan-button.change {
+    background: linear-gradient(135deg, #4f8cff 0%, #6f6fff 100%);
+    color: white;
+}
+
+.plan-button.change:hover {
+    background: linear-gradient(135deg, #3a7ae0 0%, #5555e0 100%);
+    transform: translateY(-2px);
+    box-shadow: 0 6px 16px rgba(79, 140, 255, 0.3);
+}
+
+.plan-button.current {
+    background: #e8f5e9;
+    color: #4caf50;
+    cursor: not-allowed;
+    opacity: 0.8;
+}
+
+.plan-button.downgrade {
+    background: #f5f5f5;
+    color: #999;
+    cursor: not-allowed;
+    opacity: 0.6;
+}
+
+.plan-button:disabled {
+    cursor: not-allowed;
+    opacity: 0.7;
+}
+
+.askeet-manage-billing {
+    text-align: center;
+    margin: 40px 0;
+}
+
+.manage-billing-btn {
+    display: inline-flex;
+    align-items: center;
+    gap: 12px;
+    padding: 16px 32px;
+    background: linear-gradient(135deg, #005a9e 0%, #003d6b 100%);
+    color: white;
+    text-decoration: none;
+    font-size: 1.1em;
+    font-weight: 700;
+    border-radius: 10px;
+    transition: all 0.3s ease;
+}
+
+.manage-billing-btn:hover {
+    background: linear-gradient(135deg, #003d6b 0%, #002a4a 100%);
+    transform: translateY(-2px);
+    box-shadow: 0 6px 16px rgba(0, 90, 158, 0.3);
+    color: white;
+}
+
+.manage-billing-btn .icon {
+    font-size: 1.3em;
+}
+
+.askeet-sub-footer {
+    text-align: center;
+    margin-top: 60px;
+    padding-top: 30px;
+    border-top: 1px solid #e0e6ed;
+}
+
+.askeet-sub-footer p {
+    color: #888;
+    font-size: 0.95em;
+    margin: 8px 0;
+}
+
+/* Responsive */
+@media (max-width: 900px) {
+    .askeet-pricing-cards {
+        grid-template-columns: 1fr;
+        max-width: 500px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
+    .askeet-sub-header h1 {
+        font-size: 2em;
+    }
+
+    .plan-price .price {
+        font-size: 2.5em;
+    }
+}
+
+@media (max-width: 600px) {
+    .askeet-subscription-page {
+        padding: 0 15px;
+    }
+
+    .askeet-sub-header h1 {
+        font-size: 1.8em;
+    }
+
+    .askeet-price-card {
+        padding: 24px 20px;
+    }
+
+    .plan-price .price {
+        font-size: 2.2em;
+    }
+}

askeet/trunk/assets/js/script.js

@@ -7 +7 @@
     let lastPage = 1;
     let lastPerPage = 20;
+    let currentPerPage = 20; // User-selected rows per page
+    let lastTotalCount = 0; // Total results count
     let chatHistory = [];
     let lastQueryRequest = '';
@@ -380 +382 @@
                 sql_query: currentSqlQuery,
                 nonce: askeet_query_assistant.nonce,
-                page: pageNum
+                page: pageNum,
+                per_page: currentPerPage
             },
             success: function(response) {
                 // console.log('[WCQA] AJAX success:', response); // Debug log
                 removeLoading();
+
+                // Check for upgrade requirement
+                if (handleLimitModals(response)) return;
+
                 if (response.success) {
                     lastResults = response.data.results;
@@ -396 +403 @@
                     lastPage = response.data.page;
                     lastPerPage = response.data.per_page;
+                    lastTotalCount = response.data.total_count;
                     const totalPages = Math.max(1, Math.ceil(response.data.total_count / response.data.per_page));
                     let html = '';
                     if (response.data.results && response.data.results.length > 0) {
+                        // Show rows per page selector and export buttons at the top
+                        html += '<div class="wcqa-top-controls">';
+
+                        // Rows per page selector
+                        html += '<div class="wcqa-rows-selector">';
+                        html += '<label for="wcqa-per-page-select">Rows per page:</label> ';
+                        html += '<select id="wcqa-per-page-select" class="wcqa-per-page-dropdown">';
+                        html += '<option value="20"'+(currentPerPage===20?' selected':'')+'>20</option>';
+                        html += '<option value="50"'+(currentPerPage===50?' selected':'')+'>50</option>';
+                        html += '<option value="100"'+(currentPerPage===100?' selected':'')+'>100</option>';
+                        html += '<option value="500"'+(currentPerPage===500?' selected':'')+'>500</option>';
+                        html += '<option value="1500"'+(currentPerPage===1500?' selected':'')+'>1500</option>';
+                        html += '</select>';
+                        html += '</div>';
+
+                        // Export buttons (compact, inline)
+                        html += '<div class="wcqa-export-controls-top">';
+                        const actualRowsOnPage = response.data.actual_rows || response.data.results.length;
+                        html += '<button id="export-current-page" class="button wcqa-export-btn-compact" title="Export all '+actualRowsOnPage+' rows from this page">';
+                        html += '<span class="dashicons dashicons-download"></span> Export Page ('+actualRowsOnPage+')';
+                        html += '</button>';
+                        const maxExportLimit = 10000;
+                        const exportAllCount = Math.min(response.data.total_count, maxExportLimit);
+                        html += '<button id="export-all-results" class="button wcqa-export-btn-compact wcqa-export-all-btn" title="Export up to '+maxExportLimit.toLocaleString()+' rows">';
+                        html += '<span class="dashicons dashicons-database-export"></span> Export All ('+exportAllCount.toLocaleString()+')';
+                        html += '</button>';
+                        html += '</div>';
+
+                        html += '</div>';
+
+                        // Warning for large exports
+                        if (response.data.total_count > maxExportLimit) {
+                            html += '<div class="wcqa-export-warning-top">⚠️ '+response.data.total_count.toLocaleString()+' results found. Export All will download the first '+maxExportLimit.toLocaleString()+' rows.</div>';
+                        }
+
+                        // Performance notice for large page sizes
+                        if (response.data.display_limited === true || (currentPerPage >= 500 && response.data.actual_rows >= 500)) {
+                            html += '<div class="wcqa-performance-notice">';
+                            html += '<div class="wcqa-notice-icon">💡</div>';
+                            html += '<div class="wcqa-notice-content">';
+                            html += '<strong>Performance Mode Active:</strong> For optimal browser performance, we\'re displaying only the first 50 rows. ';
+                            html += 'Don\'t worry - you can export all <strong>'+response.data.actual_rows+' rows</strong> from this page using the <strong>"Export Page"</strong> button above!';
+                            html += '</div>';
+                            html += '<button class="wcqa-notice-close" title="Close this message">&times;</button>';
+                            html += '</div>';
+                        }
+
                         // Show summary message
                         const startIdx = (response.data.page - 1) * response.data.per_page + 1;
                         const endIdx = startIdx + response.data.results.length - 1;
-                        html += '<div class="query-success">Displaying '+startIdx+' to '+endIdx+' of '+response.data.total_count+' results (Page '+response.data.page+' of '+totalPages+'). '+askeet_query_assistant_i18n.execution_time+': '+response.data.execution_time+' '+askeet_query_assistant_i18n.seconds+'.</div>';
+                        const displayInfo = response.data.display_limited ? ' (displaying first '+response.data.results.length+' rows for performance)' : '';
+                        html += '<div class="query-success">Page '+response.data.page+' of '+totalPages+': showing rows '+startIdx+' to '+endIdx+' of '+response.data.total_count+' total'+displayInfo+'. '+askeet_query_assistant_i18n.execution_time+': '+response.data.execution_time+'s</div>';
+
                         html += '<div class="results-block">' + renderResultsTable(response.data.results, response.data.total_count, response.data.page) + '</div>';
+
                         if (!response.data.disable_pagination) {
                             html += renderPagination(response.data.total_count, response.data.page, response.data.per_page);
                         }
-                        html += '<button id="export-csv" class="button" style="margin-top:10px;">'+askeet_query_assistant_i18n.export_csv+'</button>';
                     } else {
                         html += '<div class="query-success">'+askeet_query_assistant_i18n.no_result_found+'</div>';
                     }
                     renderMessage(html, 'ai');
+
+                    // Add close functionality to performance notice after rendering
+                    if (response.data.display_limited === true || (currentPerPage >= 500 && response.data.actual_rows >= 500)) {
+                        setTimeout(function() {
+                            const $notice = $('.wcqa-performance-notice').last();
+
+                            // Close button handler
+                            $notice.find('.wcqa-notice-close').on('click', function(e) {
+                                e.preventDefault();
+                                $(this).closest('.wcqa-performance-notice').fadeOut(300, function() {
+                                    $(this).remove();
+                                });
+                            });
+
+                            // Auto-fade after 12 seconds
+                            setTimeout(function() {
+                                if ($notice.is(':visible')) {
+                                    $notice.fadeOut(400, function() {
+                                        $(this).remove();
+                                    });
+                                }
+                            }, 12000);
+                        }, 200);
+                    }
                 }
                 else {
@@ -453 +534 @@
         }
     });
-    $('#wcqa-messages').on('click', '#export-csv', function(e) {
+    // Handle rows per page selection change
+    $('#wcqa-messages').on('change', '#wcqa-per-page-select', function(e) {
+        const newPerPage = parseInt($(this).val());
+        currentPerPage = newPerPage;
+
+        // Re-execute query with new page size, starting from page 1
+        executeQueryPage(1, false);
+    });
+
+    // Export Current Page - exports ALL rows from current page (even if display is limited)
+    $('#wcqa-messages').on('click', '#export-current-page', function(e) {
         e.preventDefault();
+        if (currentSqlQuery === '') {
+            alert(askeet_query_assistant_i18n.no_sql_to_execute);
+            return;
+        }
+
         const $btn = $(this);
-        // Cherche le tableau de résultats associé au bouton cliqué
-        let $table = $btn.closest('.wcqa-message').find('.results-table').first();
-        if ($table.length === 0) {
-            // Si pas trouvé dans le même message, cherche juste avant
-            $table = $btn.prevAll('.results-block').find('.results-table').first();
-        }
-        if ($table.length === 0) {
-            // Fallback : cherche dans le parent direct
-            $table = $btn.parent().find('.results-table').first();
-        }
-        if ($table.length === 0) {
-            alert(askeet_query_assistant_i18n.no_result_to_export);
+        const originalText = $btn.html();
+        $btn.prop('disabled', true).html('<span class="spinner is-active" style="float:none;"></span> Exporting...');
+
+        // Fetch the FULL page data from server (all rows for current page)
+        $.ajax({
+            url: askeet_query_assistant.ajax_url,
+            type: 'POST',
+            data: {
+                action: 'askeet_execute_sql_query',
+                sql_query: currentSqlQuery,
+                nonce: askeet_query_assistant.nonce,
+                page: lastPage,
+                per_page: currentPerPage,
+                export_mode: true // Request full data without display limit
+            },
+            success: function(response) {
+                if (response.success && response.data && response.data.results) {
+                    const results = response.data.results;
+                    if (results.length === 0) {
+                        alert('No data to export.');
+                        $btn.prop('disabled', false).html(originalText);
+                        return;
+                    }
+
+                    // Convert to CSV
+                    let csv = [];
+                    const headers = Object.keys(results[0]);
+                    csv.push(headers.map(h => '"' + h.replace(/"/g, '""') + '"').join(','));
+
+                    results.forEach(function(row) {
+                        const values = headers.map(function(header) {
+                            let val = row[header] !== null ? String(row[header]) : '';
+                            val = val.replace(/"/g, '""');
+                            return '"' + val + '"';
+                        });
+                        csv.push(values.join(','));
+                    });
+
+                    const csvContent = csv.join('\n');
+                    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+                    const link = document.createElement('a');
+                    const url = URL.createObjectURL(blob);
+                    link.setAttribute('href', url);
+
+                    var lang = (navigator.language || navigator.userLanguage || 'en').toLowerCase();
+                    var filename = lang.startsWith('fr')
+                        ? 'page-' + lastPage + '_' + results.length + '_lignes.csv'
+                        : 'page-' + lastPage + '_' + results.length + '_rows.csv';
+
+                    link.setAttribute('download', filename);
+                    link.style.visibility = 'hidden';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+
+                    $btn.prop('disabled', false).html('<span class="dashicons dashicons-yes"></span> Done!');
+                    setTimeout(function() {
+                        $btn.html(originalText);
+                    }, 2000);
+                } else {
+                    alert('Export failed. Please try again.');
+                    $btn.prop('disabled', false).html(originalText);
+                }
+            },
+            error: function() {
+                alert('Export failed. Please try again.');
+                $btn.prop('disabled', false).html(originalText);
+            }
+        });
+    });
+
+    // Export All Results - fetches up to 5000 rows from server
+    $('#wcqa-messages').on('click', '#export-all-results', function(e) {
+        e.preventDefault();
+        if (currentSqlQuery === '') {
+            alert(askeet_query_assistant_i18n.no_sql_to_execute);
             return;
         }
-        let csv = [];
-        const rows = $table[0].querySelectorAll('tr');
-        for (const row of rows) {
-            const cells = row.querySelectorAll('th, td');
-            const csvRow = [];
-            for (const cell of cells) {
-                let text = cell.textContent.trim();
-                text = text.replace(/"/g, '""');
-                csvRow.push('"' + text + '"');
-            }
-            csv.push(csvRow.join(','));
-        }
-        const csvContent = csv.join('\n');
-        const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
-        const link = document.createElement('a');
-        const url = URL.createObjectURL(blob);
-        link.setAttribute('href', url);
-        // Determine language for filename
-        var lang = (navigator.language || navigator.userLanguage || 'en').toLowerCase();
-        var filename = '';
-        if (lang.startsWith('fr')) {
-            filename = 'resultat_requete_page-' + lastPage + '.csv';
-        } else {
-            filename = 'result_query_page-' + lastPage + '.csv';
-        }
-        link.setAttribute('download', filename);
-        link.style.visibility = 'hidden';
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
+
+        const $btn = $(this);
+        const originalText = $btn.html();
+        const maxRows = Math.min(lastTotalCount, 10000);
+
+        // Confirm for large exports
+        if (maxRows > 1000) {
+            const confirmMsg = 'You are about to export ' + maxRows.toLocaleString() + ' rows. This may take up to 60 seconds. Continue?';
+            if (!confirm(confirmMsg)) {
+                return;
+            }
+        }
+
+        $btn.prop('disabled', true).html('<span class="spinner is-active" style="float:none;"></span> Exporting...');
+
+        $.ajax({
+            url: askeet_query_assistant.ajax_url,
+            type: 'POST',
+            data: {
+                action: 'askeet_export_all_results',
+                sql_query: currentSqlQuery,
+                nonce: askeet_query_assistant.nonce,
+                max_rows: 10000
+            },
+            success: function(response) {
+                if (response.success && response.data && response.data.results) {
+                    // Convert results to CSV
+                    const results = response.data.results;
+                    if (results.length === 0) {
+                        alert('No data to export.');
+                        $btn.prop('disabled', false).html(originalText);
+                        return;
+                    }
+
+                    let csv = [];
+                    // Add header row
+                    const headers = Object.keys(results[0]);
+                    csv.push(headers.map(h => '"' + h.replace(/"/g, '""') + '"').join(','));
+
+                    // Add data rows
+                    results.forEach(function(row) {
+                        const values = headers.map(function(header) {
+                            let val = row[header] !== null ? String(row[header]) : '';
+                            val = val.replace(/"/g, '""');
+                            return '"' + val + '"';
+                        });
+                        csv.push(values.join(','));
+                    });
+
+                    const csvContent = csv.join('\n');
+                    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+                    const link = document.createElement('a');
+                    const url = URL.createObjectURL(blob);
+                    link.setAttribute('href', url);
+
+                    // Filename with row count
+                    var lang = (navigator.language || navigator.userLanguage || 'en').toLowerCase();
+                    var timestamp = new Date().toISOString().slice(0,10);
+                    var filename = lang.startsWith('fr')
+                        ? 'export_complet_' + results.length + '_lignes_' + timestamp + '.csv'
+                        : 'export_all_' + results.length + '_rows_' + timestamp + '.csv';
+
+                    link.setAttribute('download', filename);
+                    link.style.visibility = 'hidden';
+                    document.body.appendChild(link);
+                    link.click();
+                    document.body.removeChild(link);
+
+                    // Show success message
+                    $btn.prop('disabled', false).html('<span class="dashicons dashicons-yes"></span> Done!');
+                    setTimeout(function() {
+                        $btn.html(originalText);
+                    }, 2000);
+                } else {
+                    alert('Error exporting data: ' + (response.data && response.data.message ? response.data.message : 'Unknown error'));
+                    $btn.prop('disabled', false).html(originalText);
+                }
+            },
+            error: function(xhr, status, error) {
+                alert('Export failed. Please try again or reduce the number of results.');
+                $btn.prop('disabled', false).html(originalText);
+            }
+        });
     });
 
@@ -812 +1025 @@
     // PATCH: Detect limit errors in AJAX responses and show only one modal
     function handleLimitModals(response) {
+        // Check if upgrade is required (even if success is true)
+        if (response && response.data && response.data.upgrade_required === true) {
+            const msg = (response.data.error || response.data.message || '').toLowerCase();
+            let currentPlan = response.data.current_plan || (typeof askeet_query_assistant !== 'undefined' && askeet_query_assistant.current_plan ? askeet_query_assistant.current_plan : null);
+
+            if (msg.includes('daily limit') || msg.includes('50 queries') || msg.includes('upgrade to unlimited')) {
+                showDailyLimitModal(currentPlan);
+                return true;
+            }
+            if (msg.includes('free limit') || msg.includes('reached your free limit') || msg.includes('upgrade to premium')) {
+                showPaymentModal(currentPlan);
+                return true;
+            }
+            // Fallback: show payment modal for any upgrade requirement
+            showPaymentModal(currentPlan);
+            return true;
+        }
+
+        // Legacy check for success === false
         if (
             response &&