Commit Graph

12845 Commits

Author SHA1 Message Date
George Stephanis 83058779b3 Merge remote-tracking branch 'origin/add/esc_attr_e' into add/esc_attr_e
Conflicts:
	includes/admin/settings/views/html-keys-edit.php
2015-08-05 14:17:18 -04:00
George Stephanis 95e6b84fbb Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:15:00 -04:00
George Stephanis 29d9a7da8c Found two missing `esc_js()` calls as well. 2015-08-05 14:10:10 -04:00
George Stephanis c7ee929325 Partial _e() => esc_attr_e() changeover.
There’s a lot of them, so I’m breaking them into multiple commits.

This is safeguarding stuff in case some translation uses a double
quote, it will no longer risk breaking out of the attribute.
2015-08-05 14:10:09 -04:00
George Stephanis 883ad9003a Make sure we esc_attr translation results
Part 2 of … 2, I think.
2015-08-05 14:08:15 -04:00
Claudio Sanches 47492fb273 Merge branch 'master' of github.com:woothemes/woocommerce 2015-08-05 15:03:05 -03:00
Claudio Sanches 054dfe0c7b Changed default Underscore's template for wp.template in API Keys 2015-08-05 15:02:55 -03:00
George Stephanis aed0b0e891 Found two missing `esc_js()` calls as well. 2015-08-05 12:52:11 -04:00
George Stephanis ecd503ec2c Partial _e() => esc_attr_e() changeover.
There’s a lot of them, so I’m breaking them into multiple commits.

This is safeguarding stuff in case some translation uses a double
quote, it will no longer risk breaking out of the attribute.
2015-08-05 12:51:44 -04:00
Mike Jolley 7f3c2a78c5 Get total functions should respect rounding settings.
Closes #8707
2015-08-05 14:33:53 +01:00
Mike Jolley 737769174e Customer class using wrong meta keys for address_1/shipping_address_1
Fixes #8717
2015-08-05 14:05:03 +01:00
Mike Jolley e8ea978e9e Merge pull request #8697 from JeroenSormani/define-ajax
Define DOING_AJAX early
2015-08-05 13:53:40 +01:00
Mike Jolley afd0e9edd4 Pass $this to filters
#8722
2015-08-05 13:49:27 +01:00
Mike Jolley ccbe22164b Merge pull request #8722 from SiR-DanieL/cross-up-sells
Added cross and up sells IDs filters
2015-08-05 13:48:46 +01:00
Mike Jolley c97f845d7f Merge pull request #8727 from SiR-DanieL/order-items-fix
Fix possible fatal error on the order admin page
2015-08-05 13:48:11 +01:00
Mike Jolley d222dd4c37 Don't apply product discount if price is already 0
Closes #8725
2015-08-05 13:45:32 +01:00
Nicola Mustone bfb0aa95b3 fix possible fatal error on the order admin page 2015-08-05 14:10:23 +02:00
Nicola Mustone 9822edda0b better naming 2015-08-05 13:54:20 +02:00
Nicola Mustone 9140ca0f76 added cross and up sells IDs filters 2015-08-05 11:01:47 +02:00
Claudio Sanches 2954707118 Fixed rest_api_allowed_post_types filter 2015-08-04 13:49:24 -03:00
Mike Jolley cb322949bd Merge pull request #8700 from WordCommerce/patch-2
Update locale-info.php
2015-08-03 23:46:39 +01:00
Claudio Sanches 8bcc926c63 Allowed products into wp.com rest api to enable jetpack related posts feature, closes #8712 2015-08-03 18:36:25 -03:00
Nicola Mustone d9f95163c7 improvements to the contributing guidelines 2015-08-03 16:53:34 +02:00
Nicola Mustone 48b8e92665 improved contributing guidelines 2015-08-03 16:48:07 +02:00
Nicola Mustone 5be932e5c0 Merge branch 'master' of github.com:woothemes/woocommerce 2015-08-03 16:28:30 +02:00
Mike Jolley 8c157e5e23 Merge branch 'expand_item_meta' 2015-08-03 13:21:50 +01:00
Mike Jolley d6bd46c55d Move expand_item_meta to own method
Fixes notices in some extensions (deposits)
2015-08-03 13:21:44 +01:00
Mike Jolley ef798921aa woocommerce_can_reduce_order_stock filter
Needed for extension (deposits)
2015-08-03 10:37:58 +01:00
Mike Jolley d1ab777e13 Merge pull request #8704 from toddlahman/master
fix for array_filter() expects parameter 1 to be array, boolean given
2015-08-02 10:30:57 +01:00
toddlahman 50d659f380 fix for array_filter() expects parameter 1 to be array, boolean given
array_filter() expects parameter 1 to be array, boolean given
/wp-content/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-
product.php(171)

