Commit Graph

11795 Commits

Author SHA1 Message Date
MindyPostoff 71c15a60cc Update woocommerce.pot 2015-04-22 16:43:43 -04:00
MindyPostoff 7418fd6c8d Update class-wc-gateway-cod.php
Prevent confusion that "Enable COD for virtual orders" will actually enable the payment method
2015-04-22 16:41:51 -04:00
Gustavo Bordoni 22393df867 The woocommerce_admin_order_item_headers action lacks a variable for context 2015-04-21 23:13:55 -03:00
Claudio Sanches e1b78b932b Merge pull request #7988 from roykho/emails
added id to addresses email template to allow 3rd party plugins to overr...
2015-04-20 16:22:37 -03:00
roykho 202f4c7045 added id to addresses email template to allow 3rd party plugins to override easier 2015-04-20 09:21:00 -07: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 9debd84a7f Merge pull request #7978 from InoPlugs/patch-3
[2.3] Update abstract-wc-order.php
2015-04-20 11:12:25 +01:00
Mike Jolley a74b1a3103 Merge pull request #7971 from Spreeuw/master
Make get_shipping_to_display compatible with refunds
2015-04-20 11:10:40 +01:00
Mike Jolley 2a1e17b34c Merge pull request #7983 from roykho/wp_query
[2.3] check to make sure wp_query object is not null before calling function t...
2015-04-20 11:08:34 +01:00
Claudio Sanches f6511ae7fe Merge pull request #7982 from franticpsyx/order_item_qty_filter
Introduce 'woocommerce_email_order_item_quantity' filter
2015-04-19 22:46:37 -03:00
roykho 30111dd988 check to make sure wp_query object is not null before calling function that depends on it fixes #7981 2015-04-19 16:46:04 -07:00
Manos Psychogyiopoulos 2053a83399 woocommerce_email_order_item_quantity filter 2015-04-20 00:22:42 +03:00
InoPlugs Webdesign 520282ff16 Update abstract-wc-order.php
Using a wrong key name -> 'cart_discount_tax' is calculated wrong a few lines below (= $cart_subtotal_tax)
2015-04-18 14:44:39 +02:00
Mike Jolley c8467b143a [2.3] Use exclusive price and exclusive subtotal to work out % of discount 2015-04-17 20:42:18 +01:00
Claudio Sanches 3e99768047 [API] Added product_url and button_text for external products, closes #7974 2015-04-17 15:50:18 -03:00
James Koster 11313fe229 [2.3] template version 2015-04-17 14:30:30 +01:00
Spreeuw 1e2d0775c4 tax text for negative shipping (refunds) 2015-04-17 12:45:32 +02:00
Spreeuw 3f0b589797 Make get_shipping_to_display compatible with refunds 2015-04-17 12:38:08 +02:00
Mike Jolley 467a269175 Only set author for user added notes so system notes can be distinguished 2015-04-17 11:23:09 +01:00
Chris Klosowski d26265f885 Allowing filters to be applied #7285 2015-04-16 13:32:35 -07:00
Claudio Sanches 7ab0d01aa2 [API] Fixed create order method 2015-04-16 15:26:54 -03:00
Claudio Sanches 99896f8410 Merge pull request #7966 from benedict-w/patch-4
Update cart.php - Added $cart_item to woocommerce_cart_item_quantity
2015-04-16 10:42:32 -03:00
Claudio Sanches 4d1b48a649 Merge pull request #7967 from shivapoudel/event-textarea
Don't react with enter key for textarea on backbone modal
2015-04-16 10:42:07 -03:00
shivapoudel d0dad3587a Don't react with enter key for textarea on backbone modal used for tinyMCE 2015-04-16 19:10:56 +05:45
Benedict 5fc10ad757 Update cart.php
In the `woocommerce_cart_item_quantity` filter the `$cart_item_key` is useless without the `$cart_item`, which is included in all the other relevant filters in this file. NB. Added here as last argument so not to break existing code.
2015-04-16 15:11:30 +02:00
Claudio Sanches b2eb52298e Updated the template version for #7962 2015-04-15 10:39:14 -03:00
Claudio Sanches e8d3ce26a6 Merge pull request #7962 from SiR-DanieL/patch-1
Action woocommerce_before_variations_form
2015-04-15 10:28:18 -03:00
Nicola Mustone c8f8ee33be Action woocommerce_before_variations_form
Added action `woocommerce_before_variations_form` to hook before the variations dropdowns
2015-04-15 15:26:46 +02:00
Claudio Sanches a344fae67f Improved simplify commerce for free subscriptions 2015-04-15 09:55:35 -03:00
Claudio Sanches 8914594534 Fixed the simplify subscription payment when is a free trial 2015-04-15 09:48:56 -03:00
Claudio Sanches 52baea6825 Merge pull request #7957 from nickrouty/patch-1
Verify order was found
2015-04-14 19:25:46 -03:00
nickrouty 0f88f6386b Verify order was found
Verify the order was found before evaluating the user_id on the $order object. Would previously throw an error if attempting to view an invalid order number.
2015-04-14 15:16:34 -07:00
Mike Jolley 1e06f82f59 Merge pull request #7948 from dangh/master
Cannot remove shipping class at quick edit
2015-04-14 12:02:17 +01:00
Mike Jolley 3d13b762d1 Merge branch 'mattallan-wc-api-rollback-error' 2015-04-14 11:27:37 +01:00
Mike Jolley d133d35e27 Fix conflict 2015-04-14 11:27:30 +01:00
Mike Jolley 38f8c5fd0b Round values in category report
Closes #7949
2015-04-14 10:51:20 +01:00
Mike Jolley 809573af41 [2.3] Coupon product id and category id checks should run for all coupon types
Closes #7936
2015-04-14 10:21:52 +01:00
Mike Jolley 49cbe2cd9a If taxes based on base location, we don't need a customer address
Closes #7890
2015-04-14 10:08:29 +01:00
Claudio Sanches bf0a180c23 Merge pull request #7945 from shivapoudel/before-update
Introduce trigger wc_backbone_modal_before_update
2015-04-13 16:06:05 -03:00
shivapoudel 3da3de766d Introduce trigger wc_backbone_modal_before_update
To update the form data upon trigger of response event
2015-04-14 00:15:08 +05:45
Claudio Sanches f774450f98 Compressed files 2015-04-13 15:22:16 -03:00
Claudio Sanches d809b60abe Merge pull request #7943 from shivapoudel/selector
Missing document.body selector
2015-04-13 15:22:15 -03:00
shivapoudel 882816e9f5 document.body selector and grunt default task 2015-04-13 22:08:06 +05:45
Claudio Sanches 54e7c38ec0 Merge branch 'master' of github.com:woothemes/woocommerce 2015-04-13 13:06:28 -03:00
Claudio Sanches c06b6f13e3 [API] Improved the error messages when sent a empty object, closes #7914 2015-04-13 13:06:19 -03:00
Mike Jolley dd0fd8c2e7 Merge pull request #7942 from SiR-DanieL/patch-2
Removing localization from reviews date
2015-04-13 17:05:17 +01:00
Nicola Mustone 94fa49655f using wc_date_format 2015-04-13 17:58:03 +02:00
Nicola Mustone cf89d78b7d removing localization 2015-04-13 17:56:41 +02:00
Claudio Sanches aa9c3a1087 Merge pull request #7901 from roykho/flatrate
fixed flatrate per item and per class if no additional costs added, it doesn't correctly fallback to base cost closes #7851
2015-04-13 12:48:55 -03:00