Commit Graph

23412 Commits

Author SHA1 Message Date
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
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
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
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
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
Gerhard Potgieter a8e3862bf2 Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066 2017-10-05 13:49:10 +02:00
Gerhard Potgieter 71fce64f54 PHPCS fixes. 2017-10-05 13:48:26 +02:00
Gerhard Potgieter 9ad6a41e7c Revert "Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066"
This reverts commit 2474396eb6.
2017-10-05 13:46:45 +02:00
Mike Jolley fa86622bd8 Merge pull request #17063 from woocommerce/add/account-unit-tests
Account function Unit Tests
2017-10-05 12:38:51 +01:00
Gerhard Potgieter 2474396eb6 Change the mexican state update routing to only update shipping and billing states, not all meta data which matches. Closes #17066
This also fixes a bunch of PHPCS issues as it seems the new rules is very strict and you must fix the whole file before commiting any of your own changes.
2017-10-05 11:32:30 +02:00
Claudio Sanches 0c423c6ef7 Account function Unit Tests 2017-10-04 16:43:41 -03: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
Claudio Sanches 50dc6be1d9 Merge pull request #17061 from woocommerce/test/api-order-meta-data
Added a test to ensure meta data gets returned in the order API
2017-10-04 14:16:24 -03:00
Mike Jolley d1211f4e63 Added a test to ensure meta data gets returned in the order API 2017-10-04 15:57:06 +01:00
Claudio Sanches 8b0400c348 Merge pull request #17060 from woocommerce/fix/17044
Ensure query_vars is set. Closes #17044
2017-10-04 11:52:12 -03:00
Claudio Sanches b25e08e1cc Merge pull request #17058 from woocommerce/fix/17047-alt
Fix meta data returns in API using JsonSerializable
2017-10-04 11:48:46 -03:00
Mike Jolley d72f6ae22c Ensure query_vars is set. Closes #17044 2017-10-04 15:37:43 +01:00
Mike Jolley 7e06a30eea Merge pull request #17042 from victorfreitas/fix_invalid_term
Fix bug when parent term is invalid
2017-10-04 14:55:12 +01: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
Mike Jolley 764e0568e0 Merge pull request #17057 from woocommerce/update/17053
Remove "Powered by WooCommerce" credit in default email footer text s…
2017-10-04 14:44:03 +01:00
Mike Jolley f4e3498d4e Handle JSON encoding for API 2017-10-04 14:12:53 +01:00
Mike Jolley 240a321dd0 Revert get_meta_data changes and return array of WC_Meta_Data objects 2017-10-04 14:12:43 +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
Mike Jolley 47d50a70ea Merge pull request #16969 from stiletagegmbh/master
added actions and filters to modify tax calculation for shipping taxes and fee taxes #16938
2017-10-04 10:30:47 +01:00
lars ac24a56ff3 #16938 rename filter for clarity 2017-10-04 10:56:56 +02:00
Claudio Sanches e6710258d2 Merge pull request #17037 from victorfreitas/master
Save postmeta attachment image reference on import of products via AP rest.
2017-10-03 19:32:27 -03:00
victorfreitas 9dcfe4883a Fix error when invalid parent term 2017-10-03 17:59:58 -03:00
Jeff Stieler c850bb92da Merge pull request #17028 from woocommerce/minor-wizard-style-updates
Small style adjusts to onboarding
2017-10-03 13:27:59 -06:00