Commit Graph

411 Commits

Author SHA1 Message Date
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
béla 850ff9ea25
email styles beautification 2018-10-04 11:21:56 +02:00
Claudio Sanches 819d03fe3f Updated "--" to "—"
Closes #21460
2018-09-28 12:52:38 -03:00
claudiulodro 4082222f7a Add inline float style for email label to match order details styling 2018-09-26 11:13:29 -07:00
Gerhard Potgieter 5f7b833844 Add missing # before order numbers and escape properly 2018-09-12 12:24:27 +02:00
Gerhard Potgieter d7cb15c8f8 Update email copy based on https://github.com/woocommerce/woocommerce/pull/21288#issuecomment-420251277 2018-09-12 11:30:53 +02:00
Gerhard Potgieter 3b57bf7051 Fix invoice escaping 2018-09-07 09:54:31 +02:00
Gerhard Potgieter c3d9ef1cab Fix missing paramater passing for reset password emails and fix sanitisation 2018-09-07 08:59:23 +02:00
Gerhard Potgieter 6305fe3059 Use user_login on new account emails, no order object present there. 2018-09-07 08:45:10 +02:00
Gerhard Potgieter b52eef4454 Fix usage of get_first_name to correct get_billing_first_name 2018-09-07 08:40:45 +02:00
Gerhard Potgieter 866aab0ead New accout email copy changes 2018-09-06 14:38:43 +02:00
Gerhard Potgieter cf03db7392 Update customer reset password email copy 2018-09-06 14:18:09 +02:00
Gerhard Potgieter 68b5fbe279 Customer note email copy changes 2018-09-06 13:58:56 +02:00
Gerhard Potgieter 9361aaa05b Update invoice emails copy 2018-09-06 13:48:40 +02:00
Gerhard Potgieter fac659c9c6 Update refunded emails copy 2018-09-06 13:24:28 +02:00
Gerhard Potgieter 84b935490d Update completed email copy 2018-09-06 13:11:58 +02:00
Gerhard Potgieter 52190bc5ce Update closing line to correct text 2018-09-06 13:01:20 +02:00
Gerhard Potgieter 5eaa6da98b Update processing emails copy 2018-09-06 13:00:21 +02:00
Gerhard Potgieter 697e3229f2 Update on-hold emails copy 2018-09-06 12:48:39 +02:00
Gerhard Potgieter b03e5cff45 Failed admin email changes 2018-09-06 12:30:33 +02:00
Gerhard Potgieter 2ce1262f69 Humanize admin cancelled order emails 2018-08-23 09:38:16 +02:00
Gerhard Potgieter 679399b4b2 Humanize admin new order email 2018-08-23 09:04:24 +02:00
Mike Jolley 6a1898455b Remove hardcoded border in email template 2018-05-16 00:14:29 +01:00
Mike Jolley 46ab27e4e8
Merge pull request #18820 from alexmacarthur/pii-removal
PII Issue Prevention - Remove user login from reset password link.
2018-03-03 17:19:55 +00:00
Mike Jolley aca0662839 KSES instead of escaping of download names
Fixes #19181
2018-03-01 10:37:39 +00:00
Claudio Sanches d9f1b7c7d4 Fixed converting letters with accents to uppercase in templates
Closes #19084
2018-02-22 12:32:08 -03:00
Alex MacArthur e01385d2b4 Remove user login from reset password link. 2018-02-22 06:58:18 -06:00
Mike Jolley 7dd880ca57 Email order details template version
This template had a change but was not bumped.
2018-02-09 16:52:02 +00:00
Mike Jolley 04fe7aaf4a Switch to variable 2018-01-30 12:12:44 +00:00
Stanislav Mazur c692c0a869 Make 'woocommerce_email_downloads_column_' hook format aware (#18598) 2018-01-25 18:04:17 +02:00
Jared Burke 8c62d76aee Fix: use string escape for order numbers 2018-01-24 09:45:35 -06:00
Claudio Sanches 7290d6e42e Fixed test string #18430 2018-01-12 11:59:17 -02:00
Mike Jolley b17ef15f7d phpcs 2018-01-11 12:28:08 +00:00
Mike Jolley f1e0d4929b Implement get_edit_order_url method. 2018-01-11 12:04:39 +00:00
ElectricFeet 21c5b36113
Remove non-standard outdated CSS
Removed `-moz-osx-font-smoothing: grayscale;` and `-webkit-font-smoothing: antialiased;`, as suggested in woocommerce/storefront#698
2018-01-03 17:58:02 +01:00
claudiulodro 7fcbceaae5 Refactor logic 2017-12-21 11:31:58 -08:00
claudiulodro d0bc5964ea Actually use correct template version 2017-12-21 11:25:22 -08:00
claudiulodro 59a174985b Use correct template version and phpcs 2017-12-21 11:20:30 -08:00
claudiulodro 2d88654a0a Always use contrasting color for links 2017-12-21 11:14:14 -08:00
claudiulodro 28db1c270a Use text color for links 2017-12-21 06:35:55 -08:00
Mike Jolley 87fd8b2feb Update pay link wording 2017-12-12 16:38:50 +00:00
Brandon Kraft e34551c6b7
Correct nesting of args 2017-11-17 15:40:54 -06:00
Brandon Kraft b77dadf5ba
Bump template version 2017-11-17 15:16:53 -06:00
Brandon Kraft 7e9068ac53
Correct errors per PHPCS 2017-11-17 12:10:58 -06:00
Brandon Kraft 5974901124
Change default text for checkout page link 2017-11-17 11:17:22 -06:00
Mike Jolley 9d7960a6ce Wrap table in div with margin
Closes #17362
2017-10-26 14:52:40 +01:00
Claudio Sanches 73e5d3c7de Merge pull request #17153 from woocommerce/fix/17140
Use base text color for links in emails
2017-10-16 22:48:58 -07:00
Mike Jolley c2c213fe05 Include date in customer emails again 2017-10-13 15:09:21 +01:00
claudiulodro 660d663149 Revert order detail header behavior 2017-10-12 10:58:04 -07:00
claudiulodro 8acba76696 Add email to email address template 2017-10-12 08:07:10 -07:00
Mike Jolley 819951815e Use base text color for links in emails 2017-10-12 12:27:15 +01:00
Manos Psychogyiopoulos d42fc93be7 Resolve undefined product notice in email-order-items.php 2017-09-11 13:45:00 +03:00
Boro Sitnikovski 99642215aa Fix email notice missing variable 2017-09-06 09:25:02 +02:00
Mike Jolley ce94a1f921 Plain 2017-07-11 16:08:06 +01:00
Mike Jolley 94b32e644a HTML emails 2017-07-11 14:52:30 +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
refael iliaguyev 3e0daa8215 Bump template versions for changes 2017-04-07 14:22:52 +03:00
Manos Psychogyiopoulos d4c58588fd Fix unnecessary margin in #13879 2017-04-03 15:03:32 +03:00
Manos Psychogyiopoulos bec1f9b113 Use `small` 2017-04-03 11:50:02 +03:00
Manos Psychogyiopoulos 196c317ab1 Fix order item meta e-mails style 2017-04-03 11:37:51 +03:00
Mike Jolley e8974f709d docblock
Closes #13740
2017-03-23 14:25:56 +00:00
Claudio Sanches f1dab3fdce Fixed coding standards 2017-03-21 12:38:35 -03:00
refael iliaguyev e13ba40254 use variable for aligning 2017-03-20 22:26:20 +02:00
refael iliaguyev af55947f87 Revert "Drop repeated conditions for rtl aligning, use variable instead"
This reverts commit a894e7b241.
2017-03-20 22:21:44 +02:00
refael iliaguyev a894e7b241 Drop repeated conditions for rtl aligning, use variable instead 2017-03-20 20:53:16 +02:00
refael iliaguyev 6aed418b6f replace hard coded aligning with rtl conditions 2017-03-19 22:23:18 +02:00
Mike Jolley 476041698f tabs 2017-03-17 11:27:23 +00:00