Commit Graph

149 Commits

Author SHA1 Message Date
Slavic Dragovtev a5d03828f4
Fix DocBlock in email template
Fixes issue [#26244](https://github.com/woocommerce/woocommerce/issues/26244)
2020-04-22 20:19:50 +03:00
Christopher Allford 46f58faeca Updated the admin-cancelled-order plain template to match the rich one 2020-04-06 13:24:52 -07:00
Rodrigo Primo 7337ab60c2 Fix PEAR.Functions.FunctionCallSignature violations
This commit fixes all violations of the PEAR.Functions.FunctionCallSignature sniff automatically using phpcbf.
2019-12-20 15:25:23 -03:00
Rodrigo Primo 73b5fff29e Fix Squiz.Strings.DoubleQuoteUsage violations
This commit fixes all violations of the Squiz.Strings.DoubleQuoteUsage sniff automatically using phpcbf.
2019-12-20 14:41:46 -03:00
Rodrigo Primo b574b0b56b Fix Squiz.WhiteSpace.SuperfluousWhitespace violations
This commit fixes all violations of the Squiz.WhiteSpace.SuperfluousWhitespace sniff automatically using phpcbf.
2019-12-20 14:31:29 -03:00
Rodrigo Primo 2c74233be2 Fix WordPress.WhiteSpace.DisallowInlineTabs violations
This commit fixes all violations of the WordPress.WhiteSpace.DisallowInlineTabs sniff automatically using phpcbf.
2019-12-20 14:27:07 -03:00
Rodrigo Primo 62d6b05b58 Fix Generic.Formatting.MultipleStatementAlignment violations
This commit fixes all violations of the Generic.Formatting.MultipleStatementAlignment sniff automatically using phpcbf.
2019-12-20 14:21:08 -03:00
Garrett Hyder 5c85f3c63d Fix invalid comments in email templates (#24928)
* Fix comment

* Fix comment

* Fix comment

* Add missing colons : to translator comments

* Add missing colon to translator comment

* Add missing colons to translator comments

* Add missing colons to translator comments

* Add missing colon to translator comment
2019-12-09 09:08:11 -03:00
Keith Light 67332f9fa0 Amend typos in email templates 2019-09-10 09:47:07 +01:00
Claudio Sanches 86a58a05c3 Fixes based in feedback in #23460 2019-07-09 16:20:54 -03:00
Claudio Sanches c1a3c65e34
Merge branch 'master' into update/23390 2019-07-09 16:15:07 -03:00
Gerhard Potgieter 3abf11e569
Merge pull request #23969 from woocommerce/fix/23956
Display line breaks of customer notes in emails, and order details.
2019-07-04 13:11:44 +02:00
Claudio Sanches 7f826226b7 No nl2br in plain text emails 2019-06-24 12:16:07 -03:00
Claudio Sanches 6cfe7cb681 Fixed coding standards 2019-06-19 18:39:27 -03:00
Claudio Sanches 62f58daeed Update templates version 2019-06-19 18:33:30 -03:00
Claudio Sanches d46d62fcb7 Fixed line break from customer notes in emails 2019-06-19 18:28:49 -03:00
Claudio Sanches edd0e7de8c Bump template versions 2019-05-21 17:53:03 -03:00
Claudio Sanches 4a99a11009 Merge branch 'master' into update/22895 2019-05-21 17:46:16 -03:00
Ewout Fernhout aee539e034
declare plain text email variables 2019-05-21 09:18:45 +02:00
Ewout Fernhout 5089c93969
coding standards 2019-05-18 16:36:34 +02:00
Ewout Fernhout 3819350aaa
remove stray parenthesis 2019-05-18 15:51:18 +02:00
Ewout Fernhout edce5277e5
check if product exists before calling get_sku() 2019-05-18 15:43:04 +02:00
Mike Jolley b37d58c934 phpcs in touched files 2019-04-23 17:04:11 +01:00
Mike Jolley ff61a4ab73 __ -> esc_html__ 2019-04-23 16:15:05 +01:00
Mike Jolley 9d5eb07373 _e -> esc_html_e 2019-04-23 15:53:58 +01:00
Mike Jolley 0a44c124be Change completed email wording to "We have finished processing your order" 2019-03-25 10:53:57 +00:00
Gerhard 89b485e8da Update translators comment to match changes. 2019-03-14 09:39:19 +02:00
Mike Jolley efc46344fc Bump template version 2019-03-13 14:35:51 +00:00
Mike Jolley df02507c47 Fix double escape 2019-03-13 14:35:16 +00:00
Mike Jolley f511718996 Reword email 2019-03-08 11:58:35 +00:00
Claudio Sanches 1064e2bbb8 Removed URL from translatable string 2019-03-07 14:28:48 -03:00
Mike Jolley b33554a4bf Update troubleshooting link 2019-03-06 09:45:57 +00:00
Mike Jolley 138ac3297d Make plain text templates clearer 2019-03-04 17:40:44 +00:00
Mike Jolley 0563a5269b Add content to plain text emails 2019-03-04 17:11:16 +00:00
Mike Jolley 0658fb7b69 phpcs 2019-03-01 16:23:43 +00:00
Mike Jolley a7ef260b2c Remove thanks for reading 2019-03-01 16:22:16 +00:00
Gerhard 2974154ae8 Update processing order email copy as per feedback https://github.com/woocommerce/woocommerce/pull/22418#discussion_r247105693 2019-01-11 15:04:06 +02:00
Gerhard 77537d2cd3 Update copy for processing order emails to not mention payment as some stores take payment after orders are placed. 2019-01-11 14:29:21 +02:00
Bradley Davis e97204a483 Removed @author tag from docbloc in the template files 2018-12-06 12:13:39 -02:00
Gerhard Potgieter 7c7f0725ef Update new account email copy to be representative of auto generated accounts also. (#21999)
* Update customer new account email copy to be more friendly for auto generated usernames.

* Bump template versions
2018-11-21 15:27:33 -02:00
Marcel M. Cary a0cb6a9166 Fix error when rendering customer invoice email
When sending a customer their invoice on a non-pending order, I get this
error in the logs:

    PHP Fatal error: Uncaught Error: Using $this when not in object context in
    wp-content/plugins/woocommerce/templates/emails/plain/customer-invoice.php:37

    Stack trace:
    #0 wp-content/plugins/woocommerce/includes/wc-core-functions.php(208): include()
    #1 wp-content/plugins/woocommerce/includes/wc-core-functions.php(228): wc_get_template('emails/plain/cu...', Array, '', '')
    #2 wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-invoice.php(165): wc_get_template_html('emails/plain/cu...', Array)
    #3 wp-content/plugins/woocommerce/includes/emails/class-wc-email.php(502): WC_Email_Customer_Invoice->get_content_plain()
    #4 wp-content/plugins/woocommerce/includes/emails/class-wc-email-customer-invoice.php(130): WC_Email->get_content()
    #5 wp-content/plugins/woocommerce/includes/class-wc-emails.php(338): WC_Email_Customer_Invoice->trigger(288402, Object(WC_Order))
    #6 wp-content/plugins/woocommerce/templates/emails/plain/customer-invoice.php on line 37
    referer: wp-admin/post.php?post=nnnnnn&action=edit

Change the "$this->object" reference to "$order" instead.
2018-11-10 14:07:55 -08:00
dixitadusara 2613770f09 remove Over to you text from admin order confirmation email 2018-10-27 13:02:05 +05:30
nishitlangaliya cbcd647a34 Merge branch 'master' of https://github.com/woocommerce/woocommerce into HEAD
# Conflicts:
#	.github/CONTRIBUTING.md
#	includes/gateways/cod/class-wc-gateway-cod.php
#	includes/wc-formatting-functions.php
#	templates/single-product/product-image.php
2018-10-27 12:14:09 -08:00
Mike Jolley ce94a1f921 Plain 2017-07-11 16:08:06 +01:00
Mike Jolley aacb01d1e7 Merge branch 'pr/13503'
# Conflicts:
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
Mike Jolley e8974f709d docblock
Closes #13740
2017-03-23 14:25:56 +00:00
Claudio Sanches 59c2849736 Changed version 2.7 to 3.0 2017-03-15 13:36:53 -03:00
Mike Jolley 8ab839a030 Replace template usage of dates 2017-03-10 16:35:47 +00:00
Aristeides Stathopoulos 10ffc92a73 Inline control structures are not allowed 2017-03-07 22:24:24 +02:00
Shohei Tanaka 79686dbd8a Mistake numbering in sprintf
change %3$s to %2$s
2016-12-23 20:50:40 +09:00