' + error_message + '
' );
wc_checkout_form.$checkout_form.removeClass( 'processing' ).unblock();
wc_checkout_form.$checkout_form.find( '.input-text, select, input:checkbox' ).blur();
$( 'html, body' ).animate({
diff --git a/assets/js/frontend/checkout.min.js b/assets/js/frontend/checkout.min.js
index 3d3487f88f0..ad762a2d43a 100644
--- a/assets/js/frontend/checkout.min.js
+++ b/assets/js/frontend/checkout.min.js
@@ -1 +1 @@
-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.$checkout_form.on("click",'input[name="payment_method"]',this.payment_method_selected),a(document.body).hasClass("woocommerce-order-pay")&&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, input:checkbox",this.validate_field),this.$checkout_form.on("update",this.trigger_update_checkout),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"], .update_totals_on_change input[type="checkbox"]',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("change 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.$checkout_form.find("#ship-to-different-address input").change(),this.init_payment_methods(),"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()},init_payment_methods:function(b){var c=a(".woocommerce-checkout").find('input[name="payment_method"]');1===c.length&&c.eq(0).hide(),b&&a("#"+b).prop("checked",!0),0===c.filter(":checked").length&&c.eq(0).prop("checked",!0),c.filter(":checked").eq(0).trigger("click")},get_payment_method:function(){return b.$checkout_form.find('input[name="payment_method"]:checked').val()},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"))},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||(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).length){var d=a(b.dirtyInput).closest("div").find(".address-field.validate-required");d.length&&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()},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")&&("checkbox"!==b.attr("type")||b.is(":checked")?""===b.val()&&(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),d=!1):(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(a,c){b.reset_update_checkout_timer(),b.updateTimer=setTimeout(b.update_checkout_action,"5",c)},update_checkout_action:function(c){if(b.xhr&&b.xhr.abort(),0!==a("form.checkout").length){c="undefined"!=typeof c?c:{update_shipping_method:!0};var d=a("#billing_country").val(),e=a("#billing_state").val(),f=a("input#billing_postcode").val(),g=a("#billing_city").val(),h=a("input#billing_address_1").val(),i=a("input#billing_address_2").val(),j=d,k=e,l=f,m=g,n=h,o=i;a("#ship-to-different-address").find("input").is(":checked")&&(j=a("#shipping_country").val(),k=a("#shipping_state").val(),l=a("input#shipping_postcode").val(),m=a("#shipping_city").val(),n=a("input#shipping_address_1").val(),o=a("input#shipping_address_2").val());var p={security:wc_checkout_params.update_order_review_nonce,payment_method:b.get_payment_method(),country:d,state:e,postcode:f,city:g,address:h,address_2:i,s_country:j,s_state:k,s_postcode:l,s_city:m,s_address:n,s_address_2:o,post_data:a("form.checkout").serialize()};if(!1!==c.update_shipping_method){var q={};a('select.shipping_method, input[name^="shipping_method"][type="radio"]:checked, input[name^="shipping_method"][type="hidden"]').each(function(){q[a(this).data("index")]=a(this).val()}),p.shipping_method=q}a(".woocommerce-checkout-payment, .woocommerce-checkout-review-order-table").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),b.xhr=a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","update_order_review"),data:p,success:function(c){var d=a('.woocommerce-checkout input[name="payment_method"]:checked').attr("id");if("true"===c.reload)return void window.location.reload();a(".woocommerce-NoticeGroup-updateOrderReview").remove();var e=a("#terms").prop("checked");if(c&&c.fragments&&a.each(c.fragments,function(b,c){a(b).replaceWith(c),a(b).unblock()}),e&&a("#terms").prop("checked",!0),"failure"===c.result){var f=a("form.checkout");a(".woocommerce-error, .woocommerce-message").remove(),c.messages?f.prepend(''+c.messages+"
"):f.prepend(c),f.find(".input-text, select, input:checkbox").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3)}b.init_payment_methods(d),a(document.body).trigger("updated_checkout",[c])}})}},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_"+b.get_payment_method())!==!1){c.addClass("processing");var d=c.data();1!==d["blockUI.isBlocked"]&&c.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajaxSetup({dataFilter:function(b,c){if("json"!==c)return b;try{var d=a.parseJSON(b);if(d&&"object"==typeof d)return b}catch(a){var e=b.match(/{"result.*"}/);null===e?console.log("Unable to fix malformed JSON"):(console.log("Fixed malformed JSON. Original:"),console.log(b),b=e[0])}return b}}),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, input:checkbox").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",{update_shipping_method:!1}))},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",{update_shipping_method:!1}),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, form.woocommerce-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.$checkout_form.on("click",'input[name="payment_method"]',this.payment_method_selected),a(document.body).hasClass("woocommerce-order-pay")&&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, input:checkbox",this.validate_field),this.$checkout_form.on("update",this.trigger_update_checkout),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"], .update_totals_on_change input[type="checkbox"]',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("change 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.$checkout_form.find("#ship-to-different-address input").change(),this.init_payment_methods(),"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()},init_payment_methods:function(b){var c=a(".woocommerce-checkout").find('input[name="payment_method"]');1===c.length&&c.eq(0).hide(),b&&a("#"+b).prop("checked",!0),0===c.filter(":checked").length&&c.eq(0).prop("checked",!0),c.filter(":checked").eq(0).trigger("click")},get_payment_method:function(){return b.$checkout_form.find('input[name="payment_method"]:checked').val()},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"))},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||(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).length){var d=a(b.dirtyInput).closest("div").find(".address-field.validate-required");d.length&&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()},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")&&("checkbox"!==b.attr("type")||b.is(":checked")?""===b.val()&&(c.removeClass("woocommerce-validated").addClass("woocommerce-invalid woocommerce-invalid-required-field"),d=!1):(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(a,c){b.reset_update_checkout_timer(),b.updateTimer=setTimeout(b.update_checkout_action,"5",c)},update_checkout_action:function(c){if(b.xhr&&b.xhr.abort(),0!==a("form.checkout").length){c="undefined"!=typeof c?c:{update_shipping_method:!0};var d=a("#billing_country").val(),e=a("#billing_state").val(),f=a("input#billing_postcode").val(),g=a("#billing_city").val(),h=a("input#billing_address_1").val(),i=a("input#billing_address_2").val(),j=d,k=e,l=f,m=g,n=h,o=i;a("#ship-to-different-address").find("input").is(":checked")&&(j=a("#shipping_country").val(),k=a("#shipping_state").val(),l=a("input#shipping_postcode").val(),m=a("#shipping_city").val(),n=a("input#shipping_address_1").val(),o=a("input#shipping_address_2").val());var p={security:wc_checkout_params.update_order_review_nonce,payment_method:b.get_payment_method(),country:d,state:e,postcode:f,city:g,address:h,address_2:i,s_country:j,s_state:k,s_postcode:l,s_city:m,s_address:n,s_address_2:o,post_data:a("form.checkout").serialize()};if(!1!==c.update_shipping_method){var q={};a('select.shipping_method, input[name^="shipping_method"][type="radio"]:checked, input[name^="shipping_method"][type="hidden"]').each(function(){q[a(this).data("index")]=a(this).val()}),p.shipping_method=q}a(".woocommerce-checkout-payment, .woocommerce-checkout-review-order-table").block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),b.xhr=a.ajax({type:"POST",url:wc_checkout_params.wc_ajax_url.toString().replace("%%endpoint%%","update_order_review"),data:p,success:function(c){var d=a('.woocommerce-checkout input[name="payment_method"]:checked').attr("id");if("true"===c.reload)return void window.location.reload();a(".woocommerce-NoticeGroup-updateOrderReview").remove();var e=a("#terms").prop("checked"),f={};if(a(".payment_box input").each(function(){var b=a(this).attr("id");b&&(a.inArray(a(this).attr("type"),["checkbox","radio"])!==-1?f[b]=a(this).prop("checked"):f[b]=a(this).val())}),c&&c.fragments&&a.each(c.fragments,function(b,c){a(b).replaceWith(c),a(b).unblock()}),e&&a("#terms").prop("checked",!0),a.isEmptyObject(f)||a(".payment_box input").each(function(){var b=a(this).attr("id");b&&(a.inArray(a(this).attr("type"),["checkbox","radio"])!==-1?a(this).prop("checked",f[b]).change():a(this).val(f[b]).change())}),"failure"===c.result){var g=a("form.checkout");a(".woocommerce-error, .woocommerce-message").remove(),c.messages?g.prepend(''+c.messages+"
"):g.prepend(c),g.find(".input-text, select, input:checkbox").blur(),a("html, body").animate({scrollTop:a("form.checkout").offset().top-100},1e3)}b.init_payment_methods(d),a(document.body).trigger("updated_checkout",[c])}})}},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_"+b.get_payment_method())!==!1){c.addClass("processing");var d=c.data();1!==d["blockUI.isBlocked"]&&c.block({message:null,overlayCSS:{background:"#fff",opacity:.6}}),a.ajaxSetup({dataFilter:function(b,c){if("json"!==c)return b;try{var d=a.parseJSON(b);if(d&&"object"==typeof d)return b}catch(a){var e=b.match(/{"result.*"}/);null===e?console.log("Unable to fix malformed JSON"):(console.log("Fixed malformed JSON. Original:"),console.log(b),b=e[0])}return b}}),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, input:checkbox").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",{update_shipping_method:!1}))},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",{update_shipping_method:!1}),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, form.woocommerce-form--login").slideToggle(),!1}};b.init(),c.init(),d.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/country-select.js b/assets/js/frontend/country-select.js
index 683575ef69c..cea40b35d07 100644
--- a/assets/js/frontend/country-select.js
+++ b/assets/js/frontend/country-select.js
@@ -8,53 +8,48 @@ jQuery( function( $ ) {
function getEnhancedSelectFormatString() {
var formatString = {
- formatMatches: function( matches ) {
- if ( 1 === matches ) {
- return wc_country_select_params.i18n_matches_1;
- }
-
- return wc_country_select_params.i18n_matches_n.replace( '%qty%', matches );
- },
- formatNoMatches: function() {
+ noResults: function() {
return wc_country_select_params.i18n_no_matches;
},
- formatAjaxError: function() {
+ errorLoading: function() {
return wc_country_select_params.i18n_ajax_error;
},
- formatInputTooShort: function( input, min ) {
- var number = min - input.length;
+ inputTooShort: function( args ) {
+ var remainingChars = args.minimum - args.input.length;
- if ( 1 === number ) {
+ if ( 1 === remainingChars ) {
return wc_country_select_params.i18n_input_too_short_1;
}
- return wc_country_select_params.i18n_input_too_short_n.replace( '%qty%', number );
+ return wc_country_select_params.i18n_input_too_short_n.replace( '%qty%', remainingChars );
},
- formatInputTooLong: function( input, max ) {
- var number = input.length - max;
+ inputTooLong: function( args ) {
+ var overChars = args.input.length - args.maximum;
- if ( 1 === number ) {
+ if ( 1 === overChars ) {
return wc_country_select_params.i18n_input_too_long_1;
}
- return wc_country_select_params.i18n_input_too_long_n.replace( '%qty%', number );
+ return wc_country_select_params.i18n_input_too_long_n.replace( '%qty%', overChars );
},
- formatSelectionTooBig: function( limit ) {
- if ( 1 === limit ) {
+ maximumSelected: function( args ) {
+ if ( 1 === args.maximum ) {
return wc_country_select_params.i18n_selection_too_long_1;
}
- return wc_country_select_params.i18n_selection_too_long_n.replace( '%qty%', limit );
+ return wc_country_select_params.i18n_selection_too_long_n.replace( '%qty%', args.maximum );
},
- formatLoadMore: function() {
+ loadingMore: function() {
return wc_country_select_params.i18n_load_more;
},
- formatSearching: function() {
+ searching: function() {
return wc_country_select_params.i18n_searching;
}
};
-
- return formatString;
+
+ var language = { 'language' : formatString };
+
+ return language;
}
// Select2 Enhancement if it exists
diff --git a/assets/js/frontend/country-select.min.js b/assets/js/frontend/country-select.min.js
index aebdb179ae2..ca75d4a2536 100644
--- a/assets/js/frontend/country-select.min.js
+++ b/assets/js/frontend/country-select.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){var a={formatMatches:function(a){return 1===a?wc_country_select_params.i18n_matches_1:wc_country_select_params.i18n_matches_n.replace("%qty%",a)},formatNoMatches:function(){return wc_country_select_params.i18n_no_matches},formatAjaxError:function(){return wc_country_select_params.i18n_ajax_error},formatInputTooShort:function(a,b){var c=b-a.length;return 1===c?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",c)},formatInputTooLong:function(a,b){var c=a.length-b;return 1===c?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",c)},formatSelectionTooBig:function(a){return 1===a?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",a)},formatLoadMore:function(){return wc_country_select_params.i18n_load_more},formatSearching:function(){return wc_country_select_params.i18n_searching}};return a}if("undefined"==typeof wc_country_select_params)return!1;if(a().select2){var c=function(){a("select.country_select:visible, select.state_select:visible").each(function(){var c=a.extend({placeholderOption:"first",width:"100%"},b());a(this).select2(c)})};c(),a(document.body).bind("country_to_state_changed",function(){c()})}var d=wc_country_select_params.countries.replace(/"/g,'"'),e=a.parseJSON(d);a(document.body).on("change","select.country_to_state, input.country_to_state",function(){var b=a(this).closest(".woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator");b.length||(b=a(this).closest(".form-row").parent());var c=a(this).val(),d=b.find("#billing_state, #shipping_state, #calc_shipping_state"),f=d.parent(),g=d.attr("name"),h=d.attr("id"),i=d.val(),j=d.attr("placeholder")||d.attr("data-placeholder")||"";if(e[c])if(a.isEmptyObject(e[c]))d.parent().hide().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b]);else{var k="",l=e[c];for(var m in l)l.hasOwnProperty(m)&&(k=k+'");d.parent().show(),d.is("input")&&(d.replaceWith(''),d=b.find("#billing_state, #shipping_state, #calc_shipping_state")),d.html('"+k),d.val(i).change(),a(document.body).trigger("country_to_state_changed",[c,b])}else d.is("select")?(f.show().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b])):d.is('input[type="hidden"]')&&(f.show().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b]));a(document.body).trigger("country_to_state_changing",[c,b])}),a(function(){a(":input.country_to_state").change()})});
\ No newline at end of file
+jQuery(function(a){function b(){var a={noResults:function(){return wc_country_select_params.i18n_no_matches},errorLoading:function(){return wc_country_select_params.i18n_ajax_error},inputTooShort:function(a){var b=a.minimum-a.input.length;return 1===b?wc_country_select_params.i18n_input_too_short_1:wc_country_select_params.i18n_input_too_short_n.replace("%qty%",b)},inputTooLong:function(a){var b=a.input.length-a.maximum;return 1===b?wc_country_select_params.i18n_input_too_long_1:wc_country_select_params.i18n_input_too_long_n.replace("%qty%",b)},maximumSelected:function(a){return 1===a.maximum?wc_country_select_params.i18n_selection_too_long_1:wc_country_select_params.i18n_selection_too_long_n.replace("%qty%",a.maximum)},loadingMore:function(){return wc_country_select_params.i18n_load_more},searching:function(){return wc_country_select_params.i18n_searching}},b={language:a};return b}if("undefined"==typeof wc_country_select_params)return!1;if(a().select2){var c=function(){a("select.country_select:visible, select.state_select:visible").each(function(){var c=a.extend({placeholderOption:"first",width:"100%"},b());a(this).select2(c)})};c(),a(document.body).bind("country_to_state_changed",function(){c()})}var d=wc_country_select_params.countries.replace(/"/g,'"'),e=a.parseJSON(d);a(document.body).on("change","select.country_to_state, input.country_to_state",function(){var b=a(this).closest(".woocommerce-billing-fields, .woocommerce-shipping-fields, .woocommerce-shipping-calculator");b.length||(b=a(this).closest(".form-row").parent());var c=a(this).val(),d=b.find("#billing_state, #shipping_state, #calc_shipping_state"),f=d.parent(),g=d.attr("name"),h=d.attr("id"),i=d.val(),j=d.attr("placeholder")||d.attr("data-placeholder")||"";if(e[c])if(a.isEmptyObject(e[c]))d.parent().hide().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b]);else{var k="",l=e[c];for(var m in l)l.hasOwnProperty(m)&&(k=k+'");d.parent().show(),d.is("input")&&(d.replaceWith(''),d=b.find("#billing_state, #shipping_state, #calc_shipping_state")),d.html('"+k),d.val(i).change(),a(document.body).trigger("country_to_state_changed",[c,b])}else d.is("select")?(f.show().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b])):d.is('input[type="hidden"]')&&(f.show().find(".select2-container").remove(),d.replaceWith(''),a(document.body).trigger("country_to_state_changed",[c,b]));a(document.body).trigger("country_to_state_changing",[c,b])}),a(function(){a(":input.country_to_state").change()})});
\ No newline at end of file
diff --git a/assets/js/frontend/single-product.js b/assets/js/frontend/single-product.js
index f511321fa36..001ac777f72 100644
--- a/assets/js/frontend/single-product.js
+++ b/assets/js/frontend/single-product.js
@@ -124,7 +124,23 @@ jQuery( function( $ ) {
controlNav: wc_single_product_params.flexslider.controlNav,
slideshow: wc_single_product_params.flexslider.slideshow,
animationSpeed: wc_single_product_params.flexslider.animationSpeed,
- animationLoop: false // Breaks photoswipe pagination if true. It's hard disabled because we don't need it anyway (no next/prev enabled in flex).
+ animationLoop: wc_single_product_params.flexslider.animationLoop, // Breaks photoswipe pagination if true.
+ start: function() {
+ var $images = $( '.woocommerce-product-gallery__image' );
+ var largest_height = 0;
+
+ $images.each( function() {
+ var height = $( this ).height();
+
+ if ( height > largest_height ) {
+ largest_height = height;
+ }
+ });
+
+ $images.each( function() {
+ $( this ).css( 'min-height', largest_height );
+ });
+ }
});
},
diff --git a/assets/js/frontend/single-product.min.js b/assets/js/frontend/single-product.min.js
index 3c8ce72737c..18dd011df5a 100644
--- a/assets/js/frontend/single-product.min.js
+++ b/assets/js/frontend/single-product.min.js
@@ -1 +1 @@
-jQuery(function(a){if("undefined"==typeof wc_single_product_params)return!1;a("body").on("init",".wc-tabs-wrapper, .woocommerce-tabs",function(){a(".wc-tab, .woocommerce-tabs .panel:not(.panel .panel)").hide();var b=window.location.hash,c=window.location.href,d=a(this).find(".wc-tabs, ul.tabs").first();b.toLowerCase().indexOf("comment-")>=0||"#reviews"===b||"#tab-reviews"===b?d.find("li.reviews_tab a").click():c.indexOf("comment-page-")>0||c.indexOf("cpage=")>0?d.find("li.reviews_tab a").click():d.find("li:first a").click()}).on("click",".wc-tabs li a, ul.tabs li a",function(b){b.preventDefault();var c=a(this),d=c.closest(".wc-tabs-wrapper, .woocommerce-tabs"),e=d.find(".wc-tabs, ul.tabs");e.find("li").removeClass("active"),d.find(".wc-tab, .panel:not(.panel .panel)").hide(),c.closest("li").addClass("active"),d.find(c.attr("href")).show()}).on("click","a.woocommerce-review-link",function(){return a(".reviews_tab a").click(),!0}).on("init","#rating",function(){a("#rating").hide().before('')}).on("click","#respond p.stars a",function(){var b=a(this),c=a(this).closest("#respond").find("#rating"),d=a(this).closest(".stars");return c.val(b.text()),b.siblings("a").removeClass("active"),b.addClass("active"),d.addClass("selected"),!1}).on("click","#respond #submit",function(){var b=a(this).closest("#respond").find("#rating"),c=b.val();if(b.length>0&&!c&&"yes"===wc_single_product_params.review_rating_required)return window.alert(wc_single_product_params.i18n_required_rating_text),!1}).on("woocommerce_init_gallery",function(){a.isFunction(a.fn.zoom)&&b.init_zoom()}),a(".wc-tabs-wrapper, .woocommerce-tabs, #rating").trigger("init");var b={init:function(){a.isFunction(a.fn.flexslider)&&this.init_flexslider(),a.isFunction(a.fn.zoom)&&this.init_zoom(),"undefined"!=typeof PhotoSwipe&&(this.init_photoswipe(),a(document).on("click",".woocommerce-product-gallery__trigger",this.trigger_photoswipe))},is_touch_device:function(){return"ontouchstart"in window||navigator.maxTouchPoints},init_flexslider:function(){a(".woocommerce-product-gallery").flexslider({selector:".woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image",animation:wc_single_product_params.flexslider.animation,smoothHeight:wc_single_product_params.flexslider.smoothHeight,directionNav:wc_single_product_params.flexslider.directionNav,controlNav:wc_single_product_params.flexslider.controlNav,slideshow:wc_single_product_params.flexslider.slideshow,animationSpeed:wc_single_product_params.flexslider.animationSpeed,animationLoop:!1})},init_zoom:function(){a(".woocommerce-product-gallery__image img").attr("width")>a(".woocommerce-product-gallery").width()&&(a(".woocommerce-product-gallery__image").trigger("zoom.destroy"),a(".woocommerce-product-gallery__image").zoom({touch:!1}))},get_gallery_items:function(){var b=a(".woocommerce-product-gallery__wrapper").children(),c=[],d=b.filter(".flex-active-slide").index();return b.length>0&&b.each(function(b,d){var e=a(d).find("img"),f=e.attr("data-large-image"),g=e.attr("data-large-image-width"),h=e.attr("data-large-image-height"),i={src:f,w:g,h:h,title:e.attr("title")};c.push(i)}),{index:d,items:c}},init_photoswipe:function(){a(".woocommerce-product-gallery--with-images").prepend('🔍')},trigger_photoswipe:function(c){c.preventDefault();var d=a(".pswp")[0],e=b.get_gallery_items(),f={index:e.index,shareEl:!1,closeOnScroll:!1,history:!1,hideAnimationDuration:0,showAnimationDuration:0},g=new PhotoSwipe(d,PhotoSwipeUI_Default,e.items,f);g.init()}};b.init()});
\ No newline at end of file
+jQuery(function(a){if("undefined"==typeof wc_single_product_params)return!1;a("body").on("init",".wc-tabs-wrapper, .woocommerce-tabs",function(){a(".wc-tab, .woocommerce-tabs .panel:not(.panel .panel)").hide();var b=window.location.hash,c=window.location.href,d=a(this).find(".wc-tabs, ul.tabs").first();b.toLowerCase().indexOf("comment-")>=0||"#reviews"===b||"#tab-reviews"===b?d.find("li.reviews_tab a").click():c.indexOf("comment-page-")>0||c.indexOf("cpage=")>0?d.find("li.reviews_tab a").click():d.find("li:first a").click()}).on("click",".wc-tabs li a, ul.tabs li a",function(b){b.preventDefault();var c=a(this),d=c.closest(".wc-tabs-wrapper, .woocommerce-tabs"),e=d.find(".wc-tabs, ul.tabs");e.find("li").removeClass("active"),d.find(".wc-tab, .panel:not(.panel .panel)").hide(),c.closest("li").addClass("active"),d.find(c.attr("href")).show()}).on("click","a.woocommerce-review-link",function(){return a(".reviews_tab a").click(),!0}).on("init","#rating",function(){a("#rating").hide().before('')}).on("click","#respond p.stars a",function(){var b=a(this),c=a(this).closest("#respond").find("#rating"),d=a(this).closest(".stars");return c.val(b.text()),b.siblings("a").removeClass("active"),b.addClass("active"),d.addClass("selected"),!1}).on("click","#respond #submit",function(){var b=a(this).closest("#respond").find("#rating"),c=b.val();if(b.length>0&&!c&&"yes"===wc_single_product_params.review_rating_required)return window.alert(wc_single_product_params.i18n_required_rating_text),!1}).on("woocommerce_init_gallery",function(){a.isFunction(a.fn.zoom)&&b.init_zoom()}),a(".wc-tabs-wrapper, .woocommerce-tabs, #rating").trigger("init");var b={init:function(){a.isFunction(a.fn.flexslider)&&this.init_flexslider(),a.isFunction(a.fn.zoom)&&this.init_zoom(),"undefined"!=typeof PhotoSwipe&&(this.init_photoswipe(),a(document).on("click",".woocommerce-product-gallery__trigger",this.trigger_photoswipe))},is_touch_device:function(){return"ontouchstart"in window||navigator.maxTouchPoints},init_flexslider:function(){a(".woocommerce-product-gallery").flexslider({selector:".woocommerce-product-gallery__wrapper > .woocommerce-product-gallery__image",animation:wc_single_product_params.flexslider.animation,smoothHeight:wc_single_product_params.flexslider.smoothHeight,directionNav:wc_single_product_params.flexslider.directionNav,controlNav:wc_single_product_params.flexslider.controlNav,slideshow:wc_single_product_params.flexslider.slideshow,animationSpeed:wc_single_product_params.flexslider.animationSpeed,animationLoop:wc_single_product_params.flexslider.animationLoop,start:function(){var b=a(".woocommerce-product-gallery__image"),c=0;b.each(function(){var b=a(this).height();b>c&&(c=b)}),b.each(function(){a(this).css("min-height",c)})}})},init_zoom:function(){a(".woocommerce-product-gallery__image img").attr("width")>a(".woocommerce-product-gallery").width()&&(a(".woocommerce-product-gallery__image").trigger("zoom.destroy"),a(".woocommerce-product-gallery__image").zoom({touch:!1}))},get_gallery_items:function(){var b=a(".woocommerce-product-gallery__wrapper").children(),c=[],d=b.filter(".flex-active-slide").index();return b.length>0&&b.each(function(b,d){var e=a(d).find("img"),f=e.attr("data-large-image"),g=e.attr("data-large-image-width"),h=e.attr("data-large-image-height"),i={src:f,w:g,h:h,title:e.attr("title")};c.push(i)}),{index:d,items:c}},init_photoswipe:function(){a(".woocommerce-product-gallery--with-images").prepend('🔍')},trigger_photoswipe:function(c){c.preventDefault();var d=a(".pswp")[0],e=b.get_gallery_items(),f={index:e.index,shareEl:!1,closeOnScroll:!1,history:!1,hideAnimationDuration:0,showAnimationDuration:0},g=new PhotoSwipe(d,PhotoSwipeUI_Default,e.items,f);g.init()}};b.init()});
\ No newline at end of file
diff --git a/assets/js/zoom/jquery.zoom.js b/assets/js/zoom/jquery.zoom.js
index 61af150b65c..17e8d651e06 100644
--- a/assets/js/zoom/jquery.zoom.js
+++ b/assets/js/zoom/jquery.zoom.js
@@ -1,5 +1,5 @@
/*!
- Zoom 1.7.15
+ Zoom 1.7.18
license: MIT
http://www.jacklmoore.com/zoom
*/
@@ -30,9 +30,8 @@
$source = $(source);
// The parent element needs positioning so that the zoomed element can be correctly positioned within.
- $target.css('position', /(absolute|fixed)/.test(position) ? position : 'relative');
- $target.css('overflow', 'hidden');
-
+ target.style.position = /(absolute|fixed)/.test(position) ? position : 'relative';
+ target.style.overflow = 'hidden';
img.style.width = img.style.height = '';
$(img)
@@ -55,7 +54,7 @@
targetWidth = $target.outerWidth();
targetHeight = $target.outerHeight();
- if (source === $target[0]) {
+ if (source === target) {
sourceWidth = targetWidth;
sourceHeight = targetHeight;
} else {
@@ -86,41 +85,34 @@
var
settings = $.extend({}, defaults, options || {}),
//target will display the zoomed image
- target = settings.target || this,
+ target = settings.target && $(settings.target)[0] || this,
//source will provide zoom location info (thumbnail)
source = this,
$source = $(source),
- $target = $(target),
img = document.createElement('img'),
$img = $(img),
mousemove = 'mousemove.zoom',
clicked = false,
- touched = false,
- $urlElement;
+ touched = false;
// If a url wasn't specified, look for an image element.
if (!settings.url) {
- $urlElement = $source.find('img');
- if ($urlElement[0]) {
- settings.url = $urlElement.data('src') || $urlElement.attr('src');
+ var srcElement = source.querySelector('img');
+ if (srcElement) {
+ settings.url = srcElement.getAttribute('data-src') || srcElement.currentSrc || srcElement.src;
}
if (!settings.url) {
return;
}
}
- (function(){
- var position = $target.css('position');
- var overflow = $target.css('overflow');
-
- $source.one('zoom.destroy', function(){
- $source.off(".zoom");
- $target.css('position', position);
- $target.css('overflow', overflow);
- $img.remove();
- });
-
- }());
+ $source.one('zoom.destroy', function(position, overflow){
+ $source.off(".zoom");
+ target.style.position = position;
+ target.style.overflow = overflow;
+ img.onload = null;
+ $img.remove();
+ }.bind(this, target.style.position, target.style.overflow));
img.onload = function () {
var zoom = $.zoom(target, source, img, settings.magnify);
@@ -228,7 +220,7 @@
}
});
}
-
+
if ($.isFunction(settings.callback)) {
settings.callback.call(img);
}
diff --git a/assets/js/zoom/jquery.zoom.min.js b/assets/js/zoom/jquery.zoom.min.js
index 3b1aaa13128..8a6309dec76 100644
--- a/assets/js/zoom/jquery.zoom.min.js
+++ b/assets/js/zoom/jquery.zoom.min.js
@@ -1,6 +1,6 @@
/*!
- Zoom 1.7.15
+ Zoom 1.7.18
license: MIT
http://www.jacklmoore.com/zoom
*/
-!function(a){var b={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1,magnify:1};a.zoom=function(b,c,d,e){var f,g,h,i,j,k,l,m=a(b),n=m.css("position"),o=a(c);return m.css("position",/(absolute|fixed)/.test(n)?n:"relative"),m.css("overflow","hidden"),d.style.width=d.style.height="",a(d).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:d.width*e,height:d.height*e,border:"none",maxWidth:"none",maxHeight:"none"}).appendTo(b),{init:function(){g=m.outerWidth(),f=m.outerHeight(),c===m[0]?(i=g,h=f):(i=o.outerWidth(),h=o.outerHeight()),j=(d.width-g)/i,k=(d.height-f)/h,l=o.offset()},move:function(a){var b=a.pageX-l.left,c=a.pageY-l.top;c=Math.max(Math.min(c,h),0),b=Math.max(Math.min(b,i),0),d.style.left=b*-j+"px",d.style.top=c*-k+"px"}}},a.fn.zoom=function(c){return this.each(function(){var d,e=a.extend({},b,c||{}),f=e.target||this,g=this,h=a(g),i=a(f),j=document.createElement("img"),k=a(j),l="mousemove.zoom",m=!1,n=!1;(e.url||(d=h.find("img"),d[0]&&(e.url=d.data("src")||d.attr("src")),e.url))&&(!function(){var a=i.css("position"),b=i.css("overflow");h.one("zoom.destroy",function(){h.off(".zoom"),i.css("position",a),i.css("overflow",b),k.remove()})}(),j.onload=function(){function b(b){d.init(),d.move(b),k.stop().fadeTo(a.support.opacity?e.duration:0,1,!!a.isFunction(e.onZoomIn)&&e.onZoomIn.call(j))}function c(){k.stop().fadeTo(e.duration,0,!!a.isFunction(e.onZoomOut)&&e.onZoomOut.call(j))}var d=a.zoom(f,g,j,e.magnify);"grab"===e.on?h.on("mousedown.zoom",function(e){1===e.which&&(a(document).one("mouseup.zoom",function(){c(),a(document).off(l,d.move)}),b(e),a(document).on(l,d.move),e.preventDefault())}):"click"===e.on?h.on("click.zoom",function(e){return m?void 0:(m=!0,b(e),a(document).on(l,d.move),a(document).one("click.zoom",function(){c(),m=!1,a(document).off(l,d.move)}),!1)}):"toggle"===e.on?h.on("click.zoom",function(a){m?c():b(a),m=!m}):"mouseover"===e.on&&(d.init(),h.on("mouseenter.zoom",b).on("mouseleave.zoom",c).on(l,d.move)),e.touch&&h.on("touchstart.zoom",function(a){a.preventDefault(),n?(n=!1,c()):(n=!0,b(a.originalEvent.touches[0]||a.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(a){a.preventDefault(),d.move(a.originalEvent.touches[0]||a.originalEvent.changedTouches[0])}).on("touchend.zoom",function(a){a.preventDefault(),n&&(n=!1,c())}),a.isFunction(e.callback)&&e.callback.call(j)},j.src=e.url)})},a.fn.zoom.defaults=b}(window.jQuery);
\ No newline at end of file
+(function(o){var t={url:!1,callback:!1,target:!1,duration:120,on:"mouseover",touch:!0,onZoomIn:!1,onZoomOut:!1,magnify:1};o.zoom=function(t,n,e,i){var u,c,a,r,m,l,s,f=o(t),h=f.css("position"),d=o(n);return t.style.position=/(absolute|fixed)/.test(h)?h:"relative",t.style.overflow="hidden",e.style.width=e.style.height="",o(e).addClass("zoomImg").css({position:"absolute",top:0,left:0,opacity:0,width:e.width*i,height:e.height*i,border:"none",maxWidth:"none",maxHeight:"none"}).appendTo(t),{init:function(){c=f.outerWidth(),u=f.outerHeight(),n===t?(r=c,a=u):(r=d.outerWidth(),a=d.outerHeight()),m=(e.width-c)/r,l=(e.height-u)/a,s=d.offset()},move:function(o){var t=o.pageX-s.left,n=o.pageY-s.top;n=Math.max(Math.min(n,a),0),t=Math.max(Math.min(t,r),0),e.style.left=t*-m+"px",e.style.top=n*-l+"px"}}},o.fn.zoom=function(n){return this.each(function(){var e=o.extend({},t,n||{}),i=e.target&&o(e.target)[0]||this,u=this,c=o(u),a=document.createElement("img"),r=o(a),m="mousemove.zoom",l=!1,s=!1;if(!e.url){var f=u.querySelector("img");if(f&&(e.url=f.getAttribute("data-src")||f.currentSrc||f.src),!e.url)return}c.one("zoom.destroy",function(o,t){c.off(".zoom"),i.style.position=o,i.style.overflow=t,a.onload=null,r.remove()}.bind(this,i.style.position,i.style.overflow)),a.onload=function(){function t(t){f.init(),f.move(t),r.stop().fadeTo(o.support.opacity?e.duration:0,1,o.isFunction(e.onZoomIn)?e.onZoomIn.call(a):!1)}function n(){r.stop().fadeTo(e.duration,0,o.isFunction(e.onZoomOut)?e.onZoomOut.call(a):!1)}var f=o.zoom(i,u,a,e.magnify);"grab"===e.on?c.on("mousedown.zoom",function(e){1===e.which&&(o(document).one("mouseup.zoom",function(){n(),o(document).off(m,f.move)}),t(e),o(document).on(m,f.move),e.preventDefault())}):"click"===e.on?c.on("click.zoom",function(e){return l?void 0:(l=!0,t(e),o(document).on(m,f.move),o(document).one("click.zoom",function(){n(),l=!1,o(document).off(m,f.move)}),!1)}):"toggle"===e.on?c.on("click.zoom",function(o){l?n():t(o),l=!l}):"mouseover"===e.on&&(f.init(),c.on("mouseenter.zoom",t).on("mouseleave.zoom",n).on(m,f.move)),e.touch&&c.on("touchstart.zoom",function(o){o.preventDefault(),s?(s=!1,n()):(s=!0,t(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0]))}).on("touchmove.zoom",function(o){o.preventDefault(),f.move(o.originalEvent.touches[0]||o.originalEvent.changedTouches[0])}).on("touchend.zoom",function(o){o.preventDefault(),s&&(s=!1,n())}),o.isFunction(e.callback)&&e.callback.call(a)},a.src=e.url})},o.fn.zoom.defaults=t})(window.jQuery);
diff --git a/composer.json b/composer.json
index c7f6bd45d7a..96e47e88cea 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"type": "wordpress-plugin",
"license": "GPL-2.0+",
"require": {
- "composer/installers": "~1.0"
+ "composer/installers": "~1.2"
},
"require-dev": {
"squizlabs/php_codesniffer": "*",
diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot
index 8825bd33348..988c6ba2159 100644
--- a/i18n/languages/woocommerce.pot
+++ b/i18n/languages/woocommerce.pot
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.7.0-beta-1\n"
"Report-Msgid-Bugs-To: https://github.com/woocommerce/woocommerce/issues\n"
-"POT-Creation-Date: 2017-01-17 14:34:16+00:00\n"
+"POT-Creation-Date: 2017-01-26 14:58:57+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -1033,7 +1033,7 @@ msgstr ""
msgid "Zimbabwe"
msgstr ""
-#: i18n/locale-info.php:351
+#: i18n/locale-info.php:371
msgid "Consumption tax"
msgstr ""
@@ -5108,17 +5108,17 @@ msgstr ""
msgid "Western Cape"
msgstr ""
-#: includes/abstracts/abstract-wc-legacy-order.php:158
+#: includes/abstracts/abstract-wc-legacy-order.php:160
#: includes/class-wc-order-item-product.php:200
msgid "Backordered"
msgstr ""
-#: includes/abstracts/abstract-wc-legacy-order.php:495
+#: includes/abstracts/abstract-wc-legacy-order.php:497
#: includes/wc-template-functions.php:2454
msgid "Download %d"
msgstr ""
-#: includes/abstracts/abstract-wc-legacy-order.php:495
+#: includes/abstracts/abstract-wc-legacy-order.php:497
#: includes/wc-template-functions.php:2454 templates/myaccount/downloads.php:76
msgid "Download"
msgstr ""
@@ -5135,43 +5135,43 @@ msgstr ""
msgid "Invalid currency code"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1388
+#: includes/abstracts/abstract-wc-order.php:1387
#. translators: %s: shipping method
msgid "via %s"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1393
+#: includes/abstracts/abstract-wc-order.php:1392
#: includes/class-wc-cart.php:1612 includes/class-wc-product-grouped.php:109
msgid "Free!"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1421
+#: includes/abstracts/abstract-wc-order.php:1420
msgid "Subtotal:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1428
+#: includes/abstracts/abstract-wc-order.php:1427
#: includes/admin/meta-boxes/views/html-order-items.php:121
msgid "Discount:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1435
+#: includes/abstracts/abstract-wc-order.php:1434
#: includes/admin/meta-boxes/views/html-order-items.php:131
msgid "Shipping:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1475
+#: includes/abstracts/abstract-wc-order.php:1474
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:328
#: includes/shortcodes/class-wc-shortcode-checkout.php:149
#: templates/checkout/thankyou.php:63
msgid "Payment method:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1483
+#: includes/abstracts/abstract-wc-order.php:1482
#: includes/admin/meta-boxes/views/html-order-items.php:206
msgid "Refund"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1490
+#: includes/abstracts/abstract-wc-order.php:1489
#: includes/admin/meta-boxes/views/html-order-item.php:97
#: includes/admin/meta-boxes/views/html-order-item.php:139
#: includes/shortcodes/class-wc-shortcode-checkout.php:144
@@ -5187,40 +5187,40 @@ msgstr ""
msgid "Save to account"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:772
+#: includes/abstracts/abstract-wc-product.php:755
msgid "Invalid catalog visibility option."
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:807
+#: includes/abstracts/abstract-wc-product.php:792
msgid "Invalid or duplicated SKU."
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:891
+#: includes/abstracts/abstract-wc-product.php:876
msgid "Invalid product tax status."
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1169
+#: includes/abstracts/abstract-wc-product.php:1154
msgid ""
"The downloadable file %1$s cannot be used as it does not have an allowed "
"file type. Allowed types include: %2$s"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1175
+#: includes/abstracts/abstract-wc-product.php:1160
msgid "The downloadable file %s cannot be used as it does not exist on the server."
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1709
+#: includes/abstracts/abstract-wc-product.php:1694
#: includes/class-wc-product-simple.php:54
msgid "Add to cart"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1718
+#: includes/abstracts/abstract-wc-product.php:1703
#: includes/class-wc-embed.php:112 includes/class-wc-product-simple.php:54
#: includes/class-wc-product-variable.php:60
msgid "Read more"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1870
+#: includes/abstracts/abstract-wc-product.php:1855
#: includes/admin/class-wc-admin-post-types.php:424
#: includes/admin/class-wc-admin-reports.php:100
#: includes/admin/reports/class-wc-report-stock.php:110
@@ -5228,7 +5228,7 @@ msgstr ""
msgid "Out of stock"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1872 templates/cart/cart.php:91
+#: includes/abstracts/abstract-wc-product.php:1857 templates/cart/cart.php:91
msgid "Available on backorder"
msgstr ""
@@ -5416,19 +5416,19 @@ msgid "Ensure result set excludes specific IDs."
msgstr ""
#: includes/abstracts/abstract-wc-rest-posts-controller.php:634
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:690
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:696
msgid "Limit result set to specific ids."
msgstr ""
#: includes/abstracts/abstract-wc-rest-posts-controller.php:640
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:697
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:703
#: includes/api/class-wc-rest-customers-controller.php:863
#: includes/api/class-wc-rest-taxes-controller.php:661
msgid "Offset the result set by a specific number of items."
msgstr ""
#: includes/abstracts/abstract-wc-rest-posts-controller.php:646
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:704
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:710
#: includes/api/class-wc-rest-customers-controller.php:870
#: includes/api/class-wc-rest-taxes-controller.php:668
msgid "Order sort attribute ascending or descending."
@@ -5498,43 +5498,43 @@ msgid "Can not set resource parent, taxonomy is not hierarchical."
msgstr ""
#: includes/abstracts/abstract-wc-rest-terms-controller.php:373
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:477
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:482
msgid "Parent resource does not exist."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:527
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:533
#: includes/api/class-wc-rest-product-attributes-controller.php:408
msgid "Resource does not support trashing."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:536
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:542
#: includes/api/class-wc-rest-customers-controller.php:470
#: includes/api/class-wc-rest-product-attributes-controller.php:427
#: includes/api/class-wc-rest-taxes-controller.php:463
msgid "The resource cannot be deleted."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:684
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:690
msgid "Ensure result set excludes specific ids."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:715
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:721
msgid "Sort collection by resource attribute."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:731
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:737
msgid "Whether to hide resources not assigned to any products."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:738
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:744
msgid "Limit result set to resources assigned to a specific parent."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:745
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:751
msgid "Limit result set to resources assigned to a specific product."
msgstr ""
-#: includes/abstracts/abstract-wc-rest-terms-controller.php:751
+#: includes/abstracts/abstract-wc-rest-terms-controller.php:757
msgid "Limit result set to resources with a specific slug."
msgstr ""
@@ -5586,7 +5586,7 @@ msgstr ""
#: includes/admin/class-wc-admin-api-keys-table-list.php:40
#: includes/admin/class-wc-admin-post-types.php:276
-#: includes/admin/class-wc-admin-setup-wizard.php:227
+#: includes/admin/class-wc-admin-setup-wizard.php:225
#: includes/admin/meta-boxes/views/html-variation-admin.php:306
#: includes/admin/settings/class-wc-settings-shipping.php:339
#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:74
@@ -5709,140 +5709,140 @@ msgstr ""
msgid "WooCommerce"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:147
+#: includes/admin/class-wc-admin-assets.php:145
#. translators: %s: decimal
msgid "Please enter in decimal (%s) format without thousand separators."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:149
+#: includes/admin/class-wc-admin-assets.php:147
#. translators: %s: price decimal separator
msgid ""
"Please enter in monetary decimal (%s) format without thousand separators "
"and currency symbols."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:150
+#: includes/admin/class-wc-admin-assets.php:148
msgid "Please enter in country code with two capital letters."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:151
+#: includes/admin/class-wc-admin-assets.php:149
msgid "Please enter in a value less than the regular price."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:190
+#: includes/admin/class-wc-admin-assets.php:188
msgid ""
"Are you sure you want to link all variations? This will create a new "
"variation for each and every possible combination of variation attributes "
"(max %d per run)."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:191
+#: includes/admin/class-wc-admin-assets.php:189
msgid "Enter a value"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:192
+#: includes/admin/class-wc-admin-assets.php:190
msgid "Variation menu order (determines position in the list of variations)"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:193
+#: includes/admin/class-wc-admin-assets.php:191
msgid "Enter a value (fixed or %)"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:194
+#: includes/admin/class-wc-admin-assets.php:192
msgid "Are you sure you want to delete all variations? This cannot be undone."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:195
+#: includes/admin/class-wc-admin-assets.php:193
msgid "Last warning, are you sure?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:196
+#: includes/admin/class-wc-admin-assets.php:194
#: includes/admin/class-wc-admin-taxonomies.php:130
#: includes/admin/class-wc-admin-taxonomies.php:240
msgid "Choose an image"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:197
+#: includes/admin/class-wc-admin-assets.php:195
msgid "Set variation image"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:198
+#: includes/admin/class-wc-admin-assets.php:196
msgid "variation added"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:199
+#: includes/admin/class-wc-admin-assets.php:197
msgid "variations added"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:200
+#: includes/admin/class-wc-admin-assets.php:198
msgid "No variations added"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:201
+#: includes/admin/class-wc-admin-assets.php:199
msgid "Are you sure you want to remove this variation?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:202
+#: includes/admin/class-wc-admin-assets.php:200
msgid "Sale start date (YYYY-MM-DD format or leave blank)"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:203
+#: includes/admin/class-wc-admin-assets.php:201
msgid "Sale end date (YYYY-MM-DD format or leave blank)"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:204
+#: includes/admin/class-wc-admin-assets.php:202
msgid "Save changes before changing page?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:205
+#: includes/admin/class-wc-admin-assets.php:203
msgid "%qty% variation"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:206
+#: includes/admin/class-wc-admin-assets.php:204
msgid "%qty% variations"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:218
-#: includes/admin/class-wc-admin-assets.php:356
+#: includes/admin/class-wc-admin-assets.php:216
+#: includes/admin/class-wc-admin-assets.php:354
#: includes/admin/settings/views/html-webhooks-edit.php:54
-#: includes/class-wc-frontend-scripts.php:498
+#: includes/class-wc-frontend-scripts.php:499
msgid "Select an option…"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:237
+#: includes/admin/class-wc-admin-assets.php:235
msgid ""
"Are you sure you want to remove the selected items? If you have previously "
"reduced this item's stock, or this order was submitted by a customer, you "
"will need to manually restore the item's stock."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:238
+#: includes/admin/class-wc-admin-assets.php:236
msgid "Please select some items."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:239
+#: includes/admin/class-wc-admin-assets.php:237
msgid "Are you sure you wish to process this refund? This action cannot be undone."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:240
+#: includes/admin/class-wc-admin-assets.php:238
msgid "Are you sure you wish to delete this refund? This action cannot be undone."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:241
+#: includes/admin/class-wc-admin-assets.php:239
msgid ""
"Are you sure you wish to delete this tax column? This action cannot be "
"undone."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:242
+#: includes/admin/class-wc-admin-assets.php:240
msgid "Remove this item meta?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:243
+#: includes/admin/class-wc-admin-assets.php:241
msgid "Remove this attribute?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:244
+#: includes/admin/class-wc-admin-assets.php:242
#: includes/admin/class-wc-admin-attributes.php:280
#: includes/admin/class-wc-admin-attributes.php:334
#: includes/admin/class-wc-admin-attributes.php:369
@@ -5850,7 +5850,7 @@ msgstr ""
#: includes/admin/class-wc-admin-attributes.php:454
#: includes/admin/class-wc-admin-attributes.php:495
#: includes/admin/class-wc-admin-post-types.php:244
-#: includes/admin/class-wc-admin-setup-wizard.php:467
+#: includes/admin/class-wc-admin-setup-wizard.php:465
#: includes/admin/class-wc-admin-webhooks-table-list.php:40
#: includes/admin/meta-boxes/views/html-product-attribute.php:12
#: includes/admin/meta-boxes/views/html-product-data-general.php:61
@@ -5862,72 +5862,72 @@ msgstr ""
msgid "Name"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:245
+#: includes/admin/class-wc-admin-assets.php:243
#: includes/admin/meta-boxes/views/html-product-attribute.php:3
#: includes/admin/meta-boxes/views/html-variation-admin.php:16
#: includes/admin/settings/views/html-admin-page-shipping-classes.php:48
msgid "Remove"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:246
+#: includes/admin/class-wc-admin-assets.php:244
#: includes/admin/meta-boxes/views/html-order-download-permission.php:10
#: includes/admin/meta-boxes/views/html-product-attribute.php:4
#: includes/admin/meta-boxes/views/html-variation-admin.php:17
msgid "Click to toggle"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:247
+#: includes/admin/class-wc-admin-assets.php:245
#: includes/admin/meta-boxes/views/html-product-attribute.php:24
msgid "Value(s)"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:248
+#: includes/admin/class-wc-admin-assets.php:246
msgid "Enter some text, or some attributes by pipe (|) separating values."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:249
+#: includes/admin/class-wc-admin-assets.php:247
#: includes/admin/meta-boxes/views/html-product-attribute.php:76
msgid "Visible on the product page"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:250
+#: includes/admin/class-wc-admin-assets.php:248
#: includes/admin/meta-boxes/views/html-product-attribute.php:82
msgid "Used for variations"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:251
+#: includes/admin/class-wc-admin-assets.php:249
msgid "Enter a name for the new attribute term:"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:252
+#: includes/admin/class-wc-admin-assets.php:250
msgid "Calculate totals based on order items, discounts, and shipping?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:253
+#: includes/admin/class-wc-admin-assets.php:251
msgid ""
"Calculate line taxes? This will calculate taxes based on the customers "
"country. If no billing/shipping is set it will use the store base country."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:254
+#: includes/admin/class-wc-admin-assets.php:252
msgid ""
"Copy billing information to shipping information? This will remove any "
"currently entered shipping information."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:255
+#: includes/admin/class-wc-admin-assets.php:253
msgid ""
"Load the customer's billing information? This will remove any currently "
"entered billing information."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:256
+#: includes/admin/class-wc-admin-assets.php:254
msgid ""
"Load the customer's shipping information? This will remove any currently "
"entered shipping information."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:257
+#: includes/admin/class-wc-admin-assets.php:255
#: includes/admin/class-wc-admin-post-types.php:257
#: includes/admin/class-wc-admin-post-types.php:1840
#: includes/admin/views/html-bulk-edit-product.php:199
@@ -5935,30 +5935,30 @@ msgstr ""
msgid "Featured"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:261
+#: includes/admin/class-wc-admin-assets.php:259
msgid "No customer selected"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:285
+#: includes/admin/class-wc-admin-assets.php:283
msgid ""
"Could not grant access - the user may already have permission for this file "
"or billing email is not set. Ensure the billing email is set, and the order "
"has been saved."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:286
+#: includes/admin/class-wc-admin-assets.php:284
msgid "Are you sure you want to revoke access to this download?"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:287
+#: includes/admin/class-wc-admin-assets.php:285
msgid "You cannot add the same tax rate twice!"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:288
+#: includes/admin/class-wc-admin-assets.php:286
msgid "Are you sure you wish to delete this note? This action cannot be undone."
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:337
+#: includes/admin/class-wc-admin-assets.php:335
#: includes/admin/views/html-admin-page-status-report.php:27
msgid "Copying to clipboard failed. Please press Ctrl/Cmd+C to copy."
msgstr ""
@@ -6234,27 +6234,15 @@ msgstr ""
msgid "Copy to a new draft"
msgstr ""
-#: includes/admin/class-wc-admin-duplicate-product.php:84
+#: includes/admin/class-wc-admin-duplicate-product.php:83
msgid "No product to duplicate has been supplied!"
msgstr ""
-#: includes/admin/class-wc-admin-duplicate-product.php:107
+#: includes/admin/class-wc-admin-duplicate-product.php:94
#. translators: %s: product id
msgid "Product creation failed, could not find original product: %s"
msgstr ""
-#: includes/admin/class-wc-admin-duplicate-product.php:134
-msgid "(Copy)"
-msgstr ""
-
-#: includes/admin/class-wc-admin-duplicate-product.php:169
-#: includes/api/class-wc-rest-products-controller.php:1361
-#: includes/api/legacy/v2/class-wc-api-products.php:1271
-#: includes/api/legacy/v3/class-wc-api-products.php:1761
-#. translators: 1: variation id 2: product name
-msgid "Variation #%1$s of %2$s"
-msgstr ""
-
#: includes/admin/class-wc-admin-help.php:41
#: includes/admin/class-wc-admin-help.php:45
msgid "General settings"
@@ -6295,7 +6283,7 @@ msgid "Checkout settings"
msgstr ""
#: includes/admin/class-wc-admin-help.php:73
-#: includes/admin/class-wc-admin-setup-wizard.php:608
+#: includes/admin/class-wc-admin-setup-wizard.php:606
msgid "Bank transfer (BACS) payments"
msgstr ""
@@ -6304,24 +6292,24 @@ msgid "Check payments"
msgstr ""
#: includes/admin/class-wc-admin-help.php:81
-#: includes/admin/class-wc-admin-setup-wizard.php:614
+#: includes/admin/class-wc-admin-setup-wizard.php:612
#: includes/gateways/cod/class-wc-gateway-cod.php:51
#: includes/gateways/cod/class-wc-gateway-cod.php:78
msgid "Cash on delivery"
msgstr ""
#: includes/admin/class-wc-admin-help.php:85
-#: includes/admin/class-wc-admin-setup-wizard.php:588
+#: includes/admin/class-wc-admin-setup-wizard.php:586
msgid "PayPal Standard"
msgstr ""
#: includes/admin/class-wc-admin-help.php:89
-#: includes/admin/class-wc-admin-setup-wizard.php:567
+#: includes/admin/class-wc-admin-setup-wizard.php:565
msgid "PayPal by Braintree"
msgstr ""
#: includes/admin/class-wc-admin-help.php:93
-#: includes/admin/class-wc-admin-setup-wizard.php:581
+#: includes/admin/class-wc-admin-setup-wizard.php:579
msgid "Stripe"
msgstr ""
@@ -6622,7 +6610,7 @@ msgid "Add to menu"
msgstr ""
#: includes/admin/class-wc-admin-menus.php:306
-msgid "Visit store"
+msgid "Visit Store"
msgstr ""
#: includes/admin/class-wc-admin-meta-boxes.php:119
@@ -7250,7 +7238,7 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:629
#: includes/admin/settings/class-wc-settings-checkout.php:328
#: includes/admin/settings/class-wc-settings-emails.php:274
-#: includes/admin/settings/class-wc-settings-shipping.php:245
+#: includes/admin/settings/class-wc-settings-shipping.php:244
#: includes/admin/views/html-bulk-edit-product.php:205
#: includes/admin/views/html-bulk-edit-product.php:239
#: includes/admin/views/html-bulk-edit-product.php:296
@@ -7258,7 +7246,7 @@ msgid "Yes"
msgstr ""
#: includes/admin/class-wc-admin-post-types.php:415
-#: includes/admin/settings/class-wc-settings-shipping.php:246
+#: includes/admin/settings/class-wc-settings-shipping.php:245
#: includes/admin/views/html-bulk-edit-product.php:206
#: includes/admin/views/html-bulk-edit-product.php:240
#: includes/admin/views/html-bulk-edit-product.php:297
@@ -7267,7 +7255,7 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:422
#: includes/admin/reports/class-wc-report-stock.php:108
-#: includes/wc-formatting-functions.php:931
+#: includes/wc-formatting-functions.php:933
#: includes/wc-product-functions.php:803
msgid "In stock"
msgstr ""
@@ -7480,7 +7468,7 @@ msgid "Ready to start selling something awesome?"
msgstr ""
#: includes/admin/class-wc-admin-post-types.php:1976
-#: includes/admin/class-wc-admin-setup-wizard.php:767
+#: includes/admin/class-wc-admin-setup-wizard.php:765
msgid "Create your first product!"
msgstr ""
@@ -7567,7 +7555,7 @@ msgstr ""
#: includes/admin/class-wc-admin-profile.php:125
#: includes/admin/class-wc-admin-settings.php:572
#: includes/admin/class-wc-admin-settings.php:597
-#: includes/admin/class-wc-admin-setup-wizard.php:464
+#: includes/admin/class-wc-admin-setup-wizard.php:462
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:71
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:120
#: includes/class-wc-countries.php:574
@@ -7699,7 +7687,7 @@ msgid "Select a page…"
msgstr ""
#: includes/admin/class-wc-admin-settings.php:572
-#: includes/admin/class-wc-admin-setup-wizard.php:300
+#: includes/admin/class-wc-admin-setup-wizard.php:298
msgid "Choose a country…"
msgstr ""
@@ -7712,7 +7700,7 @@ msgid "Introduction"
msgstr ""
#: includes/admin/class-wc-admin-setup-wizard.php:64
-#: includes/admin/class-wc-admin-setup-wizard.php:220
+#: includes/admin/class-wc-admin-setup-wizard.php:218
msgid "Page setup"
msgstr ""
@@ -7725,7 +7713,7 @@ msgid "Shipping & tax"
msgstr ""
#: includes/admin/class-wc-admin-setup-wizard.php:79
-#: includes/admin/class-wc-admin-setup-wizard.php:644
+#: includes/admin/class-wc-admin-setup-wizard.php:642
msgid "Payments"
msgstr ""
@@ -7733,365 +7721,365 @@ msgstr ""
msgid "Ready!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:147
+#: includes/admin/class-wc-admin-setup-wizard.php:145
msgid "WooCommerce › Setup Wizard"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:163
+#: includes/admin/class-wc-admin-setup-wizard.php:161
msgid "Return to the WordPress Dashboard"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:205
+#: includes/admin/class-wc-admin-setup-wizard.php:203
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:204
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:205
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:207
msgid "Let's go!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:210
+#: includes/admin/class-wc-admin-setup-wizard.php:208
msgid "Not right now"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:222
+#: includes/admin/class-wc-admin-setup-wizard.php:220
msgid ""
"Your store needs a few essential %1$spages%2$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:224
msgid "Page name"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:233
+#: includes/admin/class-wc-admin-setup-wizard.php:231
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:235
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:240
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:246
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:252
msgid ""
"Once created, these pages can be managed from your admin dashboard on the "
"%1$sPages screen%2$s. You can control which pages are shown on your website "
"via %3$sAppearance > Menus%4$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:257
-#: includes/admin/class-wc-admin-setup-wizard.php:373
-#: includes/admin/class-wc-admin-setup-wizard.php:494
-#: includes/admin/class-wc-admin-setup-wizard.php:687
+#: includes/admin/class-wc-admin-setup-wizard.php:255
+#: includes/admin/class-wc-admin-setup-wizard.php:371
+#: includes/admin/class-wc-admin-setup-wizard.php:492
+#: includes/admin/class-wc-admin-setup-wizard.php:685
msgid "Continue"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:258
-#: includes/admin/class-wc-admin-setup-wizard.php:374
-#: includes/admin/class-wc-admin-setup-wizard.php:495
-#: includes/admin/class-wc-admin-setup-wizard.php:688
+#: includes/admin/class-wc-admin-setup-wizard.php:256
+#: includes/admin/class-wc-admin-setup-wizard.php:372
+#: includes/admin/class-wc-admin-setup-wizard.php:493
+#: includes/admin/class-wc-admin-setup-wizard.php:686
msgid "Skip this step"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:294
+#: includes/admin/class-wc-admin-setup-wizard.php:292
msgid "Store locale setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:298
+#: includes/admin/class-wc-admin-setup-wizard.php:296
msgid "Where is your store based?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:306
+#: includes/admin/class-wc-admin-setup-wizard.php:304
msgid "Which currency will your store use?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:308
-#: includes/admin/class-wc-admin-setup-wizard.php:309
+#: includes/admin/class-wc-admin-setup-wizard.php:306
+#: includes/admin/class-wc-admin-setup-wizard.php:307
msgid "Choose a currency…"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:312
+#: includes/admin/class-wc-admin-setup-wizard.php:310
#: includes/admin/meta-boxes/views/html-order-items.php:39
#: includes/admin/views/html-bulk-edit-product.php:133
msgid "%1$s (%2$s)"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:316
+#: includes/admin/class-wc-admin-setup-wizard.php:314
msgid "If your currency is not listed you can %1$sadd it later%2$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:320
+#: includes/admin/class-wc-admin-setup-wizard.php:318
#: includes/admin/settings/class-wc-settings-general.php:179
#: includes/admin/views/html-admin-page-status-report.php:431
#: includes/api/class-wc-rest-system-status-controller.php:388
msgid "Currency position"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:323
+#: includes/admin/class-wc-admin-setup-wizard.php:321
#: includes/admin/settings/class-wc-settings-general.php:187
msgid "Left"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:324
+#: includes/admin/class-wc-admin-setup-wizard.php:322
#: includes/admin/settings/class-wc-settings-general.php:188
msgid "Right"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:325
+#: includes/admin/class-wc-admin-setup-wizard.php:323
#: includes/admin/settings/class-wc-settings-general.php:189
msgid "Left with space"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:326
+#: includes/admin/class-wc-admin-setup-wizard.php:324
#: includes/admin/settings/class-wc-settings-general.php:190
msgid "Right with space"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:331
+#: includes/admin/class-wc-admin-setup-wizard.php:329
#: includes/admin/settings/class-wc-settings-general.php:196
#: includes/admin/views/html-admin-page-status-report.php:436
#: includes/api/class-wc-rest-system-status-controller.php:393
msgid "Thousand separator"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:337
+#: includes/admin/class-wc-admin-setup-wizard.php:335
#: includes/admin/settings/class-wc-settings-general.php:206
#: includes/admin/views/html-admin-page-status-report.php:441
#: includes/api/class-wc-rest-system-status-controller.php:398
msgid "Decimal separator"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:343
+#: includes/admin/class-wc-admin-setup-wizard.php:341
#: includes/admin/settings/class-wc-settings-general.php:216
#: includes/admin/views/html-admin-page-status-report.php:446
#: includes/api/class-wc-rest-system-status-controller.php:403
msgid "Number of decimals"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:349
+#: includes/admin/class-wc-admin-setup-wizard.php:347
msgid "Which unit should be used for product weights?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:352
+#: includes/admin/class-wc-admin-setup-wizard.php:350
#: includes/admin/settings/class-wc-settings-products.php:429
msgid "kg"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:353
+#: includes/admin/class-wc-admin-setup-wizard.php:351
#: includes/admin/settings/class-wc-settings-products.php:430
msgid "g"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:354
+#: includes/admin/class-wc-admin-setup-wizard.php:352
#: includes/admin/settings/class-wc-settings-products.php:431
msgid "lbs"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:355
+#: includes/admin/class-wc-admin-setup-wizard.php:353
#: includes/admin/settings/class-wc-settings-products.php:432
msgid "oz"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:360
+#: includes/admin/class-wc-admin-setup-wizard.php:358
msgid "Which unit should be used for product dimensions?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:363
+#: includes/admin/class-wc-admin-setup-wizard.php:361
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:216
#: includes/admin/settings/class-wc-settings-products.php:446
msgid "m"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:364
+#: includes/admin/class-wc-admin-setup-wizard.php:362
#: includes/admin/settings/class-wc-settings-products.php:447
msgid "cm"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:365
+#: includes/admin/class-wc-admin-setup-wizard.php:363
#: includes/admin/settings/class-wc-settings-products.php:448
msgid "mm"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:366
+#: includes/admin/class-wc-admin-setup-wizard.php:364
#: includes/admin/settings/class-wc-settings-products.php:449
msgid "in"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:367
+#: includes/admin/class-wc-admin-setup-wizard.php:365
#: includes/admin/settings/class-wc-settings-products.php:450
msgid "yd"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:414
+#: includes/admin/class-wc-admin-setup-wizard.php:412
msgid "Shipping & Tax setup"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:416
+#: includes/admin/class-wc-admin-setup-wizard.php:414
msgid ""
"If you will be charging sales tax, or shipping physical goods to customers, "
"you can enable these below. This is optional and can be changed later."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:419
+#: includes/admin/class-wc-admin-setup-wizard.php:417
msgid "Will you be shipping products?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:422
+#: includes/admin/class-wc-admin-setup-wizard.php:420
msgid "Yes, I will be shipping physical goods to customers"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:426
+#: includes/admin/class-wc-admin-setup-wizard.php:424
msgid "Will you be charging sales tax?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:429
+#: includes/admin/class-wc-admin-setup-wizard.php:427
msgid "Yes, I will be charging sales tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:433
+#: includes/admin/class-wc-admin-setup-wizard.php:431
msgid "How will you enter product prices?"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:435
+#: includes/admin/class-wc-admin-setup-wizard.php:433
msgid "I will enter prices inclusive of tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:436
+#: includes/admin/class-wc-admin-setup-wizard.php:434
msgid "I will enter prices exclusive of tax"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:459
+#: includes/admin/class-wc-admin-setup-wizard.php:457
msgid ""
"The following tax rates will be imported automatically for you. You can "
"read more about taxes in %1$sour documentation%2$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:465
+#: includes/admin/class-wc-admin-setup-wizard.php:463
#: includes/class-wc-countries.php:677 includes/class-wc-countries.php:987
msgid "State"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:466
+#: includes/admin/class-wc-admin-setup-wizard.php:464
msgid "Rate (%)"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:486
+#: includes/admin/class-wc-admin-setup-wizard.php:484
msgid ""
"You may need to add/edit rates based on your products or business location "
"which can be done from the %1$stax settings%2$s screen. If in doubt, speak "
"to an accountant."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:569
-#: includes/admin/class-wc-admin-setup-wizard.php:576
+#: includes/admin/class-wc-admin-setup-wizard.php:567
+#: includes/admin/class-wc-admin-setup-wizard.php:574
msgid ""
"Safe and secure payments using credit cards or your customer's PayPal "
"account. %1$sLearn more about PayPal%2$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:574
+#: includes/admin/class-wc-admin-setup-wizard.php:572
msgid "PayPal Express Checkout"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:583
+#: includes/admin/class-wc-admin-setup-wizard.php:581
msgid ""
"A modern and robust way to accept credit card payments on your store. "
"%1$sLearn more about Stripe%2$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:589
+#: includes/admin/class-wc-admin-setup-wizard.php:587
msgid "Accept payments via PayPal using account balance or credit card."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:594
-#: includes/admin/class-wc-admin-setup-wizard.php:597
+#: includes/admin/class-wc-admin-setup-wizard.php:592
+#: includes/admin/class-wc-admin-setup-wizard.php:595
msgid "PayPal email address"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:603
+#: includes/admin/class-wc-admin-setup-wizard.php:601
msgid "A simple offline gateway that lets you accept a check as method of payment."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:609
+#: includes/admin/class-wc-admin-setup-wizard.php:607
msgid "A simple offline gateway that lets you accept BACS payment."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:615
+#: includes/admin/class-wc-admin-setup-wizard.php:613
msgid "A simple offline gateway that lets you accept cash on delivery."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:646
+#: includes/admin/class-wc-admin-setup-wizard.php:644
msgid ""
"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:751
+#: includes/admin/class-wc-admin-setup-wizard.php:749
msgid "Your store is ready!"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:755
+#: includes/admin/class-wc-admin-setup-wizard.php:753
msgid ""
"Want to help make WooCommerce even more awesome? Allow WooCommerce to "
"collect non-sensitive diagnostic data and usage information. %1$sFind out "
"more%2$s."
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:757
+#: includes/admin/class-wc-admin-setup-wizard.php:755
#: includes/admin/views/html-notice-tracking.php:13
#: includes/wc-product-functions.php:818
msgid "Allow"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:758
+#: includes/admin/class-wc-admin-setup-wizard.php:756
msgid "No thanks"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:765
+#: includes/admin/class-wc-admin-setup-wizard.php:763
msgid "Next steps"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:771
+#: includes/admin/class-wc-admin-setup-wizard.php:769
#: includes/admin/meta-boxes/views/html-product-data-variations.php:8
#: includes/gateways/simplify-commerce/class-wc-gateway-simplify-commerce.php:98
msgid "Learn more"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:773
+#: includes/admin/class-wc-admin-setup-wizard.php:771
msgid "Watch the WC 101 video walkthroughs"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:774
+#: includes/admin/class-wc-admin-setup-wizard.php:772
msgid "Get eCommerce advice in your inbox"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:775
+#: includes/admin/class-wc-admin-setup-wizard.php:773
msgid "Learn more about getting started"
msgstr ""
@@ -8632,7 +8620,7 @@ msgstr ""
msgid "Save/update the %s"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:132
+#: includes/admin/meta-boxes/class-wc-meta-box-order-actions.php:135
#. translators: %s: email title
msgid "%s email notification manually sent."
msgstr ""
@@ -8717,8 +8705,8 @@ msgstr ""
#: includes/shipping/legacy-flat-rate/includes/settings-flat-rate.php:93
#: includes/shipping/legacy-free-shipping/class-wc-shipping-legacy-free-shipping.php:122
#: includes/wc-account-functions.php:258
-#: includes/wc-formatting-functions.php:1000
-#: includes/wc-formatting-functions.php:1019
+#: includes/wc-formatting-functions.php:1002
+#: includes/wc-formatting-functions.php:1021
#: templates/order/order-details-customer.php:66
#: templates/order/order-details-customer.php:78
#: templates/single-product/meta.php:31
@@ -8988,7 +8976,7 @@ msgstr ""
#: includes/admin/reports/class-wc-report-taxes-by-code.php:149
#: includes/admin/settings/class-wc-settings-tax.php:33
#: includes/class-wc-countries.php:350 includes/class-wc-order-item-tax.php:157
-#: includes/class-wc-tax.php:735
+#: includes/class-wc-tax.php:744
msgid "Tax"
msgstr ""
@@ -11215,34 +11203,40 @@ msgid ""
"shipping rate cache."
msgstr ""
-#: includes/admin/settings/class-wc-settings-shipping.php:215
+#: includes/admin/settings/class-wc-settings-shipping.php:214
#: includes/admin/settings/class-wc-settings-shipping.php:296
msgid "Zone does not exist!"
msgstr ""
-#: includes/admin/settings/class-wc-settings-shipping.php:241
+#: includes/admin/settings/class-wc-settings-shipping.php:240
#: includes/admin/settings/class-wc-settings-shipping.php:273
#: includes/admin/settings/class-wc-settings-shipping.php:329
#: includes/admin/settings/class-wc-settings-tax.php:168
msgid "Your changed data will be lost if you leave this page without saving."
msgstr ""
-#: includes/admin/settings/class-wc-settings-shipping.php:242
+#: includes/admin/settings/class-wc-settings-shipping.php:241
msgid ""
"Do you wish to save your changes first? Your changed data will be discarded "
"if you choose to cancel."
msgstr ""
-#: includes/admin/settings/class-wc-settings-shipping.php:243
+#: includes/admin/settings/class-wc-settings-shipping.php:242
#: includes/admin/settings/class-wc-settings-shipping.php:275
#: includes/admin/settings/class-wc-settings-shipping.php:330
msgid "Your changes were not saved. Please retry."
msgstr ""
-#: includes/admin/settings/class-wc-settings-shipping.php:244
+#: includes/admin/settings/class-wc-settings-shipping.php:243
msgid "Shipping method could not be added. Please retry."
msgstr ""
+#: includes/admin/settings/class-wc-settings-shipping.php:246
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:9
+#: includes/class-wc-shipping-zone.php:272
+msgid "Zone"
+msgstr ""
+
#: includes/admin/settings/class-wc-settings-shipping.php:274
msgid "Are you sure you want to delete this zone? This action cannot be undone."
msgstr ""
@@ -11420,7 +11414,7 @@ msgstr ""
#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:80
#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:157
-#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:183
+#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:182
#: includes/admin/settings/views/html-admin-page-shipping-zones.php:95
#: includes/admin/settings/views/html-admin-page-shipping-zones.php:121
msgid "Add shipping method"
@@ -13470,7 +13464,7 @@ msgstr ""
#: includes/api/class-wc-rest-order-notes-controller.php:266
#: includes/api/class-wc-rest-order-notes-controller.php:299
#: includes/api/class-wc-rest-order-refunds-controller.php:119
-#: includes/wc-core-functions.php:135 includes/wc-order-functions.php:493
+#: includes/wc-core-functions.php:135 includes/wc-order-functions.php:497
msgid "Invalid order ID."
msgstr ""
@@ -14396,6 +14390,13 @@ msgstr ""
msgid "#%s is an invalid image ID."
msgstr ""
+#: includes/api/class-wc-rest-products-controller.php:1361
+#: includes/api/legacy/v2/class-wc-api-products.php:1271
+#: includes/api/legacy/v3/class-wc-api-products.php:1761
+#. translators: 1: variation id 2: product name
+msgid "Variation #%1$s of %2$s"
+msgstr ""
+
#: includes/api/class-wc-rest-products-controller.php:1628
#: includes/api/class-wc-rest-webhooks-controller.php:309
msgid "Invalid post ID."
@@ -16341,7 +16342,7 @@ msgid "Refund failed"
msgstr ""
#: includes/class-wc-ajax.php:1408
-msgid "Item #%s stock increased from %1$s to %2$s."
+msgid "Item #%1$s stock increased from %2$s to %3$s."
msgstr ""
#: includes/class-wc-ajax.php:1494
@@ -16532,7 +16533,7 @@ msgstr ""
msgid "Get cart should not be called before the wp_loaded action."
msgstr ""
-#: includes/class-wc-cart.php:911 includes/class-wc-frontend-scripts.php:478
+#: includes/class-wc-cart.php:911 includes/class-wc-frontend-scripts.php:479
#: includes/wc-cart-functions.php:116 includes/wc-template-functions.php:1425
#. translators: %s: product name
msgid "View cart"
@@ -16587,63 +16588,63 @@ msgstr ""
msgid "Password"
msgstr ""
-#: includes/class-wc-checkout.php:588
+#: includes/class-wc-checkout.php:592
#. translators: %s: field name
msgid "Shipping %s"
msgstr ""
-#: includes/class-wc-checkout.php:592
+#: includes/class-wc-checkout.php:596
#. translators: %s: field name
msgid "Billing %s"
msgstr ""
-#: includes/class-wc-checkout.php:601 includes/class-wc-form-handler.php:114
+#: includes/class-wc-checkout.php:605 includes/class-wc-form-handler.php:114
#: includes/shortcodes/class-wc-shortcode-cart.php:27
msgid "Please enter a valid postcode / ZIP."
msgstr ""
-#: includes/class-wc-checkout.php:610 includes/class-wc-form-handler.php:123
+#: includes/class-wc-checkout.php:614 includes/class-wc-form-handler.php:123
#. translators: %s: phone number
msgid "%s is not a valid phone number."
msgstr ""
-#: includes/class-wc-checkout.php:619 includes/class-wc-form-handler.php:130
+#: includes/class-wc-checkout.php:623 includes/class-wc-form-handler.php:130
#. translators: %s: email address
msgid "%s is not a valid email address."
msgstr ""
-#: includes/class-wc-checkout.php:637
+#: includes/class-wc-checkout.php:641
#. translators: 1: state field 2: valid states
msgid "%1$s is not valid. Please enter one of the following: %2$s"
msgstr ""
-#: includes/class-wc-checkout.php:644 includes/class-wc-form-handler.php:101
+#: includes/class-wc-checkout.php:648 includes/class-wc-form-handler.php:101
#: includes/class-wc-form-handler.php:202
#. translators: %s: field name
msgid "%s is a required field."
msgstr ""
-#: includes/class-wc-checkout.php:659 includes/class-wc-form-handler.php:307
+#: includes/class-wc-checkout.php:663 includes/class-wc-form-handler.php:307
msgid "You must accept our Terms & Conditions."
msgstr ""
-#: includes/class-wc-checkout.php:666
+#: includes/class-wc-checkout.php:670
msgid "Please enter an address to continue."
msgstr ""
-#: includes/class-wc-checkout.php:668
+#: includes/class-wc-checkout.php:672
msgid ""
"Unfortunately we do not ship %s. Please enter an "
"alternative shipping address."
msgstr ""
-#: includes/class-wc-checkout.php:675
+#: includes/class-wc-checkout.php:679
msgid ""
"No shipping method has been selected. Please double check your address, or "
"contact us if you need any help."
msgstr ""
-#: includes/class-wc-checkout.php:684 includes/class-wc-form-handler.php:317
+#: includes/class-wc-checkout.php:688 includes/class-wc-form-handler.php:317
#: includes/class-wc-form-handler.php:400
#: includes/class-wc-form-handler.php:405
#: includes/class-wc-form-handler.php:410
@@ -16653,11 +16654,11 @@ msgstr ""
msgid "Invalid payment method."
msgstr ""
-#: includes/class-wc-checkout.php:883
+#: includes/class-wc-checkout.php:887
msgid "We were unable to process your order, please try again."
msgstr ""
-#: includes/class-wc-checkout.php:892
+#: includes/class-wc-checkout.php:896
msgid ""
"Sorry, your session has expired. Return to shop"
@@ -16880,7 +16881,7 @@ msgstr ""
msgid "Invalid role"
msgstr ""
-#: includes/class-wc-customer.php:943 includes/class-wc-order.php:943
+#: includes/class-wc-customer.php:943 includes/class-wc-order.php:959
msgid "Invalid billing email address"
msgstr ""
@@ -17110,35 +17111,35 @@ msgstr ""
msgid "Please select a rating"
msgstr ""
-#: includes/class-wc-frontend-scripts.php:448
+#: includes/class-wc-frontend-scripts.php:449
msgid "Error processing checkout. Please try again."
msgstr ""
-#: includes/class-wc-frontend-scripts.php:455
+#: includes/class-wc-frontend-scripts.php:456
#: includes/wc-template-functions.php:1880
msgid "required"
msgstr ""
-#: includes/class-wc-frontend-scripts.php:490
+#: includes/class-wc-frontend-scripts.php:491
msgid ""
"Sorry, no products matched your selection. Please choose a different "
"combination."
msgstr ""
-#: includes/class-wc-frontend-scripts.php:491
+#: includes/class-wc-frontend-scripts.php:492
msgid "Please select some product options before adding this product to your cart."
msgstr ""
-#: includes/class-wc-frontend-scripts.php:492
+#: includes/class-wc-frontend-scripts.php:493
#: templates/single-product/add-to-cart/variation.php:31
msgid "Sorry, this product is unavailable. Please choose a different combination."
msgstr ""
-#: includes/class-wc-frontend-scripts.php:516
+#: includes/class-wc-frontend-scripts.php:515
msgid "Please enter a stronger password."
msgstr ""
-#: includes/class-wc-frontend-scripts.php:517
+#: includes/class-wc-frontend-scripts.php:516
msgid ""
"The password should be at least seven characters long. To make it stronger, "
"use upper and lower case letters, numbers and symbols like ! \" ? $ % ^ "
@@ -17193,7 +17194,13 @@ msgid ""
"activate it manually by clicking here."
msgstr ""
-#: includes/class-wc-logger.php:107
+#: includes/class-wc-logger.php:55
+msgid ""
+"The provided handler %s does not implement "
+"WC_Log_Handler_Interface."
+msgstr ""
+
+#: includes/class-wc-logger.php:122
msgid "WC_Logger::log was called with an invalid level \"%s\"."
msgstr ""
@@ -17211,7 +17218,7 @@ msgid "Invalid variation ID"
msgstr ""
#: includes/class-wc-order-refund.php:74
-#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:91
+#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:88
#. translators: %s: Order date
msgid "Refund – %s"
msgstr ""
@@ -17691,18 +17698,13 @@ msgstr ""
msgid "Account details"
msgstr ""
-#: includes/class-wc-shipping-zone.php:55
-#: includes/class-wc-shipping-zone.php:272
-msgid "Zone"
-msgstr ""
-
-#: includes/class-wc-shipping-zone.php:142
+#: includes/class-wc-shipping-zone.php:141
msgid "%s and %d other region"
msgid_plural "%s and %d other regions"
msgstr[0] ""
msgstr[1] ""
-#: includes/class-wc-shipping-zone.php:147
+#: includes/class-wc-shipping-zone.php:146
msgid "Everywhere"
msgstr ""
@@ -17793,7 +17795,7 @@ msgstr ""
msgid "Invalid or missing payment token fields."
msgstr ""
-#: includes/data-stores/class-wc-payment-token-data-store.php:131
+#: includes/data-stores/class-wc-payment-token-data-store.php:137
msgid "Invalid payment token."
msgstr ""
@@ -19418,15 +19420,15 @@ msgstr ""
msgid "Password reset is not allowed for this user"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:47
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:46
msgid "Please enter a valid order ID"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:51
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:48
msgid "Please enter a valid order email"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-order-tracking.php:69
+#: includes/shortcodes/class-wc-shortcode-order-tracking.php:62
msgid "Sorry, we could not find that order ID in our database."
msgstr ""
@@ -20274,15 +20276,15 @@ msgstr ""
msgid "Fixed product discount"
msgstr ""
-#: includes/wc-formatting-functions.php:937
+#: includes/wc-formatting-functions.php:939
msgid "Only %s left in stock"
msgstr ""
-#: includes/wc-formatting-functions.php:941
+#: includes/wc-formatting-functions.php:943
msgid "%s in stock"
msgstr ""
-#: includes/wc-formatting-functions.php:946
+#: includes/wc-formatting-functions.php:948
msgid "(can be backordered)"
msgstr ""
@@ -20293,15 +20295,15 @@ msgstr ""
msgid "This function should not be called before woocommerce_init."
msgstr ""
-#: includes/wc-order-functions.php:93
+#: includes/wc-order-functions.php:97
msgid "wc_get_order should not be called before the woocommerce_init action."
msgstr ""
-#: includes/wc-order-functions.php:620 includes/wc-update-functions.php:773
+#: includes/wc-order-functions.php:624 includes/wc-update-functions.php:773
msgid "Order fully refunded"
msgstr ""
-#: includes/wc-order-functions.php:746
+#: includes/wc-order-functions.php:750
msgid "Unpaid order cancelled - time limit reached."
msgstr ""
@@ -21341,7 +21343,7 @@ msgstr ""
msgid "Next (arrow right)"
msgstr ""
-#: templates/single-product/product-image.php:44
+#: templates/single-product/product-image.php:47
msgid "Awaiting product image"
msgstr ""
@@ -21492,84 +21494,70 @@ msgstr ""
#: includes/admin/class-wc-admin-assets.php:112
#: includes/admin/class-wc-admin-setup-wizard.php:96
-#: includes/class-wc-frontend-scripts.php:499
-msgctxt "enhanced select"
-msgid "One result is available, press enter to select it."
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:113
-#: includes/admin/class-wc-admin-setup-wizard.php:97
#: includes/class-wc-frontend-scripts.php:500
msgctxt "enhanced select"
-msgid "%qty% results are available, use up and down arrow keys to navigate."
-msgstr ""
-
-#: includes/admin/class-wc-admin-assets.php:114
-#: includes/admin/class-wc-admin-setup-wizard.php:98
-#: includes/class-wc-frontend-scripts.php:501
-msgctxt "enhanced select"
msgid "No matches found"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:115
-#: includes/admin/class-wc-admin-setup-wizard.php:99
-#: includes/class-wc-frontend-scripts.php:502
+#: includes/admin/class-wc-admin-assets.php:113
+#: includes/admin/class-wc-admin-setup-wizard.php:97
+#: includes/class-wc-frontend-scripts.php:501
msgctxt "enhanced select"
msgid "Loading failed"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:116
-#: includes/admin/class-wc-admin-setup-wizard.php:100
-#: includes/class-wc-frontend-scripts.php:503
+#: includes/admin/class-wc-admin-assets.php:114
+#: includes/admin/class-wc-admin-setup-wizard.php:98
+#: includes/class-wc-frontend-scripts.php:502
msgctxt "enhanced select"
msgid "Please enter 1 or more characters"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:117
-#: includes/admin/class-wc-admin-setup-wizard.php:101
-#: includes/class-wc-frontend-scripts.php:504
+#: includes/admin/class-wc-admin-assets.php:115
+#: includes/admin/class-wc-admin-setup-wizard.php:99
+#: includes/class-wc-frontend-scripts.php:503
msgctxt "enhanced select"
msgid "Please enter %qty% or more characters"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:118
-#: includes/admin/class-wc-admin-setup-wizard.php:102
-#: includes/class-wc-frontend-scripts.php:505
+#: includes/admin/class-wc-admin-assets.php:116
+#: includes/admin/class-wc-admin-setup-wizard.php:100
+#: includes/class-wc-frontend-scripts.php:504
msgctxt "enhanced select"
msgid "Please delete 1 character"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:119
-#: includes/admin/class-wc-admin-setup-wizard.php:103
-#: includes/class-wc-frontend-scripts.php:506
+#: includes/admin/class-wc-admin-assets.php:117
+#: includes/admin/class-wc-admin-setup-wizard.php:101
+#: includes/class-wc-frontend-scripts.php:505
msgctxt "enhanced select"
msgid "Please delete %qty% characters"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:120
-#: includes/admin/class-wc-admin-setup-wizard.php:104
-#: includes/class-wc-frontend-scripts.php:507
+#: includes/admin/class-wc-admin-assets.php:118
+#: includes/admin/class-wc-admin-setup-wizard.php:102
+#: includes/class-wc-frontend-scripts.php:506
msgctxt "enhanced select"
msgid "You can only select 1 item"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:121
-#: includes/admin/class-wc-admin-setup-wizard.php:105
-#: includes/class-wc-frontend-scripts.php:508
+#: includes/admin/class-wc-admin-assets.php:119
+#: includes/admin/class-wc-admin-setup-wizard.php:103
+#: includes/class-wc-frontend-scripts.php:507
msgctxt "enhanced select"
msgid "You can only select %qty% items"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:122
-#: includes/admin/class-wc-admin-setup-wizard.php:106
-#: includes/class-wc-frontend-scripts.php:509
+#: includes/admin/class-wc-admin-assets.php:120
+#: includes/admin/class-wc-admin-setup-wizard.php:104
+#: includes/class-wc-frontend-scripts.php:508
msgctxt "enhanced select"
msgid "Loading more results…"
msgstr ""
-#: includes/admin/class-wc-admin-assets.php:123
-#: includes/admin/class-wc-admin-setup-wizard.php:107
-#: includes/class-wc-frontend-scripts.php:510
+#: includes/admin/class-wc-admin-assets.php:121
+#: includes/admin/class-wc-admin-setup-wizard.php:105
+#: includes/class-wc-frontend-scripts.php:509
msgctxt "enhanced select"
msgid "Searching…"
msgstr ""
@@ -21647,37 +21635,37 @@ msgstr ""
#: includes/admin/class-wc-admin-post-types.php:655
#: includes/admin/class-wc-admin-post-types.php:665
-#: includes/class-wc-order.php:745 includes/class-wc-order.php:755
+#: includes/class-wc-order.php:761 includes/class-wc-order.php:771
#. translators: 1: first name 2: last name
msgctxt "full name"
msgid "%1$s %2$s"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:232
+#: includes/admin/class-wc-admin-setup-wizard.php:230
#: includes/class-wc-install.php:319
msgctxt "Page title"
msgid "Shop"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:236
+#: includes/admin/class-wc-admin-setup-wizard.php:234
#: includes/class-wc-install.php:324
msgctxt "Page title"
msgid "Cart"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:240
+#: includes/admin/class-wc-admin-setup-wizard.php:238
#: includes/class-wc-install.php:329
msgctxt "Page title"
msgid "Checkout"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:246
+#: includes/admin/class-wc-admin-setup-wizard.php:244
#: includes/class-wc-install.php:334
msgctxt "Page title"
msgid "My account"
msgstr ""
-#: includes/admin/class-wc-admin-setup-wizard.php:602
+#: includes/admin/class-wc-admin-setup-wizard.php:600
#: includes/gateways/cheque/class-wc-gateway-cheque.php:27
#: includes/gateways/cheque/class-wc-gateway-cheque.php:63
msgctxt "Check payment method"
@@ -21809,7 +21797,7 @@ msgstr ""
#: includes/class-wc-order-refund.php:74
#: includes/data-stores/abstract-wc-order-data-store-cpt.php:169
-#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:91
+#: includes/data-stores/class-wc-order-refund-data-store-cpt.php:88
msgctxt "Order date parsed by strftime"
msgid "%b %d, %Y @ %I:%M %p"
msgstr ""
@@ -21824,37 +21812,37 @@ msgctxt "shop_order post type singular name"
msgid "Order"
msgstr ""
-#: includes/class-wc-post-types.php:468 includes/wc-order-functions.php:107
+#: includes/class-wc-post-types.php:468 includes/wc-order-functions.php:111
msgctxt "Order status"
msgid "Pending payment"
msgstr ""
-#: includes/class-wc-post-types.php:476 includes/wc-order-functions.php:108
+#: includes/class-wc-post-types.php:476 includes/wc-order-functions.php:112
msgctxt "Order status"
msgid "Processing"
msgstr ""
-#: includes/class-wc-post-types.php:484 includes/wc-order-functions.php:109
+#: includes/class-wc-post-types.php:484 includes/wc-order-functions.php:113
msgctxt "Order status"
msgid "On hold"
msgstr ""
-#: includes/class-wc-post-types.php:492 includes/wc-order-functions.php:110
+#: includes/class-wc-post-types.php:492 includes/wc-order-functions.php:114
msgctxt "Order status"
msgid "Completed"
msgstr ""
-#: includes/class-wc-post-types.php:500 includes/wc-order-functions.php:111
+#: includes/class-wc-post-types.php:500 includes/wc-order-functions.php:115
msgctxt "Order status"
msgid "Cancelled"
msgstr ""
-#: includes/class-wc-post-types.php:508 includes/wc-order-functions.php:112
+#: includes/class-wc-post-types.php:508 includes/wc-order-functions.php:116
msgctxt "Order status"
msgid "Refunded"
msgstr ""
-#: includes/class-wc-post-types.php:516 includes/wc-order-functions.php:113
+#: includes/class-wc-post-types.php:516 includes/wc-order-functions.php:117
msgctxt "Order status"
msgid "Failed"
msgstr ""
@@ -21864,7 +21852,7 @@ msgctxt "Price range: from-to"
msgid "%1$s–%2$s"
msgstr ""
-#: includes/wc-formatting-functions.php:983
+#: includes/wc-formatting-functions.php:985
msgctxt "Price range: from-to"
msgid "%1$s – %2$s"
msgstr ""
diff --git a/i18n/locale-info.php b/i18n/locale-info.php
index 3c6a68c9606..7f17495e74d 100644
--- a/i18n/locale-info.php
+++ b/i18n/locale-info.php
@@ -254,6 +254,26 @@ return array(
),
),
),
+ 'FI' => array(
+ 'currency_code' => 'EUR',
+ 'currency_pos' => 'right_space',
+ 'thousand_sep' => ' ',
+ 'decimal_sep' => ',',
+ 'num_decimals' => 2,
+ 'weight_unit' => 'kg',
+ 'dimension_unit' => 'cm',
+ 'tax_rates' => array(
+ '' => array(
+ array(
+ 'country' => 'FI',
+ 'state' => '',
+ 'rate' => '24.0000',
+ 'name' => 'ALV',
+ 'shipping' => true
+ )
+ )
+ )
+ ),
'FR' => array(
'currency_code' => 'EUR',
'currency_pos' => 'right',
diff --git a/includes/abstracts/abstract-wc-data.php b/includes/abstracts/abstract-wc-data.php
index dfc436bd392..6aa8e4a6d9d 100644
--- a/includes/abstracts/abstract-wc-data.php
+++ b/includes/abstracts/abstract-wc-data.php
@@ -17,30 +17,40 @@ abstract class WC_Data {
/**
* ID for this object.
+ *
+ * @since 2.7.0
* @var int
*/
protected $id = 0;
/**
* Core data for this object. Name value pairs (name + default value).
+ *
+ * @since 2.7.0
* @var array
*/
protected $data = array();
/**
* Core data changes for this object.
+ *
+ * @since 2.7.0
* @var array
*/
protected $changes = array();
/**
* This is false until the object is read from the DB.
+ *
+ * @since 2.7.0
* @var bool
*/
protected $object_read = false;
/**
* This is the name of this object type.
+ *
+ * @since 2.7.0
* @var string
*/
protected $object_type = 'data';
@@ -49,18 +59,24 @@ abstract class WC_Data {
* Extra data for this object. Name value pairs (name + default value).
* Used as a standard way for sub classes (like product types) to add
* additional information to an inherited class.
+ *
+ * @since 2.7.0
* @var array
*/
protected $extra_data = array();
/**
* Set to _data on construct so we can track and reset data if needed.
+ *
+ * @since 2.7.0
* @var array
*/
protected $default_data = array();
/**
* Contains a reference to the data store for this class.
+ *
+ * @since 2.7.0
* @var object
*/
protected $data_store;
@@ -68,28 +84,36 @@ abstract class WC_Data {
/**
* Stores meta in cache for future reads.
* A group must be set to to enable caching.
+ *
+ * @since 2.7.0
* @var string
*/
protected $cache_group = '';
/**
* Stores additonal meta data.
+ *
+ * @since 2.7.0
* @var array
*/
protected $meta_data = null;
/**
* Default constructor.
+ *
* @param int|object|array $read ID to load from the DB (optional) or already queried data.
*/
public function __construct( $read = 0 ) {
+
+ $this->data = array_merge( $this->data, $this->extra_data );
+
$this->default_data = $this->data;
}
/**
* Get the data store.
*
- * @since 2.7.0
+ * @since 2.7.0
* @return object
*/
public function get_data_store() {
@@ -98,6 +122,8 @@ abstract class WC_Data {
/**
* Returns the unique ID for this object.
+ *
+ * @since 2.6.0
* @return int
*/
public function get_id() {
@@ -107,6 +133,7 @@ abstract class WC_Data {
/**
* Delete an object, set the ID to 0, and return result.
*
+ * @since 2.6.0
* @param bool $force_delete
* @return bool result
*/
@@ -122,6 +149,7 @@ abstract class WC_Data {
/**
* Save should create or update based on object existance.
*
+ * @since 2.6.0
* @return int
*/
public function save() {
@@ -140,6 +168,8 @@ abstract class WC_Data {
/**
* Change data to JSON format.
+ *
+ * @since 2.6.0
* @return string Data in JSON format.
*/
public function __toString() {
@@ -148,6 +178,8 @@ abstract class WC_Data {
/**
* Returns all data for this object.
+ *
+ * @since 2.6.0
* @return array
*/
public function get_data() {
@@ -157,7 +189,7 @@ abstract class WC_Data {
/**
* Returns array of expected data keys for this object.
*
- * @since 2.7.0
+ * @since 2.7.0
* @return array
*/
public function get_data_keys() {
@@ -167,7 +199,7 @@ abstract class WC_Data {
/**
* Returns all "extra" data keys for an object (for sub objects like product types).
*
- * @since 2.7.0
+ * @since 2.7.0
* @return array
*/
public function get_extra_data_keys() {
@@ -176,6 +208,8 @@ abstract class WC_Data {
/**
* Filter null meta values from array.
+ *
+ * @since 2.7.0
* @return bool
*/
protected function filter_null_meta( $meta ) {
@@ -184,6 +218,7 @@ abstract class WC_Data {
/**
* Get All Meta Data.
+ *
* @since 2.6.0
* @return array
*/
@@ -194,6 +229,7 @@ abstract class WC_Data {
/**
* Get Meta Data by Key.
+ *
* @since 2.6.0
* @param string $key
* @param bool $single return first found meta with key, or all with $key
@@ -222,6 +258,7 @@ abstract class WC_Data {
/**
* Set all meta data from array.
+ *
* @since 2.6.0
* @param array $data Key/Value pairs
*/
@@ -243,6 +280,7 @@ abstract class WC_Data {
/**
* Add meta data.
+ *
* @since 2.6.0
* @param string $key Meta key
* @param string $value Meta value
@@ -261,7 +299,8 @@ abstract class WC_Data {
/**
* Update meta data by key or ID, if provided.
- * @since 2.6.0
+ *
+ * @since 2.6.0
* @param string $key
* @param string $value
* @param int $meta_id
@@ -281,6 +320,7 @@ abstract class WC_Data {
/**
* Delete meta data.
+ *
* @since 2.6.0
* @param array $key Meta key
*/
@@ -295,6 +335,7 @@ abstract class WC_Data {
/**
* Delete meta data.
+ *
* @since 2.6.0
* @param int $mid Meta ID
*/
@@ -371,6 +412,7 @@ abstract class WC_Data {
/**
* Update Meta Data in the database.
+ *
* @since 2.6.0
*/
public function save_meta_data() {
@@ -399,6 +441,8 @@ abstract class WC_Data {
/**
* Set ID.
+ *
+ * @since 2.7.0
* @param int $id
*/
public function set_id( $id ) {
@@ -407,6 +451,8 @@ abstract class WC_Data {
/**
* Set all props to default values.
+ *
+ * @since 2.7.0
*/
public function set_defaults() {
$this->data = $this->default_data;
@@ -416,6 +462,8 @@ abstract class WC_Data {
/**
* Set object read property.
+ *
+ * @since 2.7.0
* @param boolean $read
*/
public function set_object_read( $read = true ) {
@@ -424,6 +472,8 @@ abstract class WC_Data {
/**
* Get object read property.
+ *
+ * @since 2.7.0
* @return boolean
*/
public function get_object_read() {
@@ -434,7 +484,8 @@ abstract class WC_Data {
* Set a collection of props in one go, collect any errors, and return the result.
* Only sets using public methods.
*
- * @param array $props Key value pairs to set. Key is the prop and should map to a setter function name.
+ * @since 2.7.0
+ * @param array $props Key value pairs to set. Key is the prop and should map to a setter function name.
* @return WP_Error|bool
*/
public function set_props( $props, $context = 'set' ) {
@@ -510,7 +561,7 @@ abstract class WC_Data {
* @return string
*/
protected function get_hook_prefix() {
- return 'woocommerce_get_' . $this->object_type . '_';
+ return 'woocommerce_' . $this->object_type . '_get_';
}
/**
@@ -539,11 +590,15 @@ abstract class WC_Data {
/**
* When invalid data is found, throw an exception unless reading from the DB.
- * @param string $error_code Error code.
- * @param string $error_message Error message.
+ *
* @throws WC_Data_Exception
+ * @since 2.7.0
+ * @param string $code Error code.
+ * @param string $message Error message.
+ * @param int $http_status_code HTTP status code.
+ * @param array $data Extra error data.
*/
- protected function error( $error_code, $error_message ) {
- throw new WC_Data_Exception( $error_code, $error_message );
+ protected function error( $code, $message, $http_status_code = 400, $data = array() ) {
+ throw new WC_Data_Exception( $code, $message, $http_status_code, $data );
}
}
diff --git a/includes/abstracts/abstract-wc-legacy-order.php b/includes/abstracts/abstract-wc-legacy-order.php
index a622935409c..7e6483e25e4 100644
--- a/includes/abstracts/abstract-wc-legacy-order.php
+++ b/includes/abstracts/abstract-wc-legacy-order.php
@@ -25,7 +25,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function add_coupon( $code = array(), $discount = 0, $discount_tax = 0 ) {
- wc_deprecated_function( 'WC_Order::add_coupon', '2.7', 'Create new WC_Order_Item_Coupon object and add to order with WC_Order::add_item()' );
+ wc_deprecated_function( 'WC_Order::add_coupon', '2.7', 'a new WC_Order_Item_Coupon object and add to order with WC_Order::add_item()' );
$item = new WC_Order_Item_Coupon();
$item->set_props( array(
@@ -36,7 +36,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
) );
$item->save();
$this->add_item( $item );
- wc_do_deprecated_action( 'woocommerce_order_add_coupon', array( $this->get_id(), $item->get_id(), $code, $discount, $discount_tax ), '2.7', 'Use woocommerce_new_order_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_order_add_coupon', array( $this->get_id(), $item->get_id(), $code, $discount, $discount_tax ), '2.7', 'woocommerce_new_order_item action instead.' );
return $item->get_id();
}
@@ -49,7 +49,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function add_tax( $tax_rate_id, $tax_amount = 0, $shipping_tax_amount = 0 ) {
- wc_deprecated_function( 'WC_Order::add_tax', '2.7', 'Create new WC_Order_Item_Tax object and add to order with WC_Order::add_item()' );
+ wc_deprecated_function( 'WC_Order::add_tax', '2.7', 'a new WC_Order_Item_Tax object and add to order with WC_Order::add_item()' );
$item = new WC_Order_Item_Tax();
$item->set_props( array(
@@ -61,7 +61,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
$item->set_order_id( $this->get_id() );
$item->save();
$this->add_item( $item );
- wc_do_deprecated_action( 'woocommerce_order_add_tax', array( $this->get_id(), $item->get_id(), $tax_rate_id, $tax_amount, $shipping_tax_amount ), '2.7', 'Use woocommerce_new_order_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_order_add_tax', array( $this->get_id(), $item->get_id(), $tax_rate_id, $tax_amount, $shipping_tax_amount ), '2.7', 'woocommerce_new_order_item action instead.' );
return $item->get_id();
}
@@ -72,7 +72,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function add_shipping( $shipping_rate ) {
- wc_deprecated_function( 'WC_Order::add_shipping', '2.7', 'Create new WC_Order_Item_Shipping object and add to order with WC_Order::add_item()' );
+ wc_deprecated_function( 'WC_Order::add_shipping', '2.7', 'a new WC_Order_Item_Shipping object and add to order with WC_Order::add_item()' );
$item = new WC_Order_Item_Shipping();
$item->set_props( array(
@@ -80,12 +80,14 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
'method_id' => $shipping_rate->id,
'total' => wc_format_decimal( $shipping_rate->cost ),
'taxes' => $shipping_rate->taxes,
- 'meta_data' => $shipping_rate->get_meta_data(),
'order_id' => $this->get_id(),
) );
+ foreach ( $shipping_rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$item->save();
$this->add_item( $item );
- wc_do_deprecated_action( 'woocommerce_order_add_shipping', array( $this->get_id(), $item->get_id(), $shipping_rate ), '2.7', 'Use woocommerce_new_order_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_order_add_shipping', array( $this->get_id(), $item->get_id(), $shipping_rate ), '2.7', 'woocommerce_new_order_item action instead.' );
return $item->get_id();
}
@@ -97,7 +99,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function add_fee( $fee ) {
- wc_deprecated_function( 'WC_Order::add_fee', '2.7', 'Create new WC_Order_Item_Fee object and add to order with WC_Order::add_item()' );
+ wc_deprecated_function( 'WC_Order::add_fee', '2.7', 'a new WC_Order_Item_Fee object and add to order with WC_Order::add_item()' );
$item = new WC_Order_Item_Fee();
$item->set_props( array(
@@ -112,7 +114,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
) );
$item->save();
$this->add_item( $item );
- wc_do_deprecated_action( 'woocommerce_order_add_fee', array( $this->get_id(), $item->get_id(), $fee ), '2.7', 'Use woocommerce_new_order_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_order_add_fee', array( $this->get_id(), $item->get_id(), $fee ), '2.7', 'woocommerce_new_order_item action instead.' );
return $item->get_id();
}
@@ -128,7 +130,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function update_product( $item, $product, $args ) {
- wc_deprecated_function( 'WC_Order::update_product', '2.7', 'Interact with WC_Order_Item_Product class' );
+ wc_deprecated_function( 'WC_Order::update_product', '2.7', 'an interaction with the WC_Order_Item_Product class' );
if ( is_numeric( $item ) ) {
$item = $this->get_item( $item );
}
@@ -177,7 +179,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function update_coupon( $item, $args ) {
- wc_deprecated_function( 'WC_Order::update_coupon', '2.7', 'Interact with WC_Order_Item_Coupon class' );
+ wc_deprecated_function( 'WC_Order::update_coupon', '2.7', 'an interaction with the WC_Order_Item_Coupon class' );
if ( is_numeric( $item ) ) {
$item = $this->get_item( $item );
}
@@ -216,7 +218,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function update_shipping( $item, $args ) {
- wc_deprecated_function( 'WC_Order::update_shipping', '2.7', 'Interact with WC_Order_Item_Shipping class' );
+ wc_deprecated_function( 'WC_Order::update_shipping', '2.7', 'an interaction with the WC_Order_Item_Shipping class' );
if ( is_numeric( $item ) ) {
$item = $this->get_item( $item );
}
@@ -253,7 +255,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function update_fee( $item, $args ) {
- wc_deprecated_function( 'WC_Order::update_fee', '2.7', 'Interact with WC_Order_Item_Fee class' );
+ wc_deprecated_function( 'WC_Order::update_fee', '2.7', 'an interaction with the WC_Order_Item_Fee class' );
if ( is_numeric( $item ) ) {
$item = $this->get_item( $item );
}
@@ -284,7 +286,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
* @throws WC_Data_Exception
*/
public function update_tax( $item, $args ) {
- wc_deprecated_function( 'WC_Order::update_tax', '2.7', 'Interact with WC_Order_Item_Tax class' );
+ wc_deprecated_function( 'WC_Order::update_tax', '2.7', 'an interaction with the WC_Order_Item_Tax class' );
if ( is_numeric( $item ) ) {
$item = $this->get_item( $item );
}
@@ -400,13 +402,13 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
wc_doing_it_wrong( $key, 'Order properties should not be accessed directly.', '2.7' );
if ( 'completed_date' === $key ) {
- return $this->get_date_completed();
+ return date( 'Y-m-d H:i:s', $this->get_date_completed() );
} elseif ( 'paid_date' === $key ) {
return $this->get_date_paid();
} elseif ( 'modified_date' === $key ) {
- return $this->get_date_modified();
+ return date( 'Y-m-d H:i:s', $this->get_date_modified() );
} elseif ( 'order_date' === $key ) {
- return $this->get_date_created();
+ return date( 'Y-m-d H:i:s', $this->get_date_created() );
} elseif ( 'id' === $key ) {
return $this->get_id();
} elseif ( 'post' === $key ) {
@@ -426,7 +428,7 @@ abstract class WC_Abstract_Legacy_Order extends WC_Data {
} elseif ( 'display_cart_ex_tax' === $key ) {
return 'excl' === get_option( 'woocommerce_tax_display_cart' );
} elseif ( 'cart_discount' === $key ) {
- return $this->get_discount();
+ return $this->get_total_discount();
} elseif ( 'cart_discount_tax' === $key ) {
return $this->get_discount_tax();
} elseif ( 'order_tax' === $key ) {
diff --git a/includes/abstracts/abstract-wc-legacy-payment-token.php b/includes/abstracts/abstract-wc-legacy-payment-token.php
index 176ab94030f..77fdf8174a0 100644
--- a/includes/abstracts/abstract-wc-legacy-payment-token.php
+++ b/includes/abstracts/abstract-wc-legacy-payment-token.php
@@ -22,7 +22,7 @@ abstract class WC_Legacy_Payment_Token extends WC_Data {
* @deprecated 2.7.0 - Init a token class with an ID.
*/
public function read( $token_id ) {
- wc_deprecated_function( 'WC_Payment_Token::read', '2.7', 'Init a token class with an ID.' );
+ wc_deprecated_function( 'WC_Payment_Token::read', '2.7', 'a new token class initialized with an ID.' );
$this->set_id( $token_id );
$data_store = WC_Data_Store::load( 'payment-token' );
$data_store->read( $this );
@@ -33,7 +33,7 @@ abstract class WC_Legacy_Payment_Token extends WC_Data {
* @deprecated 2.7.0 - Use ::save instead.
*/
public function update() {
- wc_deprecated_function( 'WC_Payment_Token::update', '2.7', 'Use ::save instead.' );
+ wc_deprecated_function( 'WC_Payment_Token::update', '2.7', '::save instead.' );
$data_store = WC_Data_Store::load( 'payment-token' );
try {
$data_store->update( $this );
@@ -47,7 +47,7 @@ abstract class WC_Legacy_Payment_Token extends WC_Data {
* @deprecated 2.7.0 - Use ::save instead.
*/
public function create() {
- wc_deprecated_function( 'WC_Payment_Token::create', '2.7', 'Use ::save instead.' );
+ wc_deprecated_function( 'WC_Payment_Token::create', '2.7', '::save instead.' );
$data_store = WC_Data_Store::load( 'payment-token' );
try {
$data_store->create( $this );
diff --git a/includes/abstracts/abstract-wc-legacy-product.php b/includes/abstracts/abstract-wc-legacy-product.php
index 4148564e4c0..ca3aafad14e 100644
--- a/includes/abstracts/abstract-wc-legacy-product.php
+++ b/includes/abstracts/abstract-wc-legacy-product.php
@@ -417,7 +417,7 @@ abstract class WC_Abstract_Legacy_Product extends WC_Data {
* @return bool
*/
public function has_default_attributes() {
- wc_deprecated_function( 'WC_Product_Variable::has_default_attributes', '2.7', 'Check WC_Product::get_default_attributes directly' );
+ wc_deprecated_function( 'WC_Product_Variable::has_default_attributes', '2.7', 'a check against WC_Product::get_default_attributes directly' );
if ( ! $this->get_default_attributes() ) {
return true;
}
@@ -431,7 +431,7 @@ abstract class WC_Abstract_Legacy_Product extends WC_Data {
* @return int
*/
public function get_variation_id() {
- wc_deprecated_function( 'WC_Product::get_variation_id', '2.7', 'WC_Product::get_id() will always be the variation ID if this is a variation.' );
+ wc_deprecated_function( 'WC_Product::get_variation_id', '2.7', 'WC_Product::get_id(). It will always be the variation ID if this is a variation.' );
return $this->get_id();
}
@@ -453,7 +453,7 @@ abstract class WC_Abstract_Legacy_Product extends WC_Data {
* @return boolean
*/
public function has_all_attributes_set() {
- wc_deprecated_function( 'WC_Product::has_all_attributes_set', '2.7', 'Use array filter on get_variation_attributes for a quick solution.' );
+ wc_deprecated_function( 'WC_Product::has_all_attributes_set', '2.7', 'an array filter on get_variation_attributes for a quick solution.' );
$set = true;
// undefined attributes have null strings as array values
@@ -484,7 +484,7 @@ abstract class WC_Abstract_Legacy_Product extends WC_Data {
* @return int
*/
public function get_total_stock() {
- wc_deprecated_function( 'WC_Product::get_total_stock', '2.7', 'Use get_stock_quantity on each child. Beware of performance issues in doing so.' );
+ wc_deprecated_function( 'WC_Product::get_total_stock', '2.7', 'get_stock_quantity on each child. Beware of performance issues in doing so.' );
if ( sizeof( $this->get_children() ) > 0 ) {
$total_stock = max( 0, $this->get_stock_quantity() );
diff --git a/includes/abstracts/abstract-wc-log-handler.php b/includes/abstracts/abstract-wc-log-handler.php
index 39d74dd92c9..a8f5898ffd7 100644
--- a/includes/abstracts/abstract-wc-log-handler.php
+++ b/includes/abstracts/abstract-wc-log-handler.php
@@ -11,20 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) {
* @category Abstract Class
* @author WooThemes
*/
-abstract class WC_Log_Handler {
-
-
- /**
- * Handle a log entry.
- *
- * @param int $timestamp Log timestamp.
- * @param string $level emergency|alert|critical|error|warning|notice|info|debug
- * @param string $message Log message.
- * @param array $context Additional information for log handlers.
- *
- * @return bool False if value was not handled and true if value was handled.
- */
- abstract public function handle( $timestamp, $level, $message, $context );
+abstract class WC_Log_Handler implements WC_Log_Handler_Interface {
/**
* Formats a timestamp for use in log messages.
diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index b38660bd52d..9c957b09ae3 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -213,17 +213,17 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
switch ( $item_group ) {
case 'fee_lines' :
if ( isset( $item->legacy_fee, $item->legacy_fee_key ) ) {
- wc_do_deprecated_action( 'woocommerce_add_order_fee_meta', array( $this->get_id(), $item_id, $item->legacy_fee, $item->legacy_fee_key ), '2.7', 'Use CRUD and woocommerce_checkout_create_order_fee_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_add_order_fee_meta', array( $this->get_id(), $item_id, $item->legacy_fee, $item->legacy_fee_key ), '2.7', 'CRUD and woocommerce_checkout_create_order_fee_item action instead' );
}
break;
case 'shipping_lines' :
if ( isset( $item->legacy_package_key ) ) {
- wc_do_deprecated_action( 'woocommerce_add_shipping_order_item', array( $this->get_id(), $item_id, $item->legacy_package_key ), '2.7', 'Use CRUD woocommerce_checkout_create_order_shipping_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_add_shipping_order_item', array( $this->get_id(), $item_id, $item->legacy_package_key ), '2.7', 'CRUD woocommerce_checkout_create_order_shipping_item action instead' );
}
break;
case 'line_items' :
if ( isset( $item->legacy_values, $item->legacy_cart_item_key ) ) {
- wc_do_deprecated_action( 'woocommerce_add_order_item_meta', array( $item_id, $item->legacy_values, $item->legacy_cart_item_key ), '2.7', 'Use CRUD and woocommerce_checkout_create_order_line_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_add_order_item_meta', array( $item_id, $item->legacy_values, $item->legacy_cart_item_key ), '2.7', 'CRUD and woocommerce_checkout_create_order_line_item action instead' );
}
break;
}
@@ -447,6 +447,16 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
return apply_filters( 'woocommerce_order_get_tax_totals', $tax_totals, $this );
}
+ /**
+ * Get all valid statuses for this order
+ *
+ * @since 2.7.0
+ * @return array Internal status keys e.g. 'wc-processing'
+ */
+ protected function get_valid_statuses() {
+ return array_keys( wc_get_order_statuses() );
+ }
+
/*
|--------------------------------------------------------------------------
| Setters
@@ -484,14 +494,14 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
// Only allow valid new status
- if ( ! in_array( 'wc-' . $new_status, array_keys( wc_get_order_statuses() ) ) ) {
+ if ( ! in_array( 'wc-' . $new_status, $this->get_valid_statuses() ) ) {
$new_status = 'pending';
}
$this->set_prop( 'status', $new_status );
// If the old status is set but unknown (e.g. draft) assume its pending for action usage.
- if ( $old_status && ! in_array( 'wc-' . $old_status, array_keys( wc_get_order_statuses() ) ) ) {
+ if ( $old_status && ! in_array( 'wc-' . $old_status, $this->get_valid_statuses() ) ) {
$old_status = 'pending';
}
@@ -890,7 +900,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
$item->set_order_id( $this->get_id() );
$item->save();
$this->add_item( $item );
- wc_do_deprecated_action( 'woocommerce_order_add_product', array( $this->get_id(), $item->get_id(), $product, $qty, $args ), '2.7', 'Use woocommerce_new_order_item action instead.' );
+ wc_do_deprecated_action( 'woocommerce_order_add_product', array( $this->get_id(), $item->get_id(), $product, $qty, $args ), '2.7', 'woocommerce_new_order_item action instead' );
return $item->get_id();
}
@@ -1038,11 +1048,10 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// Inherit tax class from items
if ( 'inherit' === $shipping_tax_class ) {
$tax_rates = array();
- $tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() );
+ $tax_classes = array_merge( array( '' ), WC_Tax::get_tax_class_slugs() );
$found_tax_classes = $this->get_items_tax_classes();
foreach ( $tax_classes as $tax_class ) {
- $tax_class = sanitize_title( $tax_class );
if ( in_array( $tax_class, $found_tax_classes ) ) {
$tax_rates = WC_Tax::find_shipping_rates( array(
'country' => $args['country'],
diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php
index 64264cfae5c..6af55450010 100644
--- a/includes/abstracts/abstract-wc-product.php
+++ b/includes/abstracts/abstract-wc-product.php
@@ -145,23 +145,6 @@ class WC_Product extends WC_Abstract_Legacy_Product {
| Methods for getting data from the product object.
*/
- /**
- * Get all class data in array format.
- * @since 2.7.0
- * @return array
- */
- public function get_data() {
- return array_merge(
- array(
- 'id' => $this->get_id(),
- ),
- $this->data,
- array(
- 'meta_data' => $this->get_meta_data(),
- )
- );
- }
-
/**
* Get product name.
*
@@ -804,7 +787,9 @@ class WC_Product extends WC_Abstract_Legacy_Product {
public function set_sku( $sku ) {
$sku = (string) $sku;
if ( $this->get_object_read() && ! empty( $sku ) && ! wc_product_has_unique_sku( $this->get_id(), $sku ) ) {
- $this->error( 'product_invalid_sku', __( 'Invalid or duplicated SKU.', 'woocommerce' ) );
+ $sku_found = wc_get_product_id_by_sku( $sku );
+
+ $this->error( 'product_invalid_sku', __( 'Invalid or duplicated SKU.', 'woocommerce' ), 400, array( 'resource_id' => $sku_found ) );
}
$this->set_prop( 'sku', $sku );
}
diff --git a/includes/abstracts/abstract-wc-rest-controller.php b/includes/abstracts/abstract-wc-rest-controller.php
index bb2941304e1..dc3a1490786 100644
--- a/includes/abstracts/abstract-wc-rest-controller.php
+++ b/includes/abstracts/abstract-wc-rest-controller.php
@@ -168,6 +168,12 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
if ( ! empty( $items['delete'] ) ) {
foreach ( $items['delete'] as $id ) {
+ $id = (int) $id;
+
+ if ( 0 === $id ) {
+ continue;
+ }
+
$_item = new WP_REST_Request( 'DELETE' );
$_item->set_query_params( array( 'id' => $id, 'force' => true ) );
$_response = $this->delete_item( $_item );
@@ -353,16 +359,25 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
'description' => __( 'List of created resources.', 'woocommerce' ),
'type' => 'array',
'context' => array( 'view', 'edit' ),
+ 'items' => array(
+ 'type' => 'object',
+ ),
),
'update' => array(
'description' => __( 'List of updated resources.', 'woocommerce' ),
'type' => 'array',
'context' => array( 'view', 'edit' ),
+ 'items' => array(
+ 'type' => 'object',
+ ),
),
'delete' => array(
'description' => __( 'List of delete resources.', 'woocommerce' ),
'type' => 'array',
'context' => array( 'view', 'edit' ),
+ 'items' => array(
+ 'type' => 'integer',
+ ),
),
),
);
diff --git a/includes/abstracts/abstract-wc-rest-posts-controller.php b/includes/abstracts/abstract-wc-rest-posts-controller.php
index fa71c8b7659..e1534cde2c3 100644
--- a/includes/abstracts/abstract-wc-rest-posts-controller.php
+++ b/includes/abstracts/abstract-wc-rest-posts-controller.php
@@ -93,7 +93,7 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
* @return WP_Error|boolean
*/
public function update_item_permissions_check( $request ) {
- $post = get_post( $request['id'] );
+ $post = get_post( (int) $request['id'] );
if ( $post && ! wc_rest_check_post_permissions( $this->post_type, 'edit', $post->ID ) ) {
return new WP_Error( 'woocommerce_rest_cannot_edit', __( 'Sorry, you are not allowed to edit this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
@@ -109,7 +109,7 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
* @return bool|WP_Error
*/
public function delete_item_permissions_check( $request ) {
- $post = get_post( $request['id'] );
+ $post = get_post( (int) $request['id'] );
if ( $post && ! wc_rest_check_post_permissions( $this->post_type, 'delete', $post->ID ) ) {
return new WP_Error( 'woocommerce_rest_cannot_delete', __( 'Sorry, you are not allowed to delete this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
@@ -625,16 +625,22 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
'validate_callback' => 'rest_validate_request_arg',
);
$params['exclude'] = array(
- 'description' => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
- 'type' => 'array',
- 'default' => array(),
- 'sanitize_callback' => 'wp_parse_id_list',
+ 'description' => __( 'Ensure result set excludes specific IDs.', 'woocommerce' ),
+ 'type' => 'array',
+ 'items' => array(
+ 'type' => 'integer',
+ ),
+ 'default' => array(),
+ 'sanitize_callback' => 'wp_parse_id_list',
);
$params['include'] = array(
- 'description' => __( 'Limit result set to specific ids.', 'woocommerce' ),
- 'type' => 'array',
- 'default' => array(),
- 'sanitize_callback' => 'wp_parse_id_list',
+ 'description' => __( 'Limit result set to specific ids.', 'woocommerce' ),
+ 'type' => 'array',
+ 'items' => array(
+ 'type' => 'integer',
+ ),
+ 'default' => array(),
+ 'sanitize_callback' => 'wp_parse_id_list',
);
$params['offset'] = array(
'description' => __( 'Offset the result set by a specific number of items.', 'woocommerce' ),
@@ -664,22 +670,30 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
);
$post_type_obj = get_post_type_object( $this->post_type );
+
if ( isset( $post_type_obj->hierarchical ) && $post_type_obj->hierarchical ) {
$params['parent'] = array(
'description' => __( 'Limit result set to those of particular parent IDs.', 'woocommerce' ),
'type' => 'array',
+ 'items' => array(
+ 'type' => 'integer',
+ ),
'sanitize_callback' => 'wp_parse_id_list',
'default' => array(),
);
$params['parent_exclude'] = array(
'description' => __( 'Limit result set to all items except those of a particular parent ID.', 'woocommerce' ),
'type' => 'array',
+ 'items' => array(
+ 'type' => 'integer',
+ ),
'sanitize_callback' => 'wp_parse_id_list',
'default' => array(),
);
}
$params['filter'] = array(
+ 'type' => 'object',
'description' => __( 'Use WP Query arguments to modify the response; private query vars require appropriate authorization.', 'woocommerce' ),
);
diff --git a/includes/abstracts/abstract-wc-rest-terms-controller.php b/includes/abstracts/abstract-wc-rest-terms-controller.php
index 329fa5592ef..a0789c08f78 100644
--- a/includes/abstracts/abstract-wc-rest-terms-controller.php
+++ b/includes/abstracts/abstract-wc-rest-terms-controller.php
@@ -45,7 +45,9 @@ abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
'permission_callback' => array( $this, 'create_item_permissions_check' ),
'args' => array_merge( $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ), array(
'name' => array(
- 'required' => true,
+ 'type' => 'string',
+ 'description' => __( 'Name for the resource.', 'woocommerce' ),
+ 'required' => true,
),
) ),
),
@@ -53,6 +55,12 @@ abstract class WC_REST_Terms_Controller extends WC_REST_Controller {
));
register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P| - | - | + | + | |||||
|---|---|---|---|---|---|---|---|---|
| + | ||||||||
- +
@@ -110,9 +107,11 @@ if ( ! defined( 'ABSPATH' ) ) { |%s does not implement WC_Log_Handler_Interface.', 'woocommerce' ),
+ esc_html( is_object( $handler ) ? get_class( $handler ) : $handler )
+ ),
+ '2.7'
+ );
+ }
+ }
+
if ( null !== $threshold ) {
$threshold = WC_Log_Levels::get_level_severity( $threshold );
} elseif ( defined( 'WC_LOG_THRESHOLD' ) && WC_Log_Levels::is_valid_level( WC_LOG_THRESHOLD ) ) {
@@ -51,7 +68,7 @@ class WC_Logger implements WC_Logger_Interface {
$threshold = null;
}
- $this->handlers = $handlers;
+ $this->handlers = $register_handlers;
$this->threshold = $threshold;
}
@@ -61,7 +78,7 @@ class WC_Logger implements WC_Logger_Interface {
* @param string $level emergency|alert|critical|error|warning|notice|info|debug
* @return bool True if the log should be handled.
*/
- public function should_handle( $level ) {
+ protected function should_handle( $level ) {
if ( null === $this->threshold ) {
return true;
}
@@ -102,9 +119,7 @@ class WC_Logger implements WC_Logger_Interface {
*/
public function log( $level, $message, $context = array() ) {
if ( ! WC_Log_Levels::is_valid_level( $level ) ) {
- $class = __CLASS__;
- $method = __FUNCTION__;
- wc_doing_it_wrong( "{$class}::{$method}", sprintf( __( 'WC_Logger::log was called with an invalid level "%s".', 'woocommerce' ), $level ), '2.7' );
+ wc_doing_it_wrong( __METHOD__, sprintf( __( 'WC_Logger::log was called with an invalid level "%s".', 'woocommerce' ), $level ), '2.7' );
}
if ( $this->should_handle( $level ) ) {
diff --git a/includes/class-wc-order-item-fee.php b/includes/class-wc-order-item-fee.php
index 1a9d59223a7..62b3c691478 100644
--- a/includes/class-wc-order-item-fee.php
+++ b/includes/class-wc-order-item-fee.php
@@ -41,7 +41,7 @@ class WC_Order_Item_Fee extends WC_Order_Item {
* @throws WC_Data_Exception
*/
public function set_tax_class( $value ) {
- if ( $value && ! in_array( $value, WC_Tax::get_tax_classes() ) ) {
+ if ( $value && ! in_array( $value, WC_Tax::get_tax_class_slugs() ) ) {
$this->error( 'order_item_fee_invalid_tax_class', __( 'Invalid tax class', 'woocommerce' ) );
}
$this->set_prop( 'tax_class', $value );
diff --git a/includes/class-wc-order-item-product.php b/includes/class-wc-order-item-product.php
index 1d3b76e3d34..902dde5366a 100644
--- a/includes/class-wc-order-item-product.php
+++ b/includes/class-wc-order-item-product.php
@@ -57,7 +57,7 @@ class WC_Order_Item_Product extends WC_Order_Item {
* @throws WC_Data_Exception
*/
public function set_tax_class( $value ) {
- if ( $value && ! in_array( $value, WC_Tax::get_tax_classes() ) ) {
+ if ( $value && ! in_array( $value, WC_Tax::get_tax_class_slugs() ) ) {
$this->error( 'order_item_product_invalid_tax_class', __( 'Invalid tax class', 'woocommerce' ) );
}
$this->set_prop( 'tax_class', $value );
diff --git a/includes/class-wc-order-item.php b/includes/class-wc-order-item.php
index 51bb8b77a3a..6631b002bd8 100644
--- a/includes/class-wc-order-item.php
+++ b/includes/class-wc-order-item.php
@@ -57,7 +57,6 @@ class WC_Order_Item extends WC_Data implements ArrayAccess {
* @param int|object|array $item ID to load from the DB, or WC_Order_Item Object
*/
public function __construct( $item = 0 ) {
- $this->data = array_merge( $this->data, $this->extra_data );
parent::__construct( $item );
if ( $item instanceof WC_Order_Item ) {
diff --git a/includes/class-wc-order-refund.php b/includes/class-wc-order-refund.php
index 7ac150d7a89..db9e9823d9b 100644
--- a/includes/class-wc-order-refund.php
+++ b/includes/class-wc-order-refund.php
@@ -38,16 +38,6 @@ class WC_Order_Refund extends WC_Abstract_Order {
'refunded_by' => 0,
);
- /**
- * Extend the abstract _data properties and then read the order object.
- *
- * @param int|object|WC_Order $read Order to init.
- */
- public function __construct( $read = 0 ) {
- $this->data = array_merge( $this->data, $this->extra_data );
- parent::__construct( $read );
- }
-
/**
* Get internal type (post type.)
* @return string
diff --git a/includes/class-wc-order.php b/includes/class-wc-order.php
index 51124ff3083..08be1765659 100644
--- a/includes/class-wc-order.php
+++ b/includes/class-wc-order.php
@@ -340,6 +340,22 @@ class WC_Order extends WC_Abstract_Order {
);
}
+ /**
+ * Expands the shipping and billing information in the changes array.
+ */
+ public function get_changes() {
+ $changed_props = parent::get_changes();
+ $subs = array( 'shipping', 'billing' );
+ foreach ( $subs as $sub ) {
+ if ( ! empty( $changed_props[ $sub ] ) ) {
+ foreach ( $changed_props[ $sub ] as $sub_prop => $value ) {
+ $changed_props[ $sub . '_' . $sub_prop ] = $value;
+ }
+ }
+ }
+ return $changed_props;
+ }
+
/**
* get_order_number function.
*
diff --git a/includes/class-wc-product-external.php b/includes/class-wc-product-external.php
index 7ef27817ee9..1d81376a193 100644
--- a/includes/class-wc-product-external.php
+++ b/includes/class-wc-product-external.php
@@ -26,15 +26,6 @@ class WC_Product_External extends WC_Product {
'button_text' => '',
);
- /**
- * Merges external product data into the parent object.
- * @param int|WC_Product|object $product Product to init.
- */
- public function __construct( $product = 0 ) {
- $this->data = array_merge( $this->data, $this->extra_data );
- parent::__construct( $product );
- }
-
/**
* Get internal type.
* @return string
diff --git a/includes/class-wc-product-grouped.php b/includes/class-wc-product-grouped.php
index 87bac32435f..d67279b65e8 100644
--- a/includes/class-wc-product-grouped.php
+++ b/includes/class-wc-product-grouped.php
@@ -25,15 +25,6 @@ class WC_Product_Grouped extends WC_Product {
'children' => array(),
);
- /**
- * Merges grouped product data into the parent object.
- * @param int|WC_Product|object $product Product to init.
- */
- public function __construct( $product = 0 ) {
- $this->data = array_merge( $this->data, $this->extra_data );
- parent::__construct( $product );
- }
-
/**
* Get internal type.
* @return string
diff --git a/includes/class-wc-product-variable.php b/includes/class-wc-product-variable.php
index b431ac0b70b..bc17c3efead 100644
--- a/includes/class-wc-product-variable.php
+++ b/includes/class-wc-product-variable.php
@@ -455,7 +455,7 @@ class WC_Product_Variable extends WC_Product {
$data_store->sync_stock_status( $product );
self::sync_attributes( $product ); // Legacy update of attributes.
- do_action( 'woocommerce_variable_product_sync', $product->get_id(), $product->get_visible_children( 'edit' ), $save );
+ do_action( 'woocommerce_variable_product_sync', $product->get_id(), $product->get_visible_children(), $save );
if ( $save ) {
$product->save();
diff --git a/includes/class-wc-product-variation.php b/includes/class-wc-product-variation.php
index 52dc96e4fd2..99fec657b14 100644
--- a/includes/class-wc-product-variation.php
+++ b/includes/class-wc-product-variation.php
@@ -44,7 +44,7 @@ class WC_Product_Variation extends WC_Product_Simple {
* @return string
*/
protected function get_hook_prefix() {
- return 'woocommerce_get_product_variation_';
+ return 'woocommerce_product_variation_get_';
}
/**
@@ -299,6 +299,16 @@ class WC_Product_Variation extends WC_Product_Simple {
$this->parent_data = $parent_data;
}
+ /**
+ * Get the parent data array for this variation.
+ *
+ * @since 2.7.0
+ * @return array
+ */
+ public function get_parent_data() {
+ return $this->parent_data;
+ }
+
/**
* Set attributes. Unlike the parent product which uses terms, variations are assigned
* specific attributes using name value pairs.
diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php
index 100897ffcbc..9c321ab27b7 100644
--- a/includes/class-wc-query.php
+++ b/includes/class-wc-query.php
@@ -285,7 +285,9 @@ class WC_Query {
}
// Define a variable so we know this is the front page shop later on
- define( 'SHOP_IS_ON_FRONT', true );
+ if ( ! defined( 'SHOP_IS_ON_FRONT' ) ) {
+ define( 'SHOP_IS_ON_FRONT', true );
+ }
// Get the actual WP page to avoid errors and let us use is_front_page()
// This is hacky but works. Awaiting https://core.trac.wordpress.org/ticket/21096
diff --git a/includes/class-wc-shipping.php b/includes/class-wc-shipping.php
index de80a500b6a..c242de60d21 100644
--- a/includes/class-wc-shipping.php
+++ b/includes/class-wc-shipping.php
@@ -238,7 +238,7 @@ class WC_Shipping {
* @param array $packages multi-dimensional array of cart items to calc shipping for
*/
public function calculate_shipping( $packages = array() ) {
- $this->shipping_total = null;
+ $this->shipping_total = 0;
$this->shipping_taxes = array();
$this->packages = array();
@@ -393,7 +393,7 @@ class WC_Shipping {
*/
public function reset_shipping() {
unset( WC()->session->chosen_shipping_methods );
- $this->shipping_total = null;
+ $this->shipping_total = 0;
$this->shipping_taxes = array();
$this->packages = array();
}
diff --git a/includes/class-wc-tax.php b/includes/class-wc-tax.php
index c857cb359b1..73d956a3058 100644
--- a/includes/class-wc-tax.php
+++ b/includes/class-wc-tax.php
@@ -410,8 +410,8 @@ class WC_Tax {
LEFT OUTER JOIN {$wpdb->prefix}woocommerce_tax_rate_locations as locations ON tax_rates.tax_rate_id = locations.tax_rate_id
LEFT OUTER JOIN {$wpdb->prefix}woocommerce_tax_rate_locations as locations2 ON tax_rates.tax_rate_id = locations2.tax_rate_id
WHERE 1=1 AND " . implode( ' AND ', $criteria ) . "
- GROUP BY tax_rate_id
- ORDER BY tax_rate_priority
+ GROUP BY tax_rates.tax_rate_id
+ ORDER BY tax_rates.tax_rate_priority
" );
$found_rates = self::sort_rates( $found_rates );
@@ -550,10 +550,9 @@ class WC_Tax {
// If multiple classes are found, use the first one found unless a standard rate item is found. This will be the first listed in the 'additonal tax class' section.
if ( sizeof( $cart_tax_classes ) > 1 && ! in_array( '', $cart_tax_classes ) ) {
- $tax_classes = self::get_tax_classes();
+ $tax_classes = self::get_tax_class_slugs();
foreach ( $tax_classes as $tax_class ) {
- $tax_class = sanitize_title( $tax_class );
if ( in_array( $tax_class, $cart_tax_classes ) ) {
$matched_tax_rates = self::find_shipping_rates( array(
'country' => $country,
@@ -691,12 +690,22 @@ class WC_Tax {
/**
* Get store tax classes.
- * @return array
+ * @return array Array of class names ("Reduced rate", "Zero rate", etc).
*/
public static function get_tax_classes() {
return array_filter( array_map( 'trim', explode( "\n", get_option( 'woocommerce_tax_classes' ) ) ) );
}
+ /**
+ * Get store tax classes as slugs.
+ *
+ * @since 2.7.0
+ * @return array Array of class slugs ("reduced-rate", "zero-rate", etc).
+ */
+ public static function get_tax_class_slugs() {
+ return array_map( 'sanitize_title', self::get_tax_classes() );
+ }
+
/**
* format the city.
* @param string $city
@@ -759,9 +768,9 @@ class WC_Tax {
* @return string
*/
public static function format_tax_rate_class( $class ) {
- $class = sanitize_title( $class );
- $sanitized_classes = array_map( 'sanitize_title', self::get_tax_classes() );
- if ( ! in_array( $class, $sanitized_classes ) ) {
+ $class = sanitize_title( $class );
+ $classes = self::get_tax_class_slugs();
+ if ( ! in_array( $class, $classes ) ) {
$class = '';
}
return ( 'standard' === $class ) ? '' : $class;
diff --git a/includes/class-wc-template-loader.php b/includes/class-wc-template-loader.php
index 43385bcea3f..5f72192d716 100644
--- a/includes/class-wc-template-loader.php
+++ b/includes/class-wc-template-loader.php
@@ -99,10 +99,10 @@ class WC_Template_Loader {
if ( is_product_taxonomy() ) {
$term = get_queried_object();
- $find[] = 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
- $find[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
- $find[] = 'taxonomy-' . $term->taxonomy . '.php';
- $find[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '.php';
+ $search_files[] = 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
+ $search_files[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '-' . $term->slug . '.php';
+ $search_files[] = 'taxonomy-' . $term->taxonomy . '.php';
+ $search_files[] = WC()->template_path() . 'taxonomy-' . $term->taxonomy . '.php';
}
$search_files[] = $default_file;
diff --git a/includes/class-wc-webhook.php b/includes/class-wc-webhook.php
index 800ac35badb..faf2423d617 100644
--- a/includes/class-wc-webhook.php
+++ b/includes/class-wc-webhook.php
@@ -139,12 +139,12 @@ class WC_Webhook {
$should_deliver = false;
} elseif ( in_array( $current_action, array( 'delete_post', 'wp_trash_post' ), true ) ) {
// Only deliver deleted event for coupons, orders, and products.
- if ( ! in_array( $GLOBALS['post_type'], array( 'shop_coupon', 'shop_order', 'product' ) ) ) {
+ if ( isset( $GLOBALS['post_type'] ) && ! in_array( $GLOBALS['post_type'], array( 'shop_coupon', 'shop_order', 'product' ) ) ) {
$should_deliver = false;
}
// Check if is delivering for the correct resource.
- if ( str_replace( 'shop_', '', $GLOBALS['post_type'] ) !== $this->get_resource() ) {
+ if ( isset( $GLOBALS['post_type'] ) && str_replace( 'shop_', '', $GLOBALS['post_type'] ) !== $this->get_resource() ) {
$should_deliver = false;
}
} elseif ( 'delete_user' == $current_action ) {
diff --git a/includes/data-stores/abstract-wc-order-data-store-cpt.php b/includes/data-stores/abstract-wc-order-data-store-cpt.php
index bbddcd32c3f..d09aed05f37 100644
--- a/includes/data-stores/abstract-wc-order-data-store-cpt.php
+++ b/includes/data-stores/abstract-wc-order-data-store-cpt.php
@@ -68,7 +68,7 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
if ( $id && ! is_wp_error( $id ) ) {
$order->set_id( $id );
- $this->update_post_meta( $order, true );
+ $this->update_post_meta( $order );
$order->save_meta_data();
$order->apply_changes();
$this->clear_caches( $order );
@@ -205,12 +205,10 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
* Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
*
* @param WC_Order
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- protected function update_post_meta( &$order, $force = false ) {
+ protected function update_post_meta( &$order ) {
$updated_props = array();
- $changed_props = array_keys( $order->get_changes() );
$meta_key_to_props = array(
'_order_currency' => 'currency',
'_cart_discount' => 'discount_total',
@@ -222,22 +220,17 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
'_order_version' => 'version',
'_prices_include_tax' => 'prices_include_tax',
);
- foreach ( $meta_key_to_props as $meta_key => $prop ) {
- if ( ! in_array( $prop, $changed_props ) && ! $force ) {
- continue;
- }
- $value = $order->{"get_$prop"}( 'edit' );
-
- if ( '' !== $value ) {
- $updated = update_post_meta( $order->get_id(), $meta_key, $value );
- } else {
- $updated = delete_post_meta( $order->get_id(), $meta_key );
- }
+ $props_to_update = $this->get_props_to_update( $order, $meta_key_to_props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
+ $value = $order->{"get_$prop"}( 'edit' );
+ $updated = update_post_meta( $order->get_id(), $meta_key, $value );
if ( $updated ) {
$updated_props[] = $prop;
}
}
+
+ do_action( 'woocommerce_order_object_updated_props', $order, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-coupon-data-store-cpt.php b/includes/data-stores/class-wc-coupon-data-store-cpt.php
index a6f818bc47d..a40ea529141 100644
--- a/includes/data-stores/class-wc-coupon-data-store-cpt.php
+++ b/includes/data-stores/class-wc-coupon-data-store-cpt.php
@@ -69,7 +69,7 @@ class WC_Coupon_Data_Store_CPT extends WC_Data_Store_WP implements WC_Coupon_Dat
if ( $coupon_id ) {
$coupon->set_id( $coupon_id );
- $this->update_post_meta( $coupon, true );
+ $this->update_post_meta( $coupon );
$coupon->save_meta_data();
$coupon->apply_changes();
do_action( 'woocommerce_new_coupon', $coupon_id );
@@ -166,13 +166,10 @@ class WC_Coupon_Data_Store_CPT extends WC_Data_Store_WP implements WC_Coupon_Dat
* Helper method that updates all the post meta for a coupon based on it's settings in the WC_Coupon class.
*
* @param WC_Coupon
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- private function update_post_meta( &$coupon, $force = false ) {
+ private function update_post_meta( &$coupon ) {
$updated_props = array();
- $changed_props = array_keys( $coupon->get_changes() );
-
$meta_key_to_props = array(
'discount_type' => 'discount_type',
'coupon_amount' => 'amount',
@@ -193,10 +190,8 @@ class WC_Coupon_Data_Store_CPT extends WC_Data_Store_WP implements WC_Coupon_Dat
'customer_email' => 'email_restrictions',
);
- foreach ( $meta_key_to_props as $meta_key => $prop ) {
- if ( ! in_array( $prop, $changed_props ) && ! $force ) {
- continue;
- }
+ $props_to_update = $this->get_props_to_update( $coupon, $meta_key_to_props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
$value = $coupon->{"get_$prop"}( 'edit' );
switch ( $prop ) {
case 'individual_use' :
@@ -223,6 +218,8 @@ class WC_Coupon_Data_Store_CPT extends WC_Data_Store_WP implements WC_Coupon_Dat
$updated_props[] = $prop;
}
}
+
+ do_action( 'woocommerce_coupon_object_updated_props', $coupon, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-customer-data-store.php b/includes/data-stores/class-wc-customer-data-store.php
index 94d3a58d06f..6aac8c51fa1 100644
--- a/includes/data-stores/class-wc-customer-data-store.php
+++ b/includes/data-stores/class-wc-customer-data-store.php
@@ -257,6 +257,8 @@ class WC_Customer_Data_Store extends WC_Data_Store_WP implements WC_Customer_Dat
$updated_props[] = $prop;
}
}
+
+ do_action( 'woocommerce_customer_object_updated_props', $customer, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-data-store-wp.php b/includes/data-stores/class-wc-data-store-wp.php
index 402322030cd..2944f294561 100644
--- a/includes/data-stores/class-wc-data-store-wp.php
+++ b/includes/data-stores/class-wc-data-store-wp.php
@@ -131,6 +131,7 @@ class WC_Data_Store_WP {
// Figure out our field names.
if ( 'user' === $this->meta_type ) {
$meta_id_field = 'umeta_id';
+ $table = $wpdb->usermeta;
}
if ( ! empty( $this->object_id_field_for_meta ) ) {
@@ -164,4 +165,27 @@ class WC_Data_Store_WP {
return ! in_array( $meta->meta_key, $this->internal_meta_keys );
}
+ /**
+ * Gets a list of props and meta keys that need updated based on change state
+ * or if they are present in the database or not.
+ *
+ * @param WC_Data $object The WP_Data object (WC_Coupon for coupons, etc).
+ * @param array $meta_key_to_props A mapping of meta keys => prop names.
+ * @param string $meta_type The internal WP meta type (post, user, etc).
+ * @return array A mapping of meta keys => prop names, filtered by ones that should be updated.
+ */
+ protected function get_props_to_update( $object, $meta_key_to_props, $meta_type = 'post' ) {
+ $props_to_update = array();
+ $changed_props = $object->get_changes();
+
+ // Props should be updated if they are a part of the $changed array or don't exist yet.
+ foreach ( $meta_key_to_props as $meta_key => $prop ) {
+ if ( array_key_exists( $prop, $changed_props ) || ! metadata_exists( $meta_type, $object->get_id(), $meta_key ) ) {
+ $props_to_update[ $meta_key ] = $prop;
+ }
+ }
+
+ return $props_to_update;
+ }
+
}
diff --git a/includes/data-stores/class-wc-order-data-store-cpt.php b/includes/data-stores/class-wc-order-data-store-cpt.php
index 9447f6526d3..67453cd883a 100644
--- a/includes/data-stores/class-wc-order-data-store-cpt.php
+++ b/includes/data-stores/class-wc-order-data-store-cpt.php
@@ -138,12 +138,10 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
* Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
*
* @param WC_Order
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- protected function update_post_meta( &$order, $force = false ) {
+ protected function update_post_meta( &$order ) {
$updated_props = array();
- $changed_props = $order->get_changes();
$meta_key_to_props = array(
'_order_key' => 'order_key',
'_customer_user' => 'customer_id',
@@ -158,15 +156,11 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
'_cart_hash' => 'cart_hash',
);
- foreach ( $meta_key_to_props as $meta_key => $prop ) {
- if ( ! array_key_exists( $prop, $changed_props ) && ! $force ) {
- continue;
- }
+ $props_to_update = $this->get_props_to_update( $order, $meta_key_to_props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
$value = $order->{"get_$prop"}( 'edit' );
-
- if ( '' !== $value ? update_post_meta( $order->get_id(), $meta_key, $value ) : delete_post_meta( $order->get_id(), $meta_key ) ) {
- $updated_props[] = $prop;
- }
+ update_post_meta( $order->get_id(), $meta_key, $value );
+ $updated_props[] = $prop;
}
$address_props = array(
@@ -197,21 +191,16 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
);
foreach ( $address_props as $props_key => $props ) {
- foreach ( $props as $meta_key => $prop ) {
- $prop_key = substr( $prop, 8 );
- if ( ! $force && ( ! isset( $changed_props[ $props_key ] ) || ! array_key_exists( $prop_key, $changed_props[ $props_key ] ) ) ) {
- continue;
- }
+ $props_to_update = $this->get_props_to_update( $order, $props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
$value = $order->{"get_$prop"}( 'edit' );
-
- if ( '' !== $value ? update_post_meta( $order->get_id(), $meta_key, $value ) : delete_post_meta( $order->get_id(), $meta_key ) ) {
- $updated_props[] = $prop;
- $updated_props[] = $props_key;
- }
+ update_post_meta( $order->get_id(), $meta_key, $value );
+ $updated_props[] = $prop;
+ $updated_props[] = $props_key;
}
}
- parent::update_post_meta( $order, $force );
+ parent::update_post_meta( $order );
// If address changed, store concatinated version to make searches faster.
if ( in_array( 'billing', $updated_props ) || ! metadata_exists( 'post', $order->get_id(), '_billing_address_index' ) ) {
@@ -226,6 +215,8 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
$data_store = WC_Data_Store::load( 'customer-download' );
$data_store->update_user_by_order_id( $order->get_id(), $order->get_customer_id(), $order->get_billing_email() );
}
+
+ do_action( 'woocommerce_order_object_updated_props', $order, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-order-refund-data-store-cpt.php b/includes/data-stores/class-wc-order-refund-data-store-cpt.php
index 8b402b7f63c..291e93da897 100644
--- a/includes/data-stores/class-wc-order-refund-data-store-cpt.php
+++ b/includes/data-stores/class-wc-order-refund-data-store-cpt.php
@@ -57,27 +57,24 @@ class WC_Order_Refund_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT im
* @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- protected function update_post_meta( &$refund, $force = false ) {
- parent::update_post_meta( $refund, $force );
+ protected function update_post_meta( &$refund ) {
+ parent::update_post_meta( $refund );
$updated_props = array();
- $changed_props = $refund->get_changes();
$meta_key_to_props = array(
'_refund_amount' => 'amount',
'_refunded_by' => 'refunded_by',
'_refund_reason' => 'reason',
);
- foreach ( $meta_key_to_props as $meta_key => $prop ) {
- if ( ! array_key_exists( $prop, $changed_props ) && ! $force ) {
- continue;
- }
+ $props_to_update = $this->get_props_to_update( $refund, $meta_key_to_props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
$value = $refund->{"get_$prop"}( 'edit' );
-
- if ( '' !== $value ? update_post_meta( $refund->get_id(), $meta_key, $value ) : delete_post_meta( $refund->get_id(), $meta_key ) ) {
- $updated_props[] = $prop;
- }
+ update_post_meta( $refund->get_id(), $meta_key, $value );
+ $updated_props[] = $prop;
}
+
+ do_action( 'woocommerce_order_refund_object_updated_props', $refund, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-payment-token-data-store.php b/includes/data-stores/class-wc-payment-token-data-store.php
index 08d7f443046..a85ed661374 100644
--- a/includes/data-stores/class-wc-payment-token-data-store.php
+++ b/includes/data-stores/class-wc-payment-token-data-store.php
@@ -71,18 +71,23 @@ class WC_Payment_Token_Data_Store extends WC_Data_Store_WP implements WC_Payment
global $wpdb;
- $payment_token_data = array(
- 'gateway_id' => $token->get_gateway_id( 'edit' ),
- 'token' => $token->get_token( 'edit' ),
- 'user_id' => $token->get_user_id( 'edit' ),
- 'type' => $token->get_type( 'edit' ),
- );
+ $updated_props = array();
+ $payment_token_data = array();
+ $props = array( 'gateway_id', 'token', 'user_id', 'type' );
+ $changed_props = array_keys( $token->get_changes() );
- $wpdb->update(
- $wpdb->prefix . 'woocommerce_payment_tokens',
- $payment_token_data,
- array( 'token_id' => $token->get_id( 'edit' ) )
- );
+ foreach ( $changed_props as $prop ) {
+ $updated_props[] = $prop;
+ $payment_token_data[ $prop ] = $token->{"get_" . $prop}( 'edit' );
+ }
+
+ if ( ! empty( $payment_token_data ) ) {
+ $wpdb->update(
+ $wpdb->prefix . 'woocommerce_payment_tokens',
+ $payment_token_data,
+ array( 'token_id' => $token->get_id( 'edit' ) )
+ );
+ }
$token->save_meta_data();
$token->apply_changes();
@@ -92,6 +97,7 @@ class WC_Payment_Token_Data_Store extends WC_Data_Store_WP implements WC_Payment
WC_Payment_Tokens::set_users_default( $token->get_user_id(), $token->get_id() );
}
+ do_action( 'woocommerce_payment_token_object_updated_props', $token, $updated_props );
do_action( 'woocommerce_payment_token_updated', $token->get_id() );
}
diff --git a/includes/data-stores/class-wc-product-data-store-cpt.php b/includes/data-stores/class-wc-product-data-store-cpt.php
index c0c315fe750..779f588ff07 100644
--- a/includes/data-stores/class-wc-product-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -91,7 +91,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
if ( $id && ! is_wp_error( $id ) ) {
$product->set_id( $id );
- $this->update_post_meta( $product, true );
+ $this->update_post_meta( $product );
$this->update_terms( $product );
$this->update_visibility( $product );
$this->update_attributes( $product );
@@ -136,6 +136,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$this->read_downloads( $product );
$this->read_visibility( $product );
$this->read_product_data( $product );
+ $this->read_extra_data( $product );
$product->set_object_read( true );
}
@@ -260,9 +261,15 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
'download_expiry' => get_post_meta( $id, '_download_expiry', true ),
'image_id' => get_post_thumbnail_id( $id ),
) );
+ }
- // Gets extra data associated with the product.
- // Like button text or product URL for external products.
+ /**
+ * Read extra data associated with the product, like button text or product URL for external products.
+ *
+ * @param WC_Product
+ * @since 2.7.0
+ */
+ protected function read_extra_data( &$product ) {
foreach ( $product->get_extra_data_keys() as $key ) {
$function = 'set_' . $key;
if ( is_callable( array( $product, $function ) ) ) {
@@ -360,12 +367,10 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
* Helper method that updates all the post meta for a product based on it's settings in the WC_Product class.
*
* @param WC_Product
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- protected function update_post_meta( &$product, $force = false ) {
+ protected function update_post_meta( &$product ) {
$updated_props = array();
- $changed_props = array_keys( $product->get_changes() );
$meta_key_to_props = array(
'_sku' => 'sku',
'_regular_price' => 'regular_price',
@@ -399,10 +404,14 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
'_wc_review_count' => 'review_count',
);
- foreach ( $meta_key_to_props as $meta_key => $prop ) {
- if ( ! in_array( $prop, $changed_props ) && ! $force ) {
- continue;
- }
+ // Make sure to take extra data (like product url or text for external products) into account.
+ $extra_data_keys = $product->get_extra_data_keys();
+ foreach ( $extra_data_keys as $key ) {
+ $meta_key_to_props[ '_' . $key ] = $key;
+ }
+
+ $props_to_update = $this->get_props_to_update( $product, $meta_key_to_props );
+ foreach ( $props_to_update as $meta_key => $prop ) {
$value = $product->{"get_$prop"}( 'edit' );
switch ( $prop ) {
case 'virtual' :
@@ -449,16 +458,22 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
do_action( $product->is_type( 'variation' ) ? 'woocommerce_variation_set_stock_status' : 'woocommerce_product_set_stock_status' , $product->get_id(), $product->get_stock_status(), $product );
}
- // Update extra data associated with the product.
- // Like button text or product URL for external products.
+ // Update extra data associated with the product like button text or product URL for external products.
if ( ! $this->extra_data_saved ) {
- foreach ( $product->get_extra_data_keys() as $key ) {
+ foreach ( $extra_data_keys as $key ) {
+ if ( ! array_key_exists( $key, $props_to_update ) ) {
+ continue;
+ }
$function = 'get_' . $key;
- if ( ( $force || in_array( $key, $changed_props ) ) && is_callable( array( $product, $function ) ) ) {
- update_post_meta( $product->get_id(), '_' . $key, $product->{$function}( 'edit' ) );
+ if ( is_callable( array( $product, $function ) ) ) {
+ if ( update_post_meta( $product->get_id(), '_' . $key, $product->{$function}( 'edit' ) ) ) {
+ $updated_props[] = $key;
+ }
}
}
}
+
+ do_action( 'woocommerce_product_object_updated_props', $product, $updated_props );
}
/**
diff --git a/includes/data-stores/class-wc-product-grouped-data-store-cpt.php b/includes/data-stores/class-wc-product-grouped-data-store-cpt.php
index 5ae6c03258b..3b11c3c6952 100644
--- a/includes/data-stores/class-wc-product-grouped-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-grouped-data-store-cpt.php
@@ -16,10 +16,9 @@ class WC_Product_Grouped_Data_Store_CPT extends WC_Product_Data_Store_CPT implem
* Helper method that updates all the post meta for a grouped product.
*
* @param WC_Product
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
* @since 2.7.0
*/
- protected function update_post_meta( &$product, $force = false ) {
+ protected function update_post_meta( &$product ) {
if ( update_post_meta( $product->get_id(), '_children', $product->get_children( 'edit' ) ) ) {
$child_prices = array();
foreach ( $product->get_children( 'edit' ) as $child_id ) {
@@ -39,7 +38,7 @@ class WC_Product_Grouped_Data_Store_CPT extends WC_Product_Data_Store_CPT implem
$this->extra_data_saved = true;
}
- parent::update_post_meta( $product, $force );
+ parent::update_post_meta( $product );
}
/**
diff --git a/includes/data-stores/class-wc-product-variable-data-store-cpt.php b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
index a063a8f2a28..2962b9f771f 100644
--- a/includes/data-stores/class-wc-product-variable-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-variable-data-store-cpt.php
@@ -17,7 +17,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
*
* @var array
*/
- private $prices_array = array();
+ protected $prices_array = array();
/**
* Read product data.
@@ -41,7 +41,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
* @param bool $force_read True to bypass the transient.
* @return array
*/
- private function read_children( &$product, $force_read = false ) {
+ protected function read_children( &$product, $force_read = false ) {
$children_transient_name = 'wc_product_children_' . $product->get_id();
$children = get_transient( $children_transient_name );
@@ -80,7 +80,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
* @param WC_Product
* @return array
*/
- private function read_variation_attributes( &$product ) {
+ protected function read_variation_attributes( &$product ) {
global $wpdb;
$variation_attributes = array();
@@ -143,7 +143,6 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
* @return array of prices
*/
public function read_price_data( &$product, $include_taxes = false ) {
- global $wp_filter;
/**
* Transient name for storing prices for this product (note: Max transient length is 45)
@@ -151,26 +150,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
*/
$transient_name = 'wc_var_prices_' . $product->get_id();
- /**
- * Create unique cache key based on the tax location (affects displayed/cached prices), product version and active price filters.
- * DEVELOPERS should filter this hash if offering conditonal pricing to keep it unique.
- * @var string
- */
- $price_hash = $include_taxes ? array( get_option( 'woocommerce_tax_display_shop', 'excl' ), WC_Tax::get_rates() ) : array( false );
- $filter_names = array( 'woocommerce_variation_prices_price', 'woocommerce_variation_prices_regular_price', 'woocommerce_variation_prices_sale_price' );
-
- foreach ( $filter_names as $filter_name ) {
- if ( ! empty( $wp_filter[ $filter_name ] ) ) {
- $price_hash[ $filter_name ] = array();
-
- foreach ( $wp_filter[ $filter_name ] as $priority => $callbacks ) {
- $price_hash[ $filter_name ][] = array_values( wp_list_pluck( $callbacks, 'function' ) );
- }
- }
- }
-
- $price_hash[] = WC_Cache_Helper::get_transient_version( 'product' );
- $price_hash = md5( json_encode( apply_filters( 'woocommerce_get_variation_prices_hash', $price_hash, $product, $include_taxes ) ) );
+ $price_hash = $this->get_price_hash( $product, $include_taxes );
/**
* $this->prices_array is an array of values which may have been modified from what is stored in transients - this may not match $transient_cached_prices_array.
@@ -247,6 +227,37 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
return $this->prices_array[ $price_hash ];
}
+ /**
+ * Create unique cache key based on the tax location (affects displayed/cached prices), product version and active price filters.
+ * DEVELOPERS should filter this hash if offering conditonal pricing to keep it unique.
+ *
+ * @since 2.7.0
+ * @param WC_Product
+ * @param bool $include_taxes If taxes should be calculated or not.
+ * @return string
+ */
+ protected function get_price_hash( &$product, $include_taxes = false ) {
+ global $wp_filter;
+
+ $price_hash = $include_taxes ? array( get_option( 'woocommerce_tax_display_shop', 'excl' ), WC_Tax::get_rates() ) : array( false );
+ $filter_names = array( 'woocommerce_variation_prices_price', 'woocommerce_variation_prices_regular_price', 'woocommerce_variation_prices_sale_price' );
+
+ foreach ( $filter_names as $filter_name ) {
+ if ( ! empty( $wp_filter[ $filter_name ] ) ) {
+ $price_hash[ $filter_name ] = array();
+
+ foreach ( $wp_filter[ $filter_name ] as $priority => $callbacks ) {
+ $price_hash[ $filter_name ][] = array_values( wp_list_pluck( $callbacks, 'function' ) );
+ }
+ }
+ }
+
+ $price_hash[] = WC_Cache_Helper::get_transient_version( 'product' );
+ $price_hash = md5( json_encode( apply_filters( 'woocommerce_get_variation_prices_hash', $price_hash, $product, $include_taxes ) ) );
+
+ return $price_hash;
+ }
+
/**
* Does a child have a weight set?
*
@@ -256,7 +267,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
*/
public function child_has_weight( $product ) {
global $wpdb;
- $children = $product->get_visible_children( 'edit' );
+ $children = $product->get_visible_children();
return $children ? $wpdb->get_var( "SELECT 1 FROM $wpdb->postmeta WHERE meta_key = '_weight' AND meta_value > 0 AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : false;
}
@@ -269,7 +280,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
*/
public function child_has_dimensions( $product ) {
global $wpdb;
- $children = $product->get_visible_children( 'edit' );
+ $children = $product->get_visible_children();
return $children ? $wpdb->get_var( "SELECT 1 FROM $wpdb->postmeta WHERE meta_key IN ( '_length', '_width', '_height' ) AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : false;
}
@@ -282,7 +293,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
*/
public function child_is_in_stock( $product ) {
global $wpdb;
- $children = $product->get_visible_children( 'edit' );
+ $children = $product->get_visible_children();
$oufofstock_children = $children ? $wpdb->get_var( "SELECT COUNT( post_id ) FROM $wpdb->postmeta WHERE meta_key = '_stock_status' AND meta_value = 'instock' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) : 0;
return $children > $oufofstock_children;
}
@@ -350,7 +361,7 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
public function sync_price( &$product ) {
global $wpdb;
- $children = $product->get_visible_children( 'edit' );
+ $children = $product->get_visible_children();
$prices = $children ? array_unique( $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key = '_price' AND post_id IN ( " . implode( ',', array_map( 'absint', $children ) ) . " )" ) ) : array();
delete_post_meta( $product->get_id(), '_price' );
diff --git a/includes/data-stores/class-wc-product-variation-data-store-cpt.php b/includes/data-stores/class-wc-product-variation-data-store-cpt.php
index d57d76e7e80..e2faa328fae 100644
--- a/includes/data-stores/class-wc-product-variation-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-variation-data-store-cpt.php
@@ -37,7 +37,7 @@ class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT impl
public function read( &$product ) {
$product->set_defaults();
- if ( ! $product->get_id() || ! ( $post_object = get_post( $product->get_id() ) ) ) {
+ if ( ! $product->get_id() || ! ( $post_object = get_post( $product->get_id() ) ) || 'product_variation' !== $post_object->post_type ) {
return;
}
@@ -55,8 +55,10 @@ class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT impl
throw new Exception( sprintf( 'Invalid parent for variation #%d', $product->get_id() ), 422 );
}
+ $product_name = get_the_title( $post_object );
+
$product->set_props( array(
- 'name' => get_the_title( $post_object ),
+ 'name' => $product_name,
'slug' => $post_object->post_name,
'date_created' => $post_object->post_date,
'date_modified' => $post_object->post_modified,
@@ -66,8 +68,24 @@ class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT impl
) );
$this->read_product_data( $product );
+ $this->read_extra_data( $product );
$product->set_attributes( wc_get_product_variation_attributes( $product->get_id() ) );
+ /**
+ * Clean up old variation titles.
+ * The "Product #" text is intentionally not wrapped in translation functions for a faster comparision. It was not inserted as a translated string:
+ * https://github.com/woocommerce/woocommerce/blob/5fc88694d211e2e176bded16d7fb95cf6285249e/includes/class-wc-ajax.php#L776
+ */
+ if ( __( 'Variation #', 'woocommerce' ) === substr( $product_name, 0, 11 ) || ( 'Product #' . $product->get_parent_id() . ' Variation' ) === $product_name ) {
+ $parent_data = $product->get_parent_data();
+ $new_title = $parent_data['title'] . ' – ' . wc_get_formatted_variation( $product, true, false );
+ $product->set_name( $new_title );
+ wp_update_post( array(
+ 'ID' => $product->get_id(),
+ 'post_title' => $new_title,
+ ) );
+ }
+
// Set object_read true once all data is read.
$product->set_object_read( true );
}
@@ -191,10 +209,10 @@ class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT impl
'tax_class' => get_post_meta( $id, '_tax_class', true ),
) );
- if ( $product->is_on_sale() ) {
- $product->set_price( $product->get_sale_price() );
+ if ( $product->is_on_sale( 'edit' ) ) {
+ $product->set_price( $product->get_sale_price( 'edit' ) );
} else {
- $product->set_price( $product->get_regular_price() );
+ $product->set_price( $product->get_regular_price( 'edit' ) );
}
$product->set_parent_data( array(
@@ -250,10 +268,9 @@ class WC_Product_Variation_Data_Store_CPT extends WC_Product_Data_Store_CPT impl
*
* @since 2.7.0
* @param WC_Product
- * @param bool $force Force all props to be written even if not changed. This is used during creation.
*/
- public function update_post_meta( &$product, $force = false ) {
+ public function update_post_meta( &$product ) {
update_post_meta( $product->get_id(), '_variation_description', $product->get_description() );
- parent::update_post_meta( $product, $force );
+ parent::update_post_meta( $product );
}
}
diff --git a/includes/interfaces/class-wc-log-handler-interface.php b/includes/interfaces/class-wc-log-handler-interface.php
new file mode 100644
index 00000000000..5bcd92934ad
--- /dev/null
+++ b/includes/interfaces/class-wc-log-handler-interface.php
@@ -0,0 +1,28 @@
+set_id( $zone_id );
$data_store = WC_Data_Store::load( 'shipping-zone' );
$data_store->read( $this );
@@ -39,7 +39,7 @@ abstract class WC_Legacy_Shipping_Zone extends WC_Data {
* @deprecated 2.7.0 - Use ::save instead.
*/
public function update() {
- wc_deprecated_function( 'WC_Shipping_Zone::update', '2.7', 'Use ::save instead.' );
+ wc_deprecated_function( 'WC_Shipping_Zone::update', '2.7', '::save instead.' );
$data_store = WC_Data_Store::load( 'shipping-zone' );
try {
$data_store->update( $this );
@@ -53,7 +53,7 @@ abstract class WC_Legacy_Shipping_Zone extends WC_Data {
* @deprecated 2.7.0 - Use ::save instead.
*/
public function create() {
- wc_deprecated_function( 'WC_Shipping_Zone::create', '2.7', 'Use ::save instead.' );
+ wc_deprecated_function( 'WC_Shipping_Zone::create', '2.7', '::save instead.' );
$data_store = WC_Data_Store::load( 'shipping-zone' );
try {
$data_store->create( $this );
diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php
index ed47184f022..890519af072 100644
--- a/includes/shortcodes/class-wc-shortcode-checkout.php
+++ b/includes/shortcodes/class-wc-shortcode-checkout.php
@@ -138,7 +138,7 @@ class WC_Shortcode_Checkout {
+
$full_size_image[1],
'data-large-image-height' => $full_size_image[2],
);
+
if ( has_post_thumbnail() ) {
- echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', '' . get_the_post_thumbnail( $post->ID, 'shop_single', $attributes ) . ' ' );
+ $main_thumbnail = '';
+ $main_thumbnail .= get_the_post_thumbnail( $post->ID, 'shop_single', $attributes );
+ $main_thumbnail .= ' ';
} else {
- echo sprintf( '
';
+ $main_thumbnail .= sprintf( '', esc_url( wc_placeholder_img_src() ), esc_html__( 'Awaiting product image', 'woocommerce' ) );
+ $main_thumbnail .= ' ';
}
+ echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', $main_thumbnail, get_post_thumbnail_id( $post->ID ) );
+
do_action( 'woocommerce_product_thumbnails' );
?>
diff --git a/templates/single-product/product-thumbnails.php b/templates/single-product/product-thumbnails.php
index 67377ed4dac..aaad58743e1 100644
--- a/templates/single-product/product-thumbnails.php
+++ b/templates/single-product/product-thumbnails.php
@@ -38,8 +38,10 @@ if ( $attachment_ids ) {
'data-large-image-height' => $full_size_image[2],
);
- echo '';
- echo wp_get_attachment_image( $attachment_id, 'shop_single', false, $attributes );
- echo ' ';
+ $html = '';
+ $html .= wp_get_attachment_image( $attachment_id, 'shop_single', false, $attributes );
+ $html .= ' ';
+
+ echo apply_filters( 'woocommerce_single_product_image_thumbnail_html', $html, $attachment_id );
}
}
diff --git a/tests/bin/phpunit.sh b/tests/bin/phpunit.sh
index 388749f8160..bb7a731ab40 100755
--- a/tests/bin/phpunit.sh
+++ b/tests/bin/phpunit.sh
@@ -1,4 +1,4 @@
-if [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
+if [[ ${TRAVIS_BRANCH} == 'master' ]] && [[ ${TRAVIS_EVENT_TYPE} != 'pull_request' ]] && [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
phpunit -c phpunit.xml.dist --coverage-clover ./tmp/clover.xml
else
phpunit -c phpunit.xml.dist
diff --git a/tests/bin/travis.sh b/tests/bin/travis.sh
index d7e4424ec04..1ed7426b53f 100755
--- a/tests/bin/travis.sh
+++ b/tests/bin/travis.sh
@@ -49,8 +49,8 @@ elif [ $1 == 'during' ]; then
elif [ $1 == 'after' ]; then
- ## Only run on latest stable PHP box (defined in .travis.yml).
- if [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
+ ## Only run on master, not pull requests, latest stable PHP box (defined in .travis.yml).
+ if [[ ${TRAVIS_BRANCH} == 'master' ]] && [[ ${TRAVIS_EVENT_TYPE} != 'pull_request' ]] && [[ ${TRAVIS_PHP_VERSION} == ${PHP_LATEST_STABLE} ]]; then
wget https://scrutinizer-ci.com/ocular.phar
chmod +x ocular.phar
php ocular.phar code-coverage:upload --format=php-clover ./tmp/clover.xml
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index cefb49b467d..78156064c22 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -69,17 +69,22 @@ class WC_Unit_Tests_Bootstrap {
*/
public function install_wc() {
- // clean existing install first
+ // Clean existing install first.
define( 'WP_UNINSTALL_PLUGIN', true );
define( 'WC_REMOVE_ALL_DATA', true );
include( $this->plugin_dir . '/uninstall.php' );
WC_Install::install();
- // reload capabilities after install, see https://core.trac.wordpress.org/ticket/28374
- $GLOBALS['wp_roles']->reinit();
+ // Reload capabilities after install, see https://core.trac.wordpress.org/ticket/28374
+ if ( version_compare( $GLOBALS['wp_version'], '4.7', '<' ) ) {
+ $GLOBALS['wp_roles']->reinit();
+ } else {
+ $GLOBALS['wp_roles'] = null;
+ wp_roles();
+ }
- echo "Installing WooCommerce..." . PHP_EOL;
+ echo 'Installing WooCommerce...' . PHP_EOL;
}
/**
diff --git a/tests/framework/helpers/class-wc-helper-order.php b/tests/framework/helpers/class-wc-helper-order.php
index 09a855dd9c0..6269a9e14bf 100644
--- a/tests/framework/helpers/class-wc-helper-order.php
+++ b/tests/framework/helpers/class-wc-helper-order.php
@@ -81,8 +81,10 @@ class WC_Helper_Order {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$order->add_item( $item );
// Set payment gateway
diff --git a/tests/unit-tests/api/product-reviews.php b/tests/unit-tests/api/product-reviews.php
index e2e6d04463a..ab3afd15a61 100644
--- a/tests/unit-tests/api/product-reviews.php
+++ b/tests/unit-tests/api/product-reviews.php
@@ -367,12 +367,8 @@ class Product_Reviews extends WC_REST_Unit_Test_Case {
),
),
'delete' => array(
- array(
- 'id' => $review_2_id,
- ),
- array(
- 'id' => $review_3_id,
- ),
+ $review_2_id,
+ $review_3_id
),
'create' => array(
array(
@@ -387,8 +383,8 @@ class Product_Reviews extends WC_REST_Unit_Test_Case {
$this->assertEquals( 'Updated review.', $data['update'][0]['review'] );
$this->assertEquals( 'New review.', $data['create'][0]['review'] );
- $this->assertEquals( $review_2_id, $data['delete'][0]['id'] );
- $this->assertEquals( $review_3_id, $data['delete'][1]['id'] );
+ $this->assertEquals( $review_2_id, $data['delete'][0] );
+ $this->assertEquals( $review_3_id, $data['delete'][1] );
$request = new WP_REST_Request( 'GET', '/wc/v1/products/' . $product->get_id() . '/reviews' );
$response = $this->server->dispatch( $request );
diff --git a/tests/unit-tests/api/product-variations.php b/tests/unit-tests/api/product-variations.php
index 96c6b42c273..f3b7b78dffa 100644
--- a/tests/unit-tests/api/product-variations.php
+++ b/tests/unit-tests/api/product-variations.php
@@ -304,9 +304,7 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case {
),
),
'delete' => array(
- array(
- 'id' => $children[1],
- ),
+ $children[1],
),
'create' => array(
array(
@@ -323,7 +321,7 @@ class Product_Variations_API extends WC_REST_Unit_Test_Case {
$this->assertContains( 'Updated description.', $data['update'][0]['description'] );
$this->assertEquals( 'DUMMY SKU VARIABLE MEDIUM', $data['create'][0]['sku'] );
$this->assertEquals( 'medium', $data['create'][0]['attributes'][0]['option'] );
- $this->assertEquals( $children[1], $data['delete'][0]['id'] );
+ $this->assertEquals( $children[1], $data['delete'][0] );
$request = new WP_REST_Request( 'GET', '/wc/v1/products/' . $product->get_id() . '/variations' );
$response = $this->server->dispatch( $request );
diff --git a/tests/unit-tests/log/logger.php b/tests/unit-tests/log/logger.php
index 8e8508e1f65..ee9bc4919b4 100644
--- a/tests/unit-tests/log/logger.php
+++ b/tests/unit-tests/log/logger.php
@@ -15,7 +15,7 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
public function test_add() {
$time = time();
$handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$handler
@@ -82,19 +82,19 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
*/
public function test_log_handlers() {
$false_handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$false_handler->expects( $this->exactly( 8 ) )->method( 'handle' )->will( $this->returnValue( false ) );
$true_handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$false_handler->expects( $this->exactly( 8 ) )->method( 'handle' )->will( $this->returnValue( true ) );
$final_handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$final_handler->expects( $this->exactly( 8 ) )->method( 'handle' );
@@ -159,7 +159,7 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
// Test no filtering by default
delete_option( 'woocommerce_log_threshold' );
$handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$handler
@@ -192,6 +192,24 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
$log->debug( 'debug message' );
}
+ /**
+ * Test that the logger validates handlers
+ *
+ * If a handler does not implement WC_Log_Handler_Interface, WC_Logger should complain
+ * (wc_doing_it_wrong) and not register the handler. This handler should receive no messages.
+ *
+ * @since 2.7.0
+ */
+ public function test_validate_handler_interface() {
+ $handler = $this
+ ->getMockBuilder( 'stdClass' )
+ ->setMethods( array( 'handle' ) )
+ ->getMock();
+ $handler->expects( $this->never() )->method( 'handle' );
+ new WC_Logger( array( $handler ) );
+ $this->setExpectedIncorrectUsage( 'WC_Logger::__construct' );
+ }
+
/**
* Helper for 'woocommerce_register_log_handlers' filter test.
*
@@ -204,7 +222,7 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
*/
public function return_assertion_handlers() {
$handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
$handler->expects( $this->exactly( 8 ) )->method( 'handle' );
@@ -224,7 +242,7 @@ class WC_Tests_Logger extends WC_Unit_Test_Case {
public function create_mock_handler() {
$time = time();
$handler = $this
- ->getMockBuilder( 'WC_Log_Handler' )
+ ->getMockBuilder( 'WC_Log_Handler_Interface' )
->setMethods( array( 'handle' ) )
->getMock();
diff --git a/tests/unit-tests/order/crud.php b/tests/unit-tests/order/crud.php
index a80663e44de..b12ab7b5939 100644
--- a/tests/unit-tests/order/crud.php
+++ b/tests/unit-tests/order/crud.php
@@ -346,8 +346,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->save();
$this->assertCount( 1, $object->get_shipping_methods() );
@@ -365,8 +367,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->save();
$this->assertEquals( 'Flat rate shipping', $object->get_shipping_method() );
@@ -378,8 +382,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->save();
$this->assertEquals( 'Flat rate shipping, Flat rate shipping 2', $object->get_shipping_method() );
@@ -490,16 +496,20 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item_1->add_meta_data( $key, $value, true );
+ }
$item_2 = new WC_Order_Item_Shipping();
$item_2->set_props( array(
'method_title' => $rate->label,
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item_1 );
$object->add_item( $item_2 );
$object->save();
@@ -536,8 +546,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->calculate_taxes();
@@ -578,8 +590,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->calculate_totals();
@@ -618,8 +632,10 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
'method_id' => $rate->id,
'total' => wc_format_decimal( $rate->cost ),
'taxes' => $rate->taxes,
- 'meta_data' => $rate->get_meta_data(),
) );
+ foreach ( $rate->get_meta_data() as $key => $value ) {
+ $item->add_meta_data( $key, $value, true );
+ }
$object->add_item( $item );
$object->save();
diff --git a/tests/unit-tests/payment-tokens/payment-token.php b/tests/unit-tests/payment-tokens/payment-token.php
index 9033784dc3e..99662280ecb 100644
--- a/tests/unit-tests/payment-tokens/payment-token.php
+++ b/tests/unit-tests/payment-tokens/payment-token.php
@@ -122,10 +122,12 @@ class WC_Tests_Payment_Token extends WC_Unit_Test_Case {
$token = WC_Helper_Payment_Token::create_stub_token( __FUNCTION__ );
$this->assertEquals( __FUNCTION__, $token->get_extra() );
$token->set_extra( ':)' );
+ $token->set_user_id( 2 );
$token->save();
$token = new WC_Payment_Token_Stub( $token->get_id() );
$this->assertEquals( ':)', $token->get_extra() );
+ $this->assertEquals( 2, $token->get_user_id() );
}
/**
diff --git a/tests/unit-tests/tax/tax.php b/tests/unit-tests/tax/tax.php
index 1dd09299fe3..f949570b87f 100644
--- a/tests/unit-tests/tax/tax.php
+++ b/tests/unit-tests/tax/tax.php
@@ -442,8 +442,10 @@ class WC_Tests_Tax extends WC_Unit_Test_Case {
*/
public function test_get_tax_classes() {
$tax_classes = WC_Tax::get_tax_classes();
-
$this->assertEquals( $tax_classes, array( 'Reduced rate', 'Zero rate' ) );
+
+ $tax_classes = WC_Tax::get_tax_class_slugs();
+ $this->assertEquals( $tax_classes, array( 'reduced-rate', 'zero-rate' ) );
}
/**
diff --git a/tests/unit-tests/util/core-functions.php b/tests/unit-tests/util/core-functions.php
index 6900ac10048..4ac0da371aa 100644
--- a/tests/unit-tests/util/core-functions.php
+++ b/tests/unit-tests/util/core-functions.php
@@ -395,4 +395,18 @@ class WC_Tests_Core_Functions extends WC_Unit_Test_Case {
return array_slice( $alternatives, $skip++ );
}
+ /**
+ * Test wc_get_wildcard_postcodes
+ */
+ public function test_wc_get_wildcard_postcodes() {
+ $postcode = 'cb23 6as';
+ $country = 'GB';
+ $wildcards = array( 'cb23 6as', 'CB23 6AS', 'CB23 6AS*', 'CB23 6A*', 'CB23 6*', 'CB23 *', 'CB23*', 'CB2*', 'CB*', 'C*', '*' );
+ $this->assertEquals( $wildcards, wc_get_wildcard_postcodes( $postcode, $country ) );
+
+ $postcode = 'GIJóN';
+ $country = '';
+ $wildcards = array( 'GIJóN', 'GIJÓN', 'GIJÓN*', 'GIJÓ*', 'GIJ*', 'GI*', 'G*', '*' );
+ $this->assertEquals( $wildcards, wc_get_wildcard_postcodes( $postcode, $country ) );
+ }
}
diff --git a/woocommerce.php b/woocommerce.php
index fb3eb4425ca..a1b59eb2a9e 100644
--- a/woocommerce.php
+++ b/woocommerce.php
@@ -294,6 +294,7 @@ final class WooCommerce {
include_once( WC_ABSPATH . 'includes/interfaces/class-wc-product-variable-data-store-interface.php' );
include_once( WC_ABSPATH . 'includes/interfaces/class-wc-shipping-zone-data-store-interface.php' );
include_once( WC_ABSPATH . 'includes/interfaces/class-wc-logger-interface.php' );
+ include_once( WC_ABSPATH . 'includes/interfaces/class-wc-log-handler-interface.php' );
include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-payment-token.php' ); // Payment Tokens
include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-product.php' ); // Products
include_once( WC_ABSPATH . 'includes/abstracts/abstract-wc-order.php' ); // Orders