Commit Graph

22214 Commits

Author SHA1 Message Date
Ninos Ego ccdac49723 Fix for #15294 2017-05-26 19:31:13 +02:00
Claudiu Lodromanean aefef12fa5 Merge pull request #15303 from woocommerce/fix/raw-keys
Use correct keys for images
2017-05-26 10:18:35 -07:00
Mike Jolley dcdd44ae67 Use correct keys for images 2017-05-26 18:09:49 +01:00
Mike Jolley 13d5a09291 Merge pull request #15293 from woocommerce/update/import-export-set-props
Update/import export set props
2017-05-26 17:44:23 +01:00
Mike Jolley dbd0f3dce0 error message 2017-05-26 16:56:37 +01:00
Mike Jolley d9217b1d59 More tidyup 2017-05-26 16:54:43 +01:00
Mike Jolley 67dde58d83 Tests 2017-05-26 16:00:32 +01:00
Mike Jolley f51d434d10 Added todo item in exporter 2017-05-26 15:57:29 +01:00
Mike Jolley 3a7f4884d8 Moved logic around and organised 2017-05-26 15:57:17 +01:00
Claudio Sanches 995aa89b84 Fixed shipping class parser 2017-05-26 12:27:06 +01:00
Mike Jolley 62bcca6cce Merge pull request #15277 from woocommerce/fix/float-number-comparison
Support floats for the custom sort function
2017-05-26 11:16:22 +01:00
Mike Jolley c92d6335ff Merge pull request #15282 from woocommerce/fix/15267
Use meta id instead of key in WC_Order_Item::offsetGet
2017-05-26 11:11:01 +01:00
Mike Jolley c2a1b8cc58 Merge pull request #15284 from Jon007/patch-1
fixes #15283
2017-05-26 10:56:41 +01:00
Peter 05516dbea5 New action for display order fee custom data
We need to display custom data in fee lines, similarly to woocommerce_after_order_itemmeta action in shipping line items.
2017-05-26 10:05:26 +02:00
Peter 0edb8904a1 Merge pull request #6 from woocommerce/master
Update Fork
2017-05-26 09:52:57 +02:00
Jonathan Moore 7dc2c7cd6e fixes #15283
fixes #15283 Notice: Undefined property: stdClass::$post_ID in wp-content/plugins/woocommerce/includes/class-wc-structured-data.php on line 262 
when calling wp_list_comments with $options['callback'] = 'woocommerce_comments'
2017-05-26 07:59:42 +08:00
claudiulodro c08140a293 Formatting 2017-05-25 14:45:36 -07:00
claudiulodro e00d7b7c55 File metadata by id 2017-05-25 14:43:36 -07:00
Claudio Sanches c9cf6c57ce Merge pull request #15281 from woocommerce/feature/importer-clean-up
Branch clean up and exporter tests.
2017-05-25 17:45:34 -03:00
Konstantin Kovshenin dda05889eb Helper: Avoid an undefined warning in the main template 2017-05-25 23:44:29 +03:00
claudiulodro fc05af3514 Phpcs fixes 2017-05-25 12:53:32 -07:00
claudiulodro df06d6f942 Merge remote-tracking branch 'origin/feature/product-csv-import-export' into HEAD 2017-05-25 12:41:26 -07:00
claudiulodro c4c990bc7c Remove unneccessary function 2017-05-25 12:36:10 -07:00
claudiulodro a99d7ff099 Exporter tests and tweaks 2017-05-25 12:33:14 -07:00
Claudio Sanches ac4bcf39c2 Merge pull request #15268 from woocommerce/fix/14775
For COD orders, force payment complete status to be completed.
2017-05-25 15:12:34 -03:00
Claudiu Lodromanean 76f57e64dc Merge pull request #15275 from woocommerce/feature/product-csv-import-non-existing-data
Feature/product csv import non existing data
2017-05-25 10:53:01 -07:00
Mike Jolley ba305eacb5 Fix tests 2017-05-25 18:16:10 +01:00
Mike Jolley 7f0fcac090 Merge branch 'feature/product-csv-import-export' into feature/product-csv-import-non-existing-data
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-05-25 17:58:34 +01:00
Boro Sitnikovski be70a3f95c Support floats for the custom sort function 2017-05-25 18:05:13 +02:00
claudiulodro 6d098b9c21 Clean up and some tests 2017-05-25 08:41:11 -07:00
Claudiu Lodromanean 458f7fcff1 Merge pull request #15276 from woocommerce/fix/15246
Fix styling in firefox
2017-05-25 08:32:38 -07:00
Mike Jolley c790e4be7c Fix styling in firefox 2017-05-25 15:39:53 +01:00
Mike Jolley c31ab30391 Create temp objects to update later 2017-05-25 14:54:49 +01:00
Mike Jolley 42c3c9e593 Remove extra full stop 2017-05-25 12:36:12 +01:00
Mike Jolley b821c24955 Restore top actions 2017-05-25 12:36:03 +01:00
Mike Jolley 2e5053633b CRUD should update post type on update so it matches expected value. 2017-05-25 12:09:59 +01:00
Mike Jolley d2da39e046 Merge branch 'pr/14549' 2017-05-25 11:51:55 +01:00
Mike Jolley 7ec25f987f Only replace the user set thousand separator and add test 2017-05-25 11:51:45 +01:00
Mike Jolley 0e675137e3 Merge branch 'fix/issue-15252' 2017-05-25 11:30:09 +01:00
Mike Jolley d73849eee3 wc_strtoupper helper 2017-05-25 11:30:01 +01:00
Mike Jolley a3f35d6e96 Checkout fallback regex tweaks (#15210)
* *Improve JSON regex #15159

* Run parse on invalid JSON to ensure validity and make regex more greedy.

Closes #15161

* Add is_valid_json helper

* Improve return
2017-05-25 11:20:05 +01:00
Anwer AR c4fcddca73 Back to attributes link on attributes edit page (#15088)
* see #15059 The issue was about editing product attributes. Added back to attributes link.

* Updates admin_url to esc_url

* Added admin_url again wrapping inside esc_url

The function works without admin_url in my previous commit. but i have added admin_url again to make sure it points to correct location.

* Correctted typo of esc function and removed icon

correction of spell mistake and removal of &larr due to translation and RTL concerns. though WP and WC itself using &larr on some places.
2017-05-25 11:15:57 +01:00
Dixita Dusara fe4a4a7e83 Update issue Undefined index warning when saving variations with stock management disabled #15242 (#15271)
* Issue Undefined index warning when saving variations with stock management disabled #15242

* updated issue as per your suggestion for index warning when saving variations with stock management disabled #15242
2017-05-25 10:58:32 +01:00
Claudio Sanches a58bd42dcf Merge pull request #15172 from woocommerce/fix/15166
Correct price query when on a post type archive
2017-05-24 21:13:30 -03:00
Cesar Rodas 563aa887f7 Apply woocommerce_order_get_items filter to get_item 2017-05-24 17:30:14 -04:00
Claudio Sanches 26656b730b Merge pull request #15263 from woocommerce/fix/15251
Increase the timeout so the sizing works after changing variation image
2017-05-24 18:25:00 -03:00
Claudio Sanches 72b98cbf5d Fixed WC_Customer->set_display_name @since #15239 2017-05-24 17:45:20 -03:00
Claudiu Lodromanean be25e49069 Merge pull request #15266 from woocommerce/fix/15238
Fix saving of text attributes with special chars
2017-05-24 11:38:28 -07:00
Boro Sitnikovski e68977d021 function_exists check 2017-05-24 20:22:58 +02:00
Mike Jolley bf48ac9e96 Merge pull request #15239 from woocommerce/fix/15020-display-name-update
Check for an existing display name before updating a user on checkout
2017-05-24 19:20:45 +01:00