Merge pull request #22418 from woocommerce/fix/22037

Remove mention of payment from processing emails
This commit is contained in:
Mike Jolley 2019-01-14 16:49:09 +00:00 committed by GitHub
commit 5dc977802c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions

View File

@ -57,7 +57,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
* @return string * @return string
*/ */
public function get_default_subject() { 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 * @return string
*/ */
public function get_default_heading() { public function get_default_heading() {
return __( 'Thank you for your payment', 'woocommerce' ); return __( 'Thank you for your order', 'woocommerce' );
} }
/** /**
@ -104,7 +104,8 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
*/ */
public function get_content_html() { public function get_content_html() {
return wc_get_template_html( return wc_get_template_html(
$this->template_html, array( $this->template_html,
array(
'order' => $this->object, 'order' => $this->object,
'email_heading' => $this->get_heading(), 'email_heading' => $this->get_heading(),
'sent_to_admin' => false, 'sent_to_admin' => false,
@ -121,7 +122,8 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order', false ) ) :
*/ */
public function get_content_plain() { public function get_content_plain() {
return wc_get_template_html( return wc_get_template_html(
$this->template_plain, array( $this->template_plain,
array(
'order' => $this->object, 'order' => $this->object,
'email_heading' => $this->get_heading(), 'email_heading' => $this->get_heading(),
'sent_to_admin' => false, 'sent_to_admin' => false,

View File

@ -12,7 +12,7 @@
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @package WooCommerce/Templates/Emails * @package WooCommerce/Templates/Emails
* @version 3.5.0 * @version 3.5.4
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -27,7 +27,7 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
<?php /* translators: %s: Customer first name */ ?> <?php /* translators: %s: Customer first name */ ?>
<p><?php printf( esc_html__( 'Hi %s,', 'woocommerce' ), esc_html( $order->get_billing_first_name() ) ); ?></p> <p><?php printf( esc_html__( 'Hi %s,', 'woocommerce' ), esc_html( $order->get_billing_first_name() ) ); ?></p>
<?php /* translators: %s: Order number */ ?> <?php /* translators: %s: Order number */ ?>
<p><?php printf( esc_html__( 'Just to let you know &mdash; your payment has been confirmed, and order #%s is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ); ?></p> <p><?php printf( esc_html__( 'Just to let you know &mdash; we\'ve received your order #%s, and it is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ); ?></p>
<?php <?php

View File

@ -12,7 +12,7 @@
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @package WooCommerce/Templates/Emails/Plain * @package WooCommerce/Templates/Emails/Plain
* @version 3.5.0 * @version 3.5.4
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
@ -24,7 +24,7 @@ echo '= ' . esc_html( $email_heading ) . " =\n\n";
/* translators: %s: Customer first name */ /* translators: %s: Customer first name */
echo sprintf( esc_html__( 'Hi %s,', 'woocommerce' ), esc_html( $order->get_billing_first_name() ) ) . "\n\n"; echo sprintf( esc_html__( 'Hi %s,', 'woocommerce' ), esc_html( $order->get_billing_first_name() ) ) . "\n\n";
/* translators: %s: Order number */ /* translators: %s: Order number */
echo sprintf( esc_html__( 'Just to let you know &mdash; 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 &mdash; we\'ve received your order #%s, and it is now being processed:', 'woocommerce' ), esc_html( $order->get_order_number() ) ) . "\n\n";
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";