Commit Graph

21424 Commits

Author SHA1 Message Date
Claudio Sanches fe67ca0aff Fixed images mapping key 2017-05-26 18:58:35 -03:00
Claudio Sanches 2eeb444eeb Properly set stock quantity 2017-05-26 18:53:22 -03:00
Claudio Sanches 780006e9c1 Merge pull request #15309 from woocommerce/feature/product-csv-normalize-names
Normalize importer/exporter column names
2017-05-26 18:44:59 -03:00
Claudio Sanches 02a27ae258 Fixed PHP Notice about undefined name for product attributes 2017-05-26 18:44:22 -03:00
Claudio Sanches 780ce1a4e6 Fixed deprecated `set_stock` notice 2017-05-26 18:42:07 -03:00
Claudio Sanches d2c3bf362f Normalize column names 2017-05-26 18:01:15 -03:00
claudiulodro 5f6986fefb Merge remote-tracking branch 'origin/feature/product-csv-import-export' into HEAD 2017-05-26 13:32:53 -07:00
claudiulodro 9b925d28ec Grouped product child support 2017-05-26 13:30:17 -07:00
Claudiu Lodromanean 1d394f41a7 Merge pull request #15306 from woocommerce/fix/15297
Get external products working in importer/exporter.
2017-05-26 12:45:48 -07:00
claudiulodro c96f8b5bc1 Better unset 2017-05-26 12:16:38 -07:00
claudiulodro 4a104f3202 Remove extra isset 2017-05-26 11:41:44 -07:00
claudiulodro 00d37412eb Accidentally reverted a fix 2017-05-26 11:37:12 -07:00
claudiulodro d362d47995 Get external products working 2017-05-26 11:26:55 -07:00
Ninos Ego 9f56561905 Typo 2017-05-26 20:21:35 +02:00
Ninos Ego b0dc827f0a CS & small fix in unit test 2017-05-26 20:15:57 +02:00
Ninos Ego 8eec5cc802 Small fix for thousand separators replacement check 2017-05-26 20:06:24 +02:00
Ninos Ego e7b3aa352a Added: Unit test 2017-05-26 19:43:50 +02:00
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