Commit Graph

3105 Commits

Author SHA1 Message Date
Claudio Sanches 5369bae987 Merge branch 'master' into add/wcs-banners 2017-05-31 16:02:38 -03:00
Claudio Sanches 08f4d7b2f2 Merge pull request #15310 from woocommerce/update/add-woo-services-in-wizard
Add WooCommerce Services to Setup Wizard
2017-05-31 15:48:42 -03:00
Nabeel Sulieman 5f0c84ee13 payment_gateways should be payment-gateways 2017-05-31 11:44:52 -07:00
Claudio Sanches b93d286985 Stop auto skip column map and remove all related code 2017-05-31 14:59:17 -03:00
Nabeel Sulieman 62d7937a52 Only queue woocommerce services install if it's not active 2017-05-31 09:36:33 -07:00
Nabeel Sulieman 27a3e83642 - WooCommerce services enabled by default
- Clicking "skip" on shipping page should disable shipping
2017-05-31 09:36:32 -07:00
Mike Jolley fc5b4f0482 Only show no_shipping_methods notice if services is not being installed 2017-05-31 09:36:32 -07:00
Mike Jolley c25b844761 Tweak handler 2017-05-31 09:36:32 -07:00
Mike Jolley c53c83aebb Tweak test and styling 2017-05-31 09:36:32 -07:00
Nabeel Sulieman c49fa38e2c Make units controls look the same for touted and non-touted
Rename local functions to "location"
2017-05-31 09:33:50 -07:00
Nabeel Sulieman e940544a2a Use Inches and Ounces as default measurement units when location is in
US
2017-05-31 09:33:19 -07:00
Nabeel Sulieman ce5aff0236 Improve wording of measurement units on shipping page 2017-05-31 09:33:19 -07:00
Jeff Stieler 3ced364583 When checking for North American stores, default location to GeoIP if the option hasn’t been set. 2017-05-31 09:31:59 -07:00
Jeff Stieler 736d3e9f94 Remove “taxes” from shipping step naming. 2017-05-31 09:31:59 -07:00
Jeff Stieler d60a4fc1da Add missing name to WooCommerce Services plugin installation info. 2017-05-31 09:31:59 -07:00
Jeff Stieler 7dcaff3e39 Handle update of weight/dimension units in the wizard shipping step instead of locale. 2017-05-31 09:31:59 -07:00
Jeff Stieler 466cee9fc9 Update tax rates upon store location change. 2017-05-31 09:31:59 -07:00
Jeff Stieler 86f6921ced Handle SCRIPT_DEBUG config for setup wizard script includes. 2017-05-31 09:31:59 -07:00
Jeff Stieler f52eab71d2 Update wizard shipping step copy to match latest designs. 2017-05-31 09:31:58 -07:00
Jeff Stieler 42dfdc7e3c Schedule single install event for WooCommerce Services when saving the shipping step. 2017-05-31 09:31:58 -07:00
Jeff Stieler cd15b6fbc6 Fix shipping enable input name. 2017-05-31 09:31:58 -07:00
Jeff Stieler 1492c50373 Add skip/continue buttons back to wizard shipping step. 2017-05-31 09:31:58 -07:00
Jeff Stieler b52b38ecb0 Properly translate strings on the shipping wizard step. 2017-05-31 09:31:57 -07:00
Jeff Stieler 6111437750 Only show WooCommerce Services tout when the store is in North America. 2017-05-31 09:31:57 -07:00
Jeff Stieler 0a63b83c7c Move dimension and weight inputs to shipping step. 2017-05-31 09:31:57 -07:00
Nabeel Sulieman 1122faf760 Implement WooCommerce Services NUX in Setup Wizard:
- Rename "shipping locale" to "shipping location"
- Move tax setup to to shipping location page
- Rename shipping & taxes to just shipping
- Implement radio button selection to enable/disable shipping
- Add checkbox for installing WooCommerce services
- Start updating wc-admin css and javascript
2017-05-31 09:31:57 -07:00
Jeff Stieler c212725053 Use WC_Install class to install/activate WooCommerce services from the Extensions page. 2017-05-31 09:27:19 -06:00
Jeff Stieler d8e508842d Allow all aspects of the WCS banner block to be overwritten by JSON data. 2017-05-31 09:27:18 -06:00
Jeff Stieler 9b6b4928a6 Show WCS banner on extensions page for both USA and Canada. 2017-05-31 09:27:18 -06:00
Jeff Stieler 0293884660 PHP 5.2+ compatibility - don’t use array dereferencing. 2017-05-31 09:27:17 -06:00
Valerie e7672d6572 Enable WCS banner on shipping extension page 2017-05-31 09:27:17 -06:00
Valerie 3b689b5da9 Enable WCS banner on featured extension page 2017-05-31 09:26:17 -06:00
Valerie 870e3ddea2 Add WCS banner addons block markup 2017-05-31 09:26:17 -06:00
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
Mike Jolley d3666738d8 Merge branch 'pr/15069' 2017-05-23 18:56:58 +01:00
Mike Jolley 00e5189a05 Merge pull request #15070 from rasmusbe/phpdoc-missing-return-throws
Phpdoc: Add missing return and throws
2017-05-23 18:50:58 +01:00
Mike Jolley 15f47e00a2 Merge branch 'master' into feature/13088
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/woocommerce-rtl.css
#	assets/css/woocommerce.css
2017-05-23 16:35:17 +01:00
Mike Jolley db012b3a12 Merge pull request #15011 from woocommerce/fix/14999
Add abspath checks
2017-05-23 15:57:35 +01:00
Mike Jolley 2d479e0580 Update serializejson to 2.8.1
Closes #14630
2017-05-23 15:27:53 +01:00
Mike Jolley b1a5b23629 Done screen handling and form tweaks 2017-05-23 15:05:32 +01:00
Mike Jolley f09f7eb84e Merge pull request #15150 from woocommerce/fix/15118
Add handles so drag and drop does not break edit on mobile
2017-05-23 10:20:08 +01:00
Claudio Sanches ac304473c7 Allow external URL and button text for external products 2017-05-22 20:18:39 -03:00
claudiulodro cb297ad1b0 Add skip existing option 2017-05-19 10:58:31 -07:00
Mike Jolley 754e991220 Redirect if there is no mapping data 2017-05-19 15:06:36 +01:00
Mike Jolley cde32be82d Done step and styling 2017-05-19 13:25:03 +01:00
Mike Jolley 1617c62f47 Export text tweaks 2017-05-19 12:03:34 +01:00
Claudio Sanches 74b4ba8a94 Improved sanitization in product CSV importer and handle special columns 2017-05-18 21:18:47 -03:00
Claudiu Lodromanean a13668f201 Merge branch 'feature/product-csv-import-export' into feature/background-processing 2017-05-18 10:11:34 -07:00
claudiulodro 9d52ef9f61 Performance tweak 2017-05-18 10:05:31 -07:00
claudiulodro 83908bc735 Move file functions to abstract class 2017-05-18 09:59:40 -07:00
claudiulodro b2e8d31262 Clean up 2017-05-18 09:49:58 -07:00
Mike Jolley 89ece25a32 Fix stock/backorder notice when stock management is disabled
Fixes #15145
2017-05-18 15:28:38 +01:00
Mike Jolley c3c966b5fd Add handles so drag and drop does not break edit on mobile
Fixes #15118
2017-05-18 15:22:12 +01:00
Claudio Sanches 36fa838678 Allow extend auto mapping options 2017-05-17 21:10:26 -03:00
Claudio Sanches df63ea9b5a Handle special column names
Handle columns names like "Attribute 1 Name" and "Meta: _foo_bar".
2017-05-17 20:59:36 -03:00
claudiulodro 2ab0fdfe78 Styling 2017-05-17 14:55:20 -07:00
claudiulodro fa1446bc86 Clean up 2017-05-17 14:43:03 -07:00
claudiulodro 17083dafae Initial background importer implementation 2017-05-17 14:34:49 -07:00
Claudio Sanches d3ec48f378 Match regular fields between exporter and importer 2017-05-17 17:55:28 -03:00
Claudio Sanches ce6741e117 Fixed error display and incorrect use of WP_Error 2017-05-17 14:57:03 -03:00
Claudio Sanches 215a9fa0c1 Fixed warning about empty callback name 2017-05-17 14:43:48 -03:00
Mike Jolley 956b1a6181 Adds storefront/theme step to the setup wizard
Also includes a background install to get Storefront installed and
activated on demand.

