Commit Graph

3512 Commits

Author SHA1 Message Date
Jeff Stieler 4c66520989 Setup wizard: set a flag when Jetpack is opted into.
This is to be picked up by the WooCommerce Services extension.
2017-10-06 20:40:25 -06:00
Konstantin Kovshenin 70a72693c3 Helper: Fix automatic subscription activation
Fixes a bug where automatic subscription activation upon plugin
activation does not trigger due to the subscription being unlimited.
2017-10-06 17:12:55 +03:00
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
Valerie K 61caed9cb8 Wizard: Add Stripe Email (#17029)
* Wizard: Add Stripe email input, show previously entered payment settings, only save settings for enabled gateways
2017-10-04 13:37:59 -06:00
Jeff Stieler b72ad3f2cc Setup wizard: fix logic error when detecting existing shipping zones. (#16995)
* Setup wizard: fix logic error when detecting existing shipping zones.
* Hide the shipping zones sections on the Shipping step if there are already shipping zones configured in the store.
2017-10-04 11:48:06 -06:00
Mike Jolley 38434e3288 Merge pull request #17052 from shivapoudel/fix/footer-text
Fix - Admin footer text
2017-10-04 14:44:46 +01:00
James Koster e26302b1ff Nothing to be translated any more! 2017-10-04 13:11:44 +01:00
James Koster 7c05dde430 Remove "Powered by WooCommerce" credit in default email footer text setting. closes #17053 2017-10-04 12:40:18 +01:00
Shiva Poudel 7cd968c69b Fix - Admin footer text 2017-10-04 15:33:22 +05:45
Valerie 60e9258913 Wizard: Update option for types of product sold 2017-10-03 17:38:08 +02:00
Valerie 3ca5ded150 Wizard: Reset live rates options on save 2017-10-03 17:30:00 +02:00
Valerie 450236c8d9 Wizard: Update store setup text 2017-10-03 17:30:00 +02:00
Valerie 9da7925288 Wizard: Fix paragraph bottom margin
Avoid too little bottom margin when the paragraph
is the last paragraph on the page, but not the last element.

Avoid too much bottom margin when there were nonce fields
after the last paragraph on the page.
2017-10-03 17:29:22 +02:00
Valerie 9a2ab72cd6 Wizard: Style tracking option 2017-10-03 17:26:32 +02:00
Mike Jolley e0421cd7bc Replay protection on refunds
Sends the current refunded amount with the request, so if a refund is
attempted twice it will mismatch.

Fixes #13614
2017-09-28 16:17:13 +01:00
claudiulodro a5c2ebb2f2 Bring up-to-date with master and recompile css 2017-09-27 13:32:09 -07:00
Jeff Stieler f6c0054aa1 Setup wizard: use a setup wizard specific ID for the Jetpack connection URL. 2017-09-27 14:04:40 -06:00
Valerie 5e33fc0b58 Wizard: Fix bad email check for Stripe status
We are no longer asking for the user's email or
saving it, so it shouldn't be checked against.
2017-09-27 23:03:01 +03:00
Valerie 72f9ce08ac Wizard: Move Jetpack TOS above button 2017-09-27 22:48:33 +03:00
Jeff Stieler 6793afed50 Setup wizard: for non-Services merchants, mention that Jetpack is for “extra” features on the activate step. 2017-09-27 13:27:52 -06:00
Valerie b772b002a9 Wizard: Save payments enabled status
- toggle payment option on if its setting was previously saved,
  or if it's listed as to be toggled on be default
- check if setting is saved as enabled in options
2017-09-27 22:26:13 +03:00
Jeff Stieler 3f7c3af3e5 Setup wizard: default Stripe gateway on, swap email input for opt-in account creation. 2017-09-27 13:14:13 -06:00
Jeff Stieler 7b9b09e9ad Setup wizard: consolidate translations for Jetpack enabled features list as much as possible. 2017-09-27 12:46:01 -06:00
Valerie 8c2a2860e3 Wizard: Correctly save taxes opt-in status
- Make sure to save the option every time, even if not selected
- Show the corresponding state in the toggle
2017-09-27 20:05:41 +03:00
Valerie 0b2bad8122 Wizard: Update 'WP Admin' to 'dashboard' 2017-09-27 17:30:09 +03:00
Valerie bd98a7098d Wizard: Remove superfluous description in last step 2017-09-27 17:29:40 +03:00
Valerie d6c94e4837 Wizard: Remove superfluous Extras description 2017-09-27 17:26:43 +03:00
Valerie a09b7f1670 Wizard: Update shipping info text 2017-09-27 17:24:50 +03:00
Konstantin Kovshenin d63eb56753 Helper: Add a new filter to display only installed extensions. 2017-09-27 15:17:24 +03:00
Mike Jolley 9800d72c82 Merge pull request #16949 from woocommerce/fix/16928
[Importer] Display error message when it's impossible to get a sample of the file
2017-09-27 13:01:20 +01:00
José Marques 409a3a0141 Helper: replaces path on logo image to new Woo theme location path 2017-09-27 11:07:19 +01:00
Jeff Stieler 3a3ae914a3 Setup wizard: add TOS blurb to the “activate” step. 2017-09-26 15:10:30 -06:00
Valerie f183344a9c Wizard: Style footnote on last page 2017-09-26 15:10:30 -06:00
Valerie 83d7b03883 Wizard: Style next actions section 2017-09-26 15:10:29 -06:00
Valerie 2348faf9e5 Wizard: style newsletter form 2017-09-26 15:10:29 -06:00
Valerie f4bc596664 Wizard: Make payment service email required 2017-09-26 15:10:29 -06:00
Valerie 5a7db686c5 Wizard: Add placeholder to flat rate cost input 2017-09-26 15:10:29 -06:00
Valerie aee55f4b68 Wizard: Style shipping method selection 2017-09-26 15:10:29 -06:00
Valerie 17a97ca3f7 Wizard: Remove inline CSS for unit dropdowns 2017-09-26 15:10:28 -06:00
Valerie 4be979f322 Setup wizard: Style email input for payment service 2017-09-26 15:10:28 -06:00
Valerie 1dadabaa56 Setup wizard: Style store info form 2017-09-26 15:10:28 -06:00
Valerie 244296b814 Setup wizard: Update button style 2017-09-26 15:10:27 -06:00
Valerie 426c0c2743 Setup wizard: Style Jetpack logo 2017-09-26 15:10:27 -06:00
Valerie 24e3db78ec Setup wizard: Style Jetpack feature sections 2017-09-26 15:10:27 -06:00
Valerie 0f04645bea Setup wizard: Show correct shipping text on select 2017-09-26 15:10:27 -06:00
Valerie 1960b6bcd1 Setup wizard: Fix thick border in toggle list 2017-09-26 15:10:27 -06:00
Valerie 18deb4dc2e Setup wizard: Style shipping unit selection 2017-09-26 15:10:26 -06:00
Valerie 43949c2b74 Setup wizard: Add shipping units descriptions 2017-09-26 15:10:26 -06:00
Valerie fc5aa77259 Setup wizard: Style shipping method description 2017-09-26 15:10:26 -06:00
Daniel Rey Lopez a5d8c371b4 Added logic to install the plugins and themes asynchronously but without using wp-cron 2017-09-26 15:10:25 -06:00
Daniel Rey Lopez 28964433fb Added wrapper function for installing a theme 2017-09-26 15:10:25 -06:00
Daniel Rey Lopez 73183634d2 Removed unused "background" argument, since it's always true 2017-09-26 15:10:25 -06:00
Daniel Rey Lopez 5c867094cc Remove unused install_jetpack() function parameter. 2017-09-26 15:10:25 -06:00
Jeff Stieler 3ba7617594 Setup wizard: change copy to “recommended” extras. 2017-09-26 15:10:24 -06:00
Jeff Stieler 09bbb1c3de Setup wizard: update the copy in several places. 2017-09-26 15:10:24 -06:00
Jeff Stieler 5ced91d56f Setup wizard: update comments to have ending punctuation and fix a few typos. 2017-09-26 15:10:24 -06:00
Jeff Stieler 47085db0b2 Setup wizard: refactor featured service check to be more efficient.
Use `empty()` instead of `isset()` and a comparison.
2017-09-26 15:10:24 -06:00
Jeff Stieler e220926b65 Setup wizard: remove markup (where possible) from the translated Stripe service description. 2017-09-26 15:10:24 -06:00
Jeff Stieler e4614b39e3 Setup wizard: make Stripe an opt-in gateway, rename “manual payments” to “offline” payments to align with the header text. 2017-09-26 15:10:24 -06:00
Jeff Stieler e6dc95432a Setup wizard: hide settings until a service is enabled. 2017-09-26 15:10:23 -06:00
Jeff Stieler 3a09d74ed4 Setup wizard: use email address of the current user (not the admin) on payments and “ready!” steps. 2017-09-26 15:09:44 -06:00
Jeff Stieler 27c6a3a141 Setup wizard: clean up unused array keys when determining Stripe country support. 2017-09-26 15:09:44 -06:00
Jeff Stieler 202808fdb8 Setup wizard: fix missing translations on payments step. 2017-09-26 15:09:43 -06:00
Jeff Stieler 3fda0f00a0 Setup wizard: remove contraction and add oxford comma to tailored “activate” step messaging. 2017-09-26 15:09:43 -06:00
Jeff Stieler a3ce6b8e81 Setup wizard: fix coding standard issues with “activate” step tailored messaging. 2017-09-26 15:09:43 -06:00
Marcin Bot 5c3e505539 Fixed the way the Jetpack string is translated 2017-09-26 15:09:43 -06:00
Marcin Bot d2116c576c Tailored the Jetpack step message to the services selected 2017-09-26 15:09:42 -06:00
Jeff Stieler 592508fc49 Setup wizard: ensure that the current user can install plugins for any setup feature that requires it. 2017-09-26 15:09:42 -06:00
Jeff Stieler e19db10be8 Setup wizard: short circuit the shipping zone setup earlier. 2017-09-26 15:09:42 -06:00
Jeff Stieler 4bf21b9724 Setup wizard: remove now unused locale and tax interactions from client side script. 2017-09-26 15:09:41 -06:00
Jeff Stieler b5fba545f6 Setup wizard: set currency formatting options based on store location. 2017-09-26 15:09:41 -06:00
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
Jeff Stieler c4c19623c0 Setup wizard: set flag for queued Jetpack installs.
This sets up the ability to avoid installation race conditions.
2017-09-26 15:09:41 -06:00
Jeff Stieler 337e3c02e4 Setup wizard: queue Jetpack installation ahead of payment gateways. 2017-09-26 15:09:41 -06:00
Jeff Stieler c0bc74154d Setup wizard: fix PHP warnings when saving shipping method settings. 2017-09-26 15:09:40 -06:00
Jeff Stieler 325cea86c6 Setup wizard: keep user in setup wizard in case of Jetpack connection error. 2017-09-26 15:09:40 -06:00
Jeff Stieler b85d311dff Setup wizard: save shipping method settings chosen on shipping step. 2017-09-26 15:09:40 -06:00
Jeff Stieler 081bcb2fc2 Setup wizard: refactor shipping method form rendering to group inputs into an array. 2017-09-26 15:09:39 -06:00
Jeff Stieler 96b0fcaacf Setup wizard: simplify automated tax eligibility check.
Use the WC_Countries class to gather EU countries.
2017-09-26 15:09:39 -06:00
Jeff Stieler e8ee3fd35a Setup wizard: enable tax calculation if automated taxes are enabled. 2017-09-26 15:09:39 -06:00
Jeff Stieler 5642868436 Setup wizard: add method-specific settings and descriptions to shipping step. 2017-09-26 15:09:39 -06:00
Jeff Stieler 59ca25aba7 Setup wizard: fix UI block when HTML5 form validation fails. 2017-09-26 15:09:38 -06:00
Jeff Stieler 2e85ff1c0e Setup wizard: revert to combined country/state selection in initial step. 2017-09-26 15:09:38 -06:00
Jeff Stieler 5f5a4da48d Setup wizard: update “ready” step overall structure.
Removed tweet, updated text. Note: completely unstyled.
2017-09-26 15:09:38 -06:00
Jeff Stieler 1a8cb7a6a4 Setup wizard: update “activate” step overall structure.
Change the Jetpack feature descriptions, graphic, placement of CTA button. Note: completely unstyled.
2017-09-26 15:09:38 -06:00
Jeff Stieler 189fbd571b Setup wizard: remove now unused “theme” step. 2017-09-26 15:09:37 -06:00
Jeff Stieler 1034dc597b Setup wizard: “extras” step save handler. 2017-09-26 15:09:37 -06:00
Jeff Stieler 4daef097fd Setup wizard: replace “theme” step with “extras” step.
Presentation only. Determine need for a WooCommerce theme and support for automated taxes, showing options to enable each. If the store isn’t eligible for either, hide the step entirely.
2017-09-26 15:09:37 -06:00
Jeff Stieler 90acbe97b4 Setup wizard: update shipping step save method.
The shipping step now detects if live rates can be configured and allows the user to add shipping methods to a domestic and international zone. Note: flat rate shipping still needs an input for rate.
2017-09-26 15:09:37 -06:00
Jeff Stieler d1c5b8239b Setup wizard: basic layout changes for shipping step.
Still needs finer touches in styling and dynamic descriptions for shipping method options.
2017-09-26 15:09:37 -06:00
Jeff Stieler 32dcfaa080 Setup wizard: fix PHP warning ‘undefined index’ in service item display method. 2017-09-26 15:09:36 -06:00
Valerie 666983bfaa Setup wizard: Fix spacing 2017-09-26 15:09:36 -06:00
Valerie afd9646c8f Setup wizard: Add country-based intro to Shipping 2017-09-26 15:09:36 -06:00
Valerie 89f34c4996 Setup wizard: Fix typo 2017-09-26 15:09:10 -06:00
Valerie e23aefef13 Setup wizard: Add toggle for manual payment list 2017-09-26 15:09:10 -06:00
Valerie 04574700a5 Setup wizard: Update Stripe featured style
- filter in-cart payment gateways by featured
- display featured and others in separate lists
2017-09-26 15:08:31 -06:00
Valerie 1eda1a026d Setup wizard: Add function to display service rows
- Update style
- Use new reusable class 'wc-wizard-services' instead of
'wc-wizard-payment-gateways'
- Update JS script for toggling checkboxes
- Update payment gateways: in-cart and manual
- Update POST variable names in save function
2017-09-26 15:08:31 -06:00
Valerie 39028f082a Setup wizard: Remove extra variable assignment 2017-09-26 15:07:14 -06:00
Valerie 32df816077 Setup wizard: Fix typo in PayPal Braintree description 2017-09-26 15:07:14 -06:00
Valerie 231f5190a2 Setup wizard: Fix Stripe description markup 2017-09-26 15:07:13 -06:00
Valerie c79320d9e4 Setup wizard: Move tracking checkbox to end of page 2017-09-26 15:07:13 -06:00
Valerie daabafbe24 Setup wizard: Add label for second address field 2017-09-26 15:07:13 -06:00
Jeff Stieler 65110cebea Setup wizard: show previously selected product type and remove shipping step when selling digital products only. 2017-09-26 15:07:13 -06:00
Jeff Stieler a196fdfc94 Setup wizard: install Jetpack and initiate connection flow when “saving” the activate step. 2017-09-26 15:07:12 -06:00
Jeff Stieler 99beab7070 Setup wizard: allow plugin install to happen immediately. 2017-09-26 15:07:12 -06:00
Jeff Stieler a83bcd7c39 Setup wizard: install WooCommerce Services if Stripe gateway is enabled. 2017-09-26 15:07:12 -06:00
Jeff Stieler 11d145fbc8 Setup wizard: refactor plugin installation logic and use it in payment gateway save method. 2017-09-26 15:07:12 -06:00
Jeff Stieler 94936ccda0 Setup wizard: refactor WooCommerce Services installer logic to be reusable. 2017-09-26 15:07:11 -06:00
Jeff Stieler 14066f33ec Setup wizard: add “skip” link to activate step. 2017-09-26 15:07:11 -06:00
Jeff Stieler 7e2ffa2043 Setup wizard: add “activate” step, modeled after theme step.
Initial commit - needs styling love and Jetpack connection hookup.
2017-09-26 15:07:11 -06:00
Jeff Stieler a423098193 Setup wizard: remove “location” step. 2017-09-26 15:07:11 -06:00
Jeff Stieler 91dfc4875e Setup wizard: remove “skip” link from payments step. 2017-09-26 15:07:10 -06:00
Jeff Stieler c9dd317b2e Setup wizard: differentiate between “in cart” and “manual” payment gateways.
This is in preparation to display the manual gateways behind a collapsable control.
2017-09-26 15:07:10 -06:00
Jeff Stieler 49443388d7 Setup wizard: check country for Stripe support before defaulting to it. 2017-09-26 15:07:10 -06:00
Jeff Stieler 70588a4a99 Setup wizard: update Stripe gateway description, default it to enabled. 2017-09-26 15:07:10 -06:00
Jeff Stieler 81773cc253 Setup wizard: replace “pages” step with “payments”. 2017-09-26 15:07:09 -06:00
Jeff Stieler 72c744e2d2 Setup wizard: remove (now) unused introduction step. 2017-09-26 15:07:09 -06:00
Jeff Stieler 9c45bd07c7 Setup wizard: save settings from initial “store setup” step. 2017-09-26 15:07:09 -06:00
Jeff Stieler 30fd62cfb8 Setup wizard: add “not right now” dashboard link on the initial wizard step. 2017-09-26 15:07:09 -06:00
Jeff Stieler b159347cfb Setup wizard: highlight first step in progress indicator. 2017-09-26 15:07:09 -06:00
Jeff Stieler 15d1edb180 Setup wizard: replaced “introduction” step with “store setup”.
New store setup step contains location, currency, page setup, and tracking opt-in. Form is display only.
2017-09-26 15:07:08 -06:00
Claudio Sanches 0c6392eeef Display error message when it's impossible to get a sample of the file.
When the file is empty or using an incorrect charset will display just an empty screen, since we output errors before check if the file is valid.

I included the error output inside the mapping step in order to fix this issue, and added a new option to display buttons after the error  message.

Closes #16928
2017-09-26 17:48:37 -03:00
Mike Jolley 120a39efd5 Handle full refunds in tax report by date
Fixes #16937
2017-09-26 18:27:53 +01:00
Mike Jolley 00ae606381 Merge pull request #16924 from woocommerce/fix/wistia
Replace wistia videos with youtube
2017-09-26 11:32:45 +01:00
claudiulodro a74ccdb4d1 https the oembed url 2017-09-25 14:48:05 -07:00
Claudio Sanches b68b4eeb6b Fixed 'Download %d URL' string 2017-09-25 14:14:55 -03:00
Claudio Sanches 9fc6615909 Removed new translatable string introduced in #16843
Fixes #16843
2017-09-25 14:13:50 -03:00
Mike Jolley c325ebfb2e Tweak branding in embed code 2017-09-25 15:15:41 +01:00
Mike Jolley 4ea80ffa9e Youtube videos 2017-09-25 15:07:02 +01:00
Claudio Sanches 6164be51d3 Escape classes in data panel 2017-09-25 10:56:14 -03:00
Mike Jolley 4f9b886d09 Merge branch 'pr/16871' 2017-09-25 12:22:24 +01:00
Mike Jolley 45aaa22bb9 correct isset 2017-09-25 12:22:17 +01:00
Mike Jolley 35740448a0 Merge pull request #16885 from woocommerce/fix/16845
Move js clipboards off zeroclipboard
2017-09-22 14:18:44 +01:00
claudiulodro ee30de89a8 Shuffle things around to prevent errors and for better performance 2017-09-21 14:06:44 -07:00
claudiulodro 279ac6814c Move clipboards off zeroclipboard 2017-09-21 13:09:36 -07:00
Shakeeb Sadikeen da6a37c0d1 fixed : custom tab with no class error
when class is not passed with custom tab. echo's undefined index error with classes fixed
2017-09-20 22:14:58 +05:30
claudiulodro 9d8e308a78 Make importer columns case-insensitive 2017-09-17 10:18:03 -07:00
Dharmesh Patel d877ab31c5 Apply filter on product csv importer steps. 2017-09-13 23:56:15 +05:30
Patrick Garman 05c27f0f70 Match the database sizes up with the right labels 2017-09-02 18:56:29 -05:00
Mike Jolley d58a09e76a Merge branch 'master' into helper-updates
# Conflicts:
#	assets/css/admin-rtl.css
#	assets/css/admin.css
2017-08-30 21:22:48 +01:00
Konstantin Kovshenin 4a5d0c3ec3 Helper: Clean up unused code. 2017-08-30 18:39:45 +03:00
Konstantin Kovshenin 64467a0925 Helper: Cache a zero updates count if update data is not available or empty. 2017-08-30 17:46:33 +03:00
Mike Jolley fce69c3dad Fix status page padding 2017-08-30 15:39:54 +01:00
Konstantin Kovshenin ebb5bfc521 Helper: Better markup for filters output. 2017-08-30 17:39:02 +03:00
Konstantin Kovshenin b5f1692ff3 Helper: Unify update-count markup into a single helper method. 2017-08-30 17:19:06 +03:00
Konstantin Kovshenin a9619da513 Merge branch 'helper-updates' of github.com:woocommerce/woocommerce into helper-updates 2017-08-30 17:12:36 +03:00
Konstantin Kovshenin a59ce3b6b1 Helper: Change woo- prefix to woocommerce-com-. 2017-08-30 17:07:37 +03:00
Lee Willis e3be6a12dd Check all plugins for presence in the untested plugins list, not just WooCommerce ones 2017-08-30 10:25:01 +01:00
Lee Willis 5400bbaf6d Use array_key_exists() instead of in_array() 2017-08-30 10:16:49 +01:00
Lee Willis cec5fef23c Flag untested extensions on the status report 2017-08-29 17:15:16 +01:00