Commit Graph

7373 Commits

Author SHA1 Message Date
Claudio Sanches f5ddaf7930 Merge branch 'master' of github.com:woothemes/woocommerce 2016-05-20 17:51:08 -03:00
Claudio Sanches 11cea999c1 Added custom titles for products tags items, closes #10958 2016-05-20 17:50:56 -03:00
Nico Hauser 62dbb131ac Bumped version 2016-05-20 17:00:19 +02:00
Nico Hauser d75d784e48 Add 'woocommerce_mail_content' to preview
Added the 'woocommerce_mail_content' filter which is used before sending the email in /includes/emails/class-wc-email.php#L465 to the preview
2016-05-20 16:47:18 +02:00
Diego Zanella 60bb76d558 Added action before the rendering of a zone's methods
* The new action will allow to add elements to the page without having to override the view.
2016-05-20 13:27:25 +01:00
Mike Jolley 33d325cd88 Only cache valid coupon codes
Fixes #10950
2016-05-20 10:36:36 +01:00
Mike Jolley c6dfe47ffa Merge pull request #10951 from jamesgol/item_to_undo_url
Pass $cart_item_key to 'woocommerce_get_undo_url' filter
2016-05-20 10:25:52 +01:00
James Golovich 96583d99c0 Pass $cart_item_key to 'woocommerce_get_undo_url' filter
I don't want users to automatically get an item re-added to their cart, I want to change the URL to send them back to the product page so they can re-add the item (if it is still available)
2016-05-19 13:46:22 -07:00
Matej Kravjar a2c85987e0 [API] Fixed product create not honoring --porcelain argument 2016-05-19 19:34:37 +02:00
Mike Jolley 54231c2946 Allow shipping classes interface to be extended. 2016-05-19 12:38:28 +01:00
Mike Jolley ed08e51ddb Status updates via API are manual
Closes #10943
2016-05-19 11:50:19 +01:00
Mike Jolley c22d9a3c14 Use empty instead of null
Closes #10944
2016-05-19 11:47:08 +01:00
Mike Jolley d3a519f6e4 Merge pull request #10945 from JeroenSormani/chosen-method-filter-arg
Add extra '$chosen_method' argument to the 'wc_shipping_chosen_method' hook
2016-05-19 11:45:43 +01:00
JeroenSormani 17878e3ffd Add extra 'chosen_method' argument to the 'wc_shipping_chosen_method' hook 2016-05-19 10:28:54 +02:00
Mike Jolley 130933badf Merge pull request #10937 from thenbrent/cart_hash_tweak
Use print_r() to stringify cart session
2016-05-18 11:30:08 +01:00
Mike Jolley cd2f8284b0 Merge pull request #10933 from bekarice/2-6-beta-tweaks
A couple small WC 2.6 fixes...
2016-05-18 11:12:11 +01:00
Brent Shepherd 671ae32e58 Use print_r() to stringify cart session
Instead of json_encode(), because json_encode() takes types into
account, meaning numbers may end up being represented in the
encoded JSON as a string, e.g. "1" instead of 1, which can lead
to the md5() being different between requests.

