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

Merge branch 'master' of github.com:woothemes/woocommerce

This commit is contained in:
claudiosmweb 2014-11-19 21:36:53 -02:00
parent 74ba11c189 2b645ed293
commit 45ddc1d26e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
includes/shipping/flat-rate/class-wc-shipping-flat-rate.php
View File

@ -16,6 +16,12 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
/**
* Stores an array of rates
* @var array
*/
public $flat_rates = array();
/**
* __construct function.
*
@ -233,7 +239,6 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
/**
* order_shipping function.
*
* @access public
* @param array $package
* @return float
*/
@ -252,17 +257,15 @@ class WC_Shipping_Flat_Rate extends WC_Shipping_Method {
$cost = $this->flat_rates[ $shipping_class ]['cost'];
$fee = $this->flat_rates[ $shipping_class ]['fee'];
}
} else {
// No matching classes so use defaults
if ( ! empty( $this->cost ) && $this->cost > $cost ) {
} elseif ( $this->cost > $cost ) {
$cost = $this->cost;
$fee = $this->fee;
}
}
}
}
// Default rates if set
if ( is_null( $cost ) && $this->cost !== '' ) {
$cost = $this->cost;