v2.9.0

Author: algoritmika

Diff for: custom-emails-for-woocommerce.php

@@ -3,12 +3,12 @@
 Plugin Name: Additional Custom Emails for WooCommerce
 Plugin URI: https://wpfactory.com/item/custom-emails-for-woocommerce/
 Description: Add custom emails to WooCommerce.
-Version: 2.8.1
+Version: 2.9.0
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: custom-emails-for-woocommerce
 Domain Path: /langs
-WC tested up to: 8.5
+WC tested up to: 8.6
 */
 
 defined( 'ABSPATH' ) || exit;
@@ -30,7 +30,7 @@
 	}
 }
 
-defined( 'ALG_WC_CUSTOM_EMAILS_VERSION' ) || define( 'ALG_WC_CUSTOM_EMAILS_VERSION', '2.8.1' );
+defined( 'ALG_WC_CUSTOM_EMAILS_VERSION' ) || define( 'ALG_WC_CUSTOM_EMAILS_VERSION', '2.9.0' );
 
 defined( 'ALG_WC_CUSTOM_EMAILS_FILE' ) || define( 'ALG_WC_CUSTOM_EMAILS_FILE', __FILE__ );
 

Diff for: includes/class-alg-wc-custom-emails-core.php

@@ -44,7 +44,7 @@ class Alg_WC_Custom_Emails_Core {
 	 * @version 2.6.0
 	 * @since   1.0.0
 	 *
-	 * @todo    (feature) option to conditionally disable some standard WC emails (e.g. "order completed" email, etc.)?
+	 * @todo    (feature) option to conditionally disable some standard WC emails (e.g., "order completed" email, etc.)?
 	 */
 	function __construct() {
 

Diff for: includes/class-alg-wc-custom-emails-shortcodes.php

@@ -2,7 +2,7 @@
 /**
  * Custom Emails for WooCommerce - Emails Shortcodes Class
  *
- * @version 2.8.1
+ * @version 2.9.0
  * @since   1.0.0
  *
  * @author  Algoritmika Ltd
@@ -49,7 +49,7 @@ class Alg_WC_Custom_Emails_Shortcodes {
 	/**
 	 * Constructor.
 	 *
-	 * @version 2.8.1
+	 * @version 2.9.0
 	 * @since   1.0.0
 	 *
 	 * @todo    (dev) not order related (e.g., customer; product)
@@ -76,6 +76,7 @@ function __construct() {
 			'order_shipping_method',
 			'order_payment_method_id',
 			'order_payment_method_title',
+			'order_checkout_payment_url',
 			'order_total_items_count',
 			'order_date',
 			'order_details',
@@ -137,7 +138,7 @@ function translate( $atts, $content = '' ) {
 	 * @since   1.1.0
 	 *
 	 * @todo    (dev) generate coupon from *order*
-	 * @todo    (dev) more `$atts`, e.g. `discount_type`
+	 * @todo    (dev) more `$atts`, e.g., `discount_type`
 	 * @todo    (dev) optional `customer_email`
 	 * @todo    (dev) optional `first_name` in coupon code
 	 */
@@ -219,6 +220,21 @@ function user_prop( $atts, $content = '' ) {
 		return $this->return_shortcode( $this->user->get( $atts['key'] ), $atts );
 	}
 
+	/**
+	 * order_checkout_payment_url.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 *
+	 * @todo    (dev) add `[order_checkout_payment_link]` shortcode (i.e., `<a href="...">Pay</a>`)?
+	 */
+	function order_checkout_payment_url( $atts, $content = '' ) {
+		if ( ! $this->order ) {
+			return '';
+		}
+		return $this->return_shortcode( $this->order->get_checkout_payment_url(), $atts );
+	}
+
 	/**
 	 * order_billing_email.
 	 *
@@ -695,7 +711,7 @@ function clear( $atts, $content = '' ) {
 	 * @version 1.0.0
 	 * @since   1.0.0
 	 *
-	 * @todo    (dev) more common atts, e.g. find/replace, strip_tags, any_func, etc.
+	 * @todo    (dev) more common atts, e.g., find/replace, strip_tags, any_func, etc.
 	 */
 	function return_shortcode( $value, $atts ) {
 		if ( is_numeric( $value ) ) {

Diff for: includes/classes/class-alg-wc-custom-email.php

@@ -2,7 +2,7 @@
 /**
  * Custom Emails for WooCommerce - Custom Email Class
  *
- * @version 2.8.0
+ * @version 2.9.0
  * @since   1.0.0
  *
  * @author  Algoritmika Ltd
@@ -283,6 +283,8 @@ function alg_wc_ce_hook_triggers() {
 	 *
 	 * @version 2.0.0
 	 * @since   1.0.0
+	 *
+	 * @todo    (dev) `is_callable( array( $object_id, 'get_id' )`?
 	 */
 	function alg_wc_ce_trigger( $object_id ) {
 		$this->alg_wc_ce_send_email( $object_id, false );
@@ -311,7 +313,7 @@ function schedule_single( $timestamp, $hook, $args ) {
 	/**
 	 * alg_wc_ce_send_email.
 	 *
-	 * @version 2.8.0
+	 * @version 2.9.0
 	 * @since   1.3.0
 	 *
 	 * @todo    (dev) `wc_get_product( $object_id )`: better solution, e.g., use `current_filter()`?
@@ -331,6 +333,11 @@ function alg_wc_ce_send_email( $object_id, $do_force_send, $note = '' ) {
 		// Debug
 		$this->alg_wc_ce_debug( sprintf( __( 'Triggered [%s].', 'custom-emails-for-woocommerce' ), current_filter() ) );
 
+		// Object ID
+		if ( is_callable( array( $object_id, 'get_id' ) ) ) {
+			$object_id = $object_id->get_id();
+		}
+
 		// Check if it's enabled
 		if ( ! $this->is_enabled() || ! apply_filters( 'alg_wc_custom_emails_is_enabled', true, $this, $object_id, $do_force_send ) ) {
 			$this->alg_wc_ce_debug( __( 'Disabled.', 'custom-emails-for-woocommerce' ) );

Diff for: includes/settings/class-alg-wc-custom-email-settings.php

@@ -2,7 +2,7 @@
 /**
  * Custom Emails for WooCommerce - Email Settings Class
  *
- * @version 2.8.0
+ * @version 2.9.0
  * @since   1.0.0
  *
  * @author  Algoritmika Ltd
@@ -74,7 +74,7 @@ function get_default_subject() {
 	 * @version 1.0.0
 	 * @since   1.0.0
 	 *
-	 * @todo    (dev) better default content (include more shortcodes, e.g. `[clear]`, `[if]` etc.)
+	 * @todo    (dev) better default content (include more shortcodes, e.g., `[clear]`, `[if]` etc.)
 	 */
 	function get_default_content() {
 		return '[order_details]' . PHP_EOL .
@@ -392,17 +392,31 @@ function get_stop_emails() {
 		) );
 	}
 
+	/**
+	 * get_order_statuses.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 */
+	function get_order_statuses() {
+		$statuses = wc_get_order_statuses();
+		if ( function_exists( 'wcs_get_subscription_statuses' ) ) {
+			$statuses = array_merge( $statuses, wcs_get_subscription_statuses() );
+		}
+		return $statuses;
+	}
+
 	/**
 	 * get_form_fields.
 	 *
-	 * @version 2.8.0
+	 * @version 2.9.0
 	 * @since   1.0.0
 	 *
 	 * @todo    (dev) move this function to a separate file/class
 	 * @todo    (feature) "Custom triggers"
 	 * @todo    (feature) `cc` and `bcc`
 	 * @todo    (desc) `delay`: better desc
-	 * @todo    (dev) add sections, e.g. "Conditions"
+	 * @todo    (dev) add sections, e.g., "Conditions"
 	 * @todo    (dev) replace `woocommerce` text domain with `custom-emails-for-woocommerce` everywhere
 	 * @todo    (feature) separate option for plain content
 	 */
@@ -735,7 +749,7 @@ function get_form_fields( $email ) {
 				'type'              => 'multiselect',
 				'class'             => 'wc-enhanced-select',
 				'default'           => array(),
-				'options'           => wc_get_order_statuses(),
+				'options'           => $this->get_order_statuses(),
 				'css'               => 'width:100%;',
 			),
 			'excluded_order_statuses' => array(
@@ -744,7 +758,7 @@ function get_form_fields( $email ) {
 				'type'              => 'multiselect',
 				'class'             => 'wc-enhanced-select',
 				'default'           => array(),
-				'options'           => wc_get_order_statuses(),
+				'options'           => $this->get_order_statuses(),
 				'css'               => 'width:100%;',
 			),
 			'order_conditions_logical_operator' => array(

Diff for: includes/settings/class-alg-wc-custom-emails-settings-general.php

@@ -34,7 +34,7 @@ function __construct() {
 	 *
 	 * @todo    (desc) `alg_wc_custom_emails_enabled_trigger_groups`
 	 * @todo    (dev) `alg_wc_custom_emails_titles`: move to the email settings?
-	 * @todo    (dev) `alg_wc_custom_emails_titles`: icon for settings (e.g. `<span class="dashicons dashicons-admin-settings"></span>`)?
+	 * @todo    (dev) `alg_wc_custom_emails_titles`: icon for settings (e.g., `<span class="dashicons dashicons-admin-settings"></span>`)?
 	 * @todo    (desc) `alg_wc_custom_emails_total`: better desc?
 	 */
 	function get_settings() {