Release/2.10.2 (#8534)

* Move Stripe to the frist payment gateway in the Available Gateway Settings when it is found #8499 (#8501) * Add ilnks to Termageddon on privacy policy and terms of agreement settings #8506 (#8507) Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Remove GLOB_BRACE flag #8519 (#8520) * Add edd_honeypot to the registration form validation. (#8510) * Added honeypot validation during user registration (#6116) Whilst the `edd_honeypot` field is present within the `[edd_register]` registration form there was no validation of this field Co-authored-by: Mike Howard <mike@mikeandniki.co.uk> * Add honeypot field to validation #6115 * Update includes/login-register.php Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com> Co-authored-by: Mike Howard <mike@mikesplugins.co.uk> Co-authored-by: Mike Howard <mike@mikeandniki.co.uk> Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com> * Issue/8497 (#8504) * Updates to the SendWP setting information #8497 #8498 * Remove Jilt callbacks #8497 #8290 * Properly deprecate Jilt callbacks and remove JS functions #8497 #8290 * Add Recapture settings section, as well as all the states the integration can be in #8497 * Replace accidently removed SendWP client registration #8497 * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/emails/functions.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/emails/functions.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Fixing spelilng of connection_complete #8497 * Require the 'install_plugins' cap to see the connect with Recapture button #8497 * Remove 'here' reference in complete connection for recapture #8497 * Deprecate more Jilt functions, remove CSS references, and swtich the abandoned payment notice #8497 * Remove Advanded Emails header #8497 * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Clean up double indents after copying functions to deprected functions file #8497 * Update includes/admin/settings/register-settings.php Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Fix double indenting #8497 * Fix double indenting #8497 Co-authored-by: Ashley Gibson <ashley@nosegraze.com> * Add stripe revision during build #8529 (#8529) * Changelog for 2.10.2 * Rebuild with updated readme stable version * Use default branch for Stripe update * Updating Stripe hash Co-authored-by: Ashley Gibson <ashley@nosegraze.com> Co-authored-by: Mike Howard <mike@mikesplugins.co.uk> Co-authored-by: Mike Howard <mike@mikeandniki.co.uk> Co-authored-by: Robin Cornett <robincornett@users.noreply.github.com>
awesomemotive · Apr 5, 2021 · f97f4f6 · f97f4f6
1 parent bfdf19b
commit f97f4f6
Show file tree

Hide file tree

Showing 17 changed files with 688 additions and 472 deletions.
diff --git a/assets/css/edd-admin.css b/assets/css/edd-admin.css
@@ -1082,35 +1082,35 @@ td.edd_order_price {
 -------------------------------------------------------------- */
 
 [id*="edd-sendwp-"].button,
-[id*="edd-jilt-"].button {
+[id*="edd-recapture-"].button {
  font-size: 16px;
  height: auto;
  padding: 8px 14px;
  margin: 6px 0 0;
 }
 [id*="edd-sendwp-"].button .dashicons,
-[id*="edd-jilt-"].button .dashicons {
+[id*="edd-recapture-"].button .dashicons {
  line-height: 29px;
  margin-right: 8px;
 }
 [id*="edd-sendwp-"].button .edd-loading,
 [id*="edd-sendwp-"].button .edd-loading:after,
-[id*="edd-jilt-"].button .edd-loading,
-[id*="edd-jilt-"].button .edd-loading:after {
+[id*="edd-recapture-"].button .edd-loading,
+[id*="edd-recapture-"].button .edd-loading:after {
  border-radius: 50%;
  display: inline-block;
  width: 14px;
  height: 14px;
 }
 [id*="edd-sendwp-"].button .edd-loading,
-[id*="edd-jilt-"].button .edd-loading {
+[id*="edd-recapture-"].button .edd-loading {
  position: relative;
  top: 3px;
  margin-left: 4px;
  box-shadow: 0 0 2px rgba(0,0,0,.2);
 }
 [id*="edd-sendwp-"].button .edd-loading,
-[id*="edd-jilt-"].button .edd-loading {
+[id*="edd-recapture-"].button .edd-loading {
  -webkit-animation: edd-spinning 1.1s infinite linear;
  animation: edd-spinning 1.1s infinite linear;
  border-top: 2px solid rgba(255, 255, 255, 0.5);
@@ -1123,14 +1123,14 @@ td.edd_order_price {
  transform: translateZ(0);
 }
 #edd-sendwp-disconnect.button .edd-loading.dark,
-#edd-jilt-disconnect.button .edd-loading.dark {
+#edd-recapture-disconnect.button .edd-loading.dark {
  border-top-color: rgba(0, 0, 0, 0.2);
  border-right-color: rgba(0, 0, 0, 0.2);
  border-bottom-color: rgba(0, 0, 0, 0.2);
  border-left-color: #666;
  box-shadow: none;
 }
-.jilt-notice {
+.recapture-notice {
  position: relative;
 }
 @-webkit-keyframes edd-spinning {

diff --git a/assets/css/edd-admin.min.css b/assets/css/edd-admin.min.css
diff --git a/assets/js/admin-scripts.js b/assets/js/admin-scripts.js
@@ -1221,20 +1221,13 @@ jQuery(document).ready(function ($) {
 
  });
 
- $('#edd-jilt-connect').on('click', function(e) {
+ $('#edd-recapture-connect').on('click', function(e) {
 
  e.preventDefault();
  $(this).html( edd_vars.wait + ' <span class="edd-loading"></span>' );
  document.body.style.cursor = 'wait';
- easy_digital_downloads_jilt_remote_install();
- });
-
- $('#edd-jilt-disconnect').on('click', function(e) {
+ easy_digital_downloads_recapture_remote_install();
 
- e.preventDefault();
- $(this).html( edd_vars.wait + ' <span class="edd-loading dark"></span>' );
- document.body.style.cursor = 'wait';
- easy_digital_downloads_jilt_disconnect();
  });
 
  },
@@ -2239,62 +2232,22 @@ function easy_digital_downloads_sendwp_register_client(register_url, client_name
  form.submit();
 }
 
-function easy_digital_downloads_jilt_remote_install() {
-
- var data = {
- 'action': 'edd_jilt_remote_install',
- };
-
- jQuery.post( ajaxurl, data, function( response ) {
-
- if( ! response.success ) {
-
- if( confirm( response.data.error ) ) {
- location.reload();
- return;
- }
- }
-
- easy_digital_downloads_jilt_connect();
- });
-}
-
-function easy_digital_downloads_jilt_connect() {
-
+function easy_digital_downloads_recapture_remote_install() {
  var data = {
- 'action': 'edd_jilt_connect',
+ 'action': 'edd_recapture_remote_install',
  };
 
- jQuery.post( ajaxurl, data, function( response ) {
+ // since 2.8 ajaxurl is always defined in the admin header and points to admin-ajax.php
+ jQuery.post(ajaxurl, data, function( response ) {
 
- if( ! response.success ) {
+ if ( false == response.success ) {
 
- if( confirm( response.data.error ) ) {
+ if ( confirm( response.data.error ) ) {
  location.reload();
  return;
  }
  }
 
- if ( response.data.connect_url !== '' ) {
-
- location.assign( response.data.connect_url );
- return;
- }
- });
-}
-
-function easy_digital_downloads_jilt_disconnect() {
-
- var data = {
- 'action': 'edd_jilt_disconnect',
- };
-
- jQuery.post( ajaxurl, data, function( response ) {
-
- if ( ! response.success ) {
- confirm( response.data.error );
- }
-
- location.reload();
+ window.location.href = 'https://recapture.io/register';
  });
 }
diff --git a/assets/js/admin-scripts.min.js b/assets/js/admin-scripts.min.js
diff --git a/bin/update-stripe.sh b/bin/update-stripe.sh
@@ -9,6 +9,8 @@ cd includes/gateways/stripe
 composer install --no-dev
 npm install && npm run build
 
+git rev-parse HEAD > ../.stripe-hash
+
 # Clean up files for distribution.
 # @todo Maybe use git archive? However composer.json would
 # need to be removed from .gitattributes export-ignore

diff --git a/easy-digital-downloads.php b/easy-digital-downloads.php
@@ -5,7 +5,7 @@
  * Description: The easiest way to sell digital products with WordPress.
  * Author: Sandhills Development, LLC
  * Author URI: https://sandhillsdev.com
- * Version: 2.10.1
+ * Version: 2.10.2
  * Text Domain: easy-digital-downloads
  * Domain Path: languages
  *
@@ -25,7 +25,7 @@
  * @package EDD
  * @category Core
  * @author Pippin Williamson
- * @version 2.10.1
+ * @version 2.10.2
  */
 
 // Exit if accessed directly.
@@ -206,7 +206,7 @@ private function setup_constants() {
 
  // Plugin version.
  if ( ! defined( 'EDD_VERSION' ) ) {
- define( 'EDD_VERSION', '2.10.1' );
+ define( 'EDD_VERSION', '2.10.2' );
  }
 
  // Plugin Folder Path.

diff --git a/includes/admin/import/class-batch-import-downloads.php b/includes/admin/import/class-batch-import-downloads.php
@@ -408,7 +408,7 @@ private function set_image( $download_id = 0, $image = '', $post_author = 0 ) {
  } else {
 
  // Now look through year/month sub folders of upload directory for files with our image's same extension
- $files = glob( $upload_dir['basedir'] . '/*/*/*{' . $ext . '}', GLOB_BRACE );
+ $files = glob( $upload_dir['basedir'] . '/*/*/*' . $ext );
  foreach( $files as $file ) {
 
  if( basename( $file ) == $image ) {