Changeset 3462993

Timestamp:

02/17/2026 12:42:24 AM (6 weeks ago)

Author:

naa986

Message:

.v1.0.47 commit

Location:

checkout-for-paypal/trunk

Files:

• cfp-old.php (deleted)
• checkout-for-paypal.php (modified) (11 diffs)
• readme.txt (modified) (2 diffs)

checkout-for-paypal/trunk/checkout-for-paypal.php

@@ -2 +2 @@
 /*
   Plugin Name: Checkout for PayPal
-  Version: 1.0.46
+  Version: 1.0.47
   Plugin URI: https://noorsplugin.com/checkout-for-paypal-wordpress-plugin/  
   Author: naa986
@@ -19 +19 @@
     class CHECKOUT_FOR_PAYPAL {
 
-        var $plugin_version = '1.0.46';
+        var $plugin_version = '1.0.47';
         var $db_version = '1.0.3';
         var $plugin_url;
@@ -46 +46 @@
             include_once('cfp-email.php');
             include_once('cfp-api.php');
-            include_once('cfp-old.php');
             if(is_admin()){
                 include_once('addons/checkout-for-paypal-addons-menu.php');
@@ -62 +61 @@
             add_filter('manage_coforpaypal_order_posts_columns', 'checkout_for_paypal_order_columns');
             add_action('manage_coforpaypal_order_posts_custom_column', 'checkout_for_paypal_custom_column', 10, 2);
-            /* start of older integration */
-            add_action('wp_ajax_coforpaypal_ajax_process_order', 'checkout_for_paypal_ajax_process_order');
-            add_action('wp_ajax_nopriv_coforpaypal_ajax_process_order', 'checkout_for_paypal_ajax_process_order');
-            add_action('checkout_for_paypal_process_order', 'checkout_for_paypal_process_order_handler');
-            /* end of older integration */
             add_shortcode('checkout_for_paypal', 'checkout_for_paypal_button_handler');
         }
@@ -128 +122 @@
                 }
             }
-            $options = checkout_for_paypal_get_option();
-            $disable_orders_api_v2_notice = get_option('checkout_for_paypal_disable_orders_api_v2_notice');
-            if(!isset($disable_orders_api_v2_notice) || empty($disable_orders_api_v2_notice)){
-                if(isset($options['app_client_id']) && !empty($options['app_client_id'])){
-                    if(!isset($options['app_secret_key']) || empty($options['app_secret_key'])){
-                        $message .= '<div class="error"><p>' . __('Checkout for PayPal is not using the latest API. To automatically use this API, the plugin requires your Client ID and Secret Key in the settings. Once you have updated the settings, click a PayPal button on your site to ensure everything is working.', 'checkout-for-paypal').'</p></div>';
-                    }
-                }
-            }
             if(empty($message)){
                 return;
@@ -184 +169 @@
 
         function load_scripts(){
+            if(!is_checkout_for_paypal_configured()){
+                return;
+            }
             $options = checkout_for_paypal_get_option();
             $client_id = '';
@@ -395 +383 @@
                     update_option('checkout_for_paypal_buyer_country', sanitize_text_field($_POST['buyer_country']));
                 }
-                $disable_orders_api_v2_notice = (isset($_POST['disable_orders_api_v2_notice']) && $_POST['disable_orders_api_v2_notice'] == '1') ? '1' : '';
-                update_option('checkout_for_paypal_disable_orders_api_v2_notice', $disable_orders_api_v2_notice);
                 $paypal_options = array();
                 $paypal_options['test_mode'] = $test_mode;
@@ -445 +431 @@
             if(!isset($buyer_country) || empty($buyer_country)){
                 $buyer_country = '';
-            }
-            $disable_orders_api_v2_notice = get_option('checkout_for_paypal_disable_orders_api_v2_notice');
-            if(!isset($disable_orders_api_v2_notice) || empty($disable_orders_api_v2_notice)){
-                $disable_orders_api_v2_notice = '';
             }
             $locale_doc_url = "https://noorsplugin.com/paypal-checkout-locale/";
@@ -552 +534 @@
                                             <td><input name="buyer_country" type="text" id="buyer_country" value="<?php echo esc_attr($buyer_country); ?>" class="regular-text">
                                                 <p class="description"><?php _e('The country to determine which funding sources are eligible for a given buyer (optional). Example:', 'checkout-for-paypal');?> <strong>US</strong>. <?php _e('This feature is only available in the sandbox to test the checkout experience as a buyer from a particular country.', 'checkout-for-paypal');?></p></td>
-                                        </tr> 
-
-                                        <tr valign="top">
-                                            <th scope="row"><?php _e('Disable Orders API v2 Notice', 'checkout-for-paypal');?></th>
-                                            <td> <fieldset><legend class="screen-reader-text"><span>Disable Orders API v2 Notice</span></legend><label for="disable_orders_api_v2_notice">
-                                                        <input name="disable_orders_api_v2_notice" type="checkbox" id="disable_orders_api_v2_notice" <?php if ($disable_orders_api_v2_notice == '1') echo ' checked="checked"'; ?> value="1">
-                                                        <?php _e("Check this option if you want to disable the orders API v2 update notice. By default, the notice is shown as long as the setup is incomplete.", 'checkout-for-paypal');?></label>
-                                                </fieldset></td>
-                                        </tr>
-
+                                        </tr>
                                     </tbody>
 
@@ -852 +825 @@
 
 function checkout_for_paypal_button_handler($atts) {
+    if(!is_checkout_for_paypal_configured()){
+        return __('You need to configure checkout options in the settings', 'checkout-for-paypal');
+    }
     $atts = array_map('sanitize_text_field', $atts);
     $id = uniqid();
     $atts['id'] = $id;
     $options = checkout_for_paypal_get_option();
-    //check older integration
-    if(isset($options['app_client_id']) && !empty($options['app_client_id'])){
-        if(!isset($options['app_secret_key']) || empty($options['app_secret_key'])){
-            $button_code = '';
-            $button_code = apply_filters('checkout_for_paypal_button', $button_code, $atts);
-            if(!empty($button_code)){
-                return $button_code;
-            }
-            return checkout_for_paypal_old_button_handler($atts);
-        }
-    }
-    //
     $button_code = '';
     $description = '';
@@ -1247 +1211 @@
     return $log_reset;
 }
+
+function is_checkout_for_paypal_configured(){
+    $options = checkout_for_paypal_get_option();
+    $configured = true;
+    if(isset($options['test_mode']) && !empty($options['test_mode'])){
+        if(!isset($options['app_sandbox_client_id']) || empty($options['app_sandbox_client_id'])){
+            $configured = false;
+        }
+        if(!isset($options['app_sandbox_secret_key']) || empty($options['app_sandbox_secret_key'])){
+            $configured = false;
+        }
+    }
+    else{
+        if(!isset($options['app_client_id']) || empty($options['app_client_id'])){
+            $configured = false;
+        }
+        if(!isset($options['app_secret_key']) || empty($options['app_secret_key'])){
+            $configured = false;
+        }
+    }
+    if(!isset($options['currency_code']) || empty($options['currency_code'])){
+        $configured = false;
+    }
+    return $configured;
+}

checkout-for-paypal/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 5.5
 Tested up to: 6.9
-Stable tag: 1.0.46
+Stable tag: 1.0.47
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -97 +97 @@
 == Changelog ==
 
+= 1.0.47 =
+* Removed older integration.
+
 = 1.0.46 =
 * Changes to URL parameters.