This issue surfaces when creating a cart hash in a different
request to the request to pay for the order, because after adding
line items to the cart, the items quantity will be encoded with
json_encode() as an int, but when encoding them in a different
request, where they are coming from the database, they will be
encoded as a string.
2016-05-17 16:38:08 -07:00
Caleb Burks 75dfae2bf2 Return to shop if session expires and escape url. 2016-05-17 17:00:09 -05:00
Caleb Burks 14edd5c1f8 Return to shop if download fails 2016-05-17 16:54:01 -05:00
Caleb Burks b8aea9aff0 Return to shop if session expires 2016-05-17 16:52:17 -05: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
Claudio Sanches a7b952838d Remove dead variable 2016-05-17 17:37:10 -03:00
Rodrigo Primo 1e78f6eb07 Remove unused variable from WC_Payment_Gateway_CC::form() 2016-05-17 16:49:10 -03:00
Beka Rice 8a715e0957 [2.6] Fix WooComm 101 video embeds...
…removes unused videos due to shipping zones changes; adjusts when
“shipping classes” video is shown
2016-05-17 15:43:57 -04:00
Rodrigo Primo 086628fba2 Enqueue 'wc-credit-card-form' before displaying credit card form
The commit c0b7429 failed to keep the line that enqueued 'wc-credit-card-form' script when the method WC_Payment_Gateway::credit_card_form() was renamed to WC_Payment_Gateway_CC::form().
2016-05-17 16:42:18 -03:00
Claudio Sanches d8614cd47e Fixed cc and echeck placeholders 2016-05-17 16:24:11 -03:00
Mike Jolley 2d3d401d67 API ignoring 'name' field.
Fixes #10929
2016-05-17 17:53:50 +01:00
Mike Jolley 19a4648a5a clean post cache after update 2016-05-17 14:46:08 +01:00
Brent Shepherd 8ae4b5ad24 Fix "Undefined variable: args" notice 2016-05-16 22:25:58 -07:00
Brent Shepherd 29692a22c5 Fix fatal error on order tax calculations
Fix "PHP Fatal error: Call to a member function get_total() on array"
by using the shipping line items cost index instead of attempting
to call a method on it which does not exist (because it's an array)
2016-05-16 22:22:53 -07:00
Brent Shepherd 94a9c649ba Remove empty lines 2016-05-16 22:22:38 -07:00
Mike Jolley e6b74ad629 Allow filtering even when DB stored tokens are empty 2016-05-16 15:32:54 +01:00
Mike Jolley dce5c312e5 Hide simplify notice outside of US 2016-05-16 11:30:20 +01:00
Mike Jolley 094afb4745 Allow failed orders to be edited 2016-05-16 11:12:12 +01:00
Mike Jolley 36021ab1ac Improve no longer editable text
Closes #10916
2016-05-16 11:12:04 +01:00
Mike Jolley cf06f69b6b Merge remote-tracking branch 'origin/master' 2016-05-16 10:17:55 +01:00
Mike Jolley ca815f9fdc Merge branch 'pr/10914' 2016-05-16 10:17:51 +01:00
Mike Jolley ba2bfdc685 Fix invalid closing tag 2016-05-16 10:17:44 +01:00
Mike Jolley cdf2e44889 Merge pull request #10919 from WPprodigy/duplicate-filter-fix
Remove an unnecessary filter
2016-05-16 10:16:04 +01:00
Mike Jolley 557bd9e8b7 Merge pull request #10917 from kreamweb/master
Add check of $raw_countries before the foreach in WC_Countries
2016-05-16 10:12:45 +01:00
Mike Jolley 9fe8a1bcdb Merge pull request #10915 from woothemes/variation-no-parent-fix
Prevent variations being created/returned without parents
2016-05-16 10:12:14 +01:00
Mike Jolley fb0358ee07 Wrap currency symbol in span 2016-05-16 10:11:05 +01:00
Caleb Burks e707adedd4 Remove a duplicate filter 2016-05-15 00:41:52 -05:00
kreamweb 0a2c0af5ff Add check of $raw_countries before the foreach in WC_Countries 2016-05-14 11:02:05 +02:00
Mike Jolley d42d7c13b6 Prevent variations being created/returned without parents
Nasty bug discovered by @RiaanKnoetze where it would get a variation
without parent, and due to the return, it wouldn’t be ‘seen’ as a
variation, therefore creating fatal errors when props are called.

To prevent this, lets allow product constructors to throw exceptions.
If they do, the factory class will catch them and return false instead
of an invalid product object.

@claudiosmweb Thoughts on this one before merge?
2016-05-13 19:06:16 +01:00
Claudio Sanches f7fa2c64c3 Added missing textdomain 2016-05-13 14:39:55 -03:00
corsonr becc4ef841 use wc_help_tip() 2016-05-13 18:49:58 +02:00
corsonr ca040a3d1f Add a refund reason help bubble 2016-05-13 18:15:35 +02:00
Mike Jolley 141dd2e7ef link to schema doc 2016-05-13 17:07:33 +01:00
Mike Jolley cf64786447 Full breadcrumbs in zones UI 2016-05-13 16:08:19 +01:00
Mike Jolley b0396004f0 Merge pull request #10906 from woothemes/add/wcc-related-tracker-data
Add additional information to the WC Tracker
2016-05-13 11:05:47 +01:00
Joey Kudish 3b59fd7af4 add additional information to the WC Tracker
* Some basic info about Jetpack version, if connected, and if is a staging site
* Some basic info about WooCommerce Connect, if installed and if active
2016-05-12 13:17:53 -07:00
Ryan Ray b57da86dee Made a tiny adjustment to the order of words and formatting. The sentence is a bit shorter and clearer (to me) now. 2016-05-12 14:22:48 -04:00
Mike Jolley 9c1aa8afe8 Merge pull request #10899 from woothemes/background-updates
Handle DB updates in the background
2016-05-12 16:45:42 +01:00
Mike Jolley 5f46f60cb0 Merge pull request #10907 from corsonr/confirm_delete_order_note
Add order note deletion confirmation
2016-05-12 12:26:26 +01:00
Mike Jolley 986bd5abc7 Fix save and striping 2016-05-12 12:18:35 +01:00
Mike Jolley 07db739a47 Revise link wording and page title 2016-05-12 11:37:48 +01:00
Mike Jolley 8be8fe4c8a Use modal for adding methods on both screens 2016-05-12 11:29:33 +01:00
Mike Jolley 3dba8e3697 Changed icons for methods into text based links and moved save buttons to left to match other settings screens 2016-05-12 11:07:18 +01:00
Mike Jolley b441a218a4 Remove logged in notice
Closes #10904
2016-05-12 10:36:27 +01:00
corsonr 52f3cb3d8a Add order note deletion confirmation 2016-05-12 10:04:32 +02:00
Claudio Sanches 9635a00b93 Fixed term_id override while trying to get term order_
Some old or imported product taxonomy terms don't have any order_ fields
in the wp_termdata and this will return a empty term_id that will
override the WP regular query.

This change avoid override term_id and allow the query work without any
additional data migration.

Closes #10903

cc @mikejolley
2016-05-11 19:33:55 -03:00
Claudio Sanches 5b916de27a Updated WP-API vendor files 2016-05-11 16:43:51 -03:00
Claudio Sanches 2b1d4eced6 [REST API] Allow batch create, update and delete for almost all endpoints 2016-05-11 16:34:53 -03:00
Claudio Sanches dac471273f Merge pull request #10884 from woothemes/wp-api-batch
[REST API] Batch create, update and delete items
2016-05-11 16:22:54 -03:00
Claudio Sanches ccd1f48025 [REST API] Save default total_sales, closes #10898 2016-05-11 13:19:56 -03:00
Claudio Sanches 47ef7e17a1 Created new function to generate webhook secrets based on the user ID and username, closes #10881 2016-05-11 13:14:00 -03:00
Mike Jolley c1830c12cc Redirect to install page w/ nonce
Fixes #10860
2016-05-11 17:01:34 +01:00
Mike Jolley c9095abf8e Save line taxes for shipping rows
Fixes #10897
2016-05-11 16:32:51 +01:00
Claudio Sanches 35fdcd243a [REST API] Added method to check if the request is to the rest api and allow third party plugins 2016-05-11 11:52:29 -03:00
Mike Jolley 2cc0ac294e Fix return on add_metadata
Fixes #10892
2016-05-11 15:28:40 +01:00
Mike Jolley d1da61a954 Remove update files 2016-05-11 14:26:54 +01:00
Mike Jolley 99cd5187c0 Merge branch 'master' into background-updates
# Conflicts:
#	includes/updates/woocommerce-update-2.4.php
#	includes/updates/woocommerce-update-2.6.php
2016-05-11 14:26:37 +01:00
Mike Jolley e716993809 Store instance ID transitions to option and fire action
Closes #10883 @franticpsyx
2016-05-11 14:25:31 +01:00
Mike Jolley a7176ae543 this is a legacy update 2016-05-11 14:25:31 +01:00
Mike Jolley 5bb7a3a1c4 Logging 2016-05-11 14:22:42 +01:00
Mike Jolley 9cf0758d3f Add logging and notices 2016-05-11 14:22:31 +01:00
Mike Jolley 44bca2633e Notice HTML 2016-05-11 14:22:21 +01:00
Mike Jolley bba4bab8e1 Save notices during shutdown 2016-05-11 14:22:06 +01:00
Mike Jolley 511e8c3146 Handle updates in install class 2016-05-11 12:44:23 +01:00
Mike Jolley 67fa79b1a4 Move updaters to functions 2016-05-11 12:44:12 +01:00
Mike Jolley f896d7a040 Background updater class 2016-05-11 12:44:00 +01:00
Mike Jolley 8e0d7d7bb7 Include libs for background processing 2016-05-11 12:43:54 +01:00
Mike Jolley a8bd4bc6e1 Updating/updated notices 2016-05-11 12:43:35 +01:00
Mike Jolley 8ba2da9820 Store instance ID transitions to option and fire action
Closes #10883 @franticpsyx
2016-05-11 11:30:10 +01:00
Mike Jolley cd01218ee9 this is a legacy update 2016-05-11 11:10:25 +01:00
Mike Jolley 63675c87dc Merge pull request #10891 from woothemes/add/shipping-zone-method-hooks
Add action hooks for shipping zone method actions
2016-05-11 11:07:40 +01:00
Mike Jolley d3b450139b Merge branch 'pr/10893' 2016-05-11 10:58:09 +01:00
Mike Jolley 96cb47e037 escape 2016-05-11 10:58:04 +01:00
Mike Jolley e54a0479fa Merge branch 'pr/10895' 2016-05-11 10:55:38 +01:00
Mike Jolley a0b792625d Adjust action args 2016-05-11 10:55:33 +01:00
Caleb Burks 2fd455769d Make customer download links available for admins 2016-05-10 23:52:18 -05:00
Claudio Sanches cae8056172 [REST API] Fixed a conflict with authentication and our old API
This make authentication avaiable only on the WP REST API for the wc/v1
namespace.

Closes #10890
2016-05-10 18:27:28 -03:00
Joey Kudish 7f71376418 add action hooks for shipping zone method actions
Adds action hooks for shipping zone methods added, deleted and status
toggled
2016-05-10 11:43:47 -07:00
Mike Jolley e552c3c916 Remove filter to hide variations with no prices in get_children()
#10854
2016-05-10 18:23:16 +01:00
Mike Jolley bc3b9a04b7 Do not add field names when tokenizing 2016-05-10 18:23:16 +01:00
Claudio Sanches 5d47875eed [REST API] Allow save post_name/slug for products in v3
Closes #10888
2016-05-10 13:46:53 -03:00
Claudio Sanches ad94a25e5e Merge branch 'master' of github.com:woothemes/woocommerce 2016-05-10 13:41:28 -03:00
Claudio Sanches d7e874324a [REST API] Fixed some schema contexts 2016-05-10 13:41:15 -03:00