Commit Graph

211 Commits

Author SHA1 Message Date
Fredrik Forsmo 9f1376185f Improve docblock comments in WC_Email_Customer_New_Account
* Added comments to properties that don’t have any.
* Added comments to `get_content_plain` and `get_content_html`
* Added missing param tags to `trigger`
2016-01-05 19:27:27 +01:00
Fredrik Forsmo 726fcbb932 Improve docblock comments in WC_Email_Customer_Invoice class
* Added comments to properties that don’t have any.
* Added comments to `get_subject`, `get_heading`, `get_content_html`
and `get_content_plain`
* Added missing param tag to `trigger`
2016-01-05 19:23:17 +01:00
Fredrik Forsmo 2ba75c59a1 Improve docblock comments in WC_Email_Cancelled_Order class
* Added comments `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:16:21 +01:00
Fredrik Forsmo db773414a8 Improve docblock comments in WC_Email_Customer_Completed_Order class
* Added comments to `get_subject`, `get_heading` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:14:06 +01:00
Mike Jolley 6cb11d5cc0 Use wc_get_template_html 2015-12-04 13:39:57 +00:00
Mike Jolley b5a2c2a9d5 Unify all order email tables to use a single template
Closes #9587

@claudiosmweb @jameskoster
2015-11-30 15:16:23 +00:00
Yoni Mazuz 9e5098627c Fix woocommerce_email_from_* filtering
- apply filters before sanitizing
- send entire $this as argument so hooked functions can access any properties of the WC_Email (subclass) instance
2015-11-20 13:00:37 -05:00
Yoni Mazuz afb19228a9 Add filters for From name/address to WC_Email (#9653)
- add woocommerce_email_from_name filter that accepts name, email ID,
and object
- add woocommerce_email_from_name filter that accepts name, email ID,
and object
- these allow return address info to be set conditionally, unlike
wp_mail_from and wp_mail_from_name, which don’t pass any context to
hooked functions
2015-11-19 14:37:50 -05:00
Mike Jolley 1b38f380af Merge remote-tracking branch 'origin/master'
Conflicts:
	includes/emails/class-wc-email.php
2015-11-03 16:09:01 +00:00
Mike Jolley 8457dbb57d Display if emails are manually sent 2015-11-03 15:40:10 +00:00
Mike Jolley d95f863d79 Show descriptions inline 2015-11-03 15:04:29 +00:00
Mike Jolley 52553968c5 Use desc_tip for emails 2015-11-03 14:59:48 +00:00
Mike Jolley 3c6a870335 Email class tidyup 2015-11-03 14:57:39 +00:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Mike Jolley 5f65494e27 Restructure emails admin to avoid listing emails along the top
Moves emails to a table on the settings screen.

Also tweaks some section text and moves descriptions to tooltips for a
less cluttered interface.
2015-11-02 16:27:00 +00:00
Mike Jolley 48b93b937f Added admin order/payment failed notification
Closes #8617
2015-11-02 14:45:24 +00:00
Mike Jolley 9ac43ec4d4 Cleanup 2015-11-02 13:02:23 +00:00
Kathy Darling f893d73af6 pass email object to email templates and template hooks 2015-10-31 23:04:59 -05:00
stuartobrien 237acd7e90 consistent code formatting 2015-08-15 01:28:48 +02:00
stuartobrien 3ce5374cd9 fixed - missing attribute $password_generated used in the object but not declared 2015-08-15 01:16:02 +02:00
stuartobrien 6a8742d4d6 change type to boolean 2015-08-15 01:03:18 +02:00
stuartobrien 5a616d86c3 fixed - missing attributes refund and partial_refund are used in the object but are not declared 2015-08-15 00:57:12 +02:00
Mike Jolley f8b539eb5e Improved refund email events and woocommerce_order_fully_refunded hook.
Closes #8793
2015-08-12 19:01:05 +01:00
Mike Jolley 817f8476ac Refund subjects when order contains downloadable product. 2015-08-12 17:50:57 +01:00
Claudio Sanches b091f12393 Fixed some js conding standards 2015-08-05 15:57:15 -03:00
Claudio Sanches 9e41552342 Removed all "@return void" 2015-07-16 16:55:48 -03:00
Mike Jolley 7d1a016502 Adjust sales report to deal with partial shipping refunds and full refunds 2015-07-01 12:11:21 +01:00
Mike Jolley d0a41989c9 Merge pull request #8451 from slash1andy/patch-1
Changed "pending" to "processing"
2015-06-28 16:48:03 +02:00
Vignesh 1241dcee69 Removed Commented Code 2015-06-25 21:24:05 +05:30
Andrew Wikel 6b5cf56b66 Changed "pending" to "processing"
reflects more accurate order statuses.
2015-06-24 15:57:28 -05:00
Mike Jolley 8dbd30e76b Merge branch 'add-email-notification-for-partial-refunds-issue-8278' 2015-06-22 15:01:17 +01:00
davidlenehan d7538559a8 Pulling customs refund email fields from wp_options
Pulling customs refund email fields from wp_options correctly now and
overriding the basic lookup for subject and heading.
2015-06-22 14:18:44 +01:00
davidlenehan a171407bcb Adding form fields for partial refund emails
This is not a working solution yet, looking for feedback on ho west to
implement this
2015-06-22 13:36:47 +01:00
davidlenehan 47c18b1947 Fixing issue where email settings were blank
Fixing issue where email strings were blank for refunded orders in
wp-admin > WooCommerce > Settings > emails
2015-06-22 11:14:19 +01:00
Mike Jolley e967c1e01c Tweak filters - move to format_string 2015-06-22 10:14:21 +01:00
Nicola Mustone c7e1540dea added filters for emails placeholders 2015-06-19 17:01:37 +02:00
davidlenehan 4c2982affe Removing an unused file
Deleting a file no longer needed for this.
2015-06-18 12:00:14 +01:00
davidlenehan 718d550252 Merging refund email template files
Changing previous commit to merge templates for partial and full
refunds to cut down on files.
2015-06-18 11:34:21 +01:00
davidlenehan 8b02b02145 Add email notification for partial refunds
fixes #8278

Emails are now sent to the customer when a partial refund is issued. I
referenced #7785 when doing this.

When a full refund happens the email the customer receives is clear
enough that they are getting a full refund. However I thought it would
be useful to add a new line in these new partial refund emails that
states exactly the value of the partial refund as it may not be that
clear.
2015-06-17 15:35:54 +01:00
Claudio Sanches 51c8bbf87c wrong nonce verification 2015-06-01 13:33:51 +01:00
Ben Bidner 27f1c15900 email templates can only be moved / deleted / edited if the user has `edit_themes` capabilities 2015-06-01 13:26:02 +01:00
Claudio Sanches 65608d3fd0 Added nonces and check capability to copy or delete email templates, closes #5 2015-06-01 13:12:25 +01:00
Mike Jolley bd7624e5b7 Check template code isset 2015-05-29 17:40:53 +01:00
Claudio Sanches a76aa5218b Improved the new order and cancelled order emails descriptions, closes #8195 2015-05-27 16:57:57 -03:00
Claudio Sanches 5c2b14d89f Standardise case of some strings closes #8125 2015-05-27 12:53:04 -03:00
Mike Jolley 7254e45edc Remove notice fade class Closes #8096 2015-05-05 13:28:08 +01:00
investonline_joost eed9332adf Bugfix: The old regex rule selects more then the unknown/unhandled entities. Plain-text email are missing content because the text is stripped out. 2015-04-23 15:55:29 +02:00
Mike Jolley c6dae2b286 Merge pull request #7834 from SiR-DanieL/scrutinizer-issues
Small tweaks and style fixes
2015-03-30 10:33:27 +01:00
Nicola Mustone dedd92d4e6 wrong comments 2015-03-27 17:11:25 +01:00
Nicola Mustone 1275346360 typo 2015-03-27 17:10:00 +01:00
Nicola Mustone 4867d635c0 fix save_template code 2015-03-27 16:59:25 +01:00
Nicola Mustone 0466fcb4e2 split process_admin_options for WC_Email 2015-03-27 16:51:30 +01:00
Nicola Mustone d2af01df5b scrutinizer suggested tweaks 2015-03-27 16:15:40 +01:00
Nicola Mustone 00d8b11a3f version 2.4.0 2015-03-20 17:55:50 +01:00
Nicola Mustone f82f3572c4 again coding standards 2015-03-20 16:37:57 +01:00
Nicola Mustone 38afee0d12 conding standards 2015-03-20 16:37:16 +01:00
Nicola Mustone c593e4ca50 added customer order refunded email 2015-03-20 16:31:31 +01:00
Max Rice 7a4360eaf5 Catch Emogrifier Exceptions
Emogrifier throws various exceptions for invalid input, etc. that
currently are not caught anywhere, causing fatal errors or unexpected
behaviors in other plugins. This commit fixes that by catching all
exceptions and logging them.
2015-03-08 19:45:05 -04:00
Claudio Sanches 1a45a447b0 Fixed the true-null-false case 2015-02-18 15:34:03 -02:00
Claudio Sanches 28bf06b702 Improved the woocommerce_email_get_option filter, closes #7464 2015-02-18 00:28:26 -02:00
Mike Jolley 35a3de03d5 Move WC_Email docblock and add class exists check
Closes #7399
2015-02-13 16:54:15 +00:00
Claudio Sanches 94e1a4bf6a Just check for DOMDocument 2015-02-13 12:54:10 -02:00
Claudio Sanches e778d26764 Created a method to test if have an inline css parser 2015-02-13 12:22:53 -02:00
Claudio Sanches 5d80f3e5cd Use plain text emails when dont have support for DOMDocument class 2015-02-13 12:16:58 -02:00
Claudio Sanches 6ca681ce86 Added new filters to help translation plugins, closes #7338 2015-02-10 10:51:44 -02:00
Michael Tieso 933fe5ff57 Customer New Account message clarification
Suggestion for clarification that this goes to the customer, not admin.
2015-02-02 15:41:12 -08:00
Claudio Sanches afb19715d4 Prevented XSS in urls 2015-01-29 12:33:06 -02:00
Mike Jolley c2c1e733ba Typo #7216 2015-01-28 21:03:09 +00:00
Mike Jolley f3cc45cfa9 Grammar corrections
Closes #7216
2015-01-28 17:15:48 +00:00
MindyPostoff 72118fb28e Update class-wc-email-customer-completed-order.php 2015-01-13 13:44:35 -05:00
Claudio Sanches 9a6dc0bf41 Added select2 for all settings fields 2015-01-12 15:45:47 -02:00
Claudio Sanches 37ea5ee65a Fixed email styles for multipart emails, closes #7033 2015-01-02 10:55:47 -02:00
Bryce 96ba418d5c remove var keyword in WC_Email_Customer_Reset_Password 2014-12-16 18:40:51 +07:00
Bryce 6af72ecb3d remove var keyword in some email classes 2014-12-16 18:40:21 +07:00
Bryce f428da3a01 remove var keyword in WC_Email_Customer_Invoice 2014-12-16 18:39:23 +07:00
Claudio Sanches 951c70de7e Allows custom directory for email templates
cc @SiR-DanieL
2014-12-03 01:30:28 -02:00
Nicola Mustone 6b03da033d Introduced woocommerce_delete_from_theme_folder filter 2014-12-03 00:52:08 +01:00
Nicola Mustone fcc072abcc Added trim to avoid errors 2014-12-03 00:40:44 +01:00
Nicola Mustone d1ce8c00ac Introduced filter woocommerce_copy_to_theme_folder 2014-12-03 00:36:26 +01:00
Mike Jolley 48ffa859cf Merge pull request #6837 from ragulka/email-settings-action-hooks
Introduce email settings action hooks
2014-11-27 11:01:31 +00:00
Mike Jolley 0d4d6fdcaf WC class cleanup 2014-11-26 00:03:00 +00:00
Illimar Tambek 2752e0c61d Correct hook name: `woocommerce_email_settings_before` 2014-11-26 00:28:23 +02:00
khag7 bf15b5e351 Corrected the docblock description for the order cancellation email class
This email is sent when an order is cancelled, not when a new order is paid for.
2014-11-25 11:23:00 -05:00
khag7 067d62541e Corrected the docblock description
This is an email sent to the customer, not the admin.
2014-11-25 11:15:53 -05:00
Illimar Tambek 88c4c2394f Introduce email settings action hooks 2014-11-25 16:59:29 +02:00
Nicola Mustone 011bb0a784 Added cancelled order admin email 2014-10-29 15:05:43 +01:00
Mike Jolley e917f10b91 Fix 2.3 plain text emails 2014-10-21 16:18:59 +01:00
Mike Jolley cb631793c5 Merge pull request #6489 from BFTrick/css-inliner-2
Adding CSS Inliner
2014-10-09 15:55:57 +01:00
Patrick Rauland 4b30a2aed5 implementing emogrifier email css inliner 2014-10-08 15:34:31 -06:00
Beka Rice de0e01f05b Fixes typos 2014-10-08 12:21:23 -04:00
Patrick Rauland 71c60d6b64 removing all isntances of abstract from the WC_Email class 2014-09-23 10:20:28 -06:00
Patrick Rauland 1498198215 renaming and moving abstract-wc-email file 2014-09-23 10:12:43 -06:00
shivapoudel 5e09f15c91 Absolute path and Indentation fix for includes/emails/*.php :) 2014-09-21 01:15:40 +05:45
Mike Jolley 08cf7c7406 Check order exists before sending
Closes #6310
2014-09-19 12:23:29 +01:00
Barry Kooij 6655188f0b Changed use of get_order with wc_get_order 2014-08-15 14:29:21 +02:00
Coen Jacobs 89ea6c46ab Replace new WC_Order calls with get_order 2014-06-13 15:24:51 +02:00
Mike Jolley 309f700283 has_status 2014-06-03 10:45:33 +01:00
Mike Jolley fca32a98de Implement is_status functions and update_status 2014-05-30 17:16:22 +01:00
Mike Jolley b2ddcf29cf Set keys for find/replace to prevent duplicate keys
Fixes #5168
2014-05-30 10:42:47 +01:00
Mike Jolley e15c572465 Better handling for sent to admin/plain text args Closes #4359 2014-01-08 15:04:49 +00:00
Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor'
Conflicts:
	includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
	includes/shortcodes/class-wc-shortcode-cart.php
	includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
Mike Jolley 51ba9c393f WC globals 2013-11-25 14:01:38 +00:00
Coen Jacobs c1a439eb99 Formatting functions woocommerce to wc refactor 2013-11-25 14:34:21 +01:00
Coen Jacobs aaa14894ca Core functions woocommerce to wc refactor 2013-11-25 13:45:04 +01:00
Mike Jolley 7fb60ccc99 blogname is the actual option, but WP terminolgy in settings is "Site Title".
Closes #3952
2013-10-23 15:57:14 +01:00
Mike Jolley 634adc9249 Fix subject + heading Closes #3841
@coenjacobs .15 please
2013-09-26 15:45:23 +01:00
Patrick Rauland 885a95b21d *sigh* forgot a period in the new order description 2013-09-18 14:23:14 -05:00
Patrick Rauland af8919f1de tweaking new order email description 2013-09-18 14:18:40 -05:00
Mike Jolley 223f862750 Tweak email inclusion 2013-08-02 11:18:05 +01:00
Mike Jolley 22bd515fbd Customer invoice does not need toggle. Closes #3459. 2013-07-30 11:24:25 +01:00
Mike Jolley c75ea04c1c classes -> includes 2013-06-11 14:25:30 +01:00