From 77537d2cd3d381136a9fc10bde2c62f676830ef9 Mon Sep 17 00:00:00 2001 From: Gerhard Date: Fri, 11 Jan 2019 14:29:21 +0200 Subject: [PATCH 1/3] Update copy for processing order emails to not mention payment as some stores take payment after orders are placed. --- includes/emails/class-wc-email-customer-processing-order.php | 4 ++-- templates/emails/customer-processing-order.php | 4 ++-- templates/emails/plain/customer-processing-order.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php index 20b6f888c00..df1a99e621c 100644 --- a/includes/emails/class-wc-email-customer-processing-order.php +++ b/includes/emails/class-wc-email-customer-processing-order.php @@ -57,7 +57,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) : * @return string */ public function get_default_subject() { - return __( 'Payment received for your order', 'woocommerce' ); + return __( 'Your {site_title} order has been received!', 'woocommerce' ); } /** @@ -67,7 +67,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) : * @return string */ public function get_default_heading() { - return __( 'Thank you for your payment', 'woocommerce' ); + return __( 'Thank you for your order', 'woocommerce' ); } /** diff --git a/templates/emails/customer-processing-order.php b/templates/emails/customer-processing-order.php index 49383803bce..7009737d113 100644 --- a/templates/emails/customer-processing-order.php +++ b/templates/emails/customer-processing-order.php @@ -12,7 +12,7 @@ * * @see https://docs.woocommerce.com/document/template-structure/ * @package WooCommerce/Templates/Emails - * @version 3.5.0 + * @version 3.5.4 */ if ( ! defined( 'ABSPATH' ) ) { @@ -27,7 +27,7 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>

get_billing_first_name() ) ); ?>

-

get_order_number() ) ); ?>

+

get_order_number() ) ); ?>

get_billing_first_name() ) ) . "\n\n"; /* translators: %s: Order number */ -echo sprintf( esc_html__( 'Just to let you know — your payment has been confirmed, and order #%s is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ) . "\n\n"; +echo sprintf( esc_html__( 'Just to let you know — your order, order #%s has been confirmed, and is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ) . "\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; From 4c6da744fe989806b70cbdbd0201102e071a62b8 Mon Sep 17 00:00:00 2001 From: Gerhard Date: Fri, 11 Jan 2019 14:30:13 +0200 Subject: [PATCH 2/3] PHPCS fixes --- .../emails/class-wc-email-customer-processing-order.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/emails/class-wc-email-customer-processing-order.php b/includes/emails/class-wc-email-customer-processing-order.php index df1a99e621c..5570c6839ca 100644 --- a/includes/emails/class-wc-email-customer-processing-order.php +++ b/includes/emails/class-wc-email-customer-processing-order.php @@ -104,7 +104,8 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) : */ public function get_content_html() { return wc_get_template_html( - $this->template_html, array( + $this->template_html, + array( 'order' => $this->object, 'email_heading' => $this->get_heading(), 'sent_to_admin' => false, @@ -121,7 +122,8 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) : */ public function get_content_plain() { return wc_get_template_html( - $this->template_plain, array( + $this->template_plain, + array( 'order' => $this->object, 'email_heading' => $this->get_heading(), 'sent_to_admin' => false, From 2974154ae859413639c4b9aa919e984ea12254f3 Mon Sep 17 00:00:00 2001 From: Gerhard Date: Fri, 11 Jan 2019 15:04:06 +0200 Subject: [PATCH 3/3] Update processing order email copy as per feedback https://github.com/woocommerce/woocommerce/pull/22418#discussion_r247105693 --- templates/emails/customer-processing-order.php | 2 +- templates/emails/plain/customer-processing-order.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/emails/customer-processing-order.php b/templates/emails/customer-processing-order.php index 7009737d113..324d980d073 100644 --- a/templates/emails/customer-processing-order.php +++ b/templates/emails/customer-processing-order.php @@ -27,7 +27,7 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>

get_billing_first_name() ) ); ?>

-

get_order_number() ) ); ?>

+

get_order_number() ) ); ?>

get_billing_first_name() ) ) . "\n\n"; /* translators: %s: Order number */ -echo sprintf( esc_html__( 'Just to let you know — your order, order #%s has been confirmed, and is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ) . "\n\n"; +echo sprintf( esc_html__( 'Just to let you know — we\'ve received your order #%s, and it is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ) . "\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";