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

Merge pull request #11471 from woothemes/fix-free-shipping 

Fix free shipping
This commit is contained in:
Claudio Sanches 2016-07-19 09:36:12 -03:00 committed by GitHub
parent aab6f86652 70bf9bfcd6
commit 8d5f0d5c11
1 changed files with 103 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,14 +15,24 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
/** @var float Min amount to be valid */
/**
* Min amount to be valid.
*
* @var integer
*/
public $min_amount = 0;
/** @var string Requires option */
/**
* Requires option.
*
* @var string
*/
public $requires = '';
/**
* Constructor.
*
* @param int $instance_id Shipping method instance.
*/
public function __construct( $instance_id = 0 ) {
$this->id = 'free_shipping';
@ -34,31 +44,32 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
'instance-settings',
'instance-settings-modal',
);
$this->init();
}
/**
* Initialize free shipping.
*/
public function init() {
// Load the settings.
$this->init_form_fields();
$this->init_settings();
// Define user set variables.
$this->title = $this->get_option( 'title' );
$this->min_amount = $this->get_option( 'min_amount', 0 );
$this->requires = $this->get_option( 'requires' );
// Actions.
add_action( 'woocommerce_update_options_shipping_' . $this->id, array( $this, 'process_admin_options' ) );
}
/**
* Get setting form fields for instances of this shipping method within zones.
* @return array
* Init form fields.
*/
public function get_instance_form_fields() {
wc_enqueue_js( "
jQuery( function( $ ) {
$('#woocommerce_free_shipping_requires').change(function(){
if ( $(this).val() === 'coupon' || $(this).val() === '' ) {
$('#woocommerce_free_shipping_min_amount').closest('tr').hide();
} else {
$('#woocommerce_free_shipping_min_amount').closest('tr').show();
}
}).change();
});
" );
return array(
public function init_form_fields() {
$this->instance_form_fields = array(
'title' => array(
'title' => __( 'Title', 'woocommerce' ),
'type' => 'text',
@ -77,7 +88,7 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
'min_amount' => __( 'A minimum order amount', 'woocommerce' ),
'either' => __( 'A minimum order amount OR a coupon', 'woocommerce' ),
'both' => __( 'A minimum order amount AND a coupon', 'woocommerce' ),
)
),
),
'min_amount' => array(
'title' => __( 'Minimum Order Amount', 'woocommerce' ),
@ -85,14 +96,50 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
'placeholder' => wc_format_localized_price( 0 ),
'description' => __( 'Users will need to spend this amount to get free shipping (if enabled above).', 'woocommerce' ),
'default' => '0',
'desc_tip' => true
)
'desc_tip' => true,
),
);
}
/**
* Get setting form fields for instances of this shipping method within zones.
*
* @return array
*/
public function get_instance_form_fields() {
wc_enqueue_js( "
jQuery( function( $ ) {
function wcFreeShippingShowHideminAmountField( el ) {
var form = $( el ).closest( 'form' );
var minAmountField = $( '#woocommerce_free_shipping_min_amount', form ).closest( 'tr' );
if ( 'coupon' === $( el ).val() || '' === $( el ).val() ) {
minAmountField.hide();
} else {
minAmountField.show();
}
}
$( document.body ).on( 'change', '#woocommerce_free_shipping_requires', function() {
wcFreeShippingShowHideminAmountField( this );
});
// Change while load.
$( '#woocommerce_free_shipping_requires' ).change();
$( document.body ).on( 'wc_backbone_modal_loaded', function( evt, target ) {
if ( 'wc-modal-shipping-method-settings' === target ) {
wcFreeShippingShowHideminAmountField( $( '#wc-backbone-modal-dialog #woocommerce_free_shipping_requires', evt.currentTarget ) );
}
} );
});
" );
return parent::get_instance_form_fields();
}
/**
* See if free shipping is available based on the package and cart.
* @param array $package
*
* @param array $package Shipping package.
* @return bool
*/
public function is_available( $package ) {
@ -147,7 +194,10 @@ class WC_Shipping_Free_Shipping extends WC_Shipping_Method {
/**
* Called to calculate shipping rates for this method. Rates can be added using the add_rate() method.
*
* @uses WC_Shipping_Method::add_rate()
*
* @param array $package Shipping package.
*/
public function calculate_shipping( $package = array() ) {
$this->add_rate( array(