Commit Graph

23538 Commits

Author SHA1 Message Date
Mike Jolley c6d0a6e0be Merge pull request #17124 from cliffordp/patch-1
Correct docblock @return
2017-10-10 16:38:26 +01:00
Clifford 1474350f0f Correct docblock @return
From incorrect `string` to correct `array`
2017-10-10 10:31:16 -05:00
Jeff Stieler 24599524ba Setup wizard: add “powered by” to automated taxes description. 2017-10-10 09:24:13 -06:00
Mike Jolley 6b357bcfdc Updates the payment step copy and fixes margins 2017-10-10 15:40:03 +01:00
Mike Jolley d4965e9df4 Merge pull request #17112 from woocommerce/fix/product-variations-tax-classes
Add 'parent' to the list of valid tax classes for product variations
2017-10-10 12:32:29 +01:00
Jack 24efd36126 set query_vars (#17105)
* query_vars is set

* add changes
2017-10-10 12:14:35 +01:00
Mike Jolley 6098e25c9a Merge pull request #17102 from woocommerce/fix/thanks-page-classname
Classname was using total instead of email
2017-10-10 11:43:47 +01:00
Jeff Stieler 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
Claudio Sanches 87cf8f4809 Merge pull request #17106 from woocommerce/fix/activate-step-when-returning-from-wpcom
Setup wizard: activate step shouldn't be hidden after a successful WPCOM connection.
2017-10-09 16:59:53 -03:00
Rodrigo Primo fa0e5569f8 Add 'parent' to the list of valid tax classes for product variations
Commit d9f9e74bd added a check to `WC_Product::set_tax_class()` to only accept valid tax classes, but this created a bug for product variations as this type of product has an extra tax class called 'parent'.

This commit fixes this problem by adding a new method to `WC_Product` that returns a list of valid tax classes. `WC_Product_Variation` then override this method, returning another list including the tax class 'parent'.

Fixes #17024
2017-10-09 16:20:03 -03:00
Rodrigo Primo d769ef24f2 Coding standards fixes 2017-10-09 16:19:24 -03:00
Mike Jolley 6d7522d864 Merge pull request #17075 from woocommerce/fix/phpunit-excluded-files
Updated tests exclusion list
2017-10-09 19:46:34 +01:00
Mike Jolley 6a035995a6 Merge pull request #17108 from woocommerce/update/phpcs-i18n
PHPCS - Check for translatable strings placeholders
2017-10-09 19:45:47 +01:00
Mike Jolley 30c98aaa2d Merge pull request #17107 from woocommerce/update/phpcs-check-for-xss-and-sanitization
PHPCS - Check for CSRF, sanitization and XSS.
2017-10-09 19:45:18 +01:00
Claudio Sanches 7ce5d9e1c6 Merge pull request #17109 from woocommerce/fix/17085-2
Translate "No matches found" message in filter widget
2017-10-09 15:39:51 -03:00
claudiulodro f1dac6f3ac Use esc_js instead of addslashes 2017-10-09 11:37:09 -07:00
Mike Jolley 6838b00c38 Merge pull request #17110 from woocommerce/fix/17104
Allow display_name to be searchable - this will commonly be full name
2017-10-09 19:29:26 +01:00
Mike Jolley fae130d038 Allow display_name to be searchable - this will commonly be full name
Closes #17104
2017-10-09 19:20:22 +01:00
claudiulodro 97d7ae7df8 Missing semicolon 2017-10-09 11:16:24 -07:00
claudiulodro 2ccd44afa7 Translate "no matches" message 2017-10-09 11:10:32 -07:00
Claudio Sanches 9acd6e14b7 PHPCS - Check for translatable strings placeholders
This also ensure that each placeholder have a properly description.
2017-10-09 14:11:22 -03:00
Claudio Sanches 1e2ec87d65 PHPCS - Check for CSRF, sanitization and XSS.
This include `wc_clean()` into PHPCS sanitization functions list.
2017-10-09 14:07:09 -03:00
Jeff Stieler 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
Rodrigo Primo 1831d7ec37 Merge pull request #17070 from mohsinsumar/master
States for Tanzania
2017-10-09 11:14:54 -03:00
Mike Jolley c16b950aa9 Merge pull request #17103 from woocommerce/fix/is_checkout_conditional
Add WOOCOMMERCE_CHECKOUT check to is_checkout
2017-10-09 13:18:09 +01:00
Gerhard Potgieter 2080858dd4 Also check the woocommerce_checkout conditional, ensure ajax conditional checks keeps working. Closes #17094 2017-10-09 12:39:47 +02:00
Mike Jolley 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
Gerhard Potgieter a815c62289 PHPCS fixes 2017-10-09 12:39:27 +02:00
Mike Jolley ce11605287 Classname was using total instead of email 2017-10-09 11:37:00 +01:00
Jeff Stieler 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
Mike Jolley 734357aa3e Merge pull request #17095 from woocommerce/update/e2e
Update chromedriver version and add singles tests
2017-10-09 11:21:53 +01:00
Claudiu Lodromanean 2b49125b46 Enable clearing for attribute filter widget (#17093)
* Enable clearing for attribute filter widget

* Multiselect variant doesnt need clear button

* Make code less ugly
2017-10-09 11:21:21 +01:00
Mike Jolley 35dbfa848c Merge pull request #17089 from woocommerce/helper-fix-activation
Helper: Fix automatic subscription activation
2017-10-09 11:20:37 +01:00
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
claudiulodro c604c0f824 Update chromedriver version and add singles tests 2017-10-06 13:10:50 -07: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
Claudio Sanches 9721a9aca0 Removed legacy tests 2017-10-06 10:39:20 -03:00
Mohsin Sumar 66888355fd Update TZ.php
Indentation fixed.
2017-10-06 13:13:56 +03:00
Mohsin Sumar a31fb456f1 Update TZ.php 2017-10-06 00:21:11 +03:00
Claudio Sanches e9a62731d4 Merge pull request #17076 from woocommerce/fix/orders-meta-test
Test fixes for meta and installer
2017-10-05 15:14:00 -03:00
Mike Jolley 7d7907fc8e Delete installing transient. 2017-10-05 18:11:25 +01:00
Claudio Sanches 109e884533 Exclude includes/wc-widget-functions.php 2017-10-05 14:10:17 -03:00
Claudio Sanches e5f7b5ebc2 Updated tests exclusion list 2017-10-05 14:05:38 -03:00
Claudio Sanches 31f42ba907 Move includes/class-wc-legacy-api.php to includes/legacy/class-wc-legacy-api.php 2017-10-05 14:02:30 -03:00
Mike Jolley 7cb7e3c864 Test should compare objects, not arrays 2017-10-05 17:37:18 +01:00
Mike Jolley cef97ebc9f Merge pull request #17074 from woocommerce/fix/unit-tests
Restored tests/bin/phpunit.sh
2017-10-05 17:16:25 +01:00
Claudio Sanches cd554c1bdf Restored tests/bin/phpunit.sh 2017-10-05 13:14:56 -03:00
Mohsin Sumar 5c6770b35b States for Tanzania 2017-10-05 16:08:01 +03:00
Mike Jolley 77e245fa68 Merge pull request #17067 from woocommerce/fix/mexican-state-update
Update only state fields when updating Mexican States
2017-10-05 12:53:35 +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