8f3de46637
Merge branch 'master' into update/setup-wizard-omit-paypal-standard
2017-12-13 09:41:25 -05:00
d7ae29fe51
Fix UK country code in Square support check
2017-12-13 09:37:15 -05:00
f4c557a9be
Add test verifying that the correct list of payment gateways is returned per country
2017-12-13 09:35:43 -05:00
71c9025709
Updates CSS for chevron to work across browsers - input::before is not supported in Firefox.
2017-12-13 14:30:00 +00:00
b1b604b401
Fix stripe being shown in Klarna and Square cases regardless of Stripe support
...
No difference in practice, since I believe all Klarna and Square countries are supported by Stripe, but for robustness this should be explicitly checked.
2017-12-12 20:39:04 -05:00
b26a3ca1a2
Fix 'Klarna Payments' name
2017-12-12 20:22:01 -05:00
4511c5ae12
Make PPEC opt-out in every case
2017-12-12 20:21:21 -05:00
1706c3e152
Refactor 'get_wizard_in_cart_payment_gateways' function
...
Extract function that returns all possible in-cart gateways, and tighten the logic overall.
2017-12-12 20:20:26 -05:00
080c5b50e7
Omit PayPal Standard unless plugins cannot be installed
2017-12-12 14:04:36 -05:00
200c6780e9
Setup wizard: omit unnecessary sentence from PPEC settings description
2017-12-12 13:57:46 -05:00
a89b8cd707
Update the logo in the wizard
2017-12-12 17:38:10 +00:00
4af3f9f12f
Add class back to paypal in wizard
2017-12-12 08:24:35 -08:00
ba363b6353
Bring up-to-date with master and resolve conflicts
2017-12-11 11:36:00 -08:00
3b94d0c52b
Bring up-to-date with master and resolve conflict
2017-12-11 10:27:05 -08:00
0f84a5eb4b
Revise checkbox label
2017-12-11 09:50:27 -05:00
d0756a4a36
Fixed the undefined index notice
2017-12-07 11:20:04 +00:00
1433347eda
Remove unused description string for Braintree
2017-12-06 15:36:46 -05:00
f2cc10922a
Add full stops to code comments
2017-12-06 14:53:31 -05:00
c75f5f54af
Show PPEC instead of Braintree in US, and remove Braintree altogether
2017-12-06 10:02:32 -05:00
94da7ffbed
Default PPEC to enabled
2017-12-06 10:01:55 -05:00
28c4dc0fbe
Install WCS if PPEC settings set
2017-12-06 09:19:39 -05:00
eecd0db0f0
Tweak checkbox label
2017-12-06 09:19:08 -05:00
4155f02ec8
Make sure PPEC settings are opened if enabled on load
2017-12-06 09:18:06 -05:00
0d12b31a13
Updated the Klarna logo
2017-12-06 14:04:28 +00:00
6500b11db8
Adjust logo widths to match design and approximately equalize prominence
2017-12-05 19:55:43 -05:00
9a3b63036f
Address 'Undefined index' notice by checking for set param
2017-12-05 14:56:15 -05:00
570a2e9512
Add PPEC settings to wizard, to facilitate rerouting via WCS
2017-12-05 14:53:44 -05:00
399e2893e1
Updated the Klarna logo
2017-12-05 17:06:35 +00:00
10f912a0a9
Split Klarna into two plugins and updated their display logic
2017-12-05 16:38:19 +00:00
d1e4d0fe3c
Fixed a <label>'s id
2017-12-05 16:21:36 +00:00
fbc630114c
Fixed the payment gateways link
2017-12-05 16:21:36 +00:00
628906a5bc
Added Klarna and Square CSS classes
2017-12-05 16:20:15 +00:00
6dae7f3451
Fixed an i18n domain
2017-12-05 16:20:15 +00:00
8b0e0e3df4
Fixed the copies
2017-12-05 16:20:15 +00:00
8c6d069377
Add Square to wizard payment step
2017-12-05 16:20:15 +00:00
e28341a9a3
Wizard: Ask user if selling in person
2017-12-05 16:20:15 +00:00
6d2ca0fd15
Add Klarna to wizard payment step
2017-12-05 16:20:15 +00:00
f395fcd2e8
Fixed missing text domain in setup wizard
2017-11-20 22:08:23 -02:00
e9985146d5
Wizard: Fix escaping in payment description
2017-11-16 11:29:21 -05:00
3c5ede6e14
Dont need placeholder any more
2017-11-07 11:41:12 -08:00
862060cba9
Add default to "What type of product do you plan to sell"
2017-11-07 11:39:37 -08:00
8add04b92e
Change input to button for submit in class-wc-admin-setup-wizard.php
2017-11-06 14:31:22 +02:00
99f38e72c1
PHPCS changes for class-wc-admin-setup-wizard.php
2017-11-06 14:26:17 +02:00
cb998799c6
Merge pull request #17298 from dechov/update/ignore-existing-unit-option-values-in-wizard
...
Ignore existing unit option values in wizard in favor of national unit conventions
2017-10-30 12:55:06 +00:00
5824cb9358
Update stripe wording
...
Closes #16385
2017-10-27 13:48:48 +01:00
d048e4d355
Use measurement unit defaults in locale-info instead of hard coding
2017-10-26 09:28:18 -04:00
fee6f954dc
Ignore existing unit option values in wizard, in favor of national conventions
2017-10-26 09:21:35 -04:00
234d9e05a5
Fixed the jetpack redirect url for sites in subdirectories ( #17312 )
...
* Fixed the jetpack redirect url for sites in subdirectories
* Using admin_url instead of get_admin_url for consistency
* Wrapped the generated url in esc_url_raw
2017-10-26 13:40:54 +01:00
9c2df6486c
Default currency responds to country selection in setup wizard ( #17318 )
...
* Default currency responds to country selection in wizard
* Refactor to use wp_list_pluck
* Use <script> tag to define global instead of using hidden <input>
* Revert ignoring currency option value on page load
2017-10-26 13:39:54 +01:00
b0c9efbdc2
Merge pull request #17267 from Umangvaghela/fix-17264
...
fix 17264 issue
2017-10-18 08:25:50 -07:00
85af075566
Check for proper currency when getting WCS live rates carrier in setup wizard ( #17240 )
2017-10-18 11:09:33 -04:00
1b7b3f214e
fix issue
2017-10-18 15:11:59 +05:30
8fa3ddde86
Tweaked intro text further about live rates
2017-10-12 18:29:23 +01:00
a447221213
wc_setup_wcs_tout is not used.
2017-10-12 17:19:47 +01:00
a1f4cc0464
Show what powers taxes and link, just like storefront
2017-10-12 17:19:17 +01:00
9198d636c5
This installs jetpack/services - be clear
2017-10-12 17:18:37 +01:00
806f80c8d2
Be explicit about what powers live rates
2017-10-12 17:18:15 +01:00
12d93803ee
Merge pull request #17121 from woocommerce/update/wizard-payments-copy
...
Update payment step copy for Stripe, and fixes margins/spacing
2017-10-11 10:17:57 +01:00
17e4f2a609
Merge pull request #17127 from woocommerce/fix/17122-setup-required-shipping-fields
...
Setup wizard - made the shipping cost fields required
2017-10-10 18:50:20 +02:00
01578d55c9
Wrapped the class name in esc_attr
2017-10-10 17:49:04 +01:00
eaf8a09e82
Setup wizard - made the shipping cost fields required
2017-10-10 16:59:08 +01:00
24599524ba
Setup wizard: add “powered by” to automated taxes description.
2017-10-10 09:24:13 -06:00
6b357bcfdc
Updates the payment step copy and fixes margins
2017-10-10 15:40:03 +01:00
974f402017
Fix duplicate plugin install from wizard. ( #17114 )
...
* Setup wizard: avoid duplicate plugin installs.
* Setup wizard: use background flag to determine if Jetpack is being installed.
* Setup wizard: use wc_set_time_limit() instead of set_time_limit() to avoid potential warnings/errors.
2017-10-09 16:45:33 -06:00
c5f097f319
Setup wizard: check for activate-step-specific GET parameters before hiding the step.
...
This was a bit overzealous, and broke successful connection flows from the wizard. (Introduced in 97faa49fc4
2017-10-09 08:55:30 -06:00
74fb3821e2
Merge pull request #17096 from woocommerce/add/17092-jetpack-tos-accept-flag
...
Setup wizard: set a flag when Jetpack is opted into.
2017-10-09 11:39:32 +01:00
000295c0bf
Setup wizard: remove the “activate” step if Jetpack is already connected. ( #17099 )
...
* Setup wizard: remove the “activate” step if Jetpack is already connected.
* phpcs
2017-10-09 11:35:17 +01:00
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
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
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
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
60e9258913
Wizard: Update option for types of product sold
2017-10-03 17:38:08 +02:00
3ca5ded150
Wizard: Reset live rates options on save
2017-10-03 17:30:00 +02:00
450236c8d9
Wizard: Update store setup text
2017-10-03 17:30:00 +02:00
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
9a2ab72cd6
Wizard: Style tracking option
2017-10-03 17:26:32 +02:00
f6c0054aa1
Setup wizard: use a setup wizard specific ID for the Jetpack connection URL.
2017-09-27 14:04:40 -06:00
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
72f9ce08ac
Wizard: Move Jetpack TOS above button
2017-09-27 22:48:33 +03:00
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
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
3f7c3af3e5
Setup wizard: default Stripe gateway on, swap email input for opt-in account creation.
2017-09-27 13:14:13 -06:00
7b9b09e9ad
Setup wizard: consolidate translations for Jetpack enabled features list as much as possible.
2017-09-27 12:46:01 -06:00
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
0b2bad8122
Wizard: Update 'WP Admin' to 'dashboard'
2017-09-27 17:30:09 +03:00
bd98a7098d
Wizard: Remove superfluous description in last step
2017-09-27 17:29:40 +03:00
d6c94e4837
Wizard: Remove superfluous Extras description
2017-09-27 17:26:43 +03:00
a09b7f1670
Wizard: Update shipping info text
2017-09-27 17:24:50 +03:00
3a3ae914a3
Setup wizard: add TOS blurb to the “activate” step.
2017-09-26 15:10:30 -06:00
f183344a9c
Wizard: Style footnote on last page
2017-09-26 15:10:30 -06:00
83d7b03883
Wizard: Style next actions section
2017-09-26 15:10:29 -06:00
2348faf9e5
Wizard: style newsletter form
2017-09-26 15:10:29 -06:00
f4bc596664
Wizard: Make payment service email required
2017-09-26 15:10:29 -06:00
5a7db686c5
Wizard: Add placeholder to flat rate cost input
2017-09-26 15:10:29 -06:00
aee55f4b68
Wizard: Style shipping method selection
2017-09-26 15:10:29 -06:00
17a97ca3f7
Wizard: Remove inline CSS for unit dropdowns
2017-09-26 15:10:28 -06:00
4be979f322
Setup wizard: Style email input for payment service
2017-09-26 15:10:28 -06:00
1dadabaa56
Setup wizard: Style store info form
2017-09-26 15:10:28 -06:00
244296b814
Setup wizard: Update button style
2017-09-26 15:10:27 -06:00
426c0c2743
Setup wizard: Style Jetpack logo
2017-09-26 15:10:27 -06:00
24e3db78ec
Setup wizard: Style Jetpack feature sections
2017-09-26 15:10:27 -06:00
0f04645bea
Setup wizard: Show correct shipping text on select
2017-09-26 15:10:27 -06:00
1960b6bcd1
Setup wizard: Fix thick border in toggle list
2017-09-26 15:10:27 -06:00
18deb4dc2e
Setup wizard: Style shipping unit selection
2017-09-26 15:10:26 -06:00
43949c2b74
Setup wizard: Add shipping units descriptions
2017-09-26 15:10:26 -06:00
fc5aa77259
Setup wizard: Style shipping method description
2017-09-26 15:10:26 -06:00
a5d8c371b4
Added logic to install the plugins and themes asynchronously but without using wp-cron
2017-09-26 15:10:25 -06:00
28964433fb
Added wrapper function for installing a theme
2017-09-26 15:10:25 -06:00
73183634d2
Removed unused "background" argument, since it's always true
2017-09-26 15:10:25 -06:00
5c867094cc
Remove unused install_jetpack() function parameter.
2017-09-26 15:10:25 -06:00
3ba7617594
Setup wizard: change copy to “recommended” extras.
2017-09-26 15:10:24 -06:00
09bbb1c3de
Setup wizard: update the copy in several places.
2017-09-26 15:10:24 -06:00
5ced91d56f
Setup wizard: update comments to have ending punctuation and fix a few typos.
2017-09-26 15:10:24 -06:00
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
e220926b65
Setup wizard: remove markup (where possible) from the translated Stripe service description.
2017-09-26 15:10:24 -06:00
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
e6dc95432a
Setup wizard: hide settings until a service is enabled.
2017-09-26 15:10:23 -06:00
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
27c6a3a141
Setup wizard: clean up unused array keys when determining Stripe country support.
2017-09-26 15:09:44 -06:00
202808fdb8
Setup wizard: fix missing translations on payments step.
2017-09-26 15:09:43 -06:00
3fda0f00a0
Setup wizard: remove contraction and add oxford comma to tailored “activate” step messaging.
2017-09-26 15:09:43 -06:00
a3ce6b8e81
Setup wizard: fix coding standard issues with “activate” step tailored messaging.
2017-09-26 15:09:43 -06:00
5c3e505539
Fixed the way the Jetpack string is translated
2017-09-26 15:09:43 -06:00
d2116c576c
Tailored the Jetpack step message to the services selected
2017-09-26 15:09:42 -06:00
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
e19db10be8
Setup wizard: short circuit the shipping zone setup earlier.
2017-09-26 15:09:42 -06:00
4bf21b9724
Setup wizard: remove now unused locale and tax interactions from client side script.
2017-09-26 15:09:41 -06:00
b5fba545f6
Setup wizard: set currency formatting options based on store location.
2017-09-26 15:09:41 -06:00
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
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
337e3c02e4
Setup wizard: queue Jetpack installation ahead of payment gateways.
2017-09-26 15:09:41 -06:00
c0bc74154d
Setup wizard: fix PHP warnings when saving shipping method settings.
2017-09-26 15:09:40 -06:00
325cea86c6
Setup wizard: keep user in setup wizard in case of Jetpack connection error.
2017-09-26 15:09:40 -06:00
b85d311dff
Setup wizard: save shipping method settings chosen on shipping step.
2017-09-26 15:09:40 -06:00
081bcb2fc2
Setup wizard: refactor shipping method form rendering to group inputs into an array.
2017-09-26 15:09:39 -06:00
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
e8ee3fd35a
Setup wizard: enable tax calculation if automated taxes are enabled.
2017-09-26 15:09:39 -06:00
5642868436
Setup wizard: add method-specific settings and descriptions to shipping step.
2017-09-26 15:09:39 -06:00
59ca25aba7
Setup wizard: fix UI block when HTML5 form validation fails.
2017-09-26 15:09:38 -06:00
2e85ff1c0e
Setup wizard: revert to combined country/state selection in initial step.
2017-09-26 15:09:38 -06:00
5f5a4da48d
Setup wizard: update “ready” step overall structure.
...
Removed tweet, updated text. Note: completely unstyled.
2017-09-26 15:09:38 -06:00
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
189fbd571b
Setup wizard: remove now unused “theme” step.
2017-09-26 15:09:37 -06:00
1034dc597b
Setup wizard: “extras” step save handler.
2017-09-26 15:09:37 -06:00
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
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
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
32dcfaa080
Setup wizard: fix PHP warning ‘undefined index’ in service item display method.
2017-09-26 15:09:36 -06:00
666983bfaa
Setup wizard: Fix spacing
2017-09-26 15:09:36 -06:00
afd9646c8f
Setup wizard: Add country-based intro to Shipping
2017-09-26 15:09:36 -06:00
Paul Dechov
Mike Jolley
claudiulodro
Marcin Bot
Valerie
Claudio Sanches
Gerhard Potgieter
Marcin Bot
Umangvaghela
Jeff Stieler
Daniel Rey Lopez