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

Adding some backwards compatability

This commit is contained in:
Patrick Garman 2012-03-24 21:34:59 -05:00
parent 705b7fe7ab
commit 97705e28c3
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
classes/shipping/class-wc-local-delivery.php
View File

@ -31,6 +31,8 @@ class WC_Local_Delivery extends WC_Shipping_Method {
$this->fee = $this->settings['fee']; $this->fee = $this->settings['fee'];
$this->type = $this->settings['type']; $this->type = $this->settings['type'];
$this->codes = $this->settings['codes']; $this->codes = $this->settings['codes'];
$this->availability = $this->settings['availability'];
$this->countries = $this->settings['countries'];
add_action('woocommerce_update_options_shipping_methods', array(&$this, 'process_admin_options')); add_action('woocommerce_update_options_shipping_methods', array(&$this, 'process_admin_options'));
} }
@ -88,6 +90,24 @@ class WC_Local_Delivery extends WC_Shipping_Method {
'description' => __( 'What zip/post codes would you like to offer delivery to? Separate codes with a comma.', 'woocommerce' ), 'description' => __( 'What zip/post codes would you like to offer delivery to? Separate codes with a comma.', 'woocommerce' ),
'default' => '' 'default' => ''
), ),
'availability' => array(
'title' => __( 'Method availability', 'woocommerce' ),
'type' => 'select',
'default' => 'all',
'class' => 'availability',
'options' => array(
'all' => __('All allowed countries', 'woocommerce'),
'specific' => __('Specific Countries', 'woocommerce')
)
),
'countries' => array(
'title' => __( 'Specific Countries', 'woocommerce' ),
'type' => 'multiselect',
'class' => 'chosen_select',
'css' => 'width: 450px;',
'default' => '',
'options' => $woocommerce->countries->countries
)
); );
} }
@ -105,15 +125,33 @@ class WC_Local_Delivery extends WC_Shipping_Method {
if ($this->enabled=="no") return false; if ($this->enabled=="no") return false;
// If post codes are listed, let's use them.
$codes = ''; $codes = '';
if($this->codes != '') {
foreach(explode(',',$this->codes) as $code) { foreach(explode(',',$this->codes) as $code) {
$codes[] = $this->clean($code); $codes[] = $this->clean($code);
} }
}
if (is_array($codes)) if (is_array($codes))
if (!in_array($this->clean($woocommerce->customer->get_shipping_postcode()), $codes)) if (!in_array($this->clean($woocommerce->customer->get_shipping_postcode()), $codes))
return false; return false;
// Either post codes not setup, or post codes are in array... so lefts check countries for backwards compatability.
$ship_to_countries = '';
if ($this->availability == 'specific') :
$ship_to_countries = $this->countries;
else :
if (get_option('woocommerce_allowed_countries')=='specific') :
$ship_to_countries = get_option('woocommerce_specific_allowed_countries');
endif;
endif;
if (is_array($ship_to_countries))
if (!in_array($woocommerce->customer->get_shipping_country(), $ship_to_countries))
return false;
// Yay! We passed!
return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true ); return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true );
} }