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

Load instance methods for calculations

This commit is contained in:
Mike Jolley 2015-12-15 15:00:45 +00:00
parent 091a8a7641
commit a0e0bb1e55
6 changed files with 70 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
includes/abstracts/abstract-wc-shipping-method.php
View File

@ -151,6 +151,15 @@ abstract class WC_Shipping_Method extends WC_Settings_API {
return 'yes' === $this->enabled;
}
/**
* Return the shipping method instance ID.
* @since 2.6.0
* @return int
*/
public function get_instance_id() {
return $this->instance_id;
}
/**
* Return the shipping method title.
* @since 2.6.0

9
includes/class-wc-countries.php
View File

@ -68,10 +68,15 @@ class WC_Countries {
* @return string
*/
public function get_continent_code_for_country( $cc ) {
$cc = trim( strtoupper( $cc ) );
$continents = $this->get_continents();
$continents_and_ccs = wp_list_pluck( $continents, 'countries' );
$match = array_search( trim( strtoupper( $cc ) ), $continents_and_ccs );
return ! empty( $match ) ? $match : '';
foreach ( $continents_and_ccs as $continent_code => $countries ) {
if ( false !== array_search( $cc, $countries ) ) {
return $continent_code;
}
}
return '';
}
/**

1
includes/class-wc-shipping-zones.php
View File

@ -145,7 +145,6 @@ class WC_Shipping_Zones {
$continent = strtoupper( wc_clean( WC()->countries->get_continent_code_for_country( $country ) ) );
$postcode = strtoupper( wc_clean( $package['destination']['postcode'] ) );
$valid_postcodes = array_map( 'wc_clean', self::_get_wildcard_postcodes( $postcode ) );
$cache_key = WC_Cache_Helper::get_cache_prefix( 'shipping_zones' ) . 'wc_shipping_zone_' . md5( sprintf( '%s+%s+%s', $country, $state, $postcode ) );
$matching_zone_id = wp_cache_get( $cache_key, 'shipping_zones' );

121
includes/class-wc-shipping.php
View File

@ -5,16 +5,19 @@
* Handles shipping and loads shipping methods via hooks.
*
* @class WC_Shipping
* @version 2.3.0
* @version 2.6.0
* @package WooCommerce/Classes/Shipping
* @category Class
* @author WooThemes
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
exit;
}
/**
* WC_Shipping
*/
class WC_Shipping {
/** @var bool True if shipping is enabled. */
@ -79,7 +82,11 @@ class WC_Shipping {
* Initialize shipping.
*/
public function __construct() {
$this->init();
$this->enabled = 'yes' === get_option( 'woocommerce_calc_shipping' );
if ( $this->enabled ) {
$this->init();
}
}
/**
@ -87,8 +94,6 @@ class WC_Shipping {
*/
public function init() {
do_action( 'woocommerce_shipping_init' );
$this->enabled = ( get_option('woocommerce_calc_shipping') == 'no' ) ? false : true;
}
/**
@ -107,48 +112,45 @@ class WC_Shipping {
}
/**
* load_shipping_methods function.
* Load shipping methods.
*
* Loads all shipping methods which are hooked in. If a $package is passed some methods may add themselves conditionally.
*
* Methods are sorted into their user-defined order after being loaded.
*
* @access public
* @param array $package
* @return array
*/
public function load_shipping_methods( $package = array() ) {
$this->unregister_shipping_methods();
// Methods can register themselves through this hook
do_action( 'woocommerce_load_shipping_methods', $package );
// Register methods through a filter
$shipping_methods_to_load = $this->get_shipping_method_class_names();
foreach ( $shipping_methods_to_load as $method ) {
$this->register_shipping_method( $method );
if ( $package ) {
// Register methods for the current customer's zone
$shipping_zone = WC_Shipping_Zones::get_zone_matching_package( $package );
$this->shipping_methods = $shipping_zone->get_shipping_methods();
} else {
$this->shipping_methods = array();
}
$this->sort_shipping_methods();
foreach ( $this->get_shipping_method_class_names() as $method_id => $method_class ) {
$this->register_shipping_method( $method_class );
}
return $this->shipping_methods;
// Methods can register themselves manually through this hook
do_action( 'woocommerce_load_shipping_methods', $package );
// Return loaded methods
return $this->get_shipping_methods();
}
/**
* Register a shipping method for use in calculations.
* Register a shipping method.
*
* @param object|string $method Either the name of the method's class, or an instance of the method's class
* @param object|string $method Either the name of the method's class, or an instance of the method's class.
*/
public function register_shipping_method( $method ) {
if ( ! is_object( $method ) ) {
$method = new $method();
}
$id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
$this->shipping_methods[ $id ] = $method;
$this->shipping_methods[ $method->id ] = $method;
}
/**
@ -158,46 +160,6 @@ class WC_Shipping {
$this->shipping_methods = array();
}
/**
* Sort shipping methods.
*
* Sorts shipping methods into the user defined order.
*
* @return array
*/
public function sort_shipping_methods() {
$sorted_shipping_methods = array();
// Get order option
$ordering = (array) get_option('woocommerce_shipping_method_order');
$order_end = 999;
// Load shipping methods in order
foreach ( $this->shipping_methods as $method ) {
if ( isset( $ordering[ $method->id ] ) && is_numeric( $ordering[ $method->id ] ) ) {
// Add in position
$sorted_shipping_methods[ $ordering[ $method->id ] ][] = $method;
} else {
// Add to end of the array
$sorted_shipping_methods[ $order_end ][] = $method;
}
}
ksort( $sorted_shipping_methods );
$this->shipping_methods = array();
foreach ( $sorted_shipping_methods as $methods )
foreach ( $methods as $method ) {
$id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
$this->shipping_methods[ $id ] = $method;
}
return $this->shipping_methods;
}
/**
* get_shipping_methods function.
*
@ -274,7 +236,7 @@ class WC_Shipping {
}
/**
* calculate_shipping function.
* Calculate shipping costs.
*
* Calculate shipping for (multiple) packages of cart items.
*
@ -371,6 +333,12 @@ class WC_Shipping {
$package['rates'] = array();
foreach ( $this->load_shipping_methods( $package ) as $shipping_method ) {
if ( $shipping_method->supports( 'shipping-zones' ) && ! $shipping_method->get_instance_id() ) {
continue;
}
if ( $shipping_method->is_available( $package ) && ( empty( $package['ship_via'] ) || in_array( $shipping_method->id, $package['ship_via'] ) ) ) {
// Reset Rates
@ -448,16 +416,11 @@ class WC_Shipping {
update_option( 'woocommerce_shipping_method_order', $order );
}
}
/**
* Register a shipping method.
*
* Registers a shipping method ready to be loaded. Accepts a class name (string) or a class object.
*
* @package WooCommerce/Classes/Shipping
* @since 1.5.7
*/
function woocommerce_register_shipping_method( $shipping_method ) {
WC()->shipping->register_shipping_method( $shipping_method );
/**
* @deprecated 2.6.0 Was previously used to determine sort order of methods, but this is now controlled by zones and thus unused.
*/
public function sort_shipping_methods() {
_deprecated_function( 'sort_shipping_methods', '2.6', '' );
return $this->shipping_methods;
}
}

4
includes/shipping/free-shipping/class-wc-shipping-free-shipping.php
View File

@ -40,7 +40,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
$this->min_amount = $this->get_option( 'min_amount', 0 );
$this->requires = $this->get_option( 'requires' );
add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) ); // @todo
add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) ); // @todo
}
/**
@ -162,7 +162,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
*/
public function calculate_shipping() {
$this->add_rate( array(
'id' => $this->id,
'id' => $this->id . $this->instance_id,
'label' => $this->title,
'cost' => 0,
'taxes' => false

12
includes/wc-cart-functions.php
View File

@ -290,8 +290,6 @@ function wc_cart_totals_shipping_method_label( $method ) {
$label .= ' <small class="tax_label">' . WC()->countries->inc_tax_or_vat() . '</small>';
}
}
} elseif ( $method->id !== 'free_shipping' ) {
$label .= ' (' . __( 'Free', 'woocommerce' ) . ')';
}
return apply_filters( 'woocommerce_cart_shipping_method_full_label', $label, $method );
@ -342,6 +340,16 @@ function wc_get_checkout_url() {
return apply_filters( 'woocommerce_get_checkout_url', $checkout_url );
}
/**
* Register a shipping method.
*
* @since 1.5.7
* @param string|object $shipping_method class name (string) or a class object.
*/
function woocommerce_register_shipping_method( $shipping_method ) {
WC()->shipping->register_shipping_method( $shipping_method );
}
/**
* Get the shipping zone matching a given package from the cart.
*