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

2.2.13

Browse Source
This commit is contained in:
Prospress Inc
2017-10-18 15:54:33 +02:00
committed by Remco Tolsma
parent a1f5512b45
commit a00aceab46
36 changed files with 1032 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1285,7 +1285,7 @@ class WC_Subscription extends WC_Order {
}
if ( ! empty( $message ) ) {
throw new Exception( $message );
throw new Exception( sprintf( __( 'Subscription #%d: ', 'woocommerce-subscriptions' ), $this->get_id() ) . $message );
}
$this->set_date_prop( $date_type, 0 );
@@ -1789,10 +1789,17 @@ class WC_Subscription extends WC_Order {
/**
* Get parent order object.
*
* @return WC_Order
* @return mixed WC_Order|bool
*/
public function get_parent() {
return wc_get_order( $this->get_parent_id() );
$parent_id = $this->get_parent_id();
$order = false;
if ( $parent_id > 0 ) {
$order = wc_get_order( $parent_id );
}
return $order;
}
/**
@@ -2335,7 +2342,7 @@ class WC_Subscription extends WC_Order {
// Don't validate dates while the subscription is being read, only dates set outside of instantiation require the strict validation rules to apply
if ( $this->object_read && ! empty( $messages ) ) {
throw new Exception( join( ' ', $messages ) );
throw new Exception( sprintf( __( 'Subscription #%d: ', 'woocommerce-subscriptions' ), $this->get_id() ) . join( ' ', $messages ) );
}
return array_merge( $dates, $delete_date_types );
@@ -2480,5 +2487,4 @@ class WC_Subscription extends WC_Order {
return $datetime;
}
}