Commit Graph

13110 Commits

Author SHA1 Message Date
Mike Jolley 1f7ecd9fb9 Merge branch 'master' into tweak/order-screens
# Conflicts:
#	assets/js/frontend/checkout.min.js
2017-11-01 16:52:21 +00:00
Claudiu Lodromanean 9117414dae
Merge pull request #17491 from woocommerce/update/17101
wc_caught_exception method
2017-11-01 09:31:57 -07:00
Mike Jolley 8fd6864a23 Merge branch 'pr/17457' 2017-11-01 15:48:57 +00:00
Mike Jolley 7606666de9 woocommerce_pre_customer_bought_product 2017-11-01 15:48:46 +00:00
Mike Jolley 9c096b419f Merge branch 'pr/17435' 2017-11-01 13:10:37 +00:00
Mike Jolley 9d92b8a8ff phpcs 2017-11-01 13:10:25 +00:00
Tim Howe abea378245 Variation Displayed in Cross-Sell and Upsells with Parent's Post Status set to 'draft' and 'pending review' (#17423)
* Fix - #17413
Update the `json_search_products` function to use the
`wc_products_array_filter_visible` filter rather then the
`wc_products_array_filter_editable` filter

Added an additional if condition to the `is_visible` function to check
if the product had a parent and it's post status

* remove additional comment from code to keep it clean

* Reverted filter

* Updated the is_visable to check parent product post status using WooCommerce class methods

* Updated the `if empty` check to make it is compatible with older versions of php

* Removed the empty check infavor of just testing on the returned value
Updated the way we are retrieving the partent product object

* Moved the `$parent_product` variable assigment out of the if statement.
2017-11-01 12:52:58 +00:00
Mike Jolley ef4c05a393 Merge branch 'pr/17098' 2017-11-01 12:43:35 +00:00
Mike Jolley 415d1ab061 Use global if it exists to improve performance. 2017-11-01 12:43:26 +00:00
Mike Jolley ff02941a53 Merge branch 'pr/17434' 2017-11-01 12:32:52 +00:00
Mike Jolley 80dfbc0ced phpcs tweaks and escaping 2017-11-01 12:32:35 +00:00
Mike Jolley c17e76adc8
Merge pull request #17113 from woocommerce/add/travis-phpcs
Run PHPCS in Travis CI
2017-11-01 12:18:44 +00:00
Mike Jolley 5d500ba5fb wc_caught_exception method 2017-11-01 11:41:53 +00:00
veisis fbd1b114db
Class name fix in docblock 2017-11-01 11:59:49 +02:00
Claudio Sanches e1a4f6e159
Merge pull request #17470 from woocommerce/pr/16959
Added actions before calculations order totals and taxes and is_vat_excempt support
2017-10-31 12:21:08 -02:00
Claudio Sanches 418bbbfee5
Merge pull request #17467 from woocommerce/fix/17460-currency
Add direction character to currency output
2017-10-31 12:04:37 -02:00
Mike Jolley 7c74e77849 handle tax removal in order class 2017-10-31 13:37:57 +00:00
Mike Jolley 80b16adb0a Revert is_vat_exempt changes in item classes 2017-10-31 13:36:57 +00:00
Mike Jolley bc7484f473 Merge branch 'master' into pr/16959
# Conflicts:
#	includes/abstracts/abstract-wc-order.php
2017-10-31 13:33:09 +00:00
Mike Jolley 01730cdc4f Add method to generate transient name 2017-10-31 12:58:36 +00:00
Mike Jolley 5848590333 Merge branch 'master' into update/14260 2017-10-31 12:54:35 +00:00
Mike Jolley 43ba326ed9 Fix currency position with rtl symbols 2017-10-31 12:22:18 +00:00
Gabor Javorszky d530556a0f Add short circuit to customer bought product function 2017-10-30 17:20:55 +00:00
Mike Jolley 17a6f9fb15
Merge pull request #17421 from woocommerce/fix/method-return-value-in-write-content
Fixed method returning value in write content warning in legacy PHP
2017-10-30 14:17:37 +00:00
Claudio Sanches 83057e3771
Merge pull request #17455 from woocommerce/pr/17450
Use item tax class rather than product tax class for getter
2017-10-30 12:13:58 -02:00
Mike Jolley 9521a0ba1f Improve tax class check and handle non-taxable items 2017-10-30 13:23:15 +00:00
Claudio Sanches 777ba46299
Merge branch 'master' into fix/17424 2017-10-30 11:01:17 -02:00
Mike Jolley 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
Mike Jolley 7ec2c5a736
Merge pull request #17444 from shivapoudel/fix/empty-content
Fix - Undefined variable: empty_content in order screen
2017-10-30 12:25:52 +00:00
Mike Jolley b436ad34e6 Merge branch 'pr/17452' 2017-10-30 12:15:41 +00:00
Mike Jolley c1d86b9994 Split up skip logic 2017-10-30 12:15:32 +00:00
Claudio Sanches 4b13b6e79c
Merge pull request #17409 from woocommerce/tweak/invoice-email-name
Change title of Customer invoice email
2017-10-30 10:09:33 -02:00
Diego Zanella 3576025036 Added filter to process meta to be exported 2017-10-30 10:19:57 +00:00
Ewout Fernhout 029e93fd4f
Use item tax class rather than product tax class for getter
Fixes #17449
2017-10-30 11:04:56 +01:00
Shiva Poudel 53a2dfd77c Fix - Empty content undeclared variable in #17233 2017-10-29 23:02:27 +05:45
Ryan Halliday 671b602db6 Added `{site_title}` replacement to Email footer 2017-10-28 15:18:53 +13:00
Shiva Poudel 289842aacf Tweak - Order panel meta description 2017-10-28 06:37:29 +05:45
claudiulodro f06ecee1c5 Fix order methods and add tests 2017-10-27 13:37:00 -07:00
Claudio Sanches 58d7a3fd3a
Merge pull request #17414 from woocommerce/fix/17412
Cart totals: don't add shipping unless show_shipping is true.
2017-10-27 16:02:02 -02:00
Claudio Sanches 1008ad1203 Fixed method returning value in write content warning in legacy PHP 2017-10-27 16:01:33 -02:00
Mike Jolley a84fe7a314 Merge branch 'cache-variable-products-queries'
# Conflicts:
#	readme.txt
2017-10-27 18:54:53 +01:00
Mike Jolley 635ea09127 Merge branch 'master' into cache-variable-products-queries 2017-10-27 18:53:40 +01:00
Mike Jolley ba3d959e66 Merge branch 'master' into pr/17183 2017-10-27 18:49:27 +01:00
Mike Jolley 65f2ee0f49 Cart totals: don't add shipping unless show_shipping is true.
Closes #17412
2017-10-27 17:30:33 +01:00
Mike Jolley 349e37399f Merge branch 'pr/17315' 2017-10-27 16:42:32 +01:00
Mike Jolley 3c3173b2f8 Rename actions and handle deprecation 2017-10-27 16:42:19 +01:00
Mike Jolley 422638bf75 Merge branch 'pr/17344' 2017-10-27 16:23:15 +01:00
Mike Jolley e72a297842 Break up logic so is callable is only checked on internal meta keys 2017-10-27 16:23:05 +01:00
Mike Jolley a6e5a684d0 Merge branch 'pr/17134' 2017-10-27 16:07:41 +01:00
Mike Jolley e5038e737e Standards 2017-10-27 16:07:30 +01:00