Commit Graph

47 Commits

Author SHA1 Message Date
Mike Jolley 1076854608 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/class-wc-shipping.php
#	includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
#	includes/shipping/flat-rate/includes/class-wc-eval-math.php
#	includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
#
includes/shipping/legacy-international-delivery/class-wc-shipping-legacy
-international-delivery.php
#
includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d
elivery.php
2016-01-11 11:48:18 +00:00
Mike Jolley ad11042afd [2.4] Don't unforce SSL on secure blogs
@claudiosmweb can you check this and cherry pick if good to go?

Fixes #10029
2016-01-08 11:27:18 +00:00
Mike Jolley 97d47fb576 Move zones to main settings 2016-01-05 11:23:15 +00:00
mitogh fb7de12235 Remove unnecessary use of ternary operator.
Since the operations are going to return the same values of true or
false after the evaluation of each statment it's easier just returing
the result of evaluation of those statements.
2015-11-17 00:08:06 -06:00
mitogh 85ea9c27ae Update conditionals to follow the Yoda conditional style 2015-11-17 00:04:59 -06:00
Claudio Sanches 9a926aef4f Updated wc_checkout_is_https() docblock 2015-11-09 23:08:10 -02:00
Claudio Sanches 5893875b0c Removed period for file headers 2015-11-03 11:53:50 -02:00
Claudio Sanches ee30b5b308 Fixed php docs standards 2015-11-03 11:31:20 -02:00
Mike Jolley 97e28d7f49 Added wc_checkout_is_https() function helper and added to simplify class
Closes #9408
2015-10-22 12:30:30 +01:00
Mike Jolley 973c3d1d7a Tweak meta_is_product_attribute conditional to check for the existence of the get_variation_attributes method before running.
Closes #8660
2015-07-27 13:03:04 +01:00
Nicola Mustone 29e6082ab6 typo 2015-06-03 12:50:11 +02:00
Nicola Mustone 17eac9eaed added filter wc_tax_enabled 2015-06-03 12:49:10 +02:00
Nicola Mustone d2af01df5b scrutinizer suggested tweaks 2015-03-27 16:15:40 +01:00
Mike Jolley aa7067e84c Merge pull request #7345 from shivapoudel/conditional-functions
Refactor the WC Conditional function coding standard
2015-03-18 10:32:31 +00:00
Mike Jolley 88be174037 [2.3] Support price filter min or max only.
Closes #7743
2015-03-17 15:34:15 +00:00
Mike Jolley 4171a20e29 Order again with custom attributes.
Fixes #7601
2015-03-09 15:50:13 +00:00
Mike Jolley d2040eca4d When updating shipping in cart, keep shipping calculator in DOM. 2015-02-11 23:25:31 +00:00
shivapoudel 20c5774e70 Refactor the WC Conditional function coding standard 2015-02-10 16:42:33 +05:45
Jason Conroy eae7bde755 Allow devs to filter is_checkout()
This is useful for extensions like WooCommerce One Page Checkout where the "checkout" may not be the default one used by WooCommerce core.
2015-01-24 21:35:35 +11:00
Mike Jolley 4785684b92 Prices include tax require taxes enabled. 2015-01-13 12:54:31 +00:00
Bryce d8c49cb988 Fix brackets 2014-12-29 21:48:26 +07:00
Bryce ca5416217c Add check for my account page too 2014-12-29 21:46:03 +07:00
Bryce ebf3ab5cc6 New `is_view_order_page` conditional function
Returns true when on the `my-account/view-order/` page
2014-12-29 15:31:18 +07:00
Claudio Sanches 5b318b1d2a Added the wc_is_webhook_valid_topic() and wc_is_valid_url() conditional functions 2014-12-17 10:16:14 -02:00
Mike Jolley 508bfd5c06 Merge branch 'breadcrumbs-class'
Adds endpoint page titles for #5522
Fixes link back to endpoint pages and closes #6638
Avoids need for breadcrumb fix which closes #6834
Removes the need and closes #6834
Fixes #6840
2014-12-05 13:42:19 +00:00
Mike Jolley 898c989753 wc_tax_enabled() and wc_prices_include_tax() methods 2014-11-18 16:13:41 +00:00
Nicola Mustone 6e9176a5bf Fix disable password submitting twice 2014-10-16 21:59:45 +02:00
shivapoudel 1f9ba73b96 Absolute path fix for wc-conditional-functions.php 2014-09-21 00:51:46 +05:45
Barry Kooij 94365791af Changed all use of get_product to wc_get_product 2014-08-19 12:09:29 +02:00
Mike Jolley 78846adfd0 Only check DOING_AJAX
Not sure why, but some hosts are setting the HTTP_X_REQUESTED_WITH
header for seemingly non-ajax requests. Could be MT, could be cloud
flare, we don’t know.
2014-02-12 22:14:26 +00:00
Mike Jolley b62162ee3e is_wc_endpoint_url Closes #4731 2014-02-12 16:18:53 +01:00
Coen Jacobs ac80b0d880 Patched up docblock after faulty merge. Closes #4721 2014-02-11 17:30:43 +01:00
Gregory K fcd97eff07 Only string param in taxonomy_is_product_attribute
Conflicts:
	includes/wc-conditional-functions.php
2014-02-11 17:27:06 +01:00
claudiosmweb 18ca7c4d2f fixed the indentation in includes/wc-conditional-functions.php 2014-02-07 15:57:17 -02:00
claudiosmweb a9f1d47a11 fixed docblock for meta_is_product_attribute() function, closes #4668 2014-02-07 15:56:58 -02:00
Patrick Garman f3be3b16b6 Add is_store_notice_showing Conditional
Added public is_store_notice_showing conditional to `includes/wc-conditional-functions.php`
Replaced two instances of  `get_option( 'woocommerce_demo_store' )` with the new conditional
2014-01-10 11:17:01 -06:00
Mike Jolley 656663ba47 is_woocommerce Closes #4475 2014-01-09 14:00:18 +00:00
Mike Jolley e9234e8d63 Removed a stray var dump and added braces 2013-12-02 11:09:33 +00:00
Scott Basgaard 2885da4581 "Order again" doesn't work. Proposed pass at fix. 2013-11-26 17:48:39 +01:00
Coen Jacobs 47ae00be28 Page functions woocommerce to wc refactor 2013-11-25 15:07:22 +01:00
Coen Jacobs f0adcb65b7 Merge remote-tracking branch 'thenbrent/add_payment_method_issue_3396' 2013-11-18 12:33:23 +01:00
Mike Jolley 78832e7e79 woocommerce_is_filtered filter Closes #4078 2013-11-08 15:56:38 +00:00
Brent Shepherd b69066405b Move /add-payment-method/ endpoint to /my-account/
Part of #3396
2013-11-05 13:02:13 -08:00
thenbrent 1bbe03d139 Add new /checkout/add-payment-method/ endpoint
Part of #3396
2013-11-03 16:53:14 -08:00
Lee Willis 1ab404e0e7 Fix is_order_received_page() 2013-10-15 21:59:29 +01:00
Mike Jolley f0853d5208 Pass text attributes when ordering again Fixes #3422 2013-08-20 12:17:56 +01:00
Mike Jolley 57157db9bf Function refactoring. 2013-08-09 17:11:21 +01:00