Commit Graph

10944 Commits

Author SHA1 Message Date
Claudio Sanches 12bd41dd4b Merge pull request #14849 from franticpsyx/fix-get-price-html-from-to-fallback
[3.0] Incorrect use of `wc_format_price_range` in `get_price_html_from_to`
2017-05-03 17:40:40 -03:00
Claudio Sanches 6f126d7c60 Merge pull request #14853 from woocommerce/fix/14818
Improve "Save Order" button to reproduce WordPress post/page behavior
2017-05-03 17:36:22 -03:00
Claudio Sanches 63552c9757 Fixed conflict between global attributes and custom attributes.
Check if is a custom attribute before trying to get an ID from a global attribute.
2017-05-03 16:30:50 -03:00
Claudio Sanches 67258ec8da Improve "Save Order" button to reproduce WordPress post/page behavior
Display "Create" when order is in "auto-draft" status and then display only "Update" after.

Closes #14818
2017-05-03 15:06:06 -03:00
Claudio Sanches 7edf10e9e1 Merge pull request #14843 from woocommerce/fix/14831
[REST API] Adds missing "id" in shipping zone methods endpoint
2017-05-03 13:37:56 -03:00
Manos Psychogyiopoulos faa53edc2b Call `wc_format_sale_price` in `get_price_html_from_to` 2017-05-03 15:13:29 +03:00
Claudio Sanches 7b5d56c643 [REST API] Adds missing "id" in shipping zone methods endpoint
This missing "id" will break CLI.

Added as duplicated with `instance_id` to keep backwards compatibility.

