Commit Graph

23443 Commits

Author SHA1 Message Date
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
Jeff Stieler 0150b4dd8e Regenerate wizard CSS. 2017-10-03 12:13:08 -06:00
Jeff Stieler d12c826acd Merge pull request #17008 from woocommerce/update/wizard-style
Tweaks to new wizard style
2017-10-03 12:05:56 -06:00
Marcin Bot 57af1bf804 Reverted compiled rtl and css of the files outside #17008 2017-10-03 17:57:00 +02:00
Valerie 60e9258913 Wizard: Update option for types of product sold 2017-10-03 17:38:08 +02:00
Valerie 49246206a5 Wizard: Update compiled CSS 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
victorfreitas e40ae14d2e Improving the code comment 2017-10-03 12:28:05 -03:00
Valerie 9a2ab72cd6 Wizard: Style tracking option 2017-10-03 17:26:32 +02:00
victorfreitas c72c2f06b8 Save postmeta attachment image reference on import of products via API rest. 2017-10-03 10:17:09 -03:00
Claudio Sanches 3f81bd9ff6 Merge pull request #17036 from ville6000/master
Fix typo
2017-10-03 09:58:54 -03:00
Ville Viklund ae17ccd65f Fix typo 2017-10-03 15:34:44 +03:00
Mike Jolley 4186a009ee Merge pull request #17027 from builtbylane/patch-1
make hidden country/state readonly
2017-10-03 11:20:52 +01:00
Ola Olusoga 231b9e7c2c adding rtl & css
Adding css and rtl to PR
2017-10-02 17:04:30 -04: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
Lane Goldberg fb8bac5957 make hidden country/state readonly
make hidden country / state fields read only. fixes #17026
2017-10-02 15:24:37 -04:00
Claudio Sanches b997c5673c Merge branch 'master' of github.com:woocommerce/woocommerce 2017-10-02 14:14:07 -03:00
Claudio Sanches 42f2bbb3fe Merge branch 'nishitlangaliya-issue-16966-B' 2017-10-02 14:13:37 -03:00