Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Goodbye to free Closes #602.

This commit is contained in:
Mike Jolley 2012-02-09 09:44:43 +00:00
parent 3984f2b467
commit 44794833f6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/post-types/writepanels/writepanel-product-type-variable.php
View File

@ -372,8 +372,10 @@ function variable_product_type_options() {
if (count==1) {
alert( count + ' <?php _e("variation added"); ?>');
} else {
} else if (count==0 || count>1) {
alert( count + ' <?php _e("variations added"); ?>');
} else {
alert('<?php _e("No variations added"); ?>');
}
jQuery('#variable_product_options').unblock();

1
readme.txt
View File

@ -95,6 +95,7 @@ Yes you can! Join in on our GitHub repository :) https://github.com/woothemes/wo
* Shipping classes added to individual product variations
* woocommerce_nocache function for cart/checkout/myaccount pages which need to be dynamic
* Coupon code case fix
* Removed automatic -free on shipping methods
* Other minor fixes
= 1.4.1 - 01/02/2012 =

7
templates/cart/totals.php
View File

@ -41,9 +41,10 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
foreach ($available_methods as $method ) :
echo '<option value="'.esc_attr($method->id).'" '.selected($method->id, $_SESSION['_chosen_shipping_method'], false).'>'.$method->label.' &mdash; ';
echo '<option value="'.esc_attr($method->id).'" '.selected($method->id, $_SESSION['_chosen_shipping_method'], false).'>'.$method->label;
if ($method->cost>0) :
echo ' &mdash; ';
if ($woocommerce->cart->display_totals_ex_tax || !$woocommerce->cart->prices_include_tax) :
@ -61,8 +62,6 @@ $available_methods = $woocommerce->shipping->get_available_shipping_methods();
endif;
else :
echo __('Free', 'woocommerce');
endif;
echo '</option>';

6
templates/checkout/review-order.php
View File

@ -44,10 +44,12 @@
if ($method->id==$_SESSION['_chosen_shipping_method']) echo 'selected="selected"';
echo '>'.esc_html($method->label).' &mdash; ';
echo '>'.esc_html($method->label);
if ($method->cost>0) :
echo ' &mdash; ';
if ($woocommerce->cart->display_totals_ex_tax || !$woocommerce->cart->prices_include_tax) :
echo woocommerce_price($method->cost);
@ -64,8 +66,6 @@
endif;
else :
echo __('Free', 'woocommerce');
endif;
echo '</option>';