Backwards compatibility for triggers

Closes #13141
woocommerce · Feb 10, 2017 · b58e26b · b58e26b
1 parent 5349171
commit b58e26b
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 36 deletions.
diff --git a/includes/emails/class-wc-email-cancelled-order.php b/includes/emails/class-wc-email-cancelled-order.php
@@ -43,13 +43,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';

diff --git a/includes/emails/class-wc-email-customer-completed-order.php b/includes/emails/class-wc-email-customer-completed-order.php
@@ -47,13 +47,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
 			$this->recipient               = $this->object->get_billing_email();
 

diff --git a/includes/emails/class-wc-email-customer-invoice.php b/includes/emails/class-wc-email-customer-invoice.php
@@ -61,12 +61,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int|WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
 			$this->recipient               = $this->object->get_billing_email();
 

diff --git a/includes/emails/class-wc-email-customer-on-hold-order.php b/includes/emails/class-wc-email-customer-on-hold-order.php
@@ -41,13 +41,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object       = $order;
 			$this->recipient    = $this->object->get_billing_email();
 

diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php
@@ -41,13 +41,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object       = $order;
 			$this->recipient    = $this->object->get_billing_email();
 

diff --git a/includes/emails/class-wc-email-failed-order.php b/includes/emails/class-wc-email-failed-order.php
@@ -7,7 +7,7 @@
 if ( ! class_exists( 'WC_Email_Failed_Order' ) ) :
 
 /**
- * Failed Order Email
+ * Failed Order Email.
  *
  * An email sent to the admin when payment fails to go through.
  *
@@ -20,7 +20,7 @@
 class WC_Email_Failed_Order extends WC_Email {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 */
 	public function __construct() {
 		$this->id               = 'failed_order';
@@ -43,13 +43,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';

diff --git a/includes/emails/class-wc-email-new-order.php b/includes/emails/class-wc-email-new-order.php
@@ -47,13 +47,17 @@ public function __construct() {
 	}
 
 	/**
-	 * Trigger.
+	 * Trigger the sending of this email.
 	 *
-	 * @param int $order_id
-	 * @param WC_Order $order
+	 * @param int $order_id The order ID.
+	 * @param WC_Order $order Order object.
 	 */
-	public function trigger( $order_id, $order ) {
-		if ( $order ) {
+	public function trigger( $order_id, $order = false ) {
+		if ( $order_id && ! is_a( $order, 'WC_Order' ) ){
+			$order = wc_get_order( $order_id );
+		}
+
+		if ( is_a( $order, 'WC_Order' ) ) {
 			$this->object                  = $order;
 			$this->find['order-date']      = '{order_date}';
 			$this->find['order-number']    = '{order_number}';