Update completed email copy

This commit is contained in:
Gerhard Potgieter 2018-09-06 13:11:58 +02:00
parent 52190bc5ce
commit 84b935490d
5 changed files with 42 additions and 28 deletions

View File

@ -80,7 +80,7 @@ if ( ! class_exists( 'WC_Email_Customer_Completed_Order', false ) ) :
* @return string * @return string
*/ */
public function get_default_subject() { public function get_default_subject() {
return __( 'Your {site_title} order from {order_date} is complete', 'woocommerce' ); return __( 'Your {site_title} order is now complete', 'woocommerce' );
} }
/** /**
@ -90,13 +90,12 @@ if ( ! class_exists( 'WC_Email_Customer_Completed_Order', false ) ) :
* @return string * @return string
*/ */
public function get_default_heading() { public function get_default_heading() {
return __( 'Your order is complete', 'woocommerce' ); return __( 'Thanks for shipping with us', 'woocommerce' );
} }
/** /**
* Get content html. * Get content html.
* *
* @access public
* @return string * @return string
*/ */
public function get_content_html() { public function get_content_html() {

View File

@ -11,25 +11,26 @@
* the readme will list any important changes. * the readme will list any important changes.
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @author WooThemes
* @package WooCommerce/Templates/Emails * @package WooCommerce/Templates/Emails
* @version 2.5.0 * @version 3.5.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; exit;
} }
/** /*
* @hooked WC_Emails::email_header() Output the email header * @hooked WC_Emails::email_header() Output the email header
*/ */
do_action( 'woocommerce_email_header', $email_heading, $email ); ?> do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
<p><?php printf( __( "Hi there. Your recent order on %s has been completed. Your order details are shown below for your reference:", 'woocommerce' ), get_option( 'blogname' ) ); ?></p> <?php /* translators: %s: Customer first name */ ?>
<p><?php printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
<?php /* translators: %s: Site title */ ?>
<p><?php printf( __( 'Your %s order has been marked complete on our side. We hope you enjoy it!', 'woocommerce' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
<?php <?php
/** /*
* @hooked WC_Emails::order_details() Shows the order details table. * @hooked WC_Emails::order_details() Shows the order details table.
* @hooked WC_Structured_Data::generate_order_data() Generates structured data. * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
* @hooked WC_Structured_Data::output_structured_data() Outputs structured data. * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
@ -37,18 +38,24 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
*/ */
do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email ); do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_text, $email );
/** /*
* @hooked WC_Emails::order_meta() Shows order meta data. * @hooked WC_Emails::order_meta() Shows order meta data.
*/ */
do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email ); do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
/** /*
* @hooked WC_Emails::customer_details() Shows customer details * @hooked WC_Emails::customer_details() Shows customer details
* @hooked WC_Emails::email_address() Shows email address * @hooked WC_Emails::email_address() Shows email address
*/ */
do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email ); do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
/** ?>
<p>
<?php _e( 'Thanks for shopping with us.', 'woocommerce' ); // phpcs:ignore WordPress.XSS.EscapeOutput ?>
</p>
<?php
/*
* @hooked WC_Emails::email_footer() Output the email footer * @hooked WC_Emails::email_footer() Output the email footer
*/ */
do_action( 'woocommerce_email_footer', $email ); do_action( 'woocommerce_email_footer', $email );

View File

@ -26,8 +26,8 @@ do_action( 'woocommerce_email_header', $email_heading, $email ); ?>
<?php /* translators: %s: Customer first name */ ?> <?php /* translators: %s: Customer first name */ ?>
<p><?php printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?> <p><?php printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
<?php /* translators: %s: Site title */ ?> <?php /* translators: %s: Order number */ ?>
<p><?php printf( __( 'Your %s order has been marked complete on our side. We hope you enjoy it!', 'woocommerce' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?> <p><?php printf( __( 'Just to let you know -- your payment has been confirmed, and order %s is now being processed:', 'woocommerce' ), $order->get_order_number() ); ?></p><?php // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped ?>
<?php <?php

View File

@ -11,22 +11,24 @@
* the readme will list any important changes. * the readme will list any important changes.
* *
* @see https://docs.woocommerce.com/document/template-structure/ * @see https://docs.woocommerce.com/document/template-structure/
* @author WooThemes
* @package WooCommerce/Templates/Emails/Plain * @package WooCommerce/Templates/Emails/Plain
* @version 2.5.0 * @version 3.5.0
*/ */
if ( ! defined( 'ABSPATH' ) ) { if ( ! defined( 'ABSPATH' ) ) {
exit; exit;
} }
echo "= " . $email_heading . " =\n\n"; echo '= ' . $email_heading . " =\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo sprintf( __( "Hi there. Your recent order on %s has been completed. Your order details are shown below for your reference:", 'woocommerce' ), get_option( 'blogname' ) ) . "\n\n"; /* translators: %s: Customer first name */
printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
/* translators: %s: Site title */
printf( __( 'Your %s order has been marked complete on our side. We hope you enjoy it!', 'woocommerce' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
/** /*
* @hooked WC_Emails::order_details() Shows the order details table. * @hooked WC_Emails::order_details() Shows the order details table.
* @hooked WC_Structured_Data::generate_order_data() Generates structured data. * @hooked WC_Structured_Data::generate_order_data() Generates structured data.
* @hooked WC_Structured_Data::output_structured_data() Outputs structured data. * @hooked WC_Structured_Data::output_structured_data() Outputs structured data.
@ -36,17 +38,23 @@ do_action( 'woocommerce_email_order_details', $order, $sent_to_admin, $plain_tex
echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
/** /*
* @hooked WC_Emails::order_meta() Shows order meta data. * @hooked WC_Emails::order_meta() Shows order meta data.
*/ */
do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email ); do_action( 'woocommerce_email_order_meta', $order, $sent_to_admin, $plain_text, $email );
/** /*
* @hooked WC_Emails::customer_details() Shows customer details * @hooked WC_Emails::customer_details() Shows customer details
* @hooked WC_Emails::email_address() Shows email address * @hooked WC_Emails::email_address() Shows email address
*/ */
do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email ); do_action( 'woocommerce_email_customer_details', $order, $sent_to_admin, $plain_text, $email );
?>
<p>
<?php _e( 'Thanks for shopping with us.', 'woocommerce' ); // phpcs:ignore WordPress.XSS.EscapeOutput ?>
</p>
<?php
echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";
echo apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) ); echo apply_filters( 'woocommerce_email_footer_text', get_option( 'woocommerce_email_footer_text' ) ); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped

View File

@ -23,8 +23,8 @@ echo '= ' . $email_heading . " =\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutpu
/* translators: %s: Customer first name */ /* translators: %s: Customer first name */
printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped printf( __( 'Hi %s,', 'woocommerce' ), $order->get_first_name() ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
/* translators: %s: Site title */ /* translators: %s: Order number */
printf( __( 'Your %s order has been marked complete on our side. We hope you enjoy it!', 'woocommerce' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped printf( __( 'Just to let you know -- your payment has been confirmed, and order %s is now being processed:', 'woocommerce' ), $order->get_order_number() ) . "\n\n"; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n"; echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n";