Commit Graph

148 Commits

Author SHA1 Message Date
Mike Jolley 1b2df3dd3b Merge branch 'pr/11797'
# Conflicts:
#	includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
#	includes/api/class-wc-rest-coupons-controller.php
#	includes/class-wc-coupon.php
#	tests/unit-tests/api/coupons.php
#	tests/unit-tests/coupon/crud.php
2016-09-01 11:46:05 +01:00
Mike Jolley 047242515d Make API and CRUD use consistent keys and make use of data 2016-08-30 17:50:35 +01:00
Aristeides Stathopoulos b063bcfe4c last item in a multiline-array should end in a comma 2016-08-27 04:46:45 +03:00
Mike Jolley f4a4f6c361 Reduce stock and other notices 2016-08-09 14:15:04 +01:00
Mike Jolley 8d58febaf8 Merge branch 'master' into orders-crud-function-update
# Conflicts:
#	includes/class-wc-checkout.php
2016-08-09 14:03:06 +01:00
Mike Jolley 39b4831e95 get_id 2016-08-05 15:56:23 +01:00
Mike Jolley 1bc9da3e91 Merge branch 'master' into WC-CRUD
# Conflicts:
#	includes/class-wc-coupon.php
2016-08-04 12:10:04 +01:00
Mike Jolley bc65d87fce [2.6] Fixes add to cart message for IDs and allows the message to be returned
Fixes #11563
2016-08-01 11:41:52 +01:00
Stratos Vetsos f4f3b5e364 closes #11448 2016-07-18 20:52:26 +03:00
Claudio Sanches 7d9d091767 Fixed mixed tabs and spaces 2016-07-11 16:56:35 +02:00
Mike Jolley 92c670acde Fix - woocommerce_local_pickup_methods comparison by stripping instance IDs before the check.
@claudiosmweb Seems that local_pickup in zones did not get base tax
applied due to method id mismatch.
2016-06-29 15:23:42 +01:00
Mike Jolley 0f714a13a4 wc_add_to_cart_message() when non-array is passed. 2016-06-16 22:32:06 +01:00
Claudio Sanches b0e2a981d6 [2.6] Fallback for wp_get_raw_referer() in WP 4.4, closes #11149 2016-06-15 16:34:05 -03:00
Mike Jolley 78142a8ebb Merge branch 'master' into WC-CRUD
# Conflicts:
#	includes/class-wc-checkout.php
#	includes/class-wc-coupon.php
#	includes/class-wc-customer.php
#	tests/unit-tests/cart/cart.php
#	tests/unit-tests/cart/functions.php
#	tests/unit-tests/coupon/coupon.php
#	woocommerce.php
2016-06-13 15:01:58 +01:00
Mike Jolley 980a726984 Fix grouped add to cart notice
Closes #10974
2016-05-23 13:39:26 +01:00
Caleb Burks 3968b0488e Redirect to the shop page as a fallback 2016-05-17 16:50:46 -05:00
Claudio Sanches 96f5b85aed Fixed "Continue Shopping" url when added products from the single product page, closes #10930 2016-05-17 18:32:16 -03:00
Mike Jolley 1238a37124 Merge pull request #10576 from justinshreve/coupon-crud
Coupon CRUD
2016-03-18 11:12:32 +00:00
Justin Shreve ffc80ccd15 Start updating some usage, and start implementing the actual CRUD functions, and some new get/setters for username, email, etc. 2016-03-17 09:41:12 -07:00
Justin Shreve f973b9d122 Make some improvements to metadata. Don't return [0] array, allow setting custom meta with a WC_Coupon method. Fix up some tests. 2016-03-17 09:19:29 -07:00
Justin Shreve 3eacb992bc Address issues from Mike's Feedback:
* Rename individual use, free shipping, and exclude sale items to match their meta names closer.
* Sanitize emails when using set_email_restrictions
* Remove some unnecessary explict true checks
* Move ID into _data with the rest of the fields
* Fixed some spacing issues
2016-03-17 09:19:27 -07:00
Justin Shreve d738dec05d Coupon CRUD (WIP). 2016-03-17 09:19:27 -07:00
Mike Jolley eefbc053c9 escape data-title
Fixes #10490
2016-03-08 13:41:34 +00:00
Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones
# Conflicts:
#	assets/css/admin.css
#	i18n/languages/woocommerce.pot
#	includes/abstracts/abstract-wc-payment-gateway.php
#	includes/abstracts/abstract-wc-shipping-method.php
#	includes/admin/settings/class-wc-settings-shipping.php
#	includes/wc-core-functions.php
#	uninstall.php
2016-02-05 14:58:48 +00:00
Mike Jolley 5ca53d3449 [2.5] Combine includes string 2016-01-28 13:21:03 +00:00
Mike Jolley 7fb7120d8e [2.5] Move URL functions to core-functions file.
Closes #10170
2016-01-27 11:53:19 +00:00
Mike Jolley a2fbfec5bf [2.5] Show user country rather than base country in "estimated for" messages
#10148
2016-01-25 10:16:39 +00:00
Mike Jolley 6050b204fc Support qty display in cart messages
Closes #10114
2016-01-20 11:32:49 +00:00
Mike Jolley 734bde83f9 Strip tags in cart messages and breadcrumbs
Fixes #10074
2016-01-15 09:59:04 +00:00
Mike Jolley 62ca37f651 Merge branch 'master' into shipping-zones
# Conflicts:
#	includes/admin/class-wc-admin-assets.php
#	includes/class-wc-install.php
2016-01-04 14:35:45 +00:00
Mike Jolley 901db7b0f8 zone tweaks 2015-12-18 17:10:58 +00:00
Mike Jolley 8aec02f625 Remove shipping select box option, tidy up logic and add filters from #9797
closes #9797
2015-12-16 13:00:16 +00:00
Mike Jolley a0e0bb1e55 Load instance methods for calculations 2015-12-15 15:00:45 +00:00
Mike Jolley 091a8a7641 Zone matching functions 2015-12-15 12:39:52 +00:00
mitogh 52a37b3a1f Update conditionals to follow Yoda style 2015-11-30 22:18:58 -06:00
Mike Jolley e94c2b86ca Remove shipping/tax estimation notice and show in context when needed.
Avoids needing complex logic for something which could easily be typed
onto the page by store owner if needed.

