hazza/woocommerce-subscriptions
1
0
Fork 0
mirror of https://github.com/pronamic/woocommerce-subscriptions.git synced 2025-10-10 11:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

2.2.7

Browse Source
This commit is contained in:
Prospress Inc
2017-06-09 16:36:26 +02:00
committed by Remco Tolsma
parent 5e536ec717
commit b99eba2f79
51 changed files with 1413 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
includes/class-wc-subscription.php
View File

@@ -176,6 +176,9 @@ class WC_Subscription extends WC_Order {
if ( ! WC_Subscriptions::is_woocommerce_pre( '3.0' ) ) {
wcs_doing_it_wrong( $key, sprintf( 'Subscription properties should not be set directly as WooCommerce 3.0 no longer supports direct property access. Use %s instead.', $function ), '2.2.0' );
}
} else {
$this->$key = $value;
}
}
@@ -455,8 +458,8 @@ class WC_Subscription extends WC_Order {
// Recalculate and set next payment date
$stored_next_payment = $this->get_time( 'next_payment' );
// Make sure the next payment date is more than 2 hours in the future
if ( $stored_next_payment < ( gmdate( 'U' ) + 2 * HOUR_IN_SECONDS ) ) { // also accounts for a $stored_next_payment of 0, meaning it's not set
// Make sure the next payment date is more than 2 hours in the future by default
if ( $stored_next_payment < ( gmdate( 'U' ) + apply_filters( 'woocommerce_subscription_activation_next_payment_date_threshold', 2 * HOUR_IN_SECONDS, $stored_next_payment, $old_status, $this ) ) ) { // also accounts for a $stored_next_payment of 0, meaning it's not set
$calculated_next_payment = $this->calculate_date( 'next_payment' );
@@ -465,6 +468,9 @@ class WC_Subscription extends WC_Order {
} elseif ( $stored_next_payment < gmdate( 'U' ) ) { // delete the stored date if it's in the past as we're not updating it (the calculated next payment date is 0 or none)
$this->delete_date( 'next_payment' );
}
} else {
// In case plugins want to run some code when the subscription was reactivated, but the next payment date was not recalculated.
do_action( 'woocommerce_subscription_activation_next_payment_not_recalculated', $stored_next_payment, $old_status, $this );
}
// Trial end date and end/expiration date don't change at all - they should be set when the subscription is first created
wcs_make_user_active( $this->get_user_id() );
@@ -846,7 +852,7 @@ class WC_Subscription extends WC_Order {
* @param int $value
*/
public function set_billing_interval( $value ) {
$this->set_prop( 'billing_interval', absint( $value ) );
$this->set_prop( 'billing_interval', (string) absint( $value ) );
}
/**
@@ -1251,8 +1257,8 @@ class WC_Subscription extends WC_Order {
}
if ( $is_updated && true === $this->object_read ) {
$this->save_dates();
do_action( 'woocommerce_subscription_date_updated', $this, $date_type, $datetime );
$this->save();
}
}
}
@@ -1287,8 +1293,8 @@ class WC_Subscription extends WC_Order {
$this->set_date_prop( $date_type, 0 );
if ( true === $this->object_read ) {
$this->save_dates();
do_action( 'woocommerce_subscription_date_deleted', $this, $date_type );
$this->save();
}
}
@@ -1392,7 +1398,7 @@ class WC_Subscription extends WC_Order {
$start_time = $this->get_time( 'date_created' );
$next_payment_time = $this->get_time( 'next_payment' );
$trial_end_time = $this->get_time( 'trial_end' );
$last_payment_time = $this->get_time( 'last_order_date_created' );
$last_payment_time = max( $this->get_time( 'last_order_date_created' ), $this->get_time( 'last_order_date_paid' ) );
$end_time = $this->get_time( 'end' );
// If the subscription has a free trial period, and we're still in the free trial period, the next payment is due at the end of the free trial
@@ -1435,6 +1441,24 @@ class WC_Subscription extends WC_Order {
return $next_payment_date;
}
/**
* Complete a partial save, saving subscription date changes to the database.
*
* Sometimes it's necessary to only save changes to date properties, for example, when you
* don't want status transitions to be triggered by a full object @see $this->save().
*
* @since 2.2.6
*/
public function save_dates() {
if ( $this->data_store && $this->get_id() ) {
$saved_dates = $this->data_store->save_dates( $this );
// Apply the saved date changes
$this->data = array_replace_recursive( $this->data, $saved_dates );
$this->changes = array_diff_key( $this->changes, $saved_dates );
}
}
/** Formatted Totals Methods *******************************************************/
/**
@@ -1548,7 +1572,7 @@ class WC_Subscription extends WC_Order {
}
// Remove discounts
$subtotal = $subtotal - $this->get_cart_discount();
$subtotal = $subtotal - $this->get_total_discount();
$subtotal = wc_price( $subtotal, array( 'currency' => $this->get_currency() ) );
}
@@ -1693,8 +1717,10 @@ class WC_Subscription extends WC_Order {
// Allow a short circuit for plugins & payment gateways to force max failed payments exceeded
if ( 'cancelled' == $new_status || apply_filters( 'woocommerce_subscription_max_failed_payments_exceeded', false, $this ) ) {
$this->update_status( 'cancelled', __( 'Subscription Cancelled: maximum number of failed payments reached.', 'woocommerce-subscriptions' ) );
} else {
if ( $this->can_be_updated_to( 'cancelled' ) ) {
$this->update_status( 'cancelled', __( 'Subscription Cancelled: maximum number of failed payments reached.', 'woocommerce-subscriptions' ) );
}
} elseif ( $this->can_be_updated_to( $new_status ) ) {
$this->update_status( $new_status );
}
@@ -1937,16 +1963,17 @@ class WC_Subscription extends WC_Order {
if ( $this->get_payment_method() !== $payment_method_id ) {
// Set the payment gateway ID depending on whether we have a string or WC_Payment_Gateway or string key
if ( is_a( $payment_method, 'WC_Payment_Gateway' ) ) {
$payment_gateway = $payment_method;
} else {
$payment_gateways = WC()->payment_gateways->payment_gateways();
$payment_gateway = isset( $payment_gateways[ $payment_method_id ] ) ? $payment_gateways[ $payment_method_id ] : null;
}
// We shouldn't set the requires manual renewal prop while the object is being read. That prop should be set by reading it from the DB not based on settings or the payment gateway
// We shouldn't set the requires manual renewal prop or try to get the payment gateway while the object is being read. That prop should be set by reading it from the DB not based on settings or the payment gateway
if ( $this->object_read ) {
// Set the payment gateway ID depending on whether we have a string or WC_Payment_Gateway or string key
if ( is_a( $payment_method, 'WC_Payment_Gateway' ) ) {
$payment_gateway = $payment_method;
} else {
$payment_gateways = WC()->payment_gateways->payment_gateways();
$payment_gateway = isset( $payment_gateways[ $payment_method_id ] ) ? $payment_gateways[ $payment_method_id ] : null;
}
if ( 'yes' == get_option( WC_Subscriptions_Admin::$option_prefix . '_turn_off_automatic_payments', 'no' ) ) {
$this->set_requires_manual_renewal( true );
} elseif ( is_null( $payment_gateway ) || false == $payment_gateway->supports( 'subscriptions' ) ) {
@@ -1954,10 +1981,11 @@ class WC_Subscription extends WC_Order {
} else {
$this->set_requires_manual_renewal( false );
}
$this->set_prop( 'payment_method_title', is_null( $payment_gateway ) ? '' : $payment_gateway->get_title() );
}
$this->set_prop( 'payment_method', $payment_method_id );
$this->set_prop( 'payment_method_title', is_null( $payment_gateway ) ? '' : $payment_gateway->get_title() );
}
}
}