Skip to content

Commit

Permalink
Merge pull request #9727 from awesomemotive/release/3.2.12
Browse files Browse the repository at this point in the history
Adding 3.2.12 changes
  • Loading branch information
cklosowski authored Apr 29, 2024
2 parents a788978 + 48834d6 commit 252a23a
Show file tree
Hide file tree
Showing 19 changed files with 369 additions and 212 deletions.
1 change: 1 addition & 0 deletions assets/js/admin/settings/recapture/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export const recaptureRemoteInstall = () => {
var data = {
'action': 'edd_recapture_remote_install',
'nonce': document.getElementById( 'edd-recapture-connect-nonce' ).value
};

jQuery.post( ajaxurl, data, function( response ) {
Expand Down
2 changes: 1 addition & 1 deletion assets/js/edd-admin-settings.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions easy-digital-downloads.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Description: The easiest way to sell digital products with WordPress.
* Author: Easy Digital Downloads
* Author URI: https://easydigitaldownloads.com
* Version: 3.2.11
* Version: 3.2.12
* Text Domain: easy-digital-downloads
* Domain Path: /languages
* Requires at least: 5.8
Expand All @@ -27,7 +27,7 @@
* @package EDD
* @category Core
* @author Easy Digital Downloads
* @version 3.2.11
* @version 3.2.12
*/

// Exit if accessed directly.
Expand Down
2 changes: 1 addition & 1 deletion i18n/states-in.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'WB' => __( 'West Bengal', 'easy-digital-downloads' ),
'AN' => __( 'Andaman and Nicobar Islands', 'easy-digital-downloads' ),
'CH' => __( 'Chandigarh', 'easy-digital-downloads' ),
'DN' => __( 'Dadar and Nagar Haveli', 'easy-digital-downloads' ),
'DN' => __( 'Dadra and Nagar Haveli', 'easy-digital-downloads' ),
'DD' => __( 'Daman and Diu', 'easy-digital-downloads' ),
'DL' => __( 'Delhi', 'easy-digital-downloads' ),
'LD' => __( 'Lakshadweep', 'easy-digital-downloads' ),
Expand Down
16 changes: 12 additions & 4 deletions includes/admin/reporting/export/class-batch-export.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,20 @@ class EDD_Batch_Export extends EDD_Export {
*/
public function __construct( $_step = 1 ) {

$upload_dir = wp_upload_dir();
$exports_dir = edd_get_exports_dir();
$this->filetype = '.csv';
$this->filename = 'edd-' . $this->export_type . $this->filetype;
$this->file = trailingslashit( $upload_dir['basedir'] ) . $this->filename;
$file_date = date( 'Y-m-d' );
$file_hash = substr( wp_hash( 'edd-' . $this->export_type . '-export', 'nonce' ), 0, 8 );
$this->filename = sprintf(
'edd-%1$s-export-%2$s-%3$s%4$s',
$this->export_type,
$file_date,
$file_hash,
$this->filetype
);
$this->file = trailingslashit( $exports_dir ) . $this->filename;

if ( ! is_writeable( $upload_dir['basedir'] ) ) {
if ( ! is_writeable( $exports_dir ) ) {
$this->is_writable = false;
}

Expand Down
2 changes: 1 addition & 1 deletion includes/admin/reporting/export/export-actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ function edd_include_taxed_orders_batch_processor( $class ) {
}

/**
* Register the taxed orders report batch exporter.
* Register the taxed customers report batch exporter.
*
* @since 3.0
*/
Expand Down
4 changes: 3 additions & 1 deletion includes/admin/settings/register-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -1811,8 +1811,10 @@ function edd_recapture_callback($args) {
</p>
<?php if ( current_user_can( 'install_plugins' ) ) : ?>
<p>
<button type="button" id="edd-recapture-connect" class="button button-primary"><?php esc_html_e( 'Connect with Recapture', 'easy-digital-downloads' ); ?>
<button type="button" id="edd-recapture-connect" class="button button-primary">
<?php esc_html_e( 'Connect with Recapture', 'easy-digital-downloads' ); ?>
</button>
<?php wp_nonce_field( 'edd-recapture-connect', 'edd-recapture-connect-nonce' ); ?>
</p>
<?php endif; ?>

Expand Down
3 changes: 2 additions & 1 deletion includes/class-easy-digital-downloads.php
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ private function setup_constants() {

// Plugin version.
if ( ! defined( 'EDD_VERSION' ) ) {
define( 'EDD_VERSION', '3.2.11' );
define( 'EDD_VERSION', '3.2.12' );
}

// Make sure CAL_GREGORIAN is defined.
Expand Down Expand Up @@ -729,6 +729,7 @@ private function include_objects() {
require_once EDD_PLUGIN_DIR . 'includes/emails/class-edd-emails.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/class-edd-email-tags.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/functions.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/recapture.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/tags.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/tags-inserter.php';
require_once EDD_PLUGIN_DIR . 'includes/emails/template.php';
Expand Down
Loading

0 comments on commit 252a23a

Please sign in to comment.