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

Clean up labels and default cost to 0 for int shipping 

Closes #5219
This commit is contained in:
Mike Jolley 2014-04-07 10:07:13 +01:00
parent b4d63270b6
commit 66a1b93fec
2 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
includes/shipping/international-delivery/class-wc-shipping-international-delivery.php
View File

@ -22,7 +22,7 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
* @access public * @access public
* @return void * @return void
*/ */
function __construct() { public function __construct() {
$this->id = 'international_delivery'; $this->id = 'international_delivery';
$this->flat_rate_option = 'woocommerce_international_delivery_flat_rates'; $this->flat_rate_option = 'woocommerce_international_delivery_flat_rates';
@ -42,7 +42,7 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
* @access public * @access public
* @return void * @return void
*/ */
function init_form_fields() { public function init_form_fields() {
$this->form_fields = array( $this->form_fields = array(
'enabled' => array( 'enabled' => array(
@ -112,7 +112,7 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
'description' => __( 'Fee excluding tax. Enter an amount, e.g. 2.50, or a percentage, e.g. 5%. Leave blank to disable.', 'woocommerce' ), 'description' => __( 'Fee excluding tax. Enter an amount, e.g. 2.50, or a percentage, e.g. 5%. Leave blank to disable.', 'woocommerce' ),
'default' => '', 'default' => '',
'desc_tip' => true, 'desc_tip' => true,
'placeholder' => wc_format_localized_price( 0 ), 'placeholder' => __( 'N/A', 'woocommerce' )
), ),
'minimum_fee' => array( 'minimum_fee' => array(
'title' => __( 'Minimum Handling Fee', 'woocommerce' ), 'title' => __( 'Minimum Handling Fee', 'woocommerce' ),
@ -120,7 +120,7 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
'description' => __( 'Enter a minimum fee amount. Fee\'s less than this will be increased. Leave blank to disable.', 'woocommerce' ), 'description' => __( 'Enter a minimum fee amount. Fee\'s less than this will be increased. Leave blank to disable.', 'woocommerce' ),
'default' => '', 'default' => '',
'desc_tip' => true, 'desc_tip' => true,
'placeholder' => wc_format_localized_decimal( '0' ) 'placeholder' => __( 'N/A', 'woocommerce' )
), ),
); );
@ -134,25 +134,78 @@ class WC_Shipping_International_Delivery extends WC_Shipping_Flat_Rate {
* @param mixed $package * @param mixed $package
* @return bool * @return bool
*/ */
function is_available( $package ) { public function is_available( $package ) {
if ($this->enabled=="no") return false; if ( "no" === $this->enabled ) {
return false;
}
if ($this->availability=='including') : if ( 'including' === $this->availability ) {
if (is_array($this->countries)) : if ( is_array( $this->countries ) && ! in_array( $package['destination']['country'], $this->countries ) ) {
if ( ! in_array( $package['destination']['country'], $this->countries) ) return false; return false;
endif; }
else : } else {
if (is_array($this->countries)) : if ( is_array( $this->countries ) && in_array( $package['destination']['country'], $this->countries ) ) {
if ( in_array( $package['destination']['country'], $this->countries) ) return false; return false;
endif; }
endif; }
return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true ); return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', true );
} }
/**
* calculate_shipping function.
*
* @access public
* @param array $package (default: array())
* @return void
*/
public function calculate_shipping( $package = array() ) {
$this->rates = array();
if ( 'order' === $this->type ) {
$shipping_total = $this->order_shipping( $package );
$rate = array(
'id' => $this->id,
'label' => $this->title,
'cost' => $shipping_total ? $shipping_total : 0,
);
} elseif ( 'class' === $this->type ) {
$shipping_total = $this->class_shipping( $package );
$rate = array(
'id' => $this->id,
'label' => $this->title,
'cost' => $shipping_total ? $shipping_total : 0,
);
} elseif ( 'item' === $this->type ) {
$costs = $this->item_shipping( $package );
if ( ! is_array( $costs ) ) {
$costs = array();
}
$rate = array(
'id' => $this->id,
'label' => $this->title,
'cost' => $costs,
'calc_tax' => 'per_item',
);
}
if ( isset( $rate ) ) {
$this->add_rate( $rate );
}
}
} }

2
templates/single-product/meta.php
View File

@ -20,7 +20,7 @@ $tag_count = sizeof( get_the_terms( $post->ID, 'product_tag' ) );
<?php if ( wc_product_sku_enabled() && ( $product->get_sku() || $product->is_type( 'variable' ) ) ) : ?> <?php if ( wc_product_sku_enabled() && ( $product->get_sku() || $product->is_type( 'variable' ) ) ) : ?>
<span class="sku_wrapper"><?php _e( 'SKU:', 'woocommerce' ); ?> <span class="sku" itemprop="sku"><?php echo ( $sku = $product->get_sku() ) ? $sku : __( 'n/a', 'woocommerce' ); ?></span>.</span> <span class="sku_wrapper"><?php _e( 'SKU:', 'woocommerce' ); ?> <span class="sku" itemprop="sku"><?php echo ( $sku = $product->get_sku() ) ? $sku : __( 'N/A', 'woocommerce' ); ?></span>.</span>
<?php endif; ?> <?php endif; ?>