Commit Graph

21100 Commits

Author SHA1 Message Date
Mike Jolley a1a79e57b5 Merge branch 'master' into pr/14896
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-05-23 16:22:18 +01:00
Mike Jolley db012b3a12 Merge pull request #15011 from woocommerce/fix/14999
Add abspath checks
2017-05-23 15:57:35 +01:00
Mike Jolley d31a58b117 More abspath 2017-05-23 15:40:19 +01:00
Mike Jolley 2d479e0580 Update serializejson to 2.8.1
Closes #14630
2017-05-23 15:27:53 +01:00
Mike Jolley 103f674d18 Merge pull request #14689 from woocommerce/fix/14578
Add a data-caption for captions and keep title around.
2017-05-23 15:09:56 +01:00
Mike Jolley b140f61510 Merge branch 'master' into fix/14578
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-05-23 15:09:20 +01:00
Mike Jolley 7901653f94 Merge pull request #15003 from woocommerce/fix/15001
Use VAT for norway
2017-05-23 15:07:39 +01:00
Mike Jolley 90213efa46 Merge pull request #15227 from woocommerce/fix/15225
A single multi-word attribute is fine for variation titles
2017-05-23 15:06:55 +01:00
claudiulodro 52fc3ad4c6 Good progress on order unit tests 2017-05-23 06:55:28 -07:00
Mike Jolley 2383799409 A single multi-word attribute is fine for variation titles
Closes #15225
2017-05-23 10:52:44 +01:00
Mike Jolley f09f7eb84e Merge pull request #15150 from woocommerce/fix/15118
Add handles so drag and drop does not break edit on mobile
2017-05-23 10:20:08 +01:00
Mike Jolley 66f2ea25e9 Merge pull request #15223 from dixitadusara/issue-15213
Issue Missing $ip Variable #15213
2017-05-23 09:02:05 +01:00
dixitadusara ebe831ccec Issue Missing $ip Variable #15213 2017-05-23 11:50:30 +05:30
James Kemp 90c987af70 Utilise $product method to get thumbnail
Is there any reason this function isn't using the `get_image()` method? It seems if we're accessing the `$post->ID`, then we should have access to the `$product` object too?