To test, use a default theme and go to wp-admin/index.php?page=wc-setup
The theme step will be after payments!
2017-05-17 17:42:18 +01:00
claudiulodro adc8f4eacb Use correct method name 2017-05-17 09:15:49 -07:00
claudiulodro d6ef3ca855 Docblock tweak and remove unused query var 2017-05-17 08:51:45 -07:00
Mike Jolley a6537ff269 export styling 2017-05-17 14:22:41 +01:00
Mike Jolley d67fb8fb83 New style import controller
Closes #15107
2017-05-17 14:16:38 +01:00
Mike Jolley bf2979f68d Revert change - export directory contains logic only, not admin 2017-05-17 11:50:55 +01:00
Mike Jolley 8a48c7d388 Made exporter and importer screens, classes and directories consistent
Once merged, @claudiosanches @claudiulodro, we should work on
https://github.com/woocommerce/woocommerce/tree/feature/product-csv-impo
rt-export branch going forward and get this merged into it.
2017-05-17 11:24:27 +01:00
Mike Jolley 3d5f1c1fe6 Merge branch 'feature/product-csv-import-export' into feature/csv-importer 2017-05-17 10:36:39 +01:00
Kelly Dwan 3cb3a1b085 Style & escaping fixes, based on review feedback 2017-05-16 14:01:14 -04:00
Mike Jolley 5939939244 Wizard and blank state 2017-05-16 15:36:56 +01:00
Mike Jolley 7293025c92 Import page placeholder 2017-05-16 15:21:35 +01:00
Mike Jolley 2ba6613abe Hide export menu item 2017-05-16 15:21:29 +01:00
Mike Jolley 74e2f61f0c Import and export buttons 2017-05-16 15:06:22 +01:00
Mike Jolley 6949ee162e Reduce visual noise 2017-05-16 15:05:11 +01:00
Claudio Sanches 020e61927b Created abstract product class 2017-05-16 01:02:46 -03:00
Claudio Sanches cc05ed77d2 Properly display the importer results 2017-05-15 20:41:19 -03:00
Claudio Sanches 121f8f6315 Abstract the product importer 2017-05-15 19:49:53 -03:00
Kelly Dwan ce06a92e57 Profiles: Add get_user_meta helper, which can fall back on core user fields when applicable, such as first_name, last_name, and email for billing fields. 2017-05-15 17:10:31 -04:00
Kelly Dwan faea811a92 Customer profile: Add a “Copy from billing” button to shipping user meta fields 2017-05-15 17:09:02 -04:00
Claudiu Lodromanean 05132f724c Merge pull request #15067 from woocommerce/fix/15047
$post global is not required in meta box callback
2017-05-15 10:35:07 -07:00
Rasmus Bengtsson 185934fad9 Fix phpdoc to include params and correct types 2017-05-15 13:50:52 +02:00
Mike Jolley 31651e41cb Merge pull request #15063 from rasmusbe/unused-vars
Remove unused local variables
2017-05-15 12:45:54 +01:00
Rasmus Bengtsson 4f00d7e5e3 PHPDoc: Add missing return statement 2017-05-15 13:37:59 +02:00
Mike Jolley 7c63c21eaf $post global is not required in meta box callback
Fixes #15047
2017-05-15 12:29:11 +01:00
Rasmus Bengtsson 6a7fc8650f Remove unused local variables 2017-05-15 12:06:52 +02:00
Rasmus Bengtsson 51fd482206 Remove duplicate entries from defined arrays 2017-05-15 10:48:02 +02:00
Mike Jolley e777b4d557 Merge branch 'feature/product-csv-import-export' into feature/csv-exporter 2017-05-12 21:03:20 +01:00
Mike Jolley 523d9d27cd Styling 2017-05-12 20:40:54 +01:00
Mike Jolley ed32dd558d Nonces and further tidyup 2017-05-12 20:15:08 +01:00
Mike Jolley 5e9f908df7 Merge pull request #15051 from reescott/fixlogtable
Fix #14967 by adding log_id as the secondary sorting column to log list.
2017-05-12 19:47:18 +01:00
Scott Rees b7b75c83f7 Fix #14967 by adding log_id as the secondary sorting column to log list. 2017-05-12 10:22:31 -07:00
claudiulodro 824d8898a2 Fix unit tests 2017-05-12 08:44:02 -07:00
Mike Jolley a35df1394c Delay final step 2017-05-12 15:26:53 +01:00
Mike Jolley 0bf749aeac Move js into script file 2017-05-12 15:03:00 +01:00
Mike Jolley 8fe0f03a95 Type exporting 2017-05-12 14:48:30 +01:00
Claudio Sanches ed09b4e350 Updated to sanitize data in parse_data method 2017-05-11 11:49:45 -03:00
Claudio Sanches 9a25f09c7b Included $item to woocommerce_csv_product_import_mapping_options filter 2017-05-10 18:57:57 -03:00
Claudio Sanches 0ec70e6b92 Allow import as meta 2017-05-10 18:56:29 -03:00
Mike Jolley 4cacceeede Variation handling 2017-05-10 22:16:53 +01:00
Claudio Sanches 6f34cdd9cf Skip mapping screen if all fields match CSV default fields 2017-05-10 17:56:00 -03:00