Commit Graph

23449 Commits

Author SHA1 Message Date
Gary Ritchie 552fa3d107 Merge remote-tracking branch 'upstream/master' 2017-09-22 20:31:00 -07:00
claudiulodro fa9bef7ce4 Minify 2017-09-22 14:24:10 -07:00
claudiulodro b757f0db28 Fix #16868 on Cart page 2017-09-22 14:22:53 -07:00
claudiulodro 877a8491ad Cleanup 2017-09-22 14:14:00 -07:00
claudiulodro b3f70bb7b5 Make labels work on Cart page again 2017-09-22 12:31:08 -07:00
claudiulodro 2e4b514a7f Modify product API returned data by context 2017-09-22 10:52:30 -07:00
Claudiu Lodromanean 832302f49d Merge pull request #16894 from adnanlimdiwala/remove-unused-variable
Remove unused variable
2017-09-22 09:19:19 -07:00
Claudiu Lodromanean bb21627583 Merge pull request #16893 from adnanlimdiwala/json-standard-improve
Json standard improve
2017-09-22 09:14:16 -07:00
Mike Jolley 3cd46c6119 Merge pull request #16887 from Miller-Media/fix/16884
Add check for 0 as a string
2017-09-22 14:19:58 +01:00
Mike Jolley 35740448a0 Merge pull request #16885 from woocommerce/fix/16845
Move js clipboards off zeroclipboard
2017-09-22 14:18:44 +01:00
Mike Jolley 5d36e6a9c8 Merge pull request #16886 from woocommerce/fix/16879
Move couple things out of "foreach" loop
2017-09-22 14:17:25 +01:00
Mike Jolley 1d04d46c60 Merge pull request #16888 from thenbrent/fix_shipping_tax
Fix shipping tax when calling WC_Cart::calculate_shipping()
2017-09-22 14:11:24 +01:00
adnanmultidots c72413d925 Removed unused variable 2017-09-22 15:27:21 +05:30
adnanmultidots dba7773e6d Merge branch 'master' of https://github.com/adnanlimdiwala/woocommerce into remove-unused-variable 2017-09-22 15:25:51 +05:30
adnanmultidots b4094b62e5 JSON standard does not allow trailing comma i think. 2017-09-22 14:38:05 +05:30
adnanmultidots 57b6a25bfe Merge remote-tracking branch 'upstream/master' 2017-09-22 12:22:12 +05:30
Gary Ritchie a25d3c8af4 Allow registration to redirect to same page
Fixes #16889
2017-09-21 20:50:45 -07:00
Brent Shepherd 89e932c338 Fix shipping tax when calling calculate_shipping()
The $shipping_taxes is a multidimensional array so array_sum() does not
correctly sum the values. The $merged_taxes is a single level array with
all other taxes set, so array_sum() can be safely used on it.
2017-09-21 16:48:32 -07:00
Matt Miller c87762177b Add check for 0 as a string 2017-09-21 16:21:49 -07:00
claudiulodro ee30de89a8 Shuffle things around to prevent errors and for better performance 2017-09-21 14:06:44 -07:00
claudiulodro 2dc6f18ab4 Use opacity:0 and fix linted js 2017-09-21 13:24:34 -07:00
claudiulodro 279ac6814c Move clipboards off zeroclipboard 2017-09-21 13:09:36 -07:00
Claudiu Lodromanean abc43c473e Merge pull request #16877 from nicoladj77/patch-1
Check for nonce when Cancelling Order.
2017-09-21 10:27:12 -07:00
Claudiu Lodromanean e713b5beb3 Merge pull request #16869 from woocommerce/fix/16861
Fix legacy access to array props (fees, taxes, coupon totals + taxes)
2017-09-21 09:47:29 -07:00
claudiulodro d5981b34e8 Remove redundant rendundancy in deprecation notices 2017-09-21 09:45:38 -07:00
Matt Miller a871d36380 Added wp_unslash() to address fields on the checkout page (#16874)
* Added wp_unslash() to address fields on the checkout page

* Cleaned up code indentation

* Added wp_unslash() function on remaining POST address fields on checkout
2017-09-21 17:37:27 +01:00
Claudiu Lodromanean 3063825c4d Merge pull request #16867 from woocommerce/fix/16853
Add legacy shipping conditon
2017-09-21 09:24:14 -07:00
Claudiu Lodromanean 5e24b86d61 Merge pull request #16866 from woocommerce/fix/16840
Add subtotal to min and max spend code
2017-09-21 09:08:34 -07:00
Claudiu Lodromanean 3440460127 Merge pull request #16865 from woocommerce/fix/16862
remove spam field
2017-09-21 09:06:08 -07:00
claudiulodro 02e33b3cd7 Update template version 2017-09-21 09:05:04 -07:00
Mike Jolley 3c796e2ee7 Merge pull request #16873 from thenbrent/cart_filters
Tweak new cart getter filters - use __FUNCTION__ not __METHOD__ to avoid including WC_Cart:: in hook names
2017-09-21 14:52:49 +01:00
adnan 5e1d68608e Remove unused variable (#16882)
* commit

* Remove Unused Variable in set_coupon_discount_amounts functions.

* removed by mistake dd ss word by me
2017-09-21 14:47:16 +01:00
adnanmultidots 691d37e485 removed by mistake dd ss word by me 2017-09-21 14:38:36 +05:30
adnanmultidots 78ed229776 Remove Unused Variable in set_coupon_discount_amounts functions. 2017-09-21 14:25:21 +05:30
adnanmultidots 9eaee7c978 commit 2017-09-21 11:46:01 +05:30
Nicola Peluchetti 74bea6ec7d Check for nonce when Cancelling Order. 2017-09-21 03:08:06 +03:00
Brent Shepherd 470c5f7a1d Use __FUNCTION__ for filter hook name
To avoid including the WC_Cart class name and a double colon.

Example hook from WC_Cart::get_total():
 * Before this PR: woocommerce_cart_WC_Cart::get_total
 * After this PR: woocommerce_cart_get_total
2017-09-20 14:45:37 -07:00
Mike Jolley 5151415eec Merge branch 'discounts-class-fixes-and-tests' 2017-09-20 18:44:18 +01:00
Mike Jolley 9c63da78c4 Fixed limit to x by avoiding changing the original item (uses clone) 2017-09-20 18:42:10 +01:00
Mike Jolley 21dfde842a Revised coupon sort order to not rely on IDs which can differ between cart and tests
Also edited test to match
2017-09-20 18:41:48 +01:00
Mike Jolley 29107d24a9 Remove filters from tests and correct sums 2017-09-20 18:37:26 +01:00
Shakeeb Sadikeen da6a37c0d1 fixed : custom tab with no class error
when class is not passed with custom tab. echo's undefined index error with classes fixed
2017-09-20 22:14:58 +05:30
Mike Jolley 5131d096a8 JSMIN 2017-09-20 16:03:30 +01:00
Mike Jolley eb3396328b Apply default locale before country locale 2017-09-20 16:03:26 +01:00
Mike Jolley c0542be4ff Merge branch 'pr/16841' 2017-09-20 15:47:37 +01:00
Mike Jolley 3d9902c4d5 Page template should have higher priority. 2017-09-20 15:47:30 +01:00
Mike Jolley eb79566985 Fix legacy access to array props (fees, taxes, coupon totals + taxes)
Closes #16861
2017-09-20 15:39:05 +01:00
Mike Jolley f1f3a6fbc0 Add legacy shipping conditon
Closes #16853
2017-09-20 14:11:47 +01:00
Mike Jolley 9e1bd3c54d phpcs 2017-09-20 14:03:06 +01:00
Mike Jolley 2c70444123 Add subtotal to min and max spend code
Closes #16840
2017-09-20 13:51:41 +01:00