1474350f0f
Correct docblock @return
...
From incorrect `string` to correct `array`
2017-10-10 10:31:16 -05:00
11d6b4e7d8
Ensure we have arrays in find/replace
...
Closes #16778
2017-09-14 17:37:23 -07:00
d0db4c6934
Reintroduce find and replace variables
2017-09-07 09:58:54 +02:00
10a873a808
Remove find/replace definition
2017-09-06 10:52:45 +01:00
cbe4e26c97
Legacy find/replace handling
...
Closes #16705
2017-09-05 10:15:32 +01:00
21bd0e5397
Better handling for legacy email find/replace filters
...
Closes #16659
2017-08-31 12:21:02 +01:00
05dc9d3c0f
Improve email directory writable checking
...
Closes #16539
2017-08-21 11:32:21 +01:00
62d078edf5
Add filters to make possible send emails in language different from default
2017-08-03 14:58:44 +03:00
cb3e1de0be
Fixed coding standards
2017-07-20 18:14:53 -03:00
af4c8b4d34
Merge pull request #16186 from woocommerce/fix/16157
...
Fix copy pasta errors in refunded email template
2017-07-19 10:52:23 -03:00
16870c9c25
Fix copy pasta errors in refunded email template
...
Closes #16157
2017-07-19 14:30:47 +01:00
28cb0909c8
Add placeholders array used in descriptions and for find and replace
...
Fixes #16156
2017-07-19 14:25:00 +01:00
3522857d23
Fix typo in WooCommerce plugin ( #16135 )
...
* Fixed typo
* Fixed more typo
* Fixed more typo
* Fix tyop
* Fix more typo
* Fix more typo
* Fix typo
* Fix typo
* Fix typo
* Fix typo datatime object
* Fix short name of compat
* Fix typo: update short name
* Fix typo "deactive" to "deactivate" and short BW - Compat
* Fix typo "Backwards compat"
* Fix typo 'parameters'
* Fix more typo 'pararmeters'
* Fix typo 'compund'
* FIx typo order
* Fix typo
* Fix typo 'incorrecly'
* Fix typo 'genarate'
* Fix typo 'reletive'
* Fix typo 'Handly'
* Fix typo 'rotatated'
* Fix typo
* Fix typo 'additonal'
* Fix typos
2017-07-17 11:10:52 +01:00
7a4b68f551
It's clear that is a subject for an email
2017-06-14 14:01:12 -03:00
c3ee9a77f5
Tweak tips and placeholders for all emails
2017-06-14 17:50:17 +01:00
e3b7e4e566
Use placeholders and description to inform the default values
2017-06-14 13:13:43 -03:00
62c65e778b
Restored emails settings default values
...
Closes #15574
2017-06-13 20:00:50 -03:00
67a0637417
Advanced locale switching
2017-06-05 14:18:39 +01:00
260cfce497
Format strings
2017-06-02 18:44:43 +01:00
adc679633b
Handle default subjects and headings at time of sending, not in constructor
2017-06-02 18:25:05 +01:00
23315a6930
Add failed to processing for the processing email
...
Fixes 15365
2017-05-31 10:12:24 +01:00
067489b155
Cancelled email should be send for processing orders, not pending.
...
Fixes #15163
2017-05-19 10:45:26 +01:00
73b7b2d91b
Typo
2017-05-16 06:31:52 -07:00
46b9190c9f
Remove extra restore_locale
2017-05-15 18:11:23 -07:00
19047ffb00
Better way of doing it
2017-05-15 18:09:24 -07:00
838b175f67
Use store language in customer emails
2017-05-15 14:34:37 -07:00
a4ad49a8e3
Only set reply-to if the email + name is set.
...
Closes #14151
2017-05-08 12:50:39 +01:00
05e6c506ce
Email dates
2017-03-10 16:29:15 +00:00
486a81bf12
Fixed coding standards
2017-02-17 16:10:15 -02:00
bbf8e750ce
Tidy up includes
2017-02-16 11:46:01 +00:00
b58e26b0ab
Backwards compatibility for triggers
...
Closes #13141
2017-02-10 13:09:37 +00:00
ab8fb48bb4
Fix and standardize e-mail sending
2017-02-09 14:49:39 -08:00
ed51c8ac13
Pass order object to emails
2017-02-01 17:54:47 +01:00
9c27661dea
Synchronized with master
2017-01-12 17:53:15 -02:00
76f8c3dddd
Escaping for scruitinizer
2017-01-06 12:45:28 +00:00
e4d5886427
Replace log `tag` with log `source`
2016-12-29 11:58:43 +01:00
691c35e97b
Update logger calls
2016-12-29 11:58:42 +01:00
3a54b24fa1
Added email ID to locate core template for email
...
This PR adds email id to `woocommerce_locate_core_template` filter. It would be useful for custom emails created by plugins, which have got default email templates.
2016-12-28 20:38:51 +01:00
208fa011b9
Fixed deprecated warnings
2016-11-08 19:00:57 -02:00
2de494e105
Merge pull request #12219 from ramiy/i18n-translation-comments
...
i18n: add translators comments
2016-11-03 13:24:35 -02:00
32e814eef1
Use all paid statuses in $customer->get_total_spent()
2016-11-03 11:27:03 +00:00
55f08d62ae
add translators comments
2016-10-29 23:03:28 +03:00
93d55dade9
add translators comments
2016-10-29 20:32:38 +03:00
0c1e531091
few more i18n updates ( #12185 )
...
* i18n: simpler translation strings
* i18n: simpler translation strings
* i18n: readble printf(), and moving the %s placeholder to `%s product`
* i18n: make string translatable and remove the HTML tags
* i18n: avoide using HTML tags in translatino strings
2016-10-26 11:31:32 -02:00
140d0efb99
i18n: Avoid using HTML tags in translation strings ( #12166 )
...
* i18n: Remove some HTML tags from translation strings
* i18n: simpler translation string
* i18n: translations strings with surrounding `<strong>` HTML tags should be moved outside the translation string
* i18n: Avoide using `<code>' HTML tags in translation strings
* i18n: Split the notice to avoide using HTML tags in translation strings
2016-10-24 21:56:37 -02:00
ec65084451
[2.6] Send processing email on on-hold to processing transition.
...
Closes #12117
2016-10-19 12:55:22 +01:00
657c312cae
Fix strings case ( #12069 )
...
* Fixed case for all _e, esc_attr_e and esc_html_e strings
* Fixed case for all _n_noop strings
* Fixed case for all _x strings
* Fixed case for all __, esc_html__ and esc_attr__ strings
* Fixed a few more strings
* Fixed strings in unit tests
* Fix PayPal Standard case.
* Save Order text
2016-10-12 11:16:30 +01:00
83e938af1e
i18n: Merge similar translation strings to reduce the total strings count #11905
2016-10-11 04:39:13 +03:00
9668247b95
WordPress.PHP.YodaConditions.NotYoda
2016-09-09 03:14:28 +03:00
2346c3b735
Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace
2016-09-02 06:15:49 +03:00
d4e3faf014
PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket
2016-09-02 04:51:31 +03:00
0516e96843
PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket
2016-09-02 04:33:57 +03:00
fde1037757
fix failing tests.
2016-09-01 23:50:14 +03:00
69e6b05205
typo fix
2016-08-27 17:10:12 +03:00
7c589cf7e1
WordPress.WhiteSpace.ControlStructureSpacing.ExtraSpaceAfterCloseParenthesis
2016-08-27 07:53:52 +03:00
ec8a0b288b
PHPCS: WordPress.Arrays.ArrayDeclaration.NoCommaAfterLast
2016-08-27 05:08:49 +03:00
b063bcfe4c
last item in a multiline-array should end in a comma
2016-08-27 04:46:45 +03:00
41d079f086
Fixes add reply-to to admin emails ref #11630
2016-08-23 13:09:27 +05:30
c7fc7cce07
Merge branch 'master' of https://github.com/nishitlangaliya/woocommerce
2016-08-23 12:41:22 +05:30
94ed2fd96d
Fixes: Add reply-to to admin emails ref #11630
2016-08-22 11:42:21 +05:30
63c3a979f4
Fixes Add reply-to to admin emails
2016-08-15 16:31:12 +05:30
39eb584321
Merge branch 'master' into orders-crud-function-update
2016-08-08 17:24:40 +01:00
7bdda1f707
more dates
2016-08-08 16:34:01 +01:00
cfe28c9b25
Made WC_Logger pluggable via wc_get_logger function.
...
Closes #11474
2016-08-08 13:59:23 +01:00
f4727c0cae
billing_email
2016-08-05 16:11:23 +01:00
7d9d091767
Fixed mixed tabs and spaces
2016-07-11 16:56:35 +02:00
7814acb96e
Typo in WC_Email_Customer_New_Account
2016-07-05 18:48:40 -04:00
8d23577683
Fixed the load of the WC_Email_Customer_On_Hold_Order class, closes #11348
2016-07-04 17:37:16 -03:00
f47e9f4af5
woocommerce_order_status_failed_to_on-hold_notification for on hold email
2016-06-09 12:20:57 +01:00
f8db1c403f
Type casting and docs
2016-06-07 11:22:36 +01:00
730019ef18
scrutinizer best practice
2016-06-06 19:39:23 +01:00
3fd15ad50f
Unused vars and code docs
2016-06-06 18:57:24 +01:00
7cef8ae4c9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-06-06 16:50:18 +00:00
47fd4af2a3
Fixed WC_Email_Customer_On_Hold_Order version
2016-06-05 17:25:18 -03:00
81bc211c57
Add `public` keyword to public email methods
2016-04-26 18:26:58 +02:00
ba46a5275f
Backward compatibility with WC 2.5 and earlier
...
* Restored signature of WC_Settings_API::process_admin_options() method.
2016-04-20 08:48:29 +01:00
d3ac3f4073
Modals first pass
2016-03-24 17:26:40 +00:00
295a900b03
Is an action hook for phpmailer_init
2016-02-25 16:59:15 +05:45
c2d29e4884
Add a back button on the email notification management screens so you can easily get back to the main listing of emails.
2016-02-18 08:46:06 -08:00
608f651133
Fix hierarchy on settings screens.
2016-02-18 08:39:02 -08:00
9302f3ac6d
template_html & template_plain variables duplicate code in both if and else conditions when there is no change in template files for partial refund or full refund
2016-02-10 15:32:34 +05:30
971f6a3dee
Added email for on-hold orders.
...
Closes #9792
2016-02-08 13:20:19 +00:00
aa12bed150
Translate during format_string rather than all options
...
Fixes #10243
2016-02-05 12:44:43 +00:00
5bae221b33
Merge pull request #9973 from frozzare/docs/class-wc-email-new-order
...
Improve docblock comments in WC_Email_New_Order class
2016-01-06 12:25:44 +00:00
0b82d67d4c
Merge pull request #9974 from frozzare/docs/class-wc-email-failed-order
...
Improve docblock comments in WC_Email_Failed_Order class
2016-01-06 12:25:38 +00:00
dc67ec8b07
Merge pull request #9975 from frozzare/docs/class-wc-email-customer-reset-password
...
Improve docblock comments in WC_Email_Customer_Reset_Password class
2016-01-06 12:25:33 +00:00
a583b5aa27
Merge pull request #9976 from frozzare/docs/class-wc-email-customer-refunded-order
...
Improve docblock comments in WC_Email_Customer_Refunded_Order class
2016-01-06 12:25:23 +00:00
81cfc5030f
Merge pull request #9977 from frozzare/docs/class-wc-email-customer-processing-order
...
Improve docblock comments in WC_Email_Customer_Processing_Order class
2016-01-06 12:25:13 +00:00
867c807fc3
Merge pull request #9978 from frozzare/docs/class-wc-email-customer-invoice
...
Improve docblock comments in WC_Email_Customer_Invoice class
2016-01-06 12:25:07 +00:00
031700b649
Merge pull request #9979 from frozzare/docs/class-wc-email-cancelled-order
...
Improve docblock comments in WC_Email_Cancelled_Order class
2016-01-06 12:24:59 +00:00
0beb86c790
Merge pull request #9980 from frozzare/docs/class-wc-email-customer-completed-order
...
Improve docblock comments in WC_Email_Customer_Completed_Order class
2016-01-06 12:24:52 +00:00
42c2b1d7e9
Merge pull request #9981 from frozzare/docs/class-wc-email-customer-new-account
...
Improve docblock comments in WC_Email_Customer_New_Account
2016-01-06 12:24:41 +00:00
a23dd4ab0a
Merge pull request #9972 from frozzare/docs/class-wc-email
...
Improve docblock comments in WC_Email class
2016-01-06 12:24:27 +00:00
e06d8a2a2f
Improve docblock comments in WC_Email class
...
* Added comments to `handle_multipart`, `format_string`, `get_subject`,
`get_heading`, `get_headers`, `get_attachments`, `get_content_type`,
`get_blogname` and `get_content`
2016-01-05 19:42:18 +01:00
12c4e48256
Improve docblock comments in WC_Email_New_Order class
...
* Added comments to `get_content_plain` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:38:19 +01:00
6a73721611
Improve docblock comments in WC_Email_Failed_Order class
...
* Added comments to `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:37:34 +01:00
c60f327e5f
Improve docblock comments in WC_Email_Customer_Reset_Password class
...
* Added better comments to properties.
* Added comments to `get_content_plain` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:36:44 +01:00
5d22c324fa
Improve docblock comments in WC_Email_Customer_Refunded_Order class
...
* Added comments to `set_email_strings`, `trigger_full`,
`trigger_partial`, `get_subject`, `get_heading` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:33:49 +01:00
e4ec2171e2
Improve docblock comments in WC_Email_Customer_Processing_Order class
...
* Added comments to `get_content_plain` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:29:45 +01:00
19b049b28b
Improve docblock comments in WC_Email_Customer_Note class
...
* Added comments to properties that don’t have any.
* Added comments to `get_content_plain` and `get_content_html`
* Added missing param tag to `trigger`
2016-01-05 19:28:45 +01:00
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
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
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
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
6cb11d5cc0
Use wc_get_template_html
2015-12-04 13:39:57 +00:00
b5a2c2a9d5
Unify all order email tables to use a single template
...
Closes #9587
@claudiosmweb @jameskoster
2015-11-30 15:16:23 +00:00
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
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
1b38f380af
Merge remote-tracking branch 'origin/master'
...
Conflicts:
includes/emails/class-wc-email.php
2015-11-03 16:09:01 +00:00
8457dbb57d
Display if emails are manually sent
2015-11-03 15:40:10 +00:00
d95f863d79
Show descriptions inline
2015-11-03 15:04:29 +00:00
52553968c5
Use desc_tip for emails
2015-11-03 14:59:48 +00:00
3c6a870335
Email class tidyup
2015-11-03 14:57:39 +00:00
ee30b5b308
Fixed php docs standards
2015-11-03 11:31:20 -02:00
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
48b93b937f
Added admin order/payment failed notification
...
Closes #8617
2015-11-02 14:45:24 +00:00
9ac43ec4d4
Cleanup
2015-11-02 13:02:23 +00:00
f893d73af6
pass email object to email templates and template hooks
2015-10-31 23:04:59 -05:00
237acd7e90
consistent code formatting
2015-08-15 01:28:48 +02:00
3ce5374cd9
fixed - missing attribute $password_generated used in the object but not declared
2015-08-15 01:16:02 +02:00
6a8742d4d6
change type to boolean
2015-08-15 01:03:18 +02:00
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
f8b539eb5e
Improved refund email events and woocommerce_order_fully_refunded hook.
...
Closes #8793
2015-08-12 19:01:05 +01:00
817f8476ac
Refund subjects when order contains downloadable product.
2015-08-12 17:50:57 +01:00
b091f12393
Fixed some js conding standards
2015-08-05 15:57:15 -03:00
9e41552342
Removed all "@return void"
2015-07-16 16:55:48 -03:00
7d1a016502
Adjust sales report to deal with partial shipping refunds and full refunds
2015-07-01 12:11:21 +01:00
d0a41989c9
Merge pull request #8451 from slash1andy/patch-1
...
Changed "pending" to "processing"
2015-06-28 16:48:03 +02:00
1241dcee69
Removed Commented Code
2015-06-25 21:24:05 +05:30
6b5cf56b66
Changed "pending" to "processing"
...
reflects more accurate order statuses.
2015-06-24 15:57:28 -05:00
8dbd30e76b
Merge branch 'add-email-notification-for-partial-refunds-issue-8278'
2015-06-22 15:01:17 +01:00
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
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
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
e967c1e01c
Tweak filters - move to format_string
2015-06-22 10:14:21 +01:00
c7e1540dea
added filters for emails placeholders
2015-06-19 17:01:37 +02:00
4c2982affe
Removing an unused file
...
Deleting a file no longer needed for this.
2015-06-18 12:00:14 +01:00
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
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
51c8bbf87c
wrong nonce verification
2015-06-01 13:33:51 +01:00
27f1c15900
email templates can only be moved / deleted / edited if the user has `edit_themes` capabilities
2015-06-01 13:26:02 +01:00
65608d3fd0
Added nonces and check capability to copy or delete email templates, closes #5
2015-06-01 13:12:25 +01:00
bd7624e5b7
Check template code isset
2015-05-29 17:40:53 +01:00
a76aa5218b
Improved the new order and cancelled order emails descriptions, closes #8195
2015-05-27 16:57:57 -03:00
5c2b14d89f
Standardise case of some strings closes #8125
2015-05-27 12:53:04 -03:00
7254e45edc
Remove notice fade class Closes #8096
2015-05-05 13:28:08 +01:00
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
c6dae2b286
Merge pull request #7834 from SiR-DanieL/scrutinizer-issues
...
Small tweaks and style fixes
2015-03-30 10:33:27 +01:00
dedd92d4e6
wrong comments
2015-03-27 17:11:25 +01:00
1275346360
typo
2015-03-27 17:10:00 +01:00
Clifford
Mike Jolley
Boro Sitnikovski
sergey.r
Claudio Sanches
Jaydeep Rami
claudiulodro
Claudiu Lodromanean
Claudio Sanches
Jon Surrell
Krzysztof Grabania
Rami Yushuvaev
Aristeides Stathopoulos
Multidots
Gregory Karpinsky
Scrutinizer Auto-Fixer
Fredrik Forsmo
Diego Zanella
Shiva Poudel
Justin Shreve
Mehul
Yoni Mazuz
Yoni Mazuz
Kathy Darling
stuartobrien
Vignesh
Andrew Wikel
davidlenehan
Nicola Mustone
Ben Bidner
investonline_joost
Nicola Mustone