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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Mike Jolley 2015-12-04 12:06:00 +00:00
parent b09851c642 67cdf834dc
commit 398cde4770
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/js/frontend/checkout.js
View File

@ -271,6 +271,12 @@ jQuery( function( $ ) {
url: wc_checkout_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'update_order_review' ), url: wc_checkout_params.wc_ajax_url.toString().replace( '%%endpoint%%', 'update_order_review' ),
data: data, data: data,
success: function( data ) { success: function( data ) {
// Reload the page if requested
if ( 'true' === data.reload ) {
window.location.reload();
return;
}
// Always update the fragments // Always update the fragments
if ( data && data.fragments ) { if ( data && data.fragments ) {
$.each( data.fragments, function ( key, value ) { $.each( data.fragments, function ( key, value ) {
@ -284,11 +290,6 @@ jQuery( function( $ ) {
var $form = $( 'form.checkout' ); var $form = $( 'form.checkout' );
if ( 'true' === data.reload ) {
window.location.reload();
return;
}
$( '.woocommerce-error, .woocommerce-message' ).remove(); $( '.woocommerce-error, .woocommerce-message' ).remove();
// Add new errors // Add new errors

2
assets/js/frontend/checkout.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
includes/abstracts/abstract-wc-product.php
View File

@ -453,7 +453,7 @@ class WC_Product {
* @return bool * @return bool
*/ */
public function is_virtual() { public function is_virtual() {
return $this->virtual == 'yes' ? true : false; return apply_filters( 'woocommerce_is_virtual', $this->virtual == 'yes' ? true : false, $this );
} }
/** /**