Commit Graph

7571 Commits

Author SHA1 Message Date
Mike Jolley 3d1ee0a633 Merge pull request #5249 from BFTrick/coupon-email-restriction
Clarifying The Coupon Email Restriction Tool Tip
2014-04-01 14:33:58 +01:00
Patrick Rauland 1db1a47cf5 updating coupon email restriction tool tip 2014-03-31 15:54:21 -05:00
Max Rice ebf7603a45 Use is_ssl() for get_woocommerce_api_url()
When accessing the API over OAuth for a site that has the checkout
forced over SSL, the OAuth string to sign is incorrect. This fixes that
by checking whether the current request is SSL when returning the api
URL
2014-03-31 16:22:17 -04:00
Mike Jolley c981bb56ca Merge pull request #5230 from ChromeOrange/master
show shipping form filter
2014-03-31 11:56:57 +01:00
Mike Jolley 24c2c845b7 When removing base taxes, round to precision. 2014-03-31 11:12:12 +01:00
Mike Jolley edf54ad0c8 Check order exists when resuming on checkout 2014-03-31 11:12:12 +01:00
Gregory K 3bd2954a13 Fix: additional-information.php
- Do not display empty <h2> tag
- Removed unused globals
- WP code style
2014-03-30 21:26:17 -04:00
JDGrimes f3ab25c12c Check wc_checkout_params.is_checkout against string '1' instead of int 1
This was causing `’init_checkout’` not to be triggered on page load. I
noticed this when the taxes for an order weren’t being shown on the
checkout page until changing the billing address.

Introduced in b85b1ab03b
2014-03-28 16:46:33 -04:00
Andrew Benbow 84899195c5 Update form-shipping.php 2014-03-28 14:41:57 +00:00
Andrew Benbow 54d5ded602 Update form-shipping.php 2014-03-28 14:41:43 +00:00
Andrew Benbow b3fc8cbdf6 Update class-wc-cart.php 2014-03-28 14:40:56 +00:00
Andrew Benbow a8e941513c Update class-wc-cart.php 2014-03-28 14:10:53 +00:00
Andrew Benbow 290043b108 Update class-wc-cart.php 2014-03-28 10:41:17 +00:00
Andrew Benbow d9c82975b4 Update form-shipping.php 2014-03-28 10:38:48 +00:00
Mike Jolley 7aa448e9f7 Merge pull request #5222 from splashingpixels/sort
orderby - skip adding hidden input of submit on a GET so JS can submit p...
2014-03-28 09:23:50 +00:00
Mike Jolley fa0f25039e Merge pull request #5226 from pauloiankoski/patch-1
Apply filters to $product_type
2014-03-28 09:19:51 +00:00
Andrew Benbow 6cb5451e15 Update form-shipping.php
Add filter to allow needs_shipping() to be overridden, useful if you want to collect a shipping address for virtual products.

Allows a filter to be used as replacement for get_option('woocommerce_require_shipping_address')

Previous suggestion of add_filter('woocommerce_cart_needs_shipping', '__return_true'); is not suitable
2014-03-28 02:27:24 +00:00
Andrew Benbow 0ada403433 Merge pull request #1 from woothemes/master
Update
2014-03-28 02:21:12 +00:00
pauloiankoski fd5435f7ee Apply filters to $product_type
Apply filters to $product_type and we can set a default product type to new products.
2014-03-27 20:37:00 -03:00
splashingpixels bbde465924 orderby - skip adding hidden input of submit on a GET so JS can submit properly fixes #5221 2014-03-27 09:37:56 -07:00
Mike Jolley ebb6af921c Correctly round shipping + shipping tax together when passes the tax inclusive total to paypal 2014-03-27 12:31:48 +00:00
Mike Jolley 2fbb257926 Merge pull request #5206 from ChromeOrange/master
Order cancelled tweaks
2014-03-26 10:50:31 +00:00
Mike Jolley df8e54985c Fix the SKU search logic so it works with other filters. Closes #5208 2014-03-26 10:46:42 +00:00
Andrew Benbow e8bc26f51c Update class-wc-form-handler.php
Updated as per comments
2014-03-26 09:58:51 +00:00
Mike Jolley e6212f7272 Fix apigen search 2014-03-26 09:43:14 +00:00
Mike Jolley 2c0cf925dd wp_kses_post for meta display in admin 2014-03-26 09:43:14 +00:00
profetes 77a5b601ed WC API: can generate API keys for different user than the one that is making request 2014-03-25 17:22:48 +01:00
Coen Jacobs 78a4448703 Merge branch 'refs/heads/2.1'
Conflicts:
	i18n/languages/woocommerce-admin.pot
	i18n/languages/woocommerce.pot
	package.json
	readme.txt
	woocommerce.php
2014-03-25 16:05:36 +01:00
Coen Jacobs 95065b65ca Version bump for 2.1.6 2014-03-25 15:33:49 +01:00
Mike Jolley b7c841df7e Translation updates 2014-03-25 14:22:06 +00:00
Mike Jolley 8287996964 Translation updates 2014-03-25 14:20:47 +00:00
James Koster 80479d67a4 flat rate additional costs table 2014-03-25 14:10:42 +00:00
James Koster c5656ee991 flat rate additional costs table 2014-03-25 13:59:30 +00:00
Mike Jolley 8d01dc9a67 readme 2014-03-25 13:41:53 +00:00
Mike Jolley 59b48c2945 Possible workaround for @BFTrick's issue. 2014-03-25 13:40:58 +00:00
Mike Jolley 8f09dc1ae2 delete terms transient during recount. #5204 2014-03-25 13:40:55 +00:00
Mike Jolley 2f605e75e5 Brackets 2014-03-25 13:40:51 +00:00
Mike Jolley b7df01724c Don't use esc_attr for storage of meta key 2014-03-25 13:40:48 +00:00
Andrew Benbow d6782567a2 Order cancelled tweaks
Add filters for order cancelled message, change message class from
success to info and allow to be filtered
2014-03-25 12:10:08 +00:00
Mike Jolley a21f8a3d47 delete terms transient during recount. #5204 2014-03-25 11:55:57 +00:00
Mike Jolley dd0e026ae7 Possible workaround for @BFTrick's issue. 2014-03-25 11:36:54 +00:00
Mike Jolley 9c913de1f2 Brackets 2014-03-25 11:36:35 +00:00
Mike Jolley 8e60cd9554 Don't use esc_attr for storage of meta key 2014-03-24 13:53:40 +00:00
Mike Jolley d9a58c53ea Update pot file in master 2014-03-24 12:17:04 +00:00
Mike Jolley dd5350862e Updated pot file 2014-03-24 12:16:17 +00:00
Mike Jolley a02f584d0d Update readme for cherry picks 2014-03-24 12:14:25 +00:00
Mike Jolley f0799f2e52 Billing Address > Billing Details. We take more than address in this section. 2014-03-24 12:13:03 +00:00
Mike Jolley d7f067349a Update localisation for terms and conditions text. 2014-03-24 12:12:54 +00:00
Mike Jolley f8c75e9d55 Trigger click event correctly in checkout 2014-03-24 12:12:48 +00:00
tamarazuk 2f47b7df48 Order items added through admin (ajax)
- Store variation data for order items added through the admin
- do 'woocommerce_ajax_add_order_item_meta' action only if $item_id exists
- fixed some indenting
2014-03-24 12:12:43 +00:00