Commit Graph

2971 Commits

Author SHA1 Message Date
Mike Jolley d8edc8a965 Always map 2017-05-31 15:07:07 +01:00
Mike Jolley 532ddfa6b0 Merge conflicts 2017-05-31 12:23:52 +01:00
Mike Jolley e185d5572b Merge branch 'feature/product-csv-import-export' into refactor/fix-importer-and-improve-unit-tests 2017-05-31 12:19:58 +01:00
Mike Jolley 72ddb1f23d Merge branch 'feature/product-csv-import-export' into feature/15302
# Conflicts:
#	includes/export/class-wc-product-csv-exporter.php
2017-05-31 12:13:42 +01:00
Claudio Sanches d6fb028481 Allow import and create new global attributes 2017-05-30 18:46:32 -03:00
Mike Jolley 85b8d8661a Merge pull request #14595 from woocommerce/feature/helper
Helper: First pass at merging the Helper plugin into WooCommerce
2017-05-30 20:39:08 +01:00
Konstantin Kovshenin aa6353bfa1 Helper: Clean up navigation/headings, remove some noop markup. 2017-05-30 22:26:33 +03:00
Claudio Sanches 40c2b471f5 Grouped products after cross sells as in the admin screen 2017-05-30 14:50:54 -03:00
Konstantin Kovshenin 1dc7e507b1 Helper: Redesign (work in progress) 2017-05-30 20:50:14 +03:00
Konstantin Kovshenin 556c2cf84c Helper: Add tabbed interface to WooCommerce > Extensions 2017-05-30 19:46:26 +03:00
Claudio Sanches 73e34b583f Fixed generic stock mapping 2017-05-30 13:04:16 -03:00
Claudio Sanches ffd248f19d Merge branch 'feature/product-csv-import-export' into refactor/fix-importer-and-improve-unit-tests 2017-05-30 13:03:17 -03:00
Claudio Sanches 9556e248a4 Missing tax class 2017-05-30 12:52:29 -03:00
claudiulodro 7cf62bb023 Set up and add extra mappings 2017-05-29 11:16:44 -07:00
Claudio Sanches c73461f440 Merge pull request #15332 from woocommerce/fix/15307
Hide replies from recent reviews widgets
2017-05-29 12:00:57 -03:00
Mike Jolley 934e95bc8b Merge pull request #15308 from woocommerce/fix/15297
Grouped product support in importer/exporter
2017-05-29 10:13:45 +01:00
Mike Jolley 4251d71dab Hide replies from recent reviews widgets
Fixes #15307
2017-05-29 10:09:17 +01:00
claudiulodro 759fcae533 Use 'grouped_products' for grouped products 2017-05-28 12:37:18 -07:00
Peter 314f64b566 Change the name of the new action
Change the name of the new action to woocommerce_after_order_fee_item_name.
2017-05-28 20:40:59 +02:00
Claudio Sanches 77fcaf3392 Fixed images map handler 2017-05-26 19:30:42 -03:00
Claudio Sanches 4bc139fef9 Fixed conflicts 2017-05-26 19:09:57 -03:00
Claudio Sanches 4d66bc9e45 Merge branch 'feature/product-csv-import-export' into refactor/fix-importer-and-improve-unit-tests 2017-05-26 19:07:46 -03:00
Claudio Sanches fe67ca0aff Fixed images mapping key 2017-05-26 18:58:35 -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 9b925d28ec Grouped product child support 2017-05-26 13:30:17 -07:00
claudiulodro d362d47995 Get external products working 2017-05-26 11:26:55 -07: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
Konstantin Kovshenin dda05889eb Helper: Avoid an undefined warning in the main template 2017-05-25 23:44:29 +03:00
claudiulodro df06d6f942 Merge remote-tracking branch 'origin/feature/product-csv-import-export' into HEAD 2017-05-25 12:41:26 -07:00
claudiulodro 6d098b9c21 Clean up and some tests 2017-05-25 08:41:11 -07:00
Mike Jolley 42c3c9e593 Remove extra full stop 2017-05-25 12:36:12 +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
Mike Jolley 28d355948f docblock 2017-05-24 19:11:16 +01:00
Konstantin Kovshenin 8b5c5c0bd6 Helper: Add better update URLs to theme subscriptions 2017-05-24 18:15:07 +03:00
Konstantin Kovshenin f912f39364 Helper: Add better update URLs to plugin subscriptions 2017-05-24 18:11:37 +03:00
Konstantin Kovshenin 353eac70ca Helper: Remove some legacy updater notices 2017-05-24 18:10:31 +03:00
roykho c837827992
Fix undefined global variable notice 2017-05-24 07:21:20 -07:00
Claudio Sanches 5f28c733cc Merge pull request #15234 from woocommerce/update/14630
Update serializejson to 2.8.1
2017-05-24 09:21:10 -03:00
Konstantin Kovshenin e8afe57593 Helper: Add contextual nags about available extension updates 2017-05-24 14:59:48 +03:00
Claudio Sanches da7d5786d3 Merge branch 'feature/product-csv-import-export' into feature/product-parser-match-exporter 2017-05-24 08:56:27 -03:00
Claudio Sanches b08c75fb83 Added handler for default attributes and improved how deal with product attributes 2017-05-24 08:14:10 -03:00
Konstantin Kovshenin a1b3d2834b Helper: Fix duplicate product output 2017-05-24 13:04:52 +03:00
Claudio Sanches cd4a9ccf6a Fixed mapping sample display of 0 and false 2017-05-24 03:57:36 -03:00
Claudio Sanches c08d3a356e Added support "Attribute %d Visible" 2017-05-24 03:42:38 -03:00
Claudio Sanches b10f3a3be9 Fixed coding standards 2017-05-24 03:26:17 -03:00
Claudio Sanches 43a26ea851 Properly map items when CSV match WooCommerce exporter format 2017-05-23 21:38:27 -03:00
Mike Jolley c5d7dfba6c Feedback 2017-05-23 19:46:46 +01:00
Mike Jolley c16acc6b51 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-05-23 19:00:24 +01:00