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

2.2.10

Browse Source
This commit is contained in:
Prospress Inc
2017-07-21 16:16:16 +02:00
committed by Remco Tolsma
parent 09e7f71161
commit ed27f81d70
31 changed files with 884 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -480,7 +480,6 @@ class WC_Subscription extends WC_Order {
case 'on-hold' :
// Record date of suspension - 'post_modified' column?
$this->set_suspension_count( $this->get_suspension_count() + 1 );
wcs_maybe_make_user_inactive( $this->get_user_id() );
break;
case 'cancelled' :
case 'switched' :
@@ -498,7 +497,6 @@ class WC_Subscription extends WC_Order {
}
$this->update_dates( $dates_to_update );
wcs_maybe_make_user_inactive( $this->get_user_id() );
break;
}
@@ -1790,7 +1788,7 @@ class WC_Subscription extends WC_Order {
/**
* Get parent order object.
*
* @return int
* @return WC_Order
*/
public function get_parent() {
return wc_get_order( $this->get_parent_id() );
@@ -2047,7 +2045,15 @@ class WC_Subscription extends WC_Order {
* @return bool
*/
public function is_download_permitted() {
return apply_filters( 'woocommerce_order_is_download_permitted', ( $this->has_status( 'active' ) || $this->has_status( 'pending-cancel' ) ), $this );
$sending_email = did_action( 'woocommerce_email_before_order_table' ) > did_action( 'woocommerce_email_after_order_table' );
$is_download_permitted = $this->has_status( 'active' ) || $this->has_status( 'pending-cancel' );
// WC Emails are sent before the subscription status is updated to active etc. so we need a way to ensure download links are added to the emails before being sent
if ( $sending_email && ! $is_download_permitted ) {
$is_download_permitted = true;
}
return apply_filters( 'woocommerce_order_is_download_permitted', $is_download_permitted, $this );
}
/**