Commit Graph

142 Commits

Author SHA1 Message Date
Valerie K b4088c5d91 Wizard: Handle Jetpack install, activate, and connection errors (#16983)
* Wizard: Remove extra query arg in next step URL

Remove the activate_error query arg from
the URL for the next step.

* Wizard: Remove temp queued Jetpack install option

This is done so that the option does not remain
when going through the wizard again, or when going
back to previous pages.

It prevents an infinite loop from happening when
waiting for the Jetpack install and activation
to finish on the activate step.

* Wizard: Install and activate Jetpack if needed

Add function to install & activate Jetpack as needed.
Props to @jeffstieler for the idea, and the implementation/code:
https://github.com/Automattic/woocommerce-services/pull/1031#discussion_r122505316
https://github.com/Automattic/jetpack/blob/master/3rd-party/woocommerce-services.php#L101

Add a list of errors and a function to get the correct error message.

After clicking the connect Jetpack button, make sure that
Jetpack is installed and activated.

On error, redirect to the activate page with a query arg.

* Wizard: Show Jetpack error message if it exists

Always check for an error message when displaying
the activate step. If the error
message exists, display it at the top of the page.

* Remove redundant "if" so the $title in the Activate step is always a valid string

* Tweaked the "Server is on a private network" Jetpack activation error message.
2017-10-05 12:51:49 +01:00
Shiva Poudel 7cd968c69b Fix - Admin footer text 2017-10-04 15:33:22 +05:45
Jeff Stieler 6c08b9644b Setup wizard: wait for in-progress Jetpack installation to complete before submitting form.
We need to know that Jetpack is active before moving to the next step. The previously logic fired off a synchronous installation that caused a race condition.
2017-09-26 15:09:41 -06:00
Rami Yushuvaev 323c177bb0 i18n: Avoid using HTML tags in translation strings
Old translation string:

* `If you like <strong>WooCommerce</strong> please leave us a %s rating. A huge thanks in advance!`

New translation string:

* `If you like %1$s please leave us a %2$s rating. A huge thanks in advance!`
2017-08-25 00:39:13 +03:00
Mike Jolley 140771e759 Merge branch 'master' into improvement/versions
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
#	assets/css/helper-rtl.css
#	assets/css/helper.css
#	assets/css/twenty-seventeen-rtl.css
#	assets/css/twenty-seventeen.css
#	assets/css/wc-setup-rtl.css
#	assets/css/wc-setup.css
2017-08-09 10:08:06 +01:00
claudiulodro 7f614d17d4 Modularize to corral different areas better 2017-08-02 14:57:17 -07:00
claudiulodro 343b3913a4 Updates screen modal. 2017-08-01 15:04:11 -07:00
Jaydeep Rami 46d3638089 Fix missing return statement (#16148)
* Fix missing return statement

* Fix missing return statement

* Fix missing return statement

* Fix missing return statement

* Fix missing return statement

* Fix missing return statement
2017-07-20 18:01:14 +01:00
claudiulodro f79c4a254c Good progress 2017-07-11 07:52:40 -07: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 532ddfa6b0 Merge conflicts 2017-05-31 12:23:52 +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 7293025c92 Import page placeholder 2017-05-16 15:21:35 +01:00
Mike Jolley fd3bf05017 Working prototype exporter for products 2017-05-10 17:22:08 +01:00
Konstantin Kovshenin e8b9bc8f98 Helper: First pass at merging the Helper plugin into WooCommerce
* Connect a site to a WooCommerce.com account
* List available product subscriptions
* Activate/deactivate subscriptions and extensions
* Serve updates for active subscriptions
2017-04-21 15:05:44 +03:00
Claudio Sanches 989d60a60a Include WooCommerce endpoints to customize nav menu setting 2017-03-28 18:07:00 -03:00
Claudio Sanches a4d2048755 Fixed confuse translatable URLs 2017-02-24 16:41:56 -03:00
Shiva Poudel 8171c73e9b Tweak - Exclude profile pages from WC pages using array_diff 2017-01-10 21:55:11 +05:45
Mike Jolley 958b97a578 Merge pull request #12129 from shivapoudel/plugin-review
Update wp.org plugin review rating link
2016-10-19 11:14:21 +01:00
Shiva Poudel 64c6ec8537 Update wp.org plugin review rating link 2016-10-19 11:29:20 +05:45
Claudio Sanches 657c312cae Fix strings case (#12069)
* Fixed case for all _e, esc_attr_e and esc_html_e strings

* Fixed case for all _n_noop strings

* Fixed case for all _x strings

* Fixed case for all __, esc_html__ and esc_attr__ strings

* Fixed a few more strings

* Fixed strings in unit tests

* Fix PayPal Standard case.

* Save Order text
2016-10-12 11:16:30 +01:00
Aristeides Stathopoulos 0516e96843 PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket 2016-09-02 04:33:57 +03:00
Aristeides Stathopoulos fde1037757 fix failing tests. 2016-09-01 23:50:14 +03:00
Oliver Juhas 9a0c283b10 Making sure `wc_get_screen_ids` function exists
This is a fix for issue #11795
2016-08-27 16:46:23 +02:00
Mike Jolley 66c61eebc8 Define full path for includes
Closes #11087
2016-07-27 11:58:43 +01:00
Patrick Rauland efee5d9b9b updating rating admin footer text to remove references to WooThemes 2016-07-04 11:33:24 -06:00
Mike Jolley 479a136edb Added view_admin_dashboard cap for disabling the admin access restriction in custom roles.
Closes #11198 @claudiosmweb
2016-06-21 11:18:14 +01:00
Claudio Sanches 33b12d70ee Fixed WC_Admin version 2016-05-20 18:02:57 -03:00
Nico Hauser 62dbb131ac Bumped version 2016-05-20 17:00:19 +02:00
Nico Hauser d75d784e48 Add 'woocommerce_mail_content' to preview
Added the 'woocommerce_mail_content' filter which is used before sending the email in /includes/emails/class-wc-email.php#L465 to the preview
2016-05-20 16:47:18 +02:00
Mike Jolley c1830c12cc Redirect to install page w/ nonce
Fixes #10860
2016-05-11 17:01:34 +01:00
Mike Jolley 43af207558 Output buffering and redirects after turning off legacy
Closes #10806
2016-04-28 12:36:51 +01:00
Shiva Poudel abe2f108f9 View mode option logic moved to appropriate post-type class 2016-02-20 00:49:36 +05:45
Justin Shreve 2968a66a01 Hide the "View Mode" option on the "Screen Options" tab for products, orders, and coupons. 2016-02-18 11:58:36 -08:00
Mike Jolley 3cef28efe8 [2.5] Error handling for screen ids
Fixes #10280
2016-02-05 12:16:44 +00:00
Gregor Capuder f785561f5f Added a filter for disabling automatic redirect to the setup wizard, after plugin activation. 2015-12-22 12:03:31 +01:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches efa19f799d Fixed some coding standards for docblocks 2015-11-03 10:28:01 -02:00
Mike Jolley 8279db6679 If redirection to setup wizard does not occur, do not redirect at all 2015-10-23 12:24:04 +01:00
Mike Jolley 68cb6b11ee Removed welcome page
2.5 release doesn’t have enough user-facing features to justify a
full-blown welcome page, and translation credits are no longer
obtainable after translate.wordpress switch. Removed the page to keep
things streamlined.
@claudiosmweb @mattyza
2015-10-09 11:56:13 +01:00
George Stephanis c938fa24da More missing esc_attr calls, :( 2015-08-05 15:17:52 -04:00
Shiva Poudel 3d328c92c4 Method should be conditional_includes 2015-07-06 15:34:31 +05:45
Mike Jolley 18c6a940f1 Merge branch 'onboarding'
Conflicts:
	assets/css/admin.css
	assets/css/select2.css
	assets/css/woocommerce-layout.css
	assets/css/woocommerce.css
	assets/js/admin/order-backbone-modal.min.js
	includes/admin/class-wc-admin-help.php
	includes/admin/class-wc-admin.php
	includes/admin/views/html-admin-page-status-report.php
	includes/admin/views/html-notice-install.php
	includes/admin/views/html-notice-template-check.php
	includes/admin/views/html-notice-theme-support.php
	includes/admin/views/html-notice-tracking.php
	includes/class-wc-install.php
	includes/class-wc-language-pack-upgrader.php

includes/shipping/international-delivery/class-wc-shipping-international
-delivery.php
2015-07-04 23:11:12 +01:00
Mike Jolley 2febc8f20a Add capability checks to ajax requests
Closes #15
2015-06-01 13:38:00 +01:00
Fulvio Notarstefano c0dda8c582 Typos conditonal_includes -> conditional_includes
I believe you meant 'conditional' - I don't think it's referenced elsewhere so it should be safe to rename
2015-05-22 16:01:55 +02:00
Claudio Sanches e106d57947 Merged #8021 2015-05-18 16:53:04 -03:00
Claudio Sanches 2689d8b51e Created api keys table list 2015-05-15 23:03:24 -03:00
Mike Jolley 18d671731c Pointers 2015-04-30 13:30:03 +01:00
Mike Jolley fcf6e97f7c Small code tweaks 2015-04-29 11:32:03 +01:00
Mike Jolley e454c52e58 Optimise admin redirect function 2015-04-29 11:24:29 +01:00
Mike Jolley 7263a4ace2 woocommerce_enable_setup_wizard filter 2015-04-29 10:59:59 +01:00
Mike Jolley 4b92f642b3 Trigger wizard on install 2015-04-29 10:47:57 +01:00
Claudio Sanches c0a8e4d87e [2.3] Error prevention for WC_Admin::admin_footer_text(), closes #8057 2015-04-28 11:06:40 -03:00
Mike Jolley 5466f0edeb Move into separate class 2015-04-28 13:19:16 +01:00
Claudio Sanches d0c71bd46e Fixe the admin access for subscsribers and customers 2015-02-27 13:32:47 -03:00
Mike Jolley 2caf287258 Tweak rating prompt text on click, and change once rated
@bftrick This is to keep the .org folk happy and look less spammy :)
2015-02-19 11:38:35 +00:00
Claudio Sanches 6c7a22b910 Removed admin message from user profile pages, closes #7478 2015-02-18 15:06:11 -02:00
Claudio Sanches c97dffcc66 Improved the WC_Admin::admin_footer_text(), closes #7461 2015-02-17 16:24:11 -02:00
Paul Wilde c913316f8b Introduce wc_get_page_permalink. 2015-02-15 19:13:22 +00:00
Mike Jolley 1785d48096 Update rating text
Based on feedback from Marina and James, cc @bftrick
2015-02-02 14:53:13 +00:00
Bryce 171f189f70 Update URL to link to review form
Closes #7243
2015-01-30 18:26:01 +07:00
Claudio Sanches 7eb3ec9a4a Admin footer text improvements #7234
@BFTrick @mikejolley
2015-01-29 10:41:39 -02:00
Patrick Rauland e7224cdc1d using wc_get_screen_ids instead of manually typing them out. see #7213 2015-01-28 17:20:38 -07:00
Patrick Rauland ee11ac6080 adding please rate our plugin footer text. closes #7213 2015-01-28 17:13:13 -07:00
Mike Jolley 2d8f021cc7 Optimise the admin notices class.
@claudiosmweb
2015-01-20 15:23:34 +00:00
Claudio Sanches 2626275782 Edit and deleted webhooks 2015-01-09 15:42:01 -02:00
Patrick Rauland d8ff34710d adding email styles back to email preview. closes #6965 2014-12-16 11:32:54 -07:00
Tamara Zuk af442599b1 Code Standards: Finish up admin includes
* fixed indentation - swapped spaces for tabs at start of line, swapped
tabs for spaces min-line for alignment
* removed instances of `@return void` and `@access public`

@see http://make.wordpress.org/core/handbook/coding-standards/php/

@see part 1: #6157
2014-11-30 01:52:32 -05:00
shivapoudel 4091fe00ad Absolute path and Indentation fix for includes/admin/{roots-files}.php :) 2014-09-21 01:37:30 +05:45
claudiosmweb 78c7fefe3e fixed some docblocks 2014-09-02 16:50:19 -03:00
Patrick Rauland 8e3c3a61db adding brackets around if statement 2014-06-17 16:40:54 -05:00
Mike Jolley ded4b7404d Admin changes for #5046
- Removed post type classes. Since they were always loaded, there was
no benefit having them split up. Combined meaning less hooked in
methods.
- Stopped loading some function files and sessions in the admin area.
They are not needed there.
- Made a few admin page classes static as they are stateless
2014-06-04 11:16:19 +01:00
Coen Jacobs 09a9463b0a Removed unused TinyMCE button 2014-05-26 16:17:56 +02:00
Mike Jolley 8d52b8d243 No class exist check needed for files included once #4616 2014-02-05 15:02:30 +00:00
Mike Jolley 0ceb0d194b Include admin functions for less complier on install. Closes #4527 2014-01-21 11:24:48 +00:00
Mike Jolley 8910042a99 Don't load some classes during ajax events Closes #4282 2013-12-05 15:34:37 +00:00
Coen Jacobs 676330de2a More code styling and return value optimisations 2013-11-29 10:33:24 +01:00
Coen Jacobs 47ae00be28 Page functions woocommerce to wc refactor 2013-11-25 15:07:22 +01:00
Max Rice 1ce5a71f3d Load admin profile class when editing a user 2013-11-23 13:41:10 -05:00
Mike Jolley ff0fae0c1f action, not filter 2013-11-07 09:53:28 +00:00
Mike Jolley 447b9d8b4f Unlike the suggestion in #3965, the HTML email preview should preview the layout only (selected colours etc). Content is irrelevant.
Closes #3965
2013-10-31 15:07:43 +00:00
Mike Jolley 22eaf33bfe Filter links + woocommerce_enable_admin_help_tab 2013-10-22 18:20:33 +01:00
Mike Jolley 51ee4ee2d8 Allow access to admin-post Closes #3814 2013-09-24 15:21:40 +01:00
Mike Jolley 355dd16962 Removed @coenjacobs helpers and cleaned up main clas 2013-09-12 14:41:02 +01:00
Mike Jolley d77bac9330 Removed hooks and functions from admin. 2013-08-06 16:56:15 +01:00
Mike Jolley f09fafe738 Meta box refactor
Closes #3458.
2013-08-06 11:41:20 +01:00
Mike Jolley 981575491d Review order columns Closes #2798. 2013-07-31 15:12:53 +01:00
Mike Jolley e7bd988470 Admin taxonomies 2013-07-25 17:51:28 +01:00
Mike Jolley cd50b328a2 Install and update functions 2013-07-25 16:29:25 +01:00
Mike Jolley 8f04446a61 Dashboard. Closes #3493 2013-07-25 15:00:23 +01:00
Mike Jolley 728b1bf244 Some more admin class conversions 2013-07-24 19:55:02 +01:00
Mike Jolley 8a6ff89bf1 Moved admin directory and moved some functions to classes (ongoing refactor) 2013-07-24 17:01:36 +01:00