Commit Graph

75 Commits

Author SHA1 Message Date
claudiulodro ba363b6353 Bring up-to-date with master and resolve conflicts 2017-12-11 11:36:00 -08:00
Marcin Bot 0d12b31a13 Updated the Klarna logo 2017-12-06 14:04:28 +00:00
Paul Dechov 75afcd26be Tweak sizing and spacing towards design 2017-12-05 19:55:43 -05:00
Paul Dechov 6500b11db8 Adjust logo widths to match design and approximately equalize prominence 2017-12-05 19:55:43 -05:00
Paul Dechov d3c09a9ee5 Extend stripe setting styles to ppec 2017-12-05 14:57:43 -05:00
Marcin Bot 399e2893e1 Updated the Klarna logo 2017-12-05 17:06:35 +00:00
Marcin Bot 4229e2652a Added a new Square logo 2017-12-05 16:20:15 +00:00
Valerie e28341a9a3 Wizard: Ask user if selling in person 2017-12-05 16:20:15 +00:00
Valerie 6d2ca0fd15 Add Klarna to wizard payment step 2017-12-05 16:20:15 +00:00
Mike Jolley cbc16f7e2b Min 2017-11-15 14:34:42 +00:00
Mike Jolley 6b357bcfdc Updates the payment step copy and fixes margins 2017-10-10 15:40:03 +01: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
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
Ola Olusoga 0894abf37d Small style adjusts to onboarding
Made WooCommere logo smaller, and adjusted padding, weights, e.t.c.
Minor tweaks.
2017-10-02 16:39:12 -04:00
Valerie 72f9ce08ac Wizard: Move Jetpack TOS above button 2017-09-27 22:48:33 +03:00
Valerie d45ae38770 Wizard: Avoid too much space after last paragraph 2017-09-27 17:53:03 +03:00
Valerie 994480c3ca Wizard: Consolidate button styles in one rule 2017-09-27 17:52:53 +03:00
Valerie 562f37520d Wizard: Fix logo placement in services list 2017-09-27 17:11:10 +03:00
Valerie 263a471c40 Wizard: Fix chevron placement in toggle list 2017-09-27 17:08:47 +03: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 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 14bb189c8a Setup wizard: Update page padding 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 fc5aa77259 Setup wizard: Style shipping method description 2017-09-26 15:10:26 -06:00
Valerie 3645435e17 Setup wizard: Fix extra padding in name column 2017-09-26 15:10:26 -06:00
Valerie ad5709d3b5 Setup wizard: Add shipping list header 2017-09-26 15:10:26 -06:00
Jeff Stieler e6dc95432a Setup wizard: hide settings until a service is enabled. 2017-09-26 15:10:23 -06:00
Valerie d9e4092281 Setup wizard: Fix list toggle name color 2017-09-26 15:09:36 -06:00
Valerie e23aefef13 Setup wizard: Add toggle for manual payment list 2017-09-26 15:09:10 -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
Mike Jolley 86a225a8d9 Newsletter signup 2017-08-08 18:00:47 +01:00
Mike Jolley 4f72e9e914 Fix button styling 2017-06-05 14:46:57 +01:00
Mike Jolley c53c83aebb Tweak test and styling 2017-05-31 09:36:32 -07:00
Nabeel Sulieman 10e8c2d82e Use circular controls to indicate radio button on shipping wizard
Regenerate CSS and JS files
2017-05-31 09:35:10 -07:00
Nabeel Sulieman cd2da7fd07 Change style of checkbox in shipping wizard 2017-05-31 09:34:24 -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