a' ).replaceWith('' + $tr.find( '.wc-shipping-zone-method-title > a' ).text() + '' );
+ var $del = $tr.find( '.wc-shipping-zone-method-delete' );
+ $tr.find( '.wc-shipping-zone-method-title .row-actions' ).empty().html($del);
}
} );
diff --git a/assets/js/admin/wc-shipping-zone-methods.min.js b/assets/js/admin/wc-shipping-zone-methods.min.js
index 41c1ee47f60..ba3eabac644 100644
--- a/assets/js/admin/wc-shipping-zone-methods.min.js
+++ b/assets/js/admin/wc-shipping-zone-methods.min.js
@@ -1 +1 @@
-!function(e,n,o,t){e(function(){var i=e(".wc-shipping-zone-methods"),s=e(".wc-shipping-zone-method-rows"),d=e(".wc-shipping-zone-method-save"),a=o.template("wc-shipping-zone-method-row"),h=o.template("wc-shipping-zone-method-row-blank"),c=Backbone.Model.extend({changes:{},logChanges:function(e){var n=this.changes||{};_.each(e.methods,function(e,o){n.methods=n.methods||{methods:{}},n.methods[o]=_.extend(n.methods[o]||{instance_id:o},e)}),"undefined"!=typeof e.zone_name&&(n.zone_name=e.zone_name),"undefined"!=typeof e.zone_locations&&(n.zone_locations=e.zone_locations),"undefined"!=typeof e.zone_postcodes&&(n.zone_postcodes=e.zone_postcodes),this.changes=n,this.trigger("change:methods")},save:function(){e.post(t+(t.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_changes",{wc_shipping_zones_nonce:n.wc_shipping_zones_nonce,changes:this.changes,zone_id:n.zone_id},this.onSaveResponse,"json")},onSaveResponse:function(e,o){"success"===o&&(e.success?(e.data.zone_id!==n.zone_id&&(n.zone_id=e.data.zone_id,window.history.pushState&&window.history.pushState({},"","admin.php?page=wc-settings&tab=shipping&zone_id="+e.data.zone_id)),l.set("methods",e.data.methods),l.trigger("change:methods"),l.changes={},l.trigger("saved:methods")):window.alert(n.strings.save_failed))}}),r=Backbone.View.extend({rowTemplate:a,initialize:function(){this.listenTo(this.model,"change:methods",this.setUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.render),s.on("change",{view:this},this.updateModelOnChange),s.on("sortupdate",{view:this},this.updateModelOnSort),e(window).on("beforeunload",{view:this},this.unloadConfirmation),d.on("click",{view:this},this.onSubmit),e(document.body).on("input change","#zone_name, #zone_locations, #zone_postcodes",{view:this},this.onUpdateZone),e(document.body).on("click",".wc-shipping-zone-method-settings",{view:this},this.onConfigureShippingMethod),e(document.body).on("click",".wc-shipping-zone-add-method",{view:this},this.onAddShippingMethod),e(document.body).on("wc_backbone_modal_response",this.onConfigureShippingMethodSubmitted),e(document.body).on("wc_backbone_modal_response",this.onAddShippingMethodSubmitted),e(document.body).on("change",".wc-shipping-zone-method-selector select",this.onChangeShippingMethodSelector),e(document.body).on("click",".wc-shipping-zone-postcodes-toggle",this.onTogglePostcodes)},onUpdateZone:function(n){var o=n.data.view,t=o.model,i=e(this).val(),s=e(n.target).data("attribute"),d={};n.preventDefault(),d[s]=i,t.set(s,i),t.logChanges(d),o.render()},block:function(){e(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){e(this.el).unblock()},render:function(){var o=_.indexBy(this.model.get("methods"),"instance_id"),t=this.model.get("zone_name"),i=this;e(".wc-shipping-zone-name").text(t||n.strings.default_zone_name),this.$el.empty(),this.unblock(),_.size(o)?(o=_.sortBy(o,function(e){return parseInt(e.method_order,10)}),e.each(o,function(e,o){"yes"===o.enabled?o.enabled_icon=''+n.strings.yes+"":o.enabled_icon=''+n.strings.no+"",i.$el.append(i.rowTemplate(o));var t=i.$el.find('tr[data-id="'+o.instance_id+'"]');o.has_settings||(t.find(".wc-shipping-zone-method-title a").replaceWith(t.find(".wc-shipping-zone-method-title").text()),t.find(".wc-shipping-zone-method-settings").remove())}),this.$el.find(".wc-shipping-zone-method-delete").on("click",{view:this},this.onDeleteRow),this.$el.find(".wc-shipping-zone-method-enabled a").on("click",{view:this},this.onToggleEnabled)):i.$el.append(h),this.initTooltips()},initTooltips:function(){e("#tiptip_holder").removeAttr("style"),e("#tiptip_arrow").removeAttr("style"),e(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:50})},onSubmit:function(e){e.data.view.block(),e.data.view.model.save(),e.preventDefault()},onDeleteRow:function(n){var o=n.data.view,t=o.model,i=_.indexBy(t.get("methods"),"instance_id"),s={},d=e(this).closest("tr").data("id");n.preventDefault(),delete i[d],s.methods=s.methods||{methods:{}},s.methods[d]=_.extend(s.methods[d]||{},{deleted:"deleted"}),t.set("methods",i),t.logChanges(s),o.render()},onToggleEnabled:function(n){var o=n.data.view,t=e(n.target),i=o.model,s=_.indexBy(i.get("methods"),"instance_id"),d=t.closest("tr").data("id"),a="yes"===t.closest("tr").data("enabled")?"no":"yes",h={};n.preventDefault(),s[d].enabled=a,h.methods=h.methods||{methods:{}},h.methods[d]=_.extend(h.methods[d]||{},{enabled:a}),i.set("methods",s),i.logChanges(h),o.render()},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,d.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,d.attr("disabled","disabled")},unloadConfirmation:function(e){if(e.data.view.needsUnloadConfirm)return e.returnValue=n.strings.unload_confirmation_msg,window.event.returnValue=n.strings.unload_confirmation_msg,n.strings.unload_confirmation_msg},updateModelOnChange:function(n){var o=n.data.view.model,t=e(n.target),i=t.closest("tr").data("id"),s=t.data("attribute"),d=t.val(),a=_.indexBy(o.get("methods"),"instance_id"),h={};a[i][s]!==d&&(h.methods[i]={},h.methods[i][s]=d,a[i][s]=d),o.logChanges(h)},updateModelOnSort:function(e){var n=e.data.view.model,o=_.indexBy(n.get("methods"),"instance_id"),t={};_.each(o,function(e){var n=parseInt(e.method_order,10),s=parseInt(i.find('tr[data-id="'+e.instance_id+'"]').index()+1,10);n!==s&&(o[e.instance_id].method_order=s,t.methods=t.methods||{methods:{}},t.methods[e.instance_id]=_.extend(t.methods[e.instance_id]||{},{method_order:s}))}),_.size(t)&&n.logChanges(t)},onConfigureShippingMethod:function(n){var o=e(this).closest("tr").data("id"),t=n.data.view.model,i=_.indexBy(t.get("methods"),"instance_id")[o];if(!i.settings_html)return!0;n.preventDefault(),e(this).WCBackboneModal({template:"wc-modal-shipping-method-settings",variable:{instance_id:o,method:i},data:{instance_id:o,method:i}}),e(document.body).trigger("init_tooltips")},onConfigureShippingMethodSubmitted:function(o,i,s){"wc-modal-shipping-method-settings"===i&&(p.block(),e.post(t+(t.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_settings",{wc_shipping_zones_nonce:n.wc_shipping_zones_nonce,instance_id:s.instance_id,data:s},function(o,t){"success"===t&&o.success?(e("table.wc-shipping-zone-methods").parent().find("#woocommerce_errors").remove(),o.data.errors.length>0&&p.showErrors(o.data.errors),_.size(p.model.changes)?p.model.save():p.model.onSaveResponse(o,t)):(window.alert(n.strings.save_failed),p.unblock())},"json"))},showErrors:function(n){var o='';e(n).each(function(e,n){o=o+"
"+n+"
"}),o+="
'+n+"
"),e(this).closest("article").height(e(this).parent().height())},onTogglePostcodes:function(n){n.preventDefault();var o=e(this).closest("tr");o.find(".wc-shipping-zone-postcodes").show(),o.find(".wc-shipping-zone-postcodes-toggle").hide()}}),l=new c({methods:n.methods,zone_name:n.zone_name}),p=new r({model:l,el:s});p.render(),s.sortable({items:"tr",cursor:"move",axis:"y",handle:"td.wc-shipping-zone-method-sort",scrollSensitivity:40})})}(jQuery,shippingZoneMethodsLocalizeScript,wp,ajaxurl);
\ No newline at end of file
+!function(e,n,t,o){e(function(){var i=e(".wc-shipping-zone-methods"),s=e(".wc-shipping-zone-method-rows"),d=e(".wc-shipping-zone-method-save"),a=t.template("wc-shipping-zone-method-row"),h=t.template("wc-shipping-zone-method-row-blank"),c=Backbone.Model.extend({changes:{},logChanges:function(e){var n=this.changes||{};_.each(e.methods,function(e,t){n.methods=n.methods||{methods:{}},n.methods[t]=_.extend(n.methods[t]||{instance_id:t},e)}),"undefined"!=typeof e.zone_name&&(n.zone_name=e.zone_name),"undefined"!=typeof e.zone_locations&&(n.zone_locations=e.zone_locations),"undefined"!=typeof e.zone_postcodes&&(n.zone_postcodes=e.zone_postcodes),this.changes=n,this.trigger("change:methods")},save:function(){e.post(o+(o.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_changes",{wc_shipping_zones_nonce:n.wc_shipping_zones_nonce,changes:this.changes,zone_id:n.zone_id},this.onSaveResponse,"json")},onSaveResponse:function(e,t){"success"===t&&(e.success?(e.data.zone_id!==n.zone_id&&(n.zone_id=e.data.zone_id,window.history.pushState&&window.history.pushState({},"","admin.php?page=wc-settings&tab=shipping&zone_id="+e.data.zone_id)),p.set("methods",e.data.methods),p.trigger("change:methods"),p.changes={},p.trigger("saved:methods")):window.alert(n.strings.save_failed))}}),r=Backbone.View.extend({rowTemplate:a,initialize:function(){this.listenTo(this.model,"change:methods",this.setUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.clearUnloadConfirmation),this.listenTo(this.model,"saved:methods",this.render),s.on("change",{view:this},this.updateModelOnChange),s.on("sortupdate",{view:this},this.updateModelOnSort),e(window).on("beforeunload",{view:this},this.unloadConfirmation),d.on("click",{view:this},this.onSubmit),e(document.body).on("input change","#zone_name, #zone_locations, #zone_postcodes",{view:this},this.onUpdateZone),e(document.body).on("click",".wc-shipping-zone-method-settings",{view:this},this.onConfigureShippingMethod),e(document.body).on("click",".wc-shipping-zone-add-method",{view:this},this.onAddShippingMethod),e(document.body).on("wc_backbone_modal_response",this.onConfigureShippingMethodSubmitted),e(document.body).on("wc_backbone_modal_response",this.onAddShippingMethodSubmitted),e(document.body).on("change",".wc-shipping-zone-method-selector select",this.onChangeShippingMethodSelector),e(document.body).on("click",".wc-shipping-zone-postcodes-toggle",this.onTogglePostcodes)},onUpdateZone:function(n){var t=n.data.view,o=t.model,i=e(this).val(),s=e(n.target).data("attribute"),d={};n.preventDefault(),d[s]=i,o.set(s,i),o.logChanges(d),t.render()},block:function(){e(this.el).block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},unblock:function(){e(this.el).unblock()},render:function(){var t=_.indexBy(this.model.get("methods"),"instance_id"),o=this.model.get("zone_name"),i=this;e(".wc-shipping-zone-name").text(o||n.strings.default_zone_name),this.$el.empty(),this.unblock(),_.size(t)?(t=_.sortBy(t,function(e){return parseInt(e.method_order,10)}),e.each(t,function(e,t){"yes"===t.enabled?t.enabled_icon=''+n.strings.yes+"":t.enabled_icon=''+n.strings.no+"",i.$el.append(i.rowTemplate(t));var o=i.$el.find('tr[data-id="'+t.instance_id+'"]');if(!t.has_settings){o.find(".wc-shipping-zone-method-title > a").replaceWith(""+o.find(".wc-shipping-zone-method-title > a").text()+"");var s=o.find(".wc-shipping-zone-method-delete");o.find(".wc-shipping-zone-method-title .row-actions").empty().html(s)}}),this.$el.find(".wc-shipping-zone-method-delete").on("click",{view:this},this.onDeleteRow),this.$el.find(".wc-shipping-zone-method-enabled a").on("click",{view:this},this.onToggleEnabled)):i.$el.append(h),this.initTooltips()},initTooltips:function(){e("#tiptip_holder").removeAttr("style"),e("#tiptip_arrow").removeAttr("style"),e(".tips").tipTip({attribute:"data-tip",fadeIn:50,fadeOut:50,delay:50})},onSubmit:function(e){e.data.view.block(),e.data.view.model.save(),e.preventDefault()},onDeleteRow:function(n){var t=n.data.view,o=t.model,i=_.indexBy(o.get("methods"),"instance_id"),s={},d=e(this).closest("tr").data("id");n.preventDefault(),delete i[d],s.methods=s.methods||{methods:{}},s.methods[d]=_.extend(s.methods[d]||{},{deleted:"deleted"}),o.set("methods",i),o.logChanges(s),t.render()},onToggleEnabled:function(n){var t=n.data.view,o=e(n.target),i=t.model,s=_.indexBy(i.get("methods"),"instance_id"),d=o.closest("tr").data("id"),a="yes"===o.closest("tr").data("enabled")?"no":"yes",h={};n.preventDefault(),s[d].enabled=a,h.methods=h.methods||{methods:{}},h.methods[d]=_.extend(h.methods[d]||{},{enabled:a}),i.set("methods",s),i.logChanges(h),t.render()},setUnloadConfirmation:function(){this.needsUnloadConfirm=!0,d.removeAttr("disabled")},clearUnloadConfirmation:function(){this.needsUnloadConfirm=!1,d.attr("disabled","disabled")},unloadConfirmation:function(e){if(e.data.view.needsUnloadConfirm)return e.returnValue=n.strings.unload_confirmation_msg,window.event.returnValue=n.strings.unload_confirmation_msg,n.strings.unload_confirmation_msg},updateModelOnChange:function(n){var t=n.data.view.model,o=e(n.target),i=o.closest("tr").data("id"),s=o.data("attribute"),d=o.val(),a=_.indexBy(t.get("methods"),"instance_id"),h={};a[i][s]!==d&&(h.methods[i]={},h.methods[i][s]=d,a[i][s]=d),t.logChanges(h)},updateModelOnSort:function(e){var n=e.data.view.model,t=_.indexBy(n.get("methods"),"instance_id"),o={};_.each(t,function(e){var n=parseInt(e.method_order,10),s=parseInt(i.find('tr[data-id="'+e.instance_id+'"]').index()+1,10);n!==s&&(t[e.instance_id].method_order=s,o.methods=o.methods||{methods:{}},o.methods[e.instance_id]=_.extend(o.methods[e.instance_id]||{},{method_order:s}))}),_.size(o)&&n.logChanges(o)},onConfigureShippingMethod:function(n){var t=e(this).closest("tr").data("id"),o=n.data.view.model,i=_.indexBy(o.get("methods"),"instance_id")[t];if(!i.settings_html)return!0;n.preventDefault(),e(this).WCBackboneModal({template:"wc-modal-shipping-method-settings",variable:{instance_id:t,method:i},data:{instance_id:t,method:i}}),e(document.body).trigger("init_tooltips")},onConfigureShippingMethodSubmitted:function(t,i,s){"wc-modal-shipping-method-settings"===i&&(l.block(),e.post(o+(o.indexOf("?")>0?"&":"?")+"action=woocommerce_shipping_zone_methods_save_settings",{wc_shipping_zones_nonce:n.wc_shipping_zones_nonce,instance_id:s.instance_id,data:s},function(t,o){"success"===o&&t.success?(e("table.wc-shipping-zone-methods").parent().find("#woocommerce_errors").remove(),t.data.errors.length>0&&l.showErrors(t.data.errors),_.size(l.model.changes)?l.model.save():l.model.onSaveResponse(t,o)):(window.alert(n.strings.save_failed),l.unblock())},"json"))},showErrors:function(n){var t='';e(n).each(function(e,n){t=t+"
"+n+"
"}),t+="
'+n+"
"),e(this).closest("article").height(e(this).parent().height())},onTogglePostcodes:function(n){n.preventDefault();var t=e(this).closest("tr");t.find(".wc-shipping-zone-postcodes").show(),t.find(".wc-shipping-zone-postcodes-toggle").hide()}}),p=new c({methods:n.methods,zone_name:n.zone_name}),l=new r({model:p,el:s});l.render(),s.sortable({items:"tr",cursor:"move",axis:"y",handle:"td.wc-shipping-zone-method-sort",scrollSensitivity:40})})}(jQuery,shippingZoneMethodsLocalizeScript,wp,ajaxurl);
\ No newline at end of file
diff --git a/assets/js/frontend/cart.min.js b/assets/js/frontend/cart.min.js
index 231262156b3..8df4190af88 100644
--- a/assets/js/frontend/cart.min.js
+++ b/assets/js/frontend/cart.min.js
@@ -1 +1 @@
-jQuery(function(t){if("undefined"==typeof wc_cart_params)return!1;var e=function(t){return wc_cart_params.wc_ajax_url.toString().replace("%%endpoint%%",t)},o=function(t){return t.is(".processing")||t.parents(".processing").length},c=function(t){o(t)||t.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},i=function(t){t.removeClass("processing").unblock()},r=function(e,o){var c=t.parseHTML(e),i=t(".woocommerce-cart-form",c),r=t(".cart_totals",c),s=t(".woocommerce-error, .woocommerce-message, .woocommerce-info",c);if(0!==t(".woocommerce-cart-form").length){if(o||t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),0===i.length){if(t(".woocommerce-checkout").length)return void(window.location.href=window.location.href);var p=t(".cart-empty",c).closest(".woocommerce");t(".woocommerce-cart-form__contents").closest(".woocommerce").replaceWith(p),s.length>0&&n(s,t(".cart-empty").closest(".woocommerce"))}else t(".woocommerce-checkout").length&&t(document.body).trigger("update_checkout"),t(".woocommerce-cart-form").replaceWith(i),t(".woocommerce-cart-form").find(':input[name="update_cart"]').prop("disabled",!0),s.length>0&&n(s),a(r);t(document.body).trigger("updated_wc_div")}else window.location.href=window.location.href},a=function(e){t(".cart_totals").replaceWith(e),t(document.body).trigger("updated_cart_totals")},n=function(e,o){o||(o=t(".woocommerce-cart-form")),o.before(e)},s={init:function(e){this.cart=e,this.toggle_shipping=this.toggle_shipping.bind(this),this.shipping_method_selected=this.shipping_method_selected.bind(this),this.shipping_calculator_submit=this.shipping_calculator_submit.bind(this),t(document).on("click",".shipping-calculator-button",this.toggle_shipping),t(document).on("change","select.shipping_method, :input[name^=shipping_method]",this.shipping_method_selected),t(document).on("submit","form.woocommerce-shipping-calculator",this.shipping_calculator_submit),t(".shipping-calculator-form").hide()},toggle_shipping:function(){return t(".shipping-calculator-form").slideToggle("slow"),t(document.body).trigger("country_to_state_changed"),!1},shipping_method_selected:function(){var o={};t("select.shipping_method, :input[name^=shipping_method][type=radio]:checked, :input[name^=shipping_method][type=hidden]").each(function(){o[t(this).data("index")]=t(this).val()}),c(t("div.cart_totals"));var r={security:wc_cart_params.update_shipping_method_nonce,shipping_method:o};t.ajax({type:"post",url:e("update_shipping_method"),data:r,dataType:"html",success:function(t){a(t)},complete:function(){i(t("div.cart_totals")),t(document.body).trigger("updated_shipping_method")}})},shipping_calculator_submit:function(e){e.preventDefault();var o=t(e.currentTarget);c(t("div.cart_totals")),c(o),t("").attr("type","hidden").attr("name","calc_shipping").attr("value","x").appendTo(o),t.ajax({type:o.attr("method"),url:o.attr("action"),data:o.serialize(),dataType:"html",success:function(t){r(t)},complete:function(){i(o),i(t("div.cart_totals"))}})}},p={init:function(){this.update_cart_totals=this.update_cart_totals.bind(this),this.input_keypress=this.input_keypress.bind(this),this.cart_submit=this.cart_submit.bind(this),this.submit_click=this.submit_click.bind(this),this.apply_coupon=this.apply_coupon.bind(this),this.remove_coupon_clicked=this.remove_coupon_clicked.bind(this),this.quantity_update=this.quantity_update.bind(this),this.item_remove_clicked=this.item_remove_clicked.bind(this),this.item_restore_clicked=this.item_restore_clicked.bind(this),this.update_cart=this.update_cart.bind(this),t(document).on("wc_update_cart",function(){p.update_cart.apply(p,[].slice.call(arguments,1))}),t(document).on("click",".woocommerce-cart-form :input[type=submit]",this.submit_click),t(document).on("keypress",".woocommerce-cart-form :input[type=number]",this.input_keypress),t(document).on("submit",".woocommerce-cart-form",this.cart_submit),t(document).on("click","a.woocommerce-remove-coupon",this.remove_coupon_clicked),t(document).on("click",".woocommerce-cart-form .product-remove > a",this.item_remove_clicked),t(document).on("click",".woocommerce-cart .restore-item",this.item_restore_clicked),t(document).on("change input",".woocommerce-cart-form .cart_item :input",this.input_changed),t('.woocommerce-cart-form :input[name="update_cart"]').prop("disabled",!0)},input_changed:function(){t('.woocommerce-cart-form :input[name="update_cart"]').prop("disabled",!1)},update_cart:function(e){var o=t(".woocommerce-cart-form");c(o),c(t("div.cart_totals")),t.ajax({type:o.attr("method"),url:o.attr("action"),data:o.serialize(),dataType:"html",success:function(t){r(t,e)},complete:function(){i(o),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},update_cart_totals:function(){c(t("div.cart_totals")),t.ajax({url:e("get_cart_totals"),dataType:"html",success:function(t){a(t)},complete:function(){i(t("div.cart_totals"))}})},input_keypress:function(e){if(13===e.keyCode){var o=t(e.currentTarget).parents("form");try{o[0].checkValidity()&&(e.preventDefault(),this.cart_submit(e))}catch(c){e.preventDefault(),this.cart_submit(e)}}},cart_submit:function(e){var c=t(document.activeElement),i=t(":input[type=submit][clicked=true]"),r=t(e.currentTarget);if(r.is("form")||(r=t(e.currentTarget).parents("form")),0!==r.find(".woocommerce-cart-form__contents").length)return!o(r)&&void(i.is(':input[name="update_cart"]')||c.is("input.qty")?(e.preventDefault(),this.quantity_update(r)):(i.is(':input[name="apply_coupon"]')||c.is("#coupon_code"))&&(e.preventDefault(),this.apply_coupon(r)))},submit_click:function(e){t(":input[type=submit]",t(e.target).parents("form")).removeAttr("clicked"),t(e.target).attr("clicked","true")},apply_coupon:function(o){c(o);var r=this,a=t("#coupon_code"),s=a.val(),p={security:wc_cart_params.apply_coupon_nonce,coupon_code:s};t.ajax({type:"POST",url:e("apply_coupon"),data:p,dataType:"html",success:function(e){t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),n(e),t(document.body).trigger("applied_coupon",[s])},complete:function(){i(o),a.val(""),r.update_cart(!0)}})},remove_coupon_clicked:function(o){o.preventDefault();var r=this,a=t(o.currentTarget).closest(".cart_totals"),s=t(o.currentTarget).attr("data-coupon");c(a);var p={security:wc_cart_params.remove_coupon_nonce,coupon:s};t.ajax({type:"POST",url:e("remove_coupon"),data:p,dataType:"html",success:function(e){t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),n(e),t(document.body).trigger("removed_coupon",[s]),i(a)},complete:function(){r.update_cart(!0)}})},quantity_update:function(e){c(e),c(t("div.cart_totals")),t("").attr("type","hidden").attr("name","update_cart").attr("value","Update Cart").appendTo(e),t.ajax({type:e.attr("method"),url:e.attr("action"),data:e.serialize(),dataType:"html",success:function(t){r(t)},complete:function(){i(e),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},item_remove_clicked:function(e){e.preventDefault();var o=t(e.currentTarget),a=o.parents("form");c(a),c(t("div.cart_totals")),t.ajax({type:"GET",url:o.attr("href"),dataType:"html",success:function(t){r(t)},complete:function(){i(a),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},item_restore_clicked:function(e){e.preventDefault();var o=t(e.currentTarget),a=t("form.woocommerce-cart-form");c(a),c(t("div.cart_totals")),t.ajax({type:"GET",url:o.attr("href"),dataType:"html",success:function(t){r(t)},complete:function(){i(a),i(t("div.cart_totals"))}})}};s.init(p),p.init()});
\ No newline at end of file
+jQuery(function(t){if("undefined"==typeof wc_cart_params)return!1;var e=function(t){return wc_cart_params.wc_ajax_url.toString().replace("%%endpoint%%",t)},o=function(t){return t.is(".processing")||t.parents(".processing").length},c=function(t){o(t)||t.addClass("processing").block({message:null,overlayCSS:{background:"#fff",opacity:.6}})},i=function(t){t.removeClass("processing").unblock()},r=function(e,o){var c=t.parseHTML(e),i=t(".woocommerce-cart-form",c),r=t(".cart_totals",c),s=t(".woocommerce-error, .woocommerce-message, .woocommerce-info",c);if(0!==t(".woocommerce-cart-form").length){if(o||t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),0===i.length){if(t(".woocommerce-checkout").length)return void(window.location.href=window.location.href);var p=t(".cart-empty",c).closest(".woocommerce");t(".woocommerce-cart-form__contents").closest(".woocommerce").replaceWith(p),s.length>0&&n(s)}else t(".woocommerce-checkout").length&&t(document.body).trigger("update_checkout"),t(".woocommerce-cart-form").replaceWith(i),t(".woocommerce-cart-form").find(':input[name="update_cart"]').prop("disabled",!0),s.length>0&&n(s),a(r);t(document.body).trigger("updated_wc_div")}else window.location.href=window.location.href},a=function(e){t(".cart_totals").replaceWith(e),t(document.body).trigger("updated_cart_totals")},n=function(e,o){o||(o=t(".woocommerce-notices-wrapper:first")||t(".cart-empty").closest(".woocommerce")||t(".woocommerce-cart-form")),o.prepend(e)},s={init:function(e){this.cart=e,this.toggle_shipping=this.toggle_shipping.bind(this),this.shipping_method_selected=this.shipping_method_selected.bind(this),this.shipping_calculator_submit=this.shipping_calculator_submit.bind(this),t(document).on("click",".shipping-calculator-button",this.toggle_shipping),t(document).on("change","select.shipping_method, :input[name^=shipping_method]",this.shipping_method_selected),t(document).on("submit","form.woocommerce-shipping-calculator",this.shipping_calculator_submit),t(".shipping-calculator-form").hide()},toggle_shipping:function(){return t(".shipping-calculator-form").slideToggle("slow"),t(document.body).trigger("country_to_state_changed"),!1},shipping_method_selected:function(){var o={};t("select.shipping_method, :input[name^=shipping_method][type=radio]:checked, :input[name^=shipping_method][type=hidden]").each(function(){o[t(this).data("index")]=t(this).val()}),c(t("div.cart_totals"));var r={security:wc_cart_params.update_shipping_method_nonce,shipping_method:o};t.ajax({type:"post",url:e("update_shipping_method"),data:r,dataType:"html",success:function(t){a(t)},complete:function(){i(t("div.cart_totals")),t(document.body).trigger("updated_shipping_method")}})},shipping_calculator_submit:function(e){e.preventDefault();var o=t(e.currentTarget);c(t("div.cart_totals")),c(o),t("").attr("type","hidden").attr("name","calc_shipping").attr("value","x").appendTo(o),t.ajax({type:o.attr("method"),url:o.attr("action"),data:o.serialize(),dataType:"html",success:function(t){r(t)},complete:function(){i(o),i(t("div.cart_totals"))}})}},p={init:function(){this.update_cart_totals=this.update_cart_totals.bind(this),this.input_keypress=this.input_keypress.bind(this),this.cart_submit=this.cart_submit.bind(this),this.submit_click=this.submit_click.bind(this),this.apply_coupon=this.apply_coupon.bind(this),this.remove_coupon_clicked=this.remove_coupon_clicked.bind(this),this.quantity_update=this.quantity_update.bind(this),this.item_remove_clicked=this.item_remove_clicked.bind(this),this.item_restore_clicked=this.item_restore_clicked.bind(this),this.update_cart=this.update_cart.bind(this),t(document).on("wc_update_cart",function(){p.update_cart.apply(p,[].slice.call(arguments,1))}),t(document).on("click",".woocommerce-cart-form :input[type=submit]",this.submit_click),t(document).on("keypress",".woocommerce-cart-form :input[type=number]",this.input_keypress),t(document).on("submit",".woocommerce-cart-form",this.cart_submit),t(document).on("click","a.woocommerce-remove-coupon",this.remove_coupon_clicked),t(document).on("click",".woocommerce-cart-form .product-remove > a",this.item_remove_clicked),t(document).on("click",".woocommerce-cart .restore-item",this.item_restore_clicked),t(document).on("change input",".woocommerce-cart-form .cart_item :input",this.input_changed),t('.woocommerce-cart-form :input[name="update_cart"]').prop("disabled",!0)},input_changed:function(){t('.woocommerce-cart-form :input[name="update_cart"]').prop("disabled",!1)},update_cart:function(e){var o=t(".woocommerce-cart-form");c(o),c(t("div.cart_totals")),t.ajax({type:o.attr("method"),url:o.attr("action"),data:o.serialize(),dataType:"html",success:function(t){r(t,e)},complete:function(){i(o),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},update_cart_totals:function(){c(t("div.cart_totals")),t.ajax({url:e("get_cart_totals"),dataType:"html",success:function(t){a(t)},complete:function(){i(t("div.cart_totals"))}})},input_keypress:function(e){if(13===e.keyCode){var o=t(e.currentTarget).parents("form");try{o[0].checkValidity()&&(e.preventDefault(),this.cart_submit(e))}catch(c){e.preventDefault(),this.cart_submit(e)}}},cart_submit:function(e){var c=t(document.activeElement),i=t(":input[type=submit][clicked=true]"),r=t(e.currentTarget);if(r.is("form")||(r=t(e.currentTarget).parents("form")),0!==r.find(".woocommerce-cart-form__contents").length)return!o(r)&&void(i.is(':input[name="update_cart"]')||c.is("input.qty")?(e.preventDefault(),this.quantity_update(r)):(i.is(':input[name="apply_coupon"]')||c.is("#coupon_code"))&&(e.preventDefault(),this.apply_coupon(r)))},submit_click:function(e){t(":input[type=submit]",t(e.target).parents("form")).removeAttr("clicked"),t(e.target).attr("clicked","true")},apply_coupon:function(o){c(o);var r=this,a=t("#coupon_code"),s=a.val(),p={security:wc_cart_params.apply_coupon_nonce,coupon_code:s};t.ajax({type:"POST",url:e("apply_coupon"),data:p,dataType:"html",success:function(e){t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),n(e),t(document.body).trigger("applied_coupon",[s])},complete:function(){i(o),a.val(""),r.update_cart(!0)}})},remove_coupon_clicked:function(o){o.preventDefault();var r=this,a=t(o.currentTarget).closest(".cart_totals"),s=t(o.currentTarget).attr("data-coupon");c(a);var p={security:wc_cart_params.remove_coupon_nonce,coupon:s};t.ajax({type:"POST",url:e("remove_coupon"),data:p,dataType:"html",success:function(e){t(".woocommerce-error, .woocommerce-message, .woocommerce-info").remove(),n(e),t(document.body).trigger("removed_coupon",[s]),i(a)},complete:function(){r.update_cart(!0)}})},quantity_update:function(e){c(e),c(t("div.cart_totals")),t("").attr("type","hidden").attr("name","update_cart").attr("value","Update Cart").appendTo(e),t.ajax({type:e.attr("method"),url:e.attr("action"),data:e.serialize(),dataType:"html",success:function(t){r(t)},complete:function(){i(e),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},item_remove_clicked:function(e){e.preventDefault();var o=t(e.currentTarget),a=o.parents("form");c(a),c(t("div.cart_totals")),t.ajax({type:"GET",url:o.attr("href"),dataType:"html",success:function(t){r(t)},complete:function(){i(a),i(t("div.cart_totals")),t.scroll_to_notices(t('[role="alert"]'))}})},item_restore_clicked:function(e){e.preventDefault();var o=t(e.currentTarget),a=t("form.woocommerce-cart-form");c(a),c(t("div.cart_totals")),t.ajax({type:"GET",url:o.attr("href"),dataType:"html",success:function(t){r(t)},complete:function(){i(a),i(t("div.cart_totals"))}})}};s.init(p),p.init()});
\ No newline at end of file
diff --git a/assets/js/frontend/checkout.js b/assets/js/frontend/checkout.js
index 48c3a8cfd13..2a649d48b83 100644
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@@ -89,7 +89,9 @@ jQuery( function( $ ) {
get_payment_method: function() {
return wc_checkout_form.$checkout_form.find( 'input[name="payment_method"]:checked' ).val();
},
- payment_method_selected: function() {
+ payment_method_selected: function( e ) {
+ e.stopPropagation();
+
if ( $( '.payment_methods input.input-radio' ).length > 1 ) {
var target_payment_box = $( 'div.payment_box.' + $( this ).attr( 'ID' ) ),
is_checked = $( this ).is( ':checked' );
diff --git a/assets/js/frontend/tokenization-form.js b/assets/js/frontend/tokenization-form.js
index fb14a340521..4b1b580304b 100644
--- a/assets/js/frontend/tokenization-form.js
+++ b/assets/js/frontend/tokenization-form.js
@@ -1,86 +1,115 @@
-( function( $ ) {
- $( function() {
- var wcTokenizationForm = (function() {
- function wcTokenizationForm( target ) {
- var $target = $( target ),
- $formWrap = $target.closest( '.payment_box' ),
- $wcTokenizationForm = this;
+/*global wc_tokenization_form_params */
+jQuery( function( $ ) {
- this.onTokenChange = function() {
- if ( 'new' === $( this ).val() ) {
- $wcTokenizationForm.showForm();
- $wcTokenizationForm.showSaveNewCheckbox();
- } else {
- $wcTokenizationForm.hideForm();
- $wcTokenizationForm.hideSaveNewCheckbox();
- }
- };
+ /**
+ * WCTokenizationForm class.
+ */
+ var TokenizationForm = function( $target ) {
+ this.$target = $target;
+ this.$formWrap = $target.closest( '.payment_box' );
- this.onCreateAccountChange = function() {
- if ( $( this ).is( ':checked' ) ) {
- $wcTokenizationForm.showSaveNewCheckbox();
- } else {
- $wcTokenizationForm.hideSaveNewCheckbox();
- }
- };
+ // Params.
+ this.params = $.extend( {}, {
+ 'is_registration_required': false,
+ 'is_logged_in' : false,
+ }, wc_tokenization_form_params );
- this.onDisplay = function() {
- // Make sure a radio button is selected if there is no is_default for this payment method..
- if ( 0 === $( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', $target ).length ) {
- $( ':input.woocommerce-SavedPaymentMethods-tokenInput:last', $target ).prop( 'checked', true );
- }
+ // Bind functions to this.
+ this.onDisplay = this.onDisplay.bind( this );
+ this.hideForm = this.hideForm.bind( this );
+ this.showForm = this.showForm.bind( this );
+ this.showSaveNewCheckbox = this.showSaveNewCheckbox.bind( this );
+ this.hideSaveNewCheckbox = this.hideSaveNewCheckbox.bind( this );
- // Don't show the "use new" radio button if we only have one method..
- if ( 0 === $target.data( 'count' ) ) {
- $( '.woocommerce-SavedPaymentMethods-new', $target ).hide();
- }
+ // When a radio button is changed, make sure to show/hide our new CC info area.
+ this.$target.on( 'click change', ':input.woocommerce-SavedPaymentMethods-tokenInput', { tokenizationForm: this }, this.onTokenChange );
- // Trigger change event
- $( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', $target ).trigger( 'change' );
+ // OR if create account is checked.
+ $( 'input#createaccount' ).change( { tokenizationForm: this }, this.onCreateAccountChange );
- // Hide "save card" if "Create Account" is not checked.
- // Check that the field is shown in the form - some plugins and force create account remove it
- if ( $( 'input#createaccount' ).length && ! $('input#createaccount').is( ':checked' ) ) {
- $wcTokenizationForm.hideSaveNewCheckbox();
- }
+ // First display.
+ this.onDisplay();
+ };
- };
+ TokenizationForm.prototype.onDisplay = function() {
+ // Make sure a radio button is selected if there is no is_default for this payment method..
+ if ( 0 === $( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', this.$target ).length ) {
+ $( ':input.woocommerce-SavedPaymentMethods-tokenInput:last', this.$target ).prop( 'checked', true );
+ }
- this.hideForm = function() {
- $( '.wc-payment-form', $formWrap ).hide();
- };
+ // Don't show the "use new" radio button if we only have one method..
+ if ( 0 === this.$target.data( 'count' ) ) {
+ $( '.woocommerce-SavedPaymentMethods-new', this.$target ).remove();
+ }
- this.showForm = function() {
- $( '.wc-payment-form', $formWrap ).show();
- };
+ // Hide "save card" if "Create Account" is not checked and registration is not forced.
+ var hasCreateAccountCheckbox = 0 < $( 'input#createaccount' ).length,
+ createAccount = hasCreateAccountCheckbox && $( 'input#createaccount' ).is( ':checked' );
- this.showSaveNewCheckbox = function() {
- $( '.woocommerce-SavedPaymentMethods-saveNew', $formWrap ).show();
- };
+ if ( createAccount || this.params.is_logged_in || this.params.is_registration_required ) {
+ this.showSaveNewCheckbox();
+ } else {
+ this.hideSaveNewCheckbox();
+ }
- this.hideSaveNewCheckbox = function() {
- $( '.woocommerce-SavedPaymentMethods-saveNew', $formWrap ).hide();
- };
+ // Trigger change event
+ $( ':input.woocommerce-SavedPaymentMethods-tokenInput:checked', this.$target ).trigger( 'change' );
+ };
- // When a radio button is changed, make sure to show/hide our new CC info area
- $( ':input.woocommerce-SavedPaymentMethods-tokenInput', $target ).change( this.onTokenChange );
+ TokenizationForm.prototype.onTokenChange = function( event ) {
+ if ( 'new' === $( this ).val() ) {
+ event.data.tokenizationForm.showForm();
+ event.data.tokenizationForm.showSaveNewCheckbox();
+ } else {
+ event.data.tokenizationForm.hideForm();
+ event.data.tokenizationForm.hideSaveNewCheckbox();
+ }
+ };
- // OR if create account is checked
- $ ( 'input#createaccount' ).change( this.onCreateAccountChange );
+ TokenizationForm.prototype.onCreateAccountChange = function( event ) {
+ if ( $( this ).is( ':checked' ) ) {
+ event.data.tokenizationForm.showSaveNewCheckbox();
+ } else {
+ event.data.tokenizationForm.hideSaveNewCheckbox();
+ }
+ };
- this.onDisplay();
- }
+ TokenizationForm.prototype.hideForm = function() {
+ $( '.wc-payment-form', this.$formWrap ).hide();
+ };
- return wcTokenizationForm;
- })();
+ TokenizationForm.prototype.showForm = function() {
+ $( '.wc-payment-form', this.$formWrap ).show();
+ };
- $( document.body ).on( 'updated_checkout wc-credit-card-form-init', function() {
- // Loop over gateways with saved payment methods
- var $saved_payment_methods = $( 'ul.woocommerce-SavedPaymentMethods' );
+ TokenizationForm.prototype.showSaveNewCheckbox = function() {
+ $( '.woocommerce-SavedPaymentMethods-saveNew', this.$formWrap ).show();
+ };
- $saved_payment_methods.each( function() {
- new wcTokenizationForm( this );
- } );
+ TokenizationForm.prototype.hideSaveNewCheckbox = function() {
+ $( '.woocommerce-SavedPaymentMethods-saveNew', this.$formWrap ).hide();
+ };
+
+ /**
+ * Function to call wc_product_gallery on jquery selector.
+ */
+ $.fn.wc_tokenization_form = function( args ) {
+ new TokenizationForm( this, args );
+ return this;
+ };
+
+ /**
+ * Initialize.
+ */
+ $( document.body ).on( 'updated_checkout wc-credit-card-form-init', function() {
+ // Loop over gateways with saved payment methods
+ var $saved_payment_methods = $( 'ul.woocommerce-SavedPaymentMethods' );
+
+ $saved_payment_methods.each( function() {
+ $( this ).wc_tokenization_form();
} );
- });
-})( jQuery );
+ } );
+
+ // Alias.
+ var wcTokenizationForm = TokenizationForm;
+} );
diff --git a/assets/js/frontend/woocommerce.js b/assets/js/frontend/woocommerce.js
index 8dcf5916bf9..b5b5e835233 100644
--- a/assets/js/frontend/woocommerce.js
+++ b/assets/js/frontend/woocommerce.js
@@ -48,7 +48,7 @@ jQuery( function( $ ) {
return false;
}
} )
- .on( 'focus', function() {
+ .on( 'click focus', function() {
var input = $( this ),
parent = input.parent(),
description = parent.find( 'span.description' );
diff --git a/includes/abstracts/abstract-wc-order.php b/includes/abstracts/abstract-wc-order.php
index 24ed3e1224b..3c288cae77d 100644
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@@ -1372,7 +1372,13 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
foreach ( $this->get_shipping_methods() as $item_id => $item ) {
$taxes = $item->get_taxes();
foreach ( $taxes['total'] as $tax_rate_id => $tax ) {
- $shipping_taxes[ $tax_rate_id ] = isset( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] + (float) $tax : (float) $tax;
+ $tax_amount = (float) $tax;
+
+ if ( 'yes' !== get_option( 'woocommerce_tax_round_at_subtotal' ) ) {
+ $tax_amount = wc_round_tax_total( $tax_amount );
+ }
+
+ $shipping_taxes[ $tax_rate_id ] = isset( $shipping_taxes[ $tax_rate_id ] ) ? $shipping_taxes[ $tax_rate_id ] + $tax_amount : $tax_amount;
}
}
@@ -1429,13 +1435,13 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// Sum line item costs.
foreach ( $this->get_items() as $item ) {
- $cart_subtotal += $item->get_subtotal();
- $cart_total += $item->get_total();
+ $cart_subtotal += round( $item->get_subtotal(), wc_get_price_decimals() );
+ $cart_total += round( $item->get_total(), wc_get_price_decimals() );
}
// Sum shipping costs.
foreach ( $this->get_shipping_methods() as $shipping ) {
- $shipping_total += $shipping->get_total();
+ $shipping_total += round( $shipping->get_total(), wc_get_price_decimals() );
}
$this->set_shipping_total( $shipping_total );
@@ -1703,7 +1709,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// Show shipping excluding tax.
$shipping = wc_price( $this->get_shipping_total(), array( 'currency' => $this->get_currency() ) );
- if ( $this->get_shipping_tax() !== 0 && $this->get_prices_include_tax() ) {
+ if ( (float) $this->get_shipping_tax() > 0 && $this->get_prices_include_tax() ) {
$shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', ' ' . WC()->countries->ex_tax_or_vat() . '', $this, $tax_display );
}
} else {
@@ -1711,7 +1717,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// Show shipping including tax.
$shipping = wc_price( $this->get_shipping_total() + $this->get_shipping_tax(), array( 'currency' => $this->get_currency() ) );
- if ( $this->get_shipping_tax() !== 0 && ! $this->get_prices_include_tax() ) {
+ if ( (float) $this->get_shipping_tax() > 0 && ! $this->get_prices_include_tax() ) {
$shipping .= apply_filters( 'woocommerce_order_shipping_to_display_tax_label', ' ' . WC()->countries->inc_tax_or_vat() . '', $this, $tax_display );
}
}
diff --git a/includes/abstracts/abstract-wc-payment-gateway.php b/includes/abstracts/abstract-wc-payment-gateway.php
index ae6c770cf7f..f2e6188618e 100644
--- a/includes/abstracts/abstract-wc-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-payment-gateway.php
@@ -441,6 +441,13 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
array( 'jquery' ),
WC()->version
);
+
+ wp_localize_script(
+ 'woocommerce-tokenization-form', 'wc_tokenization_form_params', array(
+ 'is_registration_required' => WC()->checkout()->is_registration_required(),
+ 'is_logged_in' => is_user_logged_in(),
+ )
+ );
}
/**
diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php
index cac2883960a..d622475f873 100644
--- a/includes/abstracts/abstract-wc-product.php
+++ b/includes/abstracts/abstract-wc-product.php
@@ -902,7 +902,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
$class = 'standard' === $class ? '' : $class;
$valid_classes = $this->get_valid_tax_classes();
- if ( ! in_array( $class, $valid_classes ) ) {
+ if ( ! in_array( $class, $valid_classes, true ) ) {
$class = '';
}
diff --git a/includes/abstracts/abstract-wc-widget.php b/includes/abstracts/abstract-wc-widget.php
index 279693784bb..22dd2be276b 100644
--- a/includes/abstracts/abstract-wc-widget.php
+++ b/includes/abstracts/abstract-wc-widget.php
@@ -187,7 +187,7 @@ abstract class WC_Widget extends WP_Widget {
$instance[ $key ] = empty( $new_instance[ $key ] ) ? 0 : 1;
break;
default:
- $instance[ $key ] = sanitize_text_field( $new_instance[ $key ] );
+ $instance[ $key ] = isset( $new_instance[ $key ] ) ? sanitize_text_field( $new_instance[ $key ] ) : $setting['std'];
break;
}
diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php
index bcf2f24f366..b2162002e12 100644
--- a/includes/admin/class-wc-admin-assets.php
+++ b/includes/admin/class-wc-admin-assets.php
@@ -269,18 +269,23 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
wp_enqueue_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION );
}
if ( in_array( str_replace( 'edit-', '', $screen_id ), array_merge( array( 'shop_coupon', 'product' ), wc_get_order_types( 'order-meta-boxes' ) ) ) ) {
- $post_id = isset( $post->ID ) ? $post->ID : '';
- $currency = '';
+ $post_id = isset( $post->ID ) ? $post->ID : '';
+ $currency = '';
+ $remove_item_notice = __( 'Are you sure you want to remove the selected items?', 'woocommerce' );
if ( $post_id && in_array( get_post_type( $post_id ), wc_get_order_types( 'order-meta-boxes' ) ) ) {
$order = wc_get_order( $post_id );
if ( $order ) {
- $currency = $order->get_currency();
+ $currency = $order->get_currency();
+
+ if ( ! $order->has_status( array( 'pending', 'failed', 'cancelled' ) ) ) {
+ $remove_item_notice = $remove_item_notice . ' ' . __( "You may need to manually restore the item's stock.", 'woocommerce' );
+ }
}
}
$params = array(
- 'remove_item_notice' => __( "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.", 'woocommerce' ),
+ 'remove_item_notice' => $remove_item_notice,
'i18n_select_items' => __( 'Please select some items.', 'woocommerce' ),
'i18n_do_refund' => __( 'Are you sure you wish to process this refund? This action cannot be undone.', 'woocommerce' ),
'i18n_delete_refund' => __( 'Are you sure you wish to delete this refund? This action cannot be undone.', 'woocommerce' ),
diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php
index e96ca250fd6..5650228026c 100644
--- a/includes/admin/class-wc-admin-webhooks-table-list.php
+++ b/includes/admin/class-wc-admin-webhooks-table-list.php
@@ -207,6 +207,22 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
);
}
+ /**
+ * Process bulk actions.
+ */
+ public function process_bulk_action() {
+ $action = $this->current_action();
+ $webhooks = isset( $_REQUEST['webhook'] ) ? array_map( 'absint', (array) $_REQUEST['webhook'] ) : array(); // WPCS: input var okay, CSRF ok.
+
+ if ( ! current_user_can( 'manage_woocommerce' ) ) {
+ wp_die( esc_html__( 'You do not have permission to edit Webhooks', 'woocommerce' ) );
+ }
+
+ if ( 'delete' === $action ) {
+ WC_Admin_Webhooks::bulk_delete( $webhooks );
+ }
+ }
+
/**
* Generate the table navigation above or below the table.
* Included to remove extra nonce input.
diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php
index 1635642b76a..ddc6cb2dab4 100644
--- a/includes/admin/class-wc-admin-webhooks.php
+++ b/includes/admin/class-wc-admin-webhooks.php
@@ -150,7 +150,7 @@ class WC_Admin_Webhooks {
*
* @param array $webhooks List of webhooks IDs.
*/
- private function bulk_delete( $webhooks ) {
+ public static function bulk_delete( $webhooks ) {
foreach ( $webhooks as $webhook_id ) {
$webhook = new WC_Webhook( (int) $webhook_id );
$webhook->delete( true );
@@ -179,27 +179,6 @@ class WC_Admin_Webhooks {
}
}
- /**
- * Bulk actions.
- */
- private function bulk_actions() {
- check_admin_referer( 'woocommerce-settings' );
-
- if ( ! current_user_can( 'manage_woocommerce' ) ) {
- wp_die( esc_html__( 'You do not have permission to edit Webhooks', 'woocommerce' ) );
- }
-
- if ( isset( $_REQUEST['action'] ) ) { // WPCS: input var okay, CSRF ok.
- $webhooks = isset( $_REQUEST['webhook'] ) ? array_map( 'absint', (array) $_REQUEST['webhook'] ) : array(); // WPCS: input var okay, CSRF ok.
-
- $action = sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ); // WPCS: input var okay, CSRF ok.
-
- if ( 'delete' === $action ) {
- $this->bulk_delete( $webhooks );
- }
- }
- }
-
/**
* Webhooks admin actions.
*/
@@ -210,11 +189,6 @@ class WC_Admin_Webhooks {
$this->save();
}
- // Bulk actions.
- if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['webhook'] ) ) { // WPCS: input var okay, CSRF ok.
- $this->bulk_actions();
- }
-
// Delete webhook.
if ( isset( $_GET['delete'] ) ) { // WPCS: input var okay, CSRF ok.
$this->delete();
@@ -299,6 +273,7 @@ class WC_Admin_Webhooks {
$count = count( $data_store->get_webhooks_ids() );
if ( 0 < $count ) {
+ $webhooks_table_list->process_bulk_action();
$webhooks_table_list->prepare_items();
echo '';
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-orders.php b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
index 2d3d98c7c61..1b562292c2a 100644
--- a/includes/admin/list-tables/class-wc-admin-list-table-orders.php
+++ b/includes/admin/list-tables/class-wc-admin-list-table-orders.php
@@ -222,7 +222,12 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
* Render columm: order_date.
*/
protected function render_order_date_column() {
- $order_timestamp = $this->object->get_date_created()->getTimestamp();
+ $order_timestamp = $this->object->get_date_created() ? $this->object->get_date_created()->getTimestamp() : '';
+
+ if ( ! $order_timestamp ) {
+ echo '–';
+ return;
+ }
// Check if the order was created within the last 24 hours, and not in the future.
if ( $order_timestamp > strtotime( '-1 day', current_time( 'timestamp', true ) ) && $order_timestamp <= current_time( 'timestamp', true ) ) {
@@ -428,6 +433,7 @@ class WC_Admin_List_Table_Orders extends WC_Admin_List_Table {
'_line_tax',
'method_id',
'cost',
+ '_reduced_stock',
)
);
diff --git a/includes/admin/meta-boxes/views/html-order-item-meta.php b/includes/admin/meta-boxes/views/html-order-item-meta.php
index 3dbd34a2a32..50e80f9f478 100644
--- a/includes/admin/meta-boxes/views/html-order-item-meta.php
+++ b/includes/admin/meta-boxes/views/html-order-item-meta.php
@@ -15,6 +15,7 @@ $hidden_order_itemmeta = apply_filters(
'_line_tax',
'method_id',
'cost',
+ '_reduced_stock',
)
);
?>
diff --git a/includes/admin/meta-boxes/views/html-order-items.php b/includes/admin/meta-boxes/views/html-order-items.php
index 67976976eaf..1a151407624 100644
--- a/includes/admin/meta-boxes/views/html-order-items.php
+++ b/includes/admin/meta-boxes/views/html-order-items.php
@@ -1,15 +1,15 @@
get_items( apply_filters( 'woocommerce_admin_order_item_types', 'line_item' ) );
$discounts = $order->get_items( 'discount' );
$line_items_fee = $order->get_items( 'fee' );
@@ -83,7 +83,9 @@ if ( wc_tax_enabled() ) {
get_refunds() ) {
+ $refunds = $order->get_refunds();
+
+ if ( $refunds ) {
foreach ( $refunds as $refund ) {
include 'html-order-refund.php';
}
@@ -93,18 +95,6 @@ if ( wc_tax_enabled() ) {
-
- is_editable() ) : ?>
-
-
-
-
-
-
-
-
-
-
get_items( 'coupon' );
@@ -118,7 +108,7 @@ if ( wc_tax_enabled() ) {
$post_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_title = %s AND post_type = 'shop_coupon' AND post_status = 'publish' LIMIT 1;", $item->get_code() ) );
$class = $order->is_editable() ? 'code editable' : 'code';
?>
-
+
|
- get_total_discount(), array( 'currency' => $order->get_currency() ) ); ?>
+ get_total_discount(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?>
|
@@ -166,9 +156,9 @@ if ( wc_tax_enabled() ) {
get_total_shipping_refunded();
if ( $refunded > 0 ) {
- echo '' . strip_tags( wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) ) ) . ' ' . wc_price( $order->get_shipping_total() - $refunded, array( 'currency' => $order->get_currency() ) ) . '';
+ echo '' . strip_tags( wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) ) ) . ' ' . wc_price( $order->get_shipping_total() - $refunded, array( 'currency' => $order->get_currency() ) ) . ''; // WPCS: XSS ok.
} else {
- echo wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) );
+ echo wc_price( $order->get_shipping_total(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok.
}
?>
@@ -186,9 +176,9 @@ if ( wc_tax_enabled() ) {
get_total_tax_refunded_by_rate_id( $tax->rate_id );
if ( $refunded > 0 ) {
- echo '' . strip_tags( $tax->formatted_amount ) . ' ' . wc_price( WC_Tax::round( $tax->amount, wc_get_price_decimals() ) - WC_Tax::round( $refunded, wc_get_price_decimals() ), array( 'currency' => $order->get_currency() ) ) . '';
+ echo '' . strip_tags( $tax->formatted_amount ) . ' ' . wc_price( WC_Tax::round( $tax->amount, wc_get_price_decimals() ) - WC_Tax::round( $refunded, wc_get_price_decimals() ), array( 'currency' => $order->get_currency() ) ) . ''; // WPCS: XSS ok.
} else {
- echo $tax->formatted_amount;
+ echo wp_kses_post( $tax->formatted_amount );
}
?>
@@ -202,7 +192,7 @@ if ( wc_tax_enabled() ) {
: |
|
- get_formatted_order_total(); ?>
+ get_formatted_order_total(); // WPCS: XSS ok. ?>
|
@@ -212,7 +202,7 @@ if ( wc_tax_enabled() ) {
| : |
|
- -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?> |
+ -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> |
@@ -235,7 +225,7 @@ if ( wc_tax_enabled() ) {
is_editable() ) : ?>
@@ -251,7 +241,7 @@ if ( wc_tax_enabled() ) {
@@ -268,11 +258,11 @@ if ( wc_tax_enabled() ) {
| : |
- -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?> |
+ -get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> |
| : |
- get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); ?> |
+ get_total() - $order->get_total_refunded(), array( 'currency' => $order->get_currency() ) ); // WPCS: XSS ok. ?> |
|
@@ -301,7 +291,7 @@ if ( wc_tax_enabled() ) {
}
?>
-
+
@@ -321,7 +311,24 @@ if ( wc_tax_enabled() ) {
- ';
+ '; // WPCS: XSS ok.
}
?>
diff --git a/includes/api/class-wc-rest-products-controller.php b/includes/api/class-wc-rest-products-controller.php
index 1f2af73999c..05b9c11ea5b 100644
--- a/includes/api/class-wc-rest-products-controller.php
+++ b/includes/api/class-wc-rest-products-controller.php
@@ -1064,9 +1064,9 @@ class WC_REST_Products_Controller extends WC_REST_Legacy_Products_Controller {
$images = is_array( $images ) ? array_filter( $images ) : array();
if ( ! empty( $images ) ) {
- $gallery = array();
+ $gallery_positions = array();
- foreach ( $images as $image ) {
+ foreach ( $images as $index => $image ) {
$attachment_id = isset( $image['id'] ) ? absint( $image['id'] ) : 0;
if ( 0 === $attachment_id && isset( $image['src'] ) ) {
@@ -1088,11 +1088,7 @@ class WC_REST_Products_Controller extends WC_REST_Legacy_Products_Controller {
throw new WC_REST_Exception( 'woocommerce_product_invalid_image_id', sprintf( __( '#%s is an invalid image ID.', 'woocommerce' ), $attachment_id ), 400 );
}
- if ( isset( $image['position'] ) && 0 === absint( $image['position'] ) ) {
- $product->set_image_id( $attachment_id );
- } else {
- $gallery[] = $attachment_id;
- }
+ $gallery_positions[ $attachment_id ] = absint( isset( $image['position'] ) ? $image['position'] : $index );
// Set the image alt if present.
if ( ! empty( $image['alt'] ) ) {
@@ -1115,6 +1111,17 @@ class WC_REST_Products_Controller extends WC_REST_Legacy_Products_Controller {
}
}
+ // Sort images and get IDs in correct order.
+ asort( $gallery_positions );
+
+ // Get gallery in correct order.
+ $gallery = array_keys( $gallery_positions );
+
+ // Featured image is in position 0.
+ $image_id = array_shift( $gallery );
+
+ // Set images.
+ $product->set_image_id( $image_id );
$product->set_gallery_image_ids( $gallery );
} else {
$product->set_image_id( '' );
diff --git a/includes/api/legacy/v2/class-wc-api-orders.php b/includes/api/legacy/v2/class-wc-api-orders.php
index 328f6b5be43..f5d25339cb0 100644
--- a/includes/api/legacy/v2/class-wc-api-orders.php
+++ b/includes/api/legacy/v2/class-wc-api-orders.php
@@ -360,8 +360,6 @@ class WC_API_Orders extends WC_API_Resource {
public function create_order( $data ) {
global $wpdb;
- wc_transaction_query( 'start' );
-
try {
if ( ! isset( $data['order'] ) ) {
throw new WC_API_Exception( 'woocommerce_api_missing_order_data', sprintf( __( 'No %1$s data specified to create %1$s', 'woocommerce' ), 'order' ), 400 );
@@ -466,15 +464,10 @@ class WC_API_Orders extends WC_API_Resource {
do_action( 'woocommerce_api_create_order', $order->get_id(), $data, $this );
do_action( 'woocommerce_new_order', $order->get_id() );
- wc_transaction_query( 'commit' );
-
return $this->get_order( $order->get_id() );
-
} catch ( WC_Data_Exception $e ) {
- wc_transaction_query( 'rollback' );
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
} catch ( WC_API_Exception $e ) {
- wc_transaction_query( 'rollback' );
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
}
}
diff --git a/includes/api/legacy/v3/class-wc-api-orders.php b/includes/api/legacy/v3/class-wc-api-orders.php
index 5d30676b02e..046e4dd2b25 100644
--- a/includes/api/legacy/v3/class-wc-api-orders.php
+++ b/includes/api/legacy/v3/class-wc-api-orders.php
@@ -389,16 +389,12 @@ class WC_API_Orders extends WC_API_Resource {
* Create an order
*
* @since 2.2
- *
* @param array $data raw order data
- *
* @return array|WP_Error
*/
public function create_order( $data ) {
global $wpdb;
- wc_transaction_query( 'start' );
-
try {
if ( ! isset( $data['order'] ) ) {
throw new WC_API_Exception( 'woocommerce_api_missing_order_data', sprintf( __( 'No %1$s data specified to create %1$s', 'woocommerce' ), 'order' ), 400 );
@@ -508,15 +504,10 @@ class WC_API_Orders extends WC_API_Resource {
do_action( 'woocommerce_api_create_order', $order->get_id(), $data, $this );
do_action( 'woocommerce_new_order', $order->get_id() );
- wc_transaction_query( 'commit' );
-
return $this->get_order( $order->get_id() );
-
} catch ( WC_Data_Exception $e ) {
- wc_transaction_query( 'rollback' );
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => 400 ) );
} catch ( WC_API_Exception $e ) {
- wc_transaction_query( 'rollback' );
return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
}
}
diff --git a/includes/class-wc-ajax.php b/includes/class-wc-ajax.php
index 70b3b7c3888..916d19f5dc6 100644
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@@ -847,17 +847,20 @@ class WC_AJAX {
}
try {
- $order_id = absint( $_POST['order_id'] );
+ if ( ! isset( $_POST['order_id'] ) ) {
+ throw new Exception( __( 'Invalid order', 'woocommerce' ) );
+ }
+
+ $order_id = absint( wp_unslash( $_POST['order_id'] ) ); // WPCS: input var ok.
$order = wc_get_order( $order_id );
- $items_to_add = wp_parse_id_list( is_array( $_POST['item_to_add'] ) ? $_POST['item_to_add'] : array( $_POST['item_to_add'] ) );
- $items = ( ! empty( $_POST['items'] ) ) ? $_POST['items'] : '';
- $added_items = array();
if ( ! $order ) {
throw new Exception( __( 'Invalid order', 'woocommerce' ) );
}
// If we passed through items it means we need to save first before adding a new one.
+ $items = ( ! empty( $_POST['items'] ) ) ? $_POST['items'] : '';
+
if ( ! empty( $items ) ) {
$save_items = array();
parse_str( $items, $save_items );
@@ -865,23 +868,28 @@ class WC_AJAX {
wc_save_order_items( $order->get_id(), $save_items );
}
- foreach ( $items_to_add as $item_to_add ) {
+ $items_to_add = array_filter( wp_unslash( (array) $_POST['data'] ) );
- if ( ! in_array( get_post_type( $item_to_add ), array( 'product', 'product_variation' ) ) ) {
+ // Add items to order.
+ foreach ( $items_to_add as $item ) {
+ if ( ! isset( $item['id'], $item['qty'] ) || empty( $item['id'] ) ) {
continue;
}
+ $product_id = absint( $item['id'] );
+ $qty = wc_stock_amount( $item['qty'] );
+ $product = wc_get_product( $product_id );
- $item_id = $order->add_product( wc_get_product( $item_to_add ) );
- $item = apply_filters( 'woocommerce_ajax_order_item', $order->get_item( $item_id ), $item_id );
+ if ( ! $product ) {
+ throw new Exception( __( 'Invalid product ID', 'woocommerce' ) . ' ' . $product_id );
+ }
+ $item_id = $order->add_product( $product, $qty );
+ $item = apply_filters( 'woocommerce_ajax_order_item', $order->get_item( $item_id ), $item_id );
$added_items[ $item_id ] = $item;
do_action( 'woocommerce_ajax_add_order_item_meta', $item_id, $item, $order );
}
- $last_item = ! empty( $added_items ) ? end( $added_items ) : null;
- wc_do_deprecated_action( 'woocommerce_ajax_added_order_items', array( is_a( $last_item, 'WC_Order_Item' ) ? $last_item->get_id() : null, $last_item, $order ), '3.4', 'woocommerce_ajax_order_items_added action instead.' );
-
do_action( 'woocommerce_ajax_order_items_added', $added_items, $order );
$data = get_post_meta( $order_id );
@@ -1174,96 +1182,6 @@ class WC_AJAX {
}
}
- /**
- * Reduce order item stock.
- */
- public static function reduce_order_item_stock() {
- check_ajax_referer( 'order-item', 'security' );
- if ( ! current_user_can( 'edit_shop_orders' ) ) {
- wp_die( -1 );
- }
- $order_id = absint( $_POST['order_id'] );
- $order_item_ids = isset( $_POST['order_item_ids'] ) ? $_POST['order_item_ids'] : array();
- $order_item_qty = isset( $_POST['order_item_qty'] ) ? $_POST['order_item_qty'] : array();
- $order = wc_get_order( $order_id );
- $order_items = $order->get_items();
- $return = array();
- if ( $order && ! empty( $order_items ) && sizeof( $order_item_ids ) > 0 ) {
- foreach ( $order_items as $item_id => $order_item ) {
- // Only reduce checked items
- if ( ! in_array( $item_id, $order_item_ids ) ) {
- continue;
- }
- $_product = $order_item->get_product();
- if ( $_product && $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
- $stock_change = apply_filters( 'woocommerce_reduce_order_stock_quantity', $order_item_qty[ $item_id ], $item_id );
- $new_stock = wc_update_product_stock( $_product, $stock_change, 'decrease' );
- $item_name = $_product->get_formatted_name();
- $return[] = array(
- 'note' => sprintf( wp_kses_post( __( '%1$s stock reduced from %2$s to %3$s.', 'woocommerce' ) ), $item_name, $new_stock + $stock_change, $new_stock ),
- 'success' => true,
- );
- }
- }
- do_action( 'woocommerce_reduce_order_stock', $order );
-
- if ( empty( $return ) ) {
- $return[] = array(
- 'note' => wp_kses_post( __( 'No products had their stock reduced - they may not have stock management enabled.', 'woocommerce' ) ),
- 'success' => false,
- );
- }
-
- wp_send_json_success( $return );
- }
- wp_send_json_error();
- }
-
- /**
- * Increase order item stock.
- */
- public static function increase_order_item_stock() {
- check_ajax_referer( 'order-item', 'security' );
- if ( ! current_user_can( 'edit_shop_orders' ) ) {
- wp_die( -1 );
- }
- $order_id = absint( $_POST['order_id'] );
- $order_item_ids = isset( $_POST['order_item_ids'] ) ? $_POST['order_item_ids'] : array();
- $order_item_qty = isset( $_POST['order_item_qty'] ) ? $_POST['order_item_qty'] : array();
- $order = wc_get_order( $order_id );
- $order_items = $order->get_items();
- $return = array();
- if ( $order && ! empty( $order_items ) && sizeof( $order_item_ids ) > 0 ) {
- foreach ( $order_items as $item_id => $order_item ) {
- // Only reduce checked items
- if ( ! in_array( $item_id, $order_item_ids ) ) {
- continue;
- }
- $_product = $order_item->get_product();
- if ( $_product && $_product->exists() && $_product->managing_stock() && isset( $order_item_qty[ $item_id ] ) && $order_item_qty[ $item_id ] > 0 ) {
- $old_stock = $_product->get_stock_quantity();
- $stock_change = apply_filters( 'woocommerce_restore_order_stock_quantity', $order_item_qty[ $item_id ], $item_id );
- $new_quantity = wc_update_product_stock( $_product, $stock_change, 'increase' );
- $item_name = $_product->get_formatted_name();
- $return[] = array(
- 'note' => sprintf( wp_kses_post( __( '%1$s stock increased from %2$s to %3$s.', 'woocommerce' ) ), $item_name, $old_stock, $new_quantity ),
- 'success' => true,
- );
- }
- }
- do_action( 'woocommerce_restore_order_stock', $order );
- if ( empty( $return ) ) {
- $return[] = array(
- 'note' => wp_kses_post( __( 'No products had their stock increased - they may not have stock management enabled.', 'woocommerce' ) ),
- 'success' => false,
- );
- }
-
- wp_send_json_success( $return );
- }
- wp_send_json_error();
- }
-
/**
* Calc line tax.
*/
@@ -1421,8 +1339,14 @@ class WC_AJAX {
wp_die();
}
+ if ( ! empty( $_GET['limit'] ) ) {
+ $limit = absint( $_GET['limit'] );
+ } else {
+ $limit = absint( apply_filters( 'woocommerce_json_search_limit', 30 ) );
+ }
+
$data_store = WC_Data_Store::load( 'product' );
- $ids = $data_store->search_products( $term, '', (bool) $include_variations );
+ $ids = $data_store->search_products( $term, '', (bool) $include_variations, false, $limit );
if ( ! empty( $_GET['exclude'] ) ) {
$ids = array_diff( $ids, (array) $_GET['exclude'] );
@@ -1432,15 +1356,18 @@ class WC_AJAX {
$ids = array_intersect( $ids, (array) $_GET['include'] );
}
- if ( ! empty( $_GET['limit'] ) ) {
- $ids = array_slice( $ids, 0, absint( $_GET['limit'] ) );
- }
-
$product_objects = array_filter( array_map( 'wc_get_product', $ids ), 'wc_products_array_filter_readable' );
$products = array();
foreach ( $product_objects as $product_object ) {
- $products[ $product_object->get_id() ] = rawurldecode( $product_object->get_formatted_name() );
+ $formatted_name = $product_object->get_formatted_name();
+ $managing_stock = $product_object->managing_stock();
+
+ if ( $managing_stock && ! empty( $_GET['display_stock'] ) ) {
+ $formatted_name .= ' – ' . wc_format_stock_for_display( $product_object );
+ }
+
+ $products[ $product_object->get_id() ] = rawurldecode( $formatted_name );
}
wp_send_json( apply_filters( 'woocommerce_json_search_found_products', $products ) );
diff --git a/includes/class-wc-cache-helper.php b/includes/class-wc-cache-helper.php
index 1106643e166..fe0398775f5 100644
--- a/includes/class-wc-cache-helper.php
+++ b/includes/class-wc-cache-helper.php
@@ -134,17 +134,35 @@ class WC_Cache_Helper {
public static function get_transient_version( $group, $refresh = false ) {
$transient_name = $group . '-transient-version';
$transient_value = get_transient( $transient_name );
+ $transient_value = strval( $transient_value ? $transient_value : '' );
- if ( false === $transient_value || true === $refresh ) {
- self::delete_version_transients( $transient_value );
+ if ( '' === $transient_value || true === $refresh ) {
+ $old_transient_value = $transient_value;
+ $transient_value = (string) time();
- $transient_value = time();
+ if ( $old_transient_value === $transient_value ) {
+ // Time did not change but transient needs flushing now.
+ self::delete_version_transients( $transient_value );
+ } else {
+ self::queue_delete_version_transients( $transient_value );
+ }
set_transient( $transient_name, $transient_value );
}
return $transient_value;
}
+ /**
+ * Queues a cleanup event for version transients.
+ *
+ * @param string $version Version of the transient to remove.
+ */
+ protected static function queue_delete_version_transients( $version = '' ) {
+ if ( ! wp_using_ext_object_cache() && ! empty( $version ) ) {
+ wp_schedule_single_event( time() + 30, 'delete_version_transients', array( $version ) );
+ }
+ }
+
/**
* When the transient version increases, this is used to remove all past transients to avoid filling the DB.
*
@@ -165,9 +183,9 @@ class WC_Cache_Helper {
$affected = $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE option_name LIKE %s ORDER BY option_id LIMIT %d;", '\_transient\_%' . $version, $limit ) ); // WPCS: cache ok, db call ok.
- // If affected rows is equal to limit, there are more rows to delete. Delete in 10 secs.
+ // If affected rows is equal to limit, there are more rows to delete. Delete in 30 secs.
if ( $affected === $limit ) {
- wp_schedule_single_event( time() + 10, 'delete_version_transients', array( $version ) );
+ self::queue_delete_version_transients( $version );
}
}
}
diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php
index 3d54aeb039e..255876be4c2 100644
--- a/includes/class-wc-cart.php
+++ b/includes/class-wc-cart.php
@@ -757,66 +757,35 @@ class WC_Cart extends WC_Legacy_Cart {
* @return bool|WP_Error
*/
public function check_cart_item_stock() {
- global $wpdb;
-
- $error = new WP_Error();
- $product_qty_in_cart = $this->get_cart_item_quantities();
+ $error = new WP_Error();
+ $product_qty_in_cart = $this->get_cart_item_quantities();
+ $hold_stock_minutes = (int) get_option( 'woocommerce_hold_stock_minutes', 0 );
+ $current_session_order_id = isset( WC()->session->order_awaiting_payment ) ? absint( WC()->session->order_awaiting_payment ) : 0;
foreach ( $this->get_cart() as $cart_item_key => $values ) {
$product = $values['data'];
- /**
- * Check stock based on stock-status.
- */
+ // Check stock based on stock-status.
if ( ! $product->is_in_stock() ) {
/* translators: %s: product name */
$error->add( 'out-of-stock', sprintf( __( 'Sorry, "%s" is not in stock. Please edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name() ) );
return $error;
}
- if ( ! $product->managing_stock() ) {
+ // We only need to check products managing stock, with a limited stock qty.
+ if ( ! $product->managing_stock() || $product->backorders_allowed() ) {
continue;
}
- /**
- * Check stock based on all items in the cart.
- */
- if ( ! $product->has_enough_stock( $product_qty_in_cart[ $product->get_stock_managed_by_id() ] ) ) {
+ // Check stock based on all items in the cart and consider any held stock within pending orders.
+ $held_stock = wc_get_held_stock_quantity( $product, $current_session_order_id );
+ $required_stock = $product_qty_in_cart[ $product->get_stock_managed_by_id() ];
+
+ if ( $product->get_stock_quantity() < ( $held_stock + $required_stock ) ) {
/* translators: 1: product name 2: quantity in stock */
- $error->add( 'out-of-stock', sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order (%2$s in stock). Please edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity(), $product ) ) );
+ $error->add( 'out-of-stock', sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order (%2$s available). We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity() - $held_stock, $product ) ) );
return $error;
}
-
- /**
- * Finally consider any held stock, from pending orders.
- */
- if ( get_option( 'woocommerce_hold_stock_minutes' ) > 0 && ! $product->backorders_allowed() ) {
- $order_id = isset( WC()->session->order_awaiting_payment ) ? absint( WC()->session->order_awaiting_payment ) : 0;
- $held_stock = $wpdb->get_var(
- $wpdb->prepare(
- "
- SELECT SUM( order_item_meta.meta_value ) AS held_qty
- FROM {$wpdb->posts} AS posts
- LEFT JOIN {$wpdb->prefix}woocommerce_order_items as order_items ON posts.ID = order_items.order_id
- LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta ON order_items.order_item_id = order_item_meta.order_item_id
- LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta2 ON order_items.order_item_id = order_item_meta2.order_item_id
- WHERE order_item_meta.meta_key = '_qty'
- AND order_item_meta2.meta_key = %s AND order_item_meta2.meta_value = %d
- AND posts.post_type IN ( '" . implode( "','", wc_get_order_types() ) . "' )
- AND posts.post_status = 'wc-pending'
- AND posts.ID != %d;",
- 'variation' === get_post_type( $product->get_stock_managed_by_id() ) ? '_variation_id' : '_product_id',
- $product->get_stock_managed_by_id(),
- $order_id
- )
- ); // WPCS: unprepared SQL ok.
-
- if ( $product->get_stock_quantity() < ( $held_stock + $product_qty_in_cart[ $product->get_stock_managed_by_id() ] ) ) {
- /* translators: 1: product name 2: minutes */
- $error->add( 'out-of-stock', sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order right now. Please try again in %2$d minutes or edit your cart and try again. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), get_option( 'woocommerce_hold_stock_minutes' ) ) );
- return $error;
- }
- }
}
return true;
diff --git a/includes/class-wc-discounts.php b/includes/class-wc-discounts.php
index b03694947bc..9bd4f28dacc 100644
--- a/includes/class-wc-discounts.php
+++ b/includes/class-wc-discounts.php
@@ -499,11 +499,28 @@ class WC_Discounts {
* @return int Total discounted.
*/
protected function apply_coupon_custom( $coupon, $items_to_apply ) {
+ $limit_usage_qty = 0;
+ $applied_count = 0;
+
+ if ( null !== $coupon->get_limit_usage_to_x_items() ) {
+ $limit_usage_qty = $coupon->get_limit_usage_to_x_items();
+ }
+
+ // Apply the coupon to each item.
foreach ( $items_to_apply as $item ) {
- $discounted_price = $this->get_discounted_price_in_cents( $item );
+ // Find out how much price is available to discount for the item.
+ $discounted_price = $this->get_discounted_price_in_cents( $item );
+
+ // Get the price we actually want to discount, based on settings.
$price_to_discount = wc_remove_number_precision( ( 'yes' === get_option( 'woocommerce_calc_discounts_sequentially', 'no' ) ) ? $discounted_price : $item->price );
- $discount = wc_add_number_precision( $coupon->get_discount_amount( $price_to_discount / $item->quantity, $item->object, true ) ) * $item->quantity;
- $discount = min( $discounted_price, $discount );
+
+ // See how many and what price to apply to.
+ $apply_quantity = $limit_usage_qty && ( $limit_usage_qty - $applied_count ) < $item->quantity ? $limit_usage_qty - $applied_count : $item->quantity;
+ $apply_quantity = max( 0, apply_filters( 'woocommerce_coupon_get_apply_quantity', $apply_quantity, $item, $coupon, $this ) );
+
+ // Run coupon calculations.
+ $discount = wc_add_number_precision( $coupon->get_discount_amount( $price_to_discount / $item->quantity, $item->object, true ) ) * $apply_quantity;
+ $discount = wc_round_discount( min( $discounted_price, $discount ), 0 );
// Store code and discount amount per item.
$this->discounts[ $coupon->get_code() ][ $item->key ] += $discount;
diff --git a/includes/class-wc-order.php b/includes/class-wc-order.php
index d5d3f1443e9..e8715a8cffa 100644
--- a/includes/class-wc-order.php
+++ b/includes/class-wc-order.php
@@ -102,8 +102,6 @@ class WC_Order extends WC_Abstract_Order {
}
try {
- wc_transaction_query( 'start' );
-
do_action( 'woocommerce_pre_payment_complete', $this->get_id() );
if ( WC()->session ) {
@@ -124,20 +122,18 @@ class WC_Order extends WC_Abstract_Order {
} else {
do_action( 'woocommerce_payment_complete_order_status_' . $this->get_status(), $this->get_id() );
}
-
- wc_transaction_query( 'commit' );
} catch ( Exception $e ) {
- wc_transaction_query( 'rollback' );
-
+ /**
+ * If there was an error completing the payment, log to a file and add an order note so the admin can take action.
+ */
$logger = wc_get_logger();
$logger->error(
- sprintf( 'Payment complete of order #%d failed!', $this->get_id() ), array(
+ sprintf( 'Error completing payment for order #%d', $this->get_id() ), array(
'order' => $this,
'error' => $e,
)
);
$this->add_order_note( __( 'Payment complete event failed.', 'woocommerce' ) . ' ' . $e->getMessage() );
-
return false;
}
return true;
@@ -320,18 +316,12 @@ class WC_Order extends WC_Abstract_Order {
}
try {
- wc_transaction_query( 'start' );
-
$this->set_status( $new_status, $note, $manual );
$this->save();
-
- wc_transaction_query( 'commit' );
} catch ( Exception $e ) {
- wc_transaction_query( 'rollback' );
-
$logger = wc_get_logger();
$logger->error(
- sprintf( 'Update status of order #%d failed!', $this->get_id() ), array(
+ sprintf( 'Error updating status for order #%d', $this->get_id() ), array(
'order' => $this,
'error' => $e,
)
diff --git a/includes/class-wc-privacy.php b/includes/class-wc-privacy.php
index 31739fe8f9d..23e9c63cc53 100644
--- a/includes/class-wc-privacy.php
+++ b/includes/class-wc-privacy.php
@@ -39,16 +39,16 @@ class WC_Privacy extends WC_Abstract_Privacy {
include_once 'class-wc-privacy-exporters.php';
// This hook registers WooCommerce data exporters.
- $this->add_exporter( 'woocommerce-customer-data', __( 'Customer Data', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'customer_data_exporter' ) );
- $this->add_exporter( 'woocommerce-customer-orders', __( 'Customer Orders', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'order_data_exporter' ) );
- $this->add_exporter( 'woocommerce-customer-downloads', __( 'Customer Downloads', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'download_data_exporter' ) );
- $this->add_exporter( 'woocommerce-customer-tokens', __( 'Customer Payment Tokens', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'customer_tokens_exporter' ) );
+ $this->add_exporter( 'woocommerce-customer-data', __( 'WooCommerce Customer Data', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'customer_data_exporter' ) );
+ $this->add_exporter( 'woocommerce-customer-orders', __( 'WooCommerce Customer Orders', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'order_data_exporter' ) );
+ $this->add_exporter( 'woocommerce-customer-downloads', __( 'WooCommerce Customer Downloads', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'download_data_exporter' ) );
+ $this->add_exporter( 'woocommerce-customer-tokens', __( 'WooCommerce Customer Payment Tokens', 'woocommerce' ), array( 'WC_Privacy_Exporters', 'customer_tokens_exporter' ) );
// This hook registers WooCommerce data erasers.
- $this->add_eraser( 'woocommerce-customer-data', __( 'Customer Data', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'customer_data_eraser' ) );
- $this->add_eraser( 'woocommerce-customer-orders', __( 'Customer Orders', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'order_data_eraser' ) );
- $this->add_eraser( 'woocommerce-customer-downloads', __( 'Customer Downloads', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'download_data_eraser' ) );
- $this->add_eraser( 'woocommerce-customer-tokens', __( 'Customer Payment Tokens', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'customer_tokens_eraser' ) );
+ $this->add_eraser( 'woocommerce-customer-data', __( 'WooCommerce Customer Data', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'customer_data_eraser' ) );
+ $this->add_eraser( 'woocommerce-customer-orders', __( 'WooCommerce Customer Orders', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'order_data_eraser' ) );
+ $this->add_eraser( 'woocommerce-customer-downloads', __( 'WooCommerce Customer Downloads', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'download_data_eraser' ) );
+ $this->add_eraser( 'woocommerce-customer-tokens', __( 'WooCommerce Customer Payment Tokens', 'woocommerce' ), array( 'WC_Privacy_Erasers', 'customer_tokens_eraser' ) );
// Cleanup orders daily - this is a callback on a daily cron event.
add_action( 'woocommerce_cleanup_personal_data', array( $this, 'queue_cleanup_personal_data' ) );
diff --git a/includes/class-wc-product-variation.php b/includes/class-wc-product-variation.php
index 016ef91b82c..e0d157cd972 100644
--- a/includes/class-wc-product-variation.php
+++ b/includes/class-wc-product-variation.php
@@ -426,6 +426,33 @@ class WC_Product_Variation extends WC_Product_Simple {
* @param array $parent_data parent data array for this variation.
*/
public function set_parent_data( $parent_data ) {
+ $parent_data = wp_parse_args( $parent_data, array(
+ 'title' => '',
+ 'status' => '',
+ 'sku' => '',
+ 'manage_stock' => 'no',
+ 'backorders' => 'no',
+ 'stock_quantity' => '',
+ 'weight' => '',
+ 'length' => '',
+ 'width' => '',
+ 'height' => '',
+ 'tax_class' => '',
+ 'shipping_class_id' => 0,
+ 'image_id' => 0,
+ 'purchase_note' => '',
+ 'catalog_visibility' => 'visible',
+ ) );
+
+ // Normalize tax class.
+ $parent_data['tax_class'] = sanitize_title( $parent_data['tax_class'] );
+ $parent_data['tax_class'] = 'standard' === $parent_data['tax_class'] ? '' : $parent_data['tax_class'];
+ $valid_classes = $this->get_valid_tax_classes();
+
+ if ( ! in_array( $parent_data['tax_class'], $valid_classes, true ) ) {
+ $parent_data['tax_class'] = '';
+ }
+
$this->parent_data = $parent_data;
}
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 f4dffe61a41..73ff2844cb0 100644
--- a/includes/data-stores/abstract-wc-order-data-store-cpt.php
+++ b/includes/data-stores/abstract-wc-order-data-store-cpt.php
@@ -324,7 +324,7 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
global $wpdb;
// Get from cache if available.
- $items = wp_cache_get( 'order-items-' . $order->get_id(), 'orders' );
+ $items = 0 < $order->get_id() ? wp_cache_get( 'order-items-' . $order->get_id(), 'orders' ) : false;
if ( false === $items ) {
$items = $wpdb->get_results(
@@ -333,7 +333,9 @@ abstract class Abstract_WC_Order_Data_Store_CPT extends WC_Data_Store_WP impleme
foreach ( $items as $item ) {
wp_cache_set( 'item-' . $item->order_item_id, $item, 'order-items' );
}
- wp_cache_set( 'order-items-' . $order->get_id(), $items, 'orders' );
+ if ( 0 < $order->get_id() ) {
+ wp_cache_set( 'order-items-' . $order->get_id(), $items, 'orders' );
+ }
}
$items = wp_list_filter( $items, array( 'order_item_type' => $type ) );
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 d85151f8bd3..4f2e8f9671d 100644
--- a/includes/data-stores/class-wc-product-data-store-cpt.php
+++ b/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -594,19 +594,24 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
* @param WC_Product $product Product Object.
*/
protected function handle_updated_props( &$product ) {
- if ( in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) ) {
- if ( $product->get_sale_price( 'edit' ) >= $product->get_regular_price( 'edit' ) ) {
- update_post_meta( $product->get_id(), '_sale_price', '' );
- $product->set_sale_price( '' );
+ $price_is_synced = $product->is_type( array( 'variable', 'grouped' ) );
+
+ if ( ! $price_is_synced ) {
+ if ( in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) ) {
+ if ( $product->get_sale_price( 'edit' ) >= $product->get_regular_price( 'edit' ) ) {
+ update_post_meta( $product->get_id(), '_sale_price', '' );
+ $product->set_sale_price( '' );
+ }
}
- }
- if ( in_array( 'date_on_sale_from', $this->updated_props, true ) || in_array( 'date_on_sale_to', $this->updated_props, true ) || in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) || in_array( 'product_type', $this->updated_props, true ) ) {
- if ( $product->is_on_sale( 'edit' ) ) {
- update_post_meta( $product->get_id(), '_price', $product->get_sale_price( 'edit' ) );
- $product->set_price( $product->get_sale_price( 'edit' ) );
- } else {
- update_post_meta( $product->get_id(), '_price', $product->get_regular_price( 'edit' ) );
- $product->set_price( $product->get_regular_price( 'edit' ) );
+
+ if ( in_array( 'date_on_sale_from', $this->updated_props, true ) || in_array( 'date_on_sale_to', $this->updated_props, true ) || in_array( 'regular_price', $this->updated_props, true ) || in_array( 'sale_price', $this->updated_props, true ) || in_array( 'product_type', $this->updated_props, true ) ) {
+ if ( $product->is_on_sale( 'edit' ) ) {
+ update_post_meta( $product->get_id(), '_price', $product->get_sale_price( 'edit' ) );
+ $product->set_price( $product->get_sale_price( 'edit' ) );
+ } else {
+ update_post_meta( $product->get_id(), '_price', $product->get_regular_price( 'edit' ) );
+ $product->set_price( $product->get_regular_price( 'edit' ) );
+ }
}
}
@@ -1344,13 +1349,14 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
/**
* Search product data for a term and return ids.
*
- * @param string $term Search term.
- * @param string $type Type of product.
- * @param bool $include_variations Include variations in search or not.
- * @param bool $all_statuses Should we search all statuses or limit to published.
+ * @param string $term Search term.
+ * @param string $type Type of product.
+ * @param bool $include_variations Include variations in search or not.
+ * @param bool $all_statuses Should we search all statuses or limit to published.
+ * @param null|int $limit Limit returned results. @since 3.5.0.
* @return array of ids
*/
- public function search_products( $term, $type = '', $include_variations = false, $all_statuses = false ) {
+ public function search_products( $term, $type = '', $include_variations = false, $all_statuses = false, $limit = null ) {
global $wpdb;
$post_types = $include_variations ? array( 'product', 'product_variation' ) : array( 'product' );
@@ -1358,6 +1364,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$type_join = '';
$type_where = '';
$status_where = '';
+ $limit_query = '';
$term = wc_strtolower( $term );
// See if search term contains OR keywords.
@@ -1411,6 +1418,10 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$status_where = " AND posts.post_status IN ('" . implode( "','", $post_statuses ) . "') ";
}
+ if ( $limit ) {
+ $limit_query = $wpdb->prepare( ' LIMIT %d ', $limit );
+ }
+
// phpcs:ignore WordPress.VIP.DirectDatabaseQuery.DirectQuery
$search_results = $wpdb->get_results(
// phpcs:disable
@@ -1421,7 +1432,9 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$search_where
$status_where
$type_where
- ORDER BY posts.post_parent ASC, posts.post_title ASC"
+ ORDER BY posts.post_parent ASC, posts.post_title ASC
+ $limit_query
+ "
// phpcs:enable
);
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 393663c3e1d..ea3b9adacdd 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
@@ -74,11 +74,13 @@ class WC_Product_Grouped_Data_Store_CPT extends WC_Product_Data_Store_CPT implem
foreach ( $product->get_children( 'edit' ) as $child_id ) {
$child = wc_get_product( $child_id );
if ( $child ) {
- $child_prices[] = $child->get_price();
+ $child_prices[] = $child->get_price( 'edit' );
}
}
$child_prices = array_filter( $child_prices );
delete_post_meta( $product->get_id(), '_price' );
+ delete_post_meta( $product->get_id(), '_sale_price' );
+ delete_post_meta( $product->get_id(), '_regular_price' );
if ( ! empty( $child_prices ) ) {
add_post_meta( $product->get_id(), '_price', min( $child_prices ) );
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 951a0dc97d3..91e19171492 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
@@ -515,6 +515,8 @@ class WC_Product_Variable_Data_Store_CPT extends WC_Product_Data_Store_CPT imple
$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(); // phpcs:ignore WordPress.WP.PreparedSQL.NotPrepared
delete_post_meta( $product->get_id(), '_price' );
+ delete_post_meta( $product->get_id(), '_sale_price' );
+ delete_post_meta( $product->get_id(), '_regular_price' );
if ( $prices ) {
sort( $prices );
diff --git a/includes/gateways/bacs/class-wc-gateway-bacs.php b/includes/gateways/bacs/class-wc-gateway-bacs.php
index 12afbc751a7..fdd4a64af6e 100644
--- a/includes/gateways/bacs/class-wc-gateway-bacs.php
+++ b/includes/gateways/bacs/class-wc-gateway-bacs.php
@@ -364,9 +364,6 @@ class WC_Gateway_BACS extends WC_Payment_Gateway {
$order->payment_complete();
}
- // Reduce stock levels.
- wc_reduce_stock_levels( $order_id );
-
// Remove cart.
WC()->cart->empty_cart();
diff --git a/includes/gateways/cheque/class-wc-gateway-cheque.php b/includes/gateways/cheque/class-wc-gateway-cheque.php
index 7c5a1a97dc8..b31752d6149 100644
--- a/includes/gateways/cheque/class-wc-gateway-cheque.php
+++ b/includes/gateways/cheque/class-wc-gateway-cheque.php
@@ -124,9 +124,6 @@ class WC_Gateway_Cheque extends WC_Payment_Gateway {
$order->payment_complete();
}
- // Reduce stock levels.
- wc_reduce_stock_levels( $order_id );
-
// Remove cart.
WC()->cart->empty_cart();
diff --git a/includes/gateways/cod/class-wc-gateway-cod.php b/includes/gateways/cod/class-wc-gateway-cod.php
index 808bcf1cd05..d9ba51efcfc 100644
--- a/includes/gateways/cod/class-wc-gateway-cod.php
+++ b/includes/gateways/cod/class-wc-gateway-cod.php
@@ -281,9 +281,6 @@ class WC_Gateway_COD extends WC_Payment_Gateway {
$order->payment_complete();
}
- // Reduce stock levels.
- wc_reduce_stock_levels( $order_id );
-
// Remove cart.
WC()->cart->empty_cart();
diff --git a/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php b/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
index 48b158de675..6182816eaa7 100644
--- a/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
+++ b/includes/gateways/paypal/includes/class-wc-gateway-paypal-response.php
@@ -76,7 +76,6 @@ abstract class WC_Gateway_Paypal_Response {
*/
protected function payment_on_hold( $order, $reason = '' ) {
$order->update_status( 'on-hold', $reason );
- wc_reduce_stock_levels( $order->get_id() );
WC()->cart->empty_cart();
}
}
diff --git a/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php b/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
index f39fc002f25..c7bef506404 100644
--- a/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
+++ b/includes/gateways/simplify-commerce/class-wc-addons-gateway-simplify-commerce.php
@@ -216,9 +216,6 @@ class WC_Addons_Gateway_Simplify_Commerce extends WC_Gateway_Simplify_Commerce {
throw new Simplify_ApiException( $error_msg );
}
- // Reduce stock levels
- wc_reduce_stock_levels( $order->get_id() );
-
// Remove cart
WC()->cart->empty_cart();
diff --git a/includes/shortcodes/class-wc-shortcode-checkout.php b/includes/shortcodes/class-wc-shortcode-checkout.php
index 88cad281c22..afc71182a6b 100644
--- a/includes/shortcodes/class-wc-shortcode-checkout.php
+++ b/includes/shortcodes/class-wc-shortcode-checkout.php
@@ -114,14 +114,43 @@ class WC_Shortcode_Checkout {
throw new Exception( sprintf( __( 'This order’s status is “%s”—it cannot be paid for. Please contact us if you need assistance.', 'woocommerce' ), wc_get_order_status_name( $order->get_status() ) ) );
}
- // Ensure order items are still stocked.
- foreach ( $order->get_items() as $item_key => $item ) {
- if ( $item && is_callable( array( $item, 'get_product' ) ) ) {
- $product = $item->get_product();
+ // Ensure order items are still stocked if paying for a failed order. Pending orders do not need this check because stock is held.
+ if ( ! $order->has_status( 'pending' ) ) {
+ $quantities = array();
- if ( $product && ! apply_filters( 'woocommerce_pay_order_product_in_stock', $product->is_in_stock(), $product, $order ) ) {
- /* translators: %s: product name */
- throw new Exception( sprintf( __( 'Sorry, "%s" is no longer in stock so this order cannot be paid for. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name() ) );
+ foreach ( $order->get_items() as $item_key => $item ) {
+ if ( $item && is_callable( array( $item, 'get_product' ) ) ) {
+ $product = $item->get_product();
+
+ if ( ! $product ) {
+ continue;
+ }
+
+ $quantities[ $product->get_stock_managed_by_id() ] = isset( $quantities[ $product->get_stock_managed_by_id() ] ) ? $quantities[ $product->get_stock_managed_by_id() ] + $item->get_quantity() : $item->get_quantity();
+ }
+ }
+
+ foreach ( $order->get_items() as $item_key => $item ) {
+ if ( $item && is_callable( array( $item, 'get_product' ) ) ) {
+ $product = $item->get_product();
+
+ if ( ! $product ) {
+ continue;
+ }
+
+ if ( ! apply_filters( 'woocommerce_pay_order_product_in_stock', $product->is_in_stock(), $product, $order ) ) {
+ /* translators: %s: product name */
+ throw new Exception( sprintf( __( 'Sorry, "%s" is no longer in stock so this order cannot be paid for. We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name() ) );
+ }
+
+ // Check stock based on all items in the cart and consider any held stock within pending orders.
+ $held_stock = wc_get_held_stock_quantity( $product, $order->get_id() );
+ $required_stock = $quantities[ $product->get_stock_managed_by_id() ];
+
+ if ( $product->get_stock_quantity() < ( $held_stock + $required_stock ) ) {
+ /* translators: 1: product name 2: quantity in stock */
+ throw new Exception( sprintf( __( 'Sorry, we do not have enough "%1$s" in stock to fulfill your order (%2$s available). We apologize for any inconvenience caused.', 'woocommerce' ), $product->get_name(), wc_format_stock_quantity_for_display( $product->get_stock_quantity() - $held_stock, $product ) ) );
+ }
}
}
}
diff --git a/includes/wc-rest-functions.php b/includes/wc-rest-functions.php
index fc10d884b4c..29b65501973 100644
--- a/includes/wc-rest-functions.php
+++ b/includes/wc-rest-functions.php
@@ -102,7 +102,8 @@ function wc_rest_upload_image_from_url( $image_url ) {
if ( ! $wp_filetype['type'] ) {
$headers = wp_remote_retrieve_headers( $response );
if ( isset( $headers['content-disposition'] ) && strstr( $headers['content-disposition'], 'filename=' ) ) {
- $disposition = end( explode( 'filename=', $headers['content-disposition'] ) );
+ $content = explode( 'filename=', $headers['content-disposition'] );
+ $disposition = end( $content );
$disposition = sanitize_file_name( $disposition );
$file_name = $disposition;
} elseif ( isset( $headers['content-type'] ) && strstr( $headers['content-type'], 'image/' ) ) {
diff --git a/includes/wc-stock-functions.php b/includes/wc-stock-functions.php
index 9903280971a..b56ca6ee597 100644
--- a/includes/wc-stock-functions.php
+++ b/includes/wc-stock-functions.php
@@ -79,14 +79,60 @@ function wc_update_product_stock_status( $product_id, $status ) {
*/
function wc_maybe_reduce_stock_levels( $order_id ) {
$order = wc_get_order( $order_id );
- if ( apply_filters( 'woocommerce_payment_complete_reduce_order_stock', $order && ! $order->get_data_store()->get_stock_reduced( $order_id ), $order_id ) ) {
- wc_reduce_stock_levels( $order );
+
+ if ( ! $order ) {
+ return;
}
+
+ $stock_reduced = $order->get_data_store()->get_stock_reduced( $order_id );
+ $trigger_reduce = apply_filters( 'woocommerce_payment_complete_reduce_order_stock', ! $stock_reduced, $order_id );
+
+ // Only continue if we're reducing stock.
+ if ( ! $trigger_reduce ) {
+ return;
+ }
+
+ wc_reduce_stock_levels( $order );
+
+ // Ensure stock is marked as "reduced" in case payment complete or other stock actions are called.
+ $order->get_data_store()->set_stock_reduced( $order_id, true );
}
add_action( 'woocommerce_payment_complete', 'wc_maybe_reduce_stock_levels' );
+add_action( 'woocommerce_order_status_completed', 'wc_maybe_reduce_stock_levels' );
+add_action( 'woocommerce_order_status_processing', 'wc_maybe_reduce_stock_levels' );
+add_action( 'woocommerce_order_status_on-hold', 'wc_maybe_reduce_stock_levels' );
/**
- * Reduce stock levels for items within an order.
+ * When a payment is cancelled, restore stock.
+ *
+ * @since 3.0.0
+ * @param int $order_id Order ID.
+ */
+function wc_maybe_increase_stock_levels( $order_id ) {
+ $order = wc_get_order( $order_id );
+
+ if ( ! $order ) {
+ return;
+ }
+
+ $stock_reduced = $order->get_data_store()->get_stock_reduced( $order_id );
+ $trigger_reduce = (bool) $stock_reduced;
+
+ // Only continue if we're reducing stock.
+ if ( ! $trigger_reduce ) {
+ return;
+ }
+
+ wc_increase_stock_levels( $order );
+
+ // Ensure stock is marked as "reduced" in case payment complete or other stock actions are called.
+ $order->get_data_store()->set_stock_reduced( $order_id, false );
+}
+add_action( 'woocommerce_order_status_cancelled', 'wc_maybe_increase_stock_levels' );
+add_action( 'woocommerce_order_status_pending', 'wc_maybe_increase_stock_levels' );
+
+/**
+ * Reduce stock levels for items within an order, if stock has not already been reduced for the items.
*
* @since 3.0.0
* @param int|WC_Order $order_id Order ID or order instance.
@@ -98,48 +144,175 @@ function wc_reduce_stock_levels( $order_id ) {
} else {
$order = wc_get_order( $order_id );
}
- if ( 'yes' === get_option( 'woocommerce_manage_stock' ) && $order && apply_filters( 'woocommerce_can_reduce_order_stock', true, $order ) && count( $order->get_items() ) > 0 ) {
- foreach ( $order->get_items() as $item ) {
- if ( ! $item->is_type( 'line_item' ) ) {
- continue;
- }
- $product = $item->get_product();
+ // We need an order, and a store with stock management to continue.
+ if ( ! $order || 'yes' !== get_option( 'woocommerce_manage_stock' ) || ! apply_filters( 'woocommerce_can_reduce_order_stock', true, $order ) ) {
+ return;
+ }
- if ( $product && $product->managing_stock() ) {
- $qty = apply_filters( 'woocommerce_order_item_quantity', $item->get_quantity(), $order, $item );
- $item_name = $product->get_formatted_name();
- $new_stock = wc_update_product_stock( $product, $qty, 'decrease' );
+ $changes = array();
- if ( ! is_wp_error( $new_stock ) ) {
- /* translators: 1: item name 2: old stock quantity 3: new stock quantity */
- $order->add_order_note( sprintf( __( '%1$s stock reduced from %2$s to %3$s.', 'woocommerce' ), $item_name, $new_stock + $qty, $new_stock ) );
-
- // Get the latest product data.
- $product = wc_get_product( $product->get_id() );
-
- if ( '' !== get_option( 'woocommerce_notify_no_stock_amount' ) && $new_stock <= get_option( 'woocommerce_notify_no_stock_amount' ) ) {
- do_action( 'woocommerce_no_stock', $product );
- } elseif ( '' !== get_option( 'woocommerce_notify_low_stock_amount' ) && $new_stock <= get_option( 'woocommerce_notify_low_stock_amount' ) ) {
- do_action( 'woocommerce_low_stock', $product );
- }
-
- if ( $new_stock < 0 ) {
- do_action(
- 'woocommerce_product_on_backorder', array(
- 'product' => $product,
- 'order_id' => $order_id,
- 'quantity' => $qty,
- )
- );
- }
- }
- }
+ // Loop over all items.
+ foreach ( $order->get_items() as $item ) {
+ if ( ! $item->is_type( 'line_item' ) ) {
+ continue;
}
- // Ensure stock is marked as "reduced" in case payment complete or other stock actions are called.
- $order->get_data_store()->set_stock_reduced( $order_id, true );
+ // Only reduce stock once for each item.
+ $product = $item->get_product();
+ $item_stock_reduced = $item->get_meta( '_reduced_stock', true );
- do_action( 'woocommerce_reduce_order_stock', $order );
+ if ( $item_stock_reduced || ! $product || ! $product->managing_stock() ) {
+ continue;
+ }
+
+ $qty = apply_filters( 'woocommerce_order_item_quantity', $item->get_quantity(), $order, $item );
+ $item_name = $product->get_formatted_name();
+ $new_stock = wc_update_product_stock( $product, $qty, 'decrease' );
+
+ if ( is_wp_error( $new_stock ) ) {
+ /* translators: %s item name. */
+ $order->add_order_note( sprintf( __( 'Unable to reduce stock for item %s.', 'woocommerce' ), $item_name ) );
+ continue;
+ }
+
+ $item->add_meta_data( '_reduced_stock', $qty, true );
+ $item->save();
+
+ $changes[] = array(
+ 'product' => $product,
+ 'from' => $new_stock + $qty,
+ 'to' => $new_stock,
+ );
}
+
+ wc_trigger_stock_change_notifications( $order, $changes );
+
+ do_action( 'woocommerce_reduce_order_stock', $order );
+}
+
+/**
+ * After stock change events, triggers emails and adds order notes.
+ *
+ * @since 3.5.0
+ * @param WC_Order $order order object.
+ * @param array $changes Array of changes.
+ */
+function wc_trigger_stock_change_notifications( $order, $changes ) {
+ if ( empty( $changes ) ) {
+ return;
+ }
+
+ $order_notes = array();
+ $no_stock_amount = absint( get_option( 'woocommerce_notify_no_stock_amount', 0 ) );
+ $low_stock_amount = absint( get_option( 'woocommerce_notify_low_stock_amount', 2 ) );
+
+ foreach ( $changes as $change ) {
+ $order_notes[] = $change['product']->get_formatted_name() . ' ' . $change['from'] . '→' . $change['to'];
+
+ if ( $change['to'] <= $no_stock_amount ) {
+ do_action( 'woocommerce_no_stock', wc_get_product( $change['product']->get_id() ) );
+ } elseif ( $change['to'] <= $low_stock_amount ) {
+ do_action( 'woocommerce_low_stock', wc_get_product( $change['product']->get_id() ) );
+ }
+
+ if ( $change['to'] < 0 ) {
+ do_action(
+ 'woocommerce_product_on_backorder', array(
+ 'product' => wc_get_product( $change['product']->get_id() ),
+ 'order_id' => $order->get_id(),
+ 'quantity' => abs( $change['from'] - $change['to'] ),
+ )
+ );
+ }
+ }
+
+ $order->add_order_note( __( 'Stock levels reduced:', 'woocommerce' ) . ' ' . implode( ', ', $order_notes ) );
+}
+
+/**
+ * Increase stock levels for items within an order.
+ *
+ * @since 3.0.0
+ * @param int|WC_Order $order_id Order ID or order instance.
+ */
+function wc_increase_stock_levels( $order_id ) {
+ if ( is_a( $order_id, 'WC_Order' ) ) {
+ $order = $order_id;
+ $order_id = $order->get_id();
+ } else {
+ $order = wc_get_order( $order_id );
+ }
+
+ // We need an order, and a store with stock management to continue.
+ if ( ! $order || 'yes' !== get_option( 'woocommerce_manage_stock' ) || ! apply_filters( 'woocommerce_can_restore_order_stock', true, $order ) ) {
+ return;
+ }
+
+ // Loop over all items.
+ foreach ( $order->get_items() as $item ) {
+ if ( ! $item->is_type( 'line_item' ) ) {
+ continue;
+ }
+
+ // Only reduce stock once for each item.
+ $product = $item->get_product();
+ $item_stock_reduced = $item->get_meta( '_reduced_stock', true );
+
+ if ( ! $item_stock_reduced || ! $product || ! $product->managing_stock() ) {
+ continue;
+ }
+
+ $item_name = $product->get_formatted_name();
+ $new_stock = wc_update_product_stock( $product, $item_stock_reduced, 'increase' );
+
+ if ( is_wp_error( $new_stock ) ) {
+ /* translators: %s item name. */
+ $order->add_order_note( sprintf( __( 'Unable to restore stock for item %s.', 'woocommerce' ), $item_name ) );
+ continue;
+ }
+
+ $item->delete_meta_data( '_reduced_stock' );
+ $item->save();
+
+ $changes[] = $item_name . ' ' . ( $new_stock - $item_stock_reduced ) . '→' . $new_stock;
+ }
+
+ if ( $changes ) {
+ $order->add_order_note( __( 'Stock levels increased:', 'woocommerce' ) . ' ' . implode( ', ', $changes ) );
+ }
+
+ do_action( 'woocommerce_restore_order_stock', $order );
+}
+
+/**
+ * See how much stock is being held in pending orders.
+ *
+ * @since 3.5.0
+ * @param WC_Product $product Product to check.
+ * @param integer $exclude_order_id Order ID to exclude.
+ * @return int
+ */
+function wc_get_held_stock_quantity( $product, $exclude_order_id = 0 ) {
+ global $wpdb;
+
+ return $wpdb->get_var(
+ $wpdb->prepare(
+ "
+ SELECT SUM( order_item_meta.meta_value ) AS held_qty
+ FROM {$wpdb->posts} AS posts
+ LEFT JOIN {$wpdb->prefix}woocommerce_order_items as order_items ON posts.ID = order_items.order_id
+ LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta ON order_items.order_item_id = order_item_meta.order_item_id
+ LEFT JOIN {$wpdb->prefix}woocommerce_order_itemmeta as order_item_meta2 ON order_items.order_item_id = order_item_meta2.order_item_id
+ WHERE order_item_meta.meta_key = '_qty'
+ AND order_item_meta2.meta_key = %s
+ AND order_item_meta2.meta_value = %d
+ AND posts.post_type IN ( '" . implode( "','", wc_get_order_types() ) . "' )
+ AND posts.post_status = 'wc-pending'
+ AND posts.ID != %d;",
+ 'variation' === get_post_type( $product->get_stock_managed_by_id() ) ? '_variation_id' : '_product_id',
+ $product->get_stock_managed_by_id(),
+ $exclude_order_id
+ )
+ ); // WPCS: unprepared SQL ok.
}
diff --git a/includes/wc-user-functions.php b/includes/wc-user-functions.php
index d513939bd72..a302ce008bf 100644
--- a/includes/wc-user-functions.php
+++ b/includes/wc-user-functions.php
@@ -106,7 +106,7 @@ if ( ! function_exists( 'wc_create_new_customer' ) ) {
$customer_id = wp_insert_user( $new_customer_data );
if ( is_wp_error( $customer_id ) ) {
- return new WP_Error( 'registration-error', '' . __( 'Error:', 'woocommerce' ) . ' ' . __( 'Couldn’t register you… please contact us if you continue to have problems.', 'woocommerce' ) );
+ return new WP_Error( 'registration-error', __( 'Couldn’t register you… please contact us if you continue to have problems.', 'woocommerce' ) );
}
do_action( 'woocommerce_created_customer', $customer_id, $new_customer_data, $password_generated );
diff --git a/package-lock.json b/package-lock.json
index b16a89bfb0e..4fc6f7913f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -175,9 +175,9 @@
"dev": true
},
"ajv": {
- "version": "5.5.1",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz",
- "integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI=",
+ "version": "5.5.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"dev": true,
"requires": {
"co": "^4.6.0",
@@ -1662,6 +1662,12 @@
"electron-to-chromium": "^1.3.47"
}
},
+ "buffer-from": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+ "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+ "dev": true
+ },
"builtin-modules": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -1833,16 +1839,16 @@
}
},
"chromedriver": {
- "version": "2.38.2",
- "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.38.2.tgz",
- "integrity": "sha1-5EbpO2vNHytbrlRMemTUcOc6R9E=",
+ "version": "2.40.0",
+ "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.40.0.tgz",
+ "integrity": "sha512-ewvRQ1HMk0vpFSWYCk5hKDoEz5QMPplx5w3C6/Me+03y1imr67l3Hxl9U0jn3mu2N7+c7BoC7JtNW6HzbRAwDQ==",
"dev": true,
"requires": {
"del": "^3.0.0",
- "extract-zip": "^1.6.6",
+ "extract-zip": "^1.6.7",
"kew": "^0.7.0",
"mkdirp": "^0.5.1",
- "request": "^2.85.0"
+ "request": "^2.87.0"
},
"dependencies": {
"request": {
@@ -2175,9 +2181,9 @@
}
},
"cross-env": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz",
- "integrity": "sha1-9hwUKR98xlO7hkVwAuqAoEaZ0CI=",
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.6.tgz",
+ "integrity": "sha512-VWTDq+G4v383SzgRS7jsAVWqEWF0aKZpDz1GVjhONvPRgHB1LnxP2sXUVFKbykHkPSnfRKS8YdiDevWFwZmQ9g==",
"dev": true,
"requires": {
"cross-spawn": "^5.1.0",
@@ -2677,24 +2683,27 @@
}
},
"extract-zip": {
- "version": "1.6.6",
- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",
- "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=",
+ "version": "1.6.7",
+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+ "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
"dev": true,
"requires": {
- "concat-stream": "1.6.0",
+ "concat-stream": "1.6.2",
"debug": "2.6.9",
- "mkdirp": "0.5.0",
+ "mkdirp": "0.5.1",
"yauzl": "2.4.1"
},
"dependencies": {
- "mkdirp": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
- "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+ "concat-stream": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
"dev": true,
"requires": {
- "minimist": "0.0.8"
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
}
}
}
@@ -2706,9 +2715,9 @@
"dev": true
},
"fast-deep-equal": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
- "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+ "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
"dev": true
},
"fast-glob": {
@@ -3266,14 +3275,25 @@
"dev": true
},
"form-data": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
- "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"dev": true,
"requires": {
"asynckit": "^0.4.0",
- "combined-stream": "^1.0.5",
+ "combined-stream": "1.0.6",
"mime-types": "^2.1.12"
+ },
+ "dependencies": {
+ "combined-stream": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+ "dev": true,
+ "requires": {
+ "delayed-stream": "~1.0.0"
+ }
+ }
}
},
"fragment-cache": {
@@ -6650,7 +6670,7 @@
"p-map": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
- "integrity": "sha1-5OlPMR6rvIYzoeeZCBZfyiYkG2s=",
+ "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
"dev": true
},
"p-try": {
diff --git a/package.json b/package.json
index b7ececec134..a8bae722568 100644
--- a/package.json
+++ b/package.json
@@ -26,9 +26,9 @@
"babel-preset-stage-2": "^6.13.0",
"chai": "^4.1.2",
"chai-as-promised": "^7.1.1",
- "chromedriver": "^2.37.0",
+ "chromedriver": "^2.40.0",
"config": "^1.24.0",
- "cross-env": "~5.1.1",
+ "cross-env": "^5.1.6",
"grunt": "^1.0.3",
"grunt-checktextdomain": "~1.0.1",
"grunt-contrib-clean": "~1.1.0",
diff --git a/tests/framework/helpers/class-wc-helper-coupon.php b/tests/framework/helpers/class-wc-helper-coupon.php
index 1f4ab4e01a7..25a667cafa6 100644
--- a/tests/framework/helpers/class-wc-helper-coupon.php
+++ b/tests/framework/helpers/class-wc-helper-coupon.php
@@ -7,12 +7,17 @@
*/
class WC_Helper_Coupon {
+ protected static $custom_types = array();
+
/**
* Create a dummy coupon.
*
+ * @param string $coupon_code
+ * @param array $meta
+ *
* @return WC_Coupon
*/
- public static function create_coupon( $coupon_code = 'dummycoupon' ) {
+ public static function create_coupon( $coupon_code = 'dummycoupon', $meta = array() ) {
// Insert post
$coupon_id = wp_insert_post( array(
'post_title' => $coupon_code,
@@ -21,24 +26,30 @@ class WC_Helper_Coupon {
'post_excerpt' => 'This is a dummy coupon',
) );
- // Update meta
- update_post_meta( $coupon_id, 'discount_type', 'fixed_cart' );
- update_post_meta( $coupon_id, 'coupon_amount', '1' );
- update_post_meta( $coupon_id, 'individual_use', 'no' );
- update_post_meta( $coupon_id, 'product_ids', '' );
- update_post_meta( $coupon_id, 'exclude_product_ids', '' );
- update_post_meta( $coupon_id, 'usage_limit', '' );
- update_post_meta( $coupon_id, 'usage_limit_per_user', '' );
- update_post_meta( $coupon_id, 'limit_usage_to_x_items', '' );
- update_post_meta( $coupon_id, 'expiry_date', '' );
- update_post_meta( $coupon_id, 'free_shipping', 'no' );
- update_post_meta( $coupon_id, 'exclude_sale_items', 'no' );
- update_post_meta( $coupon_id, 'product_categories', array() );
- update_post_meta( $coupon_id, 'exclude_product_categories', array() );
- update_post_meta( $coupon_id, 'minimum_amount', '' );
- update_post_meta( $coupon_id, 'maximum_amount', '' );
- update_post_meta( $coupon_id, 'customer_email', array() );
- update_post_meta( $coupon_id, 'usage_count', '0' );
+ $meta = wp_parse_args( $meta, array(
+ 'discount_type' => 'fixed_cart',
+ 'coupon_amount' => '1',
+ 'individual_use' => 'no',
+ 'product_ids' => '',
+ 'exclude_product_ids' => '',
+ 'usage_limit' => '',
+ 'usage_limit_per_user' => '',
+ 'limit_usage_to_x_items' => '',
+ 'expiry_date' => '',
+ 'free_shipping' => 'no',
+ 'exclude_sale_items' => 'no',
+ 'product_categories' => array(),
+ 'exclude_product_categories' => array(),
+ 'minimum_amount' => '',
+ 'maximum_amount' => '',
+ 'customer_email' => array(),
+ 'usage_count' => '0',
+ ) );
+
+ // Update meta.
+ foreach ( $meta as $key => $value ) {
+ update_post_meta( $coupon_id, $key, $value );
+ }
return new WC_Coupon( $coupon_code );
}
@@ -52,6 +63,71 @@ class WC_Helper_Coupon {
*/
public static function delete_coupon( $coupon_id ) {
wp_delete_post( $coupon_id, true );
+
return true;
}
+
+ /**
+ * Register a custom coupon type.
+ *
+ * @param string $coupon_type
+ */
+ public static function register_custom_type( $coupon_type ) {
+ static $filters_added = false;
+ if ( isset( self::$custom_types[ $coupon_type ] ) ) {
+ return;
+ }
+
+ self::$custom_types[ $coupon_type ] = "Testing custom type {$coupon_type}";
+
+ if ( ! $filters_added ) {
+ add_filter( 'woocommerce_coupon_discount_types', array( __CLASS__, 'filter_discount_types' ) );
+ add_filter( 'woocommerce_coupon_get_discount_amount', array( __CLASS__, 'filter_get_discount_amount' ), 10, 5 );
+ add_filter( 'woocommerce_coupon_is_valid_for_product', '__return_true' );
+ $filters_added = true;
+ }
+ }
+
+ /**
+ * Unregister custom coupon type.
+ *
+ * @param $coupon_type
+ */
+ public static function unregister_custom_type( $coupon_type ) {
+ unset( self::$custom_types[ $coupon_type ] );
+ if ( empty( self::$custom_types ) ) {
+ remove_filter( 'woocommerce_coupon_discount_types', array( __CLASS__, 'filter_discount_types' ) );
+ remove_filter( 'woocommerce_coupon_get_discount_amount', array( __CLASS__, 'filter_get_discount_amount' ) );
+ remove_filter( 'woocommerce_coupon_is_valid_for_product', '__return_true' );
+ }
+ }
+
+ /**
+ * Register custom discount types.
+ *
+ * @param array $discount_types
+ * @return array
+ */
+ public static function filter_discount_types( $discount_types ) {
+ return array_merge( $discount_types, self::$custom_types );
+ }
+
+ /**
+ * Get custom discount type amount. Works like 'percent' type.
+ *
+ * @param float $discount
+ * @param float $discounting_amount
+ * @param array|null $item
+ * @param bool $single
+ * @param WC_Coupon $coupon
+ *
+ * @return float
+ */
+ public static function filter_get_discount_amount( $discount, $discounting_amount, $item, $single, $coupon ) {
+ if ( ! isset( self::$custom_types [ $coupon->get_discount_type() ] ) ) {
+ return $discount;
+ }
+
+ return (float) $coupon->get_amount() * ( $discounting_amount / 100 );
+ }
}
diff --git a/tests/unit-tests/coupon/coupon.php b/tests/unit-tests/coupon/coupon.php
index 4e32c0d7a2d..12e671294df 100644
--- a/tests/unit-tests/coupon/coupon.php
+++ b/tests/unit-tests/coupon/coupon.php
@@ -3,6 +3,7 @@
/**
* Class Coupon.
* @package WooCommerce\Tests\Coupon
+ * @group coupons
*/
class WC_Tests_Coupon extends WC_Unit_Test_Case {
@@ -315,4 +316,79 @@ class WC_Tests_Coupon extends WC_Unit_Test_Case {
$this->assertFalse( $expired_coupon->is_valid() );
$this->assertEquals( $expired_coupon->get_error_message(), $expired_coupon->get_coupon_error( WC_Coupon::E_WC_COUPON_EXPIRED ) );
}
+
+ /**
+ * Test an item limit for percent discounts.
+ */
+ public function test_percent_discount_item_limit() {
+ // Create product
+ $product = WC_Helper_Product::create_simple_product();
+ update_post_meta( $product->get_id(), '_price', '10' );
+ update_post_meta( $product->get_id(), '_regular_price', '10' );
+
+ // Create coupon
+ $coupon = WC_Helper_Coupon::create_coupon( 'dummycoupon', array(
+ 'discount_type' => 'percent',
+ 'coupon_amount' => '5',
+ 'limit_usage_to_x_items' => 1,
+ ) );
+
+ // We need this to have the calculate_totals() method calculate totals.
+ if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
+ define( 'WOOCOMMERCE_CHECKOUT', true );
+ }
+
+ // Add 2 products and coupon to cart.
+ WC()->cart->add_to_cart( $product->get_id(), 2 );
+ WC()->cart->add_discount( $coupon->get_code() );
+ WC()->cart->calculate_totals();
+
+ // Test if the cart total amount is equal 19.5 (coupon only applying to one item).
+ $this->assertEquals( 19.5, WC()->cart->total );
+
+ // Clean up
+ wc_clear_notices();
+ WC()->cart->empty_cart();
+ WC()->cart->remove_coupons();
+ WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
+ WC_Helper_Product::delete_product( $product->get_id() );
+ }
+
+ public function test_custom_discount_item_limit() {
+ // Register custom discount type.
+ WC_Helper_Coupon::register_custom_type( __FUNCTION__ );
+
+ // Create product
+ $product = WC_Helper_Product::create_simple_product();
+ update_post_meta( $product->get_id(), '_price', '10' );
+ update_post_meta( $product->get_id(), '_regular_price', '10' );
+
+ // Create coupon
+ $coupon = WC_Helper_Coupon::create_coupon( 'dummycoupon', array(
+ 'discount_type' => __FUNCTION__,
+ 'coupon_amount' => '5',
+ 'limit_usage_to_x_items' => 1,
+ ) );
+
+ // We need this to have the calculate_totals() method calculate totals.
+ if ( ! defined( 'WOOCOMMERCE_CHECKOUT' ) ) {
+ define( 'WOOCOMMERCE_CHECKOUT', true );
+ }
+
+ // Add 4 products and coupon to cart.
+ WC()->cart->add_to_cart( $product->get_id(), 4 );
+ WC()->cart->add_discount( $coupon->get_code() );
+ WC()->cart->calculate_totals();
+
+ // Test if the cart total amount is equal 39.5 (coupon only applying to one item).
+ $this->assertEquals( 39.5, WC()->cart->total );
+
+ // Clean up
+ wc_clear_notices();
+ WC()->cart->empty_cart();
+ WC()->cart->remove_coupons();
+ WC_Helper_Coupon::delete_coupon( $coupon->get_id() );
+ WC_Helper_Product::delete_product( $product->get_id() );
+ WC_Helper_Coupon::unregister_custom_type( __FUNCTION__ );
+ }
}
diff --git a/tests/unit-tests/product/query.php b/tests/unit-tests/product/query.php
index 8d9da11f1a8..a1c4dc7f6f0 100644
--- a/tests/unit-tests/product/query.php
+++ b/tests/unit-tests/product/query.php
@@ -31,7 +31,7 @@ class WC_Tests_WC_Product_Query extends WC_Unit_Test_Case {
$product1->set_sale_price( '5.00' );
$product1->save();
- $product2 = new WC_Product_Grouped();
+ $product2 = new WC_Product_Simple();
$product2->set_sku( 'sku2' );
$product2->set_regular_price( '12.50' );
$product2->set_sale_price( '5.00' );