Changeset 2585159

Timestamp:

08/19/2021 04:04:16 AM (3 years ago)

Author:

DrewAPicture

Message:

Version 1.1.1 Release.

Location:

affiliatewp-force-pending-referrals

Files:

• tags/1.1.1 (copied) (copied from affiliatewp-force-pending-referrals/trunk)
• tags/1.1.1/affiliatewp-force-pending-referrals.php (modified) (1 diff)
• tags/1.1.1/includes/class-affiliatewp-force-pending-referrals.php (modified) (2 diffs)
• tags/1.1.1/readme.txt (copied) (copied from affiliatewp-force-pending-referrals/trunk/readme.txt) (3 diffs)
• trunk/affiliatewp-force-pending-referrals.php (modified) (1 diff)
• trunk/includes/class-affiliatewp-force-pending-referrals.php (modified) (2 diffs)
• trunk/readme.txt (modified) (3 diffs)

affiliatewp-force-pending-referrals/tags/1.1.1/affiliatewp-force-pending-referrals.php

@@ -6 +6 @@
  * Author: Sandhills Development, LLC
  * Author URI: https://sandhillsdev.com
- * Version: 1.1
+ * Version: 1.1
  * License: GPL-2.0+
  * License URI: http://www.opensource.org/licenses/gpl-license.php

affiliatewp-force-pending-referrals/tags/1.1.1/includes/class-affiliatewp-force-pending-referrals.php

@@ -42 +42 @@
          * @var   string
          */
-        private $version = '1.1';
+        private $version = '1.1';
 
         /**
@@ -202 +202 @@
             add_filter( 'plugin_row_meta', array( $this, 'plugin_meta' ), null, 2 );
 
-            // disable auto complete referrals.
-            add_filter( 'affwp_auto_complete_referral', '__return_false' );
-
+            $affwp_version = get_option( 'affwp_version' );
+
+            if ( version_compare( $affwp_version, '2.7.1', '<' ) ) {
+                // disable auto complete referrals.
+                add_filter( 'affwp_auto_complete_referral', '__return_false' );
+            } else {
+                add_filter( 'affwp_auto_complete_referral', array( $this, 'maybe_disallow_complete_referral' ), 10, 2 );
+            }
+
+        }
+
+        /**
+         * (Maybe) disallows a referral from being completed via complete_referral() in the Integrations API.
+         *
+         * @since 1.1.1
+         *
+         * @param bool            $allow    Whether to allow the referral to be completed.
+         * @param \AffWP\Referral $referral Referral object.
+         * @return bool True if the referral should continue to be processed as if Force Pending Referrals
+         *              was not present, otherwise false.
+         */
+        public function maybe_disallow_complete_referral( $allow, $referral ) {
+            if ( 'rejected' === $referral->status ) {
+                $set = affwp_set_referral_status( $referral, 'pending' );
+
+                if ( true === $set ) {
+                    affiliate_wp()->utils->log( 'Force Pending Referrals: Rejected referral successfully set to Pending.' );
+                } else {
+                    affiliate_wp()->utils->log( 'Force Pending Referrals: Rejected referral could not successfully be set to Pending.' );
+                }
+
+                $allow = false;
+
+            } elseif ( 'pending' === $referral->status ) {
+                $allow = false;
+            }
+
+            return $allow;
         }
 

affiliatewp-force-pending-referrals/tags/1.1.1/readme.txt

@@ -3 +3 @@
 Tags: AffiliateWP, affiliate, Pippin Williamson, Andrew Munro, mordauk, pippinsplugins, sumobi, ecommerce, e-commerce, e commerce, selling, membership
 Requires at least: 5.0
-Tested up to: 5.7
+Tested up to: 5.
 Requires PHP: 5.6
-Stable tag: 1.1
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -13 +13 @@
 == Description ==
 
-> This plugin requires [AffiliateWP](https://affiliatewp.com/ "AffiliateWP") 2.6+. <strong>It will NOT function without it.</strong>
+> This plugin requires [AffiliateWP](https://affiliatewp.com/ "AffiliateWP")<strong>It will NOT function without it.</strong>
 
 Once activated, all referrals created by AffiliateWP will be forced to a status of "pending".
@@ -39 +39 @@
 == Changelog ==
 
+
+
+
 = 1.1 =
 * New: Enforce minimum dependency requirements checking

affiliatewp-force-pending-referrals/trunk/affiliatewp-force-pending-referrals.php

@@ -6 +6 @@
  * Author: Sandhills Development, LLC
  * Author URI: https://sandhillsdev.com
- * Version: 1.1
+ * Version: 1.1
  * License: GPL-2.0+
  * License URI: http://www.opensource.org/licenses/gpl-license.php

affiliatewp-force-pending-referrals/trunk/includes/class-affiliatewp-force-pending-referrals.php

@@ -42 +42 @@
          * @var   string
          */
-        private $version = '1.1';
+        private $version = '1.1';
 
         /**
@@ -202 +202 @@
             add_filter( 'plugin_row_meta', array( $this, 'plugin_meta' ), null, 2 );
 
-            // disable auto complete referrals.
-            add_filter( 'affwp_auto_complete_referral', '__return_false' );
-
+            $affwp_version = get_option( 'affwp_version' );
+
+            if ( version_compare( $affwp_version, '2.7.1', '<' ) ) {
+                // disable auto complete referrals.
+                add_filter( 'affwp_auto_complete_referral', '__return_false' );
+            } else {
+                add_filter( 'affwp_auto_complete_referral', array( $this, 'maybe_disallow_complete_referral' ), 10, 2 );
+            }
+
+        }
+
+        /**
+         * (Maybe) disallows a referral from being completed via complete_referral() in the Integrations API.
+         *
+         * @since 1.1.1
+         *
+         * @param bool            $allow    Whether to allow the referral to be completed.
+         * @param \AffWP\Referral $referral Referral object.
+         * @return bool True if the referral should continue to be processed as if Force Pending Referrals
+         *              was not present, otherwise false.
+         */
+        public function maybe_disallow_complete_referral( $allow, $referral ) {
+            if ( 'rejected' === $referral->status ) {
+                $set = affwp_set_referral_status( $referral, 'pending' );
+
+                if ( true === $set ) {
+                    affiliate_wp()->utils->log( 'Force Pending Referrals: Rejected referral successfully set to Pending.' );
+                } else {
+                    affiliate_wp()->utils->log( 'Force Pending Referrals: Rejected referral could not successfully be set to Pending.' );
+                }
+
+                $allow = false;
+
+            } elseif ( 'pending' === $referral->status ) {
+                $allow = false;
+            }
+
+            return $allow;
         }
 

affiliatewp-force-pending-referrals/trunk/readme.txt

@@ -3 +3 @@
 Tags: AffiliateWP, affiliate, Pippin Williamson, Andrew Munro, mordauk, pippinsplugins, sumobi, ecommerce, e-commerce, e commerce, selling, membership
 Requires at least: 5.0
-Tested up to: 5.7
+Tested up to: 5.
 Requires PHP: 5.6
-Stable tag: 1.1
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -13 +13 @@
 == Description ==
 
-> This plugin requires [AffiliateWP](https://affiliatewp.com/ "AffiliateWP") 2.6+. <strong>It will NOT function without it.</strong>
+> This plugin requires [AffiliateWP](https://affiliatewp.com/ "AffiliateWP")<strong>It will NOT function without it.</strong>
 
 Once activated, all referrals created by AffiliateWP will be forced to a status of "pending".
@@ -39 +39 @@
 == Changelog ==
 
+
+
+
 = 1.1 =
 * New: Enforce minimum dependency requirements checking