'+wc_checkout_params.i18n_checkout_error+"
")}},error:function(a,c,d){b.submit_error(''+d+"
")}})}return!1},submit_error:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.$checkout_form.prepend(c),b.$checkout_form.removeClass("processing").unblock(),b.$checkout_form.find(".input-text, select").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3),a(document.body).trigger("checkout_error")}},c={init:function(){a(document.body).on("click","a.showcoupon",this.show_coupon_form),a(document.body).on("click",".woocommerce-remove-coupon",this.remove_coupon),a("form.checkout_coupon").hide().submit(this.submit)},show_coupon_form:function(){return a(".checkout_coupon").slideToggle(400,function(){a(".checkout_coupon").find(":input:eq(0)").focus()}),!1},submit:function(){var b=a(this);if(b.is(".processing"))return!1;b.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={security:wc_checkout_params.apply_coupon_nonce,coupon_code:b.find("input[name=coupon_code]").val()};return a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:c,success:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.removeClass("processing").unblock(),c&&(b.before(c),b.slideUp(),a(document.body).trigger("update_checkout"))},dataType:"html"}),!1},remove_coupon:function(b){b.preventDefault();var c=a(this).parents(".woocommerce-checkout-review-order"),d=a(this).data("coupon");c.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var e={security:wc_checkout_params.remove_coupon_nonce,coupon:d};a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","remove_coupon"),data:e,success:function(b){a(".woocommerce-error, .woocommerce-message").remove(),c.removeClass("processing").unblock(),b&&(a("form.woocommerce-checkout").before(b),a(document.body).trigger("update_checkout"),a("form.checkout_coupon").find('input[name="coupon_code"]').val(""))},error:function(a){wc_checkout_params.debug_mode&&console.log(a.responseText)},dataType:"html"})}},d={init:function(){a(document.body).on("click","a.showlogin",this.show_login_form)},show_login_form:function(){return a("form.login").slideToggle(),!1}};b.init(),c.init(),d.init()});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof wc_checkout_params)return!1;a.blockUI.defaults.overlayCSS.cursor="default";var b={updateTimer:!1,dirtyInput:!1,xhr:!1,$order_review:a("#order_review"),$checkout_form:a("form.checkout"),init:function(){a(document.body).bind("update_checkout",this.update_checkout),a(document.body).bind("init_checkout",this.init_checkout),this.$order_review.on("click","input[name=payment_method]",this.payment_method_selected),this.$checkout_form.on("submit",this.submit),this.$checkout_form.on("blur change",".input-text, select",this.validate_field),this.$checkout_form.on("change","select.shipping_method, input[name^=shipping_method], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type=radio]",this.trigger_update_checkout),this.$checkout_form.on("change",".address-field select",this.input_changed),this.$checkout_form.on("change",".address-field input.input-text, .update_totals_on_change input.input-text",this.maybe_input_changed),this.$checkout_form.on("keydown",".address-field input.input-text, .update_totals_on_change input.input-text",this.queue_update_checkout),this.$checkout_form.on("change","#ship-to-different-address input",this.ship_to_different_address),this.$order_review.find("input[name=payment_method]:checked").trigger("click"),this.$checkout_form.find("#ship-to-different-address input").change(),"1"===wc_checkout_params.is_checkout&&a(document.body).trigger("init_checkout"),"yes"===wc_checkout_params.option_guest_checkout&&a("input#createaccount").change(this.toggle_create_account).change()},toggle_create_account:function(){a("div.create-account").hide(),a(this).is(":checked")&&a("div.create-account").slideDown()},init_checkout:function(){a("#billing_country, #shipping_country, .country_to_state").change(),a(document.body).trigger("update_checkout")},maybe_input_changed:function(a){b.dirtyInput&&b.input_changed(a)},input_changed:function(a){b.dirtyInput=a.target,b.maybe_update_checkout()},queue_update_checkout:function(a){var c=a.keyCode||a.which||0;return 9===c?!0:(b.dirtyInput=this,b.reset_update_checkout_timer(),void(b.updateTimer=setTimeout(b.maybe_update_checkout,"1000")))},trigger_update_checkout:function(){b.reset_update_checkout_timer(),b.dirtyInput=!1,a(document.body).trigger("update_checkout")},maybe_update_checkout:function(){var c=!0;if(a(b.dirtyInput).size()){var d=a(b.dirtyInput).closest("div").find(".address-field.validate-required");d.size()&&d.each(function(){""===a(this).find("input.input-text").val()&&(c=!1)})}c&&b.trigger_update_checkout()},ship_to_different_address:function(){a("div.shipping_address").hide(),a(this).is(":checked")&&a("div.shipping_address").slideDown()},payment_method_selected:function(){if(a(".payment_methods input.input-radio").length>1){var b=a("div.payment_box."+a(this).attr("ID"));a(this).is(":checked")&&!b.is(":visible")&&(a("div.payment_box").filter(":visible").slideUp(250),a(this).is(":checked")&&a("div.payment_box."+a(this).attr("ID")).slideDown(250))}else a("div.payment_box").show();a(this).data("order_button_text")?a("#place_order").val(a(this).data("order_button_text")):a("#place_order").val(a("#place_order").data("value"))},reset_update_checkout_timer:function(){clearTimeout(b.updateTimer)},validate_field:function(){var b=a(this),c=b.closest(".form-row"),d=!0;if(c.is(".validate-required")&&""===b.val()&&(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),d=!1),c.is(".validate-email")&&b.val()){var e=new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);e.test(b.val())||(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-email"),d=!1)}d&&c.removeClass("woocommerce-invalid woocommerce-invalid-required-field").addClass("woocommerce-validated")},update_checkout:function(){b.reset_update_checkout_timer(),b.updateTimer=setTimeout(b.update_checkout_action,"5")},update_checkout_action:function(){if(b.xhr&&b.xhr.abort(),0!==a("form.checkout").size()){var c=[];a("select.shipping_method, input[name^=shipping_method][type=radio]:checked, input[name^=shipping_method][type=hidden]").each(function(){c[a(this).data("index")]=a(this).val()});var d,e,f,g,h,i,j=a("#order_review").find("input[name=payment_method]:checked").val(),k=a("#billing_country").val(),l=a("#billing_state").val(),m=a("input#billing_postcode").val(),n=a("#billing_city").val(),o=a("input#billing_address_1").val(),p=a("input#billing_address_2").val();a("#ship-to-different-address").find("input").is(":checked")?(d=a("#shipping_country").val(),e=a("#shipping_state").val(),f=a("input#shipping_postcode").val(),g=a("#shipping_city").val(),h=a("input#shipping_address_1").val(),i=a("input#shipping_address_2").val()):(d=k,e=l,f=m,g=n,h=o,i=p),a(".woocommerce-checkout-payment, .woocommerce-checkout-review-order-table").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var q={security:wc_checkout_params.update_order_review_nonce,shipping_method:c,payment_method:j,country:k,state:l,postcode:m,city:n,address:o,address_2:p,s_country:d,s_state:e,s_postcode:f,s_city:g,s_address:h,s_address_2:i,post_data:a("form.checkout").serialize()};b.xhr=a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","update_order_review"),data:q,success:function(b){if(b&&b.fragments&&a.each(b.fragments,function(b,c){a(b).replaceWith(c),a(b).unblock()}),"failure"===b.result){var c=a("form.checkout");if("true"===b.reload)return void window.location.reload();a(".woocommerce-error, .woocommerce-message").remove(),b.messages?c.prepend(b.messages):c.prepend(b),c.find(".input-text, select").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3)}0===a(".woocommerce-checkout").find("input[name=payment_method]:checked").size()&&a(".woocommerce-checkout").find("input[name=payment_method]:eq(0)").attr("checked","checked"),a(".woocommerce-checkout").find("input[name=payment_method]:checked").eq(0).trigger("click"),a(document.body).trigger("updated_checkout")}})}},submit:function(){b.reset_update_checkout_timer();var c=a(this);if(c.is(".processing"))return!1;if(c.triggerHandler("checkout_place_order")!==!1&&c.triggerHandler("checkout_place_order_"+a("#order_review").find("input[name=payment_method]:checked").val())!==!1){c.addClass("processing");var d=c.data();1!==d["blockUI.isBlocked"]&&c.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajax({type:"POST",url:wc_checkout_params.checkout_url,data:c.serialize(),dataType:"json",success:function(c){try{if("success"!==c.result)throw"failure"===c.result?"Result failure":"Invalid response";-1===c.redirect.indexOf("https://")||-1===c.redirect.indexOf("http://")?window.location=c.redirect:window.location=decodeURI(c.redirect)}catch(d){if("true"===c.reload)return void window.location.reload();"true"===c.refresh&&a(document.body).trigger("update_checkout"),c.messages?b.submit_error(c.messages):b.submit_error(''+wc_checkout_params.i18n_checkout_error+"
")}},error:function(a,c,d){b.submit_error(''+d+"
")}})}return!1},submit_error:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.$checkout_form.prepend(c),b.$checkout_form.removeClass("processing").unblock(),b.$checkout_form.find(".input-text, select").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3),a(document.body).trigger("checkout_error")}},c={init:function(){a(document.body).on("click","a.showcoupon",this.show_coupon_form),a(document.body).on("click",".woocommerce-remove-coupon",this.remove_coupon),a("form.checkout_coupon").hide().submit(this.submit)},show_coupon_form:function(){return a(".checkout_coupon").slideToggle(400,function(){a(".checkout_coupon").find(":input:eq(0)").focus()}),!1},submit:function(){var b=a(this);if(b.is(".processing"))return!1;b.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var c={security:wc_checkout_params.apply_coupon_nonce,coupon_code:b.find("input[name=coupon_code]").val()};return a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","apply_coupon"),data:c,success:function(c){a(".woocommerce-error, .woocommerce-message").remove(),b.removeClass("processing").unblock(),c&&(b.before(c),b.slideUp(),a(document.body).trigger("update_checkout"))},dataType:"html"}),!1},remove_coupon:function(b){b.preventDefault();var c=a(this).parents(".woocommerce-checkout-review-order"),d=a(this).data("coupon");c.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}});var e={security:wc_checkout_params.remove_coupon_nonce,coupon:d};a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","remove_coupon"),data:e,success:function(b){a(".woocommerce-error, .woocommerce-message").remove(),c.removeClass("processing").unblock(),b&&(a("form.woocommerce-checkout").before(b),a(document.body).trigger("update_checkout"),a("form.checkout_coupon").find('input[name="coupon_code"]').val(""))},error:function(a){wc_checkout_params.debug_mode&&console.log(a.responseText)},dataType:"html"})}},d={init:function(){a(document.body).on("click","a.showlogin",this.show_login_form)},show_login_form:function(){return a("form.login").slideToggle(),!1}};b.init(),c.init(),d.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/geolocation.js b/assets/js/frontend/geolocation.js
index 2fa76a8fd89..1503c07b865 100644
--- a/assets/js/frontend/geolocation.js
+++ b/assets/js/frontend/geolocation.js
@@ -40,13 +40,34 @@ jQuery( function( $ ) {
}
};
- if ( '1' !== wc_geolocation_params.is_checkout ) {
+ if ( '1' !== wc_geolocation_params.is_checkout && '1' !== wc_geolocation_params.is_cart && '1' !== wc_geolocation_params.is_account_page ) {
$.ajax( $geolocate_customer );
+
+ // Support form elements
+ $( 'form' ).each( function() {
+ var $this = $( this );
+ var method = $this.attr( 'method' );
+
+ if ( method && 'get' === method.toLowerCase() ) {
+ $this.append( '' );
+ } else {
+ var href = $this.attr( 'action' );
+ if ( href ) {
+ if ( href.indexOf( '?' ) > 0 ) {
+ $this.attr( 'action', href + '&v=' + wc_geolocation_params.hash );
+ } else {
+ $this.attr( 'action', href + '?v=' + wc_geolocation_params.hash );
+ }
+ }
+ }
+ });
+
+ // Append hashes on load
+ $append_hashes();
}
$( document.body ).on( 'added_to_cart', function() {
$append_hashes();
});
- $append_hashes();
});
diff --git a/assets/js/frontend/geolocation.min.js b/assets/js/frontend/geolocation.min.js
index 5adcd49cfc8..39471d94516 100644
--- a/assets/js/frontend/geolocation.min.js
+++ b/assets/js/frontend/geolocation.min.js
@@ -1 +1 @@
-jQuery(function(a){var b=window.location.toString(),c=function(){wc_geolocation_params.hash&&a('a[href^="'+wc_geolocation_params.home_url+'"]:not(a[href*="v="]), a[href^="/"]:not(a[href*="v="])').each(function(){var b=a(this),c=b.attr("href");c.indexOf("?")>0?b.attr("href",c+"&v="+wc_geolocation_params.hash):b.attr("href",c+"?v="+wc_geolocation_params.hash)})},d=function(a){b=b.indexOf("?v=")>0||b.indexOf("&v=")>0?b.replace(/v=[^&]+/,"v="+a):b.indexOf("?")>0?b+"&v="+a:b+"?v="+a,window.location=b},e={url:wc_geolocation_params.wc_ajax_url.toString().replace("%%endpoint%%","get_customer_location"),type:"GET",success:function(a){a.success&&a.data.hash&&a.data.hash!==wc_geolocation_params.hash&&d(a.data.hash)}};"1"!==wc_geolocation_params.is_checkout&&a.ajax(e),a(document.body).on("added_to_cart",function(){c()}),c()});
\ No newline at end of file
+jQuery(function(a){var b=window.location.toString(),c=function(){wc_geolocation_params.hash&&a('a[href^="'+wc_geolocation_params.home_url+'"]:not(a[href*="v="]), a[href^="/"]:not(a[href*="v="])').each(function(){var b=a(this),c=b.attr("href");c.indexOf("?")>0?b.attr("href",c+"&v="+wc_geolocation_params.hash):b.attr("href",c+"?v="+wc_geolocation_params.hash)})},d=function(a){b=b.indexOf("?v=")>0||b.indexOf("&v=")>0?b.replace(/v=[^&]+/,"v="+a):b.indexOf("?")>0?b+"&v="+a:b+"?v="+a,window.location=b},e={url:wc_geolocation_params.wc_ajax_url.toString().replace("%%endpoint%%","get_customer_location"),type:"GET",success:function(a){a.success&&a.data.hash&&a.data.hash!==wc_geolocation_params.hash&&d(a.data.hash)}};"1"!==wc_geolocation_params.is_checkout&&"1"!==wc_geolocation_params.is_cart&&"1"!==wc_geolocation_params.is_account_page&&(a.ajax(e),a("form").each(function(){var b=a(this),c=b.attr("method");if(c&&"get"===c.toLowerCase())b.append('');else{var d=b.attr("action");d&&(d.indexOf("?")>0?b.attr("action",d+"&v="+wc_geolocation_params.hash):b.attr("action",d+"?v="+wc_geolocation_params.hash))}}),c()),a(document.body).on("added_to_cart",function(){c()})});
\ No newline at end of file
diff --git a/assets/js/admin/jquery.flot.js b/assets/js/jquery-flot/jquery.flot.js
similarity index 100%
rename from assets/js/admin/jquery.flot.js
rename to assets/js/jquery-flot/jquery.flot.js
diff --git a/assets/js/admin/jquery.flot.min.js b/assets/js/jquery-flot/jquery.flot.min.js
similarity index 100%
rename from assets/js/admin/jquery.flot.min.js
rename to assets/js/jquery-flot/jquery.flot.min.js
diff --git a/assets/js/admin/jquery.flot.pie.js b/assets/js/jquery-flot/jquery.flot.pie.js
similarity index 100%
rename from assets/js/admin/jquery.flot.pie.js
rename to assets/js/jquery-flot/jquery.flot.pie.js
diff --git a/assets/js/admin/jquery.flot.pie.min.js b/assets/js/jquery-flot/jquery.flot.pie.min.js
similarity index 100%
rename from assets/js/admin/jquery.flot.pie.min.js
rename to assets/js/jquery-flot/jquery.flot.pie.min.js
diff --git a/assets/js/admin/jquery.flot.resize.js b/assets/js/jquery-flot/jquery.flot.resize.js
similarity index 100%
rename from assets/js/admin/jquery.flot.resize.js
rename to assets/js/jquery-flot/jquery.flot.resize.js
diff --git a/assets/js/admin/jquery.flot.resize.min.js b/assets/js/jquery-flot/jquery.flot.resize.min.js
similarity index 100%
rename from assets/js/admin/jquery.flot.resize.min.js
rename to assets/js/jquery-flot/jquery.flot.resize.min.js
diff --git a/assets/js/admin/jquery.flot.stack.js b/assets/js/jquery-flot/jquery.flot.stack.js
similarity index 100%
rename from assets/js/admin/jquery.flot.stack.js
rename to assets/js/jquery-flot/jquery.flot.stack.js
diff --git a/assets/js/admin/jquery.flot.stack.min.js b/assets/js/jquery-flot/jquery.flot.stack.min.js
similarity index 100%
rename from assets/js/admin/jquery.flot.stack.min.js
rename to assets/js/jquery-flot/jquery.flot.stack.min.js
diff --git a/assets/js/admin/jquery.flot.time.js b/assets/js/jquery-flot/jquery.flot.time.js
similarity index 100%
rename from assets/js/admin/jquery.flot.time.js
rename to assets/js/jquery-flot/jquery.flot.time.js
diff --git a/assets/js/admin/jquery.flot.time.min.js b/assets/js/jquery-flot/jquery.flot.time.min.js
similarity index 100%
rename from assets/js/admin/jquery.flot.time.min.js
rename to assets/js/jquery-flot/jquery.flot.time.min.js
diff --git a/assets/js/frontend/jquery-ui-touch-punch.js b/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js
similarity index 100%
rename from assets/js/frontend/jquery-ui-touch-punch.js
rename to assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.js
diff --git a/assets/js/frontend/jquery-ui-touch-punch.min.js b/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.min.js
similarity index 100%
rename from assets/js/frontend/jquery-ui-touch-punch.min.js
rename to assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch.min.js
diff --git a/assets/js/prettyPhoto/jquery.prettyPhoto.min.js b/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
index 39f59b44a18..793052a25d1 100644
--- a/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
+++ b/assets/js/prettyPhoto/jquery.prettyPhoto.min.js
@@ -1 +1 @@
-!function(a){function b(){var a=location.href;return hashtag=-1!==a.indexOf("#prettyPhoto")?decodeURI(a.substring(a.indexOf("#prettyPhoto")+1,a.length)):!1,hashtag&&(hashtag=hashtag.replace(/<|>/g,"")),hashtag}function c(){"undefined"!=typeof theRel&&(location.hash=theRel+"/"+rel_index+"/")}function d(){-1!==location.href.indexOf("#prettyPhoto")&&(location.hash="prettyPhoto")}function e(a,b){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var c="[\\?&]"+a+"=([^&#]*)",d=new RegExp(c),e=d.exec(b);return null==e?"":e[1]}a.prettyPhoto={version:"3.1.6"},a.fn.prettyPhoto=function(f){function g(){a(".pp_loaderIcon").hide(),projectedTop=scroll_pos.scrollTop+(A/2-r.containerHeight/2),projectedTop<0&&(projectedTop=0),$ppt.fadeTo(settings.animation_speed,1),$pp_pic_holder.find(".pp_content").animate({height:r.contentHeight,width:r.contentWidth},settings.animation_speed),$pp_pic_holder.animate({top:projectedTop,left:B/2-r.containerWidth/2<0?0:B/2-r.containerWidth/2,width:r.containerWidth},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(r.height).width(r.width),$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed),isSet&&"image"==l(pp_images[set_position])?$pp_pic_holder.find(".pp_hoverContainer").show():$pp_pic_holder.find(".pp_hoverContainer").hide(),settings.allow_expand&&(r.resized?a("a.pp_expand,a.pp_contract").show():a("a.pp_expand").hide()),!settings.autoplay_slideshow||x||s||a.prettyPhoto.startSlideshow(),settings.changepicturecallback(),s=!0}),p(),f.ajaxcallback()}function h(b){$pp_pic_holder.find("#pp_full_res object,#pp_full_res embed").css("visibility","hidden"),$pp_pic_holder.find(".pp_fade").fadeOut(settings.animation_speed,function(){a(".pp_loaderIcon").show(),b()})}function i(b){b>1?a(".pp_nav").show():a(".pp_nav").hide()}function j(a,b){if(resized=!1,k(a,b),imageWidth=a,imageHeight=b,(w>B||v>A)&&doresize&&settings.allow_resize&&!z){for(resized=!0,fitting=!1;!fitting;)w>B?(imageWidth=B-200,imageHeight=b/a*imageWidth):v>A?(imageHeight=A-200,imageWidth=a/b*imageHeight):fitting=!0,v=imageHeight,w=imageWidth;(w>B||v>A)&&j(w,v),k(imageWidth,imageHeight)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(v),containerWidth:Math.floor(w)+2*settings.horizontal_padding,contentHeight:Math.floor(t),contentWidth:Math.floor(u),resized:resized}}function k(b,c){b=parseFloat(b),c=parseFloat(c),$pp_details=$pp_pic_holder.find(".pp_details"),$pp_details.width(b),detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom")),$pp_details=$pp_details.clone().addClass(settings.theme).width(b).appendTo(a("body")).css({position:"absolute",top:-1e4}),detailsHeight+=$pp_details.height(),detailsHeight=detailsHeight<=34?36:detailsHeight,$pp_details.remove(),$pp_title=$pp_pic_holder.find(".ppt"),$pp_title.width(b),titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom")),$pp_title=$pp_title.clone().appendTo(a("body")).css({position:"absolute",top:-1e4}),titleHeight+=$pp_title.height(),$pp_title.remove(),t=c+detailsHeight,u=b,v=t+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height(),w=b}function l(a){return a.match(/youtube\.com\/watch/i)||a.match(/youtu\.be/i)?"youtube":a.match(/vimeo\.com/i)?"vimeo":a.match(/\b.mov\b/i)?"quicktime":a.match(/\b.swf\b/i)?"flash":a.match(/\biframe=true\b/i)?"iframe":a.match(/\bajax=true\b/i)?"ajax":a.match(/\bcustom=true\b/i)?"custom":"#"==a.substr(0,1)?"inline":"image"}function m(){if(doresize&&"undefined"!=typeof $pp_pic_holder){if(scroll_pos=n(),contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width(),projectedTop=A/2+scroll_pos.scrollTop-contentHeight/2,projectedTop<0&&(projectedTop=0),contentHeight>A)return;$pp_pic_holder.css({top:projectedTop,left:B/2+scroll_pos.scrollLeft-contentwidth/2})}}function n(){return self.pageYOffset?{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}:document.documentElement&&document.documentElement.scrollTop?{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft}:document.body?{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}:void 0}function o(){A=a(window).height(),B=a(window).width(),"undefined"!=typeof $pp_overlay&&$pp_overlay.height(a(document).height()).width(B)}function p(){isSet&&settings.overlay_gallery&&"image"==l(pp_images[set_position])?(itemWidth=57,navWidth="facebook"==settings.theme||"pp_default"==settings.theme?50:30,itemsPerPage=Math.floor((r.containerWidth-100-navWidth)/itemWidth),itemsPerPage=itemsPerPage{content}
',custom_markup:"",social_tools:''},f);var r,s,t,u,v,w,x,y=this,z=!1,A=a(window).height(),B=a(window).width();return doresize=!0,scroll_pos=n(),a(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){m(),o()}),f.keyboard_shortcuts&&a(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(b){if("undefined"!=typeof $pp_pic_holder&&$pp_pic_holder.is(":visible"))switch(b.keyCode){case 37:a.prettyPhoto.changePage("previous"),b.preventDefault();break;case 39:a.prettyPhoto.changePage("next"),b.preventDefault();break;case 27:settings.modal||a.prettyPhoto.close(),b.preventDefault()}}),a.prettyPhoto.initialize=function(){return settings=f,"pp_default"==settings.theme&&(settings.horizontal_padding=16),theRel=a(this).attr(settings.hook),galleryRegExp=/\[(?:.*)\]/,isSet=galleryRegExp.exec(theRel)?!0:!1,pp_images=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("href"):void 0}):a.makeArray(a(this).attr("href")),pp_titles=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).find("img").attr("alt")?a(b).find("img").attr("alt"):"":void 0}):a.makeArray(a(this).find("img").attr("alt")),pp_descriptions=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("title")?a(b).attr("title"):"":void 0}):a.makeArray(a(this).attr("title")),pp_images.length>settings.overlay_gallery_max&&(settings.overlay_gallery=!1),set_position=jQuery.inArray(a(this).attr("href"),pp_images),rel_index=isSet?set_position:a("a["+settings.hook+"^='"+theRel+"']").index(a(this)),q(this),settings.allow_resize&&a(window).bind("scroll.prettyphoto",function(){m()}),a.prettyPhoto.open(),!1},a.prettyPhoto.open=function(b){return"undefined"==typeof settings&&(settings=f,pp_images=a.makeArray(arguments[0]),pp_titles=arguments[1]?a.makeArray(arguments[1]):a.makeArray(""),pp_descriptions=arguments[2]?a.makeArray(arguments[2]):a.makeArray(""),isSet=pp_images.length>1?!0:!1,set_position=arguments[3]?arguments[3]:0,q(b.target)),settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden"),i(a(pp_images).size()),a(".pp_loaderIcon").show(),settings.deeplinking&&c(),settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href)),$pp_pic_holder.find(".pp_social").html(facebook_like_link)),$ppt.is(":hidden")&&$ppt.css("opacity",0).show(),$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity),$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+a(pp_images).size()),"undefined"!=typeof pp_descriptions[set_position]&&""!=pp_descriptions[set_position]?$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position])):$pp_pic_holder.find(".pp_description").hide(),movie_width=parseFloat(e("width",pp_images[set_position]))?e("width",pp_images[set_position]):settings.default_width.toString(),movie_height=parseFloat(e("height",pp_images[set_position]))?e("height",pp_images[set_position]):settings.default_height.toString(),z=!1,-1!=movie_height.indexOf("%")&&(movie_height=parseFloat(a(window).height()*parseFloat(movie_height)/100-150),z=!0),-1!=movie_width.indexOf("%")&&(movie_width=parseFloat(a(window).width()*parseFloat(movie_width)/100-150),z=!0),$pp_pic_holder.fadeIn(function(){switch(settings.show_title&&""!=pp_titles[set_position]&&"undefined"!=typeof pp_titles[set_position]?$ppt.html(unescape(pp_titles[set_position])):$ppt.html(" "),imgPreloader="",skipInjection=!1,l(pp_images[set_position])){case"image":imgPreloader=new Image,nextImage=new Image,isSet&&set_position').css({width:settings.default_width}).wrapInner('
').appendTo(a("body")).show(),doresize=!1,r=j(a(myClone).width(),a(myClone).height()),doresize=!0,a(myClone).remove(),toInject=settings.inline_markup.replace(/{content}/g,a(pp_images[set_position]).html())}imgPreloader||skipInjection||($pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g())}),!1},a.prettyPhoto.changePage=function(b){currentGalleryPage=0,"previous"==b?(set_position--,set_position<0&&(set_position=a(pp_images).size()-1)):"next"==b?(set_position++,set_position>a(pp_images).size()-1&&(set_position=0)):set_position=b,rel_index=set_position,doresize||(doresize=!0),settings.allow_expand&&a(".pp_contract").removeClass("pp_contract").addClass("pp_expand"),h(function(){a.prettyPhoto.open()})},a.prettyPhoto.changeGalleryPage=function(a){"next"==a?(currentGalleryPage++,currentGalleryPage>totalPage&&(currentGalleryPage=0)):"previous"==a?(currentGalleryPage--,currentGalleryPage<0&&(currentGalleryPage=totalPage)):currentGalleryPage=a,slide_speed="next"==a||"previous"==a?settings.animation_speed:0,slide_to=currentGalleryPage*itemsPerPage*itemWidth,$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)},a.prettyPhoto.startSlideshow=function(){"undefined"==typeof x?($pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){return a.prettyPhoto.stopSlideshow(),!1}),x=setInterval(a.prettyPhoto.startSlideshow,settings.slideshow)):a.prettyPhoto.changePage("next")},a.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1}),clearInterval(x),x=void 0},a.prettyPhoto.close=function(){$pp_overlay.is(":animated")||(a.prettyPhoto.stopSlideshow(),$pp_pic_holder.stop().find("object,embed").css("visibility","hidden"),a("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){a(this).remove()}),$pp_overlay.fadeOut(settings.animation_speed,function(){settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible"),a(this).remove(),a(window).unbind("scroll.prettyphoto"),d(),settings.callback(),doresize=!0,s=!1,delete settings}))},!pp_alreadyInitialized&&b()&&(pp_alreadyInitialized=!0,hashIndex=b(),hashRel=hashIndex,hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1),hashRel=hashRel.substring(0,hashRel.indexOf("/")),setTimeout(function(){a("a["+f.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)),this.unbind("click.prettyphoto").bind("click.prettyphoto",a.prettyPhoto.initialize)}}(jQuery);var pp_alreadyInitialized=!1;
\ No newline at end of file
+!function(a){function b(){var a=location.href;return hashtag=-1!==a.indexOf("#prettyPhoto")?decodeURI(a.substring(a.indexOf("#prettyPhoto")+1,a.length)):!1,hashtag&&(hashtag=hashtag.replace(/<|>/g,"")),hashtag}function c(){"undefined"!=typeof theRel&&(location.hash=theRel+"/"+rel_index+"/")}function d(){-1!==location.href.indexOf("#prettyPhoto")&&(location.hash="prettyPhoto")}function e(a,b){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");var c="[\\?&]"+a+"=([^&#]*)",d=new RegExp(c),e=d.exec(b);return null==e?"":e[1]}a.prettyPhoto={version:"3.1.6"},a.fn.prettyPhoto=function(f){function g(){a(".pp_loaderIcon").hide(),projectedTop=scroll_pos.scrollTop+(A/2-r.containerHeight/2),projectedTop<0&&(projectedTop=0),$ppt.fadeTo(settings.animation_speed,1),$pp_pic_holder.find(".pp_content").animate({height:r.contentHeight,width:r.contentWidth},settings.animation_speed),$pp_pic_holder.animate({top:projectedTop,left:B/2-r.containerWidth/2<0?0:B/2-r.containerWidth/2,width:r.containerWidth},settings.animation_speed,function(){$pp_pic_holder.find(".pp_hoverContainer,#fullResImage").height(r.height).width(r.width),$pp_pic_holder.find(".pp_fade").fadeIn(settings.animation_speed),isSet&&"image"==l(pp_images[set_position])?$pp_pic_holder.find(".pp_hoverContainer").show():$pp_pic_holder.find(".pp_hoverContainer").hide(),settings.allow_expand&&(r.resized?a("a.pp_expand,a.pp_contract").show():a("a.pp_expand").hide()),!settings.autoplay_slideshow||x||s||a.prettyPhoto.startSlideshow(),settings.changepicturecallback(),s=!0}),p(),f.ajaxcallback()}function h(b){$pp_pic_holder.find("#pp_full_res object,#pp_full_res embed").css("visibility","hidden"),$pp_pic_holder.find(".pp_fade").fadeOut(settings.animation_speed,function(){a(".pp_loaderIcon").show(),b()})}function i(b){b>1?a(".pp_nav").show():a(".pp_nav").hide()}function j(a,b){if(resized=!1,k(a,b),imageWidth=a,imageHeight=b,(w>B||v>A)&&doresize&&settings.allow_resize&&!z){for(resized=!0,fitting=!1;!fitting;)w>B?(imageWidth=B-200,imageHeight=b/a*imageWidth):v>A?(imageHeight=A-200,imageWidth=a/b*imageHeight):fitting=!0,v=imageHeight,w=imageWidth;(w>B||v>A)&&j(w,v),k(imageWidth,imageHeight)}return{width:Math.floor(imageWidth),height:Math.floor(imageHeight),containerHeight:Math.floor(v),containerWidth:Math.floor(w)+2*settings.horizontal_padding,contentHeight:Math.floor(t),contentWidth:Math.floor(u),resized:resized}}function k(b,c){b=parseFloat(b),c=parseFloat(c),$pp_details=$pp_pic_holder.find(".pp_details"),$pp_details.width(b),detailsHeight=parseFloat($pp_details.css("marginTop"))+parseFloat($pp_details.css("marginBottom")),$pp_details=$pp_details.clone().addClass(settings.theme).width(b).appendTo(a("body")).css({position:"absolute",top:-1e4}),detailsHeight+=$pp_details.height(),detailsHeight=detailsHeight<=34?36:detailsHeight,$pp_details.remove(),$pp_title=$pp_pic_holder.find(".ppt"),$pp_title.width(b),titleHeight=parseFloat($pp_title.css("marginTop"))+parseFloat($pp_title.css("marginBottom")),$pp_title=$pp_title.clone().appendTo(a("body")).css({position:"absolute",top:-1e4}),titleHeight+=$pp_title.height(),$pp_title.remove(),t=c+detailsHeight,u=b,v=t+titleHeight+$pp_pic_holder.find(".pp_top").height()+$pp_pic_holder.find(".pp_bottom").height(),w=b}function l(a){return a.match(/youtube\.com\/watch/i)||a.match(/youtu\.be/i)?"youtube":a.match(/vimeo\.com/i)?"vimeo":a.match(/\b.mov\b/i)?"quicktime":a.match(/\b.swf\b/i)?"flash":a.match(/\biframe=true\b/i)?"iframe":a.match(/\bajax=true\b/i)?"ajax":a.match(/\bcustom=true\b/i)?"custom":"#"==a.substr(0,1)?"inline":"image"}function m(){if(doresize&&"undefined"!=typeof $pp_pic_holder){if(scroll_pos=n(),contentHeight=$pp_pic_holder.height(),contentwidth=$pp_pic_holder.width(),projectedTop=A/2+scroll_pos.scrollTop-contentHeight/2,projectedTop<0&&(projectedTop=0),contentHeight>A)return;$pp_pic_holder.css({top:projectedTop,left:B/2+scroll_pos.scrollLeft-contentwidth/2})}}function n(){return self.pageYOffset?{scrollTop:self.pageYOffset,scrollLeft:self.pageXOffset}:document.documentElement&&document.documentElement.scrollTop?{scrollTop:document.documentElement.scrollTop,scrollLeft:document.documentElement.scrollLeft}:document.body?{scrollTop:document.body.scrollTop,scrollLeft:document.body.scrollLeft}:void 0}function o(){A=a(window).height(),B=a(window).width(),"undefined"!=typeof $pp_overlay&&$pp_overlay.height(a(document).height()).width(B)}function p(){isSet&&settings.overlay_gallery&&"image"==l(pp_images[set_position])?(itemWidth=57,navWidth="facebook"==settings.theme||"pp_default"==settings.theme?50:30,itemsPerPage=Math.floor((r.containerWidth-100-navWidth)/itemWidth),itemsPerPage=itemsPerPage
{content}
',custom_markup:"",social_tools:''},f);var r,s,t,u,v,w,x,y=this,z=!1,A=a(window).height(),B=a(window).width();return doresize=!0,scroll_pos=n(),a(window).unbind("resize.prettyphoto").bind("resize.prettyphoto",function(){m(),o()}),f.keyboard_shortcuts&&a(document).unbind("keydown.prettyphoto").bind("keydown.prettyphoto",function(b){if("undefined"!=typeof $pp_pic_holder&&$pp_pic_holder.is(":visible"))switch(b.keyCode){case 37:a.prettyPhoto.changePage("previous"),b.preventDefault();break;case 39:a.prettyPhoto.changePage("next"),b.preventDefault();break;case 27:settings.modal||a.prettyPhoto.close(),b.preventDefault()}}),a.prettyPhoto.initialize=function(){return settings=f,"pp_default"==settings.theme&&(settings.horizontal_padding=16),theRel=a(this).attr(settings.hook),galleryRegExp=/\[(?:.*)\]/,isSet=galleryRegExp.exec(theRel)?!0:!1,pp_images=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("href"):void 0}):a.makeArray(a(this).attr("href")),pp_titles=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).find("img").attr("alt")?a(b).find("img").attr("alt"):"":void 0}):a.makeArray(a(this).find("img").attr("alt")),pp_descriptions=isSet?jQuery.map(y,function(b,c){return-1!=a(b).attr(settings.hook).indexOf(theRel)?a(b).attr("title")?a(b).attr("title"):"":void 0}):a.makeArray(a(this).attr("title")),pp_images.length>settings.overlay_gallery_max&&(settings.overlay_gallery=!1),set_position=jQuery.inArray(a(this).attr("href"),pp_images),rel_index=isSet?set_position:a("a["+settings.hook+"^='"+theRel+"']").index(a(this)),q(this),settings.allow_resize&&a(window).bind("scroll.prettyphoto",function(){m()}),a.prettyPhoto.open(),!1},a.prettyPhoto.open=function(b){return"undefined"==typeof settings&&(settings=f,pp_images=a.makeArray(arguments[0]),pp_titles=arguments[1]?a.makeArray(arguments[1]):a.makeArray(""),pp_descriptions=arguments[2]?a.makeArray(arguments[2]):a.makeArray(""),isSet=pp_images.length>1?!0:!1,set_position=arguments[3]?arguments[3]:0,q(b.target)),settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","hidden"),i(a(pp_images).size()),a(".pp_loaderIcon").show(),settings.deeplinking&&c(),settings.social_tools&&(facebook_like_link=settings.social_tools.replace("{location_href}",encodeURIComponent(location.href)),$pp_pic_holder.find(".pp_social").html(facebook_like_link)),$ppt.is(":hidden")&&$ppt.css("opacity",0).show(),$pp_overlay.show().fadeTo(settings.animation_speed,settings.opacity),$pp_pic_holder.find(".currentTextHolder").text(set_position+1+settings.counter_separator_label+a(pp_images).size()),"undefined"!=typeof pp_descriptions[set_position]&&""!=pp_descriptions[set_position]?$pp_pic_holder.find(".pp_description").show().html(unescape(pp_descriptions[set_position])):$pp_pic_holder.find(".pp_description").hide(),movie_width=parseFloat(e("width",pp_images[set_position]))?e("width",pp_images[set_position]):settings.default_width.toString(),movie_height=parseFloat(e("height",pp_images[set_position]))?e("height",pp_images[set_position]):settings.default_height.toString(),z=!1,-1!=movie_height.indexOf("%")&&(movie_height=parseFloat(a(window).height()*parseFloat(movie_height)/100-150),z=!0),-1!=movie_width.indexOf("%")&&(movie_width=parseFloat(a(window).width()*parseFloat(movie_width)/100-150),z=!0),$pp_pic_holder.fadeIn(function(){switch(settings.show_title&&""!=pp_titles[set_position]&&"undefined"!=typeof pp_titles[set_position]?$ppt.html(unescape(pp_titles[set_position])):$ppt.html(" "),imgPreloader="",skipInjection=!1,l(pp_images[set_position])){case"image":imgPreloader=new Image,nextImage=new Image,isSet&&set_position').css({width:settings.default_width}).wrapInner('
').appendTo(a("body")).show(),doresize=!1,r=j(a(myClone).width(),a(myClone).height()),doresize=!0,a(myClone).remove(),toInject=settings.inline_markup.replace(/{content}/g,a(pp_images[set_position]).html())}imgPreloader||skipInjection||($pp_pic_holder.find("#pp_full_res")[0].innerHTML=toInject,g())}),!1},a.prettyPhoto.changePage=function(b){currentGalleryPage=0,"previous"==b?(set_position--,set_position<0&&(set_position=a(pp_images).size()-1)):"next"==b?(set_position++,set_position>a(pp_images).size()-1&&(set_position=0)):set_position=b,rel_index=set_position,doresize||(doresize=!0),settings.allow_expand&&a(".pp_contract").removeClass("pp_contract").addClass("pp_expand"),h(function(){a.prettyPhoto.open()})},a.prettyPhoto.changeGalleryPage=function(a){"next"==a?(currentGalleryPage++,currentGalleryPage>totalPage&&(currentGalleryPage=0)):"previous"==a?(currentGalleryPage--,currentGalleryPage<0&&(currentGalleryPage=totalPage)):currentGalleryPage=a,slide_speed="next"==a||"previous"==a?settings.animation_speed:0,slide_to=currentGalleryPage*(itemsPerPage*itemWidth),$pp_gallery.find("ul").animate({left:-slide_to},slide_speed)},a.prettyPhoto.startSlideshow=function(){"undefined"==typeof x?($pp_pic_holder.find(".pp_play").unbind("click").removeClass("pp_play").addClass("pp_pause").click(function(){return a.prettyPhoto.stopSlideshow(),!1}),x=setInterval(a.prettyPhoto.startSlideshow,settings.slideshow)):a.prettyPhoto.changePage("next")},a.prettyPhoto.stopSlideshow=function(){$pp_pic_holder.find(".pp_pause").unbind("click").removeClass("pp_pause").addClass("pp_play").click(function(){return a.prettyPhoto.startSlideshow(),!1}),clearInterval(x),x=void 0},a.prettyPhoto.close=function(){$pp_overlay.is(":animated")||(a.prettyPhoto.stopSlideshow(),$pp_pic_holder.stop().find("object,embed").css("visibility","hidden"),a("div.pp_pic_holder,div.ppt,.pp_fade").fadeOut(settings.animation_speed,function(){a(this).remove()}),$pp_overlay.fadeOut(settings.animation_speed,function(){settings.hideflash&&a("object,embed,iframe[src*=youtube],iframe[src*=vimeo]").css("visibility","visible"),a(this).remove(),a(window).unbind("scroll.prettyphoto"),d(),settings.callback(),doresize=!0,s=!1,delete settings}))},!pp_alreadyInitialized&&b()&&(pp_alreadyInitialized=!0,hashIndex=b(),hashRel=hashIndex,hashIndex=hashIndex.substring(hashIndex.indexOf("/")+1,hashIndex.length-1),hashRel=hashRel.substring(0,hashRel.indexOf("/")),setTimeout(function(){a("a["+f.hook+"^='"+hashRel+"']:eq("+hashIndex+")").trigger("click")},50)),this.unbind("click.prettyphoto").bind("click.prettyphoto",a.prettyPhoto.initialize)}}(jQuery);var pp_alreadyInitialized=!1;
\ No newline at end of file
diff --git a/assets/js/admin/round.js b/assets/js/round/round.js
similarity index 100%
rename from assets/js/admin/round.js
rename to assets/js/round/round.js
diff --git a/assets/js/admin/round.min.js b/assets/js/round/round.min.js
similarity index 100%
rename from assets/js/admin/round.min.js
rename to assets/js/round/round.min.js
diff --git a/i18n/languages/woocommerce-admin.pot b/i18n/languages/woocommerce-admin.pot
index 11c8c580d1a..cf013a47024 100644
--- a/i18n/languages/woocommerce-admin.pot
+++ b/i18n/languages/woocommerce-admin.pot
@@ -2,9 +2,9 @@
# This file is distributed under the same license as the WooCommerce package.
msgid ""
msgstr ""
-"Project-Id-Version: WooCommerce 2.4.3 Admin\n"
+"Project-Id-Version: WooCommerce 2.4.6 Admin\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2015-08-12 18:49:49+00:00\n"
+"POT-Creation-Date: 2015-08-24 16:25:51+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,7 @@ msgstr ""
#: includes/admin/class-wc-admin-api-keys-table-list.php:40
#: includes/admin/class-wc-admin-post-types.php:244
-#: includes/admin/class-wc-admin-setup-wizard.php:227
+#: includes/admin/class-wc-admin-setup-wizard.php:241
#: includes/admin/settings/views/html-keys-edit.php:16
msgid "Description"
msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
#: includes/admin/class-wc-admin-attributes.php:435
#: includes/admin/class-wc-admin-attributes.php:476
#: includes/admin/class-wc-admin-post-types.php:212
-#: includes/admin/class-wc-admin-setup-wizard.php:493
+#: includes/admin/class-wc-admin-setup-wizard.php:507
#: includes/admin/class-wc-admin-webhooks-table-list.php:40
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:192
#: includes/admin/meta-boxes/views/html-product-attribute.php:12
@@ -337,7 +337,7 @@ msgstr ""
#: includes/admin/class-wc-admin-assets.php:234
#: includes/admin/class-wc-admin-post-types.php:225
-#: includes/admin/class-wc-admin-post-types.php:2109
+#: includes/admin/class-wc-admin-post-types.php:2114
#: includes/admin/views/html-bulk-edit-product.php:197
#: includes/admin/views/html-quick-edit-product.php:155
msgid "Featured"
@@ -493,7 +493,7 @@ msgstr ""
#: includes/admin/class-wc-admin-attributes.php:372
#: includes/admin/class-wc-admin-post-types.php:431
#: includes/admin/class-wc-admin-post-types.php:559
-#: includes/admin/class-wc-admin-post-types.php:2113
+#: includes/admin/class-wc-admin-post-types.php:2118
#: includes/admin/class-wc-admin-webhooks-table-list.php:99
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:235
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:319
@@ -654,7 +654,7 @@ msgid "Webhook Settings"
msgstr ""
#: includes/admin/class-wc-admin-help.php:77
-#: includes/admin/class-wc-admin-setup-wizard.php:640
+#: includes/admin/class-wc-admin-setup-wizard.php:654
msgid "PayPal Standard"
msgstr ""
@@ -1316,7 +1316,7 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:219
#: includes/admin/class-wc-admin-reports.php:91
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:680
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:696
#: includes/admin/reports/class-wc-report-stock.php:29
#: includes/admin/reports/class-wc-report-stock.php:30
msgid "Stock"
@@ -1377,7 +1377,7 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:260
#: includes/admin/class-wc-admin-webhooks-table-list.php:41
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:664
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:680
#: includes/admin/settings/views/html-webhook-log.php:25
#: includes/admin/settings/views/html-webhooks-edit.php:24
msgid "Status"
@@ -1473,7 +1473,7 @@ msgid "No"
msgstr ""
#: includes/admin/class-wc-admin-post-types.php:392
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:327
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:338
#: includes/admin/reports/class-wc-report-stock.php:108
#: includes/admin/views/html-bulk-edit-product.php:221
#: includes/admin/views/html-quick-edit-product.php:164
@@ -1482,7 +1482,7 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:394
#: includes/admin/class-wc-admin-reports.php:100
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:328
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:339
#: includes/admin/reports/class-wc-report-stock.php:110
#: includes/admin/views/html-bulk-edit-product.php:222
#: includes/admin/views/html-quick-edit-product.php:165
@@ -1687,73 +1687,73 @@ msgstr ""
msgid "Search for a customer…"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2042
+#: includes/admin/class-wc-admin-post-types.php:2047
msgid "Product name"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2045
+#: includes/admin/class-wc-admin-post-types.php:2050
msgid "Coupon code"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2060
+#: includes/admin/class-wc-admin-post-types.php:2065
msgid "Description (optional)"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2077
+#: includes/admin/class-wc-admin-post-types.php:2082
msgid "Insert into %s"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2078
+#: includes/admin/class-wc-admin-post-types.php:2083
msgid "Uploaded to this %s"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2098
+#: includes/admin/class-wc-admin-post-types.php:2103
msgid "Catalog/search"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2099
+#: includes/admin/class-wc-admin-post-types.php:2104
#: includes/admin/views/html-bulk-edit-product.php:185
#: includes/admin/views/html-quick-edit-product.php:142
msgid "Catalog"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2100
+#: includes/admin/class-wc-admin-post-types.php:2105
#: includes/admin/views/html-bulk-edit-product.php:186
#: includes/admin/views/html-quick-edit-product.php:143
msgid "Search"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2101
+#: includes/admin/class-wc-admin-post-types.php:2106
#: includes/admin/views/html-bulk-edit-product.php:187
#: includes/admin/views/html-quick-edit-product.php:144
msgid "Hidden"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2105
+#: includes/admin/class-wc-admin-post-types.php:2110
msgid "Catalog visibility:"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2121
+#: includes/admin/class-wc-admin-post-types.php:2126
msgid ""
"Define the loops this product should be visible in. The product will still "
"be accessible directly."
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2127
+#: includes/admin/class-wc-admin-post-types.php:2132
msgid "Enable this option to feature this product."
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2129
+#: includes/admin/class-wc-admin-post-types.php:2134
msgid "Featured Product"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2132
+#: includes/admin/class-wc-admin-post-types.php:2137
msgid "OK"
msgstr ""
-#: includes/admin/class-wc-admin-post-types.php:2133
+#: includes/admin/class-wc-admin-post-types.php:2138
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:175
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:725
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:744
#: includes/admin/meta-boxes/views/html-order-items.php:257
#: includes/admin/meta-boxes/views/html-order-items.php:303
msgid "Cancel"
@@ -1814,7 +1814,7 @@ msgstr ""
#: includes/admin/class-wc-admin-profile.php:125
#: includes/admin/class-wc-admin-settings.php:559
#: includes/admin/class-wc-admin-settings.php:584
-#: includes/admin/class-wc-admin-setup-wizard.php:490
+#: includes/admin/class-wc-admin-setup-wizard.php:504
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:71
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:120
msgid "Country"
@@ -1930,7 +1930,7 @@ msgid "Select a page…"
msgstr ""
#: includes/admin/class-wc-admin-settings.php:559
-#: includes/admin/class-wc-admin-setup-wizard.php:299
+#: includes/admin/class-wc-admin-setup-wizard.php:313
msgid "Choose a country…"
msgstr ""
@@ -1948,33 +1948,33 @@ msgstr ""
msgid "Select none"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:61
+#: includes/admin/class-wc-admin-setup-wizard.php:59
msgid "Introduction"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:66
-#: includes/admin/class-wc-admin-setup-wizard.php:220
+#: includes/admin/class-wc-admin-setup-wizard.php:64
+#: includes/admin/class-wc-admin-setup-wizard.php:234
msgid "Page Setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:71
+#: includes/admin/class-wc-admin-setup-wizard.php:69
msgid "Store Locale"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:76
+#: includes/admin/class-wc-admin-setup-wizard.php:74
msgid "Shipping & Tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:81
-#: includes/admin/class-wc-admin-setup-wizard.php:634
+#: includes/admin/class-wc-admin-setup-wizard.php:79
+#: includes/admin/class-wc-admin-setup-wizard.php:648
msgid "Payments"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:86
+#: includes/admin/class-wc-admin-setup-wizard.php:84
msgid "Ready!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:148
+#: includes/admin/class-wc-admin-setup-wizard.php:147
msgid "WooCommerce › Setup Wizard"
msgstr ""
@@ -1982,201 +1982,209 @@ msgstr ""
msgid "Return to the WordPress Dashboard"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:205
+#: includes/admin/class-wc-admin-setup-wizard.php:211
+msgid "WooCommerce is available in %s. Would you like to use this translation?"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:213
+msgid "Install Translation"
+msgstr ""
+
+#: includes/admin/class-wc-admin-setup-wizard.php:219
msgid "Welcome to the world of WooCommerce!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:206
+#: includes/admin/class-wc-admin-setup-wizard.php:220
msgid ""
"Thank you for choosing WooCommerce to power your online store! This quick "
"setup wizard will help you configure the basic settings. It’s "
"completely optional and shouldn’t take longer than five minutes."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:207
+#: includes/admin/class-wc-admin-setup-wizard.php:221
msgid ""
"No time right now? If you don’t want to go through the wizard, you can skip "
"and return to the WordPress dashboard. Come back anytime if you change your "
"mind!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:209
+#: includes/admin/class-wc-admin-setup-wizard.php:223
msgid "Let's Go!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:210
+#: includes/admin/class-wc-admin-setup-wizard.php:224
msgid "Not right now"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:222
+#: includes/admin/class-wc-admin-setup-wizard.php:236
msgid ""
"Your store needs a few essential %spages%s. The following will be created "
"automatically (if they do not already exist):"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:226
+#: includes/admin/class-wc-admin-setup-wizard.php:240
msgid "Page Name"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:233
+#: includes/admin/class-wc-admin-setup-wizard.php:247
msgid "The shop page will display your products."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:237
+#: includes/admin/class-wc-admin-setup-wizard.php:251
msgid ""
"The cart page will be where the customers go to view their cart and begin "
"checkout."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:242
+#: includes/admin/class-wc-admin-setup-wizard.php:256
msgid "The checkout page will be where the customers go to pay for their items."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:248
+#: includes/admin/class-wc-admin-setup-wizard.php:262
msgid ""
"Registered customers will be able to manage their account details and view "
"past orders on this page."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:254
+#: includes/admin/class-wc-admin-setup-wizard.php:268
msgid ""
"Once created, these pages can be managed from your admin dashboard on the "
"%sPages screen%s. You can control which pages are shown on your website via "
"%sAppearance > Menus%s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:257
-#: includes/admin/class-wc-admin-setup-wizard.php:366
-#: includes/admin/class-wc-admin-setup-wizard.php:523
-#: includes/admin/class-wc-admin-setup-wizard.php:676
+#: includes/admin/class-wc-admin-setup-wizard.php:271
+#: includes/admin/class-wc-admin-setup-wizard.php:380
+#: includes/admin/class-wc-admin-setup-wizard.php:537
+#: includes/admin/class-wc-admin-setup-wizard.php:690
msgid "Continue"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:258
-#: includes/admin/class-wc-admin-setup-wizard.php:367
-#: includes/admin/class-wc-admin-setup-wizard.php:524
-#: includes/admin/class-wc-admin-setup-wizard.php:677
+#: includes/admin/class-wc-admin-setup-wizard.php:272
+#: includes/admin/class-wc-admin-setup-wizard.php:381
+#: includes/admin/class-wc-admin-setup-wizard.php:538
+#: includes/admin/class-wc-admin-setup-wizard.php:691
msgid "Skip this step"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:293
+#: includes/admin/class-wc-admin-setup-wizard.php:307
msgid "Store Locale Setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:297
+#: includes/admin/class-wc-admin-setup-wizard.php:311
msgid "Where is your store based?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:305
+#: includes/admin/class-wc-admin-setup-wizard.php:319
msgid "Which currency will your store use?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:307
-#: includes/admin/class-wc-admin-setup-wizard.php:308
+#: includes/admin/class-wc-admin-setup-wizard.php:321
+#: includes/admin/class-wc-admin-setup-wizard.php:322
msgid "Choose a currency…"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:315
+#: includes/admin/class-wc-admin-setup-wizard.php:329
msgid "If your currency is not listed you can %sadd it later%s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:319
+#: includes/admin/class-wc-admin-setup-wizard.php:333
#: includes/admin/settings/class-wc-settings-general.php:137
#: includes/admin/views/html-admin-page-status-report.php:403
msgid "Currency Position"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:322
+#: includes/admin/class-wc-admin-setup-wizard.php:336
#: includes/admin/settings/class-wc-settings-general.php:145
msgid "Left"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:323
+#: includes/admin/class-wc-admin-setup-wizard.php:337
#: includes/admin/settings/class-wc-settings-general.php:146
msgid "Right"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:324
+#: includes/admin/class-wc-admin-setup-wizard.php:338
#: includes/admin/settings/class-wc-settings-general.php:147
msgid "Left with space"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:325
+#: includes/admin/class-wc-admin-setup-wizard.php:339
#: includes/admin/settings/class-wc-settings-general.php:148
msgid "Right with space"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:330
+#: includes/admin/class-wc-admin-setup-wizard.php:344
#: includes/admin/settings/class-wc-settings-general.php:154
#: includes/admin/views/html-admin-page-status-report.php:408
msgid "Thousand Separator"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:336
+#: includes/admin/class-wc-admin-setup-wizard.php:350
#: includes/admin/settings/class-wc-settings-general.php:164
#: includes/admin/views/html-admin-page-status-report.php:413
msgid "Decimal Separator"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:342
+#: includes/admin/class-wc-admin-setup-wizard.php:356
msgid "Which unit should be used for product weights?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:345
+#: includes/admin/class-wc-admin-setup-wizard.php:359
#: includes/admin/settings/class-wc-settings-products.php:429
msgid "kg"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:346
+#: includes/admin/class-wc-admin-setup-wizard.php:360
#: includes/admin/settings/class-wc-settings-products.php:430
msgid "g"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:347
+#: includes/admin/class-wc-admin-setup-wizard.php:361
#: includes/admin/settings/class-wc-settings-products.php:431
msgid "lbs"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:348
+#: includes/admin/class-wc-admin-setup-wizard.php:362
#: includes/admin/settings/class-wc-settings-products.php:432
msgid "oz"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:353
+#: includes/admin/class-wc-admin-setup-wizard.php:367
msgid "Which unit should be used for product dimensions?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:356
+#: includes/admin/class-wc-admin-setup-wizard.php:370
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:193
#: includes/admin/settings/class-wc-settings-products.php:446
msgid "m"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:357
+#: includes/admin/class-wc-admin-setup-wizard.php:371
#: includes/admin/settings/class-wc-settings-products.php:447
msgid "cm"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:358
+#: includes/admin/class-wc-admin-setup-wizard.php:372
#: includes/admin/settings/class-wc-settings-products.php:448
msgid "mm"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:359
+#: includes/admin/class-wc-admin-setup-wizard.php:373
#: includes/admin/settings/class-wc-settings-products.php:449
msgid "in"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:360
+#: includes/admin/class-wc-admin-setup-wizard.php:374
#: includes/admin/settings/class-wc-settings-products.php:450
msgid "yd"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:417
+#: includes/admin/class-wc-admin-setup-wizard.php:431
msgid "Shipping & Tax Setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:419
+#: includes/admin/class-wc-admin-setup-wizard.php:433
msgid ""
"If you will be charging sales tax, or shipping physical goods to customers, "
"you can configure the basic options below. This is optional and can be "
@@ -2184,143 +2192,143 @@ msgid ""
"> Settings > Shipping%3$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:423
+#: includes/admin/class-wc-admin-setup-wizard.php:437
msgid "Basic Shipping Setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:427
+#: includes/admin/class-wc-admin-setup-wizard.php:441
msgid "Will you be shipping products?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:430
+#: includes/admin/class-wc-admin-setup-wizard.php:444
msgid "Yes, I will be shipping physical goods to customers"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:434
+#: includes/admin/class-wc-admin-setup-wizard.php:448
msgid "Domestic shipping costs:"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:436
-#: includes/admin/class-wc-admin-setup-wizard.php:442
+#: includes/admin/class-wc-admin-setup-wizard.php:450
+#: includes/admin/class-wc-admin-setup-wizard.php:456
msgid "A total of %s per order and/or %s per item"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:440
+#: includes/admin/class-wc-admin-setup-wizard.php:454
msgid "International shipping costs:"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:447
+#: includes/admin/class-wc-admin-setup-wizard.php:461
msgid "Basic Tax Setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:451
+#: includes/admin/class-wc-admin-setup-wizard.php:465
msgid "Will you be charging sales tax?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:454
+#: includes/admin/class-wc-admin-setup-wizard.php:468
msgid "Yes, I will be charging sales tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:458
+#: includes/admin/class-wc-admin-setup-wizard.php:472
msgid "How will you enter product prices?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:460
+#: includes/admin/class-wc-admin-setup-wizard.php:474
msgid "I will enter prices inclusive of tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:461
+#: includes/admin/class-wc-admin-setup-wizard.php:475
msgid "I will enter prices exclusive of tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:483
+#: includes/admin/class-wc-admin-setup-wizard.php:497
msgid "Import Tax Rates?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:485
+#: includes/admin/class-wc-admin-setup-wizard.php:499
msgid "Yes, please import some starter tax rates"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:491
+#: includes/admin/class-wc-admin-setup-wizard.php:505
msgid "State"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:492
+#: includes/admin/class-wc-admin-setup-wizard.php:506
msgid "Rate (%)"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:494
+#: includes/admin/class-wc-admin-setup-wizard.php:508
msgid "Tax Shipping"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:513
+#: includes/admin/class-wc-admin-setup-wizard.php:527
msgid ""
"Please note: you may still need to add local and product specific tax rates "
"depending on your business location. If in doubt, speak to an accountant."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:515
+#: includes/admin/class-wc-admin-setup-wizard.php:529
msgid ""
"You can edit tax rates later from the %1$stax settings%3$s screen and read "
"more about taxes in %2$sour documentation%3$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:636
+#: includes/admin/class-wc-admin-setup-wizard.php:650
msgid ""
-"WooCommerce comes with some payment gateways pre-installed. %2$sAdditonal "
-"gateways%3$s can be installed later. Payment Gateways can be setup, enabled "
-"and disabled from the %1$scheckout settings%3$s screen."
+"WooCommerce can accept both online and offline payments. %2$sAdditional "
+"payment methods%3$s can be installed later and managed from the "
+"%1$scheckout settings%3$s screen."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:641
+#: includes/admin/class-wc-admin-setup-wizard.php:655
msgid ""
"To accept payments via PayPal on your store, simply enter your PayPal email "
"address below."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:645
+#: includes/admin/class-wc-admin-setup-wizard.php:659
msgid "PayPal Email Address:"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:652
+#: includes/admin/class-wc-admin-setup-wizard.php:666
msgid "Offline Payments"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:653
+#: includes/admin/class-wc-admin-setup-wizard.php:667
msgid ""
"Offline gateways require manual processing, but can be useful in certain "
"circumstances or for testing payments."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:657
+#: includes/admin/class-wc-admin-setup-wizard.php:671
msgid "Cheque Payments"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:659
+#: includes/admin/class-wc-admin-setup-wizard.php:673
msgid "Enable payment via Cheques"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:663
+#: includes/admin/class-wc-admin-setup-wizard.php:677
msgid "Cash on Delivery"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:665
+#: includes/admin/class-wc-admin-setup-wizard.php:679
msgid "Enable cash on delivery"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:669
+#: includes/admin/class-wc-admin-setup-wizard.php:683
msgid "Bank Transfer (BACS)"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:671
+#: includes/admin/class-wc-admin-setup-wizard.php:685
msgid "Enable BACS payments"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:738
+#: includes/admin/class-wc-admin-setup-wizard.php:752
msgid "Your Store is Ready!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:742
+#: includes/admin/class-wc-admin-setup-wizard.php:756
#: includes/admin/views/html-notice-tracking.php:11
msgid ""
"Want to help make WooCommerce even more awesome? Allow WooThemes to collect "
@@ -2328,43 +2336,43 @@ msgid ""
"your next WooThemes purchase. %sFind out more%s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:744
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:316
+#: includes/admin/class-wc-admin-setup-wizard.php:758
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:327
#: includes/admin/views/html-bulk-edit-product.php:282
#: includes/admin/views/html-notice-tracking.php:13
#: includes/admin/views/html-quick-edit-product.php:201
msgid "Allow"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:745
+#: includes/admin/class-wc-admin-setup-wizard.php:759
msgid "No thanks"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:752
+#: includes/admin/class-wc-admin-setup-wizard.php:766
msgid "Next Steps"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:754
+#: includes/admin/class-wc-admin-setup-wizard.php:768
msgid "Create your first product!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:758
+#: includes/admin/class-wc-admin-setup-wizard.php:772
msgid "Learn More"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:760
+#: includes/admin/class-wc-admin-setup-wizard.php:774
msgid "Watch the WC 101 video walkthroughs"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:761
+#: includes/admin/class-wc-admin-setup-wizard.php:775
msgid "Get eCommerce advice in your inbox"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:762
+#: includes/admin/class-wc-admin-setup-wizard.php:776
msgid "Follow Sidekick interactive walkthroughs"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:763
+#: includes/admin/class-wc-admin-setup-wizard.php:777
msgid "Read more about getting started"
msgstr ""
@@ -2408,151 +2416,127 @@ msgstr ""
msgid "There was an error calling %s"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:148
#: includes/admin/class-wc-admin-status.php:151
-#: includes/admin/class-wc-admin-status.php:154
-msgid "Failed to install/update the translation:"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:148
-msgid "Seems you don't have permission to do this!"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:151
-msgid ""
-"An authentication error occurred while updating the translation. Please try "
-"again or configure your %sUpgrade Constants%s."
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:154
-msgid "Sorry but there is no translation available for your language =/"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:161
-msgid "Translations installed/updated successfully!"
-msgstr ""
-
-#: includes/admin/class-wc-admin-status.php:168
msgid "Your changes have been saved."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:181
+#: includes/admin/class-wc-admin-status.php:164
msgid "WC Transients"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:182
+#: includes/admin/class-wc-admin-status.php:165
msgid "Clear transients"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:183
+#: includes/admin/class-wc-admin-status.php:166
msgid "This tool will clear the product/shop transients cache."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:186
+#: includes/admin/class-wc-admin-status.php:169
msgid "Expired Transients"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:187
+#: includes/admin/class-wc-admin-status.php:170
msgid "Clear expired transients"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:188
+#: includes/admin/class-wc-admin-status.php:171
msgid "This tool will clear ALL expired transients from WordPress."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:191
+#: includes/admin/class-wc-admin-status.php:174
msgid "Term counts"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:192
+#: includes/admin/class-wc-admin-status.php:175
msgid "Recount terms"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:193
+#: includes/admin/class-wc-admin-status.php:176
msgid ""
"This tool will recount product terms - useful when changing your settings "
"in a way which hides products from the catalog."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:196
+#: includes/admin/class-wc-admin-status.php:179
msgid "Capabilities"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:197
+#: includes/admin/class-wc-admin-status.php:180
msgid "Reset capabilities"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:198
+#: includes/admin/class-wc-admin-status.php:181
msgid ""
"This tool will reset the admin, customer and shop_manager roles to default. "
"Use this if your users cannot access all of the WooCommerce admin pages."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:201
+#: includes/admin/class-wc-admin-status.php:184
msgid "Customer Sessions"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:202
+#: includes/admin/class-wc-admin-status.php:185
msgid "Clear all sessions"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:203
+#: includes/admin/class-wc-admin-status.php:186
msgid ""
"Warning: This tool will delete all customer "
"session data from the database, including any current live carts."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:206
+#: includes/admin/class-wc-admin-status.php:189
msgid "Install WooCommerce Pages"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:207
+#: includes/admin/class-wc-admin-status.php:190
msgid "Install pages"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:208
+#: includes/admin/class-wc-admin-status.php:191
msgid ""
"Note: This tool will install all the missing "
"WooCommerce pages. Pages already defined and set up will not be replaced."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:211
+#: includes/admin/class-wc-admin-status.php:194
msgid "Delete all WooCommerce tax rates"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:212
+#: includes/admin/class-wc-admin-status.php:195
msgid "Delete ALL tax rates"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:213
+#: includes/admin/class-wc-admin-status.php:196
msgid ""
"Note: This option will delete ALL of your "
"tax rates, use with caution."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:216
+#: includes/admin/class-wc-admin-status.php:199
msgid "Reset Usage Tracking Settings"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:217
+#: includes/admin/class-wc-admin-status.php:200
msgid "Reset usage tracking settings"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:218
+#: includes/admin/class-wc-admin-status.php:201
msgid ""
"This will reset your usage tracking settings, causing it to show the opt-in "
"banner again and not sending any data."
msgstr ""
-#: includes/admin/class-wc-admin-status.php:224
+#: includes/admin/class-wc-admin-status.php:207
msgid "Translation Upgrade"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:225
+#: includes/admin/class-wc-admin-status.php:208
msgid "Force Translation Upgrade"
msgstr ""
-#: includes/admin/class-wc-admin-status.php:226
+#: includes/admin/class-wc-admin-status.php:209
msgid ""
"Note: This option will force the translation "
"upgrade for your language if a translation is available."
@@ -3078,9 +3062,9 @@ msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:100
#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:118
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:474
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:491
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:511
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:490
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:507
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:527
#: includes/admin/meta-boxes/views/html-order-items.php:321
#: includes/admin/reports/class-wc-report-sales-by-product.php:181
msgid "Search for a product…"
@@ -3361,7 +3345,7 @@ msgid "Note to customer"
msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:78
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:450
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:438
#: includes/admin/meta-boxes/views/html-order-items.php:326
#: includes/admin/meta-boxes/views/html-order-items.php:383
msgid "Add"
@@ -3380,14 +3364,14 @@ msgid "Downloadable products give access to a file upon purchase."
msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:94
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:678
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:694
#: includes/admin/settings/class-wc-settings-products.php:46
#: includes/admin/settings/class-wc-settings-products.php:244
msgid "Inventory"
msgstr ""
#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:99
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:682
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:698
#: includes/admin/meta-boxes/views/html-order-items.php:150
#: includes/admin/meta-boxes/views/html-order-shipping.php:20
#: includes/admin/settings/class-wc-settings-shipping.php:27
@@ -3535,25 +3519,31 @@ msgstr ""
msgid "Music"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:255
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:257
#: includes/admin/views/html-bulk-edit-product.php:69
#: includes/admin/views/html-quick-edit-product.php:49
msgid "Tax Status"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:256
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:259
#: includes/admin/views/html-bulk-edit-product.php:75
#: includes/admin/views/html-quick-edit-product.php:54
msgid "Taxable"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:257
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:260
#: includes/admin/views/html-bulk-edit-product.php:76
#: includes/admin/views/html-quick-edit-product.php:55
msgid "Shipping only"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:263
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:264
+msgid ""
+"Define whether or not the entire product is taxable, or just the cost of "
+"shipping it."
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:269
#: includes/admin/meta-boxes/views/html-order-items.php:21
#: includes/admin/settings/views/html-settings-tax.php:6
#: includes/admin/settings/views/settings-tax.php:53
@@ -3562,376 +3552,386 @@ msgstr ""
msgid "Standard"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:272
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:279
#: includes/admin/settings/views/html-settings-tax.php:158
#: includes/admin/views/html-bulk-edit-product.php:88
#: includes/admin/views/html-quick-edit-product.php:67
msgid "Tax Class"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:293
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:282
+msgid ""
+"Choose a tax class for this product. Tax classes are used to apply "
+"different tax rates specific to certain types of product."
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:304
#: includes/admin/meta-boxes/views/html-variation-admin.php:84
#: includes/admin/views/html-bulk-edit-product.php:234
#: includes/admin/views/html-quick-edit-product.php:180
msgid "Manage stock?"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:293
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:304
msgid "Enable stock management at product level"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:302
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:313
#: includes/admin/views/html-bulk-edit-product.php:253
#: includes/admin/views/html-bulk-edit-product.php:269
#: includes/admin/views/html-quick-edit-product.php:184
msgid "Stock Qty"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:304
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:315
msgid ""
"Stock quantity. If this is a variable product this value will be used to "
"control stock for all variations, unless you define stock at variation "
"level."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:313
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:324
#: includes/admin/meta-boxes/views/html-variation-admin.php:120
msgid "Allow Backorders?"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:314
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:325
#: includes/admin/views/html-bulk-edit-product.php:280
#: includes/admin/views/html-quick-edit-product.php:199
msgid "Do not allow"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:315
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:326
#: includes/admin/views/html-bulk-edit-product.php:281
#: includes/admin/views/html-quick-edit-product.php:200
msgid "Allow, but notify customer"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:317
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:328
msgid ""
"If managing stock, this controls whether or not backorders are allowed. If "
"enabled, stock quantity can go below 0."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:326
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:337
#: includes/admin/meta-boxes/views/html-variation-admin.php:134
#: includes/admin/reports/class-wc-report-stock.php:158
msgid "Stock status"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:329
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:340
#: includes/admin/meta-boxes/views/html-variation-admin.php:134
msgid ""
"Controls whether or not the product is listed as \"in stock\" or \"out of "
"stock\" on the frontend."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:338
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:349
msgid "Sold Individually"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:338
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:349
msgid "Enable this to only allow one of this item to be bought in a single order"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:357
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:686
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:368
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:702
#: includes/admin/meta-boxes/views/html-variation-admin.php:149
#: includes/admin/views/html-bulk-edit-product.php:115
#: includes/admin/views/html-quick-edit-product.php:96
msgid "Weight"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:357
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:368
msgid "Weight in decimal form"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:363
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:374
msgid "Dimensions"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:365
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:683
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:376
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:699
#: includes/admin/views/html-quick-edit-product.php:109
msgid "Length"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:366
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:684
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:377
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:700
#: includes/admin/views/html-quick-edit-product.php:110
msgid "Width"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:367
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:685
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:378
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:701
#: includes/admin/views/html-quick-edit-product.php:111
msgid "Height"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:369
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:380
msgid "LxWxH in decimal form"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:390
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:401
#: includes/admin/views/html-bulk-edit-product.php:167
#: includes/admin/views/html-quick-edit-product.php:124
msgid "No shipping class"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:396
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:407
#: includes/admin/views/html-bulk-edit-product.php:163
#: includes/admin/views/html-quick-edit-product.php:121
msgid "Shipping class"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:396
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:407
msgid ""
"Shipping classes are used by certain shipping methods to group similar "
"products."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:452
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:419
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:478
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:715
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:749
+msgid "Expand"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:419
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:478
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:715
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:749
+msgid "Close"
+msgstr ""
+
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:422
msgid "Custom product attribute"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:464
-msgid "Save attributes"
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:480
+msgid "Save Attributes"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:473
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:489
msgid "Up-Sells"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:486
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:502
msgid ""
"Up-sells are products which you recommend instead of the currently viewed "
"product, for example, products that are more profitable or better quality "
"or more expensive."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:490
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:506
msgid "Cross-Sells"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:503
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:519
msgid ""
"Cross-sells are products which you promote in the cart, based on the "
"current product."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:510
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:526
msgid "Grouping"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:522
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:538
msgid "Set this option to make this product part of a grouped product."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:540
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:556
msgid "Purchase Note"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:540
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:556
msgid "Enter an optional note to send the customer after purchase."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:547
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:563
msgid "Menu order"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:547
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:563
msgid "Custom ordering position."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:555
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:571
msgid "Enable reviews"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:608
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:624
msgid ""
"Before adding variations, add and save some attributes on the "
"Attributes tab."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:610
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:626
msgid "Learn more"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:617
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:633
msgid "Default Form Values"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:617
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:633
msgid "These are the attributes that will be pre-selected on the frontend."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:632
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:648
msgid "No default"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:661
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:677
msgid "Add variation"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:662
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:678
msgid "Create variations from all attributes"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:663
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:679
msgid "Delete all variations"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:665
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:681
msgid "Toggle "Enabled""
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:666
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:682
msgid "Toggle "Downloadable""
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:667
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:683
msgid "Toggle "Virtual""
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:669
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:685
msgid "Pricing"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:670
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:686
msgid "Set regular prices"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:671
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:687
msgid "Increase regular prices (fixed amount or percentage)"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:672
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:688
msgid "Decrease regular prices (fixed amount or percentage)"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:673
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:689
msgid "Set sale prices"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:674
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:690
msgid "Increase sale prices (fixed amount or percentage)"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:675
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:691
msgid "Decrease sale prices (fixed amount or percentage)"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:676
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:692
msgid "Set scheduled sale dates"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:679
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:695
msgid "Toggle "Manage stock""
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:688
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:704
msgid "Downloadable products"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:689
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:705
msgid "Download limit"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:690
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:706
msgid "Download expiry"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:694
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:710
#: includes/admin/views/html-report-by-date.php:41
msgid "Go"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:697
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:728
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:713
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:747
msgid "%s item"
msgid_plural "%s items"
msgstr[0] ""
msgstr[1] ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:699
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:730
-msgid "Expand"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:699
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:730
-msgid "Close"
-msgstr ""
-
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:702
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:733
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:718
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:752
msgid "Go to the first page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:703
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:734
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:719
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:753
msgid "Go to the previous page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:705
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:736
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:721
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:755
msgid "Select Page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:706
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:737
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:722
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:756
msgid "Current page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:713
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:744
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:729
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:763
msgid "Go to the next page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:714
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:745
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:730
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:764
msgid "Go to the last page"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:724
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:743
#: includes/admin/settings/views/html-keys-edit.php:96
#: includes/admin/views/html-admin-page-status-tools.php:69
msgid "Save Changes"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:845
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:864
msgid "Product SKU must be unique."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1164
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1183
msgid ""
"The downloadable file %s cannot be used as it does not have an allowed file "
"type. Allowed types include: %s"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1177
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1196
msgid "The downloadable file %s cannot be used as it does not exist on the server."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1285
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1304
msgid "Variation #%s of %s"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1329
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1348
msgid "#%s – Variation SKU must be unique."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1449
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1468
msgid ""
"#%s – The downloadable file %s cannot be used as it does not have an "
"allowed file type. Allowed types include: %s"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1456
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:1475
msgid ""
"#%s – The downloadable file %s cannot be used as it does not exist on "
"the server."
@@ -6987,73 +6987,73 @@ msgid "%1$s at %2$s"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:103
-#: includes/admin/class-wc-admin-setup-wizard.php:97
+#: includes/admin/class-wc-admin-setup-wizard.php:96
msgctxt "enhanced select"
msgid "One result is available, press enter to select it."
msgstr ""
#: includes/admin/class-wc-admin-assets.php:104
-#: includes/admin/class-wc-admin-setup-wizard.php:98
+#: includes/admin/class-wc-admin-setup-wizard.php:97
msgctxt "enhanced select"
msgid "%qty% results are available, use up and down arrow keys to navigate."
msgstr ""
#: includes/admin/class-wc-admin-assets.php:105
-#: includes/admin/class-wc-admin-setup-wizard.php:99
+#: includes/admin/class-wc-admin-setup-wizard.php:98
msgctxt "enhanced select"
msgid "No matches found"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:106
-#: includes/admin/class-wc-admin-setup-wizard.php:100
+#: includes/admin/class-wc-admin-setup-wizard.php:99
msgctxt "enhanced select"
msgid "Loading failed"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:107
-#: includes/admin/class-wc-admin-setup-wizard.php:101
+#: includes/admin/class-wc-admin-setup-wizard.php:100
msgctxt "enhanced select"
msgid "Please enter 1 or more characters"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:108
-#: includes/admin/class-wc-admin-setup-wizard.php:102
+#: includes/admin/class-wc-admin-setup-wizard.php:101
msgctxt "enhanced select"
msgid "Please enter %qty% or more characters"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:109
-#: includes/admin/class-wc-admin-setup-wizard.php:103
+#: includes/admin/class-wc-admin-setup-wizard.php:102
msgctxt "enhanced select"
msgid "Please delete 1 character"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:110
-#: includes/admin/class-wc-admin-setup-wizard.php:104
+#: includes/admin/class-wc-admin-setup-wizard.php:103
msgctxt "enhanced select"
msgid "Please delete %qty% characters"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:111
-#: includes/admin/class-wc-admin-setup-wizard.php:105
+#: includes/admin/class-wc-admin-setup-wizard.php:104
msgctxt "enhanced select"
msgid "You can only select 1 item"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:112
-#: includes/admin/class-wc-admin-setup-wizard.php:106
+#: includes/admin/class-wc-admin-setup-wizard.php:105
msgctxt "enhanced select"
msgid "You can only select %qty% items"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:113
-#: includes/admin/class-wc-admin-setup-wizard.php:107
+#: includes/admin/class-wc-admin-setup-wizard.php:106
msgctxt "enhanced select"
msgid "Loading more results…"
msgstr ""
#: includes/admin/class-wc-admin-assets.php:114
-#: includes/admin/class-wc-admin-setup-wizard.php:108
+#: includes/admin/class-wc-admin-setup-wizard.php:107
msgctxt "enhanced select"
msgid "Searching…"
msgstr ""
@@ -7094,22 +7094,22 @@ msgctxt "Order number by X"
msgid "%s by %s"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:232
+#: includes/admin/class-wc-admin-setup-wizard.php:246
msgctxt "Page title"
msgid "Shop"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:236
+#: includes/admin/class-wc-admin-setup-wizard.php:250
msgctxt "Page title"
msgid "Cart"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:240
+#: includes/admin/class-wc-admin-setup-wizard.php:254
msgctxt "Page title"
msgid "Checkout"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:246
+#: includes/admin/class-wc-admin-setup-wizard.php:260
msgctxt "Page title"
msgid "My Account"
msgstr ""
@@ -7161,15 +7161,15 @@ msgctxt "placeholder"
msgid "To…"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:258
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:261
#: includes/admin/views/html-bulk-edit-product.php:77
#: includes/admin/views/html-quick-edit-product.php:56
msgctxt "Tax status"
msgid "None"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:711
-#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:742
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:727
+#: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:761
msgctxt "number of pages"
msgid "of"
msgstr ""
diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot
index e184e34040e..59305b1369a 100644
--- a/i18n/languages/woocommerce.pot
+++ b/i18n/languages/woocommerce.pot
@@ -2,9 +2,9 @@
# This file is distributed under the same license as the WooCommerce package.
msgid ""
msgstr ""
-"Project-Id-Version: WooCommerce 2.4.3 Frontend\n"
+"Project-Id-Version: WooCommerce 2.4.6 Frontend\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2015-08-12 18:49:49+00:00\n"
+"POT-Creation-Date: 2015-08-24 16:25:50+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -989,6 +989,10 @@ msgstr ""
msgid "Zimbabwe"
msgstr ""
+#: i18n/locale-info.php:351
+msgid "Consumption tax"
+msgstr ""
+
#: i18n/states/AR.php:13
msgid "Ciudad Autónoma de Buenos Aires"
msgstr ""
@@ -5082,7 +5086,7 @@ msgstr ""
#: includes/abstracts/abstract-wc-integration.php:29
#: includes/abstracts/abstract-wc-settings-api.php:77
-#: includes/class-wc-install.php:688 includes/emails/class-wc-email.php:711
+#: includes/class-wc-install.php:692 includes/emails/class-wc-email.php:711
msgid "Settings"
msgstr ""
@@ -5098,8 +5102,8 @@ msgstr ""
#: includes/abstracts/abstract-wc-order.php:1762
#: includes/abstracts/abstract-wc-product.php:964
#: includes/abstracts/abstract-wc-product.php:970
-#: includes/class-wc-cart.php:1538 includes/class-wc-product-variable.php:331
-#: includes/class-wc-product-variation.php:306
+#: includes/class-wc-cart.php:1538 includes/class-wc-product-variable.php:335
+#: includes/class-wc-product-variation.php:307
msgid "Free!"
msgstr ""
@@ -5120,35 +5124,41 @@ msgid "Fee"
msgstr ""
#: includes/abstracts/abstract-wc-order.php:1892
-#: includes/shortcodes/class-wc-shortcode-checkout.php:141
+#: includes/shortcodes/class-wc-shortcode-checkout.php:143
#: templates/checkout/thankyou.php:53
msgid "Payment Method:"
msgstr ""
#: includes/abstracts/abstract-wc-order.php:1898
-#: includes/shortcodes/class-wc-shortcode-checkout.php:136
+#: includes/shortcodes/class-wc-shortcode-checkout.php:138
#: templates/checkout/thankyou.php:48
msgid "Total:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:2134
-msgid "Download file%s"
+#: includes/abstracts/abstract-wc-order.php:2135
+#: templates/emails/plain/email-order-items.php:49
+msgid "Download %d"
+msgstr ""
+
+#: includes/abstracts/abstract-wc-order.php:2135
+#: templates/emails/plain/email-order-items.php:51
+msgid "Download"
msgstr ""
#. Plugin Name of the plugin/theme
msgid "WooCommerce"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:2219
+#: includes/abstracts/abstract-wc-order.php:2222
msgid "Order status changed from %s to %s."
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:2477
+#: includes/abstracts/abstract-wc-order.php:2480
msgid "Item #%s variation #%s stock reduced from %s to %s."
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:2479
-#: includes/class-wc-ajax.php:1372
+#: includes/abstracts/abstract-wc-order.php:2482
+#: includes/class-wc-ajax.php:1415
msgid "Item #%s stock reduced from %s to %s."
msgstr ""
@@ -5175,7 +5185,7 @@ msgstr ""
#: includes/abstracts/abstract-wc-product.php:537
#: includes/class-wc-product-simple.php:47
-#: includes/class-wc-product-variation.php:186
+#: includes/class-wc-product-variation.php:187
msgid "Add to cart"
msgstr ""
@@ -5186,40 +5196,40 @@ msgstr ""
#: includes/abstracts/abstract-wc-product.php:626
#: includes/abstracts/abstract-wc-product.php:637
#: includes/abstracts/abstract-wc-product.php:659
-#: includes/class-wc-ajax.php:780 includes/class-wc-ajax.php:2447
-#: includes/class-wc-product-variation.php:527
-#: includes/class-wc-product-variation.php:537
-#: includes/class-wc-product-variation.php:553
+#: includes/class-wc-ajax.php:829 includes/class-wc-ajax.php:2492
+#: includes/class-wc-product-variation.php:526
+#: includes/class-wc-product-variation.php:536
+#: includes/class-wc-product-variation.php:552
msgid "In stock"
msgstr ""
#: includes/abstracts/abstract-wc-product.php:631
-#: includes/class-wc-product-variation.php:531
+#: includes/class-wc-product-variation.php:530
msgid "Only %s left in stock"
msgstr ""
#: includes/abstracts/abstract-wc-product.php:634
#: includes/abstracts/abstract-wc-product.php:645
-#: includes/class-wc-product-variation.php:534
-#: includes/class-wc-product-variation.php:544
+#: includes/class-wc-product-variation.php:533
+#: includes/class-wc-product-variation.php:543
msgid "(can be backordered)"
msgstr ""
#: includes/abstracts/abstract-wc-product.php:642
-#: includes/class-wc-product-variation.php:541
+#: includes/class-wc-product-variation.php:540
msgid "%s in stock"
msgstr ""
#: includes/abstracts/abstract-wc-product.php:654
-#: includes/class-wc-product-variation.php:550 templates/cart/cart.php:82
+#: includes/class-wc-product-variation.php:549 templates/cart/cart.php:82
msgid "Available on backorder"
msgstr ""
#: includes/abstracts/abstract-wc-product.php:664
#: includes/abstracts/abstract-wc-product.php:670
-#: includes/class-wc-ajax.php:781 includes/class-wc-ajax.php:2448
-#: includes/class-wc-product-variation.php:556
-#: includes/class-wc-product-variation.php:560
+#: includes/class-wc-ajax.php:830 includes/class-wc-ajax.php:2493
+#: includes/class-wc-product-variation.php:555
+#: includes/class-wc-product-variation.php:559
msgid "Out of stock"
msgstr ""
@@ -6047,108 +6057,108 @@ msgstr ""
msgid "Invalid product SKU"
msgstr ""
-#: includes/class-wc-ajax.php:193
+#: includes/class-wc-ajax.php:201
msgid "Sorry there was a problem removing this coupon."
msgstr ""
-#: includes/class-wc-ajax.php:199
+#: includes/class-wc-ajax.php:207
msgid "Coupon has been removed."
msgstr ""
-#: includes/class-wc-ajax.php:250
+#: includes/class-wc-ajax.php:258
msgid "Sorry, your session has expired."
msgstr ""
-#: includes/class-wc-ajax.php:250
+#: includes/class-wc-ajax.php:258
msgid "Return to homepage"
msgstr ""
-#: includes/class-wc-ajax.php:765 includes/class-wc-ajax.php:2430
+#: includes/class-wc-ajax.php:812 includes/class-wc-ajax.php:2475
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:210
msgid "Standard"
msgstr ""
-#: includes/class-wc-ajax.php:774 includes/class-wc-ajax.php:2440
+#: includes/class-wc-ajax.php:822 includes/class-wc-ajax.php:2485
msgid "Do not allow"
msgstr ""
-#: includes/class-wc-ajax.php:775 includes/class-wc-ajax.php:2441
+#: includes/class-wc-ajax.php:823 includes/class-wc-ajax.php:2486
msgid "Allow, but notify customer"
msgstr ""
-#: includes/class-wc-ajax.php:776 includes/class-wc-ajax.php:2442
+#: includes/class-wc-ajax.php:824 includes/class-wc-ajax.php:2487
msgid "Allow"
msgstr ""
-#: includes/class-wc-ajax.php:1073
+#: includes/class-wc-ajax.php:1116
msgid "File %d"
msgstr ""
-#: includes/class-wc-ajax.php:1383
+#: includes/class-wc-ajax.php:1426
msgid ""
"No products had their stock reduced - they may not have stock management "
"enabled."
msgstr ""
-#: includes/class-wc-ajax.php:1424 includes/class-wc-ajax.php:2235
+#: includes/class-wc-ajax.php:1467 includes/class-wc-ajax.php:2278
msgid "Item #%s stock increased from %s to %s."
msgstr ""
-#: includes/class-wc-ajax.php:1434
+#: includes/class-wc-ajax.php:1477
msgid ""
"No products had their stock increased - they may not have stock management "
"enabled."
msgstr ""
-#: includes/class-wc-ajax.php:1453
+#: includes/class-wc-ajax.php:1496
#: includes/widgets/class-wc-widget-product-categories.php:52
#: templates/single-product-reviews.php:65
msgid "Name"
msgstr ""
-#: includes/class-wc-ajax.php:1453
+#: includes/class-wc-ajax.php:1496
msgid "Value"
msgstr ""
-#: includes/class-wc-ajax.php:1703
+#: includes/class-wc-ajax.php:1746
msgid "Delete note"
msgstr ""
-#: includes/class-wc-ajax.php:2175
+#: includes/class-wc-ajax.php:2218
msgid "Invalid refund amount"
msgstr ""
-#: includes/class-wc-ajax.php:2220
+#: includes/class-wc-ajax.php:2263
msgid "Refund failed"
msgstr ""
-#: includes/class-wc-ajax.php:2317
+#: includes/class-wc-ajax.php:2360
msgid "Description is missing."
msgstr ""
-#: includes/class-wc-ajax.php:2320
+#: includes/class-wc-ajax.php:2363
msgid "User is missing."
msgstr ""
-#: includes/class-wc-ajax.php:2323
+#: includes/class-wc-ajax.php:2366
msgid "Permissions is missing."
msgstr ""
-#: includes/class-wc-ajax.php:2352
+#: includes/class-wc-ajax.php:2395
msgid "API Key updated successfully."
msgstr ""
-#: includes/class-wc-ajax.php:2383
+#: includes/class-wc-ajax.php:2426
msgid ""
"API Key generated successfully. Make sure to copy your new API keys now. "
"You won't be able to see it again!"
msgstr ""
-#: includes/class-wc-ajax.php:2384
+#: includes/class-wc-ajax.php:2427
msgid "Revoke Key"
msgstr ""
-#: includes/class-wc-ajax.php:2599
+#: includes/class-wc-ajax.php:2643
msgid "Dismiss this notice."
msgstr ""
@@ -6258,27 +6268,27 @@ msgstr ""
msgid "Access Denied"
msgstr ""
-#: includes/class-wc-breadcrumb.php:118
+#: includes/class-wc-breadcrumb.php:119
msgid "Error 404"
msgstr ""
-#: includes/class-wc-breadcrumb.php:210
+#: includes/class-wc-breadcrumb.php:211
msgid "Products tagged “%s”"
msgstr ""
-#: includes/class-wc-breadcrumb.php:261
+#: includes/class-wc-breadcrumb.php:262
msgid "Posts tagged “%s”"
msgstr ""
-#: includes/class-wc-breadcrumb.php:286
+#: includes/class-wc-breadcrumb.php:304
msgid "Author: %s"
msgstr ""
-#: includes/class-wc-breadcrumb.php:321
+#: includes/class-wc-breadcrumb.php:339
msgid "Search results for “%s”"
msgstr ""
-#: includes/class-wc-breadcrumb.php:330
+#: includes/class-wc-breadcrumb.php:348
msgid "Page %d"
msgstr ""
@@ -6650,7 +6660,7 @@ msgstr ""
#: includes/class-wc-download-handler.php:98
#: includes/class-wc-form-handler.php:558
-#: includes/shortcodes/class-wc-shortcode-checkout.php:163
+#: includes/shortcodes/class-wc-shortcode-checkout.php:165
#: includes/shortcodes/class-wc-shortcode-my-account.php:108
msgid "Invalid order."
msgstr ""
@@ -6821,61 +6831,57 @@ msgid ""
"assistance."
msgstr ""
-#: includes/class-wc-form-handler.php:588
-msgid "Sorry, this product is unavailable."
+#: includes/class-wc-form-handler.php:666
+msgid "Please choose the quantity of items you wish to add to your cart…"
msgstr ""
-#: includes/class-wc-form-handler.php:635
+#: includes/class-wc-form-handler.php:674
+msgid "Please choose a product to add to your cart…"
+msgstr ""
+
+#: includes/class-wc-form-handler.php:727
msgid "%s is a required field"
msgid_plural "%s are required fields"
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wc-form-handler.php:638
+#: includes/class-wc-form-handler.php:729
msgid "Please choose product options…"
msgstr ""
-#: includes/class-wc-form-handler.php:683
-msgid "Please choose the quantity of items you wish to add to your cart…"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:690
-msgid "Please choose a product to add to your cart…"
-msgstr ""
-
-#: includes/class-wc-form-handler.php:754
-#: includes/class-wc-form-handler.php:758
-#: includes/class-wc-form-handler.php:762
-#: includes/class-wc-form-handler.php:771
-#: includes/class-wc-form-handler.php:902
+#: includes/class-wc-form-handler.php:755
+#: includes/class-wc-form-handler.php:759
+#: includes/class-wc-form-handler.php:763
+#: includes/class-wc-form-handler.php:772
+#: includes/class-wc-form-handler.php:903
msgid "Error"
msgstr ""
-#: includes/class-wc-form-handler.php:758
+#: includes/class-wc-form-handler.php:759
msgid "Username is required."
msgstr ""
-#: includes/class-wc-form-handler.php:762
+#: includes/class-wc-form-handler.php:763
msgid "Password is required."
msgstr ""
-#: includes/class-wc-form-handler.php:771
+#: includes/class-wc-form-handler.php:772
msgid "A user could not be found with this email address."
msgstr ""
-#: includes/class-wc-form-handler.php:798
+#: includes/class-wc-form-handler.php:799
msgid "You are now logged in as %s"
msgstr ""
-#: includes/class-wc-form-handler.php:842
+#: includes/class-wc-form-handler.php:843
msgid "Please enter your password."
msgstr ""
-#: includes/class-wc-form-handler.php:846
+#: includes/class-wc-form-handler.php:847
msgid "Passwords do not match."
msgstr ""
-#: includes/class-wc-form-handler.php:885
+#: includes/class-wc-form-handler.php:886
msgid "Anti-spam field was filled in."
msgstr ""
@@ -6914,34 +6920,58 @@ msgstr ""
msgid "Shop Manager"
msgstr ""
-#: includes/class-wc-install.php:688
+#: includes/class-wc-install.php:692
msgid "View WooCommerce Settings"
msgstr ""
-#: includes/class-wc-install.php:704
+#: includes/class-wc-install.php:708
msgid "View WooCommerce Documentation"
msgstr ""
-#: includes/class-wc-install.php:704
+#: includes/class-wc-install.php:708
msgid "Docs"
msgstr ""
-#: includes/class-wc-install.php:705
+#: includes/class-wc-install.php:709
msgid "View WooCommerce API Docs"
msgstr ""
-#: includes/class-wc-install.php:705
+#: includes/class-wc-install.php:709
msgid "API Docs"
msgstr ""
-#: includes/class-wc-install.php:706
+#: includes/class-wc-install.php:710
msgid "Visit Premium Customer Support Forum"
msgstr ""
-#: includes/class-wc-install.php:706
+#: includes/class-wc-install.php:710
msgid "Premium Support"
msgstr ""
+#: includes/class-wc-language-pack-upgrader.php:254
+#: includes/class-wc-language-pack-upgrader.php:257
+#: includes/class-wc-language-pack-upgrader.php:260
+msgid "Failed to install/update the translation:"
+msgstr ""
+
+#: includes/class-wc-language-pack-upgrader.php:254
+msgid "Seems you don't have permission to do this!"
+msgstr ""
+
+#: includes/class-wc-language-pack-upgrader.php:257
+msgid ""
+"An authentication error occurred while updating the translation. Please try "
+"again or configure your %sUpgrade Constants%s."
+msgstr ""
+
+#: includes/class-wc-language-pack-upgrader.php:260
+msgid "Sorry but there is no translation available for your language =/"
+msgstr ""
+
+#: includes/class-wc-language-pack-upgrader.php:267
+msgid "Translations installed/updated successfully!"
+msgstr ""
+
#: includes/class-wc-order.php:40 includes/wc-cart-functions.php:246
msgid "(Includes %s)"
msgstr ""
@@ -7398,7 +7428,7 @@ msgid "Buy product"
msgstr ""
#: includes/class-wc-product-simple.php:47
-#: includes/class-wc-product-variation.php:186
+#: includes/class-wc-product-variation.php:187
msgid "Read More"
msgstr ""
@@ -7406,13 +7436,13 @@ msgstr ""
msgid "Select options"
msgstr ""
-#: includes/class-wc-product-variable.php:678
+#: includes/class-wc-product-variable.php:693
msgid ""
"This variable product has no active variations so cannot be published. "
"Changing status to draft."
msgstr ""
-#: includes/class-wc-product-variation.php:659
+#: includes/class-wc-product-variation.php:658
msgid "%s – %s%s"
msgstr ""
@@ -7469,7 +7499,7 @@ msgstr ""
#: includes/emails/class-wc-email-cancelled-order.php:110
#: includes/emails/class-wc-email-customer-completed-order.php:138
-#: includes/emails/class-wc-email-customer-refunded-order.php:171
+#: includes/emails/class-wc-email-customer-refunded-order.php:174
#: includes/emails/class-wc-email-new-order.php:117
#: includes/emails/class-wc-email.php:475
#: includes/gateways/bacs/class-wc-gateway-bacs.php:74
@@ -7483,7 +7513,7 @@ msgstr ""
#: includes/emails/class-wc-email-cancelled-order.php:112
#: includes/emails/class-wc-email-customer-completed-order.php:140
-#: includes/emails/class-wc-email-customer-refunded-order.php:173
+#: includes/emails/class-wc-email-customer-refunded-order.php:176
#: includes/emails/class-wc-email-new-order.php:119
#: includes/emails/class-wc-email.php:477
msgid "Enable this email notification"
@@ -7531,7 +7561,7 @@ msgstr ""
#: includes/emails/class-wc-email-cancelled-order.php:137
#: includes/emails/class-wc-email-customer-completed-order.php:172
-#: includes/emails/class-wc-email-customer-refunded-order.php:205
+#: includes/emails/class-wc-email-customer-refunded-order.php:208
#: includes/emails/class-wc-email-new-order.php:144
#: includes/emails/class-wc-email.php:495
msgid "Email type"
@@ -7540,7 +7570,7 @@ msgstr ""
#: includes/emails/class-wc-email-cancelled-order.php:139
#: includes/emails/class-wc-email-customer-completed-order.php:174
#: includes/emails/class-wc-email-customer-invoice.php:175
-#: includes/emails/class-wc-email-customer-refunded-order.php:207
+#: includes/emails/class-wc-email-customer-refunded-order.php:210
#: includes/emails/class-wc-email-new-order.php:146
#: includes/emails/class-wc-email.php:497
msgid "Choose which format of email to send."
@@ -7580,10 +7610,10 @@ msgstr ""
#: includes/emails/class-wc-email-customer-invoice.php:154
#: includes/emails/class-wc-email-customer-invoice.php:161
#: includes/emails/class-wc-email-customer-invoice.php:168
-#: includes/emails/class-wc-email-customer-refunded-order.php:179
-#: includes/emails/class-wc-email-customer-refunded-order.php:186
-#: includes/emails/class-wc-email-customer-refunded-order.php:193
-#: includes/emails/class-wc-email-customer-refunded-order.php:200
+#: includes/emails/class-wc-email-customer-refunded-order.php:182
+#: includes/emails/class-wc-email-customer-refunded-order.php:189
+#: includes/emails/class-wc-email-customer-refunded-order.php:196
+#: includes/emails/class-wc-email-customer-refunded-order.php:203
#: includes/emails/class-wc-email.php:483
#: includes/emails/class-wc-email.php:490
msgid "Defaults to
%s"
@@ -7640,21 +7670,21 @@ msgstr ""
msgid "Email Type"
msgstr ""
-#: includes/emails/class-wc-email-customer-new-account.php:32
+#: includes/emails/class-wc-email-customer-new-account.php:33
msgid "New account"
msgstr ""
-#: includes/emails/class-wc-email-customer-new-account.php:33
+#: includes/emails/class-wc-email-customer-new-account.php:34
msgid ""
"Customer \"new account\" emails are sent to the customer when a customer "
"signs up via checkout or account pages."
msgstr ""
-#: includes/emails/class-wc-email-customer-new-account.php:38
+#: includes/emails/class-wc-email-customer-new-account.php:39
msgid "Your account on {site_title}"
msgstr ""
-#: includes/emails/class-wc-email-customer-new-account.php:39
+#: includes/emails/class-wc-email-customer-new-account.php:40
msgid "Welcome to {site_title}"
msgstr ""
@@ -7692,55 +7722,55 @@ msgstr ""
msgid "Your {site_title} order receipt from {order_date}"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:37
+#: includes/emails/class-wc-email-customer-refunded-order.php:40
msgid "Your {site_title} order from {order_date} has been partially refunded"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:38
+#: includes/emails/class-wc-email-customer-refunded-order.php:41
msgid "Your {site_title} order from {order_date} has been refunded"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:40
+#: includes/emails/class-wc-email-customer-refunded-order.php:43
msgid "Your order has been fully refunded"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:41
+#: includes/emails/class-wc-email-customer-refunded-order.php:44
msgid "Your order has been partially refunded"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:45
+#: includes/emails/class-wc-email-customer-refunded-order.php:48
msgid "Partially Refunded order"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:46
+#: includes/emails/class-wc-email-customer-refunded-order.php:49
msgid ""
"Order partially refunded emails are sent to customers when their orders are "
"partially refunded."
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:54
+#: includes/emails/class-wc-email-customer-refunded-order.php:57
msgid "Refunded order"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:55
+#: includes/emails/class-wc-email-customer-refunded-order.php:58
msgid ""
"Order refunded emails are sent to customers when their orders are marked "
"refunded."
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:177
+#: includes/emails/class-wc-email-customer-refunded-order.php:180
msgid "Full Refund Subject"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:184
+#: includes/emails/class-wc-email-customer-refunded-order.php:187
msgid "Partial Refund Subject"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:191
+#: includes/emails/class-wc-email-customer-refunded-order.php:194
msgid "Full Refund Email Heading"
msgstr ""
-#: includes/emails/class-wc-email-customer-refunded-order.php:198
+#: includes/emails/class-wc-email-customer-refunded-order.php:201
msgid "Partial Refund Email Heading"
msgstr ""
@@ -8092,7 +8122,7 @@ msgstr ""
msgid "Accept COD if the order is virtual"
msgstr ""
-#: includes/gateways/cod/class-wc-gateway-cod.php:206
+#: includes/gateways/cod/class-wc-gateway-cod.php:203
msgid "Payment to be made upon delivery."
msgstr ""
@@ -8640,14 +8670,14 @@ msgid "Flat Rate Shipping lets you charge a fixed rate for shipping."
msgstr ""
#: includes/shipping/flat-rate/includes/settings-flat-rate.php:7
-msgid "Enter a cost (excl. tax) or sum, e.g. 10 * [qty]."
+msgid "Enter a cost (excl. tax) or sum, e.g. 10.00 * [qty]."
msgstr ""
#: includes/shipping/flat-rate/includes/settings-flat-rate.php:7
msgid ""
"Supports the following placeholders: [qty] = number of items, "
"[cost] = cost of items, [fee percent=\"10\" "
-"min=\"20\"] = Percentage based fee."
+"min_fee=\"20\"] = Percentage based fee."
msgstr ""
#: includes/shipping/flat-rate/includes/settings-flat-rate.php:16
@@ -8877,8 +8907,7 @@ msgid "Allowed Zip/Post Codes"
msgstr ""
#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:125
-#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:81
-msgid "What zip/post codes are available for local pickup?"
+msgid "What zip/post codes are available for local delivery?"
msgstr ""
#: includes/shipping/local-delivery/class-wc-shipping-local-delivery.php:127
@@ -8904,43 +8933,47 @@ msgstr ""
msgid "Enable local pickup"
msgstr ""
+#: includes/shipping/local-pickup/class-wc-shipping-local-pickup.php:81
+msgid "What zip/post codes are available for local pickup?"
+msgstr ""
+
#: includes/shortcodes/class-wc-shortcode-cart.php:42
msgid "Shipping costs updated."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:88
+#: includes/shortcodes/class-wc-shortcode-checkout.php:90
msgid "Invalid order. If you have an account please log in and try again."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:88
+#: includes/shortcodes/class-wc-shortcode-checkout.php:90
#: includes/shortcodes/class-wc-shortcode-my-account.php:108
#: templates/checkout/thankyou.php:30
msgid "My Account"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:107
-#: includes/shortcodes/class-wc-shortcode-checkout.php:155
+#: includes/shortcodes/class-wc-shortcode-checkout.php:109
+#: includes/shortcodes/class-wc-shortcode-checkout.php:157
msgid ""
"This order’s status is “%s”—it cannot be paid for. "
"Please contact us if you need assistance."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:111
-#: includes/shortcodes/class-wc-shortcode-checkout.php:159
+#: includes/shortcodes/class-wc-shortcode-checkout.php:113
+#: includes/shortcodes/class-wc-shortcode-checkout.php:161
msgid "Sorry, this order is invalid and cannot be paid for."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:128
+#: includes/shortcodes/class-wc-shortcode-checkout.php:130
#: templates/checkout/thankyou.php:40
msgid "Order Number:"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:132
+#: includes/shortcodes/class-wc-shortcode-checkout.php:134
#: templates/checkout/thankyou.php:44
msgid "Date:"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-checkout.php:227
+#: includes/shortcodes/class-wc-shortcode-checkout.php:231
msgid ""
"The order totals have been updated. Please confirm your order by pressing "
"the Place Order button at the bottom of the page."
@@ -9282,19 +9315,19 @@ msgstr ""
msgid "Refund – %s"
msgstr ""
-#: includes/wc-product-functions.php:510
+#: includes/wc-product-functions.php:508
msgid "Simple product"
msgstr ""
-#: includes/wc-product-functions.php:511
+#: includes/wc-product-functions.php:509
msgid "Grouped product"
msgstr ""
-#: includes/wc-product-functions.php:512
+#: includes/wc-product-functions.php:510
msgid "External/Affiliate product"
msgstr ""
-#: includes/wc-product-functions.php:513
+#: includes/wc-product-functions.php:511
msgid "Variable product"
msgstr ""
@@ -10128,16 +10161,6 @@ msgstr ""
msgid "Shipping address"
msgstr ""
-#: templates/emails/email-order-items.php:54
-#: templates/emails/plain/email-order-items.php:49
-msgid "Download %d"
-msgstr ""
-
-#: templates/emails/email-order-items.php:56
-#: templates/emails/plain/email-order-items.php:51
-msgid "Download"
-msgstr ""
-
#: templates/emails/plain/admin-cancelled-order.php:21
#: templates/emails/plain/admin-new-order.php:22
#: templates/emails/plain/customer-completed-order.php:22
@@ -10862,8 +10885,8 @@ msgid "Failed"
msgstr ""
#: includes/class-wc-product-grouped.php:193
-#: includes/class-wc-product-variable.php:322
-#: includes/class-wc-product-variable.php:328
+#: includes/class-wc-product-variable.php:326
+#: includes/class-wc-product-variable.php:332
msgctxt "Price range: from-to"
msgid "%1$s–%2$s"
msgstr ""
@@ -10875,7 +10898,7 @@ msgstr ""
#: includes/wc-cart-functions.php:100
msgctxt "Item name in quotes"
-msgid "“%s“"
+msgid "“%s”"
msgstr ""
#: includes/wc-core-functions.php:78 includes/wc-order-functions.php:629
diff --git a/i18n/locale-info.php b/i18n/locale-info.php
index d3ed5ccb92a..0753522d784 100644
--- a/i18n/locale-info.php
+++ b/i18n/locale-info.php
@@ -20,6 +20,26 @@ return array(
)
)
),
+ 'BD' => array(
+ 'currency_code' => 'BDT',
+ 'currency_pos' => 'left',
+ 'thousand_sep' => ',',
+ 'decimal_sep' => '.',
+ 'num_decimals' => 2,
+ 'weight_unit' => 'kg',
+ 'dimension_unit' => 'in',
+ 'tax_rates' => array(
+ '' => array(
+ array(
+ 'country' => 'BD',
+ 'state' => '',
+ 'rate' => '15.0000',
+ 'name' => 'VAT',
+ 'shipping' => true
+ )
+ )
+ )
+ ),
'BE' => array(
'currency_code' => 'EUR',
'currency_pos' => 'left',
@@ -274,6 +294,26 @@ return array(
)
)
),
+ 'HU' => array(
+ 'currency_code' => 'HUF',
+ 'currency_pos' => 'right_space',
+ 'thousand_sep' => ' ',
+ 'decimal_sep' => ',',
+ 'num_decimals' => 0,
+ 'weight_unit' => 'kg',
+ 'dimension_unit' => 'cm',
+ 'tax_rates' => array(
+ '' => array(
+ array(
+ 'country' => 'HU',
+ 'state' => '',
+ 'rate' => '27.0000',
+ 'name' => 'ÁFA',
+ 'shipping' => true
+ )
+ )
+ )
+ ),
'IT' => array(
'currency_code' => 'EUR',
'currency_pos' => 'right',
@@ -294,6 +334,26 @@ return array(
)
)
),
+ 'JP' => array(
+ 'currency_code' => 'JPY',
+ 'currency_pos' => 'left',
+ 'thousand_sep' => ',',
+ 'decimal_sep' => '.',
+ 'num_decimals' => 0,
+ 'weight_unit' => 'kg',
+ 'dimension_unit' => 'cm',
+ 'tax_rates' => array(
+ '' => array(
+ array(
+ 'country' => 'JP',
+ 'state' => '',
+ 'rate' => '8.0000',
+ 'name' => __( 'Consumption tax', 'woocommerce' ),
+ 'shipping' => true
+ )
+ )
+ )
+ ),
'NL' => array(
'currency_code' => 'EUR',
'currency_pos' => 'left',
@@ -334,6 +394,26 @@ return array(
)
)
),
+ 'NP' => array(
+ 'currency_code' => 'NPR',
+ 'currency_pos' => 'left_space',
+ 'thousand_sep' => ',',
+ 'decimal_sep' => '.',
+ 'num_decimals' => 2,
+ 'weight_unit' => 'kg',
+ 'dimension_unit' => 'cm',
+ 'tax_rates' => array(
+ '' => array(
+ array(
+ 'country' => 'NP',
+ 'state' => '',
+ 'rate' => '13.0000',
+ 'name' => 'VAT',
+ 'shipping' => true
+ )
+ )
+ )
+ ),
'PL' => array(
'currency_code' => 'PLN',
'currency_pos' => 'right',
diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index 5337b834e40..d69db12f074 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -1732,15 +1732,13 @@ abstract class WC_Abstract_Order {
if ( $this->order_shipping != 0 ) {
- $tax_text = '';
-
if ( $tax_display == 'excl' ) {
// Show shipping excluding tax
$shipping = wc_price( $this->order_shipping, array('currency' => $this->get_order_currency()) );
if ( $this->order_shipping_tax != 0 && $this->prices_include_tax ) {
- $tax_text = WC()->countries->ex_tax_or_vat() . ' ';
+ $shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', ' ' . WC()->countries->ex_tax_or_vat() . '', $this, $tax_display );
}
} else {
@@ -1749,12 +1747,12 @@ abstract class WC_Abstract_Order {
$shipping = wc_price( $this->order_shipping + $this->order_shipping_tax, array('currency' => $this->get_order_currency()) );
if ( $this->order_shipping_tax != 0 && ! $this->prices_include_tax ) {
- $tax_text = WC()->countries->inc_tax_or_vat() . ' ';
+ $shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', ' ' . WC()->countries->inc_tax_or_vat() . '', $this, $tax_display );
}
}
- $shipping .= sprintf( __( ' %svia %s', 'woocommerce' ), $tax_text, $this->get_shipping_method() );
+ $shipping .= apply_filters( 'woocommerce_order_shipping_to_display_shipped_via', ' ' . sprintf( __( 'via %s', 'woocommerce' ), $this->get_shipping_method() ) . '', $this );
} elseif ( $this->get_shipping_method() ) {
$shipping = $this->get_shipping_method();
@@ -1830,14 +1828,14 @@ abstract class WC_Abstract_Order {
if ( $this->get_total_discount() > 0 ) {
$total_rows['discount'] = array(
'label' => __( 'Discount:', 'woocommerce' ),
- 'value' => '-' . $this->get_discount_to_display()
+ 'value' => '-' . $this->get_discount_to_display( $tax_display )
);
}
if ( $this->get_shipping_method() ) {
$total_rows['shipping'] = array(
'label' => __( 'Shipping:', 'woocommerce' ),
- 'value' => $this->get_shipping_to_display()
+ 'value' => $this->get_shipping_to_display( $tax_display )
);
}
@@ -2131,7 +2129,9 @@ abstract class WC_Abstract_Order {
$links = array();
foreach ( $download_files as $download_id => $file ) {
- $links[] = '' . sprintf( __( 'Download file%s', 'woocommerce' ), ( count( $download_files ) > 1 ? ' ' . ( $i++ ) . ': ' : ': ' ) ) . esc_html( $file['name'] ) . '';
+ $i++;
+ $prefix = count( $download_files ) > 1 ? sprintf( __( 'Download %d', 'woocommerce' ), $i ) : __( 'Download', 'woocommerce' );
+ $links[] = '' . $prefix . ': ' . esc_html( $file['name'] ) . '' . "\n";
}
echo '' . implode( '
', $links ); @@ -2199,8 +2199,9 @@ abstract class WC_Abstract_Order { * * @param string $new_status Status to change the order to. No internal wc- prefix is required. * @param string $note (default: '') Optional note to add + * @param bool $manual is this a manual order status change? */ - public function update_status( $new_status, $note = '' ) { + public function update_status( $new_status, $note = '', $manual = false ) { if ( ! $this->id ) { return; } @@ -2216,7 +2217,7 @@ abstract class WC_Abstract_Order { wp_update_post( array( 'ID' => $this->id, 'post_status' => 'wc-' . $new_status ) ); $this->post_status = 'wc-' . $new_status; - $this->add_order_note( trim( $note . ' ' . sprintf( __( 'Order status changed from %s to %s.', 'woocommerce' ), wc_get_order_status_name( $old_status ), wc_get_order_status_name( $new_status ) ) ) ); + $this->add_order_note( trim( $note . ' ' . sprintf( __( 'Order status changed from %s to %s.', 'woocommerce' ), wc_get_order_status_name( $old_status ), wc_get_order_status_name( $new_status ) ) ), 0, $manual ); // Status was changed do_action( 'woocommerce_order_status_' . $new_status, $this->id ); @@ -2285,7 +2286,6 @@ abstract class WC_Abstract_Order { * @param $transaction_id string Optional transaction id to store in post meta */ public function payment_complete( $transaction_id = '' ) { - do_action( 'woocommerce_pre_payment_complete', $this->id ); if ( null !== WC()->session ) { @@ -2295,57 +2295,43 @@ abstract class WC_Abstract_Order { $valid_order_statuses = apply_filters( 'woocommerce_valid_order_statuses_for_payment_complete', array( 'on-hold', 'pending', 'failed', 'cancelled' ), $this ); if ( $this->id && $this->has_status( $valid_order_statuses ) ) { - - $order_needs_processing = true; + $order_needs_processing = false; if ( sizeof( $this->get_items() ) > 0 ) { - foreach ( $this->get_items() as $item ) { + if ( $_product = $this->get_product_from_item( $item ) ) { + $virtual_downloadable_item = $_product->is_downloadable() && $_product->is_virtual(); - if ( $item['product_id'] > 0 ) { - - $_product = $this->get_product_from_item( $item ); - - if ( false !== $_product && ! apply_filters( 'woocommerce_order_item_needs_processing', ! ( $_product->is_downloadable() && $_product->is_virtual() ), $_product, $this->id ) ) { - $order_needs_processing = false; - continue; + if ( apply_filters( 'woocommerce_order_item_needs_processing', ! $virtual_downloadable_item, $_product, $this->id ) ) { + $order_needs_processing = true; + break; } } - - $order_needs_processing = true; - break; } } - $new_order_status = $order_needs_processing ? 'processing' : 'completed'; + $this->update_status( apply_filters( 'woocommerce_payment_complete_order_status', $order_needs_processing ? 'processing' : 'completed', $this->id ) ); - $new_order_status = apply_filters( 'woocommerce_payment_complete_order_status', $new_order_status, $this->id ); - - $this->update_status( $new_order_status ); - - add_post_meta( $this->id, '_paid_date', current_time('mysql'), true ); + add_post_meta( $this->id, '_paid_date', current_time( 'mysql' ), true ); if ( ! empty( $transaction_id ) ) { add_post_meta( $this->id, '_transaction_id', $transaction_id, true ); } - $this_order = array( - 'ID' => $this->id, - 'post_date' => current_time( 'mysql', 0 ), + wp_update_post( array( + 'ID' => $this->id, + 'post_date' => current_time( 'mysql', 0 ), 'post_date_gmt' => current_time( 'mysql', 1 ) - ); - wp_update_post( $this_order ); + ) ); - if ( apply_filters( 'woocommerce_payment_complete_reduce_order_stock', true, $this->id ) ) { - $this->reduce_order_stock(); // Payment is complete so reduce stock levels + // Payment is complete so reduce stock levels + if ( apply_filters( 'woocommerce_payment_complete_reduce_order_stock', ! get_post_meta( $this->id, '_order_stock_reduced', true ), $this->id ) ) { + $this->reduce_order_stock(); } do_action( 'woocommerce_payment_complete', $this->id ); - } else { - do_action( 'woocommerce_payment_complete_order_status_' . $this->get_status(), $this->id ); - } } @@ -2354,8 +2340,7 @@ abstract class WC_Abstract_Order { * Record sales */ public function record_product_sales() { - - if ( 'yes' == get_post_meta( $this->id, '_recorded_sales', true ) ) { + if ( 'yes' === get_post_meta( $this->id, '_recorded_sales', true ) ) { return; } @@ -2400,7 +2385,6 @@ abstract class WC_Abstract_Order { * Increase applied coupon counts */ public function increase_coupon_usage_counts() { - if ( 'yes' == get_post_meta( $this->id, '_recorded_coupon_usage_counts', true ) ) { return; } @@ -2483,6 +2467,8 @@ abstract class WC_Abstract_Order { } } + add_post_meta( $this->id, '_order_stock_reduced', '1', true ); + do_action( 'woocommerce_reduce_order_stock', $this ); } } @@ -2512,6 +2498,8 @@ abstract class WC_Abstract_Order { if ( ! $notification_sent && 'yes' == get_option( 'woocommerce_notify_low_stock' ) && get_option( 'woocommerce_notify_low_stock_amount' ) >= $new_stock ) { do_action( 'woocommerce_low_stock', $product ); } + + do_action( 'woocommerce_after_send_stock_notifications', $product, $new_stock, $qty_ordered ); } diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php index fd63f298246..abeba492b11 100644 --- a/includes/abstracts/abstract-wc-payment-gateway.php +++ b/includes/abstracts/abstract-wc-payment-gateway.php @@ -126,7 +126,7 @@ abstract class WC_Payment_Gateway extends WC_Settings_API { /** * Get the order total in checkout and pay_for_order. * - * @return bool + * @return float */ protected function get_order_total() { diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php index 0b43b067fb3..4c8b66878f0 100644 --- a/includes/abstracts/abstract-wc-product.php +++ b/includes/abstracts/abstract-wc-product.php @@ -177,7 +177,7 @@ class WC_Product { * @return int */ public function get_stock_quantity() { - return $this->managing_stock() ? wc_stock_amount( $this->stock ) : ''; + return apply_filters( 'woocommerce_get_stock_quantity', $this->managing_stock() ? wc_stock_amount( $this->stock ) : '', $this ); } /** @@ -827,7 +827,12 @@ class WC_Product { $base_tax_amount = array_sum( $base_taxes ); $price = round( $price * $qty - $base_tax_amount, wc_get_price_decimals() ); - } elseif ( $tax_rates !== $base_tax_rates ) { + /** + * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations. + * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes. + * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk. + */ + } elseif ( $tax_rates !== $base_tax_rates && apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ) { $base_taxes = WC_Tax::calc_tax( $price * $qty, $base_tax_rates, true ); $modded_taxes = WC_Tax::calc_tax( ( $price * $qty ) - array_sum( $base_taxes ), $tax_rates, false ); @@ -861,7 +866,7 @@ class WC_Product { $price = $this->get_price(); } - if ( $this->is_taxable() && get_option( 'woocommerce_prices_include_tax' ) === 'yes' ) { + if ( $this->is_taxable() && 'yes' === get_option( 'woocommerce_prices_include_tax' ) ) { $tax_rates = WC_Tax::get_base_tax_rates( $this->tax_class ); $taxes = WC_Tax::calc_tax( $price * $qty, $tax_rates, true ); $price = WC_Tax::round( $price * $qty - array_sum( $taxes ) ); @@ -967,7 +972,7 @@ class WC_Product { } else { - $price = __( 'Free!', 'woocommerce' ); + $price = '' . __( 'Free!', 'woocommerce' ) . ''; $price = apply_filters( 'woocommerce_free_price_html', $price, $this ); diff --git a/includes/abstracts/abstract-wc-shipping-method.php b/includes/abstracts/abstract-wc-shipping-method.php index 6021be78426..ecca207908f 100644 --- a/includes/abstracts/abstract-wc-shipping-method.php +++ b/includes/abstracts/abstract-wc-shipping-method.php @@ -73,51 +73,41 @@ abstract class WC_Shipping_Method extends WC_Settings_API { * @param array $args (default: array()) */ public function add_rate( $args = array() ) { - $defaults = array( + $args = wp_parse_args( $args, array( 'id' => '', // ID for the rate 'label' => '', // Label for the rate 'cost' => '0', // Amount or array of costs (per item shipping) 'taxes' => '', // Pass taxes, nothing to have it calculated for you, or 'false' to calc no tax 'calc_tax' => 'per_order' // Calc tax per_order or per_item. Per item needs an array of costs - ); - - $args = wp_parse_args( $args, $defaults ); - - extract( $args ); + ) ); // Id and label are required - if ( ! $id || ! $label ) { + if ( ! $args['id'] || ! $args['label'] ) { return; } // Handle cost - $total_cost = is_array( $cost ) ? array_sum( $cost ) : $cost; + $total_cost = is_array( $args['cost'] ) ? array_sum( $args['cost'] ) : $args['cost']; + $taxes = $args['taxes']; // Taxes - if not an array and not set to false, calc tax based on cost and passed calc_tax variable // This saves shipping methods having to do complex tax calculations if ( ! is_array( $taxes ) && $taxes !== false && $total_cost > 0 && $this->is_taxable() ) { - $taxes = array(); - switch ( $calc_tax ) { - + switch ( $args['calc_tax'] ) { case "per_item" : - // If we have an array of costs we can look up each items tax class and add tax accordingly - if ( is_array( $cost ) ) { + if ( is_array( $args['cost'] ) ) { $cart = WC()->cart->get_cart(); - foreach ( $cost as $cost_key => $amount ) { - + foreach ( $args['cost'] as $cost_key => $amount ) { if ( ! isset( $cart[ $cost_key ] ) ) { continue; } - $_product = $cart[ $cost_key ]['data']; - - $rates = WC_Tax::get_shipping_tax_rates( $_product->get_tax_class() ); - $item_taxes = WC_Tax::calc_shipping_tax( $amount, $rates ); + $item_taxes = WC_Tax::calc_shipping_tax( $amount, WC_Tax::get_shipping_tax_rates( $cart[ $cost_key ]['data']->get_tax_class() ) ); // Sum the item taxes foreach ( array_keys( $taxes + $item_taxes ) as $key ) { @@ -126,10 +116,8 @@ abstract class WC_Shipping_Method extends WC_Settings_API { } // Add any cost for the order - order costs are in the key 'order' - if ( isset( $cost['order'] ) ) { - - $rates = WC_Tax::get_shipping_tax_rates(); - $item_taxes = WC_Tax::calc_shipping_tax( $cost['order'], $rates ); + if ( isset( $args['cost']['order'] ) ) { + $item_taxes = WC_Tax::calc_shipping_tax( $args['cost']['order'], WC_Tax::get_shipping_tax_rates() ); // Sum the item taxes foreach ( array_keys( $taxes + $item_taxes ) as $key ) { @@ -137,19 +125,14 @@ abstract class WC_Shipping_Method extends WC_Settings_API { } } } - break; - default : - - $rates = WC_Tax::get_shipping_tax_rates(); - $taxes = WC_Tax::calc_shipping_tax( $total_cost, $rates ); - + $taxes = WC_Tax::calc_shipping_tax( $total_cost, WC_Tax::get_shipping_tax_rates() ); break; } } - $this->rates[] = new WC_Shipping_Rate( $id, $label, $total_cost, $taxes, $this->id ); + $this->rates[] = new WC_Shipping_Rate( $args['id'], $args['label'], $total_cost, $taxes, $this->id ); } /** diff --git a/includes/admin/class-wc-admin-api-keys-table-list.php b/includes/admin/class-wc-admin-api-keys-table-list.php index 99eafd1a769..2e73f5a018c 100644 --- a/includes/admin/class-wc-admin-api-keys-table-list.php +++ b/includes/admin/class-wc-admin-api-keys-table-list.php @@ -52,7 +52,7 @@ class WC_Admin_API_Keys_Table_List extends WP_List_Table { * @return string */ public function column_cb( $key ) { - return sprintf( '', $this->_args['singular'], $key['key_id'] ); + return sprintf( '', $key['key_id'] ); } /** diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php index d20e40d1889..95c0e7cc2e0 100644 --- a/includes/admin/class-wc-admin-assets.php +++ b/includes/admin/class-wc-admin-assets.php @@ -34,27 +34,35 @@ class WC_Admin_Assets { public function admin_styles() { global $wp_scripts; - // Sitewide menu CSS - wp_enqueue_style( 'woocommerce_admin_menu_styles', WC()->plugin_url() . '/assets/css/menu.css', array(), WC_VERSION ); + $screen = get_current_screen(); + $jquery_version = isset( $wp_scripts->registered['jquery-ui-core']->ver ) ? $wp_scripts->registered['jquery-ui-core']->ver : '1.9.2'; - $screen = get_current_screen(); + // Register admin styles + wp_register_style( 'woocommerce_admin_menu_styles', WC()->plugin_url() . '/assets/css/menu.css', array(), WC_VERSION ); + wp_register_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION ); + wp_register_style( 'jquery-ui-style', '//code.jquery.com/ui/' . $jquery_version . '/themes/smoothness/jquery-ui.css', array(), $jquery_version ); + wp_register_style( 'woocommerce_admin_dashboard_styles', WC()->plugin_url() . '/assets/css/dashboard.css', array(), WC_VERSION ); + wp_register_style( 'woocommerce_admin_print_reports_styles', WC()->plugin_url() . '/assets/css/reports-print.css', array(), WC_VERSION, 'print' ); + + // Sitewide menu CSS + wp_enqueue_style( 'woocommerce_admin_menu_styles' ); if ( in_array( $screen->id, wc_get_screen_ids() ) ) { $jquery_version = isset( $wp_scripts->registered['jquery-ui-core']->ver ) ? $wp_scripts->registered['jquery-ui-core']->ver : '1.9.2'; // Admin styles for WC pages only - wp_enqueue_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION ); - wp_enqueue_style( 'jquery-ui-style', '//code.jquery.com/ui/' . $jquery_version . '/themes/smoothness/jquery-ui.css', array(), $jquery_version ); + wp_enqueue_style( 'woocommerce_admin_styles' ); + wp_enqueue_style( 'jquery-ui-style' ); wp_enqueue_style( 'wp-color-picker' ); } if ( in_array( $screen->id, array( 'dashboard' ) ) ) { - wp_enqueue_style( 'woocommerce_admin_dashboard_styles', WC()->plugin_url() . '/assets/css/dashboard.css', array(), WC_VERSION ); + wp_enqueue_style( 'woocommerce_admin_dashboard_styles' ); } if ( in_array( $screen->id, array( 'woocommerce_page_wc-reports', 'toplevel_page_wc-reports' ) ) ) { - wp_enqueue_style( 'woocommerce_admin_print_reports_styles', WC()->plugin_url() . '/assets/css/reports-print.css', array(), WC_VERSION, 'print' ); + wp_enqueue_style( 'woocommerce_admin_print_reports_styles' ); } /** @@ -84,13 +92,18 @@ class WC_Admin_Assets { wp_register_script( 'woocommerce_admin', WC()->plugin_url() . '/assets/js/admin/woocommerce_admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui', 'jquery-ui-sortable', 'jquery-ui-widget', 'jquery-ui-core', 'jquery-tiptip' ), WC_VERSION ); wp_register_script( 'jquery-blockui', WC()->plugin_url() . '/assets/js/jquery-blockui/jquery.blockUI' . $suffix . '.js', array( 'jquery' ), '2.70', true ); wp_register_script( 'jquery-tiptip', WC()->plugin_url() . '/assets/js/jquery-tiptip/jquery.tipTip' . $suffix . '.js', array( 'jquery' ), WC_VERSION, true ); - wp_register_script( 'accounting', WC()->plugin_url() . '/assets/js/admin/accounting' . $suffix . '.js', array( 'jquery' ), '0.4.2' ); - wp_register_script( 'round', WC()->plugin_url() . '/assets/js/admin/round' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); - wp_register_script( 'wc-admin-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-sortable', 'accounting', 'round', 'wc-enhanced-select', 'plupload-all', 'stupidtable' ), WC_VERSION ); + wp_register_script( 'accounting', WC()->plugin_url() . '/assets/js/accounting/accounting' . $suffix . '.js', array( 'jquery' ), '0.4.2' ); + wp_register_script( 'round', WC()->plugin_url() . '/assets/js/round/round' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); + wp_register_script( 'wc-admin-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-sortable', 'accounting', 'round', 'wc-enhanced-select', 'plupload-all', 'stupidtable', 'jquery-tiptip' ), WC_VERSION ); wp_register_script( 'zeroclipboard', WC()->plugin_url() . '/assets/js/zeroclipboard/jquery.zeroclipboard' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); wp_register_script( 'qrcode', WC()->plugin_url() . '/assets/js/jquery-qrcode/jquery.qrcode' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); wp_register_script( 'stupidtable', WC()->plugin_url() . '/assets/js/stupidtable/stupidtable' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); wp_register_script( 'serializejson', WC()->plugin_url() . '/assets/js/jquery-serializejson/jquery.serializejson' . $suffix . '.js', array( 'jquery' ), '2.6.1' ); + wp_register_script( 'flot', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); + wp_register_script( 'flot-resize', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.resize' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); + wp_register_script( 'flot-time', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.time' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); + wp_register_script( 'flot-pie', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.pie' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); + wp_register_script( 'flot-stack', WC()->plugin_url() . '/assets/js/jquery-flot/jquery.flot.stack' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); // Chosen is @deprecated (2.3) in favour of select2, but is registered for backwards compat wp_register_script( 'ajax-chosen', WC()->plugin_url() . '/assets/js/chosen/ajax-chosen.jquery' . $suffix . '.js', array( 'jquery', 'chosen' ), WC_VERSION ); @@ -153,14 +166,18 @@ class WC_Admin_Assets { // Products if ( in_array( $screen->id, array( 'edit-product' ) ) ) { - wp_enqueue_script( 'woocommerce_quick-edit', WC()->plugin_url() . '/assets/js/admin/quick-edit' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); + wp_register_script( 'woocommerce_quick-edit', WC()->plugin_url() . '/assets/js/admin/quick-edit' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); + wp_enqueue_script( 'woocommerce_quick-edit' ); } // Meta boxes if ( in_array( $screen->id, array( 'product', 'edit-product' ) ) ) { wp_enqueue_media(); - wp_enqueue_script( 'wc-admin-product-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); - wp_enqueue_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson' ), WC_VERSION ); + wp_register_script( 'wc-admin-product-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); + wp_register_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson' ), WC_VERSION ); + + wp_enqueue_script( 'wc-admin-product-meta-boxes' ); + wp_enqueue_script( 'wc-admin-variation-meta-boxes' ); $params = array( 'post_id' => isset( $post->ID ) ? $post->ID : '', @@ -190,14 +207,17 @@ class WC_Admin_Assets { 'i18n_edited_variations' => esc_js( __( 'Save changes before changing page?', 'woocommerce' ) ), 'i18n_variation_count_single' => esc_js( __( '%qty% variation', 'woocommerce' ) ), 'i18n_variation_count_plural' => esc_js( __( '%qty% variations', 'woocommerce' ) ), - 'variations_per_page' => absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 10 ) ) + 'variations_per_page' => absint( apply_filters( 'woocommerce_admin_meta_boxes_variations_per_page', 15 ) ) ); wp_localize_script( 'wc-admin-variation-meta-boxes', 'woocommerce_admin_meta_boxes_variations', $params ); } if ( in_array( str_replace( 'edit-', '', $screen->id ), wc_get_order_types( 'order-meta-boxes' ) ) ) { - wp_enqueue_script( 'wc-admin-order-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-order' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); - wp_enqueue_script( 'wc-admin-order-meta-boxes-modal', WC()->plugin_url() . '/assets/js/admin/order-backbone-modal' . $suffix . '.js', array( 'underscore', 'backbone', 'wc-admin-order-meta-boxes' ), WC_VERSION ); + wp_register_script( 'wc-admin-order-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-order' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); + wp_register_script( 'wc-admin-order-meta-boxes-modal', WC()->plugin_url() . '/assets/js/admin/order-backbone-modal' . $suffix . '.js', array( 'underscore', 'backbone', 'wp-util', 'wc-admin-order-meta-boxes' ), WC_VERSION ); + + wp_enqueue_script( 'wc-admin-order-meta-boxes' ); + wp_enqueue_script( 'wc-admin-order-meta-boxes-modal' ); $params = array( 'countries' => json_encode( array_merge( WC()->countries->get_allowed_country_states(), WC()->countries->get_shipping_country_states() ) ), @@ -207,7 +227,8 @@ class WC_Admin_Assets { wp_localize_script( 'wc-admin-order-meta-boxes', 'woocommerce_admin_meta_boxes_order', $params ); } if ( in_array( $screen->id, array( 'shop_coupon', 'edit-shop_coupon' ) ) ) { - wp_enqueue_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); + wp_register_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); + wp_enqueue_script( 'wc-admin-coupon-meta-boxes' ); } if ( in_array( str_replace( 'edit-', '', $screen->id ), array_merge( array( 'shop_coupon', 'product' ), wc_get_order_types( 'order-meta-boxes' ) ) ) ) { $params = array( @@ -284,22 +305,26 @@ class WC_Admin_Assets { // Product sorting - only when sorting by menu order on the products page if ( current_user_can( 'edit_others_pages' ) && $screen->id == 'edit-product' && isset( $wp_query->query['orderby'] ) && $wp_query->query['orderby'] == 'menu_order title' ) { - wp_enqueue_script( 'woocommerce_product_ordering', WC()->plugin_url() . '/assets/js/admin/product-ordering' . $suffix . '.js', array( 'jquery-ui-sortable' ), WC_VERSION, true ); + wp_register_script( 'woocommerce_product_ordering', WC()->plugin_url() . '/assets/js/admin/product-ordering' . $suffix . '.js', array( 'jquery-ui-sortable' ), WC_VERSION, true ); + wp_enqueue_script( 'woocommerce_product_ordering' ); } // Reports Pages if ( in_array( $screen->id, apply_filters( 'woocommerce_reports_screen_ids', array( $wc_screen_id . '_page_wc-reports', 'toplevel_page_wc-reports', 'dashboard' ) ) ) ) { - wp_enqueue_script( 'wc-reports', WC()->plugin_url() . '/assets/js/admin/reports' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker' ), WC_VERSION ); - wp_enqueue_script( 'flot', WC()->plugin_url() . '/assets/js/admin/jquery.flot' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); - wp_enqueue_script( 'flot-resize', WC()->plugin_url() . '/assets/js/admin/jquery.flot.resize' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); - wp_enqueue_script( 'flot-time', WC()->plugin_url() . '/assets/js/admin/jquery.flot.time' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); - wp_enqueue_script( 'flot-pie', WC()->plugin_url() . '/assets/js/admin/jquery.flot.pie' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); - wp_enqueue_script( 'flot-stack', WC()->plugin_url() . '/assets/js/admin/jquery.flot.stack' . $suffix . '.js', array( 'jquery', 'flot' ), WC_VERSION ); + wp_register_script( 'wc-reports', WC()->plugin_url() . '/assets/js/admin/reports' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker' ), WC_VERSION ); + + wp_enqueue_script( 'wc-reports' ); + wp_enqueue_script( 'flot' ); + wp_enqueue_script( 'flot-resize' ); + wp_enqueue_script( 'flot-time' ); + wp_enqueue_script( 'flot-pie' ); + wp_enqueue_script( 'flot-stack' ); } // API settings if ( $wc_screen_id . '_page_wc-settings' === $screen->id && isset( $_GET['section'] ) && 'keys' == $_GET['section'] ) { - wp_enqueue_script( 'wc-api-keys', WC()->plugin_url() . '/assets/js/admin/api-keys' . $suffix . '.js', array( 'jquery', 'woocommerce_admin', 'underscore', 'backbone', 'wp-util', 'qrcode', 'zeroclipboard' ), WC_VERSION, true ); + wp_register_script( 'wc-api-keys', WC()->plugin_url() . '/assets/js/admin/api-keys' . $suffix . '.js', array( 'jquery', 'woocommerce_admin', 'underscore', 'backbone', 'wp-util', 'qrcode', 'zeroclipboard' ), WC_VERSION, true ); + wp_enqueue_script( 'wc-api-keys' ); wp_localize_script( 'wc-api-keys', 'woocommerce_admin_api_keys', @@ -316,7 +341,8 @@ class WC_Admin_Assets { } if ( in_array( $screen->id, array( 'user-edit', 'profile' ) ) ) { - wp_enqueue_script( 'wc-users', WC()->plugin_url() . '/assets/js/admin/users' . $suffix . '.js', array( 'jquery', 'wc-enhanced-select' ), WC_VERSION, true ); + wp_register_script( 'wc-users', WC()->plugin_url() . '/assets/js/admin/users' . $suffix . '.js', array( 'jquery', 'wc-enhanced-select' ), WC_VERSION, true ); + wp_enqueue_script( 'wc-users' ); wp_localize_script( 'wc-users', 'wc_users_params', diff --git a/includes/admin/class-wc-admin-help.php b/includes/admin/class-wc-admin-help.php index 78a8a81bada..6fe257fc494 100644 --- a/includes/admin/class-wc-admin-help.php +++ b/includes/admin/class-wc-admin-help.php @@ -164,7 +164,7 @@ class WC_Admin_Help { 'title' => __( 'WooCommerce 101', 'woocommerce' ), 'content' => '
' . __( 'WooCommerce 101', 'woocommerce' ) . ' – ' . esc_html( $video_map[ $video_key ]['title'] ) . '
' . - '' + '' ) ); } diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php index 08f02b9c160..e82ea175aa8 100644 --- a/includes/admin/class-wc-admin-post-types.php +++ b/includes/admin/class-wc-admin-post-types.php @@ -81,6 +81,7 @@ class WC_Admin_Post_Types { add_filter( 'enter_title_here', array( $this, 'enter_title_here' ), 1, 2 ); add_action( 'edit_form_after_title', array( $this, 'edit_form_after_title' ) ); add_filter( 'media_view_strings', array( $this, 'change_insert_into_post' ) ); + add_filter( 'default_hidden_meta_boxes', array( $this, 'hidden_meta_boxes' ), 10, 2 ); add_action( 'post_submitbox_misc_actions', array( $this, 'product_data_visibility' ) ); // Uploads @@ -99,6 +100,12 @@ class WC_Admin_Post_Types { // Disable DFW feature pointer add_action( 'admin_footer', array( $this, 'disable_dfw_feature_pointer' ) ); + + // If first time editing, disable columns by default. + if ( false === get_user_option( 'manageedit-shop_ordercolumnshidden' ) ) { + $user = wp_get_current_user(); + update_user_option( $user->ID, 'manageedit-shop_ordercolumnshidden', array( 0 => 'billing_address' ), true ); + } } /** @@ -260,6 +267,7 @@ class WC_Admin_Post_Types { $columns['order_status'] = '' . esc_attr__( 'Status', 'woocommerce' ) . ''; $columns['order_title'] = __( 'Order', 'woocommerce' ); $columns['order_items'] = __( 'Purchased', 'woocommerce' ); + $columns['billing_address'] = __( 'Billing', 'woocommerce' ); $columns['shipping_address'] = __( 'Ship to', 'woocommerce' ); $columns['customer_message'] = '' . esc_attr__( 'Customer Message', 'woocommerce' ) . ''; $columns['order_notes'] = '' . esc_attr__( 'Order Notes', 'woocommerce' ) . ''; @@ -657,6 +665,19 @@ class WC_Admin_Post_Types { } else echo '–'; break; + case 'billing_address' : + + if ( $address = $the_order->get_formatted_billing_address() ) { + echo esc_html( preg_replace( '#'; - } - - if ( $the_order->billing_phone ) { - $customer_tip[] = __( 'Tel:', 'woocommerce' ) . ' ' . $the_order->billing_phone; - } - - echo '", $customer_tip ) ) . '">'; - if ( $the_order->user_id ) { $user_info = get_userdata( $the_order->user_id ); } @@ -753,7 +758,7 @@ class WC_Admin_Post_Types { echo '' . esc_html( $the_order->billing_email ) . ''; } - echo ''; + echo ''; break; case 'order_actions' : @@ -1446,7 +1451,7 @@ class WC_Admin_Post_Types { foreach ( $post_ids as $post_id ) { $order = wc_get_order( $post_id ); - $order->update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ) ); + $order->update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ), true ); do_action( 'woocommerce_order_edit_status', $post_id, $new_status ); $changed++; } @@ -2036,7 +2041,6 @@ class WC_Admin_Post_Types { /** * Change title boxes in admin. - * * @param string $text * @param object $post * @return string @@ -2055,11 +2059,10 @@ class WC_Admin_Post_Types { } /** - * Print coupon description textarea field - * + * Print coupon description textarea field. * @param WP_Post $post */ - public function edit_form_after_title( $post ) { + public function edit_form_after_title( $post ) { if ( 'shop_coupon' === $post->post_type ) { ?> @@ -2069,8 +2072,7 @@ class WC_Admin_Post_Types { /** * Change label for insert buttons. - * - * @param array $strings + * @param array $strings * @return array */ public function change_insert_into_post( $strings ) { @@ -2086,6 +2088,20 @@ class WC_Admin_Post_Types { return $strings; } + /** + * Hidden default Meta-Boxes. + * @param array $hidden + * @param object $screen + * @return array + */ + public function hidden_meta_boxes( $hidden, $screen ) { + if ( 'product' === $screen->post_type && 'post' === $screen->base ) { + $hidden = array_merge( $hidden, array( 'postcustom' ) ); + } + + return $hidden; + } + /** * Output product visibility options. */ @@ -2123,7 +2139,7 @@ class WC_Admin_Post_Types { ' . __( 'Define the loops this product should be visible in. The product will still be accessible directly.', 'woocommerce' ) . ''; + echo '
' . __( 'Choose where this product should be displayed in your catalog. The product will always be accessible directly.', 'woocommerce' ) . '
'; foreach ( $visibility_options as $name => $label ) { echo ''; @@ -2205,7 +2221,7 @@ class WC_Admin_Post_Types { foreach ( $existing_permissions as $existing_permission ) { $order = wc_get_order( $existing_permission->order_id ); - if ( $order->id ) { + if ( ! empty( $order->id ) ) { // Remove permissions if ( ! empty( $removed_download_ids ) ) { foreach ( $removed_download_ids as $download_id ) { @@ -2221,7 +2237,7 @@ class WC_Admin_Post_Types { if ( apply_filters( 'woocommerce_process_product_file_download_paths_grant_access_to_new_file', true, $download_id, $product_id, $order ) ) { // grant permission if it doesn't already exist - if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT 1 FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE order_id = %d AND product_id = %d AND download_id = %s", $order->id, $product_id, $download_id ) ) ) { + if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT 1=1 FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions WHERE order_id = %d AND product_id = %d AND download_id = %s", $order->id, $product_id, $download_id ) ) ) { wc_downloadable_file_permission( $download_id, $product_id, $order ); } } diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php index e87fe24f918..5bc2ccedba4 100644 --- a/includes/admin/class-wc-admin-settings.php +++ b/includes/admin/class-wc-admin-settings.php @@ -690,6 +690,7 @@ class WC_Admin_Settings { $value = array_filter( array_map( 'wc_clean', (array) $raw_value ) ); break; case 'image_width' : + $value = array(); if ( isset( $raw_value['width'] ) ) { $value['width'] = wc_clean( $raw_value['width'] ); $value['height'] = wc_clean( $raw_value['height'] ); @@ -767,7 +768,7 @@ class WC_Admin_Settings { public static function check_download_folder_protection() { $upload_dir = wp_upload_dir(); $downloads_url = $upload_dir['basedir'] . '/woocommerce_uploads'; - $download_method = get_option('woocommerce_file_download_method'); + $download_method = get_option( 'woocommerce_file_download_method' ); if ( 'redirect' == $download_method ) { diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php index 9d556103b50..264d3808286 100644 --- a/includes/admin/class-wc-admin-setup-wizard.php +++ b/includes/admin/class-wc-admin-setup-wizard.php @@ -26,10 +26,8 @@ class WC_Admin_Setup_Wizard { /** @var array Tweets user can optionally send after install */ private $tweets = array( - 'WooCommerce kickstarts online stores. It\'s free and has been downloaded over 6 million times.', - 'Building an online store? WooCommerce is the leading #eCommerce plugin for WordPress (and it\'s free).', - 'WooCommerce is a free #eCommerce plugin for #WordPress for selling #allthethings online, beautifully.', - 'Ready to ship your idea? WooCommerce is the fastest growing #eCommerce plugin for WordPress on the web' + 'Someone give me woo-t, I just set up a new store with #WordPress and @WooCommerce!', + 'Someone give me high five, I just set up a new store with #WordPress and @WooCommerce!' ); /** @@ -91,6 +89,7 @@ class WC_Admin_Setup_Wizard { $this->step = isset( $_GET['step'] ) ? sanitize_key( $_GET['step'] ) : current( array_keys( $this->steps ) ); $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + wp_register_script( 'jquery-blockui', WC()->plugin_url() . '/assets/js/jquery-blockui/jquery.blockUI' . $suffix . '.js', array( 'jquery' ), '2.70', true ); wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2' . $suffix . '.js', array( 'jquery' ), '3.5.2' ); wp_register_script( 'wc-enhanced-select', WC()->plugin_url() . '/assets/js/admin/wc-enhanced-select' . $suffix . '.js', array( 'jquery', 'select2' ), WC_VERSION ); wp_localize_script( 'wc-enhanced-select', 'wc_enhanced_select_params', array( @@ -113,7 +112,7 @@ class WC_Admin_Setup_Wizard { wp_enqueue_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION ); wp_enqueue_style( 'wc-setup', WC()->plugin_url() . '/assets/css/wc-setup.css', array( 'dashicons', 'install' ), WC_VERSION ); - wp_register_script( 'wc-setup', WC()->plugin_url() . '/assets/js/admin/wc-setup.min.js', array( 'jquery', 'wc-enhanced-select' ), WC_VERSION ); + wp_register_script( 'wc-setup', WC()->plugin_url() . '/assets/js/admin/wc-setup.min.js', array( 'jquery', 'wc-enhanced-select', 'jquery-blockui' ), WC_VERSION ); wp_localize_script( 'wc-setup', 'wc_setup_params', array( 'locale_info' => json_encode( include( WC()->plugin_path() . '/i18n/locale-info.php' ) ) ) ); @@ -132,7 +131,7 @@ class WC_Admin_Setup_Wizard { public function get_next_step_link() { $keys = array_keys( $this->steps ); - return add_query_arg( 'step', $keys[ array_search( $this->step, array_keys( $this->steps ) ) + 1 ] ); + return add_query_arg( 'step', $keys[ array_search( $this->step, array_keys( $this->steps ) ) + 1 ], remove_query_arg( 'translation_updated' ) ); } /** @@ -147,7 +146,8 @@ class WC_Admin_Setup_Wizard {
->plugin_url(); ?>/assets/images/woocommerce_logo.png){kind=logo}
It’s completely optional and shouldn’t take longer than five minutes.', 'woocommerce' ); ?>
Menus%s.', 'woocommerce' ), '', '', '', '' ); ?> @@ -269,7 +283,7 @@ class WC_Admin_Setup_Wizard { check_admin_referer( 'wc-setup' ); WC_Install::create_pages(); - wp_redirect( $this->get_next_step_link() ); + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); exit; } @@ -285,8 +299,8 @@ class WC_Admin_Setup_Wizard { // Defaults $currency = get_option( 'woocommerce_currency', 'GBP' ); $currency_pos = get_option( 'woocommerce_currency_pos', 'left' ); - $decimal_sep = get_option( 'woocommerce_decimal_sep', '.' ); - $thousand_sep = get_option( 'woocommerce_thousand_sep', ',' ); + $decimal_sep = get_option( 'woocommerce_price_decimal_sep', '.' ); + $thousand_sep = get_option( 'woocommerce_price_thousand_sep', ',' ); $dimension_unit = get_option( 'woocommerce_dimension_unit', 'cm' ); $weight_unit = get_option( 'woocommerce_weight_unit', 'kg' ); ?> @@ -363,8 +377,8 @@ class WC_Admin_Setup_Wizard { @@ -388,12 +402,12 @@ class WC_Admin_Setup_Wizard { update_option( 'woocommerce_default_country', $store_location ); update_option( 'woocommerce_currency', $currency_code ); update_option( 'woocommerce_currency_pos', $currency_pos ); - update_option( 'woocommerce_decimal_sep', $decimal_sep ); - update_option( 'woocommerce_thousand_sep', $thousand_sep ); + update_option( 'woocommerce_price_decimal_sep', $decimal_sep ); + update_option( 'woocommerce_price_thousand_sep', $thousand_sep ); update_option( 'woocommerce_weight_unit', $weight_unit ); update_option( 'woocommerce_dimension_unit', $dimension_unit ); - wp_redirect( $this->get_next_step_link() ); + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); exit; } @@ -520,8 +534,8 @@ class WC_Admin_Setup_Wizard { ?> @@ -548,7 +562,7 @@ class WC_Admin_Setup_Wizard { // Init rate and settings $shipping_method = new WC_Shipping_Flat_Rate(); $costs = array(); - $costs[] = woocommerce_format_decimal( sanitize_text_field( $_POST['shipping_cost_domestic'] ) ); + $costs[] = wc_format_decimal( sanitize_text_field( $_POST['shipping_cost_domestic'] ) ); if ( $item_cost = sanitize_text_field( $_POST['shipping_cost_domestic_item'] ) ) { $costs[] = $item_cost . ' * [qty]'; } @@ -568,7 +582,7 @@ class WC_Admin_Setup_Wizard { // Init rate and settings $shipping_method = new WC_Shipping_International_Delivery(); $costs = array(); - $costs[] = woocommerce_format_decimal( sanitize_text_field( $_POST['shipping_cost_international'] ) ); + $costs[] = wc_format_decimal( sanitize_text_field( $_POST['shipping_cost_international'] ) ); if ( $item_cost = sanitize_text_field( $_POST['shipping_cost_international_item'] ) ) { $costs[] = $item_cost . ' * [qty]'; } @@ -618,7 +632,7 @@ class WC_Admin_Setup_Wizard { } } - wp_redirect( $this->get_next_step_link() ); + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); exit; } @@ -633,7 +647,7 @@ class WC_Admin_Setup_Wizard { ?> @@ -706,7 +720,7 @@ class WC_Admin_Setup_Wizard { update_option( 'woocommerce_cod_settings', $cod_settings ); update_option( 'woocommerce_bacs_settings', $bacs_settings ); - wp_redirect( $this->get_next_step_link() ); + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); exit; } diff --git a/includes/admin/class-wc-admin-status.php b/includes/admin/class-wc-admin-status.php index d2e35032530..a7af6648652 100644 --- a/includes/admin/class-wc-admin-status.php +++ b/includes/admin/class-wc-admin-status.php @@ -143,24 +143,7 @@ class WC_Admin_Status { // Manual translation update messages if ( isset( $_GET['translation_updated'] ) ) { - switch ( $_GET['translation_updated'] ) { - case 2 : - echo '' . __( 'Failed to install/update the translation:', 'woocommerce' ) . ' ' . __( 'Seems you don\'t have permission to do this!', 'woocommerce' ) . '
' . __( 'Failed to install/update the translation:', 'woocommerce' ) . ' ' . sprintf( __( 'An authentication error occurred while updating the translation. Please try again or configure your %sUpgrade Constants%s.', 'woocommerce' ), '', '' ) . '
' . __( 'Failed to install/update the translation:', 'woocommerce' ) . ' ' . __( 'Sorry but there is no translation available for your language =/', 'woocommerce' ) . '
' . __( 'Translations installed/updated successfully!', 'woocommerce' ) . '
-
+
labels->singular_name, $order->get_order_number() ) ); ?>
+labels->singular_name, $order->get_order_number() ) ); ?>
customer_user ) ) { $user_id = absint( $order->customer_user ); $user = get_user_by( 'id', $user_id ); - $user_string = esc_html( $user->display_name ) . ' (#' . absint( $user->ID ) . ' – ' . esc_html( $user->user_email ); + $user_string = esc_html( $user->display_name ) . ' (#' . absint( $user->ID ) . ' – ' . esc_html( $user->user_email ) . ')'; } ?> @@ -450,17 +450,16 @@ class WC_Meta_Box_Order_Data { $date = strtotime( $_POST['order_date'] . ' ' . (int) $_POST['order_date_hour'] . ':' . (int) $_POST['order_date_minute'] . ':00' ); } - // Order data saved, now get it so we can manipulate status - $order = wc_get_order( $post_id ); - - // Order status - $order->update_status( $_POST['order_status'] ); - - // Finally, set the date $date = date_i18n( 'Y-m-d H:i:s', $date ); $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_date = %s, post_date_gmt = %s WHERE ID = %s", $date, get_gmt_from_date( $date ), $post_id ) ); + // Order data saved, now get it so we can manipulate status + $order = wc_get_order( $post_id ); + + // Order status + $order->update_status( $_POST['order_status'], '', true ); + wc_delete_shop_order_transients( $post_id ); } } diff --git a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php index 25230ce667e..51348a7e445 100644 --- a/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php +++ b/includes/admin/meta-boxes/class-wc-meta-box-order-notes.php @@ -44,9 +44,10 @@ class WC_Meta_Box_Order_Notes { foreach( $notes as $note ) { $note_classes = get_comment_meta( $note->comment_ID, 'is_customer_note', true ) ? array( 'customer-note', 'note' ) : array( 'note' ); - + $note_classes = apply_filters( 'woocommerce_order_note_class', $note_classes, $note ); + ?> -
comment_content ) ) ); ?>
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
index 5a2ac3105a2..3bab2eb6453 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-data.php
@@ -252,24 +252,35 @@ class WC_Meta_Box_Product_Data {
echo '