Also adjusts line height and padding in cart collaterals

Closes #9578
2015-11-16 15:59:47 +00: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
Claudio Sanches 1caaea7b33 Moved methods from WC_Cart to single functions
Changes:

- WC_Cart::coupons_enabled() to wc_is_coupons_enabled()
- WC_Cart::get_cart_url() to wc_get_cart_url()
- WC_Cart::get_checkout_url() to wc_get_checkout_url()

This methods can be used in any place, but WC_Cart() is present only on
the frontend.
2015-10-28 15:43:31 -02:00
Mike Jolley da8cae596b Simplify cart shipping template + text
Also prevents calculate shipping showing multiple times when multiple
packages are present.

@jameskoster @claudiosmweb
2015-10-13 15:41:21 -06:00
Claudio Sanches 3a536ac8b7 Sanitize shipping method label/title, closes #9159 2015-10-01 17:17:45 +02:00
Mike Jolley a27aeaaa6f Escape add to cart messages to stop translations from breaking cart events. 2015-09-02 10:59:17 +01:00
Lee Hopkins 9632077c7e Wrap product name in correct double quotes in wc_format_list_of_items() 2015-08-14 09:57:35 -07:00
Claudio Sanches 7b6680f4ef Just ignore round more if have a old version of PHP, closes #8629 2015-07-21 19:57:52 -03:00
Claudio Sanches 050d073678 Removed double ;; #8629 2015-07-21 19:49:05 -03:00
Claudio Sanches 70efb53934 Introduces the wc_cart_round_discount() function #8629 2015-07-21 19:45:13 -03:00
Claudio Sanches 9e41552342 Removed all "@return void" 2015-07-16 16:55:48 -03:00
Claudio Sanches 2cc7fcfa3f Fixed missing textdomains 2015-07-13 11:03:03 -03:00
Mike Jolley 5920b88d5d Add classes to tax and shipping labels/notices
Closes #8189
2015-05-27 16:17:36 +01:00
Mike Jolley 4119ae0d7f Tweak wc_add_to_cart_message #7976 2015-04-20 12:29:04 +01:00
Mike Jolley 31104f6903 Change how wc_format_list_of_items is translated and contructed
Closes #7976
2015-04-20 12:29:04 +01:00
Mike Jolley 0ed3ce9023 Revert "Merge remote-tracking branch 'origin/shipping-costs'"
This reverts commit acc239cd1c, reversing
changes made to b0e0bdcfad.
2015-03-10 16:43:02 +00:00
Mike Jolley acc239cd1c Merge remote-tracking branch 'origin/shipping-costs' 2015-03-10 16:33:55 +00:00
Mike Jolley 5cbd02fef2 Improved message when variation attributes are missing.
Closes #7670
2015-03-09 13:14:05 +00:00
James Koster c9fff65365 shipping costs. #7650 2015-03-06 13:23:18 +00:00
Mike Jolley 9f269f765d Load persistent cart when empty, and Prevent cart being cleared when accessing the login page.
Closes #7636
2015-03-06 12:02:02 +00:00
Mike Jolley 9865e5f11e urlencode coupon Closes #7572 2015-03-02 12:03:31 +00:00
Mike Jolley d435eedbef woocommerce_cart_totals_order_total_html
Closes #7544
2015-02-24 12:05:32 +00:00
Paul Wilde c913316f8b Introduce wc_get_page_permalink. 2015-02-15 19:13:22 +00:00
Claudio Sanches afb19715d4 Prevented XSS in urls 2015-01-29 12:33:06 -02:00
splashingpixels 25b6377298 ajaxified coupon removal on checkout page for better UX closes #6881 2014-12-07 22:15:03 -08:00
Mike Jolley 3c82331a8b Store discount 'tax' to show discounts on prices including tax more accuratly
Also deprecated some functions named after having 2 levels of discounts.
2014-11-25 13:05:03 +00:00
claudiosmweb 8eeb6fc204 Removed more some unused code 2014-11-19 22:43:09 -02:00
claudiosmweb f34cead914 Removed old code in favor of wc_tax_enabled() and wc_prices_include_tax() 2014-11-18 14:45:29 -02:00
Mike Jolley 03e7a0ceaa Check order exists in wc_clear_cart_after_payment()
Fixes #6649
2014-10-31 12:37:13 +00:00
Mike Jolley 3df2c39bf5 If order gets cancelled behind the scenes, don't clear user cart
#6524
2014-10-14 12:54:23 +01:00
shivapoudel eab625e185 Absolute path fix for wc-cart-functions.php 2014-09-21 00:51:15 +05:45
Mike Jolley c4ef86d44e scrutinizer patches 2014-09-08 00:37:55 +01:00
Barry Kooij 6655188f0b Changed use of get_order with wc_get_order 2014-08-15 14:29:21 +02:00
Coen Jacobs 86a4add087 Merge remote-tracking branch 'upstream/master' into order-factory-refactor
Conflicts:
	includes/class-wc-order.php
