');
// go do the sorting stuff via ajax
- $.post( ajaxurl, { action: 'woocommerce-categories-ordering', id: termid, nextid: nexttermid }, function(response){
+ $.post( ajaxurl, { action: 'woocommerce-term-ordering', id: termid, nextid: nexttermid, thetaxonomy: woocommerce_term_ordering_params.taxonomy }, function(response){
if ( response == 'children' ) window.location.reload();
else {
ui.item.find('.check-column input').show().siblings('img').remove();
diff --git a/classes/order.class.php b/classes/order.class.php
index 39dcada71ed..a5d1ac0d0fd 100644
--- a/classes/order.class.php
+++ b/classes/order.class.php
@@ -272,6 +272,23 @@ class woocommerce_order {
}
+ /** Returns true if the order contains a downloadable product */
+ function has_downloadable_item() {
+ $has_downloadable_item = false;
+
+ foreach($this->items as $item) :
+
+ $_product = $this->get_product_from_item( $item );
+
+ if ($_product->exists && $_product->is_type('downloadable')) :
+ $has_downloadable_item = true;
+ endif;
+
+ endforeach;
+
+ return $has_downloadable_item;
+ }
+
/** Generates a URL so that a customer can checkout/pay for their (unpaid - pending) order via a link */
function get_checkout_payment_url() {
diff --git a/classes/product.class.php b/classes/product.class.php
index c60639c9eb4..0803c208908 100644
--- a/classes/product.class.php
+++ b/classes/product.class.php
@@ -762,7 +762,7 @@ class woocommerce_product {
$values = $options;
}
-
+
$available_attributes[$attribute['name']] = array_unique($values);
}
diff --git a/readme.txt b/readme.txt
index a51d42157ef..714cbcf4d9e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
Contributors: woothemes
Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, shop, shopping, cart, checkout, widgets, reports, shipping, tax, paypal, inventory
Requires at least: 3.1
-Tested up to: 3.2
-Stable tag: 1.0.3
+Tested up to: 3.3
+Stable tag: 1.1
An e-commerce toolkit that helps you sell anything. Beautifully.
@@ -57,7 +57,8 @@ For further documentation on using WooCommerce, please sign up for free at http:
== Changelog ==
-= 1.1 - xx/10/2011 =
+= 1.1 - 12/10/2011 =
+* Tested and working with WordPress 3.3 beta-1
* Added a hook for payment complete order status
* Added woocommerce term meta api
* Added ability to upload category thumbnails
@@ -74,9 +75,11 @@ For further documentation on using WooCommerce, please sign up for free at http:
* Password field type for gateways API
* Front page shop improvements/correct title tags
* Added option for controlling product permalinks
+* Shop page title option
* Load admin css only where needed
* Admin JS cleanup
* Removed error message when clicking buttons to view variations/grouped
+* Drag and drop term ordering (so variation options can be sorted)
= 1.0.3 - 06/10/2011 =
* Several minor fixes/tweaks
diff --git a/woocommerce.php b/woocommerce.php
index 54dcb3bdb2d..84383438d21 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -3,11 +3,11 @@
Plugin Name: WooCommerce
Plugin URI: http://www.woothemes.com/woocommerce/
Description: An eCommerce plugin for wordpress.
-Version: 1.0.3
+Version: 1.1
Author: WooThemes
Author URI: http://woothemes.com
Requires at least: 3.1
-Tested up to: 3.2
+Tested up to: 3.3
*/
if (!session_id()) session_start();
@@ -21,7 +21,7 @@ load_plugin_textdomain('woothemes', false, dirname( plugin_basename( __FILE__ )
* Constants
**/
if (!defined('WOOCOMMERCE_TEMPLATE_URL')) define('WOOCOMMERCE_TEMPLATE_URL', 'woocommerce/');
-if (!defined("WOOCOMMERCE_VERSION")) define("WOOCOMMERCE_VERSION", "1.0.3");
+if (!defined("WOOCOMMERCE_VERSION")) define("WOOCOMMERCE_VERSION", "1.1");
if (!defined("PHP_EOL")) define("PHP_EOL", "\r\n");
/**
diff --git a/woocommerce_emails.php b/woocommerce_emails.php
index 68cad005850..38b813f22ad 100644
--- a/woocommerce_emails.php
+++ b/woocommerce_emails.php
@@ -159,9 +159,15 @@ function woocommerce_completed_order_customer_notification( $id ) {
$order = &new woocommerce_order( $order_id );
- $email_heading = __('Order Complete', 'woothemes');
+ if ($order->has_downloadable_item()) :
+ $email_heading = __('Order Complete/Download Links', 'woothemes');
+ else :
+ $email_heading = __('Order Complete', 'woothemes');
+ endif;
+
+ $email_heading = apply_filters('woocommerce_completed_order_customer_notification_subject', $email_heading);
- $subject = '[' . get_bloginfo('name') . '] ' . __('Order Complete', 'woothemes');
+ $subject = '[' . get_bloginfo('name') . '] ' . $email_heading;
// Buffer
ob_start();
diff --git a/woocommerce_taxonomy.php b/woocommerce_taxonomy.php
index d32feaea9ef..cddd3c85622 100644
--- a/woocommerce_taxonomy.php
+++ b/woocommerce_taxonomy.php
@@ -320,7 +320,7 @@ add_filter( 'post_type_link', 'woocommerce_product_cat_filter_post_link', 10, 4
/**
- * Add product_cat ordering to get_terms
+ * Add term ordering to get_terms
*
* It enables the support a 'menu_order' parameter to get_terms for the product_cat taxonomy.
* By default it is 'ASC'. It accepts 'DESC' too
@@ -331,11 +331,18 @@ add_filter( 'post_type_link', 'woocommerce_product_cat_filter_post_link', 10, 4
add_filter( 'terms_clauses', 'woocommerce_terms_clauses', 10, 3);
function woocommerce_terms_clauses($clauses, $taxonomies, $args ) {
- global $wpdb;
-
- // wordpress should give us the taxonomies asked when calling the get_terms function
- if( !in_array('product_cat', (array)$taxonomies) ) return $clauses;
+ global $wpdb, $woocommerce;
+ // wordpress should give us the taxonomies asked when calling the get_terms function. Only apply to categories and pa_ attributes
+ $found = false;
+ foreach ((array) $taxonomies as $taxonomy) :
+ if ($taxonomy=='product_cat' || strstr($taxonomy, 'pa_')) :
+ $found = true;
+ break;
+ endif;
+ endforeach;
+ if (!$found) return $clauses;
+
// query order
if( isset($args['menu_order']) && !$args['menu_order']) return $clauses; // menu_order is false so we do not add order clause
diff --git a/woocommerce_template_functions.php b/woocommerce_template_functions.php
index d9f7f5b2da5..def23ff69aa 100644
--- a/woocommerce_template_functions.php
+++ b/woocommerce_template_functions.php
@@ -395,22 +395,28 @@ if (!function_exists('woocommerce_variable_add_to_cart')) {