Commit Graph

377 Commits

Author SHA1 Message Date
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
Gerhard Potgieter 12fbfa5677
Merge pull request #22927 from woocommerce/update/22895
Allow "Thanks" wording in emails to be reworded by admin
2019-07-04 12:43:00 +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 2802a1def1
Merge pull request #23360 from klauspaiva/fix-for-margin-on-email-header-image
Alignment of the image used in the email header
2019-05-22 21:05:14 -03:00
Claudio Sanches 576182e44d Bump version of templates 2019-05-21 18:00:52 -03:00
Claudio Sanches de2a45510b Merge branch 'master' into fix/23003 2019-05-21 17:59:52 -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
Klaus Paiva 158d7b1885 Image used in the email header has no margin as to align perfectly with the main table 2019-04-18 16:56:45 +10:00
Mike Jolley 0a44c124be Change completed email wording to "We have finished processing your order" 2019-03-25 10:53:57 +00:00
Mike Jolley 6329f61d08 Show refunded items in customer facing screens 2019-03-15 12:54:40 +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 f41070f91e Add content to html emails 2019-03-04 17:04:58 +00:00
Mike Jolley 0c21ebd037 Move footer out of content table so it appears below email content 2019-03-04 14:54:09 +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
Mike Jolley 6534653f53
Merge pull request #22309 from cynepkot/master
Update to email-styles.php to fix the iOS email app layout issue
2019-01-21 16:10:56 +00:00
Mike Jolley 34a4457a0d phpcs 2019-01-17 13:33:57 +00:00
Mike Jolley d86ce7a0d8 Fixed padding of addresses in email template 2019-01-15 15:59:25 +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
Mike Jolley fe02144d0a
Merge pull request #21927 from woocommerce/add/21925
Make links in order notes clickable.
2019-01-09 16:52:37 +00:00
Rodrigo Primo d71cb562aa Properly align order item meta in RTL emails
Since commit
4082222f7a (diff-30dd34631dd7461f75c05ded270e9ee4R60), order item meta is not aligned properly in order e-mails when using a RTL language. This commit fixes this problem by using the is_rtl() function to determine the float side for the element that contains the order item meta information.
2019-01-08 14:17:55 -02:00
Rodrigo Primo a48639b7bc Fix PHPCS violations automatilly with PHPCBF 2019-01-08 13:57:25 -02:00
Mike Jolley 038a1a103a
Merge pull request #21496 from kukac7/feature/img-optim
images, svgs optim
2019-01-08 11:25:10 +00:00
Mike Jolley 2724fd76cd
Merge pull request #22017 from Bradley-D/feature/wpcs-inline-php
WPCS: inline PHP semicolon and spacing
2019-01-07 12:47:08 +00:00
cynepkot 87c2e9066f
Update to email-styles.php to fix the iOS email app layout issue
Adding a style property to fix the iOS email app layout issue, described in #22308.
2018-12-28 17:37:03 +03:00
Bradley Davis e97204a483 Removed @author tag from docbloc in the template files 2018-12-06 12:13:39 -02:00
grigorijurasov adbce426c5
Line 27 - replacing a typo in the comment
Line 27 - there's currently a typo, `numer`, changing that to `number`
2018-12-06 12:38:42 +02:00
Bradley Davis 7481af8614 [ UPDATE ] inline PHP semicolon and spacing 2018-11-22 20:37:14 +10: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
Gerhard 097861605e Update translators comment to reflect true variable 2018-11-19 11:38:30 +02:00
Gerhard 6b9f283d6d Make the note clickable in the email as well. 2018-11-15 14:30:58 +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