Commit Graph

12453 Commits

Author SHA1 Message Date
James Koster e09f5e35db header padding. #7841 2015-06-18 12:39:12 +01: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
Mike Jolley af83181a25 Set to default locale if QS does not match customer data in store 2015-06-17 16:56:26 +01:00
Mike Jolley 389ccd5761 Remove base location from script and don't rely on session storage 2015-06-17 16:56:06 +01:00
Claudio Sanches 05ca8898fe Merge pull request #8399 from shivapoudel/tweak-meta
Tweaks Meta boxes Scripts
2015-06-17 11:38:03 -03: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
James Koster 2951a40b89 select2 highlight. closes #8352 2015-06-17 15:33:34 +01:00
Shiva Poudel 2a2867cf51 Tweaks Meta boxes Scripts 2015-06-17 20:15:06 +05:45
Mike Jolley b8f644fe9e Remove line breaks 2015-06-17 15:19:04 +01:00
Justin Shreve 55317e69e3 Move the wp_posts ID check out of the string matching so we can find by ID _OR_ find based on sku match 2015-06-17 13:59:39 +00:00
James Koster b7888f2355 Merge pull request #8396 from corsonr/notice_info_tweak
[CSS] word-wrap for woocommerce notices
2015-06-17 14:52:20 +01:00
Mike Jolley 4a9c2aece9 Update option wording 2015-06-17 14:27:42 +01:00
Mike Jolley 38dd251f96 geolocation 2015-06-17 14:16:37 +01:00
Mike Jolley b1441c05c1 Move geolocation to separate script 2015-06-17 14:16:35 +01:00
Mike Jolley 9886a805df Fix up standards #7939 2015-06-17 13:59:04 +01:00
Mike Jolley d939d7b395 Merge pull request #8391 from justinshreve/sale-date-8357
Make sure sale prices are properly applied when no from date is set and today is used as default (#8357)
2015-06-17 13:49:53 +01:00
Mike Jolley 5ac994f4f2 Nonces 2015-06-17 13:35:09 +01:00
Justin Shreve 8ae228f535 Do a less than or equals to check in meta-box-product-data in the case of $date_from being exactly the current time. 2015-06-17 12:18:57 +00:00
Mike Jolley 33c298fea7 Experiment with appending geolocation to query string to prevent caching 2015-06-17 12:12:49 +01:00
Remi Corson c37c2f7c45 word-wrap for woocommerce notices 2015-06-17 12:21:34 +02:00
Mike Jolley 9843608cd4 Move country field with other address fields
Closes #8263
2015-06-17 10:17:41 +01:00
Mike Jolley ef2b32a0be Merge pull request #8394 from aaemnnosttv/pr/settings-for-email-classes
Fix settings for email classes
2015-06-17 09:54:44 +01:00
Evan Mattson 2181cd1d26 rename $email_id to $email_key
`$email_id` here is not the same as `$email->id`, renaming to show this, and for consistency with similar code
2015-06-16 21:37:54 -04:00
Evan Mattson c9c48b718e identify current section by email key to be consistent 2015-06-16 21:36:36 -04:00
Justin Shreve e1130005a5 When figuring out if to store a sale price, make sure $date_from is set to "today" when blank. The date meta was previously set, but the check to set the actual sale price saw $date_from as empty. 2015-06-16 20:00:16 +00:00
Mike Jolley 4965d0204e Merge pull request #8390 from tamarazuk/master
[2.3] Fix bug introduced in #8365
2015-06-16 19:50:54 +01:00
Tamara Zuk bd7f07d29f [2.3] Fix bug introduced in #8365
my mistake 🙀
2015-06-16 14:46:54 -04:00
Mike Jolley a31a1911cd Merge pull request #8388 from justinshreve/download-url-help-text
Update the help text to mention that we expect already encoded URLs
2015-06-16 18:09:12 +01:00
Claudio Sanches 1876227c9a Removed dead variable and fixed coding standards on wc_create_page() 2015-06-16 13:08:30 -03:00
Justin Shreve 5d8b17bd6f Update the help text to mention that we expect already encoded URLs. 2015-06-16 15:48:05 +00:00
Mike Jolley bf9265309e Merge pull request #8386 from jobthomas/onboarding
Edited copy text: consistency with second tab.
2015-06-16 15:45:59 +01:00
Mike Jolley e626545f67 Shipping costs for new settings 2015-06-16 15:43:39 +01:00
Mike Jolley b4574ba911 Remove code to view test product 2015-06-16 15:14:14 +01:00
Mike Jolley f8151f416c Merge branch 'text-attribute-handling' 2015-06-16 15:11:58 +01:00
Mike Jolley 622b11ae9f Add version check to prevent pre-2.4 logic kicking in when not needed
@claudiosmweb
2015-06-16 15:10:53 +01:00
Claudio Sanches dde7bc699b Merge pull request #8385 from jobthomas/master
Copy edit shipping settings
2015-06-16 10:54:19 -03:00
Job fd5fec705b Copy edit shipping settings
users > customer's
2015-06-16 15:51:36 +02:00
Mike Jolley 1f79a116e9 Fix create_simple_flat_rate helper 2015-06-16 14:48:06 +01:00
Mike Jolley 09fb3a604b [2.3] Small tweak to use email ID rather than classname directly
#8365
2015-06-16 14:47:03 +01:00
Mike Jolley 2501af0376 Merge pull request #8365 from tamarazuk/master
[2.3] Email settings save tweak
2015-06-16 14:43:07 +01:00
Mike Jolley f414ab99b4 Merge pull request #8375 from justinshreve/negative-refund-amount-8346
Prevent negative refund amounts (#8346)
2015-06-16 14:25:17 +01:00
Claudio Sanches 680605481f Merge pull request #8383 from woothemes/pages-cant-be-created-on-install-issue-8269
Allow trashed pages to be republished, closes #8269
2015-06-16 10:15:52 -03:00
Mike Jolley 93fbfe0bc3 Merge branch 'flat-rate-shipping-refactor' 2015-06-16 14:09:38 +01:00
Mike Jolley 583e1fc284 Typo closes #8381 2015-06-16 14:08:46 +01:00
Mike Jolley 71fc6c207e Free should only be used if costs set. If left blank, offer no rate
Closes #8380
2015-06-16 14:07:28 +01:00
davidlenehan 2fb7e0b52b Allow trashed pages to be republished
Expanding on @mehulkaklotar’s fix above. One issue is that is a deleted
store page has had its short code removed then it won’t be republished
and that page is still missing.

This fix catches pages that are in the trash but have no short code.
Those pages are now left in the trash and new page with the correct
short code is added in its place.

Fixes #8269
2015-06-16 12:31:15 +01:00
Mike Jolley 2347418c5b International shipping + legacy updater 2015-06-16 11:37:58 +01:00
Claudio Sanches ce2314d554 Merge pull request #8377 from justinshreve/order-item-meta-filter-8353
Add new filters around order meta (#8353)
2015-06-16 00:19:15 -03:00
Justin Shreve e832f1d132 Add some filters around order meta to enable filtering the output of meta/attribute information. 2015-06-15 22:16:44 +00:00