updated plugin Easy Digital Downloads version 3.1.2

This commit is contained in:
2023-06-28 12:45:44 +00:00
committed by Gitium
parent 44df590080
commit f710fa7de2
120 changed files with 5556 additions and 3347 deletions

View File

@ -187,6 +187,7 @@ function edd_add_manual_order( $args = array() ) {
'discount' => $order_discount,
'total' => $order_total,
'date_created' => $date,
'order_number' => edd_set_order_number(),
)
);
@ -425,22 +426,6 @@ function edd_add_manual_order( $args = array() ) {
edd_update_order_meta( $order_id, 'unlimited_downloads', 1 );
}
// Setup order number.
$order_number = '';
if ( edd_get_option( 'enable_sequential' ) ) {
$number = edd_get_next_payment_number();
$order_number = edd_format_payment_number( $number );
update_option( 'edd_last_payment_number', $number );
// Update totals & maybe add order number.
edd_update_order( $order_id, array(
'order_number' => $order_number,
) );
}
// Stop purchase receipt from being sent.
if ( ! isset( $order_data['edd_order_send_receipt'] ) ) {
remove_action( 'edd_complete_purchase', 'edd_trigger_purchase_receipt', 999 );

View File

@ -791,7 +791,8 @@ function edd_build_order( $order_data = array() ) {
unset( $order_args['date_created'] );
edd_update_order( $order_id, $order_args );
} else {
$order_id = edd_add_order( $order_args );
$order_args['order_number'] = edd_set_order_number();
$order_id = edd_add_order( $order_args );
}
// If there is no order ID at this point, something went wrong.
@ -1141,18 +1142,8 @@ function edd_build_order( $order_data = array() ) {
}
}
// Setup order number.
if ( edd_get_option( 'enable_sequential' ) ) {
$number = edd_get_next_payment_number();
$order_args['order_number'] = edd_format_payment_number( $number );
update_option( 'edd_last_payment_number', $number );
}
// Update the order with all of the newly computed values.
edd_update_order( $order_id, array(
'order_number' => $order_args['order_number'],
'subtotal' => $subtotal,
'tax' => $total_tax,
'discount' => $total_discount,
@ -1373,3 +1364,15 @@ function edd_generate_order_payment_key( $key ) {
*/
return apply_filters( 'edd_generate_order_payment_key', $payment_key, $key );
}
/**
* Helper function to get and maybe update the order number.
*
* @since 3.1.1.2
* @return string
*/
function edd_set_order_number() {
$order_number = new EDD\Orders\Number();
return $order_number->apply();
}