2014-07-03 13:38:55 +02:00
claudiosmweb 7fd6e9f0a0 moved the wc_ship_to_billing_address_only() function to wc-order-functions.php 2014-06-17 17:39:02 -03:00
Coen Jacobs 89ea6c46ab Replace new WC_Order calls with get_order 2014-06-13 15:24:51 +02:00
Mike Jolley 309f700283 has_status 2014-06-03 10:45:33 +01:00
Mike Jolley e0a74fffc4 implement is_status() 2014-05-30 17:43:21 +01:00
Mike Jolley 41eab15b13 Clear sessions after ordering/on logout 2014-05-20 10:01:26 +01:00
Mike Jolley 937db45913 [2.2] Merge ship to billing and billing only options
+ update options, update files to use new option + function Closes #5284
2014-04-08 16:28:27 +01:00
Mike Jolley 09bf77c74b Stay on checkout when removing coupon Closes #5274 2014-04-07 09:51:12 +01:00
Brent Shepherd c7e6a779cb Add wc_cart_totals_taxes_total_html()
Also introduces the new 'woocommerce_cart_totals_taxes_total_html' filter.
2014-03-20 17:54:42 -07:00
Patrick Rauland f7a63f0ae8 fixing comma issue with free shipping coupon 2014-03-18 16:29:15 -05:00
thenbrent 18efa7341a Add 'woocommerce_cart_totals_fee_html' filter 2014-03-12 21:11:22 +10:00
Mike Jolley 3ab6acc495 wc_cart_totals_coupon_label function and filter to override coupon labels 2014-02-21 15:16:47 +00:00
Gregory K 9521f44cb2 wc-cart-functions : removed unused $woocommerce and fixed phpdocs 2014-02-11 09:01:58 -05:00
Coen Jacobs 61a7fa93ef Remove unused global. Closes #4694 2014-02-10 13:36:34 +01:00
Ewout Fernhout df773f520e include product_id for extended customization of wc_add_to_cart_message 2014-02-06 20:24:34 +01:00
Mike Jolley f46e6aefd7 Only show taxes in cart when taxes are enabled 2014-01-22 14:10:11 +00:00
Brent Shepherd 8ab50db41d Add woocommerce_cart_totals_coupon_html filter 2014-01-13 17:25:54 -08:00
Brent Shepherd 66b7d4ee14 Add woocommerce_coupon_discount_amount_html filter 2014-01-13 17:25:54 -08:00
James Koster dbf1b15001 replace a few missed →'s. closes #4350 2013-12-12 13:42:29 +00:00
Coen Jacobs 173f341631 Moved cart related output functions to right file 2013-11-25 16:17:18 +01:00
Coen Jacobs 4afbd0b556 Merge branch 'function-call-refactor'
Conflicts:
	includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php
	includes/shortcodes/class-wc-shortcode-cart.php
	includes/wc-template-functions.php
2013-11-25 15:42:26 +01:00
Coen Jacobs 47ae00be28 Page functions woocommerce to wc refactor 2013-11-25 15:07:22 +01:00
Mike Jolley 51ba9c393f WC globals 2013-11-25 14:01:38 +00:00
Coen Jacobs cb4e239655 Cart functions woocommerce to wc refactor 2013-11-25 13:23:39 +01:00
thenbrent fe44f020e3 Update calls to wc_add_message() function
Part of #4034
2013-11-12 20:59:39 -08:00
thenbrent 0d45e19fcf Update calls to wc_add_error() function
Part of #4034
2013-11-12 20:59:39 -08:00
Mike Jolley fce70b288d We should allow failed orders to be resumed, not show a blank page. Closes #3612
@coenjacobs might need to go in 15
2013-09-26 17:18:12 +01:00
Mike Jolley 2e6aaa9ede Hide password protected posts from loop, prevent adding to cart, hide product content. Closes #3617. 2013-08-19 18:19:27 +01:00
Mike Jolley 57157db9bf Function refactoring. 2013-08-09 17:11:21 +01:00