The reason being, the `get_image()` method also checks for the parent featured image, so is more robust. It may also be worth considering a filter in the `get_image()` method.
2017-05-22 22:07:51 +01:00
Claudiu Lodromanean 4bbc50d52c Merge pull request #15182 from woocommerce/fix/14861
Group by term ID to prevent duplicates
2017-05-22 13:14:47 -07:00
Claudiu Lodromanean 58189cb4b5 Merge pull request #15208 from woocommerce/fix/15203
Missing variable in legacy API
2017-05-22 13:10:28 -07:00
Claudiu Lodromanean d530587cd3 Merge pull request #15170 from woocommerce/fix/15163
Cancelled email should be send for processing orders, not pending.
2017-05-22 12:00:25 -07:00
Claudiu Lodromanean 2a19598930 Merge pull request #15214 from woocommerce/fix/15191
Update jquery payment to v3
2017-05-22 11:13:22 -07:00
Claudiu Lodromanean 700460d925 Merge pull request #15211 from woocommerce/fix/15002
Zones API changes for zone 0
2017-05-22 11:12:59 -07:00
Mike Jolley 2a51aa2020 Update jquery payment to v3 2017-05-22 16:37:08 +01:00
Mike Jolley c0e7c2f517 Merge pull request #15173 from woocommerce/fix/15158
Always sync incorrect titles on variation read regardless of version
2017-05-22 16:20:55 +01:00
Mike Jolley b1bf3278a7 Prevent zone 0 having locations set in CRUD 2017-05-22 15:19:15 +01:00
Mike Jolley 8cba7db7cd Prevent zone 0 name being changed 2017-05-22 15:19:04 +01:00
Mike Jolley a826b363d8 Prevent zone 0 locations being changed 2017-05-22 15:18:55 +01:00
Mike Jolley d1b49888f2 Missing variable in legacy API
Fixes #15203
2017-05-22 13:25:33 +01:00
Mike Jolley fc8100877c Undo change 2017-05-22 12:19:54 +01:00
Mike Jolley a15fffb945 Merge pull request #15204 from ughimire/nepali-zones
Tweak - Nepali zone name update
2017-05-22 12:18:35 +01:00
Umesh Ghimire b026e9839c Tweak - Nepali zone name update 2017-05-22 14:14:07 +05:45
Mike Jolley eae2fb64c8 Group by term ID to prevent duplicates
Fixes #14861
2017-05-19 15:27:57 +01:00
Mike Jolley 2082d84e4d Always sync incorrect titles on variation read regardless of version
For #15158
2017-05-19 11:28:13 +01:00
Mike Jolley 47d7fedff8 Correct price query when on a post type archive
Fixes #15166
2017-05-19 11:19:30 +01:00
Mike Jolley 067489b155 Cancelled email should be send for processing orders, not pending.
Fixes #15163
2017-05-19 10:45:26 +01:00
Mike Jolley 9f4b29a677 Merge pull request #15153 from woocommerce/tweak/15104
Check if subtotal is blank, not empty
2017-05-18 16:50:26 +01:00
Claudiu Lodromanean 0132a29c18 Merge pull request #15152 from woocommerce/fix/15127
Handle shipping item taxes if set to avoid the legacy fallback
2017-05-18 08:28:02 -07:00
Claudiu Lodromanean b5b76a428f Merge pull request #15151 from woocommerce/fix/15145
Fix stock/backorder notice when stock management is disabled
2017-05-18 08:24:04 -07:00
Mike Jolley 64bcef0722 Merge pull request #15148 from woocommerce/fix/15115
Variations should inherit purchase_note from parent.
2017-05-18 16:08:03 +01:00
Mike Jolley 8dbf41994b Check if subtotal is blank, not empty
Closes #15104
2017-05-18 15:59:07 +01:00
Mike Jolley 56a3b31e68 Handle shipping item taxes if set to avoid the legacy fallback
Fixes #15127
2017-05-18 15:48:42 +01:00
Mike Jolley 89ece25a32 Fix stock/backorder notice when stock management is disabled
Fixes #15145
2017-05-18 15:28:38 +01:00
Mike Jolley c3c966b5fd Add handles so drag and drop does not break edit on mobile
Fixes #15118
2017-05-18 15:22:12 +01:00
Mike Jolley eb147197a2 Variations should inherit purchase_note from parent.
Fixes #15115
2017-05-18 14:47:00 +01:00
Mike Jolley cac5b33553 Merge pull request #14639 from atimmer/stories/webhook-public-build_payload
Change build_payload from private to public
2017-05-18 13:15:53 +01:00
Mike Jolley ebfe8fec65 Merge pull request #14953 from pixedelic/master
added filters on zoom / flexslider / photoswipe enabling
2017-05-18 13:14:14 +01:00
Timon Davis af308da6b9 Fix bug #15103 where site operator cannot assign a variation with value of '0' as the default choice on the customer facing form.
The WC_Product::set_default_attributes function uses an array_filter (using the default callback for filtration)
to remove null and false values from the defaults array for a given product.  The issue here is that, in the above use case,
the array_filter will evaluate '0' as 0 and therefore as false.  Ultimately, array_filter then prevents the value from being
recorded, moving forward.

I've added a new filter callback to includes/wc-attribute-functions which will disregard all FALSE PHP equivalents except for
'0' (as a a string).  Also, I've updated the filter_array call in WC_Product::set_default_attributes so that it uses this new callback,
instead of the PHP default. Finally, I've added a phpunit test to assert that, when storing default variations / attributes on a product,
the false/true PHP synonyms are evaluating and storing like one would normally expect, with the exception that (string) '0'
evaluates as true in this special case.

This solution could potentially be broadened to facililate similar rules elsewhere, but the need raised in the bug is specific and
this is a specific solution.
2017-05-18 02:43:14 -07:00
Mike Jolley 05eeab33b8 Merge pull request #15142 from woocommerce/fix/phpdoc-info-logging
Rename `informational` to `info` in the phpdoc
2017-05-18 10:41:28 +01:00
Boro Sitnikovski d302e18a9b Rename `informational` to `info` in the phpdoc 2017-05-18 10:32:25 +02:00
Claudio Sanches f5bda12e42 Merge pull request #15126 from woocommerce/fix/15111
Fix shop page when using shop base and UTF8 shop page slug
2017-05-17 14:22:57 -03:00
Mike Jolley e23acb3719 Fix shop page when using shop base and UTF8 shop page slug
To test, set shop page slug and name to `חנות` then set permalinks to
shop base.

Repeat that before and after patch.

Shop page 404 errors before patch.

Fixes #15111
2017-05-17 18:13:32 +01:00
Mike Jolley 956b1a6181 Adds storefront/theme step to the setup wizard
Also includes a background install to get Storefront installed and
activated on demand.

To test, use a default theme and go to wp-admin/index.php?page=wc-setup
The theme step will be after payments!
2017-05-17 17:42:18 +01:00
Beka Rice 8885d58799 Fix: Re-add date for wc_create_refund 2017-05-17 04:46:56 -04:00