Fixes #14831
2017-05-02 20:37:03 -03:00
Akeda Bagus 881929b9b3
Fix small typo in the docblock. 2017-04-29 13:52:14 +07:00
Claudio Sanches e945db9464 Fixed relative URL in process lost password
Closes #14701
2017-04-28 18:29:58 -03:00
Claudio Sanches f6136ba326 Merge pull request #14789 from woocommerce/fix/undefined-customer-user
Fixed undefined customer_user when remove users from order in admin
2017-04-28 13:28:18 -03:00
Claudio Sanches 8885c66d8c Merge pull request #14787 from woocommerce/fix/14750
Fix zone routes in CLI
2017-04-28 13:14:34 -03:00
Claudio Sanches e46cb8813d Fixed undefined customer_user when remove users from order in admin 2017-04-28 13:13:18 -03:00
Mike Jolley b0bba8c853 Remove array merge 2017-04-28 17:09:39 +01:00
Claudio Sanches c48ddfbab8 Merge pull request #14784 from woocommerce/fix/14769
get_settings for shipping and checkout need to support sections for the API
2017-04-28 12:49:53 -03:00
Mike Jolley 4b0fff3437 Fix zone routes in CLI
Fixes #14750
2017-04-28 15:49:51 +01:00
Mike Jolley d744dce594 get_settings for shipping and checkout need to support sections for the API
Fixes #14769
2017-04-28 14:37:44 +01:00
Mike Jolley af09548ec0 Add missing shipping_company from internal props in data store
Fixes #14768
2017-04-28 13:44:22 +01:00
Mike Jolley 25bca1c218 Merge branch 'pr/13391' 2017-04-28 13:36:10 +01:00
Mike Jolley 6fb644738e woocommerce_after_set_term_order 2017-04-28 13:36:01 +01:00
Mike Jolley d14a679e70 Merge pull request #14697 from bekarice/tweak/confirm-log-deletion
Confirm before deleting log files
2017-04-28 12:57:48 +01:00
Mike Jolley e960756d22 Merge pull request #14766 from umeshnevase/master
Removed unused variable $variation_data
2017-04-28 12:49:17 +01:00
claudiulodro 027e7b1f94 Add restored webhook 2017-04-27 11:44:57 -07:00
umesh.nevase 168b5e2833 Removed unused variable
$variation_data = array_map( 'urlencode', $this->get_variation_attributes() );
2017-04-27 23:59:16 +05:30
Mike Jolley ddcf561b70 Merge pull request #14722 from woocommerce/fix/14720
wc_attribute_taxonomy_id_by_name needs to use lowercase attribute slug
2017-04-27 18:08:03 +01:00
Mike Jolley 1d91276f77 Use sanitize_title 2017-04-27 18:07:39 +01:00
Mike Jolley 796ab0f257 Merge pull request #14756 from woocommerce/fix/14753
Compare with timestamp and remove start date once passed for sale products
2017-04-27 18:06:18 +01:00
Mike Jolley a1ff66fbe7 Merge remote-tracking branch 'origin/master' 2017-04-27 18:05:40 +01:00
Mike Jolley d0ebf48da4 Merge branch 'fix-13625'
# Conflicts:
#	assets/css/woocommerce-layout-rtl.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	includes/wc-core-functions.php
2017-04-27 18:05:34 +01:00
Claudio Sanches c58a6f42e3 Merge pull request #14604 from cristiangrama/fix-filter-guest-orders
Fetch only guest orders: Allow passing a `customer=0` filter on the order request
2017-04-27 14:04:19 -03:00
Mike Jolley ad578137be No need to wrap - leave styling to themes 2017-04-27 18:03:42 +01:00
Mike Jolley 56d190287e Merge pull request #14755 from woocommerce/fix/14736
On multisite, add user to blog during checkout if not a user
2017-04-27 17:46:54 +01:00
Mike Jolley e143a51cc7 Merge pull request #14463 from woocommerce/add/show-shipping-calculator-variable
Add variable so shipping calculator is shown on first row
2017-04-27 17:41:48 +01:00
Mike Jolley 8869cb3c2a First to false at loop end 2017-04-27 17:41:25 +01:00
Mike Jolley 0d89250b3f Merge pull request #14748 from woocommerce/fix/stock-in-cart-notice
Correct the stock display notice when a variable product manages stock for it's children
2017-04-27 17:38:59 +01:00
Mike Jolley ca0c3e0bb8 Merge pull request #14064 from rafsuntaskin/develop
added bulk variation update for stock status, resolves #14046
2017-04-27 17:37:59 +01:00
Mike Jolley a68934d7db Merge pull request #14731 from crodas/make_sure_meta_data_cache_is_not_shared
Make sure the meta data cache is not shared among instances
2017-04-27 16:50:10 +01:00
Mike Jolley 4e8de076d2 Merge pull request #14740 from woocommerce/fix/14452
Fixed how to flush rewrite rules after save the shop main page
2017-04-27 16:44:25 +01:00
Claudio Sanches 1bf2902762 Check if get_current_screen() is true 2017-04-27 12:42:16 -03:00
Mike Jolley 891e55e1cf Merge pull request #14721 from woocommerce/fix/14670
Avoid escaped quote chars in strings
2017-04-27 15:34:27 +01:00
Mike Jolley eedcdd97ba Compare with timestamp and remove start date once passed for sale products
Fixes #14753
2017-04-27 14:35:33 +01:00
Mike Jolley a283351ef8 On multisite, add user to blog during checkout if not a user
Fixes #14736
2017-04-27 13:48:45 +01:00
Mike Jolley a6329fa68c Merge pull request #14752 from woocommerce/pr/14732
revert price handling of get_price_html()
2017-04-27 13:03:15 +01:00
Mike Jolley db5e2572f6 clean up 2017-04-27 13:01:52 +01:00
Mike Jolley aacb01d1e7 Merge branch 'pr/13503'
# Conflicts:
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-layout.css
#	assets/css/woocommerce-layout.scss
#	assets/css/woocommerce.css
2017-04-27 12:46:05 +01:00
Mike Jolley 3403e39740 Add icons and fix links 2017-04-27 12:23:16 +01:00
Mike Jolley bbffbd6a9f Merge branch 'master' into maybe_blank_keys_webhooks 2017-04-27 12:11:27 +01:00
Mike Jolley 29feafb116 Merge branch 'pr/14414' 2017-04-27 12:01:45 +01:00
Mike Jolley 2e77b0f417 Keep both classes 2017-04-27 12:01:37 +01:00
Mike Jolley 7c037728f6 Merge branch 'fix/14448'
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-04-27 12:00:05 +01:00
Mike Jolley d546613c25 Merge branch 'pr/14394'
# Conflicts:
#	assets/js/frontend/single-product.min.js
2017-04-27 11:53:08 +01:00