Commit Graph

20295 Commits

Author SHA1 Message Date
Claudio Sanches 11d6e175b9 Merge pull request #14029 from woocommerce/fix/trycatchselect2
Add try/catch block to select2 code to stop it breaking EVERYTHING on conflict/failure
2017-04-06 16:09:32 -03:00
Claudio Sanches 0529e4efab Merge pull request #14026 from woocommerce/fix/13978
Fix variable stock syncing
2017-04-06 16:06:26 -03:00
Claudio Sanches 21dd7cb987 Merge pull request #14055 from woocommerce/fix/14054
Get cross sells from parent
2017-04-06 16:05:57 -03:00
Mike Jolley 8f2287be12 Use get_children for comparison 2017-04-06 19:47:22 +01:00
Mike Jolley 5701b1f7e2 Get cross sells from parent
fixes #14054
2017-04-06 19:01:57 +01:00
Mike Jolley c1468cdc2e Merge branch 'master' into fix/trycatchselect2
# Conflicts:
#	assets/js/admin/wc-enhanced-select.js
#	assets/js/admin/wc-enhanced-select.min.js
2017-04-06 18:58:17 +01:00
Claudio Sanches abc48f1601 Correct class version and author 2017-04-06 14:47:56 -03:00
Claudio Sanches fa40e7b205 Merge pull request #14035 from woocommerce/fix/13963
Background Emailer instead of just CRON
2017-04-06 14:47:15 -03:00
Claudio Sanches 2ff763a976 Merge pull request #14042 from franticpsyx/order-again-meta-std-class-props
[3.0] Fix non-existing stdClass props in WC_Form_Handler::order_again
2017-04-06 14:42:14 -03:00
Claudio Sanches 5ca593f782 Merge pull request #14048 from woocommerce/fix/13949
Fix variation description formatting in frontend and REST API v2
2017-04-06 14:42:01 -03:00
Claudio Sanches b16d3a091c Merge pull request #14049 from woocommerce/fix/variation-description-sanitization
Removed extra variation description extra sanitization
2017-04-06 14:41:41 -03:00
Claudio Sanches 42ca7bda3d Merge pull request #13989 from woocommerce/fix/product-meta-save_post
Fix saving meta when using `save_post`.
2017-04-06 14:38:16 -03:00
Claudio Sanches cdab73af3c Merge pull request #14051 from woocommerce/fix/no-base-permalinks
Make sure there is a name, otherwise the taxonomy + base will conflict with other post types if empty
2017-04-06 14:29:45 -03:00
Claudio Sanches 5f9a215318 Merge pull request #14052 from woocommerce/fix/variation-tax-status
Pull tax status from parent since there is no UI to set at variation level
2017-04-06 14:29:28 -03:00
Claudio Sanches 5840e863aa Merge pull request #14053 from woocommerce/fix/default-external-button-text
Use placeholder value from backend if not set
2017-04-06 14:28:43 -03:00
Mike Jolley 0348a4751e Use placeholder value from backend if not set 2017-04-06 18:19:07 +01:00
Mike Jolley fd3e656912 Pull tax status from parent since there is no UI to set at variation level 2017-04-06 17:54:34 +01:00
Mike Jolley 56eb3c4da3 Make sure there is a name, otherwise the taxonomy + base will conflict with other post types if empty 2017-04-06 17:50:04 +01:00
Claudio Sanches 4032167f6c Removed extra variation description extra sanitization 2017-04-06 13:21:34 -03:00
Claudio Sanches fc9ba64e50 Properly format variation description in REST API v2 2017-04-06 13:02:51 -03:00
Claudio Sanches f3c2e6c5f6 Improved wc_format_content() formatting and added sanitization 2017-04-06 13:01:35 -03:00
Claudio Sanches 567a551d83 Fixed shortcode render for variations and backwards compatibility
Fixes #13949
2017-04-06 13:00:02 -03:00
Claudio Sanches b059851882 Merge pull request #14001 from woocommerce/fix/13980
Allow search customers by ID in admin customer ajax search
2017-04-06 12:01:39 -03:00
Claudio Sanches d326fd2224 Merge pull request #14041 from woocommerce/fix/missing-translation
Added context to string in result-count.php to make GlotPress catch
2017-04-06 12:01:27 -03:00
Claudio Sanches 3fff61ea4e Merge pull request #14043 from woocommerce/fix/missing-product-type-field
if product type field is not posted, we should maintain existing type, not change to simple
2017-04-06 11:58:55 -03:00
Mike Jolley 82cdf65c04 if product type field is not posted, we should maintain existing type, not change to simple 2017-04-06 15:56:55 +01:00
Manos Psychogyiopoulos e18d9741a4 Fix non-existing stdClass props 2017-04-06 17:42:51 +03:00
Claudio Sanches f3156fb5f4 Merge pull request #13981 from woocommerce/fix/13936
[REST API] Fixed attributes while trying to save variations
2017-04-06 11:38:23 -03:00
Claudio Sanches 83135c24c1 Merge pull request #13971 from woocommerce/fix/13966
Ensure gateways are loaded in emails
2017-04-06 11:38:09 -03:00
Claudio Sanches f2fa4f127d Added context to string in result-count.php to make GlotPress catch
Missing this string on GlotPress, since the first part is equal from the
previous translatable string.
2017-04-06 11:07:48 -03:00
Claudio Sanches 7b04551233 Merge pull request #14039 from dixitadusara/issue-14038
fixes issue-14038
2017-04-06 11:02:31 -03:00
Claudio Sanches 966fd0e411 Merge pull request #14037 from woocommerce/fix/legacy-sync
Only call sync if callable
2017-04-06 10:54:58 -03:00
Claudio Sanches 3ce04d2bee Merge pull request #14024 from dixitadusara/issue-14016
fixes issue-14016
2017-04-06 10:42:33 -03:00
dixitadusara 8c053b891e fixes issue-14038 2017-04-06 19:12:02 +05:30
Claudio Sanches 49ce6bdda5 Merge pull request #14022 from dixitadusara/issue-14015
fixes issue-14015
2017-04-06 10:41:13 -03:00
Claudio Sanches 954c45d01c Merge pull request #14021 from dixitadusara/issue-14020
fixes added issue-14020
2017-04-06 10:40:58 -03:00
Claudio Sanches 6c1a38d637 Merge pull request #13975 from woocommerce/fix/13943
Compare to the order item title instead of variation title
2017-04-06 10:36:36 -03:00
Mike Jolley bad16b47da Merge pull request #14013 from om4james/testsdeprecatedwarning
Avoid deprecated warning when creating an order in unit tests
2017-04-06 14:34:29 +01:00
Claudio Sanches 550f7b4028 Merge pull request #13986 from woocommerce/fix/13954
Fixed "singular" and "plural" parameters of WP_List_Table instances
2017-04-06 10:33:43 -03:00
Claudio Sanches 9a219b71da Merge pull request #14036 from woocommerce/fix/14032
Make sure we have a prefix for strstr
2017-04-06 10:25:46 -03:00
Mike Jolley 261ae0ebda Only call sync if callable 2017-04-06 14:18:17 +01:00
Claudio Sanches 03004bdd49 Merge pull request #14009 from woocommerce/fix/14006
When forcing shipping to billing, set the shipping fields in the order itself
2017-04-06 10:17:54 -03:00
Claudio Sanches d25261a03a Merge pull request #14011 from woocommerce/fix/13988
Template version bump
2017-04-06 10:16:30 -03:00
Claudio Sanches 01c425398c Merge pull request #14012 from woocommerce/fix/13930-alt
Hide structured data in hidden element
2017-04-06 10:14:30 -03:00
Claudio Sanches f2b90d6163 Merge pull request #14014 from woocommerce/fix/13906
Set session data only if the value is empty in customer object. Prevents session data overwriting customer data on login.
2017-04-06 10:12:54 -03:00
Claudio Sanches 03e05cab1c Merge pull request #14017 from woocommerce/fix/14008
Allow variation image to be unset
2017-04-06 10:12:12 -03:00
Mike Jolley 822412d03c Make sure we have a prefix for strstr
Closes #14032
2017-04-06 14:11:00 +01:00
Claudio Sanches ddf188a61e Merge pull request #14018 from woocommerce/fix/13968
Show a sale price on variable products if on sale and all prices are the same
2017-04-06 10:10:49 -03:00
Claudio Sanches 7efbb3f52e Merge pull request #14027 from woocommerce/fix/null-product-json-ld
Make sure we have a product before generating JSON
2017-04-06 10:08:55 -03:00
Mike Jolley 288026ca9f Background Emailer instead of just CRON 2017-04-06 13:46:07 +01:00