' +
- wc_add_to_cart_variation_params.i18n_no_matching_variations_text +
- '
'
- );
- form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 );
+ form.showNoMatchingVariationsMsg();
}
}
},
@@ -213,14 +207,7 @@
attributes.chosenCount = 0;
if ( ! form.loading ) {
- form.$form
- .find( '.single_variation' )
- .after(
- '' +
- wc_add_to_cart_variation_params.i18n_no_matching_variations_text +
- '
'
- );
- form.$form.find( '.wc-no-matching-variations' ).slideDown( 200 );
+ form.showNoMatchingVariationsMsg();
}
}
}
@@ -328,7 +315,7 @@
var form = event.data.variationForm;
form.$form.find( 'input[name="variation_id"], input.variation_id' ).val( '' ).trigger( 'change' );
- form.$form.find( '.wc-no-matching-variations' ).remove();
+ form.$form.find( '.wc-no-matching-variations' ).parent().remove();
if ( form.useAjax ) {
form.$form.trigger( 'check_variations' );
@@ -569,6 +556,24 @@
}
};
+ /**
+ * Show no matching variation message.
+ */
+ VariationForm.prototype.showNoMatchingVariationsMsg = function() {
+ this.$form
+ .find( '.single_variation' )
+ .after(
+ '` element instead.'
+ );
+ }
+ }
+
+ decorated.call(this, $element, options);
+ }
+
+ InputData.prototype.current = function (_, callback) {
+ function getSelected (data, selectedIds) {
+ var selected = [];
+
+ if (data.selected || $.inArray(data.id, selectedIds) !== -1) {
+ data.selected = true;
+ selected.push(data);
+ } else {
+ data.selected = false;
+ }
+
+ if (data.children) {
+ selected.push.apply(selected, getSelected(data.children, selectedIds));
+ }
+
+ return selected;
+ }
+
+ var selected = [];
+
+ for (var d = 0; d < this._currentData.length; d++) {
+ var data = this._currentData[d];
+
+ selected.push.apply(
+ selected,
+ getSelected(
+ data,
+ this.$element.val().split(
+ this._valueSeparator
+ )
+ )
+ );
+ }
+
+ callback(selected);
+ };
+
+ InputData.prototype.select = function (_, data) {
+ if (!this.options.get('multiple')) {
+ this.current(function (allData) {
+ $.map(allData, function (data) {
+ data.selected = false;
+ });
+ });
+
+ this.$element.val(data.id);
+ this.$element.trigger('change');
+ } else {
+ var value = this.$element.val();
+ value += this._valueSeparator + data.id;
+
+ this.$element.val(value);
+ this.$element.trigger('change');
+ }
+ };
+
+ InputData.prototype.unselect = function (_, data) {
+ var self = this;
+
+ data.selected = false;
+
+ this.current(function (allData) {
+ var values = [];
+
+ for (var d = 0; d < allData.length; d++) {
+ var item = allData[d];
+
+ if (data.id == item.id) {
+ continue;
+ }
+
+ values.push(item.id);
+ }
+
+ self.$element.val(values.join(self._valueSeparator));
+ self.$element.trigger('change');
+ });
+ };
+
+ InputData.prototype.query = function (_, params, callback) {
+ var results = [];
+
+ for (var d = 0; d < this._currentData.length; d++) {
+ var data = this._currentData[d];
+
+ var matches = this.matches(params, data);
+
+ if (matches !== null) {
+ results.push(matches);
+ }
+ }
+
+ callback({
+ results: results
+ });
+ };
+
+ InputData.prototype.addOptions = function (_, $options) {
+ var options = $.map($options, function ($option) {
+ return $.data($option[0], 'data');
+ });
+
+ this._currentData.push.apply(this._currentData, options);
+ };
+
+ return InputData;
+});
+
+S2.define('select2/compat/matcher',[
+ 'jquery'
+], function ($) {
+ function oldMatcher (matcher) {
+ function wrappedMatcher (params, data) {
+ var match = $.extend(true, {}, data);
+
+ if (params.term == null || $.trim(params.term) === '') {
+ return match;
+ }
+
+ if (data.children) {
+ for (var c = data.children.length - 1; c >= 0; c--) {
+ var child = data.children[c];
+
+ // Check if the child object matches
+ // The old matcher returned a boolean true or false
+ var doesMatch = matcher(params.term, child.text, child);
+
+ // If the child didn't match, pop it off
+ if (!doesMatch) {
+ match.children.splice(c, 1);
+ }
+ }
+
+ if (match.children.length > 0) {
+ return match;
+ }
+ }
+
+ if (matcher(params.term, data.text, data)) {
+ return match;
+ }
+
+ return null;
+ }
+
+ return wrappedMatcher;
+ }
+
+ return oldMatcher;
+});
+
+S2.define('select2/compat/query',[
+
+], function () {
+ function Query (decorated, $element, options) {
+ if (options.get('debug') && window.console && console.warn) {
+ console.warn(
+ 'Select2: The `query` option has been deprecated in favor of a ' +
+ 'custom data adapter that overrides the `query` method. Support ' +
+ 'will be removed for the `query` option in future versions of ' +
+ 'Select2.'
+ );
+ }
+
+ decorated.call(this, $element, options);
+ }
+
+ Query.prototype.query = function (_, params, callback) {
+ params.callback = callback;
+
+ var query = this.options.get('query');
+
+ query.call(null, params);
+ };
+
+ return Query;
+});
+
+S2.define('select2/dropdown/attachContainer',[
+
+], function () {
+ function AttachContainer (decorated, $element, options) {
+ decorated.call(this, $element, options);
+ }
+
+ AttachContainer.prototype.position =
+ function (decorated, $dropdown, $container) {
+ var $dropdownContainer = $container.find('.dropdown-wrapper');
+ $dropdownContainer.append($dropdown);
+
+ $dropdown.addClass('select2-dropdown--below');
+ $container.addClass('select2-container--below');
+ };
+
+ return AttachContainer;
+});
+
+S2.define('select2/dropdown/stopPropagation',[
+
+], function () {
+ function StopPropagation () { }
+
+ StopPropagation.prototype.bind = function (decorated, container, $container) {
+ decorated.call(this, container, $container);
+
+ var stoppedEvents = [
+ 'blur',
+ 'change',
+ 'click',
+ 'dblclick',
+ 'focus',
+ 'focusin',
+ 'focusout',
+ 'input',
+ 'keydown',
+ 'keyup',
+ 'keypress',
+ 'mousedown',
+ 'mouseenter',
+ 'mouseleave',
+ 'mousemove',
+ 'mouseover',
+ 'mouseup',
+ 'search',
+ 'touchend',
+ 'touchstart'
+ ];
+
+ this.$dropdown.on(stoppedEvents.join(' '), function (evt) {
+ evt.stopPropagation();
+ });
+ };
+
+ return StopPropagation;
+});
+
+S2.define('select2/selection/stopPropagation',[
+
+], function () {
+ function StopPropagation () { }
+
+ StopPropagation.prototype.bind = function (decorated, container, $container) {
+ decorated.call(this, container, $container);
+
+ var stoppedEvents = [
+ 'blur',
+ 'change',
+ 'click',
+ 'dblclick',
+ 'focus',
+ 'focusin',
+ 'focusout',
+ 'input',
+ 'keydown',
+ 'keyup',
+ 'keypress',
+ 'mousedown',
+ 'mouseenter',
+ 'mouseleave',
+ 'mousemove',
+ 'mouseover',
+ 'mouseup',
+ 'search',
+ 'touchend',
+ 'touchstart'
+ ];
+
+ this.$selection.on(stoppedEvents.join(' '), function (evt) {
+ evt.stopPropagation();
+ });
+ };
+
+ return StopPropagation;
+});
+
+/*!
+ * jQuery Mousewheel 3.1.13
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ */
+
+(function (factory) {
+ if ( typeof S2.define === 'function' && S2.define.amd ) {
+ // AMD. Register as an anonymous module.
+ S2.define('jquery-mousewheel',['jquery'], factory);
+ } else if (typeof exports === 'object') {
+ // Node/CommonJS style for Browserify
+ module.exports = factory;
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function ($) {
+
+ var toFix = ['wheel', 'mousewheel', 'DOMMouseScroll', 'MozMousePixelScroll'],
+ toBind = ( 'onwheel' in document || document.documentMode >= 9 ) ?
+ ['wheel'] : ['mousewheel', 'DomMouseScroll', 'MozMousePixelScroll'],
+ slice = Array.prototype.slice,
+ nullLowestDeltaTimeout, lowestDelta;
+
+ if ( $.event.fixHooks ) {
+ for ( var i = toFix.length; i; ) {
+ $.event.fixHooks[ toFix[--i] ] = $.event.mouseHooks;
+ }
+ }
+
+ var special = $.event.special.mousewheel = {
+ version: '3.1.12',
+
+ setup: function() {
+ if ( this.addEventListener ) {
+ for ( var i = toBind.length; i; ) {
+ this.addEventListener( toBind[--i], handler, false );
+ }
+ } else {
+ this.onmousewheel = handler;
+ }
+ // Store the line height and page height for this particular element
+ $.data(this, 'mousewheel-line-height', special.getLineHeight(this));
+ $.data(this, 'mousewheel-page-height', special.getPageHeight(this));
+ },
+
+ teardown: function() {
+ if ( this.removeEventListener ) {
+ for ( var i = toBind.length; i; ) {
+ this.removeEventListener( toBind[--i], handler, false );
+ }
+ } else {
+ this.onmousewheel = null;
+ }
+ // Clean up the data we added to the element
+ $.removeData(this, 'mousewheel-line-height');
+ $.removeData(this, 'mousewheel-page-height');
+ },
+
+ getLineHeight: function(elem) {
+ var $elem = $(elem),
+ $parent = $elem['offsetParent' in $.fn ? 'offsetParent' : 'parent']();
+ if (!$parent.length) {
+ $parent = $('body');
+ }
+ return parseInt($parent.css('fontSize'), 10) || parseInt($elem.css('fontSize'), 10) || 16;
+ },
+
+ getPageHeight: function(elem) {
+ return $(elem).height();
+ },
+
+ settings: {
+ adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
+ normalizeOffset: true // calls getBoundingClientRect for each event
+ }
+ };
+
+ $.fn.extend({
+ mousewheel: function(fn) {
+ return fn ? this.bind('mousewheel', fn) : this.trigger('mousewheel');
+ },
+
+ unmousewheel: function(fn) {
+ return this.unbind('mousewheel', fn);
+ }
+ });
+
+
+ function handler(event) {
+ var orgEvent = event || window.event,
+ args = slice.call(arguments, 1),
+ delta = 0,
+ deltaX = 0,
+ deltaY = 0,
+ absDelta = 0,
+ offsetX = 0,
+ offsetY = 0;
+ event = $.event.fix(orgEvent);
+ event.type = 'mousewheel';
+
+ // Old school scrollwheel delta
+ if ( 'detail' in orgEvent ) { deltaY = orgEvent.detail * -1; }
+ if ( 'wheelDelta' in orgEvent ) { deltaY = orgEvent.wheelDelta; }
+ if ( 'wheelDeltaY' in orgEvent ) { deltaY = orgEvent.wheelDeltaY; }
+ if ( 'wheelDeltaX' in orgEvent ) { deltaX = orgEvent.wheelDeltaX * -1; }
+
+ // Firefox < 17 horizontal scrolling related to DOMMouseScroll event
+ if ( 'axis' in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
+ deltaX = deltaY * -1;
+ deltaY = 0;
+ }
+
+ // Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatabilitiy
+ delta = deltaY === 0 ? deltaX : deltaY;
+
+ // New school wheel delta (wheel event)
+ if ( 'deltaY' in orgEvent ) {
+ deltaY = orgEvent.deltaY * -1;
+ delta = deltaY;
+ }
+ if ( 'deltaX' in orgEvent ) {
+ deltaX = orgEvent.deltaX;
+ if ( deltaY === 0 ) { delta = deltaX * -1; }
+ }
+
+ // No change actually happened, no reason to go any further
+ if ( deltaY === 0 && deltaX === 0 ) { return; }
+
+ // Need to convert lines and pages to pixels if we aren't already in pixels
+ // There are three delta modes:
+ // * deltaMode 0 is by pixels, nothing to do
+ // * deltaMode 1 is by lines
+ // * deltaMode 2 is by pages
+ if ( orgEvent.deltaMode === 1 ) {
+ var lineHeight = $.data(this, 'mousewheel-line-height');
+ delta *= lineHeight;
+ deltaY *= lineHeight;
+ deltaX *= lineHeight;
+ } else if ( orgEvent.deltaMode === 2 ) {
+ var pageHeight = $.data(this, 'mousewheel-page-height');
+ delta *= pageHeight;
+ deltaY *= pageHeight;
+ deltaX *= pageHeight;
+ }
+
+ // Store lowest absolute delta to normalize the delta values
+ absDelta = Math.max( Math.abs(deltaY), Math.abs(deltaX) );
+
+ if ( !lowestDelta || absDelta < lowestDelta ) {
+ lowestDelta = absDelta;
+
+ // Adjust older deltas if necessary
+ if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+ lowestDelta /= 40;
+ }
+ }
+
+ // Adjust older deltas if necessary
+ if ( shouldAdjustOldDeltas(orgEvent, absDelta) ) {
+ // Divide all the things by 40!
+ delta /= 40;
+ deltaX /= 40;
+ deltaY /= 40;
+ }
+
+ // Get a whole, normalized value for the deltas
+ delta = Math[ delta >= 1 ? 'floor' : 'ceil' ](delta / lowestDelta);
+ deltaX = Math[ deltaX >= 1 ? 'floor' : 'ceil' ](deltaX / lowestDelta);
+ deltaY = Math[ deltaY >= 1 ? 'floor' : 'ceil' ](deltaY / lowestDelta);
+
+ // Normalise offsetX and offsetY properties
+ if ( special.settings.normalizeOffset && this.getBoundingClientRect ) {
+ var boundingRect = this.getBoundingClientRect();
+ offsetX = event.clientX - boundingRect.left;
+ offsetY = event.clientY - boundingRect.top;
+ }
+
+ // Add information to the event object
+ event.deltaX = deltaX;
+ event.deltaY = deltaY;
+ event.deltaFactor = lowestDelta;
+ event.offsetX = offsetX;
+ event.offsetY = offsetY;
+ // Go ahead and set deltaMode to 0 since we converted to pixels
+ // Although this is a little odd since we overwrite the deltaX/Y
+ // properties with normalized deltas.
+ event.deltaMode = 0;
+
+ // Add event and delta to the front of the arguments
+ args.unshift(event, delta, deltaX, deltaY);
+
+ // Clearout lowestDelta after sometime to better
+ // handle multiple device types that give different
+ // a different lowestDelta
+ // Ex: trackpad = 3 and mouse wheel = 120
+ if (nullLowestDeltaTimeout) { clearTimeout(nullLowestDeltaTimeout); }
+ nullLowestDeltaTimeout = setTimeout(nullLowestDelta, 200);
+
+ return ($.event.dispatch || $.event.handle).apply(this, args);
+ }
+
+ function nullLowestDelta() {
+ lowestDelta = null;
+ }
+
+ function shouldAdjustOldDeltas(orgEvent, absDelta) {
+ // If this is an older event and the delta is divisable by 120,
+ // then we are assuming that the browser is treating this as an
+ // older mouse wheel event and that we should divide the deltas
+ // by 40 to try and get a more usable deltaFactor.
+ // Side note, this actually impacts the reported scroll distance
+ // in older browsers and can cause scrolling to be slower than native.
+ // Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
+ return special.settings.adjustOldDeltas && orgEvent.type === 'mousewheel' && absDelta % 120 === 0;
+ }
+
+}));
+
+S2.define('jquery.select2',[
+ 'jquery',
+ 'jquery-mousewheel',
+
+ './select2/core',
+ './select2/defaults'
+], function ($, _, Select2, Defaults) {
+ if ($.fn.select2 == null) {
+ // All methods that should return the element
+ var thisMethods = ['open', 'close', 'destroy'];
+
+ $.fn.select2 = function (options) {
+ options = options || {};
+
+ if (typeof options === 'object') {
+ this.each(function () {
+ var instanceOptions = $.extend(true, {}, options);
+
+ var instance = new Select2($(this), instanceOptions);
+ });
+
+ return this;
+ } else if (typeof options === 'string') {
+ var ret;
+ var args = Array.prototype.slice.call(arguments, 1);
+
+ this.each(function () {
+ var instance = $(this).data('select2');
+
+ if (instance == null && window.console && console.error) {
+ console.error(
+ 'The select2(\'' + options + '\') method was called on an ' +
+ 'element that is not using Select2.'
+ );
+ }
+
+ ret = instance[options].apply(instance, args);
+ });
+
+ // Check if we should be returning `this`
+ if ($.inArray(options, thisMethods) > -1) {
+ return this;
+ }
+
+ return ret;
+ } else {
+ throw new Error('Invalid arguments for Select2: ' + options);
+ }
+ };
+ }
+
+ if ($.fn.select2.defaults == null) {
+ $.fn.select2.defaults = Defaults;
+ }
+
+ return Select2;
+});
+
+ // Return the AMD loader configuration so it can be used outside of this file
+ return {
+ define: S2.define,
+ require: S2.require
+ };
+}());
+
+ // Autoload the jQuery bindings
+ // We know that all of the modules exist above this, so we're safe
+ var select2 = S2.require('jquery.select2');
+
+ // Hold the AMD module references on the jQuery function that was just loaded
+ // This allows Select2 to use the internal loader outside of this file, such
+ // as in the language files.
+ jQuery.fn.select2.amd = S2;
+
+ // Return the Select2 instance for anyone who is importing it.
+ return select2;
+}));
diff --git a/plugins/woocommerce/client/legacy/js/select2/select2.js b/plugins/woocommerce/client/legacy/js/select2/select2.js
new file mode 100644
index 00000000000..13b84fadff6
--- /dev/null
+++ b/plugins/woocommerce/client/legacy/js/select2/select2.js
@@ -0,0 +1,5725 @@
+/*!
+ * Select2 4.0.3
+ * https://select2.github.io
+ *
+ * Released under the MIT license
+ * https://github.com/select2/select2/blob/master/LICENSE.md
+ */
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['jquery'], factory);
+ } else if (typeof exports === 'object') {
+ // Node/CommonJS
+ factory(require('jquery'));
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function (jQuery) {
+ // This is needed so we can catch the AMD loader configuration and use it
+ // The inner file should be wrapped (by `banner.start.js`) in a function that
+ // returns the AMD loader references.
+ var S2 =
+(function () {
+ // Restore the Select2 AMD loader so it can be used
+ // Needed mostly in the language files, where the loader is not inserted
+ if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
+ var S2 = jQuery.fn.select2.amd;
+ }
+var S2;(function () { if (!S2 || !S2.requirejs) {
+if (!S2) { S2 = {}; } else { require = S2; }
+/**
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/almond for details
+ */
+//Going sloppy to avoid 'use strict' string cost, but strict practices should
+//be followed.
+/*jslint sloppy: true */
+/*global setTimeout: false */
+
+var requirejs, require, define;
+(function (undef) {
+ var main, req, makeMap, handlers,
+ defined = {},
+ waiting = {},
+ config = {},
+ defining = {},
+ hasOwn = Object.prototype.hasOwnProperty,
+ aps = [].slice,
+ jsSuffixRegExp = /\.js$/;
+
+ function hasProp(obj, prop) {
+ return hasOwn.call(obj, prop);
+ }
+
+ /**
+ * Given a relative module name, like ./something, normalize it to
+ * a real name that can be mapped to a path.
+ * @param {String} name the relative name
+ * @param {String} baseName a real name that the name arg is relative
+ * to.
+ * @returns {String} normalized name
+ */
+ function normalize(name, baseName) {
+ var nameParts, nameSegment, mapValue, foundMap, lastIndex,
+ foundI, foundStarMap, starI, i, j, part,
+ baseParts = baseName && baseName.split("/"),
+ map = config.map,
+ starMap = (map && map['*']) || {};
+
+ //Adjust any relative paths.
+ if (name && name.charAt(0) === ".") {
+ //If have a base name, try to normalize against it,
+ //otherwise, assume it is a top-level require that will
+ //be relative to baseUrl in the end.
+ if (baseName) {
+ name = name.split('/');
+ lastIndex = name.length - 1;
+
+ // Node .js allowance:
+ if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+ name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+ }
+
+ //Lop off the last part of baseParts, so that . matches the
+ //"directory" and not name of the baseName's module. For instance,
+ //baseName of "one/two/three", maps to "one/two/three.js", but we
+ //want the directory, "one/two" for this normalization.
+ name = baseParts.slice(0, baseParts.length - 1).concat(name);
+
+ //start trimDots
+ for (i = 0; i < name.length; i += 1) {
+ part = name[i];
+ if (part === ".") {
+ name.splice(i, 1);
+ i -= 1;
+ } else if (part === "..") {
+ if (i === 1 && (name[2] === '..' || name[0] === '..')) {
+ //End of the line. Keep at least one non-dot
+ //path segment at the front so it can be mapped
+ //correctly to disk. Otherwise, there is likely
+ //no path mapping for a path starting with '..'.
+ //This can still fail, but catches the most reasonable
+ //uses of ..
+ break;
+ } else if (i > 0) {
+ name.splice(i - 1, 2);
+ i -= 2;
+ }
+ }
+ }
+ //end trimDots
+
+ name = name.join("/");
+ } else if (name.indexOf('./') === 0) {
+ // No baseName, so this is ID is resolved relative
+ // to baseUrl, pull off the leading dot.
+ name = name.substring(2);
+ }
+ }
+
+ //Apply map config if available.
+ if ((baseParts || starMap) && map) {
+ nameParts = name.split('/');
+
+ for (i = nameParts.length; i > 0; i -= 1) {
+ nameSegment = nameParts.slice(0, i).join("/");
+
+ if (baseParts) {
+ //Find the longest baseName segment match in the config.
+ //So, do joins on the biggest to smallest lengths of baseParts.
+ for (j = baseParts.length; j > 0; j -= 1) {
+ mapValue = map[baseParts.slice(0, j).join('/')];
+
+ //baseName segment has config, find if it has one for
+ //this name.
+ if (mapValue) {
+ mapValue = mapValue[nameSegment];
+ if (mapValue) {
+ //Match, update name to the new value.
+ foundMap = mapValue;
+ foundI = i;
+ break;
+ }
+ }
+ }
+ }
+
+ if (foundMap) {
+ break;
+ }
+
+ //Check for a star map match, but just hold on to it,
+ //if there is a shorter segment match later in a matching
+ //config, then favor over this star map.
+ if (!foundStarMap && starMap && starMap[nameSegment]) {
+ foundStarMap = starMap[nameSegment];
+ starI = i;
+ }
+ }
+
+ if (!foundMap && foundStarMap) {
+ foundMap = foundStarMap;
+ foundI = starI;
+ }
+
+ if (foundMap) {
+ nameParts.splice(0, foundI, foundMap);
+ name = nameParts.join('/');
+ }
+ }
+
+ return name;
+ }
+
+ function makeRequire(relName, forceSync) {
+ return function () {
+ //A version of a require function that passes a moduleName
+ //value for items that may need to
+ //look up paths relative to the moduleName
+ var args = aps.call(arguments, 0);
+
+ //If first arg is not require('string'), and there is only
+ //one arg, it is the array form without a callback. Insert
+ //a null so that the following concat is correct.
+ if (typeof args[0] !== 'string' && args.length === 1) {
+ args.push(null);
+ }
+ return req.apply(undef, args.concat([relName, forceSync]));
+ };
+ }
+
+ function makeNormalize(relName) {
+ return function (name) {
+ return normalize(name, relName);
+ };
+ }
+
+ function makeLoad(depName) {
+ return function (value) {
+ defined[depName] = value;
+ };
+ }
+
+ function callDep(name) {
+ if (hasProp(waiting, name)) {
+ var args = waiting[name];
+ delete waiting[name];
+ defining[name] = true;
+ main.apply(undef, args);
+ }
+
+ if (!hasProp(defined, name) && !hasProp(defining, name)) {
+ throw new Error('No ' + name);
+ }
+ return defined[name];
+ }
+
+ //Turns a plugin!resource to [plugin, resource]
+ //with the plugin being undefined if the name
+ //did not have a plugin prefix.
+ function splitPrefix(name) {
+ var prefix,
+ index = name ? name.indexOf('!') : -1;
+ if (index > -1) {
+ prefix = name.substring(0, index);
+ name = name.substring(index + 1, name.length);
+ }
+ return [prefix, name];
+ }
+
+ /**
+ * Makes a name map, normalizing the name, and using a plugin
+ * for normalization if necessary. Grabs a ref to plugin
+ * too, as an optimization.
+ */
+ makeMap = function (name, relName) {
+ var plugin,
+ parts = splitPrefix(name),
+ prefix = parts[0];
+
+ name = parts[1];
+
+ if (prefix) {
+ prefix = normalize(prefix, relName);
+ plugin = callDep(prefix);
+ }
+
+ //Normalize according
+ if (prefix) {
+ if (plugin && plugin.normalize) {
+ name = plugin.normalize(name, makeNormalize(relName));
+ } else {
+ name = normalize(name, relName);
+ }
+ } else {
+ name = normalize(name, relName);
+ parts = splitPrefix(name);
+ prefix = parts[0];
+ name = parts[1];
+ if (prefix) {
+ plugin = callDep(prefix);
+ }
+ }
+
+ //Using ridiculous property names for space reasons
+ return {
+ f: prefix ? prefix + '!' + name : name, //fullName
+ n: name,
+ pr: prefix,
+ p: plugin
+ };
+ };
+
+ function makeConfig(name) {
+ return function () {
+ return (config && config.config && config.config[name]) || {};
+ };
+ }
+
+ handlers = {
+ require: function (name) {
+ return makeRequire(name);
+ },
+ exports: function (name) {
+ var e = defined[name];
+ if (typeof e !== 'undefined') {
+ return e;
+ } else {
+ return (defined[name] = {});
+ }
+ },
+ module: function (name) {
+ return {
+ id: name,
+ uri: '',
+ exports: defined[name],
+ config: makeConfig(name)
+ };
+ }
+ };
+
+ main = function (name, deps, callback, relName) {
+ var cjsModule, depName, ret, map, i,
+ args = [],
+ callbackType = typeof callback,
+ usingExports;
+
+ //Use name if no relName
+ relName = relName || name;
+
+ //Call the callback to define the module, if necessary.
+ if (callbackType === 'undefined' || callbackType === 'function') {
+ //Pull out the defined dependencies and pass the ordered
+ //values to the callback.
+ //Default to [require, exports, module] if no deps
+ deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
+ for (i = 0; i < deps.length; i += 1) {
+ map = makeMap(deps[i], relName);
+ depName = map.f;
+
+ //Fast path CommonJS standard dependencies.
+ if (depName === "require") {
+ args[i] = handlers.require(name);
+ } else if (depName === "exports") {
+ //CommonJS module spec 1.1
+ args[i] = handlers.exports(name);
+ usingExports = true;
+ } else if (depName === "module") {
+ //CommonJS module spec 1.1
+ cjsModule = args[i] = handlers.module(name);
+ } else if (hasProp(defined, depName) ||
+ hasProp(waiting, depName) ||
+ hasProp(defining, depName)) {
+ args[i] = callDep(depName);
+ } else if (map.p) {
+ map.p.load(map.n, makeRequire(relName, true), makeLoad(depName), {});
+ args[i] = defined[depName];
+ } else {
+ throw new Error(name + ' missing ' + depName);
+ }
+ }
+
+ ret = callback ? callback.apply(defined[name], args) : undefined;
+
+ if (name) {
+ //If setting exports via "module" is in play,
+ //favor that over return value and exports. After that,
+ //favor a non-undefined return value over exports use.
+ if (cjsModule && cjsModule.exports !== undef &&
+ cjsModule.exports !== defined[name]) {
+ defined[name] = cjsModule.exports;
+ } else if (ret !== undef || !usingExports) {
+ //Use the return value from the function.
+ defined[name] = ret;
+ }
+ }
+ } else if (name) {
+ //May just be an object definition for the module. Only
+ //worry about defining if have a module name.
+ defined[name] = callback;
+ }
+ };
+
+ requirejs = require = req = function (deps, callback, relName, forceSync, alt) {
+ if (typeof deps === "string") {
+ if (handlers[deps]) {
+ //callback in this case is really relName
+ return handlers[deps](callback);
+ }
+ //Just return the module wanted. In this scenario, the
+ //deps arg is the module name, and second arg (if passed)
+ //is just the relName.
+ //Normalize module name, if it contains . or ..
+ return callDep(makeMap(deps, callback).f);
+ } else if (!deps.splice) {
+ //deps is a config object, not an array.
+ config = deps;
+ if (config.deps) {
+ req(config.deps, config.callback);
+ }
+ if (!callback) {
+ return;
+ }
+
+ if (callback.splice) {
+ //callback is an array, which means it is a dependency list.
+ //Adjust args if there are dependencies
+ deps = callback;
+ callback = relName;
+ relName = null;
+ } else {
+ deps = undef;
+ }
+ }
+
+ //Support require(['a'])
+ callback = callback || function () {};
+
+ //If relName is a function, it is an errback handler,
+ //so remove it.
+ if (typeof relName === 'function') {
+ relName = forceSync;
+ forceSync = alt;
+ }
+
+ //Simulate async callback;
+ if (forceSync) {
+ main(undef, deps, callback, relName);
+ } else {
+ //Using a non-zero value because of concern for what old browsers
+ //do, and latest browsers "upgrade" to 4 if lower value is used:
+ //http://www.whatwg.org/specs/web-apps/current-work/multipage/timers.html#dom-windowtimers-settimeout:
+ //If want a value immediately, use require('id') instead -- something
+ //that works in almond on the global level, but not guaranteed and
+ //unlikely to work in other AMD implementations.
+ setTimeout(function () {
+ main(undef, deps, callback, relName);
+ }, 4);
+ }
+
+ return req;
+ };
+
+ /**
+ * Just drops the config on the floor, but returns req in case
+ * the config return value is used.
+ */
+ req.config = function (cfg) {
+ return req(cfg);
+ };
+
+ /**
+ * Expose module registry for debugging and tooling
+ */
+ requirejs._defined = defined;
+
+ define = function (name, deps, callback) {
+ if (typeof name !== 'string') {
+ throw new Error('See almond README: incorrect module build, no module name');
+ }
+
+ //This module may not have dependencies
+ if (!deps.splice) {
+ //deps is not an array, so probably means
+ //an object literal or factory function for
+ //the value. Adjust args.
+ callback = deps;
+ deps = [];
+ }
+
+ if (!hasProp(defined, name) && !hasProp(waiting, name)) {
+ waiting[name] = [name, deps, callback];
+ }
+ };
+
+ define.amd = {
+ jQuery: true
+ };
+}());
+
+S2.requirejs = requirejs;S2.require = require;S2.define = define;
+}
+}());
+S2.define("almond", function(){});
+
+/* global jQuery:false, $:false */
+S2.define('jquery',[],function () {
+ var _$ = jQuery || $;
+
+ if (_$ == null && console && console.error) {
+ console.error(
+ 'Select2: An instance of jQuery or a jQuery-compatible library was not ' +
+ 'found. Make sure that you are including jQuery before Select2 on your ' +
+ 'web page.'
+ );
+ }
+
+ return _$;
+});
+
+S2.define('select2/utils',[
+ 'jquery'
+], function ($) {
+ var Utils = {};
+
+ Utils.Extend = function (ChildClass, SuperClass) {
+ var __hasProp = {}.hasOwnProperty;
+
+ function BaseConstructor () {
+ this.constructor = ChildClass;
+ }
+
+ for (var key in SuperClass) {
+ if (__hasProp.call(SuperClass, key)) {
+ ChildClass[key] = SuperClass[key];
+ }
+ }
+
+ BaseConstructor.prototype = SuperClass.prototype;
+ ChildClass.prototype = new BaseConstructor();
+ ChildClass.__super__ = SuperClass.prototype;
+
+ return ChildClass;
+ };
+
+ function getMethods (theClass) {
+ var proto = theClass.prototype;
+
+ var methods = [];
+
+ for (var methodName in proto) {
+ var m = proto[methodName];
+
+ if (typeof m !== 'function') {
+ continue;
+ }
+
+ if (methodName === 'constructor') {
+ continue;
+ }
+
+ methods.push(methodName);
+ }
+
+ return methods;
+ }
+
+ Utils.Decorate = function (SuperClass, DecoratorClass) {
+ var decoratedMethods = getMethods(DecoratorClass);
+ var superMethods = getMethods(SuperClass);
+
+ function DecoratedClass () {
+ var unshift = Array.prototype.unshift;
+
+ var argCount = DecoratorClass.prototype.constructor.length;
+
+ var calledConstructor = SuperClass.prototype.constructor;
+
+ if (argCount > 0) {
+ unshift.call(arguments, SuperClass.prototype.constructor);
+
+ calledConstructor = DecoratorClass.prototype.constructor;
+ }
+
+ calledConstructor.apply(this, arguments);
+ }
+
+ DecoratorClass.displayName = SuperClass.displayName;
+
+ function ctr () {
+ this.constructor = DecoratedClass;
+ }
+
+ DecoratedClass.prototype = new ctr();
+
+ for (var m = 0; m < superMethods.length; m++) {
+ var superMethod = superMethods[m];
+
+ DecoratedClass.prototype[superMethod] =
+ SuperClass.prototype[superMethod];
+ }
+
+ var calledMethod = function (methodName) {
+ // Stub out the original method if it's not decorating an actual method
+ var originalMethod = function () {};
+
+ if (methodName in DecoratedClass.prototype) {
+ originalMethod = DecoratedClass.prototype[methodName];
+ }
+
+ var decoratedMethod = DecoratorClass.prototype[methodName];
+
+ return function () {
+ var unshift = Array.prototype.unshift;
+
+ unshift.call(arguments, originalMethod);
+
+ return decoratedMethod.apply(this, arguments);
+ };
+ };
+
+ for (var d = 0; d < decoratedMethods.length; d++) {
+ var decoratedMethod = decoratedMethods[d];
+
+ DecoratedClass.prototype[decoratedMethod] = calledMethod(decoratedMethod);
+ }
+
+ return DecoratedClass;
+ };
+
+ var Observable = function () {
+ this.listeners = {};
+ };
+
+ Observable.prototype.on = function (event, callback) {
+ this.listeners = this.listeners || {};
+
+ if (event in this.listeners) {
+ this.listeners[event].push(callback);
+ } else {
+ this.listeners[event] = [callback];
+ }
+ };
+
+ Observable.prototype.trigger = function (event) {
+ var slice = Array.prototype.slice;
+ var params = slice.call(arguments, 1);
+
+ this.listeners = this.listeners || {};
+
+ // Params should always come in as an array
+ if (params == null) {
+ params = [];
+ }
+
+ // If there are no arguments to the event, use a temporary object
+ if (params.length === 0) {
+ params.push({});
+ }
+
+ // Set the `_type` of the first object to the event
+ params[0]._type = event;
+
+ if (event in this.listeners) {
+ this.invoke(this.listeners[event], slice.call(arguments, 1));
+ }
+
+ if ('*' in this.listeners) {
+ this.invoke(this.listeners['*'], arguments);
+ }
+ };
+
+ Observable.prototype.invoke = function (listeners, params) {
+ for (var i = 0, len = listeners.length; i < len; i++) {
+ listeners[i].apply(this, params);
+ }
+ };
+
+ Utils.Observable = Observable;
+
+ Utils.generateChars = function (length) {
+ var chars = '';
+
+ for (var i = 0; i < length; i++) {
+ var randomChar = Math.floor(Math.random() * 36);
+ chars += randomChar.toString(36);
+ }
+
+ return chars;
+ };
+
+ Utils.bind = function (func, context) {
+ return function () {
+ func.apply(context, arguments);
+ };
+ };
+
+ Utils._convertData = function (data) {
+ for (var originalKey in data) {
+ var keys = originalKey.split('-');
+
+ var dataLevel = data;
+
+ if (keys.length === 1) {
+ continue;
+ }
+
+ for (var k = 0; k < keys.length; k++) {
+ var key = keys[k];
+
+ // Lowercase the first letter
+ // By default, dash-separated becomes camelCase
+ key = key.substring(0, 1).toLowerCase() + key.substring(1);
+
+ if (!(key in dataLevel)) {
+ dataLevel[key] = {};
+ }
+
+ if (k == keys.length - 1) {
+ dataLevel[key] = data[originalKey];
+ }
+
+ dataLevel = dataLevel[key];
+ }
+
+ delete data[originalKey];
+ }
+
+ return data;
+ };
+
+ Utils.hasScroll = function (index, el) {
+ // Adapted from the function created by @ShadowScripter
+ // and adapted by @BillBarry on the Stack Exchange Code Review website.
+ // The original code can be found at
+ // http://codereview.stackexchange.com/q/13338
+ // and was designed to be used with the Sizzle selector engine.
+
+ var $el = $(el);
+ var overflowX = el.style.overflowX;
+ var overflowY = el.style.overflowY;
+
+ //Check both x and y declarations
+ if (overflowX === overflowY &&
+ (overflowY === 'hidden' || overflowY === 'visible')) {
+ return false;
+ }
+
+ if (overflowX === 'scroll' || overflowY === 'scroll') {
+ return true;
+ }
+
+ return ($el.innerHeight() < el.scrollHeight ||
+ $el.innerWidth() < el.scrollWidth);
+ };
+
+ Utils.escapeMarkup = function (markup) {
+ var replaceMap = {
+ '\\': '\',
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ '\'': ''',
+ '/': '/'
+ };
+
+ // Do not try to escape the markup if it's not a string
+ if (typeof markup !== 'string') {
+ return markup;
+ }
+
+ return String(markup).replace(/[&<>"'\/\\]/g, function (match) {
+ return replaceMap[match];
+ });
+ };
+
+ // Append an array of jQuery nodes to a given element.
+ Utils.appendMany = function ($element, $nodes) {
+ // jQuery 1.7.x does not support $.fn.append() with an array
+ // Fall back to a jQuery object collection using $.fn.add()
+ if ($.fn.jquery.substr(0, 3) === '1.7') {
+ var $jqNodes = $();
+
+ $.map($nodes, function (node) {
+ $jqNodes = $jqNodes.add(node);
+ });
+
+ $nodes = $jqNodes;
+ }
+
+ $element.append($nodes);
+ };
+
+ return Utils;
+});
+
+S2.define('select2/results',[
+ 'jquery',
+ './utils'
+], function ($, Utils) {
+ function Results ($element, options, dataAdapter) {
+ this.$element = $element;
+ this.data = dataAdapter;
+ this.options = options;
+
+ Results.__super__.constructor.call(this);
+ }
+
+ Utils.Extend(Results, Utils.Observable);
+
+ Results.prototype.render = function () {
+ var $results = $(
+ ''
+ );
+
+ if (this.options.get('multiple')) {
+ $results.attr('aria-multiselectable', 'true');
+ }
+
+ this.$results = $results;
+
+ return $results;
+ };
+
+ Results.prototype.clear = function () {
+ this.$results.empty();
+ };
+
+ Results.prototype.displayMessage = function (params) {
+ var escapeMarkup = this.options.get('escapeMarkup');
+
+ this.clear();
+ this.hideLoading();
+
+ var $message = $(
+ '' +
+ ' '
+ );
+
+ this._tabindex = 0;
+
+ if (this.$element.data('old-tabindex') != null) {
+ this._tabindex = this.$element.data('old-tabindex');
+ } else if (this.$element.attr('tabindex') != null) {
+ this._tabindex = this.$element.attr('tabindex');
+ }
+
+ $selection.attr('title', this.$element.attr('title'));
+ $selection.attr('tabindex', this._tabindex);
+
+ this.$selection = $selection;
+
+ return $selection;
+ };
+
+ BaseSelection.prototype.bind = function (container, $container) {
+ var self = this;
+
+ var id = container.id + '-container';
+ var resultsId = container.id + '-results';
+
+ this.container = container;
+
+ this.$selection.on('focus', function (evt) {
+ self.trigger('focus', evt);
+ });
+
+ this.$selection.on('blur', function (evt) {
+ self._handleBlur(evt);
+ });
+
+ this.$selection.on('keydown', function (evt) {
+ self.trigger('keypress', evt);
+
+ if (evt.which === KEYS.SPACE) {
+ evt.preventDefault();
+ }
+ });
+
+ container.on('results:focus', function (params) {
+ self.$selection.attr('aria-activedescendant', params.data._resultId);
+ });
+
+ container.on('selection:update', function (params) {
+ self.update(params.data);
+ });
+
+ container.on('open', function () {
+ // When the dropdown is open, aria-expanded="true"
+ self.$selection.attr('aria-expanded', 'true');
+ self.$selection.attr('aria-owns', resultsId);
+
+ self._attachCloseHandler(container);
+ });
+
+ container.on('close', function () {
+ // When the dropdown is closed, aria-expanded="false"
+ self.$selection.attr('aria-expanded', 'false');
+ self.$selection.removeAttr('aria-activedescendant');
+ self.$selection.removeAttr('aria-owns');
+
+ self.$selection.focus();
+
+ self._detachCloseHandler(container);
+ });
+
+ container.on('enable', function () {
+ self.$selection.attr('tabindex', self._tabindex);
+ });
+
+ container.on('disable', function () {
+ self.$selection.attr('tabindex', '-1');
+ });
+ };
+
+ BaseSelection.prototype._handleBlur = function (evt) {
+ var self = this;
+
+ // This needs to be delayed as the active element is the body when the tab
+ // key is pressed, possibly along with others.
+ window.setTimeout(function () {
+ // Don't trigger `blur` if the focus is still in the selection
+ if (
+ (document.activeElement == self.$selection[0]) ||
+ ($.contains(self.$selection[0], document.activeElement))
+ ) {
+ return;
+ }
+
+ self.trigger('blur', evt);
+ }, 1);
+ };
+
+ BaseSelection.prototype._attachCloseHandler = function (container) {
+ var self = this;
+
+ $(document.body).on('mousedown.select2.' + container.id, function (e) {
+ var $target = $(e.target);
+
+ var $select = $target.closest('.select2');
+
+ var $all = $('.select2.select2-container--open');
+
+ $all.each(function () {
+ var $this = $(this);
+
+ if (this == $select[0]) {
+ return;
+ }
+
+ var $element = $this.data('element');
+
+ $element.select2('close');
+ });
+ });
+ };
+
+ BaseSelection.prototype._detachCloseHandler = function (container) {
+ $(document.body).off('mousedown.select2.' + container.id);
+ };
+
+ BaseSelection.prototype.position = function ($selection, $container) {
+ var $selectionContainer = $container.find('.selection');
+ $selectionContainer.append($selection);
+ };
+
+ BaseSelection.prototype.destroy = function () {
+ this._detachCloseHandler(this.container);
+ };
+
+ BaseSelection.prototype.update = function (data) {
+ throw new Error('The `update` method must be defined in child classes.');
+ };
+
+ return BaseSelection;
+});
+
+S2.define('select2/selection/single',[
+ 'jquery',
+ './base',
+ '../utils',
+ '../keys'
+], function ($, BaseSelection, Utils, KEYS) {
+ function SingleSelection () {
+ SingleSelection.__super__.constructor.apply(this, arguments);
+ }
+
+ Utils.Extend(SingleSelection, BaseSelection);
+
+ SingleSelection.prototype.render = function () {
+ var $selection = SingleSelection.__super__.render.call(this);
+
+ $selection.addClass('select2-selection--single');
+
+ $selection.html(
+ '' +
+ ' '
+ );
+
+ return $selection;
+ };
+
+ SingleSelection.prototype.bind = function (container, $container) {
+ var self = this;
+
+ SingleSelection.__super__.bind.apply(this, arguments);
+
+ var id = container.id + '-container';
+
+ this.$selection.find('.select2-selection__rendered').attr('id', id);
+ this.$selection.attr('aria-labelledby', id);
+
+ this.$selection.on('mousedown', function (evt) {
+ // Only respond to left clicks
+ if (evt.which !== 1) {
+ return;
+ }
+
+ self.trigger('toggle', {
+ originalEvent: evt
+ });
+ });
+
+ this.$selection.on('focus', function (evt) {
+ // User focuses on the container
+ });
+
+ this.$selection.on('blur', function (evt) {
+ // User exits the container
+ });
+
+ container.on('focus', function (evt) {
+ if (!container.isOpen()) {
+ self.$selection.focus();
+ }
+ });
+
+ container.on('selection:update', function (params) {
+ self.update(params.data);
+ });
+ };
+
+ SingleSelection.prototype.clear = function () {
+ this.$selection.find('.select2-selection__rendered').empty();
+ };
+
+ SingleSelection.prototype.display = function (data, container) {
+ var template = this.options.get('templateSelection');
+ var escapeMarkup = this.options.get('escapeMarkup');
+
+ return escapeMarkup(template(data, container));
+ };
+
+ SingleSelection.prototype.selectionContainer = function () {
+ return $('' +
+ '' +
+ '×' +
+ ' ' +
+ ' '
+ );
+
+ return $container;
+ };
+
+ MultipleSelection.prototype.update = function (data) {
+ this.clear();
+
+ if (data.length === 0) {
+ return;
+ }
+
+ var $selections = [];
+
+ for (var d = 0; d < data.length; d++) {
+ var selection = data[d];
+
+ var $selection = this.selectionContainer();
+ var formatted = this.display(selection, $selection);
+
+ $selection.append(formatted);
+ $selection.prop('title', selection.title || selection.text);
+
+ $selection.data('data', selection);
+
+ $selections.push($selection);
+ }
+
+ var $rendered = this.$selection.find('.select2-selection__rendered');
+
+ Utils.appendMany($rendered, $selections);
+ };
+
+ return MultipleSelection;
+});
+
+S2.define('select2/selection/placeholder',[
+ '../utils'
+], function (Utils) {
+ function Placeholder (decorated, $element, options) {
+ this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+ decorated.call(this, $element, options);
+ }
+
+ Placeholder.prototype.normalizePlaceholder = function (_, placeholder) {
+ if (typeof placeholder === 'string') {
+ placeholder = {
+ id: '',
+ text: placeholder
+ };
+ }
+
+ return placeholder;
+ };
+
+ Placeholder.prototype.createPlaceholder = function (decorated, placeholder) {
+ var $placeholder = this.selectionContainer();
+
+ $placeholder.html(this.display(placeholder));
+ $placeholder.addClass('select2-selection__placeholder')
+ .removeClass('select2-selection__choice');
+
+ return $placeholder;
+ };
+
+ Placeholder.prototype.update = function (decorated, data) {
+ var singlePlaceholder = (
+ data.length == 1 && data[0].id != this.placeholder.id
+ );
+ var multipleSelections = data.length > 1;
+
+ if (multipleSelections || singlePlaceholder) {
+ return decorated.call(this, data);
+ }
+
+ this.clear();
+
+ var $placeholder = this.createPlaceholder(this.placeholder);
+
+ this.$selection.find('.select2-selection__rendered').append($placeholder);
+ };
+
+ return Placeholder;
+});
+
+S2.define('select2/selection/allowClear',[
+ 'jquery',
+ '../keys'
+], function ($, KEYS) {
+ function AllowClear () { }
+
+ AllowClear.prototype.bind = function (decorated, container, $container) {
+ var self = this;
+
+ decorated.call(this, container, $container);
+
+ if (this.placeholder == null) {
+ if (this.options.get('debug') && window.console && console.error) {
+ console.error(
+ 'Select2: The `allowClear` option should be used in combination ' +
+ 'with the `placeholder` option.'
+ );
+ }
+ }
+
+ this.$selection.on('mousedown', '.select2-selection__clear',
+ function (evt) {
+ self._handleClear(evt);
+ });
+
+ container.on('keypress', function (evt) {
+ self._handleKeyboardClear(evt, container);
+ });
+ };
+
+ AllowClear.prototype._handleClear = function (_, evt) {
+ // Ignore the event if it is disabled
+ if (this.options.get('disabled')) {
+ return;
+ }
+
+ var $clear = this.$selection.find('.select2-selection__clear');
+
+ // Ignore the event if nothing has been selected
+ if ($clear.length === 0) {
+ return;
+ }
+
+ evt.stopPropagation();
+
+ var data = $clear.data('data');
+
+ for (var d = 0; d < data.length; d++) {
+ var unselectData = {
+ data: data[d]
+ };
+
+ // Trigger the `unselect` event, so people can prevent it from being
+ // cleared.
+ this.trigger('unselect', unselectData);
+
+ // If the event was prevented, don't clear it out.
+ if (unselectData.prevented) {
+ return;
+ }
+ }
+
+ this.$element.val(this.placeholder.id).trigger('change');
+
+ this.trigger('toggle', {});
+ };
+
+ AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {
+ if (container.isOpen()) {
+ return;
+ }
+
+ if (evt.which == KEYS.DELETE || evt.which == KEYS.BACKSPACE) {
+ this._handleClear(evt);
+ }
+ };
+
+ AllowClear.prototype.update = function (decorated, data) {
+ decorated.call(this, data);
+
+ if (this.$selection.find('.select2-selection__placeholder').length > 0 ||
+ data.length === 0) {
+ return;
+ }
+
+ var $remove = $(
+ '' +
+ '×' +
+ ' '
+ );
+ $remove.data('data', data);
+
+ this.$selection.find('.select2-selection__rendered').prepend($remove);
+ };
+
+ return AllowClear;
+});
+
+S2.define('select2/selection/search',[
+ 'jquery',
+ '../utils',
+ '../keys'
+], function ($, Utils, KEYS) {
+ function Search (decorated, $element, options) {
+ decorated.call(this, $element, options);
+ }
+
+ Search.prototype.render = function (decorated) {
+ var $search = $(
+ '' +
+ ' '
+ );
+
+ this.$searchContainer = $search;
+ this.$search = $search.find('input');
+
+ var $rendered = decorated.call(this);
+
+ this._transferTabIndex();
+
+ return $rendered;
+ };
+
+ Search.prototype.bind = function (decorated, container, $container) {
+ var self = this;
+
+ decorated.call(this, container, $container);
+
+ container.on('open', function () {
+ self.$search.trigger('focus');
+ });
+
+ container.on('close', function () {
+ self.$search.val('');
+ self.$search.removeAttr('aria-activedescendant');
+ self.$search.trigger('focus');
+ });
+
+ container.on('enable', function () {
+ self.$search.prop('disabled', false);
+
+ self._transferTabIndex();
+ });
+
+ container.on('disable', function () {
+ self.$search.prop('disabled', true);
+ });
+
+ container.on('focus', function (evt) {
+ self.$search.trigger('focus');
+ });
+
+ container.on('results:focus', function (params) {
+ self.$search.attr('aria-activedescendant', params.id);
+ });
+
+ this.$selection.on('focusin', '.select2-search--inline', function (evt) {
+ self.trigger('focus', evt);
+ });
+
+ this.$selection.on('focusout', '.select2-search--inline', function (evt) {
+ self._handleBlur(evt);
+ });
+
+ this.$selection.on('keydown', '.select2-search--inline', function (evt) {
+ evt.stopPropagation();
+
+ self.trigger('keypress', evt);
+
+ self._keyUpPrevented = evt.isDefaultPrevented();
+
+ var key = evt.which;
+
+ if (key === KEYS.BACKSPACE && self.$search.val() === '') {
+ var $previousChoice = self.$searchContainer
+ .prev('.select2-selection__choice');
+
+ if ($previousChoice.length > 0) {
+ var item = $previousChoice.data('data');
+
+ self.searchRemoveChoice(item);
+
+ evt.preventDefault();
+ }
+ }
+ });
+
+ // Try to detect the IE version should the `documentMode` property that
+ // is stored on the document. This is only implemented in IE and is
+ // slightly cleaner than doing a user agent check.
+ // This property is not available in Edge, but Edge also doesn't have
+ // this bug.
+ var msie = document.documentMode;
+ var disableInputEvents = msie && msie <= 11;
+
+ // Workaround for browsers which do not support the `input` event
+ // This will prevent double-triggering of events for browsers which support
+ // both the `keyup` and `input` events.
+ this.$selection.on(
+ 'input.searchcheck',
+ '.select2-search--inline',
+ function (evt) {
+ // IE will trigger the `input` event when a placeholder is used on a
+ // search box. To get around this issue, we are forced to ignore all
+ // `input` events in IE and keep using `keyup`.
+ if (disableInputEvents) {
+ self.$selection.off('input.search input.searchcheck');
+ return;
+ }
+
+ // Unbind the duplicated `keyup` event
+ self.$selection.off('keyup.search');
+ }
+ );
+
+ this.$selection.on(
+ 'keyup.search input.search',
+ '.select2-search--inline',
+ function (evt) {
+ // IE will trigger the `input` event when a placeholder is used on a
+ // search box. To get around this issue, we are forced to ignore all
+ // `input` events in IE and keep using `keyup`.
+ if (disableInputEvents && evt.type === 'input') {
+ self.$selection.off('input.search input.searchcheck');
+ return;
+ }
+
+ var key = evt.which;
+
+ // We can freely ignore events from modifier keys
+ if (key == KEYS.SHIFT || key == KEYS.CTRL || key == KEYS.ALT) {
+ return;
+ }
+
+ // Tabbing will be handled during the `keydown` phase
+ if (key == KEYS.TAB) {
+ return;
+ }
+
+ self.handleSearch(evt);
+ }
+ );
+ };
+
+ /**
+ * This method will transfer the tabindex attribute from the rendered
+ * selection to the search box. This allows for the search box to be used as
+ * the primary focus instead of the selection container.
+ *
+ * @private
+ */
+ Search.prototype._transferTabIndex = function (decorated) {
+ this.$search.attr('tabindex', this.$selection.attr('tabindex'));
+ this.$selection.attr('tabindex', '-1');
+ };
+
+ Search.prototype.createPlaceholder = function (decorated, placeholder) {
+ this.$search.attr('placeholder', placeholder.text);
+ };
+
+ Search.prototype.update = function (decorated, data) {
+ var searchHadFocus = this.$search[0] == document.activeElement;
+
+ this.$search.attr('placeholder', '');
+
+ decorated.call(this, data);
+
+ this.$selection.find('.select2-selection__rendered')
+ .append(this.$searchContainer);
+
+ this.resizeSearch();
+ if (searchHadFocus) {
+ this.$search.focus();
+ }
+ };
+
+ Search.prototype.handleSearch = function () {
+ this.resizeSearch();
+
+ if (!this._keyUpPrevented) {
+ var input = this.$search.val();
+
+ this.trigger('query', {
+ term: input
+ });
+ }
+
+ this._keyUpPrevented = false;
+ };
+
+ Search.prototype.searchRemoveChoice = function (decorated, item) {
+ this.trigger('unselect', {
+ data: item
+ });
+
+ this.$search.val(item.text);
+ this.handleSearch();
+ };
+
+ Search.prototype.resizeSearch = function () {
+ this.$search.css('width', '25px');
+
+ var width = '';
+
+ if (this.$search.attr('placeholder') !== '') {
+ width = this.$selection.find('.select2-selection__rendered').innerWidth();
+ } else {
+ var minimumWidth = this.$search.val().length + 1;
+
+ width = (minimumWidth * 0.75) + 'em';
+ }
+
+ this.$search.css('width', width);
+ };
+
+ return Search;
+});
+
+S2.define('select2/selection/eventRelay',[
+ 'jquery'
+], function ($) {
+ function EventRelay () { }
+
+ EventRelay.prototype.bind = function (decorated, container, $container) {
+ var self = this;
+ var relayEvents = [
+ 'open', 'opening',
+ 'close', 'closing',
+ 'select', 'selecting',
+ 'unselect', 'unselecting'
+ ];
+
+ var preventableEvents = ['opening', 'closing', 'selecting', 'unselecting'];
+
+ decorated.call(this, container, $container);
+
+ container.on('*', function (name, params) {
+ // Ignore events that should not be relayed
+ if ($.inArray(name, relayEvents) === -1) {
+ return;
+ }
+
+ // The parameters should always be an object
+ params = params || {};
+
+ // Generate the jQuery event for the Select2 event
+ var evt = $.Event('select2:' + name, {
+ params: params
+ });
+
+ self.$element.trigger(evt);
+
+ // Only handle preventable events if it was one
+ if ($.inArray(name, preventableEvents) === -1) {
+ return;
+ }
+
+ params.prevented = evt.isDefaultPrevented();
+ });
+ };
+
+ return EventRelay;
+});
+
+S2.define('select2/translation',[
+ 'jquery',
+ 'require'
+], function ($, require) {
+ function Translation (dict) {
+ this.dict = dict || {};
+ }
+
+ Translation.prototype.all = function () {
+ return this.dict;
+ };
+
+ Translation.prototype.get = function (key) {
+ return this.dict[key];
+ };
+
+ Translation.prototype.extend = function (translation) {
+ this.dict = $.extend({}, translation.all(), this.dict);
+ };
+
+ // Static functions
+
+ Translation._cache = {};
+
+ Translation.loadPath = function (path) {
+ if (!(path in Translation._cache)) {
+ var translations = require(path);
+
+ Translation._cache[path] = translations;
+ }
+
+ return new Translation(Translation._cache[path]);
+ };
+
+ return Translation;
+});
+
+S2.define('select2/diacritics',[
+
+], function () {
+ var diacritics = {
+ '\u24B6': 'A',
+ '\uFF21': 'A',
+ '\u00C0': 'A',
+ '\u00C1': 'A',
+ '\u00C2': 'A',
+ '\u1EA6': 'A',
+ '\u1EA4': 'A',
+ '\u1EAA': 'A',
+ '\u1EA8': 'A',
+ '\u00C3': 'A',
+ '\u0100': 'A',
+ '\u0102': 'A',
+ '\u1EB0': 'A',
+ '\u1EAE': 'A',
+ '\u1EB4': 'A',
+ '\u1EB2': 'A',
+ '\u0226': 'A',
+ '\u01E0': 'A',
+ '\u00C4': 'A',
+ '\u01DE': 'A',
+ '\u1EA2': 'A',
+ '\u00C5': 'A',
+ '\u01FA': 'A',
+ '\u01CD': 'A',
+ '\u0200': 'A',
+ '\u0202': 'A',
+ '\u1EA0': 'A',
+ '\u1EAC': 'A',
+ '\u1EB6': 'A',
+ '\u1E00': 'A',
+ '\u0104': 'A',
+ '\u023A': 'A',
+ '\u2C6F': 'A',
+ '\uA732': 'AA',
+ '\u00C6': 'AE',
+ '\u01FC': 'AE',
+ '\u01E2': 'AE',
+ '\uA734': 'AO',
+ '\uA736': 'AU',
+ '\uA738': 'AV',
+ '\uA73A': 'AV',
+ '\uA73C': 'AY',
+ '\u24B7': 'B',
+ '\uFF22': 'B',
+ '\u1E02': 'B',
+ '\u1E04': 'B',
+ '\u1E06': 'B',
+ '\u0243': 'B',
+ '\u0182': 'B',
+ '\u0181': 'B',
+ '\u24B8': 'C',
+ '\uFF23': 'C',
+ '\u0106': 'C',
+ '\u0108': 'C',
+ '\u010A': 'C',
+ '\u010C': 'C',
+ '\u00C7': 'C',
+ '\u1E08': 'C',
+ '\u0187': 'C',
+ '\u023B': 'C',
+ '\uA73E': 'C',
+ '\u24B9': 'D',
+ '\uFF24': 'D',
+ '\u1E0A': 'D',
+ '\u010E': 'D',
+ '\u1E0C': 'D',
+ '\u1E10': 'D',
+ '\u1E12': 'D',
+ '\u1E0E': 'D',
+ '\u0110': 'D',
+ '\u018B': 'D',
+ '\u018A': 'D',
+ '\u0189': 'D',
+ '\uA779': 'D',
+ '\u01F1': 'DZ',
+ '\u01C4': 'DZ',
+ '\u01F2': 'Dz',
+ '\u01C5': 'Dz',
+ '\u24BA': 'E',
+ '\uFF25': 'E',
+ '\u00C8': 'E',
+ '\u00C9': 'E',
+ '\u00CA': 'E',
+ '\u1EC0': 'E',
+ '\u1EBE': 'E',
+ '\u1EC4': 'E',
+ '\u1EC2': 'E',
+ '\u1EBC': 'E',
+ '\u0112': 'E',
+ '\u1E14': 'E',
+ '\u1E16': 'E',
+ '\u0114': 'E',
+ '\u0116': 'E',
+ '\u00CB': 'E',
+ '\u1EBA': 'E',
+ '\u011A': 'E',
+ '\u0204': 'E',
+ '\u0206': 'E',
+ '\u1EB8': 'E',
+ '\u1EC6': 'E',
+ '\u0228': 'E',
+ '\u1E1C': 'E',
+ '\u0118': 'E',
+ '\u1E18': 'E',
+ '\u1E1A': 'E',
+ '\u0190': 'E',
+ '\u018E': 'E',
+ '\u24BB': 'F',
+ '\uFF26': 'F',
+ '\u1E1E': 'F',
+ '\u0191': 'F',
+ '\uA77B': 'F',
+ '\u24BC': 'G',
+ '\uFF27': 'G',
+ '\u01F4': 'G',
+ '\u011C': 'G',
+ '\u1E20': 'G',
+ '\u011E': 'G',
+ '\u0120': 'G',
+ '\u01E6': 'G',
+ '\u0122': 'G',
+ '\u01E4': 'G',
+ '\u0193': 'G',
+ '\uA7A0': 'G',
+ '\uA77D': 'G',
+ '\uA77E': 'G',
+ '\u24BD': 'H',
+ '\uFF28': 'H',
+ '\u0124': 'H',
+ '\u1E22': 'H',
+ '\u1E26': 'H',
+ '\u021E': 'H',
+ '\u1E24': 'H',
+ '\u1E28': 'H',
+ '\u1E2A': 'H',
+ '\u0126': 'H',
+ '\u2C67': 'H',
+ '\u2C75': 'H',
+ '\uA78D': 'H',
+ '\u24BE': 'I',
+ '\uFF29': 'I',
+ '\u00CC': 'I',
+ '\u00CD': 'I',
+ '\u00CE': 'I',
+ '\u0128': 'I',
+ '\u012A': 'I',
+ '\u012C': 'I',
+ '\u0130': 'I',
+ '\u00CF': 'I',
+ '\u1E2E': 'I',
+ '\u1EC8': 'I',
+ '\u01CF': 'I',
+ '\u0208': 'I',
+ '\u020A': 'I',
+ '\u1ECA': 'I',
+ '\u012E': 'I',
+ '\u1E2C': 'I',
+ '\u0197': 'I',
+ '\u24BF': 'J',
+ '\uFF2A': 'J',
+ '\u0134': 'J',
+ '\u0248': 'J',
+ '\u24C0': 'K',
+ '\uFF2B': 'K',
+ '\u1E30': 'K',
+ '\u01E8': 'K',
+ '\u1E32': 'K',
+ '\u0136': 'K',
+ '\u1E34': 'K',
+ '\u0198': 'K',
+ '\u2C69': 'K',
+ '\uA740': 'K',
+ '\uA742': 'K',
+ '\uA744': 'K',
+ '\uA7A2': 'K',
+ '\u24C1': 'L',
+ '\uFF2C': 'L',
+ '\u013F': 'L',
+ '\u0139': 'L',
+ '\u013D': 'L',
+ '\u1E36': 'L',
+ '\u1E38': 'L',
+ '\u013B': 'L',
+ '\u1E3C': 'L',
+ '\u1E3A': 'L',
+ '\u0141': 'L',
+ '\u023D': 'L',
+ '\u2C62': 'L',
+ '\u2C60': 'L',
+ '\uA748': 'L',
+ '\uA746': 'L',
+ '\uA780': 'L',
+ '\u01C7': 'LJ',
+ '\u01C8': 'Lj',
+ '\u24C2': 'M',
+ '\uFF2D': 'M',
+ '\u1E3E': 'M',
+ '\u1E40': 'M',
+ '\u1E42': 'M',
+ '\u2C6E': 'M',
+ '\u019C': 'M',
+ '\u24C3': 'N',
+ '\uFF2E': 'N',
+ '\u01F8': 'N',
+ '\u0143': 'N',
+ '\u00D1': 'N',
+ '\u1E44': 'N',
+ '\u0147': 'N',
+ '\u1E46': 'N',
+ '\u0145': 'N',
+ '\u1E4A': 'N',
+ '\u1E48': 'N',
+ '\u0220': 'N',
+ '\u019D': 'N',
+ '\uA790': 'N',
+ '\uA7A4': 'N',
+ '\u01CA': 'NJ',
+ '\u01CB': 'Nj',
+ '\u24C4': 'O',
+ '\uFF2F': 'O',
+ '\u00D2': 'O',
+ '\u00D3': 'O',
+ '\u00D4': 'O',
+ '\u1ED2': 'O',
+ '\u1ED0': 'O',
+ '\u1ED6': 'O',
+ '\u1ED4': 'O',
+ '\u00D5': 'O',
+ '\u1E4C': 'O',
+ '\u022C': 'O',
+ '\u1E4E': 'O',
+ '\u014C': 'O',
+ '\u1E50': 'O',
+ '\u1E52': 'O',
+ '\u014E': 'O',
+ '\u022E': 'O',
+ '\u0230': 'O',
+ '\u00D6': 'O',
+ '\u022A': 'O',
+ '\u1ECE': 'O',
+ '\u0150': 'O',
+ '\u01D1': 'O',
+ '\u020C': 'O',
+ '\u020E': 'O',
+ '\u01A0': 'O',
+ '\u1EDC': 'O',
+ '\u1EDA': 'O',
+ '\u1EE0': 'O',
+ '\u1EDE': 'O',
+ '\u1EE2': 'O',
+ '\u1ECC': 'O',
+ '\u1ED8': 'O',
+ '\u01EA': 'O',
+ '\u01EC': 'O',
+ '\u00D8': 'O',
+ '\u01FE': 'O',
+ '\u0186': 'O',
+ '\u019F': 'O',
+ '\uA74A': 'O',
+ '\uA74C': 'O',
+ '\u01A2': 'OI',
+ '\uA74E': 'OO',
+ '\u0222': 'OU',
+ '\u24C5': 'P',
+ '\uFF30': 'P',
+ '\u1E54': 'P',
+ '\u1E56': 'P',
+ '\u01A4': 'P',
+ '\u2C63': 'P',
+ '\uA750': 'P',
+ '\uA752': 'P',
+ '\uA754': 'P',
+ '\u24C6': 'Q',
+ '\uFF31': 'Q',
+ '\uA756': 'Q',
+ '\uA758': 'Q',
+ '\u024A': 'Q',
+ '\u24C7': 'R',
+ '\uFF32': 'R',
+ '\u0154': 'R',
+ '\u1E58': 'R',
+ '\u0158': 'R',
+ '\u0210': 'R',
+ '\u0212': 'R',
+ '\u1E5A': 'R',
+ '\u1E5C': 'R',
+ '\u0156': 'R',
+ '\u1E5E': 'R',
+ '\u024C': 'R',
+ '\u2C64': 'R',
+ '\uA75A': 'R',
+ '\uA7A6': 'R',
+ '\uA782': 'R',
+ '\u24C8': 'S',
+ '\uFF33': 'S',
+ '\u1E9E': 'S',
+ '\u015A': 'S',
+ '\u1E64': 'S',
+ '\u015C': 'S',
+ '\u1E60': 'S',
+ '\u0160': 'S',
+ '\u1E66': 'S',
+ '\u1E62': 'S',
+ '\u1E68': 'S',
+ '\u0218': 'S',
+ '\u015E': 'S',
+ '\u2C7E': 'S',
+ '\uA7A8': 'S',
+ '\uA784': 'S',
+ '\u24C9': 'T',
+ '\uFF34': 'T',
+ '\u1E6A': 'T',
+ '\u0164': 'T',
+ '\u1E6C': 'T',
+ '\u021A': 'T',
+ '\u0162': 'T',
+ '\u1E70': 'T',
+ '\u1E6E': 'T',
+ '\u0166': 'T',
+ '\u01AC': 'T',
+ '\u01AE': 'T',
+ '\u023E': 'T',
+ '\uA786': 'T',
+ '\uA728': 'TZ',
+ '\u24CA': 'U',
+ '\uFF35': 'U',
+ '\u00D9': 'U',
+ '\u00DA': 'U',
+ '\u00DB': 'U',
+ '\u0168': 'U',
+ '\u1E78': 'U',
+ '\u016A': 'U',
+ '\u1E7A': 'U',
+ '\u016C': 'U',
+ '\u00DC': 'U',
+ '\u01DB': 'U',
+ '\u01D7': 'U',
+ '\u01D5': 'U',
+ '\u01D9': 'U',
+ '\u1EE6': 'U',
+ '\u016E': 'U',
+ '\u0170': 'U',
+ '\u01D3': 'U',
+ '\u0214': 'U',
+ '\u0216': 'U',
+ '\u01AF': 'U',
+ '\u1EEA': 'U',
+ '\u1EE8': 'U',
+ '\u1EEE': 'U',
+ '\u1EEC': 'U',
+ '\u1EF0': 'U',
+ '\u1EE4': 'U',
+ '\u1E72': 'U',
+ '\u0172': 'U',
+ '\u1E76': 'U',
+ '\u1E74': 'U',
+ '\u0244': 'U',
+ '\u24CB': 'V',
+ '\uFF36': 'V',
+ '\u1E7C': 'V',
+ '\u1E7E': 'V',
+ '\u01B2': 'V',
+ '\uA75E': 'V',
+ '\u0245': 'V',
+ '\uA760': 'VY',
+ '\u24CC': 'W',
+ '\uFF37': 'W',
+ '\u1E80': 'W',
+ '\u1E82': 'W',
+ '\u0174': 'W',
+ '\u1E86': 'W',
+ '\u1E84': 'W',
+ '\u1E88': 'W',
+ '\u2C72': 'W',
+ '\u24CD': 'X',
+ '\uFF38': 'X',
+ '\u1E8A': 'X',
+ '\u1E8C': 'X',
+ '\u24CE': 'Y',
+ '\uFF39': 'Y',
+ '\u1EF2': 'Y',
+ '\u00DD': 'Y',
+ '\u0176': 'Y',
+ '\u1EF8': 'Y',
+ '\u0232': 'Y',
+ '\u1E8E': 'Y',
+ '\u0178': 'Y',
+ '\u1EF6': 'Y',
+ '\u1EF4': 'Y',
+ '\u01B3': 'Y',
+ '\u024E': 'Y',
+ '\u1EFE': 'Y',
+ '\u24CF': 'Z',
+ '\uFF3A': 'Z',
+ '\u0179': 'Z',
+ '\u1E90': 'Z',
+ '\u017B': 'Z',
+ '\u017D': 'Z',
+ '\u1E92': 'Z',
+ '\u1E94': 'Z',
+ '\u01B5': 'Z',
+ '\u0224': 'Z',
+ '\u2C7F': 'Z',
+ '\u2C6B': 'Z',
+ '\uA762': 'Z',
+ '\u24D0': 'a',
+ '\uFF41': 'a',
+ '\u1E9A': 'a',
+ '\u00E0': 'a',
+ '\u00E1': 'a',
+ '\u00E2': 'a',
+ '\u1EA7': 'a',
+ '\u1EA5': 'a',
+ '\u1EAB': 'a',
+ '\u1EA9': 'a',
+ '\u00E3': 'a',
+ '\u0101': 'a',
+ '\u0103': 'a',
+ '\u1EB1': 'a',
+ '\u1EAF': 'a',
+ '\u1EB5': 'a',
+ '\u1EB3': 'a',
+ '\u0227': 'a',
+ '\u01E1': 'a',
+ '\u00E4': 'a',
+ '\u01DF': 'a',
+ '\u1EA3': 'a',
+ '\u00E5': 'a',
+ '\u01FB': 'a',
+ '\u01CE': 'a',
+ '\u0201': 'a',
+ '\u0203': 'a',
+ '\u1EA1': 'a',
+ '\u1EAD': 'a',
+ '\u1EB7': 'a',
+ '\u1E01': 'a',
+ '\u0105': 'a',
+ '\u2C65': 'a',
+ '\u0250': 'a',
+ '\uA733': 'aa',
+ '\u00E6': 'ae',
+ '\u01FD': 'ae',
+ '\u01E3': 'ae',
+ '\uA735': 'ao',
+ '\uA737': 'au',
+ '\uA739': 'av',
+ '\uA73B': 'av',
+ '\uA73D': 'ay',
+ '\u24D1': 'b',
+ '\uFF42': 'b',
+ '\u1E03': 'b',
+ '\u1E05': 'b',
+ '\u1E07': 'b',
+ '\u0180': 'b',
+ '\u0183': 'b',
+ '\u0253': 'b',
+ '\u24D2': 'c',
+ '\uFF43': 'c',
+ '\u0107': 'c',
+ '\u0109': 'c',
+ '\u010B': 'c',
+ '\u010D': 'c',
+ '\u00E7': 'c',
+ '\u1E09': 'c',
+ '\u0188': 'c',
+ '\u023C': 'c',
+ '\uA73F': 'c',
+ '\u2184': 'c',
+ '\u24D3': 'd',
+ '\uFF44': 'd',
+ '\u1E0B': 'd',
+ '\u010F': 'd',
+ '\u1E0D': 'd',
+ '\u1E11': 'd',
+ '\u1E13': 'd',
+ '\u1E0F': 'd',
+ '\u0111': 'd',
+ '\u018C': 'd',
+ '\u0256': 'd',
+ '\u0257': 'd',
+ '\uA77A': 'd',
+ '\u01F3': 'dz',
+ '\u01C6': 'dz',
+ '\u24D4': 'e',
+ '\uFF45': 'e',
+ '\u00E8': 'e',
+ '\u00E9': 'e',
+ '\u00EA': 'e',
+ '\u1EC1': 'e',
+ '\u1EBF': 'e',
+ '\u1EC5': 'e',
+ '\u1EC3': 'e',
+ '\u1EBD': 'e',
+ '\u0113': 'e',
+ '\u1E15': 'e',
+ '\u1E17': 'e',
+ '\u0115': 'e',
+ '\u0117': 'e',
+ '\u00EB': 'e',
+ '\u1EBB': 'e',
+ '\u011B': 'e',
+ '\u0205': 'e',
+ '\u0207': 'e',
+ '\u1EB9': 'e',
+ '\u1EC7': 'e',
+ '\u0229': 'e',
+ '\u1E1D': 'e',
+ '\u0119': 'e',
+ '\u1E19': 'e',
+ '\u1E1B': 'e',
+ '\u0247': 'e',
+ '\u025B': 'e',
+ '\u01DD': 'e',
+ '\u24D5': 'f',
+ '\uFF46': 'f',
+ '\u1E1F': 'f',
+ '\u0192': 'f',
+ '\uA77C': 'f',
+ '\u24D6': 'g',
+ '\uFF47': 'g',
+ '\u01F5': 'g',
+ '\u011D': 'g',
+ '\u1E21': 'g',
+ '\u011F': 'g',
+ '\u0121': 'g',
+ '\u01E7': 'g',
+ '\u0123': 'g',
+ '\u01E5': 'g',
+ '\u0260': 'g',
+ '\uA7A1': 'g',
+ '\u1D79': 'g',
+ '\uA77F': 'g',
+ '\u24D7': 'h',
+ '\uFF48': 'h',
+ '\u0125': 'h',
+ '\u1E23': 'h',
+ '\u1E27': 'h',
+ '\u021F': 'h',
+ '\u1E25': 'h',
+ '\u1E29': 'h',
+ '\u1E2B': 'h',
+ '\u1E96': 'h',
+ '\u0127': 'h',
+ '\u2C68': 'h',
+ '\u2C76': 'h',
+ '\u0265': 'h',
+ '\u0195': 'hv',
+ '\u24D8': 'i',
+ '\uFF49': 'i',
+ '\u00EC': 'i',
+ '\u00ED': 'i',
+ '\u00EE': 'i',
+ '\u0129': 'i',
+ '\u012B': 'i',
+ '\u012D': 'i',
+ '\u00EF': 'i',
+ '\u1E2F': 'i',
+ '\u1EC9': 'i',
+ '\u01D0': 'i',
+ '\u0209': 'i',
+ '\u020B': 'i',
+ '\u1ECB': 'i',
+ '\u012F': 'i',
+ '\u1E2D': 'i',
+ '\u0268': 'i',
+ '\u0131': 'i',
+ '\u24D9': 'j',
+ '\uFF4A': 'j',
+ '\u0135': 'j',
+ '\u01F0': 'j',
+ '\u0249': 'j',
+ '\u24DA': 'k',
+ '\uFF4B': 'k',
+ '\u1E31': 'k',
+ '\u01E9': 'k',
+ '\u1E33': 'k',
+ '\u0137': 'k',
+ '\u1E35': 'k',
+ '\u0199': 'k',
+ '\u2C6A': 'k',
+ '\uA741': 'k',
+ '\uA743': 'k',
+ '\uA745': 'k',
+ '\uA7A3': 'k',
+ '\u24DB': 'l',
+ '\uFF4C': 'l',
+ '\u0140': 'l',
+ '\u013A': 'l',
+ '\u013E': 'l',
+ '\u1E37': 'l',
+ '\u1E39': 'l',
+ '\u013C': 'l',
+ '\u1E3D': 'l',
+ '\u1E3B': 'l',
+ '\u017F': 'l',
+ '\u0142': 'l',
+ '\u019A': 'l',
+ '\u026B': 'l',
+ '\u2C61': 'l',
+ '\uA749': 'l',
+ '\uA781': 'l',
+ '\uA747': 'l',
+ '\u01C9': 'lj',
+ '\u24DC': 'm',
+ '\uFF4D': 'm',
+ '\u1E3F': 'm',
+ '\u1E41': 'm',
+ '\u1E43': 'm',
+ '\u0271': 'm',
+ '\u026F': 'm',
+ '\u24DD': 'n',
+ '\uFF4E': 'n',
+ '\u01F9': 'n',
+ '\u0144': 'n',
+ '\u00F1': 'n',
+ '\u1E45': 'n',
+ '\u0148': 'n',
+ '\u1E47': 'n',
+ '\u0146': 'n',
+ '\u1E4B': 'n',
+ '\u1E49': 'n',
+ '\u019E': 'n',
+ '\u0272': 'n',
+ '\u0149': 'n',
+ '\uA791': 'n',
+ '\uA7A5': 'n',
+ '\u01CC': 'nj',
+ '\u24DE': 'o',
+ '\uFF4F': 'o',
+ '\u00F2': 'o',
+ '\u00F3': 'o',
+ '\u00F4': 'o',
+ '\u1ED3': 'o',
+ '\u1ED1': 'o',
+ '\u1ED7': 'o',
+ '\u1ED5': 'o',
+ '\u00F5': 'o',
+ '\u1E4D': 'o',
+ '\u022D': 'o',
+ '\u1E4F': 'o',
+ '\u014D': 'o',
+ '\u1E51': 'o',
+ '\u1E53': 'o',
+ '\u014F': 'o',
+ '\u022F': 'o',
+ '\u0231': 'o',
+ '\u00F6': 'o',
+ '\u022B': 'o',
+ '\u1ECF': 'o',
+ '\u0151': 'o',
+ '\u01D2': 'o',
+ '\u020D': 'o',
+ '\u020F': 'o',
+ '\u01A1': 'o',
+ '\u1EDD': 'o',
+ '\u1EDB': 'o',
+ '\u1EE1': 'o',
+ '\u1EDF': 'o',
+ '\u1EE3': 'o',
+ '\u1ECD': 'o',
+ '\u1ED9': 'o',
+ '\u01EB': 'o',
+ '\u01ED': 'o',
+ '\u00F8': 'o',
+ '\u01FF': 'o',
+ '\u0254': 'o',
+ '\uA74B': 'o',
+ '\uA74D': 'o',
+ '\u0275': 'o',
+ '\u01A3': 'oi',
+ '\u0223': 'ou',
+ '\uA74F': 'oo',
+ '\u24DF': 'p',
+ '\uFF50': 'p',
+ '\u1E55': 'p',
+ '\u1E57': 'p',
+ '\u01A5': 'p',
+ '\u1D7D': 'p',
+ '\uA751': 'p',
+ '\uA753': 'p',
+ '\uA755': 'p',
+ '\u24E0': 'q',
+ '\uFF51': 'q',
+ '\u024B': 'q',
+ '\uA757': 'q',
+ '\uA759': 'q',
+ '\u24E1': 'r',
+ '\uFF52': 'r',
+ '\u0155': 'r',
+ '\u1E59': 'r',
+ '\u0159': 'r',
+ '\u0211': 'r',
+ '\u0213': 'r',
+ '\u1E5B': 'r',
+ '\u1E5D': 'r',
+ '\u0157': 'r',
+ '\u1E5F': 'r',
+ '\u024D': 'r',
+ '\u027D': 'r',
+ '\uA75B': 'r',
+ '\uA7A7': 'r',
+ '\uA783': 'r',
+ '\u24E2': 's',
+ '\uFF53': 's',
+ '\u00DF': 's',
+ '\u015B': 's',
+ '\u1E65': 's',
+ '\u015D': 's',
+ '\u1E61': 's',
+ '\u0161': 's',
+ '\u1E67': 's',
+ '\u1E63': 's',
+ '\u1E69': 's',
+ '\u0219': 's',
+ '\u015F': 's',
+ '\u023F': 's',
+ '\uA7A9': 's',
+ '\uA785': 's',
+ '\u1E9B': 's',
+ '\u24E3': 't',
+ '\uFF54': 't',
+ '\u1E6B': 't',
+ '\u1E97': 't',
+ '\u0165': 't',
+ '\u1E6D': 't',
+ '\u021B': 't',
+ '\u0163': 't',
+ '\u1E71': 't',
+ '\u1E6F': 't',
+ '\u0167': 't',
+ '\u01AD': 't',
+ '\u0288': 't',
+ '\u2C66': 't',
+ '\uA787': 't',
+ '\uA729': 'tz',
+ '\u24E4': 'u',
+ '\uFF55': 'u',
+ '\u00F9': 'u',
+ '\u00FA': 'u',
+ '\u00FB': 'u',
+ '\u0169': 'u',
+ '\u1E79': 'u',
+ '\u016B': 'u',
+ '\u1E7B': 'u',
+ '\u016D': 'u',
+ '\u00FC': 'u',
+ '\u01DC': 'u',
+ '\u01D8': 'u',
+ '\u01D6': 'u',
+ '\u01DA': 'u',
+ '\u1EE7': 'u',
+ '\u016F': 'u',
+ '\u0171': 'u',
+ '\u01D4': 'u',
+ '\u0215': 'u',
+ '\u0217': 'u',
+ '\u01B0': 'u',
+ '\u1EEB': 'u',
+ '\u1EE9': 'u',
+ '\u1EEF': 'u',
+ '\u1EED': 'u',
+ '\u1EF1': 'u',
+ '\u1EE5': 'u',
+ '\u1E73': 'u',
+ '\u0173': 'u',
+ '\u1E77': 'u',
+ '\u1E75': 'u',
+ '\u0289': 'u',
+ '\u24E5': 'v',
+ '\uFF56': 'v',
+ '\u1E7D': 'v',
+ '\u1E7F': 'v',
+ '\u028B': 'v',
+ '\uA75F': 'v',
+ '\u028C': 'v',
+ '\uA761': 'vy',
+ '\u24E6': 'w',
+ '\uFF57': 'w',
+ '\u1E81': 'w',
+ '\u1E83': 'w',
+ '\u0175': 'w',
+ '\u1E87': 'w',
+ '\u1E85': 'w',
+ '\u1E98': 'w',
+ '\u1E89': 'w',
+ '\u2C73': 'w',
+ '\u24E7': 'x',
+ '\uFF58': 'x',
+ '\u1E8B': 'x',
+ '\u1E8D': 'x',
+ '\u24E8': 'y',
+ '\uFF59': 'y',
+ '\u1EF3': 'y',
+ '\u00FD': 'y',
+ '\u0177': 'y',
+ '\u1EF9': 'y',
+ '\u0233': 'y',
+ '\u1E8F': 'y',
+ '\u00FF': 'y',
+ '\u1EF7': 'y',
+ '\u1E99': 'y',
+ '\u1EF5': 'y',
+ '\u01B4': 'y',
+ '\u024F': 'y',
+ '\u1EFF': 'y',
+ '\u24E9': 'z',
+ '\uFF5A': 'z',
+ '\u017A': 'z',
+ '\u1E91': 'z',
+ '\u017C': 'z',
+ '\u017E': 'z',
+ '\u1E93': 'z',
+ '\u1E95': 'z',
+ '\u01B6': 'z',
+ '\u0225': 'z',
+ '\u0240': 'z',
+ '\u2C6C': 'z',
+ '\uA763': 'z',
+ '\u0386': '\u0391',
+ '\u0388': '\u0395',
+ '\u0389': '\u0397',
+ '\u038A': '\u0399',
+ '\u03AA': '\u0399',
+ '\u038C': '\u039F',
+ '\u038E': '\u03A5',
+ '\u03AB': '\u03A5',
+ '\u038F': '\u03A9',
+ '\u03AC': '\u03B1',
+ '\u03AD': '\u03B5',
+ '\u03AE': '\u03B7',
+ '\u03AF': '\u03B9',
+ '\u03CA': '\u03B9',
+ '\u0390': '\u03B9',
+ '\u03CC': '\u03BF',
+ '\u03CD': '\u03C5',
+ '\u03CB': '\u03C5',
+ '\u03B0': '\u03C5',
+ '\u03C9': '\u03C9',
+ '\u03C2': '\u03C3'
+ };
+
+ return diacritics;
+});
+
+S2.define('select2/data/base',[
+ '../utils'
+], function (Utils) {
+ function BaseAdapter ($element, options) {
+ BaseAdapter.__super__.constructor.call(this);
+ }
+
+ Utils.Extend(BaseAdapter, Utils.Observable);
+
+ BaseAdapter.prototype.current = function (callback) {
+ throw new Error('The `current` method must be defined in child classes.');
+ };
+
+ BaseAdapter.prototype.query = function (params, callback) {
+ throw new Error('The `query` method must be defined in child classes.');
+ };
+
+ BaseAdapter.prototype.bind = function (container, $container) {
+ // Can be implemented in subclasses
+ };
+
+ BaseAdapter.prototype.destroy = function () {
+ // Can be implemented in subclasses
+ };
+
+ BaseAdapter.prototype.generateResultId = function (container, data) {
+ var id = container.id + '-result-';
+
+ id += Utils.generateChars(4);
+
+ if (data.id != null) {
+ id += '-' + data.id.toString();
+ } else {
+ id += '-' + Utils.generateChars(4);
+ }
+ return id;
+ };
+
+ return BaseAdapter;
+});
+
+S2.define('select2/data/select',[
+ './base',
+ '../utils',
+ 'jquery'
+], function (BaseAdapter, Utils, $) {
+ function SelectAdapter ($element, options) {
+ this.$element = $element;
+ this.options = options;
+
+ SelectAdapter.__super__.constructor.call(this);
+ }
+
+ Utils.Extend(SelectAdapter, BaseAdapter);
+
+ SelectAdapter.prototype.current = function (callback) {
+ var data = [];
+ var self = this;
+
+ this.$element.find(':selected').each(function () {
+ var $option = $(this);
+
+ var option = self.item($option);
+
+ data.push(option);
+ });
+
+ callback(data);
+ };
+
+ SelectAdapter.prototype.select = function (data) {
+ var self = this;
+
+ data.selected = true;
+
+ // If data.element is a DOM node, use it instead
+ if ($(data.element).is('option')) {
+ data.element.selected = true;
+
+ this.$element.trigger('change');
+
+ return;
+ }
+
+ if (this.$element.prop('multiple')) {
+ this.current(function (currentData) {
+ var val = [];
+
+ data = [data];
+ data.push.apply(data, currentData);
+
+ for (var d = 0; d < data.length; d++) {
+ var id = data[d].id;
+
+ if ($.inArray(id, val) === -1) {
+ val.push(id);
+ }
+ }
+
+ self.$element.val(val);
+ self.$element.trigger('change');
+ });
+ } else {
+ var val = data.id;
+
+ this.$element.val(val);
+ this.$element.trigger('change');
+ }
+ };
+
+ SelectAdapter.prototype.unselect = function (data) {
+ var self = this;
+
+ if (!this.$element.prop('multiple')) {
+ return;
+ }
+
+ data.selected = false;
+
+ if ($(data.element).is('option')) {
+ data.element.selected = false;
+
+ this.$element.trigger('change');
+
+ return;
+ }
+
+ this.current(function (currentData) {
+ var val = [];
+
+ for (var d = 0; d < currentData.length; d++) {
+ var id = currentData[d].id;
+
+ if (id !== data.id && $.inArray(id, val) === -1) {
+ val.push(id);
+ }
+ }
+
+ self.$element.val(val);
+
+ self.$element.trigger('change');
+ });
+ };
+
+ SelectAdapter.prototype.bind = function (container, $container) {
+ var self = this;
+
+ this.container = container;
+
+ container.on('select', function (params) {
+ self.select(params.data);
+ });
+
+ container.on('unselect', function (params) {
+ self.unselect(params.data);
+ });
+ };
+
+ SelectAdapter.prototype.destroy = function () {
+ // Remove anything added to child elements
+ this.$element.find('*').each(function () {
+ // Remove any custom data set by Select2
+ $.removeData(this, 'data');
+ });
+ };
+
+ SelectAdapter.prototype.query = function (params, callback) {
+ var data = [];
+ var self = this;
+
+ var $options = this.$element.children();
+
+ $options.each(function () {
+ var $option = $(this);
+
+ if (!$option.is('option') && !$option.is('optgroup')) {
+ return;
+ }
+
+ var option = self.item($option);
+
+ var matches = self.matches(params, option);
+
+ if (matches !== null) {
+ data.push(matches);
+ }
+ });
+
+ callback({
+ results: data
+ });
+ };
+
+ SelectAdapter.prototype.addOptions = function ($options) {
+ Utils.appendMany(this.$element, $options);
+ };
+
+ SelectAdapter.prototype.option = function (data) {
+ var option;
+
+ if (data.children) {
+ option = document.createElement('optgroup');
+ option.label = data.text;
+ } else {
+ option = document.createElement('option');
+
+ if (option.textContent !== undefined) {
+ option.textContent = data.text;
+ } else {
+ option.innerText = data.text;
+ }
+ }
+
+ if (data.id) {
+ option.value = data.id;
+ }
+
+ if (data.disabled) {
+ option.disabled = true;
+ }
+
+ if (data.selected) {
+ option.selected = true;
+ }
+
+ if (data.title) {
+ option.title = data.title;
+ }
+
+ var $option = $(option);
+
+ var normalizedData = this._normalizeItem(data);
+ normalizedData.element = option;
+
+ // Override the option's data with the combined data
+ $.data(option, 'data', normalizedData);
+
+ return $option;
+ };
+
+ SelectAdapter.prototype.item = function ($option) {
+ var data = {};
+
+ data = $.data($option[0], 'data');
+
+ if (data != null) {
+ return data;
+ }
+
+ if ($option.is('option')) {
+ data = {
+ id: $option.val(),
+ text: $option.text(),
+ disabled: $option.prop('disabled'),
+ selected: $option.prop('selected'),
+ title: $option.prop('title')
+ };
+ } else if ($option.is('optgroup')) {
+ data = {
+ text: $option.prop('label'),
+ children: [],
+ title: $option.prop('title')
+ };
+
+ var $children = $option.children('option');
+ var children = [];
+
+ for (var c = 0; c < $children.length; c++) {
+ var $child = $($children[c]);
+
+ var child = this.item($child);
+
+ children.push(child);
+ }
+
+ data.children = children;
+ }
+
+ data = this._normalizeItem(data);
+ data.element = $option[0];
+
+ $.data($option[0], 'data', data);
+
+ return data;
+ };
+
+ SelectAdapter.prototype._normalizeItem = function (item) {
+ if (!$.isPlainObject(item)) {
+ item = {
+ id: item,
+ text: item
+ };
+ }
+
+ item = $.extend({}, {
+ text: ''
+ }, item);
+
+ var defaults = {
+ selected: false,
+ disabled: false
+ };
+
+ if (item.id != null) {
+ item.id = item.id.toString();
+ }
+
+ if (item.text != null) {
+ item.text = item.text.toString();
+ }
+
+ if (item._resultId == null && item.id && this.container != null) {
+ item._resultId = this.generateResultId(this.container, item);
+ }
+
+ return $.extend({}, defaults, item);
+ };
+
+ SelectAdapter.prototype.matches = function (params, data) {
+ var matcher = this.options.get('matcher');
+
+ return matcher(params, data);
+ };
+
+ return SelectAdapter;
+});
+
+S2.define('select2/data/array',[
+ './select',
+ '../utils',
+ 'jquery'
+], function (SelectAdapter, Utils, $) {
+ function ArrayAdapter ($element, options) {
+ var data = options.get('data') || [];
+
+ ArrayAdapter.__super__.constructor.call(this, $element, options);
+
+ this.addOptions(this.convertToOptions(data));
+ }
+
+ Utils.Extend(ArrayAdapter, SelectAdapter);
+
+ ArrayAdapter.prototype.select = function (data) {
+ var $option = this.$element.find('option').filter(function (i, elm) {
+ return elm.value == data.id.toString();
+ });
+
+ if ($option.length === 0) {
+ $option = this.option(data);
+
+ this.addOptions($option);
+ }
+
+ ArrayAdapter.__super__.select.call(this, data);
+ };
+
+ ArrayAdapter.prototype.convertToOptions = function (data) {
+ var self = this;
+
+ var $existing = this.$element.find('option');
+ var existingIds = $existing.map(function () {
+ return self.item($(this)).id;
+ }).get();
+
+ var $options = [];
+
+ // Filter out all items except for the one passed in the argument
+ function onlyItem (item) {
+ return function () {
+ return $(this).val() == item.id;
+ };
+ }
+
+ for (var d = 0; d < data.length; d++) {
+ var item = this._normalizeItem(data[d]);
+
+ // Skip items which were pre-loaded, only merge the data
+ if ($.inArray(item.id, existingIds) >= 0) {
+ var $existingOption = $existing.filter(onlyItem(item));
+
+ var existingData = this.item($existingOption);
+ var newData = $.extend(true, {}, item, existingData);
+
+ var $newOption = this.option(newData);
+
+ $existingOption.replaceWith($newOption);
+
+ continue;
+ }
+
+ var $option = this.option(item);
+
+ if (item.children) {
+ var $children = this.convertToOptions(item.children);
+
+ Utils.appendMany($option, $children);
+ }
+
+ $options.push($option);
+ }
+
+ return $options;
+ };
+
+ return ArrayAdapter;
+});
+
+S2.define('select2/data/ajax',[
+ './array',
+ '../utils',
+ 'jquery'
+], function (ArrayAdapter, Utils, $) {
+ function AjaxAdapter ($element, options) {
+ this.ajaxOptions = this._applyDefaults(options.get('ajax'));
+
+ if (this.ajaxOptions.processResults != null) {
+ this.processResults = this.ajaxOptions.processResults;
+ }
+
+ AjaxAdapter.__super__.constructor.call(this, $element, options);
+ }
+
+ Utils.Extend(AjaxAdapter, ArrayAdapter);
+
+ AjaxAdapter.prototype._applyDefaults = function (options) {
+ var defaults = {
+ data: function (params) {
+ return $.extend({}, params, {
+ q: params.term
+ });
+ },
+ transport: function (params, success, failure) {
+ var $request = $.ajax(params);
+
+ $request.then(success);
+ $request.fail(failure);
+
+ return $request;
+ }
+ };
+
+ return $.extend({}, defaults, options, true);
+ };
+
+ AjaxAdapter.prototype.processResults = function (results) {
+ return results;
+ };
+
+ AjaxAdapter.prototype.query = function (params, callback) {
+ var matches = [];
+ var self = this;
+
+ if (this._request != null) {
+ // JSONP requests cannot always be aborted
+ if ($.isFunction(this._request.abort)) {
+ this._request.abort();
+ }
+
+ this._request = null;
+ }
+
+ var options = $.extend({
+ type: 'GET'
+ }, this.ajaxOptions);
+
+ if (typeof options.url === 'function') {
+ options.url = options.url.call(this.$element, params);
+ }
+
+ if (typeof options.data === 'function') {
+ options.data = options.data.call(this.$element, params);
+ }
+
+ function request () {
+ var $request = options.transport(options, function (data) {
+ var results = self.processResults(data, params);
+
+ if (self.options.get('debug') && window.console && console.error) {
+ // Check to make sure that the response included a `results` key.
+ if (!results || !results.results || !$.isArray(results.results)) {
+ console.error(
+ 'Select2: The AJAX results did not return an array in the ' +
+ '`results` key of the response.'
+ );
+ }
+ }
+
+ callback(results);
+ }, function () {
+ // Attempt to detect if a request was aborted
+ // Only works if the transport exposes a status property
+ if ($request.status && $request.status === '0') {
+ return;
+ }
+
+ self.trigger('results:message', {
+ message: 'errorLoading'
+ });
+ });
+
+ self._request = $request;
+ }
+
+ if (this.ajaxOptions.delay && params.term != null) {
+ if (this._queryTimeout) {
+ window.clearTimeout(this._queryTimeout);
+ }
+
+ this._queryTimeout = window.setTimeout(request, this.ajaxOptions.delay);
+ } else {
+ request();
+ }
+ };
+
+ return AjaxAdapter;
+});
+
+S2.define('select2/data/tags',[
+ 'jquery'
+], function ($) {
+ function Tags (decorated, $element, options) {
+ var tags = options.get('tags');
+
+ var createTag = options.get('createTag');
+
+ if (createTag !== undefined) {
+ this.createTag = createTag;
+ }
+
+ var insertTag = options.get('insertTag');
+
+ if (insertTag !== undefined) {
+ this.insertTag = insertTag;
+ }
+
+ decorated.call(this, $element, options);
+
+ if ($.isArray(tags)) {
+ for (var t = 0; t < tags.length; t++) {
+ var tag = tags[t];
+ var item = this._normalizeItem(tag);
+
+ var $option = this.option(item);
+
+ this.$element.append($option);
+ }
+ }
+ }
+
+ Tags.prototype.query = function (decorated, params, callback) {
+ var self = this;
+
+ this._removeOldTags();
+
+ if (params.term == null || params.page != null) {
+ decorated.call(this, params, callback);
+ return;
+ }
+
+ function wrapper (obj, child) {
+ var data = obj.results;
+
+ for (var i = 0; i < data.length; i++) {
+ var option = data[i];
+
+ var checkChildren = (
+ option.children != null &&
+ !wrapper({
+ results: option.children
+ }, true)
+ );
+
+ var checkText = option.text === params.term;
+
+ if (checkText || checkChildren) {
+ if (child) {
+ return false;
+ }
+
+ obj.data = data;
+ callback(obj);
+
+ return;
+ }
+ }
+
+ if (child) {
+ return true;
+ }
+
+ var tag = self.createTag(params);
+
+ if (tag != null) {
+ var $option = self.option(tag);
+ $option.attr('data-select2-tag', true);
+
+ self.addOptions([$option]);
+
+ self.insertTag(data, tag);
+ }
+
+ obj.results = data;
+
+ callback(obj);
+ }
+
+ decorated.call(this, params, wrapper);
+ };
+
+ Tags.prototype.createTag = function (decorated, params) {
+ var term = $.trim(params.term);
+
+ if (term === '') {
+ return null;
+ }
+
+ return {
+ id: term,
+ text: term
+ };
+ };
+
+ Tags.prototype.insertTag = function (_, data, tag) {
+ data.unshift(tag);
+ };
+
+ Tags.prototype._removeOldTags = function (_) {
+ var tag = this._lastTag;
+
+ var $options = this.$element.find('option[data-select2-tag]');
+
+ $options.each(function () {
+ if (this.selected) {
+ return;
+ }
+
+ $(this).remove();
+ });
+ };
+
+ return Tags;
+});
+
+S2.define('select2/data/tokenizer',[
+ 'jquery'
+], function ($) {
+ function Tokenizer (decorated, $element, options) {
+ var tokenizer = options.get('tokenizer');
+
+ if (tokenizer !== undefined) {
+ this.tokenizer = tokenizer;
+ }
+
+ decorated.call(this, $element, options);
+ }
+
+ Tokenizer.prototype.bind = function (decorated, container, $container) {
+ decorated.call(this, container, $container);
+
+ this.$search = container.dropdown.$search || container.selection.$search ||
+ $container.find('.select2-search__field');
+ };
+
+ Tokenizer.prototype.query = function (decorated, params, callback) {
+ var self = this;
+
+ function createAndSelect (data) {
+ // Normalize the data object so we can use it for checks
+ var item = self._normalizeItem(data);
+
+ // Check if the data object already exists as a tag
+ // Select it if it doesn't
+ var $existingOptions = self.$element.find('option').filter(function () {
+ return $(this).val() === item.id;
+ });
+
+ // If an existing option wasn't found for it, create the option
+ if (!$existingOptions.length) {
+ var $option = self.option(item);
+ $option.attr('data-select2-tag', true);
+
+ self._removeOldTags();
+ self.addOptions([$option]);
+ }
+
+ // Select the item, now that we know there is an option for it
+ select(item);
+ }
+
+ function select (data) {
+ self.trigger('select', {
+ data: data
+ });
+ }
+
+ params.term = params.term || '';
+
+ var tokenData = this.tokenizer(params, this.options, createAndSelect);
+
+ if (tokenData.term !== params.term) {
+ // Replace the search term if we have the search box
+ if (this.$search.length) {
+ this.$search.val(tokenData.term);
+ this.$search.focus();
+ }
+
+ params.term = tokenData.term;
+ }
+
+ decorated.call(this, params, callback);
+ };
+
+ Tokenizer.prototype.tokenizer = function (_, params, options, callback) {
+ var separators = options.get('tokenSeparators') || [];
+ var term = params.term;
+ var i = 0;
+
+ var createTag = this.createTag || function (params) {
+ return {
+ id: params.term,
+ text: params.term
+ };
+ };
+
+ while (i < term.length) {
+ var termChar = term[i];
+
+ if ($.inArray(termChar, separators) === -1) {
+ i++;
+
+ continue;
+ }
+
+ var part = term.substr(0, i);
+ var partParams = $.extend({}, params, {
+ term: part
+ });
+
+ var data = createTag(partParams);
+
+ if (data == null) {
+ i++;
+ continue;
+ }
+
+ callback(data);
+
+ // Reset the term to not include the tokenized portion
+ term = term.substr(i + 1) || '';
+ i = 0;
+ }
+
+ return {
+ term: term
+ };
+ };
+
+ return Tokenizer;
+});
+
+S2.define('select2/data/minimumInputLength',[
+
+], function () {
+ function MinimumInputLength (decorated, $e, options) {
+ this.minimumInputLength = options.get('minimumInputLength');
+
+ decorated.call(this, $e, options);
+ }
+
+ MinimumInputLength.prototype.query = function (decorated, params, callback) {
+ params.term = params.term || '';
+
+ if (params.term.length < this.minimumInputLength) {
+ this.trigger('results:message', {
+ message: 'inputTooShort',
+ args: {
+ minimum: this.minimumInputLength,
+ input: params.term,
+ params: params
+ }
+ });
+
+ return;
+ }
+
+ decorated.call(this, params, callback);
+ };
+
+ return MinimumInputLength;
+});
+
+S2.define('select2/data/maximumInputLength',[
+
+], function () {
+ function MaximumInputLength (decorated, $e, options) {
+ this.maximumInputLength = options.get('maximumInputLength');
+
+ decorated.call(this, $e, options);
+ }
+
+ MaximumInputLength.prototype.query = function (decorated, params, callback) {
+ params.term = params.term || '';
+
+ if (this.maximumInputLength > 0 &&
+ params.term.length > this.maximumInputLength) {
+ this.trigger('results:message', {
+ message: 'inputTooLong',
+ args: {
+ maximum: this.maximumInputLength,
+ input: params.term,
+ params: params
+ }
+ });
+
+ return;
+ }
+
+ decorated.call(this, params, callback);
+ };
+
+ return MaximumInputLength;
+});
+
+S2.define('select2/data/maximumSelectionLength',[
+
+], function (){
+ function MaximumSelectionLength (decorated, $e, options) {
+ this.maximumSelectionLength = options.get('maximumSelectionLength');
+
+ decorated.call(this, $e, options);
+ }
+
+ MaximumSelectionLength.prototype.query =
+ function (decorated, params, callback) {
+ var self = this;
+
+ this.current(function (currentData) {
+ var count = currentData != null ? currentData.length : 0;
+ if (self.maximumSelectionLength > 0 &&
+ count >= self.maximumSelectionLength) {
+ self.trigger('results:message', {
+ message: 'maximumSelected',
+ args: {
+ maximum: self.maximumSelectionLength
+ }
+ });
+ return;
+ }
+ decorated.call(self, params, callback);
+ });
+ };
+
+ return MaximumSelectionLength;
+});
+
+S2.define('select2/dropdown',[
+ 'jquery',
+ './utils'
+], function ($, Utils) {
+ function Dropdown ($element, options) {
+ this.$element = $element;
+ this.options = options;
+
+ Dropdown.__super__.constructor.call(this);
+ }
+
+ Utils.Extend(Dropdown, Utils.Observable);
+
+ Dropdown.prototype.render = function () {
+ var $dropdown = $(
+ '' +
+ ' '
+ );
+
+ $dropdown.attr('dir', this.options.get('dir'));
+
+ this.$dropdown = $dropdown;
+
+ return $dropdown;
+ };
+
+ Dropdown.prototype.bind = function () {
+ // Should be implemented in subclasses
+ };
+
+ Dropdown.prototype.position = function ($dropdown, $container) {
+ // Should be implmented in subclasses
+ };
+
+ Dropdown.prototype.destroy = function () {
+ // Remove the dropdown from the DOM
+ this.$dropdown.remove();
+ };
+
+ return Dropdown;
+});
+
+S2.define('select2/dropdown/search',[
+ 'jquery',
+ '../utils'
+], function ($, Utils) {
+ function Search () { }
+
+ Search.prototype.render = function (decorated) {
+ var $rendered = decorated.call(this);
+
+ var $search = $(
+ '' +
+ ' '
+ );
+
+ this.$searchContainer = $search;
+ this.$search = $search.find('input');
+
+ $rendered.prepend($search);
+
+ return $rendered;
+ };
+
+ Search.prototype.bind = function (decorated, container, $container) {
+ var self = this;
+
+ decorated.call(this, container, $container);
+
+ this.$search.on('keydown', function (evt) {
+ self.trigger('keypress', evt);
+
+ self._keyUpPrevented = evt.isDefaultPrevented();
+ });
+
+ // Workaround for browsers which do not support the `input` event
+ // This will prevent double-triggering of events for browsers which support
+ // both the `keyup` and `input` events.
+ this.$search.on('input', function (evt) {
+ // Unbind the duplicated `keyup` event
+ $(this).off('keyup');
+ });
+
+ this.$search.on('keyup input', function (evt) {
+ self.handleSearch(evt);
+ });
+
+ container.on('open', function () {
+ self.$search.attr('tabindex', 0);
+
+ self.$search.focus();
+
+ window.setTimeout(function () {
+ self.$search.focus();
+ }, 0);
+ });
+
+ container.on('close', function () {
+ self.$search.attr('tabindex', -1);
+
+ self.$search.val('');
+ });
+
+ container.on('focus', function () {
+ if (container.isOpen()) {
+ self.$search.focus();
+ }
+ });
+
+ container.on('results:all', function (params) {
+ if (params.query.term == null || params.query.term === '') {
+ var showSearch = self.showSearch(params);
+
+ if (showSearch) {
+ self.$searchContainer.removeClass('select2-search--hide');
+ } else {
+ self.$searchContainer.addClass('select2-search--hide');
+ }
+ }
+ });
+ };
+
+ Search.prototype.handleSearch = function (evt) {
+ if (!this._keyUpPrevented) {
+ var input = this.$search.val();
+
+ this.trigger('query', {
+ term: input
+ });
+ }
+
+ this._keyUpPrevented = false;
+ };
+
+ Search.prototype.showSearch = function (_, params) {
+ return true;
+ };
+
+ return Search;
+});
+
+S2.define('select2/dropdown/hidePlaceholder',[
+
+], function () {
+ function HidePlaceholder (decorated, $element, options, dataAdapter) {
+ this.placeholder = this.normalizePlaceholder(options.get('placeholder'));
+
+ decorated.call(this, $element, options, dataAdapter);
+ }
+
+ HidePlaceholder.prototype.append = function (decorated, data) {
+ data.results = this.removePlaceholder(data.results);
+
+ decorated.call(this, data);
+ };
+
+ HidePlaceholder.prototype.normalizePlaceholder = function (_, placeholder) {
+ if (typeof placeholder === 'string') {
+ placeholder = {
+ id: '',
+ text: placeholder
+ };
+ }
+
+ return placeholder;
+ };
+
+ HidePlaceholder.prototype.removePlaceholder = function (_, data) {
+ var modifiedData = data.slice(0);
+
+ for (var d = data.length - 1; d >= 0; d--) {
+ var item = data[d];
+
+ if (this.placeholder.id === item.id) {
+ modifiedData.splice(d, 1);
+ }
+ }
+
+ return modifiedData;
+ };
+
+ return HidePlaceholder;
+});
+
+S2.define('select2/dropdown/infiniteScroll',[
+ 'jquery'
+], function ($) {
+ function InfiniteScroll (decorated, $element, options, dataAdapter) {
+ this.lastParams = {};
+
+ decorated.call(this, $element, options, dataAdapter);
+
+ this.$loadingMore = this.createLoadingMore();
+ this.loading = false;
+ }
+
+ InfiniteScroll.prototype.append = function (decorated, data) {
+ this.$loadingMore.remove();
+ this.loading = false;
+
+ decorated.call(this, data);
+
+ if (this.showLoadingMore(data)) {
+ this.$results.append(this.$loadingMore);
+ }
+ };
+
+ InfiniteScroll.prototype.bind = function (decorated, container, $container) {
+ var self = this;
+
+ decorated.call(this, container, $container);
+
+ container.on('query', function (params) {
+ self.lastParams = params;
+ self.loading = true;
+ });
+
+ container.on('query:append', function (params) {
+ self.lastParams = params;
+ self.loading = true;
+ });
+
+ this.$results.on('scroll', function () {
+ var isLoadMoreVisible = $.contains(
+ document.documentElement,
+ self.$loadingMore[0]
+ );
+
+ if (self.loading || !isLoadMoreVisible) {
+ return;
+ }
+
+ var currentOffset = self.$results.offset().top +
+ self.$results.outerHeight(false);
+ var loadingMoreOffset = self.$loadingMore.offset().top +
+ self.$loadingMore.outerHeight(false);
+
+ if (currentOffset + 50 >= loadingMoreOffset) {
+ self.loadMore();
+ }
+ });
+ };
+
+ InfiniteScroll.prototype.loadMore = function () {
+ this.loading = true;
+
+ var params = $.extend({}, {page: 1}, this.lastParams);
+
+ params.page++;
+
+ this.trigger('query:append', params);
+ };
+
+ InfiniteScroll.prototype.showLoadingMore = function (_, data) {
+ return data.pagination && data.pagination.more;
+ };
+
+ InfiniteScroll.prototype.createLoadingMore = function () {
+ var $option = $(
+ '' +
+ ' '
+ );
+
+ $container.attr('dir', this.options.get('dir'));
+
+ this.$container = $container;
+
+ this.$container.addClass('select2-container--' + this.options.get('theme'));
+
+ $container.data('element', this.$element);
+
+ return $container;
+ };
+
+ return Select2;
+});
+
+S2.define('jquery-mousewheel',[
+ 'jquery'
+], function ($) {
+ // Used to shim jQuery.mousewheel for non-full builds.
+ return $;
+});
+
+S2.define('jquery.select2',[
+ 'jquery',
+ 'jquery-mousewheel',
+
+ './select2/core',
+ './select2/defaults'
+], function ($, _, Select2, Defaults) {
+ if ($.fn.select2 == null) {
+ // All methods that should return the element
+ var thisMethods = ['open', 'close', 'destroy'];
+
+ $.fn.select2 = function (options) {
+ options = options || {};
+
+ if (typeof options === 'object') {
+ this.each(function () {
+ var instanceOptions = $.extend(true, {}, options);
+
+ var instance = new Select2($(this), instanceOptions);
+ });
+
+ return this;
+ } else if (typeof options === 'string') {
+ var ret;
+ var args = Array.prototype.slice.call(arguments, 1);
+
+ this.each(function () {
+ var instance = $(this).data('select2');
+
+ if (instance == null && window.console && console.error) {
+ console.error(
+ 'The select2(\'' + options + '\') method was called on an ' +
+ 'element that is not using Select2.'
+ );
+ }
+
+ ret = instance[options].apply(instance, args);
+ });
+
+ // Check if we should be returning `this`
+ if ($.inArray(options, thisMethods) > -1) {
+ return this;
+ }
+
+ return ret;
+ } else {
+ throw new Error('Invalid arguments for Select2: ' + options);
+ }
+ };
+ }
+
+ if ($.fn.select2.defaults == null) {
+ $.fn.select2.defaults = Defaults;
+ }
+
+ return Select2;
+});
+
+ // Return the AMD loader configuration so it can be used outside of this file
+ return {
+ define: S2.define,
+ require: S2.require
+ };
+}());
+
+ // Autoload the jQuery bindings
+ // We know that all of the modules exist above this, so we're safe
+ var select2 = S2.require('jquery.select2');
+
+ // Hold the AMD module references on the jQuery function that was just loaded
+ // This allows Select2 to use the internal loader outside of this file, such
+ // as in the language files.
+ jQuery.fn.select2.amd = S2;
+
+ // Return the Select2 instance for anyone who is importing it.
+ return select2;
+}));
diff --git a/plugins/woocommerce/client/legacy/js/selectWoo/selectWoo.full.js b/plugins/woocommerce/client/legacy/js/selectWoo/selectWoo.full.js
index 82f38f68b99..3f9ab6c3ecf 100644
--- a/plugins/woocommerce/client/legacy/js/selectWoo/selectWoo.full.js
+++ b/plugins/woocommerce/client/legacy/js/selectWoo/selectWoo.full.js
@@ -1392,9 +1392,14 @@ S2.define('select2/selection/base',[
var id = container.id + '-container';
var resultsId = container.id + '-results';
var searchHidden = this.options.get('minimumResultsForSearch') === Infinity;
+ var isRequired = this.options.get('required') === true;
this.container = container;
+ if (isRequired) {
+ this.$selection.attr('aria-required', 'true')
+ }
+
this.$selection.on('focus', function (evt) {
self.trigger('focus', evt);
});
@@ -1553,6 +1558,11 @@ S2.define('select2/selection/single',[
var id = container.id + '-container';
+ var isRequired = this.options.get('required') === true;
+ if (isRequired) {
+ this.$selection.find('.select2-selection__rendered').attr('aria-required', 'true')
+ }
+
this.$selection.find('.select2-selection__rendered')
.attr('id', id)
.attr('role', 'textbox')
@@ -5069,6 +5079,10 @@ S2.define('select2/options',[
this.options.disabled = $e.prop('disabled');
}
+ if (!this.options.required) {
+ this.options.required = $e.prop('required');
+ }
+
if (this.options.language == null) {
if ($e.prop('lang')) {
this.options.language = $e.prop('lang').toLowerCase();
diff --git a/plugins/woocommerce/composer.json b/plugins/woocommerce/composer.json
index 80809c5668c..b51f7e3c195 100644
--- a/plugins/woocommerce/composer.json
+++ b/plugins/woocommerce/composer.json
@@ -2,7 +2,7 @@
"name": "woocommerce/woocommerce",
"description": "An eCommerce toolkit that helps you sell anything. Beautifully.",
"homepage": "https://woocommerce.com/",
- "version": "9.2.0",
+ "version": "9.4.0",
"type": "wordpress-plugin",
"license": "GPL-3.0-or-later",
"prefer-stable": true,
@@ -15,18 +15,27 @@
{
"type": "path",
"url": "../../packages/php/monorepo-plugin"
+ },
+ {
+ "type": "path",
+ "url": "../../packages/php/blueprint",
+ "options": {
+ "symlink": false
+ }
}
],
"require": {
"php": ">=7.4",
+ "automattic/jetpack-a8c-mc-stats": "^2.0.1",
"automattic/jetpack-autoloader": "2.11.18",
"automattic/jetpack-config": "1.15.2",
- "automattic/jetpack-connection": "^1.57",
- "automattic/jetpack-constants": "^1.6.22",
+ "automattic/jetpack-connection": "^2.10.1",
+ "automattic/jetpack-constants": "^2.0.3",
"composer/installers": "^1.9",
"maxmind-db/reader": "^1.11",
"pelago/emogrifier": "^6.0",
- "woocommerce/action-scheduler": "3.7.4"
+ "woocommerce/action-scheduler": "3.8.1",
+ "woocommerce/blueprint": "*"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.0",
diff --git a/plugins/woocommerce/composer.lock b/plugins/woocommerce/composer.lock
index 51cdcf7df3e..f312f86d4ba 100644
--- a/plugins/woocommerce/composer.lock
+++ b/plugins/woocommerce/composer.lock
@@ -4,24 +4,27 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "12ea33bcea6a641c43d24712adc9f0b6",
+ "content-hash": "e481b35f50815040071d81943b40b880",
"packages": [
{
"name": "automattic/jetpack-a8c-mc-stats",
- "version": "v1.4.22",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-a8c-mc-stats.git",
- "reference": "d7fdf2fc7ae33d75e24e82d81269e33ec718446f"
+ "reference": "64748d02bf646e6b000f79dc8e4ea127bbd8df14"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-a8c-mc-stats/zipball/d7fdf2fc7ae33d75e24e82d81269e33ec718446f",
- "reference": "d7fdf2fc7ae33d75e24e82d81269e33ec718446f",
+ "url": "https://api.github.com/repos/Automattic/jetpack-a8c-mc-stats/zipball/64748d02bf646e6b000f79dc8e4ea127bbd8df14",
+ "reference": "64748d02bf646e6b000f79dc8e4ea127bbd8df14",
"shasum": ""
},
+ "require": {
+ "php": ">=7.0"
+ },
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.9",
+ "automattic/jetpack-changelogger": "^4.1.1",
"yoast/phpunit-polyfills": "1.1.0"
},
"suggest": {
@@ -35,7 +38,7 @@
"link-template": "https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.4.x-dev"
+ "dev-trunk": "2.0.x-dev"
}
},
"autoload": {
@@ -49,27 +52,30 @@
],
"description": "Used to record internal usage stats for Automattic. Not visible to site owners.",
"support": {
- "source": "https://github.com/Automattic/jetpack-a8c-mc-stats/tree/v1.4.22"
+ "source": "https://github.com/Automattic/jetpack-a8c-mc-stats/tree/v2.0.1"
},
- "time": "2023-09-19T18:18:33+00:00"
+ "time": "2024-03-12T22:00:11+00:00"
},
{
"name": "automattic/jetpack-admin-ui",
- "version": "v0.2.25",
+ "version": "v0.4.2",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-admin-ui.git",
- "reference": "d9566f47ab310d675779273eeead6d0ca64fff82"
+ "reference": "cc7062363464f53bb3ae5745754f353c248d6278"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-admin-ui/zipball/d9566f47ab310d675779273eeead6d0ca64fff82",
- "reference": "d9566f47ab310d675779273eeead6d0ca64fff82",
+ "url": "https://api.github.com/repos/Automattic/jetpack-admin-ui/zipball/cc7062363464f53bb3ae5745754f353c248d6278",
+ "reference": "cc7062363464f53bb3ae5745754f353c248d6278",
"shasum": ""
},
+ "require": {
+ "php": ">=7.0"
+ },
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.11",
- "automattic/jetpack-logo": "^1.6.3",
+ "automattic/jetpack-changelogger": "^4.2.2",
+ "automattic/jetpack-logo": "^2.0.2",
"automattic/wordbless": "dev-master",
"yoast/phpunit-polyfills": "1.1.0"
},
@@ -85,7 +91,7 @@
"link-template": "https://github.com/Automattic/jetpack-admin-ui/compare/${old}...${new}"
},
"branch-alias": {
- "dev-trunk": "0.2.x-dev"
+ "dev-trunk": "0.4.x-dev"
},
"version-constants": {
"::PACKAGE_VERSION": "src/class-admin-menu.php"
@@ -102,9 +108,66 @@
],
"description": "Generic Jetpack wp-admin UI elements",
"support": {
- "source": "https://github.com/Automattic/jetpack-admin-ui/tree/v0.2.25"
+ "source": "https://github.com/Automattic/jetpack-admin-ui/tree/v0.4.2"
},
- "time": "2023-11-14T16:36:17+00:00"
+ "time": "2024-04-22T18:47:32+00:00"
+ },
+ {
+ "name": "automattic/jetpack-assets",
+ "version": "v2.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Automattic/jetpack-assets.git",
+ "reference": "02493a602255136051b750ca46fdce8bf4a49ab0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Automattic/jetpack-assets/zipball/02493a602255136051b750ca46fdce8bf4a49ab0",
+ "reference": "02493a602255136051b750ca46fdce8bf4a49ab0",
+ "shasum": ""
+ },
+ "require": {
+ "automattic/jetpack-constants": "^2.0.3",
+ "php": ">=7.0"
+ },
+ "require-dev": {
+ "automattic/jetpack-changelogger": "^4.2.5",
+ "brain/monkey": "2.6.1",
+ "wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0",
+ "yoast/phpunit-polyfills": "1.1.0"
+ },
+ "suggest": {
+ "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
+ },
+ "type": "jetpack-library",
+ "extra": {
+ "autotagger": true,
+ "mirror-repo": "Automattic/jetpack-assets",
+ "textdomain": "jetpack-assets",
+ "changelogger": {
+ "link-template": "https://github.com/Automattic/jetpack-assets/compare/v${old}...v${new}"
+ },
+ "branch-alias": {
+ "dev-trunk": "2.3.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "actions.php"
+ ],
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "description": "Asset management utilities for Jetpack ecosystem packages",
+ "support": {
+ "source": "https://github.com/Automattic/jetpack-assets/tree/v2.3.0"
+ },
+ "time": "2024-08-08T07:50:01+00:00"
},
{
"name": "automattic/jetpack-autoloader",
@@ -206,28 +269,30 @@
},
{
"name": "automattic/jetpack-connection",
- "version": "v1.60.1",
+ "version": "v2.11.3",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-connection.git",
- "reference": "fc99f0a4d8839b69341a25f9059b872d426f3e9d"
+ "reference": "601127eeb384008f49a1983dc3ba630eca82df08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-connection/zipball/fc99f0a4d8839b69341a25f9059b872d426f3e9d",
- "reference": "fc99f0a4d8839b69341a25f9059b872d426f3e9d",
+ "url": "https://api.github.com/repos/Automattic/jetpack-connection/zipball/601127eeb384008f49a1983dc3ba630eca82df08",
+ "reference": "601127eeb384008f49a1983dc3ba630eca82df08",
"shasum": ""
},
"require": {
- "automattic/jetpack-a8c-mc-stats": "^1.4.22",
- "automattic/jetpack-admin-ui": "^0.2.25",
- "automattic/jetpack-constants": "^1.6.23",
- "automattic/jetpack-redirect": "^1.7.27",
- "automattic/jetpack-roles": "^1.4.25",
- "automattic/jetpack-status": "^1.19.0"
+ "automattic/jetpack-a8c-mc-stats": "^2.0.1",
+ "automattic/jetpack-admin-ui": "^0.4.2",
+ "automattic/jetpack-assets": "^2.2.0",
+ "automattic/jetpack-constants": "^2.0.3",
+ "automattic/jetpack-redirect": "^2.0.2",
+ "automattic/jetpack-roles": "^2.0.2",
+ "automattic/jetpack-status": "^3.3.2",
+ "php": ">=7.0"
},
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.11",
+ "automattic/jetpack-changelogger": "^4.2.5",
"automattic/wordbless": "@dev",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0"
@@ -247,14 +312,21 @@
"link-template": "https://github.com/Automattic/jetpack-connection/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.60.x-dev"
+ "dev-trunk": "2.11.x-dev"
+ },
+ "dependencies": {
+ "test-only": [
+ "packages/licensing",
+ "packages/sync"
+ ]
}
},
"autoload": {
"classmap": [
"legacy",
"src/",
- "src/webhooks"
+ "src/webhooks",
+ "src/identity-crisis"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -263,26 +335,29 @@
],
"description": "Everything needed to connect to the Jetpack infrastructure",
"support": {
- "source": "https://github.com/Automattic/jetpack-connection/tree/v1.60.1"
+ "source": "https://github.com/Automattic/jetpack-connection/tree/v2.11.3"
},
- "time": "2023-11-14T16:36:48+00:00"
+ "time": "2024-08-01T11:55:48+00:00"
},
{
"name": "automattic/jetpack-constants",
- "version": "v1.6.23",
+ "version": "v2.0.3",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-constants.git",
- "reference": "0825fb1fa94956f26adebc01be0d716a0fd3ade0"
+ "reference": "f5da87d3b7f80411b77aa58a7355733ea72295aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-constants/zipball/0825fb1fa94956f26adebc01be0d716a0fd3ade0",
- "reference": "0825fb1fa94956f26adebc01be0d716a0fd3ade0",
+ "url": "https://api.github.com/repos/Automattic/jetpack-constants/zipball/f5da87d3b7f80411b77aa58a7355733ea72295aa",
+ "reference": "f5da87d3b7f80411b77aa58a7355733ea72295aa",
"shasum": ""
},
+ "require": {
+ "php": ">=7.0"
+ },
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.8",
+ "automattic/jetpack-changelogger": "^4.2.4",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0"
},
@@ -297,7 +372,7 @@
"link-template": "https://github.com/Automattic/jetpack-constants/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.6.x-dev"
+ "dev-trunk": "2.0.x-dev"
}
},
"autoload": {
@@ -311,29 +386,30 @@
],
"description": "A wrapper for defining constants in a more testable way.",
"support": {
- "source": "https://github.com/Automattic/jetpack-constants/tree/v1.6.23"
+ "source": "https://github.com/Automattic/jetpack-constants/tree/v2.0.3"
},
- "time": "2023-08-23T17:56:35+00:00"
+ "time": "2024-05-29T09:44:58+00:00"
},
{
"name": "automattic/jetpack-redirect",
- "version": "v1.7.27",
+ "version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-redirect.git",
- "reference": "43dd3ae2bef71281fe70f62733bfaa44c988f1b1"
+ "reference": "7214fcd3684eb99178d6368c01f8778a182444cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-redirect/zipball/43dd3ae2bef71281fe70f62733bfaa44c988f1b1",
- "reference": "43dd3ae2bef71281fe70f62733bfaa44c988f1b1",
+ "url": "https://api.github.com/repos/Automattic/jetpack-redirect/zipball/7214fcd3684eb99178d6368c01f8778a182444cb",
+ "reference": "7214fcd3684eb99178d6368c01f8778a182444cb",
"shasum": ""
},
"require": {
- "automattic/jetpack-status": "^1.18.4"
+ "automattic/jetpack-status": "^3.0.0",
+ "php": ">=7.0"
},
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.9",
+ "automattic/jetpack-changelogger": "^4.2.2",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0"
},
@@ -348,7 +424,7 @@
"link-template": "https://github.com/Automattic/jetpack-redirect/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.7.x-dev"
+ "dev-trunk": "2.0.x-dev"
}
},
"autoload": {
@@ -362,26 +438,29 @@
],
"description": "Utilities to build URLs to the jetpack.com/redirect/ service",
"support": {
- "source": "https://github.com/Automattic/jetpack-redirect/tree/v1.7.27"
+ "source": "https://github.com/Automattic/jetpack-redirect/tree/v2.0.2"
},
- "time": "2023-09-19T18:19:22+00:00"
+ "time": "2024-04-25T07:24:30+00:00"
},
{
"name": "automattic/jetpack-roles",
- "version": "v1.4.25",
+ "version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-roles.git",
- "reference": "708b33f16a879fc2ab5939a972c968c9aeefbe38"
+ "reference": "7d452c94509612e94e045b66bbfabee43fdf8728"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-roles/zipball/708b33f16a879fc2ab5939a972c968c9aeefbe38",
- "reference": "708b33f16a879fc2ab5939a972c968c9aeefbe38",
+ "url": "https://api.github.com/repos/Automattic/jetpack-roles/zipball/7d452c94509612e94e045b66bbfabee43fdf8728",
+ "reference": "7d452c94509612e94e045b66bbfabee43fdf8728",
"shasum": ""
},
+ "require": {
+ "php": ">=7.0"
+ },
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.9",
+ "automattic/jetpack-changelogger": "^4.2.2",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0"
},
@@ -396,7 +475,7 @@
"link-template": "https://github.com/Automattic/jetpack-roles/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.4.x-dev"
+ "dev-trunk": "2.0.x-dev"
}
},
"autoload": {
@@ -410,30 +489,33 @@
],
"description": "Utilities, related with user roles and capabilities.",
"support": {
- "source": "https://github.com/Automattic/jetpack-roles/tree/v1.4.25"
+ "source": "https://github.com/Automattic/jetpack-roles/tree/v2.0.2"
},
- "time": "2023-09-19T18:18:38+00:00"
+ "time": "2024-04-22T18:47:11+00:00"
},
{
"name": "automattic/jetpack-status",
- "version": "v1.19.0",
+ "version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/Automattic/jetpack-status.git",
- "reference": "3281c2311752e9df1b2809d8feacb7bf7b9b7b8d"
+ "reference": "5a57484666740d42666d18e6a52a23697c4c22ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Automattic/jetpack-status/zipball/3281c2311752e9df1b2809d8feacb7bf7b9b7b8d",
- "reference": "3281c2311752e9df1b2809d8feacb7bf7b9b7b8d",
+ "url": "https://api.github.com/repos/Automattic/jetpack-status/zipball/5a57484666740d42666d18e6a52a23697c4c22ed",
+ "reference": "5a57484666740d42666d18e6a52a23697c4c22ed",
"shasum": ""
},
"require": {
- "automattic/jetpack-constants": "^1.6.23"
+ "automattic/jetpack-constants": "^2.0.3",
+ "php": ">=7.0"
},
"require-dev": {
- "automattic/jetpack-changelogger": "^3.3.11",
- "automattic/jetpack-ip": "^0.1.6",
+ "automattic/jetpack-changelogger": "^4.2.4",
+ "automattic/jetpack-connection": "@dev",
+ "automattic/jetpack-ip": "^0.2.2",
+ "automattic/jetpack-plans": "@dev",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0"
},
@@ -448,7 +530,13 @@
"link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "1.19.x-dev"
+ "dev-trunk": "3.3.x-dev"
+ },
+ "dependencies": {
+ "test-only": [
+ "packages/connection",
+ "packages/plans"
+ ]
}
},
"autoload": {
@@ -462,9 +550,9 @@
],
"description": "Used to retrieve information about the current status of Jetpack and the site overall.",
"support": {
- "source": "https://github.com/Automattic/jetpack-status/tree/v1.19.0"
+ "source": "https://github.com/Automattic/jetpack-status/tree/v3.3.2"
},
- "time": "2023-11-13T13:50:12+00:00"
+ "time": "2024-06-24T19:22:37+00:00"
},
{
"name": "composer/installers",
@@ -622,7 +710,7 @@
"version": "v1.11.1",
"source": {
"type": "git",
- "url": "git@github.com:maxmind/MaxMind-DB-Reader-php.git",
+ "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
"reference": "1e66f73ffcf25e17c7a910a1317e9720a95497c7"
},
"dist": {
@@ -676,8 +764,202 @@
"geolocation",
"maxmind"
],
+ "support": {
+ "issues": "https://github.com/maxmind/MaxMind-DB-Reader-php/issues",
+ "source": "https://github.com/maxmind/MaxMind-DB-Reader-php/tree/v1.11.1"
+ },
"time": "2023-12-02T00:09:23+00:00"
},
+ {
+ "name": "opis/json-schema",
+ "version": "2.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/opis/json-schema.git",
+ "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/opis/json-schema/zipball/c48df6d7089a45f01e1c82432348f2d5976f9bfb",
+ "reference": "c48df6d7089a45f01e1c82432348f2d5976f9bfb",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "opis/string": "^2.0",
+ "opis/uri": "^1.0",
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "ext-bcmath": "*",
+ "ext-intl": "*",
+ "phpunit/phpunit": "^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Opis\\JsonSchema\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Sorin Sarca",
+ "email": "sarca_sorin@hotmail.com"
+ },
+ {
+ "name": "Marius Sarca",
+ "email": "marius.sarca@gmail.com"
+ }
+ ],
+ "description": "Json Schema Validator for PHP",
+ "homepage": "https://opis.io/json-schema",
+ "keywords": [
+ "json",
+ "json-schema",
+ "schema",
+ "validation",
+ "validator"
+ ],
+ "support": {
+ "issues": "https://github.com/opis/json-schema/issues",
+ "source": "https://github.com/opis/json-schema/tree/2.3.0"
+ },
+ "time": "2022-01-08T20:38:03+00:00"
+ },
+ {
+ "name": "opis/string",
+ "version": "2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/opis/string.git",
+ "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/opis/string/zipball/9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+ "reference": "9ebf1a1f873f502f6859d11210b25a4bf5d141e7",
+ "shasum": ""
+ },
+ "require": {
+ "ext-iconv": "*",
+ "ext-json": "*",
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Opis\\String\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Marius Sarca",
+ "email": "marius.sarca@gmail.com"
+ },
+ {
+ "name": "Sorin Sarca",
+ "email": "sarca_sorin@hotmail.com"
+ }
+ ],
+ "description": "Multibyte strings as objects",
+ "homepage": "https://opis.io/string",
+ "keywords": [
+ "multi-byte",
+ "opis",
+ "string",
+ "string manipulation",
+ "utf-8"
+ ],
+ "support": {
+ "issues": "https://github.com/opis/string/issues",
+ "source": "https://github.com/opis/string/tree/2.0.1"
+ },
+ "time": "2022-01-14T15:42:23+00:00"
+ },
+ {
+ "name": "opis/uri",
+ "version": "1.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/opis/uri.git",
+ "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/opis/uri/zipball/0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+ "reference": "0f3ca49ab1a5e4a6681c286e0b2cc081b93a7d5a",
+ "shasum": ""
+ },
+ "require": {
+ "opis/string": "^2.0",
+ "php": "^7.4 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Opis\\Uri\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "Apache-2.0"
+ ],
+ "authors": [
+ {
+ "name": "Marius Sarca",
+ "email": "marius.sarca@gmail.com"
+ },
+ {
+ "name": "Sorin Sarca",
+ "email": "sarca_sorin@hotmail.com"
+ }
+ ],
+ "description": "Build, parse and validate URIs and URI-templates",
+ "homepage": "https://opis.io",
+ "keywords": [
+ "URI Template",
+ "parse url",
+ "punycode",
+ "uri",
+ "uri components",
+ "url",
+ "validate uri"
+ ],
+ "support": {
+ "issues": "https://github.com/opis/uri/issues",
+ "source": "https://github.com/opis/uri/tree/1.1.0"
+ },
+ "time": "2021-05-22T15:57:08+00:00"
+ },
{
"name": "pelago/emogrifier",
"version": "v6.0.0",
@@ -758,16 +1040,16 @@
},
{
"name": "sabberworm/php-css-parser",
- "version": "8.4.0",
+ "version": "v8.6.0",
"source": {
"type": "git",
- "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
- "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+ "url": "https://github.com/MyIntervals/PHP-CSS-Parser.git",
+ "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
- "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+ "url": "https://api.github.com/repos/MyIntervals/PHP-CSS-Parser/zipball/d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
+ "reference": "d2fb94a9641be84d79c7548c6d39bbebba6e9a70",
"shasum": ""
},
"require": {
@@ -775,13 +1057,17 @@
"php": ">=5.6.20"
},
"require-dev": {
- "codacy/coverage": "^1.4",
- "phpunit/phpunit": "^4.8.36"
+ "phpunit/phpunit": "^5.7.27"
},
"suggest": {
"ext-mbstring": "for parsing UTF-8 CSS"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "9.0.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Sabberworm\\CSS\\": "src/"
@@ -794,6 +1080,14 @@
"authors": [
{
"name": "Raphael Schweikert"
+ },
+ {
+ "name": "Oliver Klee",
+ "email": "github@oliverklee.de"
+ },
+ {
+ "name": "Jake Hotson",
+ "email": "jake.github@qzdesign.co.uk"
}
],
"description": "Parser for CSS Files written in PHP",
@@ -804,23 +1098,23 @@
"stylesheet"
],
"support": {
- "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
- "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+ "issues": "https://github.com/MyIntervals/PHP-CSS-Parser/issues",
+ "source": "https://github.com/MyIntervals/PHP-CSS-Parser/tree/v8.6.0"
},
- "time": "2021-12-11T13:40:54+00:00"
+ "time": "2024-07-01T07:33:21+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v5.4.26",
+ "version": "v5.4.40",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a"
+ "reference": "ea43887e9afd2029509662d4f95e8b5ef6fc9bbb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a",
- "reference": "0ad3f7e9a1ab492c5b4214cf22a9dc55dcf8600a",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/ea43887e9afd2029509662d4f95e8b5ef6fc9bbb",
+ "reference": "ea43887e9afd2029509662d4f95e8b5ef6fc9bbb",
"shasum": ""
},
"require": {
@@ -857,7 +1151,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/css-selector/tree/v5.4.26"
+ "source": "https://github.com/symfony/css-selector/tree/v5.4.40"
},
"funding": [
{
@@ -873,20 +1167,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-07T06:10:25+00:00"
+ "time": "2024-05-31T14:33:22+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+ "reference": "77fa7995ac1b21ab60769b7323d600a991a90433"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
- "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433",
+ "reference": "77fa7995ac1b21ab60769b7323d600a991a90433",
"shasum": ""
},
"require": {
@@ -894,9 +1188,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -940,7 +1231,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0"
},
"funding": [
{
@@ -956,20 +1247,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "woocommerce/action-scheduler",
- "version": "3.7.4",
+ "version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/woocommerce/action-scheduler.git",
- "reference": "5fb655253dc004bb7a6d840da807f0949aea8bcd"
+ "reference": "e331b534d7de10402d7545a0de50177b874c0779"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/5fb655253dc004bb7a6d840da807f0949aea8bcd",
- "reference": "5fb655253dc004bb7a6d840da807f0949aea8bcd",
+ "url": "https://api.github.com/repos/woocommerce/action-scheduler/zipball/e331b534d7de10402d7545a0de50177b874c0779",
+ "reference": "e331b534d7de10402d7545a0de50177b874c0779",
"shasum": ""
},
"require": {
@@ -997,9 +1288,36 @@
"homepage": "https://actionscheduler.org/",
"support": {
"issues": "https://github.com/woocommerce/action-scheduler/issues",
- "source": "https://github.com/woocommerce/action-scheduler/tree/3.7.4"
+ "source": "https://github.com/woocommerce/action-scheduler/tree/3.8.1"
},
- "time": "2024-04-05T14:42:07+00:00"
+ "time": "2024-06-20T19:53:06+00:00"
+ },
+ {
+ "name": "woocommerce/blueprint",
+ "version": "dev-add/blueprint-package-1",
+ "dist": {
+ "type": "path",
+ "url": "../../packages/php/blueprint",
+ "reference": "4eac6cb480be161204cb4fbf81567215592daecc"
+ },
+ "require": {
+ "opis/json-schema": "^2.3"
+ },
+ "require-dev": {
+ "mockery/mockery": "^1.5",
+ "phpunit/phpunit": "^9"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Automattic\\WooCommerce\\Blueprint\\": "src/",
+ "Automattic\\WooCommerce\\Blueprint\\Tests\\": "tests/"
+ }
+ },
+ "transport-options": {
+ "symlink": false,
+ "relative": true
+ }
}
],
"packages-dev": [
@@ -1697,16 +2015,16 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.1",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
"shasum": ""
},
"require": {
@@ -1714,11 +2032,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -1744,7 +2063,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
},
"funding": [
{
@@ -1752,29 +2071,31 @@
"type": "tidelift"
}
],
- "time": "2023-03-08T13:26:56+00:00"
+ "time": "2024-06-12T14:39:25+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.18.0",
+ "version": "v5.1.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+ "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1",
+ "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
+ "ext-json": "*",
"ext-tokenizer": "*",
- "php": ">=7.0"
+ "php": ">=7.4"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -1782,7 +2103,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.9-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -1806,26 +2127,27 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0"
},
- "time": "2023-12-10T21:03:43+00:00"
+ "time": "2024-07-01T20:03:41+00:00"
},
{
"name": "phar-io/manifest",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+ "reference": "54750ef60c58e43759730615a392c31c80e23176"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+ "reference": "54750ef60c58e43759730615a392c31c80e23176",
"shasum": ""
},
"require": {
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-phar": "*",
"ext-xmlwriter": "*",
"phar-io/version": "^3.0.1",
@@ -1866,9 +2188,15 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": {
"issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+ "source": "https://github.com/phar-io/manifest/tree/2.0.4"
},
- "time": "2021-07-20T11:28:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2024-03-03T12:33:53+00:00"
},
{
"name": "phar-io/version",
@@ -1923,23 +2251,23 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.29",
+ "version": "9.2.31",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
+ "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
- "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+ "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.15",
+ "nikic/php-parser": "^4.18 || ^5.0",
"php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2",
@@ -1989,7 +2317,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
},
"funding": [
{
@@ -1997,7 +2325,7 @@
"type": "github"
}
],
- "time": "2023-09-19T04:57:46+00:00"
+ "time": "2024-03-02T06:37:42+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -2242,45 +2570,45 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.15",
+ "version": "9.6.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+ "reference": "49d7820565836236411f5dc002d16dd689cde42f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
- "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f",
+ "reference": "49d7820565836236411f5dc002d16dd689cde42f",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.3.1 || ^2",
+ "doctrine/instantiator": "^1.5.0 || ^2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
"php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.28",
- "phpunit/php-file-iterator": "^3.0.5",
+ "phpunit/php-code-coverage": "^9.2.31",
+ "phpunit/php-file-iterator": "^3.0.6",
"phpunit/php-invoker": "^3.1.1",
- "phpunit/php-text-template": "^2.0.3",
- "phpunit/php-timer": "^5.0.2",
- "sebastian/cli-parser": "^1.0.1",
- "sebastian/code-unit": "^1.0.6",
+ "phpunit/php-text-template": "^2.0.4",
+ "phpunit/php-timer": "^5.0.3",
+ "sebastian/cli-parser": "^1.0.2",
+ "sebastian/code-unit": "^1.0.8",
"sebastian/comparator": "^4.0.8",
- "sebastian/diff": "^4.0.3",
- "sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.5",
- "sebastian/global-state": "^5.0.1",
- "sebastian/object-enumerator": "^4.0.3",
- "sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.2",
+ "sebastian/diff": "^4.0.6",
+ "sebastian/environment": "^5.1.5",
+ "sebastian/exporter": "^4.0.6",
+ "sebastian/global-state": "^5.0.7",
+ "sebastian/object-enumerator": "^4.0.4",
+ "sebastian/resource-operations": "^3.0.4",
+ "sebastian/type": "^3.2.1",
"sebastian/version": "^3.0.2"
},
"suggest": {
@@ -2325,7 +2653,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20"
},
"funding": [
{
@@ -2341,7 +2669,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-01T16:55:19+00:00"
+ "time": "2024-07-10T11:45:39+00:00"
},
{
"name": "psr/container",
@@ -2465,16 +2793,16 @@
},
{
"name": "react/stream",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/stream.git",
- "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66"
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66",
- "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66",
+ "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
"shasum": ""
},
"require": {
@@ -2484,7 +2812,7 @@
},
"require-dev": {
"clue/stream-filter": "~1.2",
- "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
@@ -2531,7 +2859,7 @@
],
"support": {
"issues": "https://github.com/reactphp/stream/issues",
- "source": "https://github.com/reactphp/stream/tree/v1.3.0"
+ "source": "https://github.com/reactphp/stream/tree/v1.4.0"
},
"funding": [
{
@@ -2539,20 +2867,20 @@
"type": "open_collective"
}
],
- "time": "2023-06-16T10:52:11+00:00"
+ "time": "2024-06-11T12:45:25+00:00"
},
{
"name": "sebastian/cli-parser",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+ "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+ "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
"shasum": ""
},
"require": {
@@ -2587,7 +2915,7 @@
"homepage": "https://github.com/sebastianbergmann/cli-parser",
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
},
"funding": [
{
@@ -2595,7 +2923,7 @@
"type": "github"
}
],
- "time": "2020-09-28T06:08:49+00:00"
+ "time": "2024-03-02T06:27:43+00:00"
},
{
"name": "sebastian/code-unit",
@@ -2784,20 +3112,20 @@
},
{
"name": "sebastian/complexity",
- "version": "2.0.2",
+ "version": "2.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+ "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
- "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+ "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.7",
+ "nikic/php-parser": "^4.18 || ^5.0",
"php": ">=7.3"
},
"require-dev": {
@@ -2829,7 +3157,7 @@
"homepage": "https://github.com/sebastianbergmann/complexity",
"support": {
"issues": "https://github.com/sebastianbergmann/complexity/issues",
- "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+ "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
},
"funding": [
{
@@ -2837,20 +3165,20 @@
"type": "github"
}
],
- "time": "2020-10-26T15:52:27+00:00"
+ "time": "2023-12-22T06:19:30+00:00"
},
{
"name": "sebastian/diff",
- "version": "4.0.5",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+ "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+ "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
"shasum": ""
},
"require": {
@@ -2895,7 +3223,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+ "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
},
"funding": [
{
@@ -2903,7 +3231,7 @@
"type": "github"
}
],
- "time": "2023-05-07T05:35:17+00:00"
+ "time": "2024-03-02T06:30:58+00:00"
},
{
"name": "sebastian/environment",
@@ -2970,16 +3298,16 @@
},
{
"name": "sebastian/exporter",
- "version": "4.0.5",
+ "version": "4.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+ "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+ "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
"shasum": ""
},
"require": {
@@ -3035,7 +3363,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
},
"funding": [
{
@@ -3043,20 +3371,20 @@
"type": "github"
}
],
- "time": "2022-09-14T06:03:37+00:00"
+ "time": "2024-03-02T06:33:00+00:00"
},
{
"name": "sebastian/global-state",
- "version": "5.0.6",
+ "version": "5.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+ "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+ "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
"shasum": ""
},
"require": {
@@ -3099,7 +3427,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
},
"funding": [
{
@@ -3107,24 +3435,24 @@
"type": "github"
}
],
- "time": "2023-08-02T09:26:13+00:00"
+ "time": "2024-03-02T06:35:11+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "1.0.3",
+ "version": "1.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+ "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
- "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+ "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.6",
+ "nikic/php-parser": "^4.18 || ^5.0",
"php": ">=7.3"
},
"require-dev": {
@@ -3156,7 +3484,7 @@
"homepage": "https://github.com/sebastianbergmann/lines-of-code",
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
},
"funding": [
{
@@ -3164,7 +3492,7 @@
"type": "github"
}
],
- "time": "2020-11-28T06:42:11+00:00"
+ "time": "2023-12-22T06:20:34+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -3343,16 +3671,16 @@
},
{
"name": "sebastian/resource-operations",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
"shasum": ""
},
"require": {
@@ -3364,7 +3692,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -3385,8 +3713,7 @@
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"support": {
- "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
- "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
},
"funding": [
{
@@ -3394,7 +3721,7 @@
"type": "github"
}
],
- "time": "2020-09-28T06:45:17+00:00"
+ "time": "2024-03-14T16:00:52+00:00"
},
{
"name": "sebastian/type",
@@ -3571,16 +3898,16 @@
},
{
"name": "symfony/console",
- "version": "v5.4.32",
+ "version": "v5.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
+ "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
- "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/cef62396a0477e94fc52e87a17c6e5c32e226b7f",
+ "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f",
"shasum": ""
},
"require": {
@@ -3650,7 +3977,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v5.4.32"
+ "source": "https://github.com/symfony/console/tree/v5.4.42"
},
"funding": [
{
@@ -3666,20 +3993,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-18T18:23:04+00:00"
+ "time": "2024-07-26T12:21:55+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v2.5.2",
+ "version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+ "reference": "80d075412b557d41002320b96a096ca65aa2c98d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d",
+ "reference": "80d075412b557d41002320b96a096ca65aa2c98d",
"shasum": ""
},
"require": {
@@ -3717,7 +4044,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3"
},
"funding": [
{
@@ -3733,20 +4060,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:53:40+00:00"
+ "time": "2023-01-24T14:02:46+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.4.35",
+ "version": "v5.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
+ "reference": "0724c51fa067b198e36506d2864e09a52180998a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
- "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/0724c51fa067b198e36506d2864e09a52180998a",
+ "reference": "0724c51fa067b198e36506d2864e09a52180998a",
"shasum": ""
},
"require": {
@@ -3780,7 +4107,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.35"
+ "source": "https://github.com/symfony/finder/tree/v5.4.42"
},
"funding": [
{
@@ -3796,20 +4123,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T13:51:25+00:00"
+ "time": "2024-07-22T08:53:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540",
+ "reference": "0424dff1c58f028c451efff2045f5d92410bd540",
"shasum": ""
},
"require": {
@@ -3823,9 +4150,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -3862,7 +4186,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0"
},
"funding": [
{
@@ -3878,20 +4202,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "875e90aeea2777b6f135677f618529449334a612"
+ "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
- "reference": "875e90aeea2777b6f135677f618529449334a612",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a",
+ "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a",
"shasum": ""
},
"require": {
@@ -3902,9 +4226,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -3943,7 +4264,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0"
},
"funding": [
{
@@ -3959,20 +4280,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+ "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
- "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb",
+ "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb",
"shasum": ""
},
"require": {
@@ -3983,9 +4304,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -4027,7 +4345,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0"
},
"funding": [
{
@@ -4043,20 +4361,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "42292d99c55abe617799667f454222c54c60e229"
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
- "reference": "42292d99c55abe617799667f454222c54c60e229",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c",
+ "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c",
"shasum": ""
},
"require": {
@@ -4070,9 +4388,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -4110,7 +4425,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0"
},
"funding": [
{
@@ -4126,20 +4441,20 @@
"type": "tidelift"
}
],
- "time": "2023-07-28T09:04:16+00:00"
+ "time": "2024-06-19T12:30:46+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.28.0",
+ "version": "v1.30.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
+ "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
- "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1",
+ "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1",
"shasum": ""
},
"require": {
@@ -4147,9 +4462,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -4189,7 +4501,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0"
},
"funding": [
{
@@ -4205,20 +4517,20 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-05-31T15:07:36+00:00"
},
{
"name": "symfony/process",
- "version": "v5.4.28",
+ "version": "v5.4.40",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b"
+ "reference": "deedcb3bb4669cae2148bc920eafd2b16dc7c046"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
- "reference": "45261e1fccad1b5447a8d7a8e67aa7b4a9798b7b",
+ "url": "https://api.github.com/repos/symfony/process/zipball/deedcb3bb4669cae2148bc920eafd2b16dc7c046",
+ "reference": "deedcb3bb4669cae2148bc920eafd2b16dc7c046",
"shasum": ""
},
"require": {
@@ -4251,7 +4563,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v5.4.28"
+ "source": "https://github.com/symfony/process/tree/v5.4.40"
},
"funding": [
{
@@ -4267,20 +4579,20 @@
"type": "tidelift"
}
],
- "time": "2023-08-07T10:36:04+00:00"
+ "time": "2024-05-31T14:33:22+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v2.5.2",
+ "version": "v2.5.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+ "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3",
+ "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3",
"shasum": ""
},
"require": {
@@ -4334,7 +4646,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+ "source": "https://github.com/symfony/service-contracts/tree/v2.5.3"
},
"funding": [
{
@@ -4350,20 +4662,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-30T19:17:29+00:00"
+ "time": "2023-04-21T15:04:16+00:00"
},
{
"name": "symfony/string",
- "version": "v5.4.32",
+ "version": "v5.4.42",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "91bf4453d65d8231688a04376c3a40efe0770f04"
+ "reference": "909cec913edea162a3b2836788228ad45fcab337"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04",
- "reference": "91bf4453d65d8231688a04376c3a40efe0770f04",
+ "url": "https://api.github.com/repos/symfony/string/zipball/909cec913edea162a3b2836788228ad45fcab337",
+ "reference": "909cec913edea162a3b2836788228ad45fcab337",
"shasum": ""
},
"require": {
@@ -4420,7 +4732,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.4.32"
+ "source": "https://github.com/symfony/string/tree/v5.4.42"
},
"funding": [
{
@@ -4436,20 +4748,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-26T13:43:46+00:00"
+ "time": "2024-07-20T18:38:32+00:00"
},
{
"name": "symfony/yaml",
- "version": "v5.4.35",
+ "version": "v5.4.40",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4"
+ "reference": "81cad0ceab3d61fe14fe941ff18a230ac9c80f83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
- "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/81cad0ceab3d61fe14fe941ff18a230ac9c80f83",
+ "reference": "81cad0ceab3d61fe14fe941ff18a230ac9c80f83",
"shasum": ""
},
"require": {
@@ -4495,7 +4807,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v5.4.35"
+ "source": "https://github.com/symfony/yaml/tree/v5.4.40"
},
"funding": [
{
@@ -4511,20 +4823,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T13:51:25+00:00"
+ "time": "2024-05-31T14:33:22+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.2",
+ "version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
"shasum": ""
},
"require": {
@@ -4553,7 +4865,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
},
"funding": [
{
@@ -4561,7 +4873,7 @@
"type": "github"
}
],
- "time": "2023-11-20T00:12:19+00:00"
+ "time": "2024-03-03T12:36:25+00:00"
},
{
"name": "wikimedia/at-ease",
@@ -4620,7 +4932,7 @@
},
{
"name": "woocommerce/monorepo-plugin",
- "version": "dev-update/action-scheduler-3.7.4",
+ "version": "dev-tweak/bump-jetpack-connection",
"dist": {
"type": "path",
"url": "../../packages/php/monorepo-plugin",
@@ -4648,16 +4960,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "2.0.0",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "c758753e8f9dac251fed396a73c8305af3f17922"
+ "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/c758753e8f9dac251fed396a73c8305af3f17922",
- "reference": "c758753e8f9dac251fed396a73c8305af3f17922",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/4a088f125c970d6d6ea52c927f96fe39b330d0f1",
+ "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1",
"shasum": ""
},
"require": {
@@ -4665,7 +4977,9 @@
"phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0"
},
"require-dev": {
- "yoast/yoastcs": "^2.3.0"
+ "php-parallel-lint/php-console-highlighter": "^1.0.0",
+ "php-parallel-lint/php-parallel-lint": "^1.4.0",
+ "yoast/yoastcs": "^3.1.0"
},
"type": "library",
"extra": {
@@ -4702,9 +5016,10 @@
],
"support": {
"issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
+ "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2023-06-06T20:28:24+00:00"
+ "time": "2024-04-05T16:36:44+00:00"
},
{
"name": "yosymfony/resource-watcher",
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
index 99a45d0c339..57786b9a591 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-order.php
@@ -626,7 +626,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
*/
public function set_status( $new_status ) {
$old_status = $this->get_status();
- $new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
+ $new_status = OrderUtil::remove_status_prefix( $new_status );
$status_exceptions = array( 'auto-draft', 'trash' );
@@ -1413,7 +1413,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
private function get_temporary_coupon( WC_Order_Item_Coupon $coupon_item ): WC_Coupon {
$coupon_object = new WC_Coupon();
- // Since WooCommerce 8.7 a succint 'coupon_info' line item meta entry is created
+ // Since WooCommerce 8.7 a succinct 'coupon_info' line item meta entry is created
// whenever a coupon is applied to an order. Previously a more verbose 'coupon_data' was created.
$coupon_info = $coupon_item->get_meta( 'coupon_info', true );
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-product.php b/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
index e32e6e2d735..d00e5b24d9f 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-product.php
@@ -854,7 +854,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
* @param string $global_unique_id Unique ID.
*/
public function set_global_unique_id( $global_unique_id ) {
- $global_unique_id = (string) $global_unique_id;
+ $global_unique_id = preg_replace( '/[^0-9\-]/', '', (string) $global_unique_id );
if ( $this->get_object_read() && ! empty( $global_unique_id ) && ! wc_product_has_global_unique_id( $this->get_id(), $global_unique_id ) ) {
$global_unique_id_found = wc_get_product_id_by_global_unique_id( $global_unique_id );
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-assets.php b/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
index ef3c34e4b51..f93b755c6c1 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-assets.php
@@ -149,7 +149,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
wp_register_script( 'wc-shipping-zone-methods', WC()->plugin_url() . '/assets/js/admin/wc-shipping-zone-methods' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'jquery-ui-sortable', 'wc-backbone-modal' ), $version );
wp_register_script( 'wc-shipping-classes', WC()->plugin_url() . '/assets/js/admin/wc-shipping-classes' . $suffix . '.js', array( 'jquery', 'wp-util', 'underscore', 'backbone', 'wc-backbone-modal' ), $version, array( 'in_footer' => false ) );
wp_register_script( 'wc-clipboard', WC()->plugin_url() . '/assets/js/admin/wc-clipboard' . $suffix . '.js', array( 'jquery' ), $version );
- wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/selectWoo/selectWoo.full' . $suffix . '.js', array( 'jquery' ), '1.0.6' );
+ wp_register_script( 'select2', WC()->plugin_url() . '/assets/js/select2/select2.full' . $suffix . '.js', array( 'jquery' ), '4.0.3', array( 'in_footer' => false ) );
wp_register_script( 'selectWoo', WC()->plugin_url() . '/assets/js/selectWoo/selectWoo.full' . $suffix . '.js', array( 'jquery' ), '1.0.6' );
wp_register_script( 'wc-enhanced-select', WC()->plugin_url() . '/assets/js/admin/wc-enhanced-select' . $suffix . '.js', array( 'jquery', 'selectWoo' ), $version );
wp_register_script( 'js-cookie', WC()->plugin_url() . '/assets/js/js-cookie/js.cookie' . $suffix . '.js', array(), '2.1.4', true );
@@ -220,6 +220,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
'i18n_delete_product_notice' => __( 'This product has produced sales and may be linked to existing orders. Are you sure you want to delete it?', 'woocommerce' ),
'i18n_remove_personal_data_notice' => __( 'This action cannot be reversed. Are you sure you wish to erase personal data from the selected orders?', 'woocommerce' ),
'i18n_confirm_delete' => __( 'Are you sure you wish to delete this item?', 'woocommerce' ),
+ 'i18n_global_unique_id_error' => __( 'Please enter only numbers and hyphens (-).', 'woocommerce' ),
'decimal_point' => $decimal,
'mon_decimal_point' => wc_get_price_decimal_separator(),
'ajax_url' => admin_url( 'admin-ajax.php' ),
@@ -276,7 +277,7 @@ if ( ! class_exists( 'WC_Admin_Assets', false ) ) :
if ( in_array( $screen_id, array( 'product', 'edit-product' ) ) ) {
wp_enqueue_media();
wp_register_script( 'wc-admin-product-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'media-models' ), $version );
- wp_register_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson', 'media-models', 'backbone', 'jquery-ui-sortable', 'wc-backbone-modal' ), $version );
+ wp_register_script( 'wc-admin-variation-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-product-variation' . $suffix . '.js', array( 'wc-admin-meta-boxes', 'serializejson', 'media-models', 'backbone', 'jquery-ui-sortable', 'wc-backbone-modal', 'wp-data', 'wp-notices' ), $version );
wp_enqueue_script( 'wc-admin-product-meta-boxes' );
wp_enqueue_script( 'wc-admin-variation-meta-boxes' );
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-product.php b/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-product.php
index 05c67028ac3..77043e0b8b8 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-product.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-duplicate-product.php
@@ -156,6 +156,9 @@ class WC_Admin_Duplicate_Product {
if ( '' !== $product->get_sku( 'edit' ) ) {
$duplicate->set_sku( wc_product_generate_unique_sku( 0, $product->get_sku( 'edit' ) ) );
}
+ if ( '' !== $product->get_global_unique_id( 'edit' ) ) {
+ $duplicate->set_global_unique_id( '' );
+ }
$duplicate->set_status( 'draft' );
$duplicate->set_date_created( null );
$duplicate->set_slug( '' );
@@ -195,6 +198,9 @@ class WC_Admin_Duplicate_Product {
if ( '' !== $child->get_sku( 'edit' ) ) {
$child_duplicate->set_sku( wc_product_generate_unique_sku( 0, $child->get_sku( 'edit' ) ) );
}
+ if ( '' !== $child->get_global_unique_id( 'edit' ) ) {
+ $child_duplicate->set_global_unique_id( '' );
+ }
foreach ( $meta_to_exclude as $meta_key ) {
$child_duplicate->delete_meta_data( $meta_key );
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-importers.php b/plugins/woocommerce/includes/admin/class-wc-admin-importers.php
index 37c59e4dc5b..6dfec075b89 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-importers.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-importers.php
@@ -1,4 +1,4 @@
-importers['product_importer'] = array(
@@ -96,10 +97,15 @@ class WC_Admin_Importers {
*/
public function product_importer() {
if ( Constants::is_defined( 'WP_LOAD_IMPORTERS' ) ) {
- wp_safe_redirect( admin_url( 'edit.php?post_type=product&page=product_importer' ) );
+ wp_safe_redirect( admin_url( 'edit.php?post_type=product&page=product_importer&source=wordpress-importer' ) );
exit;
}
+ // phpcs:ignore
+ if ( isset( $_GET['source'] ) && 'wordpress-importer' === sanitize_text_field( wp_unslash( $_GET['source'] ) ) ) {
+ wc_admin_record_tracks_event( 'product_importer_view_from_wp_importer' );
+ }
+
include_once WC_ABSPATH . 'includes/import/class-wc-product-csv-importer.php';
include_once WC_ABSPATH . 'includes/admin/importers/class-wc-product-csv-importer-controller.php';
@@ -132,7 +138,9 @@ class WC_Admin_Importers {
}
}
- require dirname( __FILE__ ) . '/importers/class-wc-tax-rate-importer.php';
+ wc_admin_record_tracks_event( 'tax_rates_importer_view_from_wp_importer' );
+
+ require __DIR__ . '/importers/class-wc-tax-rate-importer.php';
$importer = new WC_Tax_Rate_Importer();
$importer->dispatch();
@@ -182,7 +190,9 @@ class WC_Admin_Importers {
// Register the taxonomy now so that the import works!
register_taxonomy(
$term['domain'],
+ // phpcs:ignore
apply_filters( 'woocommerce_taxonomy_objects_' . $term['domain'], array( 'product' ) ),
+ // phpcs:ignore
apply_filters(
'woocommerce_taxonomy_args_' . $term['domain'],
array(
@@ -229,7 +239,7 @@ class WC_Admin_Importers {
*
* @param int $size Batch size.
*
- * @since
+ * @since 3.1.0
*/
'lines' => apply_filters( 'woocommerce_product_import_batch_size', 30 ),
'parse' => true,
@@ -314,6 +324,29 @@ class WC_Admin_Importers {
);
}
}
+
+ /**
+ * Track importer/exporter view.
+ *
+ * @return void
+ */
+ public function track_importer_exporter_view() {
+ $screen = get_current_screen();
+
+ if ( ! isset( $screen->id ) ) {
+ return;
+ }
+
+ // Don't track if we're in a specific import screen.
+ // phpcs:ignore
+ if ( isset( $_GET['import'] ) ) {
+ return;
+ }
+
+ if ( 'import' === $screen->id || 'export' === $screen->id ) {
+ wc_admin_record_tracks_event( 'wordpress_' . $screen->id . '_view' );
+ }
+ }
}
new WC_Admin_Importers();
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-marketplace-promotions.php b/plugins/woocommerce/includes/admin/class-wc-admin-marketplace-promotions.php
index d1e6f667932..02aedbd9556 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-marketplace-promotions.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-marketplace-promotions.php
@@ -219,8 +219,8 @@ class WC_Admin_Marketplace_Promotions {
/**
* From the array of promotions, select those of a given format.
*
- * @param ? array $promotions Array of data about promotions of all formats.
- * @param ? string $format Format we want to filter for.
+ * @param ?array $promotions Array of data about promotions of all formats.
+ * @param ?string $format Format we want to filter for.
*
* @return array
*/
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-post-types.php b/plugins/woocommerce/includes/admin/class-wc-admin-post-types.php
index 1432ac80391..741fda165cd 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-post-types.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-post-types.php
@@ -43,6 +43,12 @@ class WC_Admin_Post_Types {
add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
add_filter( 'woocommerce_order_updated_messages', array( $this, 'order_updated_messages' ) );
add_filter( 'bulk_post_updated_messages', array( $this, 'bulk_post_updated_messages' ), 10, 2 );
+ add_action(
+ 'admin_notices',
+ function () {
+ $this->maybe_display_warning_for_password_protected_coupon();
+ }
+ );
// Disable Auto Save.
add_action( 'admin_print_scripts', array( $this, 'disable_autosave' ) );
@@ -256,6 +262,33 @@ class WC_Admin_Post_Types {
return $bulk_messages;
}
+ /**
+ * Shows a warning when editing a password-protected coupon.
+ *
+ * @since 9.2.0
+ */
+ private function maybe_display_warning_for_password_protected_coupon() {
+ if ( ! function_exists( 'get_current_screen' ) || 'shop_coupon' !== get_current_screen()->id ) {
+ return;
+ }
+
+ if ( ! isset( $GLOBALS['post'] ) || 'shop_coupon' !== $GLOBALS['post']->post_type ) {
+ return;
+ }
+
+ wp_admin_notice(
+ __(
+ 'This coupon is password protected. WooCommerce does not support password protection for coupons. You can temporarily hide a coupon by making it private. Alternatively, usage limits and restrictions can be configured below.',
+ 'woocommerce'
+ ),
+ array(
+ 'type' => 'warning',
+ 'id' => 'wc-password-protected-coupon-warning',
+ 'additional_classes' => empty( $GLOBALS['post']->post_password ) ? array( 'hidden' ) : array(),
+ )
+ );
+ }
+
/**
* Custom bulk edit - form.
*
@@ -873,13 +906,17 @@ class WC_Admin_Post_Types {
switch ( $change_price ) {
case 1:
- $new_price = $price;
+ if ( empty( $price ) ) {
+ $new_price = $product->get_regular_price();
+ } else {
+ $new_price = $price;
+ }
break;
case 2:
if ( $is_percentage ) {
$percent = $price / 100;
$new_price = $old_price + ( $old_price * $percent );
- } else {
+ } elseif ( ! empty( $price ) ) {
$new_price = $old_price + $price;
}
break;
@@ -887,7 +924,7 @@ class WC_Admin_Post_Types {
if ( $is_percentage ) {
$percent = $price / 100;
$new_price = max( 0, $old_price - ( $old_price * $percent ) );
- } else {
+ } elseif ( ! empty( $price ) ) {
$new_price = max( 0, $old_price - $price );
}
break;
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-profile.php b/plugins/woocommerce/includes/admin/class-wc-admin-profile.php
index cf1b0d042e3..90f2d52da82 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-profile.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-profile.php
@@ -176,7 +176,7 @@ if ( ! class_exists( 'WC_Admin_Profile', false ) ) :
-
+
ID, $key, true ) );
foreach ( $field['options'] as $option_key => $option_value ) :
diff --git a/plugins/woocommerce/includes/admin/class-wc-admin-settings.php b/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
index a5f0de69566..d2458143813 100644
--- a/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
+++ b/plugins/woocommerce/includes/admin/class-wc-admin-settings.php
@@ -53,7 +53,11 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
$settings[] = include __DIR__ . '/settings/class-wc-settings-products.php';
$settings[] = include __DIR__ . '/settings/class-wc-settings-tax.php';
$settings[] = include __DIR__ . '/settings/class-wc-settings-shipping.php';
- $settings[] = include __DIR__ . '/settings/class-wc-settings-payment-gateways.php';
+ if ( \Automattic\WooCommerce\Admin\Features\Features::is_enabled( 'reactify-classic-payments-settings' ) ) {
+ $settings[] = include __DIR__ . '/settings/class-wc-settings-payment-gateways-react.php';
+ } else {
+ $settings[] = include __DIR__ . '/settings/class-wc-settings-payment-gateways.php';
+ }
$settings[] = include __DIR__ . '/settings/class-wc-settings-accounts.php';
$settings[] = include __DIR__ . '/settings/class-wc-settings-emails.php';
$settings[] = include __DIR__ . '/settings/class-wc-settings-integrations.php';
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-helper-admin.php b/plugins/woocommerce/includes/admin/helper/class-wc-helper-admin.php
index 8db27dbbc78..96cc160502c 100644
--- a/plugins/woocommerce/includes/admin/helper/class-wc-helper-admin.php
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-helper-admin.php
@@ -27,7 +27,19 @@ class WC_Helper_Admin {
* @return void
*/
public static function load() {
- add_filter( 'woocommerce_admin_shared_settings', array( __CLASS__, 'add_marketplace_settings' ) );
+ global $pagenow;
+
+ if ( is_admin() ) {
+ $is_in_app_marketplace = ( 'admin.php' === $pagenow
+ && isset( $_GET['page'] ) && 'wc-admin' === $_GET['page'] //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ && isset( $_GET['path'] ) && '/extensions' === $_GET['path'] //phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ );
+
+ if ( $is_in_app_marketplace ) {
+ add_filter( 'woocommerce_admin_shared_settings', array( __CLASS__, 'add_marketplace_settings' ) );
+ }
+ }
+
add_filter( 'rest_api_init', array( __CLASS__, 'register_rest_routes' ) );
}
@@ -101,6 +113,14 @@ class WC_Helper_Admin {
$connect_url_args['wc-helper-nonce'] = wp_create_nonce( 'connect' );
}
+ if ( ! empty( $_GET['utm_source'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $connect_url_args['utm_source'] = wc_clean( wp_unslash( $_GET['utm_source'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ }
+
+ if ( ! empty( $_GET['utm_campaign'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $connect_url_args['utm_campaign'] = wc_clean( wp_unslash( $_GET['utm_campaign'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ }
+
return add_query_arg(
$connect_url_args,
admin_url( 'admin.php' )
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-helper-subscriptions-api.php b/plugins/woocommerce/includes/admin/helper/class-wc-helper-subscriptions-api.php
index 09b1b4d1ae2..6346f8e0a4f 100644
--- a/plugins/woocommerce/includes/admin/helper/class-wc-helper-subscriptions-api.php
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-helper-subscriptions-api.php
@@ -139,6 +139,8 @@ class WC_Helper_Subscriptions_API {
*/
public static function refresh() {
WC_Helper::refresh_helper_subscriptions();
+ WC_Helper::get_subscriptions();
+ WC_Helper::get_product_usage_notice_rules();
self::get_subscriptions();
}
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php b/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
index 9c590497005..02eeb89e0aa 100644
--- a/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php
@@ -6,6 +6,8 @@
* @package WooCommerce\Admin\Helper
*/
+use Automattic\WooCommerce\Admin\PluginsHelper;
+
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
@@ -186,9 +188,11 @@ class WC_Helper_Updater {
public static function add_connect_woocom_plugin_message() {
$connect_page_url = add_query_arg(
array(
- 'page' => 'wc-admin',
- 'tab' => 'my-subscriptions',
- 'path' => rawurlencode( '/extensions' ),
+ 'page' => 'wc-admin',
+ 'tab' => 'my-subscriptions',
+ 'path' => rawurlencode( '/extensions' ),
+ 'utm_source' => 'pu',
+ 'utm_campaign' => 'pu_plugin_screen_connect',
),
admin_url( 'admin.php' )
);
@@ -252,41 +256,73 @@ class WC_Helper_Updater {
* @return void.
*/
public static function display_notice_for_expired_and_expiring_subscriptions( $plugin_data, $response ) {
-
// Extract product ID from the response.
$product_id = preg_replace( '/[^0-9]/', '', $response->id );
- // Get the subscription details based on product ID.
- $subscription = current(
- wp_list_filter(
- WC_Helper::get_subscriptions(),
- array( 'product_id' => $product_id )
- )
+ $installed_or_unconnected = array_merge(
+ WC_Helper::get_installed_subscriptions(),
+ WC_Helper::get_unconnected_subscriptions()
);
- // Check if subscription is empty.
- if ( empty( $subscription ) ) {
+ // Product subscriptions.
+ $subscriptions = wp_list_filter( $installed_or_unconnected, array( 'product_id' => $product_id ) );
+ if ( empty( $subscriptions ) ) {
return;
}
+ $expired_subscription = current(
+ array_filter(
+ $subscriptions,
+ function ( $subscription ) {
+ return ! empty( $subscription['expired'] ) && ! $subscription['lifetime'];
+ }
+ )
+ );
+
+ $expiring_subscription = current(
+ array_filter(
+ $subscriptions,
+ function ( $subscription ) {
+ return ! empty( $subscription['expiring'] ) && ! $subscription['autorenew'];
+ }
+ )
+ );
+
// Prepare the expiry notice based on subscription status.
$expiry_notice = '';
- if ( ! empty( $subscription['expired'] ) && ! $subscription['lifetime'] ) {
+ if ( ! empty( $expired_subscription ) ) {
+
+ $renew_link = add_query_arg(
+ array(
+ 'utm_source' => 'pu',
+ 'utm_campaign' => 'pu_plugin_screen_renew',
+ ),
+ PluginsHelper::WOO_SUBSCRIPTION_PAGE_URL
+ );
+
/* translators: 1: Product regular price */
- $product_price = ! empty( $subscription['product_regular_price'] ) ? sprintf( __( 'for %s ', 'woocommerce' ), esc_html( $subscription['product_regular_price'] ) ) : '';
+ $product_price = ! empty( $expired_subscription['product_regular_price'] ) ? sprintf( __( 'for %s ', 'woocommerce' ), esc_html( $expired_subscription['product_regular_price'] ) ) : '';
$expiry_notice = sprintf(
/* translators: 1: URL to My Subscriptions page 2: Product price */
__( ' Your subscription expired, renew %2$s to update.', 'woocommerce' ),
- esc_url( 'https://woocommerce.com/my-account/my-subscriptions/' ),
+ esc_url( $renew_link ),
$product_price
);
- } elseif ( ! empty( $subscription['expiring'] ) && ! $subscription['autorenew'] ) {
+ } elseif ( ! empty( $expiring_subscription ) ) {
+ $renew_link = add_query_arg(
+ array(
+ 'utm_source' => 'pu',
+ 'utm_campaign' => 'pu_plugin_screen_enable_autorenew',
+ ),
+ PluginsHelper::WOO_SUBSCRIPTION_PAGE_URL
+ );
+
$expiry_notice = sprintf(
/* translators: 1: Expiry date 1: URL to My Subscriptions page */
__( ' Your subscription expires on %1$s, enable auto-renew to continue receiving updates.', 'woocommerce' ),
- date_i18n( 'F jS', $subscription['expires'] ),
- esc_url( 'https://woocommerce.com/my-account/my-subscriptions/' )
+ date_i18n( 'F jS', $expiring_subscription['expires'] ),
+ esc_url( $renew_link )
);
}
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-helper.php b/plugins/woocommerce/includes/admin/helper/class-wc-helper.php
index e35057b4c6b..586b47fc21f 100644
--- a/plugins/woocommerce/includes/admin/helper/class-wc-helper.php
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-helper.php
@@ -63,6 +63,7 @@ class WC_Helper {
include_once __DIR__ . '/class-wc-helper-admin.php';
include_once __DIR__ . '/class-wc-helper-subscriptions-api.php';
include_once __DIR__ . '/class-wc-helper-orders-api.php';
+ include_once __DIR__ . '/class-wc-product-usage-notice.php';
}
/**
@@ -785,6 +786,14 @@ class WC_Helper {
$redirect_url_args['install'] = sanitize_text_field( wp_unslash( $_GET['install'] ) );
}
+ if ( isset( $_GET['utm_source'] ) ) {
+ $redirect_url_args['utm_source'] = wc_clean( wp_unslash( $_GET['utm_source'] ) );
+ }
+
+ if ( isset( $_GET['utm_campaign'] ) ) {
+ $redirect_url_args['utm_campaign'] = wc_clean( wp_unslash( $_GET['utm_campaign'] ) );
+ }
+
$redirect_uri = add_query_arg(
$redirect_url_args,
admin_url( 'admin.php' )
@@ -998,6 +1007,7 @@ class WC_Helper {
self::_flush_authentication_cache();
self::_flush_subscriptions_cache();
self::_flush_updates_cache();
+ self::flush_product_usage_notice_rules_cache();
}
/**
@@ -1296,6 +1306,88 @@ class WC_Helper {
return ! empty( $subscription );
}
+ /**
+ * Get the user's connected subscriptions that are installed on the current
+ * site.
+ *
+ * @return array
+ */
+ public static function get_installed_subscriptions() {
+ static $installed_subscriptions = null;
+
+ // Cache installed_subscriptions in the current request.
+ if ( is_null( $installed_subscriptions ) ) {
+ $auth = WC_Helper_Options::get( 'auth' );
+ $site_id = isset( $auth['site_id'] ) ? absint( $auth['site_id'] ) : 0;
+ if ( 0 === $site_id ) {
+ $installed_subscriptions = array();
+ return $installed_subscriptions;
+ }
+
+ $installed_subscriptions = array_filter(
+ self::get_subscriptions(),
+ function ( $subscription ) use ( $site_id ) {
+ return in_array( $site_id, $subscription['connections'], true );
+ }
+ );
+ }
+
+ return $installed_subscriptions;
+ }
+
+ /**
+ * Get the user's unconnected subscriptions.
+ *
+ * @return array
+ */
+ public static function get_unconnected_subscriptions() {
+ static $unconnected_subscriptions = null;
+
+ // Cache unconnected_subscriptions in the current request.
+ if ( is_null( $unconnected_subscriptions ) ) {
+ $auth = WC_Helper_Options::get( 'auth' );
+ $site_id = isset( $auth['site_id'] ) ? absint( $auth['site_id'] ) : 0;
+ if ( 0 === $site_id ) {
+ $unconnected_subscriptions = array();
+ return $unconnected_subscriptions;
+ }
+
+ $unconnected_subscriptions = array_filter(
+ self::get_subscriptions(),
+ function ( $subscription ) use ( $site_id ) {
+ return empty( $subscription['connections'] );
+ }
+ );
+ }
+
+ return $unconnected_subscriptions;
+ }
+
+ /**
+ * Get subscription state of a given product ID.
+ *
+ * @since TBD
+ *
+ * @param int $product_id The product id.
+ *
+ * @return array Array of state_name => (bool) state
+ */
+ public static function get_product_subscription_state( $product_id ) {
+ $product_subscriptions = wp_list_filter( self::get_installed_subscriptions(), array( 'product_id' => $product_id ) );
+
+ $subscription = ! empty( $product_subscriptions )
+ ? array_shift( $product_subscriptions )
+ : array();
+
+ return array(
+ 'unregistered' => empty( $subscription ),
+ 'expired' => ( isset( $subscription['expired'] ) && $subscription['expired'] ),
+ 'expiring' => ( isset( $subscription['expiring'] ) && $subscription['expiring'] ),
+ 'key' => $subscription['product_key'] ?? '',
+ 'order_id' => $subscription['order_id'] ?? '',
+ );
+ }
+
/**
* Get a subscription entry from product_id. If multiple subscriptions are
* found with the same product id and $single is set to true, will return the
@@ -1482,6 +1574,42 @@ class WC_Helper {
return $woo_themes;
}
+ /**
+ * Get rules for displaying notice regarding marketplace product usage.
+ *
+ * @return array
+ */
+ public static function get_product_usage_notice_rules() {
+ $cache_key = '_woocommerce_helper_product_usage_notice_rules';
+ $data = get_transient( $cache_key );
+ if ( false !== $data ) {
+ return $data;
+ }
+
+ $request = WC_Helper_API::get(
+ 'product-usage-notice-rules',
+ array(
+ 'authenticated' => false,
+ 'timeout' => 2,
+ )
+ );
+
+ // Retry in 15 minutes for non-200 response.
+ if ( wp_remote_retrieve_response_code( $request ) !== 200 ) {
+ set_transient( $cache_key, array(), 15 * MINUTE_IN_SECONDS );
+ return array();
+ }
+
+ $data = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( empty( $data ) || ! is_array( $data ) ) {
+ $data = array();
+ }
+
+ set_transient( $cache_key, $data, 1 * HOUR_IN_SECONDS );
+ return $data;
+ }
+
+
/**
* Get the connected user's subscriptions.
*
@@ -1737,8 +1865,22 @@ class WC_Helper {
return false;
}
- // If there are multiple subscriptions, but no active subscriptions, then mark the first one as installed.
- $product_subscription = array_shift( $product_subscriptions );
+ // Find subscriptions that can be activated.
+ $product_subscriptions_without_maxed_connections = wp_list_filter(
+ $product_subscriptions,
+ array(
+ 'maxed' => false,
+ )
+ );
+
+ if ( 0 < count( $product_subscriptions_without_maxed_connections ) ) {
+ // Pick the first subscription available for activation.
+ $product_subscription = array_shift( $product_subscriptions_without_maxed_connections );
+ } else {
+ // If there are multiple subscriptions, but no active subscriptions, then mark the first one as installed.
+ $product_subscription = array_shift( $product_subscriptions );
+ }
+
if ( $product_subscription['product_key'] === $subscription['product_key'] ) {
return true;
}
@@ -2074,6 +2216,13 @@ class WC_Helper {
delete_transient( '_woocommerce_helper_subscriptions' );
}
+ /**
+ * Flush product-usage-notice-rules cache.
+ */
+ public static function flush_product_usage_notice_rules_cache() {
+ delete_transient( '_woocommerce_helper_product_usage_notice_rules' );
+ }
+
/**
* Flush auth cache.
*/
@@ -2173,6 +2322,7 @@ class WC_Helper {
self::_flush_subscriptions_cache();
self::_flush_updates_cache();
+ self::flush_product_usage_notice_rules_cache();
}
/**
@@ -2262,6 +2412,7 @@ class WC_Helper {
self::_flush_subscriptions_cache();
self::_flush_updates_cache();
+ self::flush_product_usage_notice_rules_cache();
}
/**
diff --git a/plugins/woocommerce/includes/admin/helper/class-wc-product-usage-notice.php b/plugins/woocommerce/includes/admin/helper/class-wc-product-usage-notice.php
new file mode 100644
index 00000000000..ba24b42c7fd
--- /dev/null
+++ b/plugins/woocommerce/includes/admin/helper/class-wc-product-usage-notice.php
@@ -0,0 +1,384 @@
+= $max_dismissals;
+ }
+
+ /**
+ * Check whether the user dismissed any product usage notices recently.
+ *
+ * @param int $user_id User ID.
+ *
+ * @return bool
+ */
+ private static function is_any_notices_dismissed_recently( int $user_id ): bool {
+ $global_last_dismissed_ts = absint(
+ get_user_meta(
+ $user_id,
+ self::LAST_DISMISSED_TIMESTAMP_META,
+ true
+ )
+ );
+ if ( 0 === $global_last_dismissed_ts ) {
+ return false;
+ }
+
+ $seconds_since_dismissed = time() - $global_last_dismissed_ts;
+
+ $wait_after_any_dismisses = self::$product_usage_notice_rules['wait_in_seconds_after_any_dismisses'];
+
+ return $seconds_since_dismissed < $wait_after_any_dismisses;
+ }
+
+ /**
+ * Check whether the user dismissed given product usage notice recently.
+ *
+ * @param int $user_id User ID.
+ * @param int $product_id Product ID.
+ *
+ * @return bool
+ */
+ private static function is_product_notice_dismissed_recently( int $user_id, int $product_id ): bool {
+ $last_dismissed_ts = absint(
+ get_user_meta(
+ $user_id,
+ self::DISMISSED_TIMESTAMP_META_PREFIX . $product_id,
+ true
+ )
+ );
+ if ( 0 === $last_dismissed_ts ) {
+ return false;
+ }
+
+ $seconds_since_dismissed = time() - $last_dismissed_ts;
+
+ $wait_after_dismiss = self::$current_notice_rule['wait_in_seconds_after_dismiss'];
+
+ return $seconds_since_dismissed < $wait_after_dismiss;
+ }
+
+ /**
+ * Check whether current notice is throttled for the user and product.
+ *
+ * @param int $user_id User ID.
+ * @param int $product_id Product ID.
+ *
+ * @return bool
+ */
+ private static function is_notice_throttled( int $user_id, int $product_id ): bool {
+ return self::is_remind_later_clicked_recently( $user_id, $product_id ) ||
+ self::has_reached_max_dismissals( $user_id, $product_id ) ||
+ self::is_any_notices_dismissed_recently( $user_id ) ||
+ self::is_product_notice_dismissed_recently( $user_id, $product_id );
+ }
+
+ /**
+ * Enqueue scripts needed to display product usage notice (or modal).
+ */
+ public static function enqueue_product_usage_notice_scripts() {
+ WCAdminAssets::register_style( 'woo-product-usage-notice', 'style', array( 'wp-components' ) );
+ WCAdminAssets::register_script( 'wp-admin-scripts', 'woo-product-usage-notice', true );
+
+ $subscribe_url = add_query_arg(
+ array(
+ 'add-to-cart' => self::$current_notice_rule['id'],
+ 'utm_source' => 'pu',
+ 'utm_medium' => 'product',
+ 'utm_campaign' => 'pu_modal_subscribe',
+ ),
+ 'https://woocommerce.com/cart/'
+ );
+
+ $renew_url = add_query_arg(
+ array(
+ 'renew_product' => self::$current_notice_rule['id'],
+ 'product_key' => self::$current_notice_rule['state']['key'],
+ 'order_id' => self::$current_notice_rule['state']['order_id'],
+ 'utm_source' => 'pu',
+ 'utm_medium' => 'product',
+ 'utm_campaign' => 'pu_modal_renew',
+ ),
+ 'https://woocommerce.com/cart/'
+ );
+
+ wp_localize_script(
+ 'wc-admin-woo-product-usage-notice',
+ 'wooProductUsageNotice',
+ array(
+ 'subscribeUrl' => $subscribe_url,
+ 'renewUrl' => $renew_url,
+ 'dismissAction' => 'woocommerce_dismiss_product_usage_notice',
+ 'remindLaterAction' => 'woocommerce_remind_later_product_usage_notice',
+ 'productId' => self::$current_notice_rule['id'],
+ 'productName' => self::$current_notice_rule['name'],
+ 'productRegularPrice' => self::$current_notice_rule['regular_price'],
+ 'dismissNonce' => wp_create_nonce( 'dismiss_product_usage_notice' ),
+ 'remindLaterNonce' => wp_create_nonce( 'remind_later_product_usage_notice' ),
+ 'showAs' => self::$current_notice_rule['show_as'],
+ 'colorScheme' => self::$current_notice_rule['color_scheme'],
+ 'subscriptionState' => self::$current_notice_rule['state'],
+ 'screenId' => get_current_screen()->id,
+ )
+ );
+ }
+
+ /**
+ * Get product usage notice rule from a given WP_Screen object.
+ *
+ * @param \WP_Screen $screen Current \WP_Screen object.
+ *
+ * @return array
+ */
+ private static function get_current_notice_rule( $screen ) {
+ foreach ( self::$product_usage_notice_rules['products'] as $product_id => $rule ) {
+ if ( ! isset( $rule['screens'][ $screen->id ] ) ) {
+ continue;
+ }
+
+ // Check query strings.
+ if ( ! self::query_string_matches( $screen, $rule ) ) {
+ continue;
+ }
+
+ $product_id = absint( $product_id );
+ $state = WC_Helper::get_product_subscription_state( $product_id );
+ if ( $state['expired'] || $state['unregistered'] ) {
+ $rule['id'] = $product_id;
+ $rule['state'] = $state;
+ return $rule;
+ }
+ }
+
+ return array();
+ }
+
+ /**
+ * Check whether the screen and GET parameter matches a given rule.
+ *
+ * @param \WP_Screen $screen Current \WP_Screen object.
+ * @param array $rule Product usage notice rule.
+ *
+ * @return bool
+ */
+ private static function query_string_matches( $screen, $rule ) {
+ if ( empty( $rule['screens'][ $screen->id ]['qs'] ) ) {
+ return true;
+ }
+
+ $qs = $rule['screens'][ $screen->id ]['qs'];
+ foreach ( $qs as $key => $val ) {
+ // phpcs:disable WordPress.Security.NonceVerification.Recommended
+ if ( empty( $_GET[ $key ] ) || $_GET[ $key ] !== $val ) {
+ return false;
+ }
+ // phpcs:enable WordPress.Security.NonceVerification.Recommended
+ }
+ return true;
+ }
+
+ /**
+ * AJAX handler for dismiss action of product usage notice.
+ */
+ public static function ajax_dismiss() {
+ if ( ! check_ajax_referer( 'dismiss_product_usage_notice' ) ) {
+ wp_die( -1 );
+ }
+
+ $user_id = get_current_user_id();
+ if ( ! $user_id ) {
+ wp_die( -1 );
+ }
+
+ $product_id = absint( $_GET['product_id'] ?? 0 );
+ if ( ! $product_id ) {
+ wp_die( -1 );
+ }
+
+ $dismiss_count = absint( get_user_meta( $user_id, self::DISMISSED_COUNT_META_PREFIX . $product_id, true ) );
+ update_user_meta( $user_id, self::DISMISSED_COUNT_META_PREFIX . $product_id, $dismiss_count + 1 );
+
+ update_user_meta( $user_id, self::DISMISSED_TIMESTAMP_META_PREFIX . $product_id, time() );
+ update_user_meta( $user_id, self::LAST_DISMISSED_TIMESTAMP_META, time() );
+
+ wp_die( 1 );
+ }
+
+ /**
+ * AJAX handler for "remind later" action of product usage notice.
+ */
+ public static function ajax_remind_later() {
+ if ( ! check_ajax_referer( 'remind_later_product_usage_notice' ) ) {
+ wp_die( -1 );
+ }
+
+ $user_id = get_current_user_id();
+ if ( ! $user_id ) {
+ wp_die( -1 );
+ }
+
+ $product_id = absint( $_GET['product_id'] ?? 0 );
+ if ( ! $product_id ) {
+ wp_die( -1 );
+ }
+
+ update_user_meta( $user_id, self::REMIND_LATER_TIMESTAMP_META_PREFIX . $product_id, time() );
+
+ wp_die( 1 );
+ }
+}
+
+WC_Product_Usage_Notice::load();
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-fee.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-fee.php
index 701a3b8c309..79c0236b2f5 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-fee.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-fee.php
@@ -78,7 +78,7 @@ if ( ! defined( 'ABSPATH' ) ) {
is_editable() ) : ?>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php
index 13c301748e7..8e1e463c07f 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-item.php
@@ -181,7 +181,7 @@ $row_class = apply_filters( 'woocommerce_admin_html_order_item_class', ! empt
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-shipping.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-shipping.php
index ade41c05ef8..a69e06c47c1 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-shipping.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-order-shipping.php
@@ -109,7 +109,7 @@ if ( ! defined( 'ABSPATH' ) ) {
is_editable() ) : ?>
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-inventory.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-inventory.php
index f60d6d2bbae..2900c929e88 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-inventory.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-inventory.php
@@ -32,7 +32,8 @@ if ( ! defined( 'ABSPATH' ) ) {
array(
'id' => '_global_unique_id',
'value' => $product_object->get_global_unique_id( 'edit' ),
- 'label' => __( 'GTIN, UPC, EAN or ISBN', 'woocommerce' ),
+ // translators: %1$s GTIN %2$s UPC %3$s EAN %4$s ISBN.
+ 'label' => sprintf( __( '%1$s, %2$s, %3$s, or %4$s', 'woocommerce' ), '' . esc_html__( 'GTIN', 'woocommerce' ) . ' ', '' . esc_html__( 'UPC', 'woocommerce' ) . ' ', '' . esc_html__( 'EAN', 'woocommerce' ) . ' ', '' . esc_html__( 'ISBN', 'woocommerce' ) . ' ' ),
'desc_tip' => true,
'description' => __( 'Enter a barcode or any other identifier unique to this product. It can help you list this product on other channels or marketplaces.', 'woocommerce' ),
)
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-panel.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-panel.php
index e04789e2b57..08009706e29 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-panel.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-product-data-panel.php
@@ -32,9 +32,9 @@ if ( ! defined( 'ABSPATH' ) ) {
$selected_value = 'yes' === ( isset( $option['default'] ) ? $option['default'] : 'no' );
}
?>
-
- :
+
diff --git a/plugins/woocommerce/includes/admin/meta-boxes/views/html-variation-admin.php b/plugins/woocommerce/includes/admin/meta-boxes/views/html-variation-admin.php
index 9dda44b7110..9a205f574e3 100644
--- a/plugins/woocommerce/includes/admin/meta-boxes/views/html-variation-admin.php
+++ b/plugins/woocommerce/includes/admin/meta-boxes/views/html-variation-admin.php
@@ -98,7 +98,8 @@ defined( 'ABSPATH' ) || exit;
'name' => "variable_global_unique_id[{$loop}]",
'value' => $variation_object->get_global_unique_id( 'edit' ),
'placeholder' => $variation_object->get_global_unique_id(),
- 'label' => __( 'GTIN, UPC, EAN or ISBN', 'woocommerce' ),
+ // translators: %1$s GTIN %2$s UPC %3$s EAN %4$s ISBN.
+ 'label' => sprintf( __( '%1$s, %2$s, %3$s, or %4$s', 'woocommerce' ), '' . esc_html__( 'GTIN', 'woocommerce' ) . ' ', '' . esc_html__( 'UPC', 'woocommerce' ) . ' ', '' . esc_html__( 'EAN', 'woocommerce' ) . ' ', '' . esc_html__( 'ISBN', 'woocommerce' ) . ' ' ),
'desc_tip' => true,
'description' => __( 'Enter a barcode or any other identifier unique to this product. It can help you list this product on other channels or marketplaces.', 'woocommerce' ),
'wrapper_class' => 'form-row',
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php
index b8c18059943..49cd3ade06e 100644
--- a/plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-accounts.php
@@ -11,6 +11,8 @@ if ( class_exists( 'WC_Settings_Accounts', false ) ) {
return new WC_Settings_Accounts();
}
+use Automattic\WooCommerce\Blocks\Utils\CartCheckoutUtils;
+
/**
* WC_Settings_Accounts.
*/
@@ -237,6 +239,25 @@ class WC_Settings_Accounts extends WC_Settings_Page {
),
);
+ // Change settings when using the block based checkout.
+ if ( CartCheckoutUtils::is_checkout_block_default() ) {
+ $account_settings = array_filter(
+ $account_settings,
+ function ( $setting ) {
+ return 'woocommerce_registration_generate_username' !== $setting['id'];
+ },
+ );
+ $account_settings = array_map(
+ function ( $setting ) {
+ if ( 'woocommerce_registration_generate_password' === $setting['id'] ) {
+ unset( $setting['checkboxgroup'] );
+ }
+ return $setting;
+ },
+ $account_settings
+ );
+ }
+
/**
* Filter account settings.
*
@@ -270,12 +291,15 @@ class WC_Settings_Accounts extends WC_Settings_Page {
function updateInputs() {
const isChecked = checkboxes.some(cb => cb && cb.checked);
inputs.forEach(input => {
+ if ( ! input ) {
+ return;
+ }
input.disabled = !isChecked;
input.closest('td').classList.toggle("disabled", !isChecked);
});
}
- checkboxes.forEach(cb => cb.addEventListener('change', updateInputs));
+ checkboxes.forEach(cb => cb && cb.addEventListener('change', updateInputs));
updateInputs(); // Initial state
});
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-advanced.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-advanced.php
index f7c9f0631ea..accadab37c5 100644
--- a/plugins/woocommerce/includes/admin/settings/class-wc-settings-advanced.php
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-advanced.php
@@ -38,13 +38,19 @@ class WC_Settings_Advanced extends WC_Settings_Page {
* @return array
*/
protected function get_own_sections() {
- return array(
+ $sections = array(
'' => __( 'Page setup', 'woocommerce' ),
'keys' => __( 'REST API', 'woocommerce' ),
'webhooks' => __( 'Webhooks', 'woocommerce' ),
'legacy_api' => __( 'Legacy API', 'woocommerce' ),
'woocommerce_com' => __( 'WooCommerce.com', 'woocommerce' ),
);
+
+ if ( Features::is_enabled( 'blueprint' ) ) {
+ $sections['blueprint'] = __( 'Blueprint', 'woocommerce' );
+ }
+
+ return $sections;
}
/**
@@ -426,6 +432,27 @@ class WC_Settings_Advanced extends WC_Settings_Page {
return apply_filters( 'woocommerce_settings_rest_api', $settings );
}
+ /**
+ * Get settings for the Blueprint section.
+ *
+ * @return array
+ */
+ protected function get_settings_for_blueprint_section() {
+ $settings =
+ array(
+ array(
+ 'title' => esc_html__( 'Blueprint', 'woocommerce' ),
+ 'type' => 'title',
+ ),
+ array(
+ 'id' => 'wc_settings_blueprint_slotfill',
+ 'type' => 'slotfill_placeholder',
+ ),
+ );
+
+ return $settings;
+ }
+
/**
* Form method.
*
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-emails.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-emails.php
index 623e2ceaf88..6100551cd1a 100644
--- a/plugins/woocommerce/includes/admin/settings/class-wc-settings-emails.php
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-emails.php
@@ -130,19 +130,6 @@ class WC_Settings_Emails extends WC_Settings_Page {
'desc_tip' => true,
),
- array(
- 'title' => __( 'Footer text', 'woocommerce' ),
- /* translators: %s: Available placeholders for use */
- 'desc' => __( 'The text to appear in the footer of all WooCommerce emails.', 'woocommerce' ) . ' ' . sprintf( __( 'Available placeholders: %s', 'woocommerce' ), '{site_title} {site_url}' ),
- 'id' => 'woocommerce_email_footer_text',
- 'css' => 'width:400px; height: 75px;',
- 'placeholder' => __( 'N/A', 'woocommerce' ),
- 'type' => 'textarea',
- 'default' => '{site_title} — Built with {WooCommerce}',
- 'autoload' => false,
- 'desc_tip' => true,
- ),
-
array(
'title' => __( 'Base color', 'woocommerce' ),
/* translators: %s: default color */
@@ -191,6 +178,31 @@ class WC_Settings_Emails extends WC_Settings_Page {
'desc_tip' => true,
),
+ array(
+ 'title' => __( 'Footer text', 'woocommerce' ),
+ /* translators: %s: Available placeholders for use */
+ 'desc' => __( 'The text to appear in the footer of all WooCommerce emails.', 'woocommerce' ) . ' ' . sprintf( __( 'Available placeholders: %s', 'woocommerce' ), '{site_title} {site_url}' ),
+ 'id' => 'woocommerce_email_footer_text',
+ 'css' => 'width:400px; height: 75px;',
+ 'placeholder' => __( 'N/A', 'woocommerce' ),
+ 'type' => 'textarea',
+ 'default' => '{site_title} — Built with {WooCommerce}',
+ 'autoload' => false,
+ 'desc_tip' => true,
+ ),
+
+ array(
+ 'title' => __( 'Footer text color', 'woocommerce' ),
+ /* translators: %s: footer default color */
+ 'desc' => sprintf( __( 'The footer text color. Default %s.', 'woocommerce' ), '#3c3c3c' ),
+ 'id' => 'woocommerce_email_footer_text_color',
+ 'type' => 'color',
+ 'css' => 'width:6em;',
+ 'default' => '#3c3c3c',
+ 'autoload' => false,
+ 'desc_tip' => true,
+ ),
+
array(
'type' => 'sectionend',
'id' => 'email_template_options',
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-payment-gateways-react.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-payment-gateways-react.php
new file mode 100644
index 00000000000..88ee03acd20
--- /dev/null
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-payment-gateways-react.php
@@ -0,0 +1,187 @@
+id = 'checkout';
+ $this->label = _x( 'Payments', 'Settings tab label', 'woocommerce' );
+ parent::__construct();
+ }
+
+ /**
+ * Output the settings.
+ */
+ public function output() {
+ //phpcs:disable WordPress.Security.NonceVerification.Recommended
+ global $current_section;
+
+ // We don't want to output anything from the action for now. So we buffer it and discard it.
+ ob_start();
+ /**
+ * Fires before the payment gateways settings fields are rendered.
+ *
+ * @since 1.5.7
+ */
+ do_action( 'woocommerce_admin_field_payment_gateways' );
+ ob_end_clean();
+
+ // Load gateways so we can show any global options they may have.
+ $payment_gateways = WC()->payment_gateways->payment_gateways();
+
+ if ( $this->should_render_react_section( $current_section ) ) {
+ $this->render_react_section( $current_section );
+ } elseif ( $current_section ) {
+ $this->render_classic_gateway_settings_page( $payment_gateways, $current_section );
+ } else {
+ $this->render_react_section( 'main' );
+ }
+
+ parent::output();
+ //phpcs:enable
+ }
+
+ /**
+ * Check if the given section should be rendered using React.
+ *
+ * @param string $section The section to check.
+ * @return bool Whether the section should be rendered using React.
+ */
+ private function should_render_react_section( $section ) {
+ return in_array( $section, $this->get_reactify_render_sections(), true );
+ }
+
+ /**
+ * Render the React section.
+ *
+ * @param string $section The section to render.
+ */
+ private function render_react_section( $section ) {
+ global $hide_save_button;
+ $hide_save_button = true;
+ echo '
';
+
+ // Output the gateways data to the page so the React app can use it.
+ $controller = new WC_REST_Payment_Gateways_Controller();
+ $response = $controller->get_items( new WP_REST_Request( 'GET', '/wc/v3/payment_gateways' ) );
+ echo '';
+ }
+
+ /**
+ * Render the classic gateway settings page.
+ *
+ * @param array $payment_gateways The payment gateways.
+ * @param string $current_section The current section.
+ */
+ private function render_classic_gateway_settings_page( $payment_gateways, $current_section ) {
+ foreach ( $payment_gateways as $gateway ) {
+ if ( in_array( $current_section, array( $gateway->id, sanitize_title( get_class( $gateway ) ) ), true ) ) {
+ if ( isset( $_GET['toggle_enabled'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $enabled = $gateway->get_option( 'enabled' );
+
+ if ( $enabled ) {
+ $gateway->settings['enabled'] = wc_string_to_bool( $enabled ) ? 'no' : 'yes';
+ }
+ }
+ $this->run_gateway_admin_options( $gateway );
+ break;
+ }
+ }
+ }
+
+ /**
+ * Run the 'admin_options' method on a given gateway.
+ * This method exists to easy unit testing.
+ *
+ * @param object $gateway The gateway object to run the method on.
+ */
+ protected function run_gateway_admin_options( $gateway ) {
+ $gateway->admin_options();
+ }
+
+ /**
+ * Don't show any section links.
+ *
+ * @return array
+ */
+ public function get_sections() {
+ return array();
+ }
+
+ /**
+ * Save settings.
+ */
+ public function save() {
+ global $current_section;
+
+ $wc_payment_gateways = WC_Payment_Gateways::instance();
+
+ $this->save_settings_for_current_section();
+
+ if ( ! $current_section ) {
+ // If section is empty, we're on the main settings page. This makes sure 'gateway ordering' is saved.
+ $wc_payment_gateways->process_admin_options();
+ $wc_payment_gateways->init();
+ } else {
+ // There is a section - this may be a gateway or custom section.
+ foreach ( $wc_payment_gateways->payment_gateways() as $gateway ) {
+ if ( in_array( $current_section, array( $gateway->id, sanitize_title( get_class( $gateway ) ) ), true ) ) {
+ /**
+ * Fires update actions for payment gateways.
+ *
+ * @since 3.4.0
+ *
+ * @param int $gateway->id Gateway ID.
+ */
+ do_action( 'woocommerce_update_options_payment_gateways_' . $gateway->id );
+ $wc_payment_gateways->init();
+ }
+ }
+
+ $this->do_update_options_action();
+ }
+ }
+}
+
+return new WC_Settings_Payment_Gateways_React();
diff --git a/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php b/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
index 813f108ee02..e37d37d90eb 100644
--- a/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
+++ b/plugins/woocommerce/includes/admin/settings/class-wc-settings-products.php
@@ -446,6 +446,20 @@ class WC_Settings_Products extends WC_Settings_Page {
),
),
+ array(
+ 'title' => __( 'Count partial downloads', 'woocommerce' ),
+ 'desc' => __( 'Count downloads even if only part of a file is fetched.', 'woocommerce' ),
+ 'id' => 'woocommerce_downloads_count_partial',
+ 'type' => 'checkbox',
+ 'default' => 'yes',
+ 'desc_tip' => sprintf(
+ /* Translators: 1: opening link tag 2: closing link tag. */
+ __( 'Repeat fetches made within a reasonable window of time (by default, 30 minutes) will not be counted twice. This is a generally reasonably way to enforce download limits in relation to ranged requests. %1$sLearn more.%2$s', 'woocommerce' ),
+ '',
+ ' '
+ ),
+ ),
+
array(
'type' => 'sectionend',
'id' => 'digital_download_options',
diff --git a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
index 980a9806f44..49329da8921 100644
--- a/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
+++ b/plugins/woocommerce/includes/admin/settings/views/html-admin-page-shipping-zones.php
@@ -8,7 +8,20 @@ if ( ! defined( 'ABSPATH' ) ) {
+
+ local pickup settings.",
+ 'woocommerce'
+ ),
+ esc_url( admin_url( 'admin.php?page=wc-settings&tab=shipping§ion=pickup_location' ) )
+ )
+ );
+ ?>
+
@@ -56,14 +69,13 @@ if ( ! defined( 'ABSPATH' ) ) {
-
-
+
+
-
+
@@ -95,9 +107,9 @@ if ( ! defined( 'ABSPATH' ) ) {
diff --git a/plugins/woocommerce/includes/admin/views/html-admin-page-status-report.php b/plugins/woocommerce/includes/admin/views/html-admin-page-status-report.php
index 1630d059b2c..76a0418a68f 100644
--- a/plugins/woocommerce/includes/admin/views/html-admin-page-status-report.php
+++ b/plugins/woocommerce/includes/admin/views/html-admin-page-status-report.php
@@ -1060,6 +1060,12 @@ if ( 0 < $mu_plugins_count ) :
+ |
+
+
+
+
diff --git a/plugins/woocommerce/includes/class-wc-auth.php b/plugins/woocommerce/includes/class-wc-auth.php
index 099282c7a62..9614234b53f 100644
--- a/plugins/woocommerce/includes/class-wc-auth.php
+++ b/plugins/woocommerce/includes/class-wc-auth.php
@@ -333,7 +333,7 @@ class WC_Auth {
*/
// Check if Jetpack is installed and activated.
- if ( class_exists( 'Jetpack' ) && Jetpack::connection()->is_active() ) {
+ if ( class_exists( 'Jetpack' ) && Jetpack::connection()->has_connected_owner() ) {
// Check if the user is using the WordPress.com SSO.
if ( Jetpack::is_module_active( 'sso' ) ) {
@@ -341,7 +341,7 @@ class WC_Auth {
$redirect_url = $this->build_url( $data, 'authorize' );
// Build the SSO URL.
- $login_url = Jetpack_SSO::get_instance()->build_sso_button_url(
+ $login_url = \Automattic\Jetpack\Connection\SSO::get_instance()->build_sso_button_url(
array(
'redirect_to' => rawurlencode( esc_url_raw( $redirect_url ) ),
'action' => 'login',
diff --git a/plugins/woocommerce/includes/class-wc-cache-helper.php b/plugins/woocommerce/includes/class-wc-cache-helper.php
index d717cf874e9..72c037b1092 100644
--- a/plugins/woocommerce/includes/class-wc-cache-helper.php
+++ b/plugins/woocommerce/includes/class-wc-cache-helper.php
@@ -129,7 +129,18 @@ class WC_Cache_Helper {
$location['state'] = $customer->get_billing_state();
$location['postcode'] = $customer->get_billing_postcode();
$location['city'] = $customer->get_billing_city();
- return apply_filters( 'woocommerce_geolocation_ajax_get_location_hash', substr( md5( implode( '', $location ) ), 0, 12 ), $location, $customer );
+ $location_hash = substr( md5( strtolower( implode( '', $location ) ) ), 0, 12 );
+
+ /**
+ * Controls the location hash used in geolocation-based caching.
+ *
+ * @since 3.6.0
+ *
+ * @param string $location_hash The hash used for geolocation.
+ * @param array $location The location/address data.
+ * @param WC_Customer $customer The current customer object.
+ */
+ return apply_filters( 'woocommerce_geolocation_ajax_get_location_hash', $location_hash, $location, $customer );
}
/**
diff --git a/plugins/woocommerce/includes/class-wc-cart.php b/plugins/woocommerce/includes/class-wc-cart.php
index 6b036136f8a..db8fefc926b 100644
--- a/plugins/woocommerce/includes/class-wc-cart.php
+++ b/plugins/woocommerce/includes/class-wc-cart.php
@@ -1170,7 +1170,7 @@ class WC_Cart extends WC_Legacy_Cart {
$message = apply_filters( 'woocommerce_cart_product_cannot_add_another_message', $message, $product_data );
$wp_button_class = wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '';
- throw new Exception( sprintf( '%s %s', wc_get_cart_url(), esc_attr( $wp_button_class ), __( 'View cart', 'woocommerce' ), $message ) );
+ throw new Exception( sprintf( '%s %s ', $message, wc_get_cart_url(), esc_attr( $wp_button_class ), __( 'View cart', 'woocommerce' ) ) );
}
}
@@ -1232,12 +1232,12 @@ class WC_Cart extends WC_Legacy_Cart {
$wp_button_class = wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '';
$message = sprintf(
- '%s %s',
+ '%s %s ',
+ /* translators: 1: quantity in stock 2: current quantity */
+ sprintf( __( 'You cannot add that amount to the cart — we have %1$s in stock and you already have %2$s in your cart.', 'woocommerce' ), wc_format_stock_quantity_for_display( $stock_quantity, $product_data ), wc_format_stock_quantity_for_display( $stock_quantity_in_cart, $product_data ) ),
wc_get_cart_url(),
esc_attr( $wp_button_class ),
- __( 'View cart', 'woocommerce' ),
- /* translators: 1: quantity in stock 2: current quantity */
- sprintf( __( 'You cannot add that amount to the cart — we have %1$s in stock and you already have %2$s in your cart.', 'woocommerce' ), wc_format_stock_quantity_for_display( $stock_quantity, $product_data ), wc_format_stock_quantity_for_display( $stock_quantity_in_cart, $product_data ) )
+ __( 'View cart', 'woocommerce' )
);
/**
diff --git a/plugins/woocommerce/includes/class-wc-checkout.php b/plugins/woocommerce/includes/class-wc-checkout.php
index 943746642e8..3c920e598a4 100644
--- a/plugins/woocommerce/includes/class-wc-checkout.php
+++ b/plugins/woocommerce/includes/class-wc-checkout.php
@@ -1357,7 +1357,7 @@ class WC_Checkout {
if ( is_callable( array( $customer_object, "get_$input" ) ) ) {
$value = $customer_object->{"get_$input"}();
- } elseif ( $customer_object->meta_exists( $input ) ) {
+ } elseif ( is_callable( array( $customer_object, 'meta_exists' ) ) && $customer_object->meta_exists( $input ) ) {
$value = $customer_object->get_meta( $input, true );
}
diff --git a/plugins/woocommerce/includes/class-wc-cli.php b/plugins/woocommerce/includes/class-wc-cli.php
index c30255ac558..0165be435e0 100644
--- a/plugins/woocommerce/includes/class-wc-cli.php
+++ b/plugins/woocommerce/includes/class-wc-cli.php
@@ -34,6 +34,7 @@ class WC_CLI {
require_once __DIR__ . '/cli/class-wc-cli-tracker-command.php';
require_once __DIR__ . '/cli/class-wc-cli-com-command.php';
require_once __DIR__ . '/cli/class-wc-cli-com-extension-command.php';
+ $this->maybe_include_blueprint_cli();
}
/**
@@ -50,6 +51,24 @@ class WC_CLI {
WP_CLI::add_hook( 'after_wp_load', array( $cli_runner, 'register_commands' ) );
$cli_runner = wc_get_container()->get( ProductAttributesLookupCLIRunner::class );
WP_CLI::add_hook( 'after_wp_load', fn() => \WP_CLI::add_command( 'wc palt', $cli_runner ) );
+
+ if ( class_exists( \Automattic\WooCommerce\Blueprint\Cli::class ) ) {
+ WP_CLI::add_hook( 'after_wp_load', 'Automattic\WooCommerce\Blueprint\Cli::register_commands' );
+ }
+ }
+
+ /**
+ * Include Blueprint CLI if it's available.
+ */
+ private function maybe_include_blueprint_cli() {
+ if ( ! function_exists( 'wc_admin_get_feature_config' ) ) {
+ require_once WC_ABSPATH . 'includes/react-admin/feature-config.php';
+ }
+
+ $features = wc_admin_get_feature_config();
+ if ( isset( $features['blueprint'] ) ) {
+ require_once dirname( WC_PLUGIN_FILE ) . '/vendor/woocommerce/blueprint/src/Cli.php';
+ }
}
}
diff --git a/plugins/woocommerce/includes/class-wc-coupon.php b/plugins/woocommerce/includes/class-wc-coupon.php
index f1148391978..5c7691cf092 100644
--- a/plugins/woocommerce/includes/class-wc-coupon.php
+++ b/plugins/woocommerce/includes/class-wc-coupon.php
@@ -13,7 +13,7 @@ use Automattic\WooCommerce\Utilities\StringUtil;
defined( 'ABSPATH' ) || exit;
-require_once dirname( __FILE__ ) . '/legacy/class-wc-legacy-coupon.php';
+require_once __DIR__ . '/legacy/class-wc-legacy-coupon.php';
/**
* Coupon class.
@@ -85,7 +85,7 @@ class WC_Coupon extends WC_Legacy_Coupon {
* Error message.
*
* This property should not be considered public API, and should not be accessed directly.
- * It is being added to supress PHP > 8.0 warnings against dynamic property creation, and all access
+ * It is being added to suppress PHP > 8.0 warnings against dynamic property creation, and all access
* should be through the getter and setter methods, namely `get_error_message()` and `set_error_message()`.
* In the future, the access modifier may be changed back to protected.
*
@@ -1066,7 +1066,7 @@ class WC_Coupon extends WC_Legacy_Coupon {
$err = __( 'Sorry, this coupon is not applicable to your cart contents.', 'woocommerce' );
break;
case self::E_WC_COUPON_USAGE_LIMIT_COUPON_STUCK:
- if ( is_user_logged_in() && wc_get_page_id( 'myaccount' ) > 0 ) {
+ if ( is_user_logged_in() && wc_get_page_id( 'myaccount' ) > 0 && ! WC()->is_store_api_request() ) {
/* translators: %s: myaccount page link. */
$err = sprintf( __( 'Coupon usage limit has been reached. If you were using this coupon just now but your order was not complete, you can retry or cancel the order by going to the my account page .', 'woocommerce' ), wc_get_endpoint_url( 'orders', '', wc_get_page_permalink( 'myaccount' ) ) );
} else {
diff --git a/plugins/woocommerce/includes/class-wc-download-handler.php b/plugins/woocommerce/includes/class-wc-download-handler.php
index 82571a9cf65..cb9d5d940a0 100644
--- a/plugins/woocommerce/includes/class-wc-download-handler.php
+++ b/plugins/woocommerce/includes/class-wc-download-handler.php
@@ -8,12 +8,19 @@
* @version 2.2.0
*/
+use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
defined( 'ABSPATH' ) || exit;
/**
* Download handler class.
*/
class WC_Download_Handler {
+ use AccessiblePrivateMethods;
+
+ /**
+ * The hook used for deferred tracking of partial download attempts.
+ */
+ public const TRACK_DOWNLOAD_CALLBACK = 'track_partial_download';
/**
* Hook in methods.
@@ -25,6 +32,7 @@ class WC_Download_Handler {
add_action( 'woocommerce_download_file_redirect', array( __CLASS__, 'download_file_redirect' ), 10, 2 );
add_action( 'woocommerce_download_file_xsendfile', array( __CLASS__, 'download_file_xsendfile' ), 10, 2 );
add_action( 'woocommerce_download_file_force', array( __CLASS__, 'download_file_force' ), 10, 2 );
+ self::add_action( self::TRACK_DOWNLOAD_CALLBACK, array( __CLASS__, 'track_download' ), 10, 3 );
}
/**
@@ -135,9 +143,13 @@ class WC_Download_Handler {
// Track the download in logs and change remaining/counts.
$current_user_id = get_current_user_id();
$ip_address = WC_Geolocation::get_ip_address();
- if ( ! $download_range['is_range_request'] ) {
- $download->track_download( $current_user_id > 0 ? $current_user_id : null, ! empty( $ip_address ) ? $ip_address : null );
- }
+
+ self::track_download(
+ $download,
+ $current_user_id > 0 ? $current_user_id : null,
+ ! empty( $ip_address ) ? $ip_address : null,
+ $download_range['is_range_request']
+ );
self::download( $file_path, $download->get_product_id() );
}
@@ -695,6 +707,76 @@ class WC_Download_Handler {
}
wp_die( $message, $title, array( 'response' => $status ) ); // WPCS: XSS ok.
}
+
+ /**
+ * Takes care of tracking download requests, with support for deferring tracking in the case of
+ * partial (ranged request) downloads.
+ *
+ * @param WC_Customer_Download|int $download The download to be tracked.
+ * @param int|null $user_id The user ID, if known.
+ * @param string|null $user_ip_address The download IP address, if known.
+ * @param bool $defer If tracking the download should be deferred.
+ *
+ * @return void
+ * @throws Exception If the active version of Action Scheduler is less than 3.6.0.
+ */
+ private static function track_download( $download, $user_id = null, $user_ip_address = null, bool $defer = false ): void {
+ try {
+ // If we were supplied with an integer, convert it to a download object.
+ $download = new WC_Customer_Download( $download );
+
+ // In simple cases, we can track the download immediately.
+ if ( ! $defer ) {
+ $download->track_download( $user_id, $user_ip_address );
+ return;
+ }
+
+ // Counting of partial downloads may be disabled by the site operator.
+ if ( get_option( 'woocommerce_downloads_count_partial', 'yes' ) !== 'yes' ) {
+ return;
+ }
+
+ /**
+ * Determines how long the window of time is for tracking unique download attempts, in relation to
+ * partial (ranged) download requests.
+ *
+ * @since 9.2.0
+ *
+ * @param int $window_in_seconds Non-negative number of seconds. Defaults to 1800 (30 minutes).
+ * @param int $download_permission_id References the download permission being tracked.
+ */
+ $window = absint( apply_filters( 'woocommerce_partial_download_tracking_window', 30 * MINUTE_IN_SECONDS, $download->get_id() ) );
+
+ // If we do not have Action Scheduler 3.6.0+ (this would be an unexpected scenario) then we cannot
+ // track partial downloads, because we require support for unique actions.
+ if ( version_compare( ActionScheduler_Versions::instance()->latest_version(), '3.6.0', '<' ) ) {
+ throw new Exception( 'Support for unique scheduled actions is not currently available.' );
+ }
+
+ as_schedule_single_action(
+ time() + $window,
+ self::TRACK_DOWNLOAD_CALLBACK,
+ array(
+ $download->get_id(),
+ $user_id,
+ $user_ip_address,
+ ),
+ 'woocommerce',
+ true
+ );
+ } catch ( Exception $e ) {
+ wc_get_logger()->error(
+ 'There was a problem while tracking a product download.',
+ array(
+ 'error' => $e->getMessage(),
+ 'id' => $download->get_id(),
+ 'user_id' => $user_id,
+ 'ip' => $user_ip_address,
+ 'deferred' => $defer ? 'yes' : 'no',
+ )
+ );
+ }
+ }
}
WC_Download_Handler::init();
diff --git a/plugins/woocommerce/includes/class-wc-form-handler.php b/plugins/woocommerce/includes/class-wc-form-handler.php
index aafd3b04bb0..b9575b2ef95 100644
--- a/plugins/woocommerce/includes/class-wc-form-handler.php
+++ b/plugins/woocommerce/includes/class-wc-form-handler.php
@@ -582,7 +582,6 @@ class WC_Form_Handler {
wp_safe_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
exit();
}
-
}
/**
@@ -607,7 +606,6 @@ class WC_Form_Handler {
wp_safe_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
exit();
}
-
}
/**
@@ -653,10 +651,10 @@ class WC_Form_Handler {
wc_add_notice( $removed_notice, apply_filters( 'woocommerce_cart_item_removed_notice_type', 'success' ) );
}
- $referer = wp_get_referer() ? remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart', 'order_again', '_wpnonce' ), add_query_arg( 'removed_item', '1', wp_get_referer() ) ) : wc_get_cart_url();
- wp_safe_redirect( $referer );
- exit;
-
+ if ( wp_get_referer() ) {
+ wp_safe_redirect( remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart', 'order_again', '_wpnonce' ), add_query_arg( 'removed_item', '1', wp_get_referer() ) ) );
+ exit;
+ }
} elseif ( ! empty( $_GET['undo_item'] ) && isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $nonce_value, 'woocommerce-cart' ) ) {
// Undo Cart Item.
@@ -664,10 +662,10 @@ class WC_Form_Handler {
WC()->cart->restore_cart_item( $cart_item_key );
- $referer = wp_get_referer() ? remove_query_arg( array( 'undo_item', '_wpnonce' ), wp_get_referer() ) : wc_get_cart_url();
- wp_safe_redirect( $referer );
- exit;
-
+ if ( wp_get_referer() ) {
+ wp_safe_redirect( remove_query_arg( array( 'undo_item', '_wpnonce' ), wp_get_referer() ) );
+ exit;
+ }
}
// Update Cart - checks apply_coupon too because they are in the same form.
@@ -722,9 +720,11 @@ class WC_Form_Handler {
exit;
} elseif ( $cart_updated ) {
wc_add_notice( __( 'Cart updated.', 'woocommerce' ), apply_filters( 'woocommerce_cart_updated_notice_type', 'success' ) );
- $referer = remove_query_arg( array( 'remove_coupon', 'add-to-cart' ), ( wp_get_referer() ? wp_get_referer() : wc_get_cart_url() ) );
- wp_safe_redirect( $referer );
- exit;
+
+ if ( wp_get_referer() ) {
+ wp_safe_redirect( remove_query_arg( array( 'remove_coupon', 'add-to-cart' ), wp_get_referer() ) );
+ exit;
+ }
}
}
}
@@ -986,7 +986,7 @@ class WC_Form_Handler {
}
}
- // Peform the login.
+ // Perform the login.
$user = wp_signon( apply_filters( 'woocommerce_login_credentials', $creds ), is_ssl() );
if ( is_wp_error( $user ) ) {
diff --git a/plugins/woocommerce/includes/class-wc-frontend-scripts.php b/plugins/woocommerce/includes/class-wc-frontend-scripts.php
index c52309655aa..b77615b8451 100644
--- a/plugins/woocommerce/includes/class-wc-frontend-scripts.php
+++ b/plugins/woocommerce/includes/class-wc-frontend-scripts.php
@@ -234,9 +234,9 @@ class WC_Frontend_Scripts {
'version' => $version,
),
'select2' => array(
- 'src' => self::get_asset_url( 'assets/js/selectWoo/selectWoo.full' . $suffix . '.js' ),
+ 'src' => self::get_asset_url( 'assets/js/select2/select2.full' . $suffix . '.js' ),
'deps' => array( 'jquery' ),
- 'version' => '1.0.9-wc.' . $version,
+ 'version' => '4.0.3-wc.' . $version,
),
'selectWoo' => array(
'src' => self::get_asset_url( 'assets/js/selectWoo/selectWoo.full' . $suffix . '.js' ),
diff --git a/plugins/woocommerce/includes/class-wc-geo-ip.php b/plugins/woocommerce/includes/class-wc-geo-ip.php
index 392025a83f7..9c5e751d270 100644
--- a/plugins/woocommerce/includes/class-wc-geo-ip.php
+++ b/plugins/woocommerce/includes/class-wc-geo-ip.php
@@ -633,7 +633,7 @@ class WC_Geo_IP {
);
/**
- * Contry names.
+ * Country names.
*
* @var array
*/
diff --git a/plugins/woocommerce/includes/class-wc-install.php b/plugins/woocommerce/includes/class-wc-install.php
index 2b1be80cda7..e6d591d8d11 100644
--- a/plugins/woocommerce/includes/class-wc-install.php
+++ b/plugins/woocommerce/includes/class-wc-install.php
@@ -17,7 +17,7 @@ use Automattic\WooCommerce\Internal\ProductDownloads\ApprovedDirectories\Synchro
use Automattic\WooCommerce\Internal\Utilities\DatabaseUtil;
use Automattic\WooCommerce\Internal\WCCom\ConnectionHelper as WCConnectionHelper;
use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
-use Automattic\WooCommerce\Utilities\OrderUtil;
+use Automattic\WooCommerce\Utilities\{ OrderUtil, PluginUtil };
use Automattic\WooCommerce\Internal\Utilities\PluginInstaller;
defined( 'ABSPATH' ) || exit;
@@ -259,6 +259,13 @@ class WC_Install {
'wc_update_910_add_launch_your_store_tour_option',
'wc_update_910_remove_obsolete_user_meta',
),
+ '9.2.0' => array(
+ 'wc_update_920_add_wc_hooked_blocks_version_option',
+ ),
+ '9.3.0' => array(
+ 'wc_update_930_add_woocommerce_coming_soon_option',
+ 'wc_update_930_migrate_user_meta_for_launch_your_store_tour',
+ ),
);
/**
@@ -289,6 +296,7 @@ class WC_Install {
add_action( 'init', array( __CLASS__, 'check_version' ), 5 );
add_action( 'init', array( __CLASS__, 'manual_database_update' ), 20 );
add_action( 'woocommerce_newly_installed', array( __CLASS__, 'maybe_enable_hpos' ), 20 );
+ add_action( 'woocommerce_newly_installed', array( __CLASS__, 'add_coming_soon_option' ), 20 );
add_action( 'admin_init', array( __CLASS__, 'wc_admin_db_update_notice' ) );
add_action( 'admin_init', array( __CLASS__, 'add_admin_note_after_page_created' ) );
add_action( 'woocommerce_run_update_callback', array( __CLASS__, 'run_update_callback' ) );
@@ -983,6 +991,17 @@ class WC_Install {
}
}
+ /**
+ * Add the woocommerce_coming_soon option for new shops.
+ *
+ * Ensure that the option is set for all shops, even if core profiler is disabled on the host.
+ *
+ * @since 9.3.0
+ */
+ public static function add_coming_soon_option() {
+ add_option( 'woocommerce_coming_soon', 'no' );
+ }
+
/**
* Checks whether HPOS should be enabled for new shops.
*
@@ -1264,7 +1283,8 @@ class WC_Install {
return;
}
- if ( in_array( $legacy_api_plugin, wp_get_active_and_valid_plugins(), true ) ) {
+ $active_valid_plugins = wc_get_container()->get( PluginUtil::class )->get_all_active_valid_plugins();
+ if ( in_array( $legacy_api_plugin, $active_valid_plugins, true ) ) {
return;
}
diff --git a/plugins/woocommerce/includes/class-wc-post-data.php b/plugins/woocommerce/includes/class-wc-post-data.php
index c1e3aa6b5f0..56e826b34c5 100644
--- a/plugins/woocommerce/includes/class-wc-post-data.php
+++ b/plugins/woocommerce/includes/class-wc-post-data.php
@@ -58,6 +58,8 @@ class WC_Post_Data {
// Meta cache flushing.
add_action( 'updated_post_meta', array( __CLASS__, 'flush_object_meta_cache' ), 10, 4 );
+ add_action( 'added_post_meta', array( __CLASS__, 'flush_object_meta_cache' ), 10, 4 );
+ add_action( 'deleted_post_meta', array( __CLASS__, 'flush_object_meta_cache' ), 10, 4 );
add_action( 'updated_order_item_meta', array( __CLASS__, 'flush_object_meta_cache' ), 10, 4 );
}
@@ -405,6 +407,7 @@ class WC_Post_Data {
$data_store->untrash_variations( $id );
wc_product_force_unique_sku( $id );
+ self::clear_global_unique_id_if_necessary( $id );
wc_get_container()->get( ProductAttributesLookupDataStore::class )->on_product_changed( $id );
} elseif ( 'product_variation' === $post_type ) {
@@ -412,6 +415,19 @@ class WC_Post_Data {
}
}
+ /**
+ * Clear global unique id if it's not unique.
+ *
+ * @param mixed $id Post ID.
+ */
+ private static function clear_global_unique_id_if_necessary( $id ) {
+ $product = wc_get_product( $id );
+ if ( $product && ! wc_product_has_global_unique_id( $id, $product->get_global_unique_id() ) ) {
+ $product->set_global_unique_id( '' );
+ $product->save();
+ }
+ }
+
/**
* Get the post type for a given post.
*
diff --git a/plugins/woocommerce/includes/class-wc-product-simple.php b/plugins/woocommerce/includes/class-wc-product-simple.php
index e49f4959d0f..98bb00f3ffe 100644
--- a/plugins/woocommerce/includes/class-wc-product-simple.php
+++ b/plugins/woocommerce/includes/class-wc-product-simple.php
@@ -74,4 +74,28 @@ class WC_Product_Simple extends WC_Product {
return apply_filters( 'woocommerce_product_add_to_cart_description', sprintf( $text, $this->get_name() ), $this );
}
+
+ /**
+ * Get the add to cart button success message - used to update the mini cart live region.
+ *
+ * @return string
+ */
+ public function add_to_cart_success_message() {
+ $text = '';
+
+ if ( $this->is_purchasable() && $this->is_in_stock() ) {
+ /* translators: %s: Product title */
+ $text = __( '“%s” has been added to your cart', 'woocommerce' );
+ $text = sprintf( $text, $this->get_name() );
+ }
+
+ /**
+ * Filter product add to cart success message.
+ *
+ * @since 9.2.0
+ * @param string $text The success message when a product is added to the cart.
+ * @param WC_Product_Simple $this Reference to the current WC_Product_Simple instance.
+ */
+ return apply_filters( 'woocommerce_product_add_to_cart_success_message', $text, $this );
+ }
}
diff --git a/plugins/woocommerce/includes/class-wc-structured-data.php b/plugins/woocommerce/includes/class-wc-structured-data.php
index 213fb9788f3..98acb513224 100644
--- a/plugins/woocommerce/includes/class-wc-structured-data.php
+++ b/plugins/woocommerce/includes/class-wc-structured-data.php
@@ -214,6 +214,12 @@ class WC_Structured_Data {
$markup['sku'] = $product->get_id();
}
+ // Add GTIN only if it's a valid number.
+ $gtin = $product->get_global_unique_id();
+ if ( $gtin && is_numeric( $gtin ) ) {
+ $markup['gtin'] = $gtin;
+ }
+
if ( '' !== $product->get_price() ) {
// Assume prices will be valid until the end of next year, unless on sale and there is an end date.
$price_valid_until = gmdate( 'Y-12-31', time() + YEAR_IN_SECONDS );
diff --git a/plugins/woocommerce/includes/class-wc-tracker.php b/plugins/woocommerce/includes/class-wc-tracker.php
index f41f30fbab1..fc535ac1cd3 100644
--- a/plugins/woocommerce/includes/class-wc-tracker.php
+++ b/plugins/woocommerce/includes/class-wc-tracker.php
@@ -112,13 +112,20 @@ class WC_Tracker {
* However, there are version of JP where \Automattic\Jetpack\Status exists, but does *not* contain is_staging_site method,
* so with those, code still needs to use the previous check as a fallback.
*
+ * After upgrading Jetpack Status to v3.3.2 is_staging_site is also deprecated and in_safe_mode is the new replacement.
+ * So we check this first of all.
+ *
* @return bool
*/
private static function is_jetpack_staging_site() {
if ( class_exists( '\Automattic\Jetpack\Status' ) ) {
- // Preferred way of checking with Jetpack 8.1+.
+
$jp_status = new \Automattic\Jetpack\Status();
- if ( is_callable( array( $jp_status, 'is_staging_site' ) ) ) {
+
+ if ( is_callable( array( $jp_status, 'in_safe_mode' ) ) ) {
+ return $jp_status->in_safe_mode();
+ } elseif ( is_callable( array( $jp_status, 'is_staging_site' ) ) ) {
+ // Preferred way of checking with Jetpack 8.1+.
return $jp_status->is_staging_site();
}
}
@@ -965,6 +972,7 @@ class WC_Tracker {
'hpos_transactions_enabled' => get_option( 'woocommerce_use_db_transactions_for_custom_orders_table_data_sync' ),
'hpos_transactions_level' => get_option( 'woocommerce_db_transactions_isolation_level_for_custom_orders_table_data_sync' ),
'show_marketplace_suggestions' => get_option( 'woocommerce_show_marketplace_suggestions' ),
+ 'admin_install_timestamp' => get_option( 'woocommerce_admin_install_timestamp' ),
);
}
diff --git a/plugins/woocommerce/includes/class-woocommerce.php b/plugins/woocommerce/includes/class-woocommerce.php
index 9eb3f3c003d..41104fcbd65 100644
--- a/plugins/woocommerce/includes/class-woocommerce.php
+++ b/plugins/woocommerce/includes/class-woocommerce.php
@@ -10,6 +10,7 @@ defined( 'ABSPATH' ) || exit;
use Automattic\WooCommerce\Internal\AssignDefaultCategory;
use Automattic\WooCommerce\Internal\BatchProcessing\BatchProcessingController;
+use Automattic\WooCommerce\Internal\ComingSoon\ComingSoonAdminBarBadge;
use Automattic\WooCommerce\Internal\ComingSoon\ComingSoonCacheInvalidator;
use Automattic\WooCommerce\Internal\ComingSoon\ComingSoonRequestHandler;
use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
@@ -26,10 +27,10 @@ use Automattic\WooCommerce\Internal\Traits\AccessiblePrivateMethods;
use Automattic\WooCommerce\Internal\Utilities\LegacyRestApiStub;
use Automattic\WooCommerce\Internal\Utilities\WebhookUtil;
use Automattic\WooCommerce\Internal\Admin\Marketplace;
+use Automattic\WooCommerce\Internal\McStats;
use Automattic\WooCommerce\Proxies\LegacyProxy;
use Automattic\WooCommerce\Utilities\{LoggingUtil, RestApiUtil, TimeUtil};
-use Automattic\WooCommerce\Admin\WCAdminHelper;
-use Automattic\WooCommerce\Admin\Features\Features;
+use Automattic\WooCommerce\Internal\Logging\RemoteLogger;
/**
* Main WooCommerce Class.
@@ -45,7 +46,7 @@ final class WooCommerce {
*
* @var string
*/
- public $version = '9.2.0';
+ public $version = '9.4.0';
/**
* WooCommerce Schema version.
@@ -54,7 +55,7 @@ final class WooCommerce {
*
* @var string
*/
- public $db_version = '430';
+ public $db_version = '920';
/**
* The single instance of the class.
@@ -307,8 +308,11 @@ final class WooCommerce {
self::add_action( 'rest_api_init', array( $this, 'register_wp_admin_settings' ) );
add_action( 'woocommerce_installed', array( $this, 'add_woocommerce_remote_variant' ) );
add_action( 'woocommerce_updated', array( $this, 'add_woocommerce_remote_variant' ) );
+ add_action( 'woocommerce_newly_installed', 'wc_set_hooked_blocks_version', 10 );
+ self::add_filter( 'robots_txt', array( $this, 'robots_txt' ) );
add_filter( 'wp_plugin_dependencies_slug', array( $this, 'convert_woocommerce_slug' ) );
+ self::add_filter( 'woocommerce_register_log_handlers', array( $this, 'register_remote_log_handler' ) );
// These classes set up hooks on instantiation.
$container = wc_get_container();
@@ -326,6 +330,7 @@ final class WooCommerce {
$container->get( WebhookUtil::class );
$container->get( Marketplace::class );
$container->get( TimeUtil::class );
+ $container->get( ComingSoonAdminBarBadge::class );
$container->get( ComingSoonCacheInvalidator::class );
$container->get( ComingSoonRequestHandler::class );
@@ -402,6 +407,12 @@ final class WooCommerce {
$context
);
+ // Record fatal error stats.
+ $container = wc_get_container();
+ $mc_stats = $container->get( McStats::class );
+ $mc_stats->add( 'error', 'fatal-errors-during-shutdown' );
+ $mc_stats->do_server_side_stats();
+
/**
* Action triggered when there are errors during shutdown.
*
@@ -415,8 +426,6 @@ final class WooCommerce {
* Define WC Constants.
*/
private function define_constants() {
- $upload_dir = wp_upload_dir( null, false );
-
$this->define( 'WC_ABSPATH', dirname( WC_PLUGIN_FILE ) . '/' );
$this->define( 'WC_PLUGIN_BASENAME', plugin_basename( WC_PLUGIN_FILE ) );
$this->define( 'WC_VERSION', $this->version );
@@ -435,8 +444,9 @@ final class WooCommerce {
*/
if ( defined( 'WC_LOG_DIR' ) ) {
$this->define( 'WC_LOG_DIR_CUSTOM', true );
+ } else {
+ $this->define( 'WC_LOG_DIR', LoggingUtil::get_log_directory( false ) );
}
- $this->define( 'WC_LOG_DIR', LoggingUtil::get_log_directory() );
// These three are kept defined for compatibility, but are no longer used.
$this->define( 'WC_NOTICE_MIN_PHP_VERSION', '7.2' );
@@ -702,6 +712,11 @@ final class WooCommerce {
*/
include_once WC_ABSPATH . 'includes/wccom-site/class-wc-wccom-site.php';
+ /**
+ * Product Usage
+ */
+ include_once WC_ABSPATH . 'includes/product-usage/class-wc-product-usage.php';
+
/**
* Libraries and packages.
*/
@@ -1038,6 +1053,43 @@ final class WooCommerce {
}
}
+ /**
+ * Tell bots not to index some WooCommerce-created directories.
+ *
+ * We try to detect the default "User-agent: *" added by WordPress and add our rules to that group, because
+ * it's possible that some bots will only interpret the first group of rules if there are multiple groups with
+ * the same user agent.
+ *
+ * @param string $output The contents that WordPress will output in a robots.txt file.
+ *
+ * @return string
+ */
+ private function robots_txt( $output ) {
+ $path = ( ! empty( $site_url['path'] ) ) ? $site_url['path'] : '';
+
+ $lines = preg_split( '/\r\n|\r|\n/', $output );
+ $agent_index = array_search( 'User-agent: *', $lines, true );
+
+ if ( false !== $agent_index ) {
+ $above = array_slice( $lines, 0, $agent_index + 1 );
+ $below = array_slice( $lines, $agent_index + 1 );
+ } else {
+ $above = $lines;
+ $below = array();
+
+ $above[] = '';
+ $above[] = 'User-agent: *';
+ }
+
+ $above[] = "Disallow: $path/wp-content/uploads/wc-logs/";
+ $above[] = "Disallow: $path/wp-content/uploads/woocommerce_transient_files/";
+ $above[] = "Disallow: $path/wp-content/uploads/woocommerce_uploads/";
+
+ $lines = array_merge( $above, $below );
+
+ return implode( PHP_EOL, $lines );
+ }
+
/**
* Set tablenames inside WPDB object.
*/
@@ -1267,4 +1319,16 @@ final class WooCommerce {
}
return $slug;
}
+
+ /**
+ * Register the remote log handler.
+ *
+ * @param \WC_Log_Handler[] $handlers The handlers to register.
+ *
+ * @return \WC_Log_Handler[]
+ */
+ private function register_remote_log_handler( $handlers ) {
+ $handlers[] = wc_get_container()->get( RemoteLogger::class );
+ return $handlers;
+ }
}
diff --git a/plugins/woocommerce/includes/cli/class-wc-cli-com-command.php b/plugins/woocommerce/includes/cli/class-wc-cli-com-command.php
index 5f6f7b63144..d56ec1b29fe 100644
--- a/plugins/woocommerce/includes/cli/class-wc-cli-com-command.php
+++ b/plugins/woocommerce/includes/cli/class-wc-cli-com-command.php
@@ -137,7 +137,7 @@ class WC_CLI_COM_Command {
* # force connecting to WCCOM even if site is already connected.
* $ wp wc com connect --force
*
- * # Pass password to comman.
+ * # Pass password to command.
* $ wp wc com connect --password=PASSWORD
*
* @param array $args Positional arguments to include when calling the command.
diff --git a/plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php b/plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php
index 7882f1673aa..9a96390266e 100644
--- a/plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php
+++ b/plugins/woocommerce/includes/data-stores/class-wc-order-data-store-cpt.php
@@ -5,6 +5,8 @@
* @package WooCommerce\Classes
*/
+use Automattic\WooCommerce\Utilities\OrderUtil;
+
if ( ! defined( 'ABSPATH' ) ) {
exit;
}
@@ -189,22 +191,37 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
// Also grab the current status so we can compare.
$previous_status = get_post_status( $order->get_id() );
+ // If the order doesn't exist in the DB, we will consider it as new.
+ if ( ! $previous_status && $order->get_id() === 0 ) {
+ $previous_status = 'new';
+ }
// Update the order.
parent::update( $order );
- // Fire a hook depending on the status - this should be considered a creation if it was previously draft status.
- $new_status = $order->get_status( 'edit' );
+ $current_status = $order->get_status( 'edit' );
- if ( $new_status !== $previous_status && in_array( $previous_status, array( 'new', 'auto-draft', 'draft', 'checkout-draft' ), true ) ) {
- do_action( 'woocommerce_new_order', $order->get_id(), $order );
- } else {
- do_action( 'woocommerce_update_order', $order->get_id(), $order );
+ // We need to remove the wc- prefix from the status for comparison and proper evaluation of new vs updated orders.
+ $previous_status = OrderUtil::remove_status_prefix( $previous_status );
+ $current_status = OrderUtil::remove_status_prefix( $current_status );
+
+ $draft_statuses = array( 'new', 'auto-draft', 'draft', 'checkout-draft' );
+
+ // This hook should be fired only if the new status is not one of draft statuses and the previous status was one of the draft statuses.
+ if (
+ $current_status !== $previous_status
+ && ! in_array( $current_status, $draft_statuses, true )
+ && in_array( $previous_status, $draft_statuses, true )
+ ) {
+ do_action( 'woocommerce_new_order', $order->get_id(), $order ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
+ return;
}
+
+ do_action( 'woocommerce_update_order', $order->get_id(), $order ); // phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
}
/**
- * Helper method that updates all the post meta for an order based on it's settings in the WC_Order class.
+ * Helper method that updates all the post meta for an order based on its settings in the WC_Order class.
*
* @param WC_Order $order Order object.
* @since 3.0.0
@@ -1003,6 +1020,40 @@ class WC_Order_Data_Store_CPT extends Abstract_WC_Order_Data_Store_CPT implement
* @return array|object
*/
public function query( $query_vars ) {
+ /**
+ * Allows 3rd parties to filter query args that will trigger an unsupported notice.
+ *
+ * @since 9.2.0
+ *
+ * @param array $unsupported_args Array of query arg names.
+ */
+ $unsupported_args = (array) apply_filters(
+ 'woocommerce_order_data_store_cpt_query_unsupported_args',
+ array( 'meta_query', 'field_query' )
+ );
+
+ // Trigger doing_it_wrong() for query vars only supported in HPOS.
+ $unsupported_args_in_query = array_keys( array_filter( array_intersect_key( $query_vars, array_flip( $unsupported_args ) ) ) );
+
+ if ( $unsupported_args_in_query && __CLASS__ === get_class( $this ) ) {
+ wc_doing_it_wrong(
+ __METHOD__,
+ esc_html(
+ sprintf(
+ // translators: %s is a comma separated list of query arguments.
+ _n(
+ 'Order query argument (%s) is not supported on the current order datastore.',
+ 'Order query arguments (%s) are not supported on the current order datastore.',
+ count( $unsupported_args_in_query ),
+ 'woocommerce'
+ ),
+ implode( ', ', $unsupported_args_in_query )
+ )
+ ),
+ '9.2.0'
+ );
+ }
+
$args = $this->get_wp_query_args( $query_vars );
if ( ! empty( $args['errors'] ) ) {
diff --git a/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php b/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
index 7bdc8bd3368..b5a611d6f8a 100644
--- a/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
+++ b/plugins/woocommerce/includes/data-stores/class-wc-product-data-store-cpt.php
@@ -131,6 +131,20 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$sku,
$sku
);
+
+ /**
+ * Filter to bail early on the SKU lock query.
+ *
+ * @since 9.3.0
+ *
+ * @param bool|null $locked Set to a boolean value to short-circuit the SKU lock query.
+ * @param WC_Product $product The product being created.
+ */
+ $locked = apply_filters( 'wc_product_pre_lock_on_sku', null, $product );
+ if ( ! is_null( $locked ) ) {
+ return boolval( $locked );
+ }
+
// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
$result = $wpdb->query( $query );
@@ -334,7 +348,7 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$product->apply_changes();
// phpcs:ignore WooCommerce.Commenting.CommentHooks.MissingHookComment
- do_action( 'woocommerce_update_product', $product->get_id(), $product, $changes );
+ do_action( 'woocommerce_update_product', $product->get_id(), $product );
}
/**
@@ -642,21 +656,21 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
// Fire actions to let 3rd parties know the stock is about to be changed.
if ( $product->is_type( 'variation' ) ) {
/**
- * Action to signal that the value of 'stock_quantity' for a variation is about to change.
- *
- * @since 4.9
- *
- * @param int $product The variation whose stock is about to change.
- */
+ * Action to signal that the value of 'stock_quantity' for a variation is about to change.
+ *
+ * @param WC_Product $product The variation whose stock is about to change.
+ *
+ * @since 4.9
+ */
do_action( 'woocommerce_variation_before_set_stock', $product );
} else {
/**
- * Action to signal that the value of 'stock_quantity' for a product is about to change.
- *
- * @since 4.9
- *
- * @param int $product The product whose stock is about to change.
- */
+ * Action to signal that the value of 'stock_quantity' for a product is about to change.
+ *
+ * @param WC_Product $product The product whose stock is about to change.
+ *
+ * @since 4.9
+ */
do_action( 'woocommerce_product_before_set_stock', $product );
}
break;
@@ -732,16 +746,48 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
if ( in_array( 'stock_quantity', $this->updated_props, true ) ) {
if ( $product->is_type( 'variation' ) ) {
+ /**
+ * Action to signal that the value of 'stock_quantity' for a variation has changed.
+ *
+ * @since 3.0
+ *
+ * @param WC_Product $product The variation whose stock has changed.
+ */
do_action( 'woocommerce_variation_set_stock', $product );
} else {
+ /**
+ * Action to signal that the value of 'stock_quantity' for a product has changed.
+ *
+ * @since 3.0
+ *
+ * @param WC_Product $product The variation whose stock has changed.
+ */
do_action( 'woocommerce_product_set_stock', $product );
}
}
if ( in_array( 'stock_status', $this->updated_props, true ) ) {
if ( $product->is_type( 'variation' ) ) {
+ /**
+ * Action to signal that the `stock_status` for a variation has changed.
+ *
+ * @since 3.0
+ *
+ * @param int $product_id The ID of the variation.
+ * @param string $stock_status The new stock status of the variation.
+ * @param WC_Product $product The product object.
+ */
do_action( 'woocommerce_variation_set_stock_status', $product->get_id(), $product->get_stock_status(), $product );
} else {
+ /**
+ * Action to signal that the `stock_status` for a product has changed.
+ *
+ * @since 3.0
+ *
+ * @param int $product_id The ID of the product.
+ * @param string $stock_status The new stock status of the product.
+ * @param WC_Product $product The product object.
+ */
do_action( 'woocommerce_product_set_stock_status', $product->get_id(), $product->get_stock_status(), $product );
}
}
@@ -2237,23 +2283,26 @@ class WC_Product_Data_Store_CPT extends WC_Data_Store_WP implements WC_Object_Da
$stock = 'yes' === $manage_stock ? wc_stock_amount( get_post_meta( $id, '_stock', true ) ) : null;
$price = wc_format_decimal( get_post_meta( $id, '_price', true ) );
$sale_price = wc_format_decimal( get_post_meta( $id, '_sale_price', true ) );
- return array(
- 'product_id' => absint( $id ),
- 'sku' => get_post_meta( $id, '_sku', true ),
- 'global_unique_id' => get_post_meta( $id, '_global_unique_id', true ),
- 'virtual' => 'yes' === get_post_meta( $id, '_virtual', true ) ? 1 : 0,
- 'downloadable' => 'yes' === get_post_meta( $id, '_downloadable', true ) ? 1 : 0,
- 'min_price' => reset( $price_meta ),
- 'max_price' => end( $price_meta ),
- 'onsale' => $sale_price && $price === $sale_price ? 1 : 0,
- 'stock_quantity' => $stock,
- 'stock_status' => get_post_meta( $id, '_stock_status', true ),
- 'rating_count' => array_sum( array_map( 'intval', (array) get_post_meta( $id, '_wc_rating_count', true ) ) ),
- 'average_rating' => get_post_meta( $id, '_wc_average_rating', true ),
- 'total_sales' => get_post_meta( $id, 'total_sales', true ),
- 'tax_status' => get_post_meta( $id, '_tax_status', true ),
- 'tax_class' => get_post_meta( $id, '_tax_class', true ),
+ $product_data = array(
+ 'product_id' => absint( $id ),
+ 'sku' => get_post_meta( $id, '_sku', true ),
+ 'virtual' => 'yes' === get_post_meta( $id, '_virtual', true ) ? 1 : 0,
+ 'downloadable' => 'yes' === get_post_meta( $id, '_downloadable', true ) ? 1 : 0,
+ 'min_price' => reset( $price_meta ),
+ 'max_price' => end( $price_meta ),
+ 'onsale' => $sale_price && $price === $sale_price ? 1 : 0,
+ 'stock_quantity' => $stock,
+ 'stock_status' => get_post_meta( $id, '_stock_status', true ),
+ 'rating_count' => array_sum( array_map( 'intval', (array) get_post_meta( $id, '_wc_rating_count', true ) ) ),
+ 'average_rating' => get_post_meta( $id, '_wc_average_rating', true ),
+ 'total_sales' => get_post_meta( $id, 'total_sales', true ),
+ 'tax_status' => get_post_meta( $id, '_tax_status', true ),
+ 'tax_class' => get_post_meta( $id, '_tax_class', true ),
);
+ if ( get_option( 'woocommerce_schema_version', 0 ) >= 920 ) {
+ $product_data['global_unique_id'] = get_post_meta( $id, '_global_unique_id', true );
+ }
+ return $product_data;
}
return array();
}
diff --git a/plugins/woocommerce/includes/emails/class-wc-email-new-order.php b/plugins/woocommerce/includes/emails/class-wc-email-new-order.php
index 3451c64b3a3..33a49ebce34 100644
--- a/plugins/woocommerce/includes/emails/class-wc-email-new-order.php
+++ b/plugins/woocommerce/includes/emails/class-wc-email-new-order.php
@@ -109,10 +109,11 @@ if ( ! class_exists( 'WC_Email_New_Order' ) ) :
}
if ( $this->is_enabled() && $this->get_recipient() ) {
- $this->send( $this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments() );
-
- $order->update_meta_data( '_new_order_email_sent', 'true' );
- $order->save();
+ $email_sent_successfully = $this->send( $this->get_recipient(), $this->get_subject(), $this->get_content(), $this->get_headers(), $this->get_attachments() );
+ if ( $email_sent_successfully ) {
+ $order->update_meta_data( '_new_order_email_sent', 'true' );
+ $order->save();
+ }
}
$this->restore_locale();
diff --git a/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php b/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
index 1c0b976dddf..10808c09bc4 100644
--- a/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
+++ b/plugins/woocommerce/includes/export/class-wc-product-csv-exporter.php
@@ -262,7 +262,7 @@ class WC_Product_CSV_Exporter extends WC_CSV_Batch_Exporter {
* @since 3.1.0
*
* @param array $row An associative array with the data of a single row in the CSV file.
- * @param WC_Product $product The product object correspnding to the current row.
+ * @param WC_Product $product The product object corresponding to the current row.
* @param WC_Product_CSV_Exporter $exporter The instance of the CSV exporter.
*/
return apply_filters( 'woocommerce_product_export_row_data', $row, $product, $this );
diff --git a/plugins/woocommerce/includes/gateways/paypal/includes/settings-paypal.php b/plugins/woocommerce/includes/gateways/paypal/includes/settings-paypal.php
index 19b8291d15c..fe2f53fa216 100644
--- a/plugins/woocommerce/includes/gateways/paypal/includes/settings-paypal.php
+++ b/plugins/woocommerce/includes/gateways/paypal/includes/settings-paypal.php
@@ -5,6 +5,8 @@
* @package WooCommerce\Classes\Payment
*/
+use Automattic\WooCommerce\Utilities\LoggingUtil;
+
defined( 'ABSPATH' ) || exit;
return array(
@@ -55,7 +57,11 @@ return array(
'label' => __( 'Enable logging', 'woocommerce' ),
'default' => 'no',
/* translators: %s: URL */
- 'description' => sprintf( __( 'Log PayPal events, such as IPN requests, inside %s Note: this may log personal information. We recommend using this for debugging purposes only and deleting the logs when finished.', 'woocommerce' ), '' . WC_Log_Handler_File::get_log_file_path( 'paypal' ) . '' ),
+ 'description' => sprintf(
+ // translators: %s is a placeholder for a URL.
+ __( 'Log PayPal events such as IPN requests and review them on the Logs screen . Note: this may log personal information. We recommend using this for debugging purposes only and deleting the logs when finished.', 'woocommerce' ),
+ esc_url( LoggingUtil::get_logs_tab_url() )
+ ),
),
'ipn_notification' => array(
'title' => __( 'IPN email notifications', 'woocommerce' ),
diff --git a/plugins/woocommerce/includes/import/class-wc-product-csv-importer.php b/plugins/woocommerce/includes/import/class-wc-product-csv-importer.php
index 27be278e6eb..804426ed9aa 100644
--- a/plugins/woocommerce/includes/import/class-wc-product-csv-importer.php
+++ b/plugins/woocommerce/includes/import/class-wc-product-csv-importer.php
@@ -198,7 +198,7 @@ class WC_Product_CSV_Importer extends WC_Product_Importer {
return absint( $original_id );
}
- // See if the given ID maps to a valid product allready.
+ // See if the given ID maps to a valid product already.
$existing_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_type IN ( 'product', 'product_variation' ) AND ID = %d;", $id ) ); // WPCS: db call ok, cache ok.
if ( $existing_id ) {
diff --git a/plugins/woocommerce/includes/interfaces/class-wc-product-data-store-interface.php b/plugins/woocommerce/includes/interfaces/class-wc-product-data-store-interface.php
index e1e8150ac5e..ed9244ae56a 100644
--- a/plugins/woocommerce/includes/interfaces/class-wc-product-data-store-interface.php
+++ b/plugins/woocommerce/includes/interfaces/class-wc-product-data-store-interface.php
@@ -41,15 +41,6 @@ interface WC_Product_Data_Store_Interface {
*/
public function is_existing_sku( $product_id, $sku );
- /**
- * Check if product unique ID is found for any other product IDs.
- *
- * @param int $product_id Product ID.
- * @param string $global_unique_id Unique ID.
- * @return bool
- */
- public function is_existing_global_unique_id( $product_id, $global_unique_id );
-
/**
* Return product ID based on SKU.
*
@@ -58,13 +49,6 @@ interface WC_Product_Data_Store_Interface {
*/
public function get_product_id_by_sku( $sku );
- /**
- * Return product ID based on Unique ID.
- *
- * @param string $global_unique_id Unique ID.
- * @return int
- */
- public function get_product_id_by_global_unique_id( $global_unique_id );
/**
* Returns an array of IDs of products that have sales starting soon.
diff --git a/plugins/woocommerce/includes/interfaces/class-wc-queue-interface.php b/plugins/woocommerce/includes/interfaces/class-wc-queue-interface.php
index 3cfe06845ce..c4e3ef442e7 100644
--- a/plugins/woocommerce/includes/interfaces/class-wc-queue-interface.php
+++ b/plugins/woocommerce/includes/interfaces/class-wc-queue-interface.php
@@ -91,7 +91,7 @@ interface WC_Queue_Interface {
public function cancel_all( $hook, $args = array(), $group = '' );
/**
- * Get the date and time for the next scheduled occurence of an action with a given hook
+ * Get the date and time for the next scheduled occurrence of an action with a given hook
* (an optionally that matches certain args and group), if any.
*
* @param string $hook The hook that the job will trigger.
diff --git a/plugins/woocommerce/includes/product-usage/class-wc-product-usage-rule-set.php b/plugins/woocommerce/includes/product-usage/class-wc-product-usage-rule-set.php
new file mode 100644
index 00000000000..e8ccb1bc3a2
--- /dev/null
+++ b/plugins/woocommerce/includes/product-usage/class-wc-product-usage-rule-set.php
@@ -0,0 +1,50 @@
+rules = $rules;
+ }
+
+ /**
+ * Retrieve the value of a rule by name
+ *
+ * @param string $rule_name name of the rule to retrieve value.
+ * @return mixed|null
+ */
+ public function get_rule( string $rule_name ) {
+ if ( ! isset( $this->rules[ $rule_name ] ) ) {
+ return null;
+ }
+
+ return $this->rules[ $rule_name ];
+ }
+}
diff --git a/plugins/woocommerce/includes/product-usage/class-wc-product-usage.php b/plugins/woocommerce/includes/product-usage/class-wc-product-usage.php
new file mode 100644
index 00000000000..7e986309fc0
--- /dev/null
+++ b/plugins/woocommerce/includes/product-usage/class-wc-product-usage.php
@@ -0,0 +1,87 @@
+ $product_id ) );
+ if ( empty( $subscriptions ) ) {
+ return new WC_Product_Usage_Rule_Set( $rules );
+ }
+
+ // Product should only have a single connected subscription on current store.
+ $product_subscription = current( $subscriptions );
+ if ( $product_subscription['expired'] ) {
+ return new WC_Product_Usage_Rule_Set( $rules );
+ }
+
+ return null;
+ }
+
+ /**
+ * Get the product usage rule for a product.
+ *
+ * @param int $product_id product id to get feature restriction rules.
+ * @return array|null
+ * @since 9.3.0
+ */
+ private static function get_product_usage_restriction_rule( int $product_id ): ?array {
+ $rules = WC_Helper::get_product_usage_notice_rules();
+ if ( empty( $rules['restricted_products'][ $product_id ] ) ) {
+ return null;
+ }
+
+ return $rules['restricted_products'][ $product_id ];
+ }
+}
+
+WC_Product_Usage::load();
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
index a8aa9c46ede..aeebf511d81 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-orders-v2-controller.php
@@ -468,7 +468,7 @@ class WC_REST_Orders_V2_Controller extends WC_REST_CRUD_Controller {
}
// Format the order status.
- $data['status'] = 'wc-' === substr( $data['status'], 0, 3 ) ? substr( $data['status'], 3 ) : $data['status'];
+ $data['status'] = OrderUtil::remove_status_prefix( $data['status'] );
// Format line items.
foreach ( $format_line_items as $key ) {
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
index d9c8ad8d9fe..822b2a651f1 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php
@@ -123,42 +123,42 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
*/
public function get_tools() {
$tools = array(
- 'clear_transients' => array(
+ 'clear_transients' => array(
'name' => __( 'WooCommerce transients', 'woocommerce' ),
'button' => __( 'Clear transients', 'woocommerce' ),
'desc' => __( 'This tool will clear the product/shop transients cache.', 'woocommerce' ),
),
- 'clear_expired_transients' => array(
+ 'clear_expired_transients' => array(
'name' => __( 'Expired transients', 'woocommerce' ),
'button' => __( 'Clear transients', 'woocommerce' ),
'desc' => __( 'This tool will clear ALL expired transients from WordPress.', 'woocommerce' ),
),
- 'delete_orphaned_variations' => array(
+ 'delete_orphaned_variations' => array(
'name' => __( 'Orphaned variations', 'woocommerce' ),
'button' => __( 'Delete orphaned variations', 'woocommerce' ),
'desc' => __( 'This tool will delete all variations which have no parent.', 'woocommerce' ),
),
- 'clear_expired_download_permissions' => array(
+ 'clear_expired_download_permissions' => array(
'name' => __( 'Used-up download permissions', 'woocommerce' ),
'button' => __( 'Clean up download permissions', 'woocommerce' ),
'desc' => __( 'This tool will delete expired download permissions and permissions with 0 remaining downloads.', 'woocommerce' ),
),
- 'regenerate_product_lookup_tables' => array(
+ 'regenerate_product_lookup_tables' => array(
'name' => __( 'Product lookup tables', 'woocommerce' ),
'button' => __( 'Regenerate', 'woocommerce' ),
'desc' => __( 'This tool will regenerate product lookup table data. This process may take a while.', 'woocommerce' ),
),
- 'recount_terms' => array(
+ 'recount_terms' => array(
'name' => __( 'Term counts', 'woocommerce' ),
'button' => __( 'Recount terms', 'woocommerce' ),
'desc' => __( 'This tool will recount product terms - useful when changing your settings in a way which hides products from the catalog.', 'woocommerce' ),
),
- 'reset_roles' => array(
+ 'reset_roles' => array(
'name' => __( 'Capabilities', 'woocommerce' ),
'button' => __( 'Reset capabilities', 'woocommerce' ),
'desc' => __( 'This tool will reset the admin, customer and shop_manager roles to default. Use this if your users cannot access all of the WooCommerce admin pages.', 'woocommerce' ),
),
- 'clear_sessions' => array(
+ 'clear_sessions' => array(
'name' => __( 'Clear customer sessions', 'woocommerce' ),
'button' => __( 'Clear', 'woocommerce' ),
'desc' => sprintf(
@@ -167,7 +167,7 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
__( 'This tool will delete all customer session data from the database, including current carts and saved carts in the database.', 'woocommerce' )
),
),
- 'clear_template_cache' => array(
+ 'clear_template_cache' => array(
'name' => __( 'Clear template cache', 'woocommerce' ),
'button' => __( 'Clear', 'woocommerce' ),
'desc' => sprintf(
@@ -176,7 +176,16 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
__( 'This tool will empty the template cache.', 'woocommerce' )
),
),
- 'install_pages' => array(
+ 'clear_system_status_theme_info_cache' => array(
+ 'name' => __( 'Clear system status theme info cache', 'woocommerce' ),
+ 'button' => __( 'Clear', 'woocommerce' ),
+ 'desc' => sprintf(
+ '%1$s %2$s',
+ __( 'Note:', 'woocommerce' ),
+ __( 'This tool will empty the system status theme info cache.', 'woocommerce' )
+ ),
+ ),
+ 'install_pages' => array(
'name' => __( 'Create default WooCommerce pages', 'woocommerce' ),
'button' => __( 'Create pages', 'woocommerce' ),
'desc' => sprintf(
@@ -185,7 +194,7 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
__( 'This tool will install all the missing WooCommerce pages. Pages already defined and set up will not be replaced.', 'woocommerce' )
),
),
- 'delete_taxes' => array(
+ 'delete_taxes' => array(
'name' => __( 'Delete WooCommerce tax rates', 'woocommerce' ),
'button' => __( 'Delete tax rates', 'woocommerce' ),
'desc' => sprintf(
@@ -194,12 +203,12 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
__( 'This option will delete ALL of your tax rates, use with caution. This action cannot be reversed.', 'woocommerce' )
),
),
- 'regenerate_thumbnails' => array(
+ 'regenerate_thumbnails' => array(
'name' => __( 'Regenerate shop thumbnails', 'woocommerce' ),
'button' => __( 'Regenerate', 'woocommerce' ),
'desc' => __( 'This will regenerate all shop thumbnails to match your theme and/or image settings.', 'woocommerce' ),
),
- 'db_update_routine' => array(
+ 'db_update_routine' => array(
'name' => __( 'Update database', 'woocommerce' ),
'button' => __( 'Update database', 'woocommerce' ),
'desc' => sprintf(
@@ -567,6 +576,11 @@ class WC_REST_System_Status_Tools_V2_Controller extends WC_REST_Controller {
}
break;
+ case 'clear_system_status_theme_info_cache':
+ wc_clear_system_status_theme_info_cache();
+ $message = __( 'System status theme info cache cleared.', 'woocommerce' );
+ break;
+
case 'verify_db_tables':
if ( ! method_exists( 'WC_Install', 'verify_base_tables' ) ) {
$message = __( 'You need WooCommerce 4.2 or newer to run this tool.', 'woocommerce' );
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
index e9da6f31cdd..f8c244c7e68 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version2/class-wc-rest-system-status-v2-controller.php
@@ -13,7 +13,7 @@ defined( 'ABSPATH' ) || exit;
use Automattic\WooCommerce\Internal\WCCom\ConnectionHelper;
use Automattic\WooCommerce\Internal\ProductDownloads\ApprovedDirectories\Register as Download_Directories;
use Automattic\WooCommerce\Internal\DataStores\Orders\DataSynchronizer as Order_DataSynchronizer;
-use Automattic\WooCommerce\Utilities\{ LoggingUtil, OrderUtil };
+use Automattic\WooCommerce\Utilities\{ LoggingUtil, OrderUtil, PluginUtil };
/**
* System status controller class.
@@ -373,7 +373,41 @@ class WC_REST_System_Status_V2_Controller extends WC_REST_Controller {
'context' => array( 'view' ),
'readonly' => true,
'items' => array(
- 'type' => 'string',
+ 'type' => 'object',
+ 'properties' => array(
+ 'plugin' => array(
+ 'description' => __( 'Plugin basename. The path to the main plugin file relative to the plugins directory.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'name' => array(
+ 'description' => __( 'Name of the plugin.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'version' => array(
+ 'description' => __( 'Current plugin version.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'version_latest' => array(
+ 'description' => __( 'Latest available plugin version.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'url' => array(
+ 'description' => __( 'Plugin URL.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'author_name' => array(
+ 'description' => __( 'Plugin author name.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'author_url' => array(
+ 'description' => __( 'Plugin author URL.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'network_activated' => array(
+ 'description' => __( 'Whether the plugin can only be activated network-wide.', 'woocommerce' ),
+ 'type' => 'boolean',
+ ),
+ ),
),
),
'inactive_plugins' => array(
@@ -382,7 +416,41 @@ class WC_REST_System_Status_V2_Controller extends WC_REST_Controller {
'context' => array( 'view' ),
'readonly' => true,
'items' => array(
- 'type' => 'string',
+ 'type' => 'object',
+ 'properties' => array(
+ 'plugin' => array(
+ 'description' => __( 'Plugin basename. The path to the main plugin file relative to the plugins directory.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'name' => array(
+ 'description' => __( 'Name of the plugin.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'version' => array(
+ 'description' => __( 'Current plugin version.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'version_latest' => array(
+ 'description' => __( 'Latest available plugin version.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'url' => array(
+ 'description' => __( 'Plugin URL.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'author_name' => array(
+ 'description' => __( 'Plugin author name.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'author_url' => array(
+ 'description' => __( 'Plugin author URL.', 'woocommerce' ),
+ 'type' => 'string',
+ ),
+ 'network_activated' => array(
+ 'description' => __( 'Whether the plugin can only be activated network-wide.', 'woocommerce' ),
+ 'type' => 'boolean',
+ ),
+ ),
),
),
'dropins_mu_plugins' => array(
@@ -864,7 +932,7 @@ class WC_REST_System_Status_V2_Controller extends WC_REST_Controller {
}
$database_version = wc_get_server_database_version();
- $log_directory = LoggingUtil::get_log_directory();
+ $log_directory = LoggingUtil::get_log_directory( false );
// Return all environment info. Described by JSON Schema.
return array(
@@ -1044,15 +1112,10 @@ class WC_REST_System_Status_V2_Controller extends WC_REST_Controller {
return array();
}
- $active_plugins = (array) get_option( 'active_plugins', array() );
- if ( is_multisite() ) {
- $network_activated_plugins = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
- $active_plugins = array_merge( $active_plugins, $network_activated_plugins );
- }
+ $active_valid_plugins = wc_get_container()->get( PluginUtil::class )->get_all_active_valid_plugins();
+ $active_plugins_data = array();
- $active_plugins_data = array();
-
- foreach ( $active_plugins as $plugin ) {
+ foreach ( $active_valid_plugins as $plugin ) {
$data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
$active_plugins_data[] = $this->format_plugin_data( $plugin, $data );
}
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
index 5e249c55ba7..53ed28e80fe 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-orders-controller.php
@@ -131,7 +131,7 @@ class WC_REST_Orders_Controller extends WC_REST_Orders_V2_Controller {
foreach ( $value as $item ) {
if ( is_array( $item ) ) {
if ( $this->item_is_null( $item ) || ( isset( $item['quantity'] ) && 0 === $item['quantity'] ) ) {
- $order->remove_item( $item['id'] );
+ $this->remove_item( $order, $key, $item['id'] );
} else {
$this->set_item( $order, $key, $item );
}
@@ -170,6 +170,46 @@ class WC_REST_Orders_Controller extends WC_REST_Orders_V2_Controller {
return apply_filters( "woocommerce_rest_pre_insert_{$this->post_type}_object", $order, $request, $creating );
}
+ /**
+ * Wrapper method to remove order items.
+ * When updating, the item ID provided is checked to ensure it is associated
+ * with the order.
+ *
+ * @param WC_Order $order The order to remove the item from.
+ * @param string $item_type The item type (from the request, not from the item, e.g. 'line_items' rather than 'line_item').
+ * @param int $item_id The ID of the item to remove.
+ *
+ * @return void
+ * @throws WC_REST_Exception If item ID is not associated with order.
+ */
+ protected function remove_item( WC_Order $order, string $item_type, int $item_id ): void {
+ $item = $order->get_item( $item_id );
+
+ if ( ! $item ) {
+ throw new WC_REST_Exception(
+ 'woocommerce_rest_invalid_item_id',
+ esc_html__( 'Order item ID provided is not associated with order.', 'woocommerce' ),
+ 400
+ );
+ }
+
+ if ( 'line_items' === $item_type ) {
+ require_once WC_ABSPATH . 'includes/admin/wc-admin-functions.php';
+ wc_maybe_adjust_line_item_product_stock( $item, 0 );
+ }
+
+ /**
+ * Allow extensions be notified before the item is removed.
+ *
+ * @param WC_Order_Item $item The item object.
+ *
+ * @since 9.3.0.
+ */
+ do_action( 'woocommerce_rest_remove_order_item', $item );
+
+ $order->remove_item( $item_id );
+ }
+
/**
* Save an object data.
*
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-reviews-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-reviews-controller.php
index 46fad08b36a..0e25996d107 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-reviews-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-reviews-controller.php
@@ -472,6 +472,10 @@ class WC_REST_Product_Reviews_Controller extends WC_REST_Controller {
update_comment_meta( $review_id, 'rating', ! empty( $request['rating'] ) ? $request['rating'] : '0' );
+ if ( isset( $request['verified'] ) && ! empty( $request['verified'] ) ) {
+ update_comment_meta( $review_id, 'verified', $request['verified'] );
+ }
+
$review = get_comment( $review_id );
/**
@@ -586,6 +590,10 @@ class WC_REST_Product_Reviews_Controller extends WC_REST_Controller {
update_comment_meta( $id, 'rating', $request['rating'] );
}
+ if ( isset( $request['verified'] ) && ! empty( $request['verified'] ) ) {
+ update_comment_meta( $id, 'verified', $request['verified'] );
+ }
+
$review = get_comment( $id );
/** This action is documented in includes/api/class-wc-rest-product-reviews-controller.php */
@@ -1057,7 +1065,7 @@ class WC_REST_Product_Reviews_Controller extends WC_REST_Controller {
}
/**
- * Get the reivew, if the ID is valid.
+ * Get the review, if the ID is valid.
*
* @since 3.5.0
* @param int $id Supplied ID.
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php
index a8d37886478..f0baad08771 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-shipping-classes-controller.php
@@ -53,7 +53,7 @@ class WC_REST_Product_Shipping_Classes_Controller extends WC_REST_Product_Shippi
}
/**
- * Callback fuction for the slug-suggestion endpoint.
+ * Callback function for the slug-suggestion endpoint.
*
* @param WP_REST_Request $request Full details about the request.
* @return string The suggested slug.
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-variations-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-variations-controller.php
index aa298f52749..aaa06648fe1 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-variations-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-product-variations-controller.php
@@ -446,7 +446,7 @@ class WC_REST_Product_Variations_Controller extends WC_REST_Product_Variations_V
if ( is_wp_error( $upload ) ) {
/**
- * Filter to check if it should supress the image upload error, false by default.
+ * Filter to check if it should suppress the image upload error, false by default.
*
* @since 4.5.0
* @param bool false If it should suppress.
diff --git a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
index b4a3a933faa..f1c472a38cd 100644
--- a/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
+++ b/plugins/woocommerce/includes/rest-api/Controllers/Version3/class-wc-rest-products-controller.php
@@ -232,7 +232,7 @@ class WC_REST_Products_Controller extends WC_REST_Products_V2_Controller {
}
if ( wc_product_sku_enabled() ) {
- // Do a partial match for a sku. Supercedes sku parameter that does exact matching.
+ // Do a partial match for a sku. Supersedes sku parameter that does exact matching.
if ( ! empty( $request['search_sku'] ) ) {
// Store this for use in the query clause filters.
$this->search_sku_in_product_lookup_table = $request['search_sku'];
diff --git a/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-my-account.php b/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-my-account.php
index 49dafb20c7e..c090b4a52a1 100644
--- a/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-my-account.php
+++ b/plugins/woocommerce/includes/shortcodes/class-wc-shortcode-my-account.php
@@ -39,66 +39,55 @@ class WC_Shortcode_My_Account {
return;
}
- if ( ! is_user_logged_in() || isset( $wp->query_vars['lost-password'] ) ) {
+ self::my_account_add_notices();
+
+ // Show the lost password page. This can still be accessed directly by logged in accounts which is important for the initial create password links sent via email.
+ if ( isset( $wp->query_vars['lost-password'] ) ) {
+ self::lost_password();
+ return;
+ }
+
+ // Show login form if not logged in.
+ if ( ! is_user_logged_in() ) {
+ wc_get_template( 'myaccount/form-login.php' );
+ return;
+ }
+
+ // Output the my account page.
+ self::my_account( $atts );
+ }
+
+ /**
+ * Add notices to the my account page.
+ *
+ * Historically a filter has existed to render a message above the my account page content while the user is
+ * logged out. See `woocommerce_my_account_message`.
+ */
+ private static function my_account_add_notices() {
+ global $wp;
+
+ if ( ! is_user_logged_in() ) {
+ /**
+ * Filters the message shown on the 'my account' page when the user is not logged in.
+ *
+ * @since 2.6.0
+ */
$message = apply_filters( 'woocommerce_my_account_message', '' );
if ( ! empty( $message ) ) {
wc_add_notice( $message );
}
+ }
- // After password reset, add confirmation message.
- if ( ! empty( $_GET['password-reset'] ) ) { // WPCS: input var ok, CSRF ok.
- wc_add_notice( __( 'Your password has been reset successfully.', 'woocommerce' ) );
- }
+ // After password reset, add confirmation message.
+ if ( ! empty( $_GET['password-reset'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ wc_add_notice( __( 'Your password has been reset successfully.', 'woocommerce' ) );
+ }
- if ( isset( $wp->query_vars['lost-password'] ) ) {
- self::lost_password();
- } else {
- wc_get_template( 'myaccount/form-login.php' );
- }
- } else {
- // Start output buffer since the html may need discarding for BW compatibility.
- ob_start();
-
- if ( isset( $wp->query_vars['customer-logout'] ) ) {
- /* translators: %s: logout url */
- wc_add_notice( sprintf( __( 'Are you sure you want to log out? Confirm and log out ', 'woocommerce' ), wc_logout_url() ) );
- }
-
- // Collect notices before output.
- $notices = wc_get_notices();
-
- // Output the new account page.
- self::my_account( $atts );
-
- /**
- * Deprecated my-account.php template handling. This code should be
- * removed in a future release.
- *
- * If woocommerce_account_content did not run, this is an old template
- * so we need to render the endpoint content again.
- */
- if ( ! did_action( 'woocommerce_account_content' ) ) {
- if ( ! empty( $wp->query_vars ) ) {
- foreach ( $wp->query_vars as $key => $value ) {
- if ( 'pagename' === $key ) {
- continue;
- }
- if ( has_action( 'woocommerce_account_' . $key . '_endpoint' ) ) {
- ob_clean(); // Clear previous buffer.
- wc_set_notices( $notices );
- wc_print_notices();
- do_action( 'woocommerce_account_' . $key . '_endpoint', $value );
- break;
- }
- }
-
- wc_deprecated_function( 'Your theme version of my-account.php template', '2.6', 'the latest version, which supports multiple account pages and navigation, from WC 2.6.0' );
- }
- }
-
- // Send output buffer.
- ob_end_flush();
+ // After logging out without a nonce, add confirmation message.
+ if ( isset( $wp->query_vars['customer-logout'] ) && is_user_logged_in() ) {
+ /* translators: %s: logout url */
+ wc_add_notice( sprintf( __( 'Are you sure you want to log out? Confirm and log out ', 'woocommerce' ), wc_logout_url() ) );
}
}
diff --git a/plugins/woocommerce/includes/tracks/events/class-wc-extensions-tracking.php b/plugins/woocommerce/includes/tracks/events/class-wc-extensions-tracking.php
index cbd16c61744..897af313d68 100644
--- a/plugins/woocommerce/includes/tracks/events/class-wc-extensions-tracking.php
+++ b/plugins/woocommerce/includes/tracks/events/class-wc-extensions-tracking.php
@@ -34,7 +34,7 @@ class WC_Extensions_Tracking {
'section' => empty( $_REQUEST['section'] ) ? '_featured' : wc_clean( wp_unslash( $_REQUEST['section'] ) ),
);
- $event = 'extensions_view';
+ $event = 'extensions_view';
if ( 'helper' === $properties['section'] ) {
$event = 'subscriptions_view';
}
@@ -52,7 +52,7 @@ class WC_Extensions_Tracking {
* Send a Tracks event when the Extensions page gets a bad response or no response
* from the WCCOM extensions API.
*
- * @param string $error
+ * @param string $error Error message.
*/
public function track_extensions_page_connection_error( string $error = '' ) {
// phpcs:disable WordPress.Security.NonceVerification.Recommended
@@ -89,7 +89,17 @@ class WC_Extensions_Tracking {
* Send a Tracks even when a Helper connection process completed successfully.
*/
public function track_helper_connection_complete() {
- WC_Tracks::record_event( 'extensions_subscriptions_connected' );
+ $properties = array();
+
+ if ( ! empty( $_GET['utm_source'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $properties['utm_source'] = wc_clean( wp_unslash( $_GET['utm_source'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ }
+
+ if ( ! empty( $_GET['utm_campaign'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ $properties['utm_campaign'] = wc_clean( wp_unslash( $_GET['utm_campaign'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+ }
+
+ WC_Tracks::record_event( 'extensions_subscriptions_connected', $properties );
}
/**
diff --git a/plugins/woocommerce/includes/tracks/events/class-wc-product-collection-block-tracking.php b/plugins/woocommerce/includes/tracks/events/class-wc-product-collection-block-tracking.php
index 0021c9afc50..092be4f81ee 100644
--- a/plugins/woocommerce/includes/tracks/events/class-wc-product-collection-block-tracking.php
+++ b/plugins/woocommerce/includes/tracks/events/class-wc-product-collection-block-tracking.php
@@ -121,7 +121,7 @@ class WC_Product_Collection_Block_Tracking {
'in_single_product' => $is_in_single_product ? 'yes' : 'no',
'in_template_part' => $is_in_template_part ? 'yes' : 'no',
'in_synced_pattern' => $is_in_synced_pattern ? 'yes' : 'no',
- 'filters' => $this->get_query_filters_usage_data( $block ),
+ 'filters' => wp_json_encode( $this->get_query_filters_usage_data( $block ) ),
);
}
diff --git a/plugins/woocommerce/includes/tracks/events/class-wc-products-tracking.php b/plugins/woocommerce/includes/tracks/events/class-wc-products-tracking.php
index 3056f5b07d4..91532cf2a9f 100644
--- a/plugins/woocommerce/includes/tracks/events/class-wc-products-tracking.php
+++ b/plugins/woocommerce/includes/tracks/events/class-wc-products-tracking.php
@@ -29,8 +29,7 @@ class WC_Products_Tracking {
add_action( 'load-edit.php', array( $this, 'track_products_view' ), 10 );
add_action( 'load-edit-tags.php', array( $this, 'track_categories_and_tags_view' ), 10, 2 );
add_action( 'edit_post', array( $this, 'track_product_updated' ), 10, 2 );
- add_action( 'woocommerce_new_product', array( $this, 'track_product_published' ), 10, 3 );
- add_action( 'woocommerce_update_product', array( $this, 'track_product_published' ), 10, 3 );
+ add_action( 'wp_after_insert_post', array( $this, 'track_product_published' ), 10, 4 );
add_action( 'created_product_cat', array( $this, 'track_product_category_created' ) );
add_action( 'edited_product_cat', array( $this, 'track_product_category_updated' ) );
add_action( 'add_meta_boxes_product', array( $this, 'track_product_updated_client_side' ), 10 );
@@ -304,21 +303,24 @@ class WC_Products_Tracking {
/**
* Send a Tracks event when a product is published.
*
- * @param int $product_id Product ID.
- * @param WC_Product $product Product object.
- * @param array $changes Product changes.
+ * @param int $post_id Post ID.
+ * @param WP_Post $post Post object.
+ * @param bool $update Whether this is an existing post being updated.
+ * @param null|WP_Post $post_before Null for new posts, the WP_Post object prior
+ * to the update for updated posts.
*/
- public function track_product_published( $product_id, $product, $changes = null ) {
+ public function track_product_published( $post_id, $post, $update, $post_before ) {
if (
- ! isset( $product ) ||
- 'product' !== $product->post_type ||
- 'publish' !== $product->get_status( 'edit' ) ||
- ( $changes && ! isset( $changes['status'] ) )
+ 'product' !== $post->post_type ||
+ 'publish' !== $post->post_status ||
+ ( $post_before && 'publish' === $post_before->post_status )
) {
return;
}
- $product_type_options = self::get_product_type_options( $product_id );
+ $product = wc_get_product( $post_id );
+
+ $product_type_options = self::get_product_type_options( $post_id );
$product_type_options_string = self::get_product_type_options_string( $product_type_options );
$properties = array(
@@ -332,7 +334,7 @@ class WC_Products_Tracking {
'is_virtual' => $product->is_virtual() ? 'yes' : 'no',
'manage_stock' => $product->get_manage_stock() ? 'yes' : 'no',
'menu_order' => $product->get_menu_order() ? 'yes' : 'no',
- 'product_id' => $product_id,
+ 'product_id' => $post_id,
'product_gallery' => count( $product->get_gallery_image_ids() ),
'product_image' => $product->get_image_id() ? 'yes' : 'no',
'product_type' => $product->get_type(),
diff --git a/plugins/woocommerce/includes/wc-account-functions.php b/plugins/woocommerce/includes/wc-account-functions.php
index 7b76c515dae..7a4fe452588 100644
--- a/plugins/woocommerce/includes/wc-account-functions.php
+++ b/plugins/woocommerce/includes/wc-account-functions.php
@@ -22,6 +22,11 @@ function wc_lostpassword_url( $default_url = '' ) {
return $default_url;
}
+ // Don't change the admin form.
+ if ( did_action( 'login_form_login' ) ) {
+ return $default_url;
+ }
+
// Don't redirect to the woocommerce endpoint on global network admin lost passwords.
if ( is_multisite() && isset( $_GET['redirect_to'] ) && false !== strpos( wp_unslash( $_GET['redirect_to'] ), network_admin_url() ) ) { // WPCS: input var ok, sanitization ok, CSRF ok.
return $default_url;
@@ -131,21 +136,15 @@ function wc_get_account_menu_items() {
}
/**
- * Get account menu item classes.
+ * Find current item in account menu.
*
- * @since 2.6.0
+ * @since 9.3.0
* @param string $endpoint Endpoint.
- * @return string
+ * @return bool
*/
-function wc_get_account_menu_item_classes( $endpoint ) {
+function wc_is_current_account_menu_item( $endpoint ) {
global $wp;
- $classes = array(
- 'woocommerce-MyAccount-navigation-link',
- 'woocommerce-MyAccount-navigation-link--' . $endpoint,
- );
-
- // Set current item class.
$current = isset( $wp->query_vars[ $endpoint ] );
if ( 'dashboard' === $endpoint && ( isset( $wp->query_vars['page'] ) || empty( $wp->query_vars ) ) ) {
$current = true; // Dashboard is not an endpoint, so needs a custom check.
@@ -155,7 +154,23 @@ function wc_get_account_menu_item_classes( $endpoint ) {
$current = true;
}
- if ( $current ) {
+ return $current;
+}
+
+/**
+ * Get account menu item classes.
+ *
+ * @since 2.6.0
+ * @param string $endpoint Endpoint.
+ * @return string
+ */
+function wc_get_account_menu_item_classes( $endpoint ) {
+ $classes = array(
+ 'woocommerce-MyAccount-navigation-link',
+ 'woocommerce-MyAccount-navigation-link--' . $endpoint,
+ );
+
+ if ( wc_is_current_account_menu_item( $endpoint ) ) {
$classes[] = 'is-active';
}
@@ -176,11 +191,13 @@ function wc_get_account_endpoint_url( $endpoint ) {
return wc_get_page_permalink( 'myaccount' );
}
+ $url = wc_get_endpoint_url( $endpoint, '', wc_get_page_permalink( 'myaccount' ) );
+
if ( 'customer-logout' === $endpoint ) {
- return wc_logout_url();
+ return wp_nonce_url( $url, 'customer-logout' );
}
- return wc_get_endpoint_url( $endpoint, '', wc_get_page_permalink( 'myaccount' ) );
+ return $url;
}
/**
diff --git a/plugins/woocommerce/includes/wc-cart-functions.php b/plugins/woocommerce/includes/wc-cart-functions.php
index c4657188505..d0a048d3bbb 100644
--- a/plugins/woocommerce/includes/wc-cart-functions.php
+++ b/plugins/woocommerce/includes/wc-cart-functions.php
@@ -123,9 +123,9 @@ function wc_add_to_cart_message( $products, $show_qty = false, $return = false )
$wp_button_class = wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '';
if ( 'yes' === get_option( 'woocommerce_cart_redirect_after_add' ) ) {
$return_to = apply_filters( 'woocommerce_continue_shopping_redirect', wc_get_raw_referer() ? wp_validate_redirect( wc_get_raw_referer(), false ) : wc_get_page_permalink( 'shop' ) );
- $message = sprintf( '%s %s', esc_url( $return_to ), esc_attr( $wp_button_class ), esc_html__( 'Continue shopping', 'woocommerce' ), esc_html( $added_text ) );
+ $message = sprintf( '%s %s ', esc_html( $added_text ), esc_url( $return_to ), esc_attr( $wp_button_class ), esc_html__( 'Continue shopping', 'woocommerce' ) );
} else {
- $message = sprintf( '%s %s', esc_url( wc_get_cart_url() ), esc_attr( $wp_button_class ), esc_html__( 'View cart', 'woocommerce' ), esc_html( $added_text ) );
+ $message = sprintf( '%s %s ', esc_html( $added_text ), esc_url( wc_get_cart_url() ), esc_attr( $wp_button_class ), esc_html__( 'View cart', 'woocommerce' ) );
}
if ( has_filter( 'wc_add_to_cart_message' ) ) {
@@ -170,6 +170,10 @@ function wc_format_list_of_items( $items ) {
function wc_clear_cart_after_payment() {
global $wp;
+ $should_clear_cart_after_payment = false;
+ $after_payment = false;
+
+ // If the order has been received, clear the cart.
if ( ! empty( $wp->query_vars['order-received'] ) ) {
$order_id = absint( $wp->query_vars['order-received'] );
@@ -179,21 +183,39 @@ function wc_clear_cart_after_payment() {
$order = wc_get_order( $order_id );
if ( $order instanceof WC_Order && hash_equals( $order->get_order_key(), $order_key ) ) {
- WC()->cart->empty_cart();
+ $should_clear_cart_after_payment = true;
+ $after_payment = true;
}
}
}
- if ( WC()->session->order_awaiting_payment > 0 ) {
+ // If the order is awaiting payment, and we haven't already decided to clear the cart, check the order status.
+ if ( is_object( WC()->session ) && WC()->session->order_awaiting_payment > 0 && ! $should_clear_cart_after_payment ) {
$order = wc_get_order( WC()->session->order_awaiting_payment );
if ( $order instanceof WC_Order && $order->get_id() > 0 ) {
- // If the order has not failed, or is not pending, the order must have gone through.
- if ( ! $order->has_status( array( 'failed', 'pending', 'cancelled' ) ) ) {
- WC()->cart->empty_cart();
- }
+ // If the order status is neither pending, failed, nor cancelled, the order must have gone through.
+ $should_clear_cart_after_payment = ! $order->has_status( array( 'failed', 'pending', 'cancelled' ) );
+ $after_payment = true;
}
}
+
+ // If it doesn't look like a payment happened, bail early.
+ if ( ! $after_payment ) {
+ return;
+ }
+
+ /**
+ * Determine whether the cart should be cleared after payment.
+ *
+ * @since 9.3.0
+ * @param bool $should_clear_cart_after_payment Whether the cart should be cleared after payment.
+ */
+ $should_clear_cart_after_payment = apply_filters( 'woocommerce_should_clear_cart_after_payment', $should_clear_cart_after_payment );
+
+ if ( $should_clear_cart_after_payment ) {
+ WC()->cart->empty_cart();
+ }
}
add_action( 'template_redirect', 'wc_clear_cart_after_payment', 20 );
@@ -391,7 +413,12 @@ function wc_cart_round_discount( $value, $precision ) {
*/
function wc_get_chosen_shipping_method_ids() {
$method_ids = array();
- $chosen_methods = WC()->session->get( 'chosen_shipping_methods', array() );
+ $chosen_methods = array();
+
+ if ( is_callable( array( WC()->session, 'get' ) ) ) {
+ $chosen_methods = WC()->session->get( 'chosen_shipping_methods', array() );
+ }
+
foreach ( $chosen_methods as $chosen_method ) {
if ( ! is_string( $chosen_method ) ) {
continue;
@@ -399,6 +426,7 @@ function wc_get_chosen_shipping_method_ids() {
$chosen_method = explode( ':', $chosen_method );
$method_ids[] = current( $chosen_method );
}
+
return $method_ids;
}
diff --git a/plugins/woocommerce/includes/wc-core-functions.php b/plugins/woocommerce/includes/wc-core-functions.php
index 9099609a91c..4158fd900e0 100644
--- a/plugins/woocommerce/includes/wc-core-functions.php
+++ b/plugins/woocommerce/includes/wc-core-functions.php
@@ -456,6 +456,15 @@ function wc_clear_template_cache() {
}
}
+/**
+ * Clear the system status theme info cache.
+ *
+ * @since 9.4.0
+ */
+function wc_clear_system_status_theme_info_cache() {
+ delete_transient( 'wc_system_status_theme_info' );
+}
+
/**
* Get Base Currency Code.
*
@@ -1469,12 +1478,27 @@ function wc_transaction_query( $type = 'start', $force = false ) {
/**
* Gets the url to the cart page.
*
- * @since 2.5.0
+ * @since 2.5.0
+ * @since 9.3.0 To support shortcodes on other pages besides the main cart page, this returns the current URL if it is the cart page.
*
* @return string Url to cart page
*/
function wc_get_cart_url() {
- return apply_filters( 'woocommerce_get_cart_url', wc_get_page_permalink( 'cart' ) );
+ if ( is_cart() && isset( $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'] ) ) {
+ $protocol = is_ssl() ? 'https' : 'http';
+ $current_url = esc_url_raw( $protocol . '://' . wp_unslash( $_SERVER['HTTP_HOST'] ) . wp_unslash( $_SERVER['REQUEST_URI'] ) );
+ $cart_url = remove_query_arg( array( 'remove_item', 'add-to-cart', 'added-to-cart', 'order_again', '_wpnonce' ), $current_url );
+ } else {
+ $cart_url = wc_get_page_permalink( 'cart' );
+ }
+
+ /**
+ * Filter the cart URL.
+ *
+ * @since 2.5.0
+ * @param string $cart_url Cart URL.
+ */
+ return apply_filters( 'woocommerce_get_cart_url', $cart_url );
}
/**
@@ -1580,6 +1604,8 @@ function wc_help_tip( $tip, $allow_html = false ) {
$sanitized_tip = esc_attr( $tip );
}
+ $aria_label = wp_strip_all_tags( $tip );
+
/**
* Filter the help tip.
*
@@ -1592,7 +1618,7 @@ function wc_help_tip( $tip, $allow_html = false ) {
*
* @return string
*/
- return apply_filters( 'wc_help_tip', 'Confirm and log out ', 'woocommerce' ), wc_logout_url() ) );
+ wp_safe_redirect( wc_get_page_permalink( 'myaccount' ) );
exit;
}
@@ -237,11 +237,11 @@ function wc_set_loop_prop( $prop, $value = '' ) {
}
/**
- * Set the current visbility for a product in the woocommerce_loop global.
+ * Set the current visibility for a product in the woocommerce_loop global.
*
* @since 4.4.0
- * @param int $product_id Product it to cache visbiility for.
- * @param bool $value The poduct visibility value to cache.
+ * @param int $product_id Product it to cache visibility for.
+ * @param bool $value The product visibility value to cache.
*/
function wc_set_loop_product_visibility( $product_id, $value ) {
wc_set_loop_prop( "product_visibility_$product_id", $value );
@@ -1387,6 +1387,10 @@ if ( ! function_exists( 'woocommerce_template_loop_add_to_cart' ) ) {
),
);
+ if ( is_a( $product, 'WC_Product_Simple' ) ) {
+ $defaults['attributes']['data-success_message'] = $product->add_to_cart_success_message();
+ }
+
$args = apply_filters( 'woocommerce_loop_add_to_cart_args', wp_parse_args( $args, $defaults ), $product );
if ( ! empty( $args['attributes']['aria-describedby'] ) ) {
@@ -1611,25 +1615,39 @@ function wc_get_gallery_image_html( $attachment_id, $main_image = false ) {
$thumbnail_srcset = wp_get_attachment_image_srcset( $attachment_id, $thumbnail_size );
$full_src = wp_get_attachment_image_src( $attachment_id, $full_size );
$alt_text = trim( wp_strip_all_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) );
- $image = wp_get_attachment_image(
+
+ /**
+ * Filters the attributes for the image markup.
+ *
+ * @since 3.3.2
+ *
+ * @param array $image_attributes Attributes for the image markup.
+ */
+ $image_params = apply_filters(
+ 'woocommerce_gallery_image_html_attachment_image_params',
+ array(
+ 'title' => _wp_specialchars( get_post_field( 'post_title', $attachment_id ), ENT_QUOTES, 'UTF-8', true ),
+ 'data-caption' => _wp_specialchars( get_post_field( 'post_excerpt', $attachment_id ), ENT_QUOTES, 'UTF-8', true ),
+ 'data-src' => esc_url( $full_src[0] ),
+ 'data-large_image' => esc_url( $full_src[0] ),
+ 'data-large_image_width' => esc_attr( $full_src[1] ),
+ 'data-large_image_height' => esc_attr( $full_src[2] ),
+ 'class' => esc_attr( $main_image ? 'wp-post-image' : '' ),
+ ),
+ $attachment_id,
+ $image_size,
+ $main_image
+ );
+
+ if ( isset( $image_params['title'] ) ) {
+ unset( $image_params['title'] );
+ }
+
+ $image = wp_get_attachment_image(
$attachment_id,
$image_size,
false,
- apply_filters(
- 'woocommerce_gallery_image_html_attachment_image_params',
- array(
- 'title' => _wp_specialchars( get_post_field( 'post_title', $attachment_id ), ENT_QUOTES, 'UTF-8', true ),
- 'data-caption' => _wp_specialchars( get_post_field( 'post_excerpt', $attachment_id ), ENT_QUOTES, 'UTF-8', true ),
- 'data-src' => esc_url( $full_src[0] ),
- 'data-large_image' => esc_url( $full_src[0] ),
- 'data-large_image_width' => esc_attr( $full_src[1] ),
- 'data-large_image_height' => esc_attr( $full_src[2] ),
- 'class' => esc_attr( $main_image ? 'wp-post-image' : '' ),
- ),
- $attachment_id,
- $image_size,
- $main_image
- )
+ $image_params
);
return '';
@@ -2854,6 +2872,12 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
}
if ( $args['required'] ) {
+ // hidden inputs are the only kind of inputs that don't need an `aria-required` attribute.
+ // checkboxes apply the `custom_attributes` to the label - we need to apply the attribute on the input itself, instead.
+ if ( ! in_array( $args['type'], array( 'hidden', 'checkbox' ), true ) ) {
+ $args['custom_attributes']['aria-required'] = 'true';
+ }
+
$args['class'][] = 'validate-required';
$required = ' * ';
} else {
@@ -2978,12 +3002,13 @@ if ( ! function_exists( 'woocommerce_form_field' ) ) {
}
$field .= sprintf(
- '' . $notice . '
';
}
@@ -4019,3 +4053,45 @@ function wc_update_product_archive_title( $post_type_name, $post_type ) {
add_filter( 'post_type_archive_title', 'wc_update_product_archive_title', 10, 2 );
// phpcs:enable Generic.Commenting.Todo.TaskFound
+
+/**
+ * Set the version of the hooked blocks in the database. Used when WC is installed for the first time.
+ *
+ * @since 9.2.0
+ *
+ * @return void
+ */
+function wc_set_hooked_blocks_version() {
+ // Only set the version if the current theme is a block theme.
+ if ( ! wc_current_theme_is_fse_theme() && ! current_theme_supports( 'block-template-parts' ) ) {
+ return;
+ }
+
+ $option_name = 'woocommerce_hooked_blocks_version';
+
+ if ( get_option( $option_name ) ) {
+ return;
+ }
+
+ add_option( $option_name, WC()->version );
+}
+
+/**
+ * If the user switches from a classic to a block theme and they haven't already got a woocommerce_hooked_blocks_version,
+ * set the version of the hooked blocks in the database, or as "no" to disable all block hooks then set as the latest WC version.
+ *
+ * @since 9.2.0
+ *
+ * @param string $old_name Old theme name.
+ * @param \WP_Theme $old_theme Instance of the old theme.
+ * @return void
+ */
+function wc_set_hooked_blocks_version_on_theme_switch( $old_name, $old_theme ) {
+ $option_name = 'woocommerce_hooked_blocks_version';
+ $option_value = get_option( $option_name, false );
+
+ // Sites with the option value set to "no" have already been migrated, and block hooks have been disabled. Checking explicitly for false to avoid setting the option again.
+ if ( ! $old_theme->is_block_theme() && ( wc_current_theme_is_fse_theme() || current_theme_supports( 'block-template-parts' ) ) && false === $option_value ) {
+ add_option( $option_name, WC()->version );
+ }
+}
diff --git a/plugins/woocommerce/includes/wc-template-hooks.php b/plugins/woocommerce/includes/wc-template-hooks.php
index 22588ca1d2f..e9fa7da964f 100644
--- a/plugins/woocommerce/includes/wc-template-hooks.php
+++ b/plugins/woocommerce/includes/wc-template-hooks.php
@@ -319,3 +319,8 @@ add_action( 'woocommerce_before_customer_login_form', 'woocommerce_output_all_no
add_action( 'woocommerce_before_lost_password_form', 'woocommerce_output_all_notices', 10 );
add_action( 'before_woocommerce_pay', 'woocommerce_output_all_notices', 10 );
add_action( 'woocommerce_before_reset_password_form', 'woocommerce_output_all_notices', 10 );
+
+/**
+ * Hooked blocks.
+ */
+add_action( 'after_switch_theme', 'wc_set_hooked_blocks_version_on_theme_switch', 10, 2 );
diff --git a/plugins/woocommerce/includes/wc-update-functions.php b/plugins/woocommerce/includes/wc-update-functions.php
index ff5f6ee2feb..179cd988255 100644
--- a/plugins/woocommerce/includes/wc-update-functions.php
+++ b/plugins/woocommerce/includes/wc-update-functions.php
@@ -416,7 +416,7 @@ function wc_update_209_brazillian_state() {
// phpcs:disable WordPress.DB.SlowDBQuery
- // Update brazillian state codes.
+ // Update Brazilian state codes.
$wpdb->update(
$wpdb->postmeta,
array(
@@ -2598,7 +2598,7 @@ function wc_update_770_remove_multichannel_marketing_feature_options() {
/**
* Migrate transaction data which was being incorrectly stored in the postmeta table to HPOS tables.
*
- * @return bool Whether there are pending migration recrods.
+ * @return bool Whether there are pending migration records.
*/
function wc_update_810_migrate_transactional_metadata_for_hpos() {
global $wpdb;
@@ -2730,6 +2730,45 @@ function wc_update_910_add_launch_your_store_tour_option() {
add_option( 'woocommerce_show_lys_tour', 'yes' );
}
+/**
+ * Add woocommerce_hooked_blocks_version option for existing stores that are using a theme that supports the Block Hooks API
+ */
+function wc_update_920_add_wc_hooked_blocks_version_option() {
+ if ( ! wc_current_theme_is_fse_theme() && ! current_theme_supports( 'block-template-parts' ) ) {
+ return;
+ }
+
+ $option_name = 'woocommerce_hooked_blocks_version';
+ $option_value = get_option( $option_name );
+
+ // If the option already exists, we don't need to do anything.
+ if ( false !== $option_value ) {
+ return;
+ }
+
+ /**
+ * A list of theme slugs to execute this with.
+ * We are applying this filter to allow for the list to be extended by third-parties who were already using it.
+ *
+ * @since 8.4.0
+ */
+ $theme_include_list = apply_filters( 'woocommerce_hooked_blocks_theme_include_list', array( 'Twenty Twenty-Four', 'Twenty Twenty-Three', 'Twenty Twenty-Two', 'Tsubaki', 'Zaino', 'Thriving Artist', 'Amulet', 'Tazza' ) );
+ $active_theme_name = wp_get_theme()->get( 'Name' );
+ $should_set_hooked_blocks_version = in_array( $active_theme_name, $theme_include_list, true );
+
+ if ( $should_set_hooked_blocks_version ) {
+ // Set 8.4.0 as the version for existing stores that are using a theme that supports the Block Hooks API.
+ // This will ensure that the Block Hooks API is enabled for these stores and works as expected.
+ // Existing stores that aren't running approved block themes will not have the Block Hooks API enabled.
+ add_option( $option_name, '8.4.0' );
+ } else {
+ // For block themes that aren't approved themes set this option to "no" to completely disable hooked blocks.
+ // This means we can assume the absence of the option is when a site is switching from a classic theme to a block theme for the first time.
+ // Note: We have to use "no" instead of false since the latter is the default value for the option if it doesn't exist.
+ add_option( $option_name, 'no' );
+ }
+}
+
/**
* Remove user meta associated with the keys '_last_order', '_order_count' and '_money_spent'.
*
@@ -2740,14 +2779,16 @@ function wc_update_910_add_launch_your_store_tour_option() {
function wc_update_910_remove_obsolete_user_meta() {
global $wpdb;
- $deletions = $wpdb->query( "
+ $deletions = $wpdb->query(
+ "
DELETE FROM $wpdb->usermeta
WHERE meta_key IN (
'_last_order',
'_order_count',
'_money_spent'
)
- " );
+ "
+ );
$logger = wc_get_logger();
@@ -2776,3 +2817,38 @@ function wc_update_910_remove_obsolete_user_meta() {
);
}
}
+
+/**
+ * Add woocommerce_coming_soon option when it is not currently present.
+ */
+function wc_update_930_add_woocommerce_coming_soon_option() {
+ add_option( 'woocommerce_coming_soon', 'no' );
+}
+
+/**
+ * Migrate Launch Your Store tour meta keys to the woocommerce_meta user data fields.
+ */
+function wc_update_930_migrate_user_meta_for_launch_your_store_tour() {
+ // Rename `woocommerce_launch_your_store_tour_hidden` meta key to `woocommerce_admin_launch_your_store_tour_hidden`.
+ global $wpdb;
+ $wpdb->query(
+ $wpdb->prepare(
+ "UPDATE {$wpdb->usermeta}
+ SET meta_key = %s
+ WHERE meta_key = %s",
+ 'woocommerce_admin_launch_your_store_tour_hidden',
+ 'woocommerce_launch_your_store_tour_hidden'
+ )
+ );
+
+ // Rename `woocommerce_coming_soon_banner_dismissed` meta key to `woocommerce_admin_coming_soon_banner_dismissed`.
+ $wpdb->query(
+ $wpdb->prepare(
+ "UPDATE {$wpdb->usermeta}
+ SET meta_key = %s
+ WHERE meta_key = %s",
+ 'woocommerce_admin_coming_soon_banner_dismissed',
+ 'woocommerce_coming_soon_banner_dismissed'
+ )
+ );
+}
diff --git a/plugins/woocommerce/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-ssr-controller.php b/plugins/woocommerce/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-ssr-controller.php
index 0dbee4d8feb..886e8e286b2 100644
--- a/plugins/woocommerce/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-ssr-controller.php
+++ b/plugins/woocommerce/includes/wccom-site/rest-api/endpoints/class-wc-rest-wccom-site-ssr-controller.php
@@ -55,7 +55,7 @@ class WC_REST_WCCOM_Site_SSR_Controller extends WC_REST_WCCOM_Site_Controller {
}
/**
- * Generate SSR data and submit it to WooCommmerce.com.
+ * Generate SSR data and submit it to WooCommerce.com.
*
* @since 7.8.0
* @param WP_REST_Request $request Full details about the request.
diff --git a/plugins/woocommerce/lib/packages/Detection/MobileDetect.php b/plugins/woocommerce/lib/packages/Detection/MobileDetect.php
index d4c2d48c7c8..f7eb621e537 100644
--- a/plugins/woocommerce/lib/packages/Detection/MobileDetect.php
+++ b/plugins/woocommerce/lib/packages/Detection/MobileDetect.php
@@ -789,7 +789,7 @@ class MobileDetect
'SamsungBrowser' => 'SamsungBrowser/[VER]',
'Iron' => 'Iron/[VER]',
// @note: Safari 7534.48.3 is actually Version 5.1.
- // @note: On BlackBerry the Version is overwriten by the OS.
+ // @note: On BlackBerry the Version is overwritten by the OS.
'Safari' => ['Version/[VER]', 'Safari/[VER]'],
'Skyfire' => 'Skyfire/[VER]',
'Tizen' => 'Tizen/[VER]',
diff --git a/plugins/woocommerce/package.json b/plugins/woocommerce/package.json
index afc80c04526..7ed07ba6aba 100644
--- a/plugins/woocommerce/package.json
+++ b/plugins/woocommerce/package.json
@@ -2,7 +2,7 @@
"name": "@woocommerce/plugin-woocommerce",
"private": true,
"title": "WooCommerce",
- "version": "9.2.0",
+ "version": "9.4.0",
"homepage": "https://woocommerce.com/",
"repository": {
"type": "git",
@@ -51,10 +51,9 @@
"makepot": "composer run-script makepot",
"packages:fix:textdomain": "node ./bin/package-update-textdomain.js",
"test": "pnpm test:unit",
- "test:api": "API_TEST_REPORT_DIR=\"$PWD/tests/api\" pnpm exec wc-api-tests test api",
- "test:api-pw": "USE_WP_ENV=1 pnpm playwright test --config=tests/api-core-tests/playwright.config.js",
- "test:e2e-pw": "pnpm test:e2e:install && pnpm playwright test --config=tests/e2e-pw/envs/default/playwright.config.js",
- "test:e2e": "pnpm test:e2e:install && pnpm test:e2e:with-env default",
+ "test:api": "pnpm test:e2e:default --project=api --workers 4",
+ "test:e2e": "pnpm test:e2e:default --project=ui",
+ "test:e2e:default": "pnpm test:e2e:install && pnpm test:e2e:with-env default",
"test:e2e:install": "pnpm playwright install chromium",
"test:e2e:blocks": "pnpm --filter='@woocommerce/block-library' test:e2e",
"test:e2e:with-env": "pnpm test:e2e:install && bash ./tests/e2e-pw/run-tests-with-env.sh",
@@ -73,7 +72,8 @@
"update-wp-env": "php ./tests/e2e-pw/bin/update-wp-env.php",
"watch:build": "pnpm --if-present --workspace-concurrency=Infinity --filter=\"$npm_package_name...\" --parallel '/^watch:build:project:.*$/'",
"watch:build:project": "pnpm --if-present run '/^watch:build:project:.*$/'",
- "watch:build:project:copy-assets": "wireit"
+ "watch:build:project:copy-assets": "wireit",
+ "wp-env": "wp-env"
},
"lint-staged": {
"*.php": [
@@ -92,61 +92,32 @@
"command": "lint:changes:branch ",
"changes": [
"composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php",
- "tests/**/*.js"
+ "**/*.php",
+ "**/*.js"
]
},
"tests": [
{
- "name": "PHP",
+ "name": "PHP: 8.0 WP: latest",
"testType": "unit:php",
"command": "test:php:env",
- "changes": [
- "client/admin/config/*.json",
- "composer.json",
- "composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php"
+ "shardingArguments": [
+ "--testsuite=wc-phpunit-legacy",
+ "--testsuite=wc-phpunit-main"
],
- "testEnv": {
- "start": "env:test"
- },
- "events": [
- "pull_request",
- "push"
- ]
- },
- {
- "name": "PHP 8.0",
- "testType": "unit:php",
- "command": "test:php:env",
"changes": [
"client/admin/config/*.json",
"composer.json",
"composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php"
+ "**/*.php",
+ ".wp-env.json",
+ "phpunit.xml"
],
"testEnv": {
"start": "env:test",
"config": {
- "phpVersion": "8.0"
+ "phpVersion": "8.0",
+ "wpVersion": "latest"
}
},
"events": [
@@ -158,17 +129,17 @@
"name": "PHP WP: latest - 1",
"testType": "unit:php",
"command": "test:php:env",
+ "shardingArguments": [
+ "--testsuite=wc-phpunit-legacy",
+ "--testsuite=wc-phpunit-main"
+ ],
"changes": [
"client/admin/config/*.json",
"composer.json",
"composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php"
+ "**/*.php",
+ ".wp-env.json",
+ "phpunit.xml"
],
"testEnv": {
"start": "env:test",
@@ -181,49 +152,22 @@
"push"
]
},
- {
- "name": "PHP WP: latest - 2",
- "testType": "unit:php",
- "command": "test:php:env",
- "changes": [
- "client/admin/config/*.json",
- "composer.json",
- "composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php"
- ],
- "testEnv": {
- "start": "env:test",
- "config": {
- "wpVersion": "latest-2"
- }
- },
- "events": [
- "pull_request",
- "push"
- ]
- },
{
"name": "PHP WP: nightly",
"testType": "unit:php",
"command": "test:php:env",
+ "shardingArguments": [
+ "--testsuite=wc-phpunit-legacy",
+ "--testsuite=wc-phpunit-main"
+ ],
"optional": true,
"changes": [
"client/admin/config/*.json",
"composer.json",
"composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/php/**/*.php",
- "tests/legacy/unit-tests/**/*.php",
- "tests/unit-tests/**/*.php"
+ "**/*.php",
+ ".wp-env.json",
+ "phpunit.xml"
],
"testEnv": {
"start": "env:test",
@@ -239,7 +183,7 @@
{
"name": "Core e2e tests",
"testType": "e2e",
- "command": "test:e2e:with-env default",
+ "command": "test:e2e",
"shardingArguments": [
"--shard=1/6",
"--shard=2/6",
@@ -256,7 +200,10 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/e2e-pw/**"
+ "tests/e2e-pw/**",
+ ".wp-env.json",
+ "woocommerce.php",
+ "uninstall.php"
],
"testEnv": {
"start": "env:test"
@@ -382,28 +329,13 @@
{
"name": "Core e2e tests - HPOS disabled",
"testType": "e2e",
- "command": "test:e2e:with-env default",
- "shardingArguments": [
- "--shard=1/5",
- "--shard=2/5",
- "--shard=3/5",
- "--shard=4/5",
- "--shard=5/5"
- ],
+ "command": "test:e2e:with-env default-hpos-disabled --project=ui",
+ "shardingArguments": [],
"events": [
"daily-checks",
"release-checks"
],
- "changes": [
- "client/admin/config/*.json",
- "composer.json",
- "composer.lock",
- "includes/**/*.php",
- "patterns/**/*.php",
- "src/**/*.php",
- "templates/**/*.php",
- "tests/e2e-pw/**"
- ],
+ "changes": [],
"testEnv": {
"start": "env:test",
"config": {
@@ -411,7 +343,7 @@
}
},
"report": {
- "resultsBlobName": "core-e2e-reports-non-hpos",
+ "resultsBlobName": "core-e2e-reports-hpos-disabled",
"resultsPath": "tests/e2e-pw/test-results",
"allure": true
}
@@ -419,7 +351,7 @@
{
"name": "Core e2e tests - PHP 8.1",
"testType": "e2e",
- "command": "test:e2e:with-env default",
+ "command": "test:e2e",
"shardingArguments": [
"--shard=1/5",
"--shard=2/5",
@@ -447,7 +379,7 @@
{
"name": "Core e2e tests - WP latest-1",
"testType": "e2e",
- "command": "test:e2e:with-env default",
+ "command": "test:e2e",
"shardingArguments": [
"--shard=1/5",
"--shard=2/5",
@@ -475,7 +407,7 @@
{
"name": "Core API tests",
"testType": "api",
- "command": "test:api-pw",
+ "command": "test:api",
"optional": false,
"changes": [
"client/admin/config/*.json",
@@ -485,8 +417,9 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/api-core-tests/**",
- "tests/e2e-pw/bin/**"
+ ".wp-env.json",
+ "woocommerce.php",
+ "uninstall.php"
],
"testEnv": {
"start": "env:test"
@@ -497,14 +430,14 @@
],
"report": {
"resultsBlobName": "core-api-report",
- "resultsPath": "tests/api-core-tests/test-results",
+ "resultsPath": "tests/e2e-pw/test-results",
"allure": true
}
},
{
"name": "Core API tests - HPOS disabled",
"testType": "api",
- "command": "test:api-pw",
+ "command": "test:e2e:with-env default-hpos-disabled --project=api",
"optional": false,
"changes": [
"client/admin/config/*.json",
@@ -514,8 +447,10 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/api-core-tests/**",
- "tests/e2e-pw/bin/**"
+ "tests/e2e-pw/bin/**",
+ ".wp-env.json",
+ "woocommerce.php",
+ "uninstall.php"
],
"events": [
"push"
@@ -528,7 +463,7 @@
},
"report": {
"resultsBlobName": "core-api-report-hpos-disabled",
- "resultsPath": "tests/api-core-tests/test-results",
+ "resultsPath": "tests/e2e-pw/test-results",
"allure": true
}
},
@@ -545,7 +480,10 @@
"patterns/**/*.php",
"src/**/*.php",
"templates/**/*.php",
- "tests/performance/**"
+ "tests/performance/**",
+ ".wp-env.json",
+ "woocommerce.php",
+ "uninstall.php"
],
"testEnv": {
"start": "env:perf"
@@ -568,11 +506,16 @@
"src/**/*.php",
"templates/**/*.php",
"templates/**/*.html",
- "tests/metrics/**"
+ "tests/metrics/**",
+ ".wp-env.json"
],
"events": [
- "disabled"
- ]
+ "push"
+ ],
+ "report": {
+ "resultsBlobName": "core-metrics-report",
+ "resultsPath": "../../tools/compare-perf/artifacts/"
+ }
},
{
"name": "Blocks e2e tests",
@@ -616,13 +559,30 @@
"shardingArguments": [],
"changes": [],
"events": [
- "daily-checks"
+ "daily-checks",
+ "on-demand"
],
"report": {
"resultsBlobName": "default-pressable-core-e2e",
"resultsPath": "tests/e2e-pw/test-results",
"allure": true
}
+ },
+ {
+ "name": "Core e2e tests - default WPCOM site",
+ "testType": "e2e",
+ "command": "test:e2e:with-env default-wpcom",
+ "shardingArguments": [],
+ "changes": [],
+ "events": [
+ "daily-checks",
+ "on-demand"
+ ],
+ "report": {
+ "resultsBlobName": "default-wpcom-core-e2e",
+ "resultsPath": "tests/e2e-pw/test-results",
+ "allure": true
+ }
}
]
}
@@ -632,7 +592,7 @@
"@babel/core": "7.12.9",
"@babel/preset-env": "7.12.7",
"@babel/register": "7.12.1",
- "@playwright/test": "^1.45.1",
+ "@playwright/test": "^1.46.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/experimental-utils": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
@@ -646,8 +606,8 @@
"@woocommerce/woocommerce-rest-api": "^1.0.1",
"@wordpress/babel-plugin-import-jsx-pragma": "1.1.3",
"@wordpress/babel-preset-default": "3.0.2",
- "@wordpress/e2e-test-utils-playwright": "wp-6.4",
- "@wordpress/env": "^9.0.7",
+ "@wordpress/e2e-test-utils-playwright": "wp-6.6",
+ "@wordpress/env": "^10.1.0",
"@wordpress/stylelint-config": "^21.36.0",
"allure-commandline": "^2.25.0",
"allure-playwright": "^2.9.2",
@@ -679,7 +639,7 @@
},
"engines": {
"node": "^20.11.1",
- "pnpm": "^9.1.0"
+ "pnpm": "9.1.3"
},
"browserslist": [
"> 0.1%",
diff --git a/plugins/woocommerce/patterns/banner.php b/plugins/woocommerce/patterns/banner.php
index 09d145e6299..11da651b411 100644
--- a/plugins/woocommerce/patterns/banner.php
+++ b/plugins/woocommerce/patterns/banner.php
@@ -27,9 +27,9 @@ $second_description = $content['descriptions'][1]['default'] ?? '';
-
-
-
+
+
diff --git a/plugins/woocommerce/patterns/coming-soon-entire-site.php b/plugins/woocommerce/patterns/coming-soon-entire-site.php
index e168886d453..6853b90d637 100644
--- a/plugins/woocommerce/patterns/coming-soon-entire-site.php
+++ b/plugins/woocommerce/patterns/coming-soon-entire-site.php
@@ -19,8 +19,8 @@ if ( 'twentytwentyfour' === $current_theme ) {
}
?>
-
-
diff --git a/plugins/woocommerce/patterns/coming-soon-store-only.php b/plugins/woocommerce/patterns/coming-soon-store-only.php
index b84d6e6a192..ad54ce0ccc9 100644
--- a/plugins/woocommerce/patterns/coming-soon-store-only.php
+++ b/plugins/woocommerce/patterns/coming-soon-store-only.php
@@ -20,8 +20,8 @@ if ( 'twentytwentyfour' === $current_theme ) {
?>
-
-
diff --git a/plugins/woocommerce/patterns/content-right-image-left.php b/plugins/woocommerce/patterns/content-right-image-left.php
index baa05e426d0..f6959940329 100644
--- a/plugins/woocommerce/patterns/content-right-image-left.php
+++ b/plugins/woocommerce/patterns/content-right-image-left.php
@@ -9,9 +9,9 @@ declare(strict_types=1);
use Automattic\WooCommerce\Blocks\AIContent\PatternsHelper;
-$header = __( 'Discover a world of possibilities', 'woocommerce' );
-$content = __( 'Welcome to a world of limitless possibilities, where the journey is as exhilarating as the destination, and where every moment is an opportunity to make your mark on the canvas of existence. The only limit is the extent of your imagination.', 'woocommerce' );
-$button = __( 'Get Started', 'woocommerce' );
+$header = __( 'Committed to a greener lifestyle', 'woocommerce' );
+$content = __( "Our passion is crafting mindful moments with locally sourced, organic, and sustainable products. We're more than a store; we're your path to a community-driven, eco-friendly lifestyle that embraces premium quality.", 'woocommerce' );
+$button = __( 'Meet us', 'woocommerce' );
$image_0 = PatternsHelper::get_image_url( $images, 0, 'assets/images/pattern-placeholders/drinkware-liquid-tableware-dishware-bottle-fluid.jpg' );
?>
diff --git a/plugins/woocommerce/patterns/featured-category-cover-image.php b/plugins/woocommerce/patterns/featured-category-cover-image.php
index 0b9d5b6d7ea..fbc70579df4 100644
--- a/plugins/woocommerce/patterns/featured-category-cover-image.php
+++ b/plugins/woocommerce/patterns/featured-category-cover-image.php
@@ -14,7 +14,7 @@ $description = $content['descriptions'][0]['default'] ?? '';
$button = $content['buttons'][0]['default'] ?? '';
?>
-
+
diff --git a/plugins/woocommerce/patterns/filters.php b/plugins/woocommerce/patterns/filters.php
new file mode 100644
index 00000000000..f386dfbad44
--- /dev/null
+++ b/plugins/woocommerce/patterns/filters.php
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+attribute_id;
+}
+?>
+
+
+
+
+
+
+
+
+
diff --git a/plugins/woocommerce/patterns/four-image-grid-content-left.php b/plugins/woocommerce/patterns/four-image-grid-content-left.php
index 383e5aedc5f..30e05b32f52 100644
--- a/plugins/woocommerce/patterns/four-image-grid-content-left.php
+++ b/plugins/woocommerce/patterns/four-image-grid-content-left.php
@@ -18,14 +18,12 @@ $image_3 = PatternsHelper::get_image_url( $images, 0, 'assets/images/pattern-pla
?>
-
-
-
+
-
+
