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

using spaces after text

This commit is contained in:
Patrick Rauland 2014-04-01 16:55:36 -05:00 committed by Mike Jolley
parent d6f8ef13d0
commit f9fafc7d16
1 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
includes/shipping/local-delivery/class-wc-shipping-local-delivery.php
View File

@ -21,7 +21,7 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
* @return void * @return void
*/ */
function __construct() { function __construct() {
$this->id = 'local_delivery'; $this->id = 'local_delivery';
$this->method_title = __( 'Local Delivery', 'woocommerce' ); $this->method_title = __( 'Local Delivery', 'woocommerce' );
$this->init(); $this->init();
} }
@ -39,13 +39,13 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
$this->init_settings(); $this->init_settings();
// Define user set variables // Define user set variables
$this->title = $this->get_option( 'title' ); $this->title = $this->get_option( 'title' );
$this->type = $this->get_option( 'type' ); $this->type = $this->get_option( 'type' );
$this->fee = $this->get_option( 'fee' ); $this->fee = $this->get_option( 'fee' );
$this->type = $this->get_option( 'type' ); $this->type = $this->get_option( 'type' );
$this->codes = $this->get_option( 'codes' ); $this->codes = $this->get_option( 'codes' );
$this->availability = $this->get_option( 'availability' ); $this->availability = $this->get_option( 'availability' );
$this->countries = $this->get_option( 'countries' ); $this->countries = $this->get_option( 'countries' );
add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) ); add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
} }
@ -70,15 +70,16 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
foreach ( WC()->cart->get_cart() as $item_id => $values ) { foreach ( WC()->cart->get_cart() as $item_id => $values ) {
$_product = $values['data']; $_product = $values['data'];
if ( $values['quantity'] > 0 && $_product->needs_shipping() ) if ( $values['quantity'] > 0 && $_product->needs_shipping() ) {
$shipping_total += $this->fee * $values['quantity']; $shipping_total += $this->fee * $values['quantity'];
}
} }
} }
$rate = array( $rate = array(
'id' => $this->id, 'id' => $this->id,
'label' => $this->title, 'label' => $this->title,
'cost' => $shipping_total 'cost' => $shipping_total
); );
$this->add_rate($rate); $this->add_rate($rate);
@ -93,67 +94,67 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
function init_form_fields() { function init_form_fields() {
$this->form_fields = array( $this->form_fields = array(
'enabled' => array( 'enabled' => array(
'title' => __( 'Enable', 'woocommerce' ), 'title' => __( 'Enable', 'woocommerce' ),
'type' => 'checkbox', 'type' => 'checkbox',
'label' => __( 'Enable local delivery', 'woocommerce' ), 'label' => __( 'Enable local delivery', 'woocommerce' ),
'default' => 'no' 'default' => 'no'
), ),
'title' => array( 'title' => array(
'title' => __( 'Title', 'woocommerce' ), 'title' => __( 'Title', 'woocommerce' ),
'type' => 'text', 'type' => 'text',
'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ), 'description' => __( 'This controls the title which the user sees during checkout.', 'woocommerce' ),
'default' => __( 'Local Delivery', 'woocommerce' ), 'default' => __( 'Local Delivery', 'woocommerce' ),
'desc_tip' => true, 'desc_tip' => true,
), ),
'type' => array( 'type' => array(
'title' => __( 'Fee Type', 'woocommerce' ), 'title' => __( 'Fee Type', 'woocommerce' ),
'type' => 'select', 'type' => 'select',
'description' => __( 'How to calculate delivery charges', 'woocommerce' ), 'description' => __( 'How to calculate delivery charges', 'woocommerce' ),
'default' => 'fixed', 'default' => 'fixed',
'options' => array( 'options' => array(
'fixed' => __( 'Fixed amount', 'woocommerce' ), 'fixed' => __( 'Fixed amount', 'woocommerce' ),
'percent' => __( 'Percentage of cart total', 'woocommerce' ), 'percent' => __( 'Percentage of cart total', 'woocommerce' ),
'product' => __( 'Fixed amount per product', 'woocommerce' ), 'product' => __( 'Fixed amount per product', 'woocommerce' ),
), ),
'desc_tip' => true, 'desc_tip' => true,
), ),
'fee' => array( 'fee' => array(
'title' => __( 'Delivery Fee', 'woocommerce' ), 'title' => __( 'Delivery Fee', 'woocommerce' ),
'type' => 'price', 'type' => 'price',
'description' => __( 'What fee do you want to charge for local delivery, disregarded if you choose free. Leave blank to disable.', 'woocommerce' ), 'description' => __( 'What fee do you want to charge for local delivery, disregarded if you choose free. Leave blank to disable.', 'woocommerce' ),
'default' => '', 'default' => '',
'desc_tip' => true, 'desc_tip' => true,
'placeholder' => wc_format_localized_price( 0 ) 'placeholder' => wc_format_localized_price( 0 )
), ),
'codes' => array( 'codes' => array(
'title' => __( 'Zip/Post Codes', 'woocommerce' ), 'title' => __( 'Zip/Post Codes', 'woocommerce' ),
'type' => 'textarea', 'type' => 'textarea',
'description' => __( 'What zip/post codes would you like to offer delivery to? Separate codes with a comma. Accepts wildcards, e.g. P* will match a postcode of PE30.', 'woocommerce' ), 'description' => __( 'What zip/post codes would you like to offer delivery to? Separate codes with a comma. Accepts wildcards, e.g. P* will match a postcode of PE30.', 'woocommerce' ),
'default' => '', 'default' => '',
'desc_tip' => true, 'desc_tip' => true,
'placeholder' => '12345, 56789 etc' 'placeholder' => '12345, 56789 etc'
), ),
'availability' => array( 'availability' => array(
'title' => __( 'Method availability', 'woocommerce' ), 'title' => __( 'Method availability', 'woocommerce' ),
'type' => 'select', 'type' => 'select',
'default' => 'all', 'default' => 'all',
'class' => 'availability', 'class' => 'availability',
'options' => array( 'options' => array(
'all' => __( 'All allowed countries', 'woocommerce' ), 'all' => __( 'All allowed countries', 'woocommerce' ),
'specific' => __( 'Specific Countries', 'woocommerce' ) 'specific' => __( 'Specific Countries', 'woocommerce' )
) )
), ),
'countries' => array( 'countries' => array(
'title' => __( 'Specific Countries', 'woocommerce' ), 'title' => __( 'Specific Countries', 'woocommerce' ),
'type' => 'multiselect', 'type' => 'multiselect',
'class' => 'chosen_select', 'class' => 'chosen_select',
'css' => 'width: 450px;', 'css' => 'width: 450px;',
'default' => '', 'default' => '',
'options' => WC()->countries->get_shipping_countries(), 'options' => WC()->countries->get_shipping_countries(),
'custom_attributes' => array( 'custom_attributes' => array(
'data-placeholder' => __( 'Select some countries', 'woocommerce' ) 'data-placeholder' => __( 'Select some countries', 'woocommerce' )
) )
) )
); );
} }
@ -196,18 +197,18 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
$found_match = false; $found_match = false;
if ( in_array( $this->clean( $package['destination']['postcode'] ), $codes ) ) if ( in_array( $this->clean( $package['destination']['postcode'] ), $codes ) ) {
$found_match = true; $found_match = true;
}
// Pattern match // Pattern match
if ( ! $found_match ) { if ( ! $found_match ) {
$customer_postcode = $this->clean( $package['destination']['postcode'] ); $customer_postcode = $this->clean( $package['destination']['postcode'] );
foreach ($codes as $c) { foreach ($codes as $c) {
$pattern = '/^'.str_replace('_', '[0-9a-zA-Z]', $c).'$/i'; $pattern = '/^' . str_replace( '_', '[0-9a-zA-Z]', $c ) . '$/i';
if(preg_match($pattern, $customer_postcode)) { if ( preg_match( $pattern, $customer_postcode ) ) {
$found_match = true; $found_match = true;
break; break;
} }
@ -224,26 +225,31 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
for ( $i = 0; $i <= $customer_postcode_length; $i++ ) { for ( $i = 0; $i <= $customer_postcode_length; $i++ ) {
if ( in_array( $customer_postcode, $codes ) ) if ( in_array( $customer_postcode, $codes ) ) {
$found_match = true; $found_match = true;
}
$customer_postcode = substr( $customer_postcode, 0, -2 ) . '*'; $customer_postcode = substr( $customer_postcode, 0, -2 ) . '*';
} }
} }
if ( ! $found_match ) if ( ! $found_match ) {
return false; return false;
}
} }
// Either post codes not setup, or post codes are in array... so lefts check countries for backwards compatibility. // Either post codes not setup, or post codes are in array... so lefts check countries for backwards compatibility.
if ( $this->availability == 'specific' ) if ( $this->availability == 'specific' ) {
$ship_to_countries = $this->countries; $ship_to_countries = $this->countries;
else } else {
$ship_to_countries = array_keys( WC()->countries->get_shipping_countries() ); $ship_to_countries = array_keys( WC()->countries->get_shipping_countries() );
}
if (is_array($ship_to_countries)) if (is_array($ship_to_countries)) {
if (!in_array( $package['destination']['country'] , $ship_to_countries)) if (!in_array( $package['destination']['country'] , $ship_to_countries)){
return false; return false;
}
}
// Yay! We passed! // Yay! We passed!
return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true ); return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true );
@ -261,4 +267,4 @@ class WC_Shipping_Local_Delivery extends WC_Shipping_Method {
return str_replace( '-', '', sanitize_title( $code ) ) . ( strstr( $code, '*' ) ? '*' : '' ); return str_replace( '-', '', sanitize_title( $code ) ) . ( strstr( $code, '*' ) ? '*' : '' );
} }
} }