Commit Graph

103 Commits

Author SHA1 Message Date
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