$exclude is evaluated as a boolean.
2015-08-02 00:35:58 -07:00
Claudio Sanches 2264ad9c41 Merge pull request #8702 from exlil/patch-3
Found a typo, "Permissons"
2015-08-01 17:01:38 -03:00
Fredrik Rossland 841beb95a6 Found a typo, "Permissons"
Changed "Permissons" to "Permissions"
2015-08-01 19:42:10 +02:00
WordCommerce f175fd835c Update locale-info.php 2015-07-31 22:54:42 +03:00
WordCommerce edfa45f8e6 Update locale-info.php
Turkish localization added..
2015-07-31 22:50:10 +03:00
Claudio Sanches fe8b0d0fbe Merge pull request #8698 from thenbrent/update_product_type
Save product type before saving variations
2015-07-31 16:33:12 -03:00
Brent Shepherd 501f0b752f Save product type before saving variations
WooCommerce prior to WC 2.4 saved the product type before any variations were saved because
WC_Meta_Box_Product_Data::save_variations() was called by WC_Meta_Box_Product_Data::save().
However, in WC 2.4 the variations are saved independently of other data about the containing
variable product, including product type. Because the product type hasn't been saved yet,
extensions that need to save their own variation level meta data can't know when saving
variations if the product is of the type they want to act on. They also can't check `$_POST`
to find out when saving variations, because 'product-type' isn't passed to that as it's
variable level meta data, not variation level meta data.

This patch passes the product type along with the variation level meta data when saving variations.
It then uses that to save the product type if the variable product has not yet been saved (and
therefore the product type has never been stored, which means calling get_product() would instantiate
a 'simple' product, as that is the default product type). This can lead to fatal errors if callbacks
expect the product type to be variable and attempt to call methods that only exist on those product
types, like variable_product_sync().

It will also update the product type if it was previously saved but has since changed. This prevents
fatal errors like that mentioned above but caused by switching from one product type, like a simple
product, to another, like a variable product.
2015-07-31 11:42:21 -07:00
JeroenSormani 2c81a71f04 Define DOING_AJAX early 2015-07-31 20:15:17 +02:00
Claudio Sanches 0e70aed254 POT 2015-07-31 13:20:56 -03:00
Mike Jolley e7dfff8687 Update wording and add tooltip
#8690
2015-07-31 17:14:28 +01:00
Nicola Mustone 4f13387881 Merge branch 'master' of github.com:woothemes/woocommerce 2015-07-31 17:15:13 +02:00
Mike Jolley 61cb48afd7 Tweak wc ajax to post to the CURRENT URL rather than a fixed endpoint 2015-07-31 12:56:27 +01:00
Mike Jolley 67788f971d Merge pull request #8696 from franticpsyx/animate-variations-changes
[2.4] Animate variations script DOM modifications
2015-07-31 12:44:18 +01:00
Mike Jolley 82f50cedb0 Allow menu_order sorting like in 2.3
Also allow setting manually to allow sorting between pages.

Fixes #8690
2015-07-31 12:39:23 +01:00
Manos Psychogyiopoulos f5691fd82a animate variations script markup changes 2015-07-31 14:04:55 +03:00
Mike Jolley 763c7dde35 Fix product image size saving
Fixes #8695
2015-07-31 11:29:04 +01:00
Claudio Sanches a314726c3c 2.4.0-RC1 2015-07-30 21:54:35 -03:00
Claudio Sanches a215c4ed3c [API] Fixed variation without parent for v2 2015-07-30 21:53:00 -03:00
Claudio Sanches a42b25ec4e Merge pull request #8692 from Nils-Fredrik/master
Fix for #8691: Variation without parent will not cause 500.
2015-07-30 21:51:13 -03:00
Claudio Sanches 6c4893e0b2 Introduces the woocommerce_ajax_admin_get_variations_args filter, closes #8690 2015-07-30 19:11:53 -03:00
nils-fredrik@maksimer.no f4db67bcbc Fix for #8691: Variation without parent will not cause 500. 2015-07-30 23:32:24 +02:00