Commit Graph

3164 Commits

Author SHA1 Message Date
Konstantin Kovshenin e67babf77a Helper: Fix download button class for expiring subscriptions. 2017-06-21 18:15:45 +03:00
Gerhard Potgieter 6d3e3fd5e5 Merge branch 'feature/helper' of github.com:woocommerce/woocommerce into feature/helper 2017-06-21 16:58:26 +02:00
Gerhard Potgieter e08df8d2aa Adjust messaging and display information for collaborator accounts on woocommerce.com subscription page. 2017-06-21 16:57:16 +02:00
Konstantin Kovshenin 346b446283 Helper: Fix label for maxed out subscriptions. 2017-06-21 17:50:34 +03:00
Konstantin Kovshenin 41ea3f3f43 Helper: Pass a migrate flag if migrating during token exchange 2017-06-21 16:23:57 +03:00
Konstantin Kovshenin 16f2541e9b Helper: Set helper compat screen slug to woothemes-helper.
Previously the helper compat screen used a different slug, but
since updates can be done without refreshing the screen via AJAX
the old menu item doesn't disappear until a full refresh. This fix
allows users to navigate to that same menu item and not get an
error.
2017-06-21 15:28:30 +03:00
Caleb Burks cfbd56c04a Remove some settings for grouped products
Purchase notes and Cross-sells aren’t needing as you can never add a grouped product to your cart or purchase it.
2017-06-20 21:04:56 -05:00
Caleb Burks f13c4c3b30 Hide Cross-sells for external products 2017-06-20 20:56:54 -05:00
Mike Jolley 91511bd92a Merge pull request #15631 from woocommerce/update/13738
Create a way to 'resend order details'
2017-06-20 15:09:10 +01:00
Caleb Burks ae6a5e34f2 Move “Grouped products” setting to the top 2017-06-19 21:59:42 -05:00
Allen Snook 0f311f0cba Add address, address 2, city and postcode to setup wizard 2017-06-19 12:22:05 -07:00
Allen Snook 61a8d858b5 Update address labels in settings to better match customer address labelling 2017-06-19 11:28:42 -07:00
Mike Jolley acf0026834 Update description for exclude_sale_items 2017-06-19 11:56:04 +01:00
Umesh Ghimire 3f2742fd6f Tweak - Add remove icon on Account page my account page dropdown 2017-06-19 12:59:12 +05:45
Claudiu Lodromanean 1b04963f27 Merge pull request #15659 from woocommerce/fix/15642
Fix webhook saving and ping only once
2017-06-16 11:01:08 -07:00
Claudiu Lodromanean fac4114bae Merge pull request #15654 from woocommerce/fix/15640
Add missing nonce to product sales report
2017-06-16 10:43:10 -07:00
Mike Jolley 42ebde73cd Fix is_webhook_settings_page 2017-06-16 13:58:28 +01:00
Mike Jolley b4ea8bb94f clean up comparison operators 2017-06-16 13:53:57 +01:00
Mike Jolley f8ca27f32e Add missing nonce to product sales report
Fixes #15640
2017-06-16 11:51:00 +01:00
Allen Snook 21d2bee658 Add store street, city and postcode fields to settings > general 2017-06-15 09:56:52 -07:00
Mike Jolley 3c6635a0f6 Remove all emails except for the invoice email 2017-06-15 15:14:10 +01:00
Mike Jolley b3fcbc56ba Tweak sent message 2017-06-15 15:13:59 +01:00
Job 8b48accc01 Upsell/up-sell
We had a few different usages of up-sells and upsells in the copy -
“Upsells” were used more and also seems to be more correct English so
I’ve updated the “up-sells”
2017-06-15 15:56:01 +02:00
Mike Jolley 75041b6dca Remove email based actions from order screen 2017-06-15 14:19:05 +01:00
Mike Jolley 8bd7f89f73 Clear placeholder data after import 2017-06-14 16:38:07 +01:00
Mike Jolley 907b986d4f Tweak wording 2017-06-14 16:37:53 +01:00
Konstantin Kovshenin 247e13e2ca Helper: Various Improvements (#15519)
* Helper: Improve messaging and CTAs

* Helper: Update copy on connect flow

* Helper: Improve messaging around plugins without a subscription

* removes toggle from extensions that cannot be activated

* Helper: Add new `WC_Helper_Compat` class for legacy helper compat

This new class removes some of the actions from the legacy helper
(updater) plugin, attempts to migrate an existing legacy connection
to a new one, attempts to deactivate the old helper plugin.

* Helper: Improve messaging around maxed out subscriptions

* Helper: Enable `WC_Tracker` when connected to WooCommerce.com

* Helper: adds styles for manual licence form row and other visual improvements

* Helper: removes disabled toggles

* Helper: adds styles for connection component

* Helper: redesigned connection module

* Helper: rotates the connection module chevron on mouse hover

* Helper: adds some fixes to the key form on mobile and other updates to meet coding standards

* Helper: Only mark action as primary if there's a CTA button.

* Helper: Better handling for woothemes_updater_notice

Remove the updater notice built into extensions and themes, even
if the legacy Helper plugin is deactivated.

* Helper: Navigate existing Helper users to the new place.

Adds a Dashboard menu item and direct users of the old helper
plugin to the new Extensions screen.

* Helper: Do not show the back-compat menu item for new users

* Helper: Avoid notice in API authentication if credentials are missing

* Helper: Hide the back-compat menu item when users see the new screen

Also sets the user_id for the connection if one was not previously set.
2017-06-14 14:12:53 +01:00
Mike Jolley 4a4e201888 Copy tweaks for catalog visibility
Ref #15604
2017-06-14 12:07:20 +01:00
Valerie K 66259ebff1 Update WooCommerce Services copy (#15598)
* Remove excess explanation from wizard shipping step

* Remove distracting link from shipping wizard page

* Update copy on extensions WCS banner

* Update copy on WCS extensions banner for Canada

* Fix extensions WCS banner when read from json

* Add Canada copy on wizard shipping step

* Use strict array comparison in WCS shipping tout

* Add service logos to WCS extension banner

* Use strict array comparison in WCS banner

* Remove related extensions when showing WCS banner

- when store is based in Canada remove Canada Post
extension from shipping page
- when store is based in US remove USPS
extension from shipping page

* Add image alt for logos on WCS banners

* Update WCS banner and wizard content
2017-06-14 11:24:45 +01:00
Mike Jolley 393f1be092 Merge pull request #15580 from woocommerce/refactore/improve-importer-mapping-options
Better importer mapping options
2017-06-13 12:15:33 +01:00
Mike Jolley 1a6e477c83 Merge pull request #15579 from woocommerce/fix/importer-delimiter
Start handle importer delimiter
2017-06-13 11:57:10 +01:00
Umesh Ghimire b5cd0a8680 Space after parentheses 2017-06-13 09:52:27 +05:45
Claudio Sanches e6b5ac83c4 Better importer mapping options
- Rearranged fields to make easy to find
- Grouped price fields
- Include context to "Stock" since could means different things depending on the language
2017-06-12 18:08:23 -03:00
Claudio Sanches 2702647f88 Start handle importer delimiter
This make able handle the delimiter input passing to mapping screen and to the AJAX importation process.
2017-06-12 17:47:20 -03:00
Umesh Ghimire 71c22cadf1 Fixed - Directory separator issue on windows for product import file fixed. 2017-06-10 08:50:41 +05:45
Mike Jolley 3367047c8e Update total orders and items 2017-06-09 15:07:31 +01:00
Mike Jolley 4a56c8b92a Fix indent 2017-06-09 09:36:44 +01:00
nishitlangaliya 9ba5f534ea Fixed Don't show 'Restock refunded items' ref #14888 2017-06-09 09:06:57 +05:30
Claudio Sanches 8b3d1046e0 Merge pull request #15515 from woocommerce/update/15399
Tweak review settings and add global enable option
2017-06-08 15:53:00 -03:00
Mike Jolley 5ee38c54c2 Option to disable reviews globally 2017-06-08 15:26:30 +01:00
Mike Jolley b4040b1335 Translate quick edit text 2017-06-08 14:24:28 +01:00
Mike Jolley 32aca8cc39 String clarification 2017-06-08 14:08:48 +01:00
Mike Jolley 0d4dc49bd3 Break up verified owner and rating options 2017-06-08 14:06:15 +01:00
Mike Jolley 4ea9ab46a7 Avoid slow substring query 2017-06-08 12:21:55 +01:00
Mike Jolley 75480ab99f Show notes in order list 2017-06-08 12:17:46 +01:00
Mike Jolley eddcb16e00 Update copy + css for zones
Closes #15031
2017-06-06 13:46:09 +01:00
Mike Jolley d62aefba74 Merge branch 'master' into fix/15414
# Conflicts:
#	includes/wc-core-functions.php
2017-06-06 12:55:50 +01:00
Mike Jolley c77347da48 Merge pull request #15459 from woocommerce/fix/14659
Make phone number clickable
2017-06-06 11:52:05 +01:00
Claudio Sanches 6c42f3c16a Properly sanitization for wc_make_phone_clickable() and fixed coding standards
Closes #14659
2017-06-05 16:15:04 -03:00
Claudio Sanches f65005be41 Merge pull request #14719 from avinapatel/fix-14659
Made the buyer phone number clickable in the in the order backend.
2017-06-05 15:47:16 -03:00
Claudio Sanches 4aec4efa67 Merge pull request #15432 from woocommerce/update/wcs-banner-responsive
Update WooCommerce Services extensions banner
2017-06-05 15:36:22 -03:00
Claudio Sanches 527fa0d07a Fixe CHMOD 2017-06-05 14:45:30 -03:00
Valerie 70570f3745 Update WCS banner style 2017-06-05 11:30:42 -04:00
Valerie baf405fdcf Update WCS banner image 2017-06-05 11:28:37 -04:00
Valerie 8939dfc1a5 Update WCS banner text 2017-06-05 11:28:37 -04:00
Mike Jolley b4098a7472 Use WP date format in admin
Closes #15453
2017-06-05 15:58:29 +01:00
Mike Jolley 67a0637417 Advanced locale switching 2017-06-05 14:18:39 +01:00
José Marques 3d516ab9cd removes checkbox toggle markup and replaces inactive toggles links with spans 2017-06-02 11:22:48 +01:00
José Marques be229a3e5b replaces active/deactivate buttons with toggles 2017-06-01 12:51:45 +01:00
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