+
+
'),d.post(ajaxurl,{action:"woocommerce_product_ordering",id:i,previd:o,nextid:n},function(t){d.each(t,function(t,e){d("#inline_"+t+" .menu_order").html(e)}),e.item.find(".check-column input").show().siblings("img").remove(),d("table.widefat tbody th, table.widefat tbody td").css("cursor","move"),d("table.widefat tbody").sortable("enable")}),d("table.widefat tbody tr").each(function(){d("table.widefat tbody tr").index(this)%2==0?d(this).addClass("alternate"):d(this).removeClass("alternate")})}})});
\ No newline at end of file
diff --git a/assets/js/admin/quick-edit.js b/assets/js/admin/quick-edit.js
index 21c8964ef02..74f2f94c866 100644
--- a/assets/js/admin/quick-edit.js
+++ b/assets/js/admin/quick-edit.js
@@ -1,4 +1,4 @@
-/*global inlineEditPost, woocommerce_admin */
+/*global inlineEditPost, woocommerce_admin, woocommerce_quick_edit */
jQuery(function( $ ) {
$( '#the-list' ).on( 'click', '.editinline', function() {
@@ -59,18 +59,31 @@ jQuery(function( $ ) {
$( 'input[name="_featured"]', '.inline-edit-row' ).removeAttr( 'checked' );
}
- if ( 'yes' === manage_stock ) {
- $( '.stock_qty_field', '.inline-edit-row' ).show().removeAttr( 'style' );
- $( 'input[name="_manage_stock"]', '.inline-edit-row' ).attr( 'checked', 'checked' );
- } else {
- $( '.stock_qty_field', '.inline-edit-row' ).hide();
- $( 'input[name="_manage_stock"]', '.inline-edit-row' ).removeAttr( 'checked' );
- }
-
// Conditional display
var product_type = $wc_inline_data.find( '.product_type' ).text(),
product_is_virtual = $wc_inline_data.find( '.product_is_virtual' ).text();
+ var product_supports_stock_status = 'external' !== product_type;
+ var product_supports_stock_fields = 'external' !== product_type && 'grouped' !== product_type;
+
+ $( '.stock_fields, .manage_stock_field, .stock_status_field, .backorder_field' ).show();
+
+ if ( product_supports_stock_fields ) {
+ if ( 'yes' === manage_stock ) {
+ $( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).show().removeAttr( 'style' );
+ $( '.stock_status_field' ).hide();
+ $( '.manage_stock_field input' ).prop( 'checked', true );
+ } else {
+ $( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).hide();
+ $( '.stock_status_field' ).show().removeAttr( 'style' );
+ $( '.manage_stock_field input' ).prop( 'checked', false );
+ }
+ } else if ( product_supports_stock_status ) {
+ $( '.stock_fields, .manage_stock_field, .backorder_field' ).hide();
+ } else {
+ $( '.stock_fields, .manage_stock_field, .stock_status_field, .backorder_field' ).hide();
+ }
+
if ( 'simple' === product_type || 'external' === product_type ) {
$( '.price_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
} else {
@@ -83,19 +96,18 @@ jQuery(function( $ ) {
$( '.dimension_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
}
- if ( 'grouped' === product_type ) {
- $( '.stock_fields', '.inline-edit-row' ).hide();
- } else {
- $( '.stock_fields', '.inline-edit-row' ).show().removeAttr( 'style' );
- }
+ // Rename core strings
+ $( 'input[name="comment_status"]' ).parent().find( '.checkbox-title' ).text( woocommerce_quick_edit.strings.allow_reviews );
});
$( '#the-list' ).on( 'change', '.inline-edit-row input[name="_manage_stock"]', function() {
if ( $( this ).is( ':checked' ) ) {
- $( '.stock_qty_field', '.inline-edit-row' ).show().removeAttr( 'style' );
+ $( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).show().removeAttr( 'style' );
+ $( '.stock_status_field' ).hide();
} else {
- $( '.stock_qty_field', '.inline-edit-row' ).hide();
+ $( '.stock_qty_field, .backorder_field', '.inline-edit-row' ).hide();
+ $( '.stock_status_field' ).show().removeAttr( 'style' );
}
});
@@ -115,4 +127,8 @@ jQuery(function( $ ) {
}
});
+
+ $( '#wpbody' ).on( 'click', '.trash-product', function() {
+ return window.confirm( woocommerce_admin.i18n_delete_product_notice );
+ });
});
diff --git a/assets/js/admin/quick-edit.min.js b/assets/js/admin/quick-edit.min.js
index affe9fc31a9..48828de40db 100644
--- a/assets/js/admin/quick-edit.min.js
+++ b/assets/js/admin/quick-edit.min.js
@@ -1 +1 @@
-jQuery(function(a){a("#the-list").on("click",".editinline",function(){inlineEditPost.revert();var b=a(this).closest("tr").attr("id");b=b.replace("post-","");var c=a("#woocommerce_inline_"+b),d=c.find(".sku").text(),e=c.find(".regular_price").text(),f=c.find(".sale_price ").text(),g=c.find(".weight").text(),h=c.find(".length").text(),i=c.find(".width").text(),j=c.find(".height").text(),k=c.find(".shipping_class").text(),l=c.find(".visibility").text(),m=c.find(".stock_status").text(),n=c.find(".stock").text(),o=c.find(".featured").text(),p=c.find(".manage_stock").text(),q=c.find(".menu_order").text(),r=c.find(".tax_status").text(),s=c.find(".tax_class").text(),t=c.find(".backorders").text(),u=e.replace(".",woocommerce_admin.mon_decimal_point),v=f.replace(".",woocommerce_admin.mon_decimal_point);a('input[name="_sku"]',".inline-edit-row").val(d),a('input[name="_regular_price"]',".inline-edit-row").val(u),a('input[name="_sale_price"]',".inline-edit-row").val(v),a('input[name="_weight"]',".inline-edit-row").val(g),a('input[name="_length"]',".inline-edit-row").val(h),a('input[name="_width"]',".inline-edit-row").val(i),a('input[name="_height"]',".inline-edit-row").val(j),a('select[name="_shipping_class"] option:selected',".inline-edit-row").attr("selected",!1).change(),a('select[name="_shipping_class"] option[value="'+k+'"]').attr("selected","selected").change(),a('input[name="_stock"]',".inline-edit-row").val(n),a('input[name="menu_order"]',".inline-edit-row").val(q),a('select[name="_tax_status"] option, select[name="_tax_class"] option, select[name="_visibility"] option, select[name="_stock_status"] option, select[name="_backorders"] option').removeAttr("selected"),a('select[name="_tax_status"] option[value="'+r+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_tax_class"] option[value="'+s+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_visibility"] option[value="'+l+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_stock_status"] option[value="'+m+'"]',".inline-edit-row").attr("selected","selected"),a('select[name="_backorders"] option[value="'+t+'"]',".inline-edit-row").attr("selected","selected"),"yes"===o?a('input[name="_featured"]',".inline-edit-row").attr("checked","checked"):a('input[name="_featured"]',".inline-edit-row").removeAttr("checked"),"yes"===p?(a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"),a('input[name="_manage_stock"]',".inline-edit-row").attr("checked","checked")):(a(".stock_qty_field",".inline-edit-row").hide(),a('input[name="_manage_stock"]',".inline-edit-row").removeAttr("checked"));var w=c.find(".product_type").text(),x=c.find(".product_is_virtual").text();"simple"===w||"external"===w?a(".price_fields",".inline-edit-row").show().removeAttr("style"):a(".price_fields",".inline-edit-row").hide(),"yes"===x?a(".dimension_fields",".inline-edit-row").hide():a(".dimension_fields",".inline-edit-row").show().removeAttr("style"),"grouped"===w?a(".stock_fields",".inline-edit-row").hide():a(".stock_fields",".inline-edit-row").show().removeAttr("style")}),a("#the-list").on("change",'.inline-edit-row input[name="_manage_stock"]',function(){a(this).is(":checked")?a(".stock_qty_field",".inline-edit-row").show().removeAttr("style"):a(".stock_qty_field",".inline-edit-row").hide()}),a("#wpbody").on("click","#doaction, #doaction2",function(){a("input.text",".inline-edit-row").val(""),a("#woocommerce-fields").find("select").prop("selectedIndex",0),a("#woocommerce-fields-bulk").find(".inline-edit-group .change-input").hide()}),a("#wpbody").on("change","#woocommerce-fields-bulk .inline-edit-group .change_to",function(){0->plugin_url() . '/assets/images/woocommerce_logo.png' ); ?>){kind=logo}
+
+
+ ' . esc_html_e( 'Feel free to reconnect again using the button below.', 'woocommerce' ); ?>
+ + + + + +Action and Filter Hook Reference
'; + echo '
+
';
foreach ( self::$files_to_scan as $heading => $files ) {
self::$custom_hooks_found = array();
@@ -125,43 +133,36 @@ class WC_HookFinder {
case 'filter' :
case 'action' :
$hook = trim( $token[1], "'" );
+ $hook = str_replace( '_FUNCTION_', strtoupper( $current_function ), $hook );
+ $hook = str_replace( '_CLASS_', strtoupper( $current_class ), $hook );
+ $hook = str_replace( '$this', strtoupper( $current_class ), $hook );
+ $hook = str_replace( array( '.', '{', '}', '"', "'", ' ', ')', '(' ), '', $hook );
$loop = 0;
- if ( '_' === substr( $hook, '-1', 1 ) ) {
- $hook .= '{';
- $open = true;
- // Keep adding to hook until we find a comma or colon
- while ( 1 ) {
- $loop ++;
- $next_hook = trim( trim( is_string( $tokens[ $index + $loop ] ) ? $tokens[ $index + $loop ] : $tokens[ $index + $loop ][1], '"' ), "'" );
+ // Keep adding to hook until we find a comma or colon
+ while ( 1 ) {
+ $loop ++;
+ $prev_hook = is_string( $tokens[ $index + $loop - 1 ] ) ? $tokens[ $index + $loop - 1 ] : $tokens[ $index + $loop - 1 ][1];
+ $next_hook = is_string( $tokens[ $index + $loop ] ) ? $tokens[ $index + $loop ] : $tokens[ $index + $loop ][1];
- if ( in_array( $next_hook, array( '.', '{', '}', '"', "'", ' ' ) ) ) {
- continue;
- }
-
- $hook_first = substr( $next_hook, 0, 1 );
- $hook_last = substr( $next_hook, -1, 1 );
-
- if ( in_array( $next_hook, array( ',', ';' ) ) ) {
- if ( $open ) {
- $hook .= '}';
- $open = false;
- }
- break;
- }
-
- if ( '_' === $hook_first ) {
- $next_hook = '}' . $next_hook;
- $open = false;
- }
-
- if ( '_' === $hook_last ) {
- $next_hook .= '{';
- $open = true;
- }
-
- $hook .= $next_hook;
+ if ( in_array( $next_hook, array( '.', '{', '}', '"', "'", ' ', ')', '(' ) ) ) {
+ continue;
}
+
+ if ( in_array( $next_hook, array( ',', ';' ) ) ) {
+ break;
+ }
+
+ $hook_first = substr( $next_hook, 0, 1 );
+ $hook_last = substr( $next_hook, -1, 1 );
+
+ if ( '{' === $hook_first || '}' === $hook_last || '$' === $hook_first || ')' === $hook_last || '>' === substr( $prev_hook, -1, 1 ) ) {
+ $next_hook = strtoupper( $next_hook );
+ }
+
+ $next_hook = str_replace( array( '.', '{', '}', '"', "'", ' ', ')', '(' ), '', $next_hook );
+
+ $hook .= $next_hook;
}
if ( isset( self::$custom_hooks_found[ $hook ] ) ) {
@@ -185,14 +186,14 @@ class WC_HookFinder {
foreach ( self::$custom_hooks_found as $hook => $details ) {
if ( ! strstr( $hook, 'woocommerce' ) && ! strstr( $hook, 'product' ) && ! strstr( $hook, 'wc_' ) ) {
- unset( self::$custom_hooks_found[ $hook ] );
+ //unset( self::$custom_hooks_found[ $hook ] );
}
}
ksort( self::$custom_hooks_found );
if ( ! empty( self::$custom_hooks_found ) ) {
- echo 'This is simply a list of action and filter hooks found within WooCommerce files. View the source to see supported params and usage.
+' . implode( ', ', $index ) . '
+' . $heading . '
' . $heading . '
| Hook | Type | File(s) | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ' + - '' + + '' + '' + ' | ' + '' + @@ -813,187 +902,24 @@ jQuery( function ( $ ) { } }, - select_row: function() { - var $row = false; - if ( $( this ).is( 'tr' ) ) { - $row = $( this ); - } else { - $row = $( this ).closest( 'tr' ); - } - var $table = $( this ).closest( 'table' ); - - if ( $row.is( '.selected' ) ) { - $row.removeClass( 'selected' ); - } else { - $row.addClass( 'selected' ); - } - - var $rows = $table.find( 'tr.selected' ); - - if ( $rows.length ) { - $( 'div.wc-order-item-bulk-edit' ).slideDown(); - - var selected_product = false; - - $rows.each( function() { - if ( $( this ).is( 'tr.item' ) ) { - selected_product = true; - } - } ); - - if ( selected_product ) { - $( '.bulk-increase-stock, .bulk-decrease-stock' ).show(); - } else { - $( '.bulk-increase-stock, .bulk-decrease-stock' ).hide(); - } - } else { - $( 'div.wc-order-item-bulk-edit' ).slideUp(); - } - }, - - select_row_child: function( e ) { - e.stopPropagation(); - }, - - bulk_actions: { - - do_delete: function( e ) { - e.preventDefault(); - var $table = $( 'table.woocommerce_order_items' ); - var $rows = $table.find( 'tr.selected' ); - - if ( $rows.length && window.confirm( woocommerce_admin_meta_boxes.remove_item_notice ) ) { - - wc_meta_boxes_order_items.block(); - - var delete_items = []; - var delete_refunds = []; - var deferred = []; - - $.map( $rows, function( row ) { - var $row = $( row ); - - if ( $row.is( '.refund' ) ) { - delete_refunds.push( parseInt( $( $row ).data( 'order_refund_id' ), 10 ) ); - } else { - delete_items.push( parseInt( $( $row ).data( 'order_item_id' ), 10 ) ); - } - return ; - }); - - if ( delete_items.length ) { - deferred.push( $.ajax({ - url : woocommerce_admin_meta_boxes.ajax_url, - data: { - order_item_ids: delete_items, - action: 'woocommerce_remove_order_item', - security: woocommerce_admin_meta_boxes.order_item_nonce - }, - type: 'POST' - } ) ); - } - - if ( delete_refunds.length ) { - deferred.push( $.ajax( { - url : woocommerce_admin_meta_boxes.ajax_url, - data: { - action: 'woocommerce_delete_refund', - refund_id: delete_refunds, - security: woocommerce_admin_meta_boxes.order_item_nonce - }, - type: 'POST' - } ) ); - } - - if ( deferred ) { - $.when.apply( $, deferred ).done( function() { - wc_meta_boxes_order_items.reload_items(); - wc_meta_boxes_order_items.unblock(); - } ); - } else { - wc_meta_boxes_order_items.unblock(); - } - } - }, - - do_increase_stock: function( e ) { - e.preventDefault(); - wc_meta_boxes_order_items.block(); - - var $table = $( 'table.woocommerce_order_items' ); - var $rows = $table.find( 'tr.selected' ); - var quantities = {}; - var item_ids = $.map( $rows, function( $row ) { - return parseInt( $( $row ).data( 'order_item_id' ), 10 ); - }); - - $rows.each(function() { - if ( $( this ).find( 'input.quantity' ).length ) { - quantities[ $( this ).attr( 'data-order_item_id' ) ] = $( this ).find( 'input.quantity' ).val(); - } - }); - - var data = { - order_id: woocommerce_admin_meta_boxes.post_id, - order_item_ids: item_ids, - order_item_qty: quantities, - action: 'woocommerce_increase_order_item_stock', - security: woocommerce_admin_meta_boxes.order_item_nonce - }; - - $.ajax({ - url: woocommerce_admin_meta_boxes.ajax_url, - data: data, - type: 'POST', - success: function( response ) { - window.alert( response ); - wc_meta_boxes_order_items.unblock(); - } - }); - }, - - do_reduce_stock: function( e ) { - e.preventDefault(); - wc_meta_boxes_order_items.block(); - - var $table = $( 'table.woocommerce_order_items' ); - var $rows = $table.find( 'tr.selected' ); - var quantities = {}; - var item_ids = $.map( $rows, function( $row ) { - return parseInt( $( $row ).data( 'order_item_id' ), 10 ); - }); - - $rows.each(function() { - if ( $( this ).find( 'input.quantity' ).length ) { - quantities[ $( this ).attr( 'data-order_item_id' ) ] = $( this ).find( 'input.quantity' ).val(); - } - }); - - var data = { - order_id: woocommerce_admin_meta_boxes.post_id, - order_item_ids: item_ids, - order_item_qty: quantities, - action: 'woocommerce_reduce_order_item_stock', - security: woocommerce_admin_meta_boxes.order_item_nonce - }; - - $.ajax({ - url: woocommerce_admin_meta_boxes.ajax_url, - data: data, - type: 'POST', - success: function( response ) { - window.alert( response ); - wc_meta_boxes_order_items.unblock(); - } - }); - } - }, - backbone: { init: function( e, target ) { if ( 'wc-modal-add-products' === target ) { $( document.body ).trigger( 'wc-enhanced-select-init' ); + + $( this ).on( 'change', '.wc-product-search', function() { + if ( ! $( this ).closest( 'tr' ).is( ':last-child' ) ) { + return; + } + var item_table = $( this ).closest( 'table.widefat' ), + item_table_body = item_table.find( 'tbody' ), + index = item_table_body.find( 'tr' ).length, + row = item_table_body.data( 'row' ).replace( /\[0\]/g, '[' + index + ']' ); + + item_table_body.append( ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ';return o.append(i),!1},remove:function(){if(window.confirm(woocommerce_admin_meta_boxes.remove_item_meta)){var e=l(this).closest("tr");e.find(":input").val(""),e.hide()}return!1}},backbone:{init:function(e,o){"wc-modal-add-products"===o&&(l(document.body).trigger("wc-enhanced-select-init"),l(this).on("change",".wc-product-search",function(){if(l(this).closest("tr").is(":last-child")){var e=l(this).closest("table.widefat").find("tbody"),o=e.find("tr").length,t=e.data("row").replace(/\[0\]/g,"["+o+"]");e.append(" | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ';0===r(c).find(".column-handle").length&&(r(c).find("tr:not(.inline-edit-row)").append(i),m=".check-column input"),r(c).find(".column-handle").show(),r.wc_add_missing_sort_handles=function(){var e=r(c).find("tbody > tr"),n=r(c).find("tbody > tr > td.column-handle").parent();e.length!==n.length&&e.each(function(e,t){n.is(t)||r(t).append(i)}),r(c).find(".column-handle").show()},r(document).ajaxComplete(function(e,t,n){t&&4===t.readyState&&200===t.status&&n.data&&(0<=n.data.indexOf("_inline_edit")||0<=n.data.indexOf("add-tag"))&&(r.wc_add_missing_sort_handles(),r(document.body).trigger("init_tooltips"))}),r(c).sortable({items:"tbody tr:not(.inline-edit-row)",cursor:"move",handle:".column-handle",axis:"y",forcePlaceholderSize:!0,helper:"clone",opacity:.65,placeholder:"product-cat-placeholder",scrollSensitivity:40,start:function(e,t){t.item.hasClass("alternate")||t.item.css("background-color","#ffffff"),t.item.children("td, th").css("border-bottom-width","0"),t.item.css("outline","1px solid #aaa")},stop:function(e,t){t.item.removeAttr("style"),t.item.children("td, th").css("border-bottom-width","1px")},update:function(e,t){var n,i,d=t.item.find(m).val(),a=t.item.find(".parent").html(),o=t.item.prev().find(m).val(),l=t.item.next().find(m).val();o!==undefined&&(n=t.item.prev().find(".parent").html())!==a&&(o=undefined),l!==undefined&&(i=t.item.next().find(".parent").html())!==a&&(l=undefined),o===undefined&&l===undefined||l===undefined&&i===o||l!==undefined&&n===d?r(c).sortable("cancel"):(t.item.find(".check-column input").hide(),t.item.find(".check-column").append(' | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - get_tooltip_html( $data ); ?> - + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - get_tooltip_html( $data ); ?> - + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - get_tooltip_html( $data ); ?> - + | @@ -745,8 +784,8 @@ abstract class WC_Settings_API { /** * Generate Title HTML. * - * @param mixed $key - * @param mixed $data + * @param string $key Field key. + * @param array $data Field data. * @since 1.0.0 * @return string */ @@ -777,8 +816,8 @@ abstract class WC_Settings_API { * * Make sure the data is escaped correctly, etc. * - * @param string $key Field key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_text_field( $key, $value ) { @@ -791,8 +830,8 @@ abstract class WC_Settings_API { * * Make sure the data is escaped correctly, etc. * - * @param string $key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_price_field( $key, $value ) { @@ -805,8 +844,8 @@ abstract class WC_Settings_API { * * Make sure the data is escaped correctly, etc. * - * @param string $key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_decimal_field( $key, $value ) { @@ -817,8 +856,8 @@ abstract class WC_Settings_API { /** * Validate Password Field. No input sanitization is used to avoid corrupting passwords. * - * @param string $key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_password_field( $key, $value ) { @@ -829,8 +868,8 @@ abstract class WC_Settings_API { /** * Validate Textarea Field. * - * @param string $key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_textarea_field( $key, $value ) { @@ -838,7 +877,12 @@ abstract class WC_Settings_API { return wp_kses( trim( stripslashes( $value ) ), array_merge( array( - 'iframe' => array( 'src' => true, 'style' => true, 'id' => true, 'class' => true ), + 'iframe' => array( + 'src' => true, + 'style' => true, + 'id' => true, + 'class' => true, + ), ), wp_kses_allowed_html( 'post' ) ) @@ -850,8 +894,8 @@ abstract class WC_Settings_API { * * If not set, return "no", otherwise return "yes". * - * @param string $key - * @param string|null $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_checkbox_field( $key, $value ) { @@ -861,8 +905,8 @@ abstract class WC_Settings_API { /** * Validate Select Field. * - * @param string $key - * @param string $value Posted Value + * @param string $key Field key. + * @param string $value Posted Value. * @return string */ public function validate_select_field( $key, $value ) { @@ -873,9 +917,9 @@ abstract class WC_Settings_API { /** * Validate Multiselect Field. * - * @param string $key - * @param string $value Posted Value - * @return string + * @param string $key Field key. + * @param string $value Posted Value. + * @return string|array */ public function validate_multiselect_field( $key, $value ) { return is_array( $value ) ? array_map( 'wc_clean', array_map( 'stripslashes', $value ) ) : ''; @@ -883,7 +927,9 @@ abstract class WC_Settings_API { /** * Validate the data on the "Settings" form. - * @deprecated 2.6.0 No longer used + * + * @deprecated 2.6.0 No longer used. + * @param array $form_fields Array of fields. */ public function validate_settings_fields( $form_fields = array() ) { wc_deprecated_function( 'validate_settings_fields', '2.6' ); @@ -891,8 +937,9 @@ abstract class WC_Settings_API { /** * Format settings if needed. - * @deprecated 2.6.0 Unused - * @param array $value + * + * @deprecated 2.6.0 Unused. + * @param array $value Value to format. * @return array */ public function format_settings( $value ) { diff --git a/includes/abstracts/abstract-wc-shipping-method.php b/includes/abstracts/abstract-wc-shipping-method.php index e277f72eed2..a3a28e0dea5 100644 --- a/includes/abstracts/abstract-wc-shipping-method.php +++ b/includes/abstracts/abstract-wc-shipping-method.php @@ -1,4 +1,10 @@ instance_id = absint( $instance_id ); @@ -128,7 +148,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { * * Methods should override this to declare support (or lack of support) for a feature. * - * @param $feature string The name of a feature to test support for. + * @param string $feature The name of a feature to test support for. * @return bool True if the shipping method supports the feature, false otherwise. */ public function supports( $feature ) { @@ -137,11 +157,14 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Called to calculate shipping rates for this method. Rates can be added using the add_rate() method. + * + * @param array $package Package array. */ public function calculate_shipping( $package = array() ) {} /** * Whether or not we need to calculate tax on top of the shipping rate. + * * @return boolean */ public function is_taxable() { @@ -150,6 +173,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Whether or not this method is enabled in settings. + * * @since 2.6.0 * @return boolean */ @@ -159,6 +183,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Return the shipping method instance ID. + * * @since 2.6.0 * @return int */ @@ -168,6 +193,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Return the shipping method title. + * * @since 2.6.0 * @return string */ @@ -177,6 +203,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Return the shipping method description. + * * @since 2.6.0 * @return string */ @@ -195,8 +222,9 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Return calculated rates for a package. + * * @since 2.6.0 - * @param object $package + * @param object $package Package array. * @return array */ public function get_rates_for_package( $package ) { @@ -210,8 +238,9 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Returns a rate ID based on this methods ID and instance, with an optional * suffix if distinguishing between multiple rates. + * * @since 2.6.0 - * @param string $suffix + * @param string $suffix Suffix. * @return string */ public function get_rate_id( $suffix = '' ) { @@ -230,25 +259,27 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Add a shipping rate. If taxes are not set they will be calculated based on cost. - * @param array $args (default: array()) + * + * @param array $args Arguments (default: array()). */ public function add_rate( $args = array() ) { - $args = wp_parse_args( $args, array( + $args = apply_filters( 'woocommerce_shipping_method_add_rate_args', wp_parse_args( $args, array( 'id' => $this->get_rate_id(), // ID for the rate. If not passed, this id:instance default will be used. - 'label' => '', // Label for the rate - 'cost' => '0', // Amount or array of costs (per item shipping) - 'taxes' => '', // Pass taxes, or leave empty to have it calculated for you, or 'false' to disable calculations - 'calc_tax' => 'per_order', // Calc tax per_order or per_item. Per item needs an array of costs + 'label' => '', // Label for the rate. + 'cost' => '0', // Amount or array of costs (per item shipping). + 'taxes' => '', // Pass taxes, or leave empty to have it calculated for you, or 'false' to disable calculations. + 'calc_tax' => 'per_order', // Calc tax per_order or per_item. Per item needs an array of costs. 'meta_data' => array(), // Array of misc meta data to store along with this rate - key value pairs. - 'package' => false, // Package array this rate was generated for @since 2.6.0 - ) ); + 'package' => false, // Package array this rate was generated for @since 2.6.0. + 'price_decimals' => wc_get_price_decimals(), + ) ), $this ); - // ID and label are required + // ID and label are required. if ( ! $args['id'] || ! $args['label'] ) { return; } - // Total up the cost + // Total up the cost. $total_cost = is_array( $args['cost'] ) ? array_sum( $args['cost'] ) : $args['cost']; $taxes = $args['taxes']; @@ -258,10 +289,16 @@ abstract class WC_Shipping_Method extends WC_Settings_API { } // Round the total cost after taxes have been calculated. - $total_cost = wc_format_decimal( $total_cost, wc_get_price_decimals() ); + $total_cost = wc_format_decimal( $total_cost, $args['price_decimals'] ); - // Create rate object - $rate = new WC_Shipping_Rate( $args['id'], $args['label'], $total_cost, $taxes, $this->id ); + // Create rate object. + $rate = new WC_Shipping_Rate(); + $rate->set_id( $args['id'] ); + $rate->set_method_id( $this->id ); + $rate->set_instance_id( $this->instance_id ); + $rate->set_label( $args['label'] ); + $rate->set_cost( $total_cost ); + $rate->set_taxes( $taxes ); if ( ! empty( $args['meta_data'] ) ) { foreach ( $args['meta_data'] as $key => $value ) { @@ -269,30 +306,31 @@ abstract class WC_Shipping_Method extends WC_Settings_API { } } - // Store package data + // Store package data. if ( $args['package'] ) { $items_in_package = array(); foreach ( $args['package']['contents'] as $item ) { - $product = $item['data']; + $product = $item['data']; $items_in_package[] = $product->get_name() . ' × ' . $item['quantity']; } $rate->add_meta_data( __( 'Items', 'woocommerce' ), implode( ', ', $items_in_package ) ); } - $this->rates[ $args['id'] ] = $rate; + $this->rates[ $args['id'] ] = apply_filters( 'woocommerce_shipping_method_add_rate', $rate, $args, $this ); } /** * Calc taxes per item being shipping in costs array. + * * @since 2.6.0 * @access protected - * @param array $costs + * @param array $costs Costs. * @return array of taxes */ protected function get_taxes_per_item( $costs ) { $taxes = array(); - // If we have an array of costs we can look up each items tax class and add tax accordingly + // If we have an array of costs we can look up each items tax class and add tax accordingly. if ( is_array( $costs ) ) { $cart = WC()->cart->get_cart(); @@ -304,17 +342,17 @@ abstract class WC_Shipping_Method extends WC_Settings_API { $item_taxes = WC_Tax::calc_shipping_tax( $amount, WC_Tax::get_shipping_tax_rates( $cart[ $cost_key ]['data']->get_tax_class() ) ); - // Sum the item taxes + // Sum the item taxes. foreach ( array_keys( $taxes + $item_taxes ) as $key ) { $taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 ); } } - // Add any cost for the order - order costs are in the key 'order' + // Add any cost for the order - order costs are in the key 'order'. if ( isset( $costs['order'] ) ) { $item_taxes = WC_Tax::calc_shipping_tax( $costs['order'], WC_Tax::get_shipping_tax_rates() ); - // Sum the item taxes + // Sum the item taxes. foreach ( array_keys( $taxes + $item_taxes ) as $key ) { $taxes[ $key ] = ( isset( $item_taxes[ $key ] ) ? $item_taxes[ $key ] : 0 ) + ( isset( $taxes[ $key ] ) ? $taxes[ $key ] : 0 ); } @@ -326,37 +364,39 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Is this method available? - * @param array $package + * + * @param array $package Package. * @return bool */ public function is_available( $package ) { $available = $this->is_enabled(); - // Country availability (legacy, for non-zone based methods) + // Country availability (legacy, for non-zone based methods). if ( ! $this->instance_id && $available ) { $countries = is_array( $this->countries ) ? $this->countries : array(); switch ( $this->availability ) { - case 'specific' : - case 'including' : + case 'specific': + case 'including': $available = in_array( $package['destination']['country'], array_intersect( $countries, array_keys( WC()->countries->get_shipping_countries() ) ) ); - break; - case 'excluding' : + break; + case 'excluding': $available = in_array( $package['destination']['country'], array_diff( array_keys( WC()->countries->get_shipping_countries() ), $countries ) ); - break; - default : + break; + default: $available = in_array( $package['destination']['country'], array_keys( WC()->countries->get_shipping_countries() ) ); - break; + break; } } - return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $available, $package ); + return apply_filters( 'woocommerce_shipping_' . $this->id . '_is_available', $available, $package, $this ); } /** * Get fee to add to shipping cost. - * @param string|float $fee - * @param float $total + * + * @param string|float $fee Fee. + * @param float $total Total. * @return float */ public function get_fee( $fee, $total ) { @@ -371,6 +411,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Does this method have a settings page? + * * @return bool */ public function has_settings() { @@ -379,6 +420,7 @@ abstract class WC_Shipping_Method extends WC_Settings_API { /** * Return admin options as a html string. + * * @return string */ public function get_admin_options_html() { @@ -399,33 +441,33 @@ abstract class WC_Shipping_Method extends WC_Settings_API { echo ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| - | - | - | - | + | + | + + | + + | + | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| attribute_label ); ?> - + | attribute_name ); ?> | -attribute_type ) ); ?> attribute_public ? __( '(Public)', 'woocommerce' ) : ''; ?> | -+ | attribute_type ) ); ?> attribute_public ? esc_html__( '(Public)', 'woocommerce' ) : ''; ?> | + ++ attribute_orderby ) { - case 'name' : - _e( 'Name', 'woocommerce' ); - break; - case 'name_num' : - _e( 'Name (numeric)', 'woocommerce' ); - break; - case 'id' : - _e( 'Term ID', 'woocommerce' ); - break; + case 'name': + esc_html_e( 'Name', 'woocommerce' ); + break; + case 'name_num': + esc_html_e( 'Name (numeric)', 'woocommerce' ); + break; + case 'id': + esc_html_e( 'Term ID', 'woocommerce' ); + break; default: - _e( 'Custom ordering', 'woocommerce' ); - break; + esc_html_e( 'Custom ordering', 'woocommerce' ); + break; } - ?> | -+ | +
+ attribute_name );
if ( taxonomy_exists( $taxonomy ) ) {
@@ -412,30 +340,35 @@ class WC_Admin_Attributes {
}
switch ( $tax->attribute_orderby ) {
- case 'name_num' :
+ case 'name_num':
usort( $terms, '_wc_get_product_terms_name_num_usort_callback' );
- break;
- case 'parent' :
+ break;
+ case 'parent':
usort( $terms, '_wc_get_product_terms_parent_usort_callback' );
- break;
+ break;
}
$terms_string = implode( ', ', wp_list_pluck( $terms, 'name' ) );
if ( $terms_string ) {
- echo $terms_string;
+ echo esc_html( $terms_string );
} else {
echo '–';
}
} else {
- echo '–';
+ echo '–';
}
- ?>
- + ?> + |
- |||||||||
| + | ||||||||||||||||
| + | + | + |
+
+
+ + +
+' . __( 'Help & Support', 'woocommerce' ) . '
' . + '' . sprintf( + /* translators: %s: Documentation URL */ + __( 'Should you need help understanding, using, or extending WooCommerce, please read our documentation. You will find all kinds of resources including snippets, tutorials and much more.', 'woocommerce' ), + 'https://docs.woocommerce.com/documentation/plugins/woocommerce/?utm_source=helptab&utm_medium=product&utm_content=docs&utm_campaign=woocommerceplugin' + ) . '
' . + '' . sprintf( + /* translators: %s: Forum URL */ + __( 'For further assistance with WooCommerce core you can use the community forum. If you need help with premium extensions sold by WooCommerce, please use our helpdesk.', 'woocommerce' ), + 'https://wordpress.org/support/plugin/woocommerce', + 'https://woocommerce.com/my-account/tickets/?utm_source=helptab&utm_medium=product&utm_content=tickets&utm_campaign=woocommerceplugin' + ) . '
' . + '' . __( 'Before asking for help we recommend checking the system status page to identify any problems with your configuration.', 'woocommerce' ) . '
' . + '' . __( 'System status', 'woocommerce' ) . ' ' . __( 'Community forum', 'woocommerce' ) . ' ' . __( 'WooCommerce helpdesk', 'woocommerce' ) . '
', + ) ); - $page = empty( $_GET['page'] ) ? '' : sanitize_title( $_GET['page'] ); - $tab = empty( $_GET['tab'] ) ? '' : sanitize_title( $_GET['tab'] ); - $section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( $_REQUEST['section'] ); - $video_key = $page ? implode( '-', array_filter( array( $page, $tab, $section ) ) ) : $screen->id; + $screen->add_help_tab( + array( + 'id' => 'woocommerce_bugs_tab', + 'title' => __( 'Found a bug?', 'woocommerce' ), + 'content' => + '' . __( 'Found a bug?', 'woocommerce' ) . '
' . + /* translators: 1: GitHub issues URL 2: GitHub contribution guide URL 3: System status report URL */ + '' . sprintf( __( 'If you find a bug within WooCommerce core you can create a ticket via Github issues. Ensure you read the contribution guide prior to submitting your report. To help us solve your issue, please be as descriptive as possible and include your system status report.', 'woocommerce' ), 'https://github.com/woocommerce/woocommerce/issues?state=open', 'https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md', admin_url( 'admin.php?page=wc-status' ) ) . '
' . + '' . __( 'Report a bug', 'woocommerce' ) . ' ' . __( 'System status', 'woocommerce' ) . '
', - // Fallback for sections - if ( ! isset( $video_map[ $video_key ] ) ) { - $video_key = $page ? implode( '-', array_filter( array( $page, $tab ) ) ) : $screen->id; - } + ) + ); - // Fallback for tabs - if ( ! isset( $video_map[ $video_key ] ) ) { - $video_key = $page ? $page : $screen->id; - } + $screen->add_help_tab( + array( + 'id' => 'woocommerce_education_tab', + 'title' => __( 'Education', 'woocommerce' ), + 'content' => + '' . __( 'Education', 'woocommerce' ) . '
' . + '' . __( 'If you would like to learn about using WooCommerce from an expert, consider a WooCommerce course to further your education.', 'woocommerce' ) . '
' . + '' . __( 'Further education', 'woocommerce' ) . '
', + ) + ); - if ( isset( $video_map[ $video_key ] ) ) { - $screen->add_help_tab( array( - 'id' => 'woocommerce_guided_tour_tab', - 'title' => __( 'Guided Tour', 'woocommerce' ), - 'content' => - '' . __( 'Guided Tour', 'woocommerce' ) . ' – ' . esc_html( $video_map[ $video_key ]['title'] ) . '
' . - '
-
- ',
- ) );
- }
+ $screen->add_help_tab(
+ array(
+ 'id' => 'woocommerce_onboard_tab',
+ 'title' => __( 'Setup wizard', 'woocommerce' ),
+ 'content' =>
+ '
-
-
' . __( 'Setup wizard', 'woocommerce' ) . '
' . + '' . __( 'If you need to access the setup wizard again, please click on the button below.', 'woocommerce' ) . '
' . + '' . __( 'Setup wizard', 'woocommerce' ) . '
', - $screen->add_help_tab( array( - 'id' => 'woocommerce_support_tab', - 'title' => __( 'Help & Support', 'woocommerce' ), - 'content' => - '' . __( 'Help & Support', 'woocommerce' ) . '
' . - '' . sprintf( - __( 'Should you need help understanding, using, or extending WooCommerce, please read our documentation. You will find all kinds of resources including snippets, tutorials and much more.' , 'woocommerce' ), - 'https://docs.woocommerce.com/documentation/plugins/woocommerce/?utm_source=helptab&utm_medium=product&utm_content=docs&utm_campaign=woocommerceplugin' - ) . '
' . - '' . sprintf( - __( 'For further assistance with WooCommerce core you can use the community forum. If you need help with premium extensions sold by WooCommerce, please use our helpdesk.', 'woocommerce' ), - 'https://wordpress.org/support/plugin/woocommerce', - 'https://woocommerce.com/my-account/tickets/?utm_source=helptab&utm_medium=product&utm_content=tickets&utm_campaign=woocommerceplugin' - ) . '
' . - '' . __( 'Before asking for help we recommend checking the system status page to identify any problems with your configuration.', 'woocommerce' ) . '
' . - '' . __( 'System status', 'woocommerce' ) . ' ' . __( 'Community forum', 'woocommerce' ) . ' ' . __( 'WooCommerce helpdesk', 'woocommerce' ) . '
', - ) ); - - $screen->add_help_tab( array( - 'id' => 'woocommerce_bugs_tab', - 'title' => __( 'Found a bug?', 'woocommerce' ), - 'content' => - '' . __( 'Found a bug?', 'woocommerce' ) . '
' . - '' . sprintf( __( 'If you find a bug within WooCommerce core you can create a ticket via Github issues. Ensure you read the contribution guide prior to submitting your report. To help us solve your issue, please be as descriptive as possible and include your system status report.', 'woocommerce' ), 'https://github.com/woocommerce/woocommerce/issues?state=open', 'https://github.com/woocommerce/woocommerce/blob/master/.github/CONTRIBUTING.md', admin_url( 'admin.php?page=wc-status' ) ) . '
' . - '' . __( 'Report a bug', 'woocommerce' ) . ' ' . __( 'System status', 'woocommerce' ) . '
', - - ) ); - - $screen->add_help_tab( array( - 'id' => 'woocommerce_education_tab', - 'title' => __( 'Education', 'woocommerce' ), - 'content' => - '' . __( 'Education', 'woocommerce' ) . '
' . - '' . __( 'If you would like to learn about using WooCommerce from an expert, consider following a WooCommerce course offered by one of our educational partners.', 'woocommerce' ) . '
' . - '' . __( 'View education partners', 'woocommerce' ) . '
', - ) ); - - $screen->add_help_tab( array( - 'id' => 'woocommerce_onboard_tab', - 'title' => __( 'Setup wizard', 'woocommerce' ), - 'content' => - '' . __( 'Setup wizard', 'woocommerce' ) . '
' . - '' . __( 'If you need to access the setup wizard again, please click on the button below.', 'woocommerce' ) . '
' . - '' . __( 'Setup wizard', 'woocommerce' ) . '
', - - ) ); + ) + ); $screen->set_help_sidebar( '' . __( 'For more information:', 'woocommerce' ) . '
' . - '' . __( 'About WooCommerce', 'woocommerce' ) . '
' . - '' . __( 'WordPress.org project', 'woocommerce' ) . '
' . - '' . __( 'Github project', 'woocommerce' ) . '
' . - '' . __( 'Official themes', 'woocommerce' ) . '
' . - '' . __( 'Official extensions', 'woocommerce' ) . '
' + '' . __( 'About WooCommerce', 'woocommerce' ) . '
' . + '' . __( 'WordPress.org project', 'woocommerce' ) . '
' . + '' . __( 'Github project', 'woocommerce' ) . '
' . + '' . __( 'Official theme', 'woocommerce' ) . '
' . + '' . __( 'Official extensions', 'woocommerce' ) . '
' ); } } -endif; - return new WC_Admin_Help(); diff --git a/includes/admin/class-wc-admin-importers.php b/includes/admin/class-wc-admin-importers.php index 0ed3c2fd9ed..6a09e469809 100644 --- a/includes/admin/class-wc-admin-importers.php +++ b/includes/admin/class-wc-admin-importers.php @@ -1,18 +1,11 @@ import_allowed() ) { + return; + } + + add_action( 'admin_menu', array( $this, 'add_to_menus' ) ); add_action( 'admin_init', array( $this, 'register_importers' ) ); - add_action( 'import_start', array( $this, 'post_importer_compatibility' ) ); + add_action( 'admin_head', array( $this, 'hide_from_menus' ) ); + add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts' ) ); + add_action( 'wp_ajax_woocommerce_do_ajax_product_import', array( $this, 'do_ajax_product_import' ) ); + + // Register WooCommerce importers. + $this->importers['product_importer'] = array( + 'menu' => 'edit.php?post_type=product', + 'name' => __( 'Product Import', 'woocommerce' ), + 'capability' => 'import', + 'callback' => array( $this, 'product_importer' ), + ); } /** - * Add menu items. + * Return true if WooCommerce imports are allowed for current user, false otherwise. + * + * @return bool Whether current user can perform imports. + */ + protected function import_allowed() { + return current_user_can( 'edit_products' ) && current_user_can( 'import' ); + } + + /** + * Add menu items for our custom importers. + */ + public function add_to_menus() { + foreach ( $this->importers as $id => $importer ) { + add_submenu_page( $importer['menu'], $importer['name'], $importer['name'], $importer['capability'], $id, $importer['callback'] ); + } + } + + /** + * Hide menu items from view so the pages exist, but the menu items do not. + */ + public function hide_from_menus() { + global $submenu; + + foreach ( $this->importers as $id => $importer ) { + if ( isset( $submenu[ $importer['menu'] ] ) ) { + foreach ( $submenu[ $importer['menu'] ] as $key => $menu ) { + if ( $id === $menu[2] ) { + unset( $submenu[ $importer['menu'] ][ $key ] ); + } + } + } + } + } + + /** + * Register importer scripts. + */ + public function admin_scripts() { + $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; + wp_register_script( 'wc-product-import', WC()->plugin_url() . '/assets/js/admin/wc-product-import' . $suffix . '.js', array( 'jquery' ), WC_VERSION ); + } + + /** + * The product importer. + * + * This has a custom screen - the Tools > Import item is a placeholder. + * If we're on that screen, redirect to the custom one. + */ + public function product_importer() { + if ( defined( 'WP_LOAD_IMPORTERS' ) ) { + wp_safe_redirect( admin_url( 'edit.php?post_type=product&page=product_importer' ) ); + exit; + } + + 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'; + + $importer = new WC_Product_CSV_Importer_Controller(); + $importer->dispatch(); + } + + /** + * Register WordPress based importers. */ public function register_importers() { - register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce tax rates (CSV)', 'woocommerce' ), __( 'Import tax rates to your store via a csv file.', 'woocommerce' ), array( $this, 'tax_rates_importer' ) ); + if ( defined( 'WP_LOAD_IMPORTERS' ) ) { + add_action( 'import_start', array( $this, 'post_importer_compatibility' ) ); + register_importer( 'woocommerce_product_csv', __( 'WooCommerce products (CSV)', 'woocommerce' ), __( 'Import products to your store via a csv file.', 'woocommerce' ), array( $this, 'product_importer' ) ); + register_importer( 'woocommerce_tax_rate_csv', __( 'WooCommerce tax rates (CSV)', 'woocommerce' ), __( 'Import tax rates to your store via a csv file.', 'woocommerce' ), array( $this, 'tax_rates_importer' ) ); + } } /** - * Add menu item. + * The tax rate importer which extends WP_Importer. */ public function tax_rates_importer() { - // Load Importer API require_once ABSPATH . 'wp-admin/includes/import.php'; if ( ! class_exists( 'WP_Importer' ) ) { @@ -49,16 +129,14 @@ class WC_Admin_Importers { } } - // includes - require( dirname( __FILE__ ) . '/importers/class-wc-tax-rate-importer.php' ); + require dirname( __FILE__ ) . '/importers/class-wc-tax-rate-importer.php'; - // Dispatch $importer = new WC_Tax_Rate_Importer(); $importer->dispatch(); } /** - * When running the WP importer, ensure attributes exist. + * When running the WP XML importer, ensure attributes exist. * * WordPress import should work - however, it fails to import custom product attribute taxonomies. * This code grabs the file before it is imported and ensures the taxonomies are created. @@ -66,53 +144,49 @@ class WC_Admin_Importers { public function post_importer_compatibility() { global $wpdb; - if ( empty( $_POST['import_id'] ) || ! class_exists( 'WXR_Parser' ) ) { + if ( empty( $_POST['import_id'] ) || ! class_exists( 'WXR_Parser' ) ) { // PHPCS: input var ok, CSRF ok. return; } - $id = absint( $_POST['import_id'] ); + $id = absint( $_POST['import_id'] ); // PHPCS: input var ok. $file = get_attached_file( $id ); $parser = new WXR_Parser(); $import_data = $parser->parse( $file ); - if ( isset( $import_data['posts'] ) ) { - $posts = $import_data['posts']; + if ( isset( $import_data['posts'] ) && ! empty( $import_data['posts'] ) ) { + foreach ( $import_data['posts'] as $post ) { + if ( 'product' === $post['post_type'] && ! empty( $post['terms'] ) ) { + foreach ( $post['terms'] as $term ) { + if ( strstr( $term['domain'], 'pa_' ) ) { + if ( ! taxonomy_exists( $term['domain'] ) ) { + $attribute_name = wc_sanitize_taxonomy_name( str_replace( 'pa_', '', $term['domain'] ) ); - if ( $posts && sizeof( $posts ) > 0 ) { - foreach ( $posts as $post ) { - if ( 'product' === $post['post_type'] ) { - if ( ! empty( $post['terms'] ) ) { - foreach ( $post['terms'] as $term ) { - if ( strstr( $term['domain'], 'pa_' ) ) { - if ( ! taxonomy_exists( $term['domain'] ) ) { - $attribute_name = wc_sanitize_taxonomy_name( str_replace( 'pa_', '', $term['domain'] ) ); - - // Create the taxonomy - if ( ! in_array( $attribute_name, wc_get_attribute_taxonomies() ) ) { - $attribute = array( - 'attribute_label' => $attribute_name, - 'attribute_name' => $attribute_name, - 'attribute_type' => 'select', - 'attribute_orderby' => 'menu_order', - 'attribute_public' => 0, - ); - $wpdb->insert( $wpdb->prefix . 'woocommerce_attribute_taxonomies', $attribute ); - delete_transient( 'wc_attribute_taxonomies' ); - } - - // Register the taxonomy now so that the import works! - register_taxonomy( - $term['domain'], - apply_filters( 'woocommerce_taxonomy_objects_' . $term['domain'], array( 'product' ) ), - apply_filters( 'woocommerce_taxonomy_args_' . $term['domain'], array( - 'hierarchical' => true, - 'show_ui' => false, - 'query_var' => true, - 'rewrite' => false, - ) ) - ); - } + // Create the taxonomy. + if ( ! in_array( $attribute_name, wc_get_attribute_taxonomies(), true ) ) { + wc_create_attribute( + array( + 'name' => $attribute_name, + 'slug' => $attribute_name, + 'type' => 'select', + 'order_by' => 'menu_order', + 'has_archives' => false, + ) + ); } + + // Register the taxonomy now so that the import works! + register_taxonomy( + $term['domain'], + apply_filters( 'woocommerce_taxonomy_objects_' . $term['domain'], array( 'product' ) ), + apply_filters( + 'woocommerce_taxonomy_args_' . $term['domain'], array( + 'hierarchical' => true, + 'show_ui' => false, + 'query_var' => true, + 'rewrite' => false, + ) + ) + ); } } } @@ -120,8 +194,105 @@ class WC_Admin_Importers { } } } + + /** + * Ajax callback for importing one batch of products from a CSV. + */ + public function do_ajax_product_import() { + global $wpdb; + + check_ajax_referer( 'wc-product-import', 'security' ); + + if ( ! $this->import_allowed() || ! isset( $_POST['file'] ) ) { // PHPCS: input var ok. + wp_send_json_error( array( 'message' => __( 'Insufficient privileges to import products.', 'woocommerce' ) ) ); + } + + include_once WC_ABSPATH . 'includes/admin/importers/class-wc-product-csv-importer-controller.php'; + include_once WC_ABSPATH . 'includes/import/class-wc-product-csv-importer.php'; + + $file = wc_clean( wp_unslash( $_POST['file'] ) ); // PHPCS: input var ok. + $params = array( + 'delimiter' => ! empty( $_POST['delimiter'] ) ? wc_clean( wp_unslash( $_POST['delimiter'] ) ) : ',', // PHPCS: input var ok. + 'start_pos' => isset( $_POST['position'] ) ? absint( $_POST['position'] ) : 0, // PHPCS: input var ok. + 'mapping' => isset( $_POST['mapping'] ) ? (array) wc_clean( wp_unslash( $_POST['mapping'] ) ) : array(), // PHPCS: input var ok. + 'update_existing' => isset( $_POST['update_existing'] ) ? (bool) $_POST['update_existing'] : false, // PHPCS: input var ok. + 'lines' => apply_filters( 'woocommerce_product_import_batch_size', 30 ), + 'parse' => true, + ); + + // Log failures. + if ( 0 !== $params['start_pos'] ) { + $error_log = array_filter( (array) get_user_option( 'product_import_error_log' ) ); + } else { + $error_log = array(); + } + + $importer = WC_Product_CSV_Importer_Controller::get_importer( $file, $params ); + $results = $importer->import(); + $percent_complete = $importer->get_percent_complete(); + $error_log = array_merge( $error_log, $results['failed'], $results['skipped'] ); + + update_user_option( get_current_user_id(), 'product_import_error_log', $error_log ); + + if ( 100 === $percent_complete ) { + // @codingStandardsIgnoreStart. + $wpdb->delete( $wpdb->postmeta, array( 'meta_key' => '_original_id' ) ); + $wpdb->delete( $wpdb->posts, array( + 'post_type' => 'product', + 'post_status' => 'importing', + ) ); + $wpdb->delete( $wpdb->posts, array( + 'post_type' => 'product_variation', + 'post_status' => 'importing', + ) ); + // @codingStandardsIgnoreEnd. + + // Clean up orphaned data. + $wpdb->query( " + DELETE {$wpdb->posts}.* FROM {$wpdb->posts} + LEFT JOIN {$wpdb->posts} wp ON wp.ID = {$wpdb->posts}.post_parent + WHERE wp.ID IS NULL AND {$wpdb->posts}.post_type = 'product_variation' + " ); + $wpdb->query( " + DELETE {$wpdb->postmeta}.* FROM {$wpdb->postmeta} + LEFT JOIN {$wpdb->posts} wp ON wp.ID = {$wpdb->postmeta}.post_id + WHERE wp.ID IS NULL + " ); + // @codingStandardsIgnoreStart. + $wpdb->query( " + DELETE tr.* FROM {$wpdb->term_relationships} tr + LEFT JOIN {$wpdb->posts} wp ON wp.ID = tr.object_id + LEFT JOIN {$wpdb->term_taxonomy} tt ON tr.term_taxonomy_id = tt.term_taxonomy_id + WHERE wp.ID IS NULL + AND tt.taxonomy IN ( '" . implode( "','", array_map( 'esc_sql', get_object_taxonomies( 'product' ) ) ) . "' ) + " ); + // @codingStandardsIgnoreEnd. + + // Send success. + wp_send_json_success( + array( + 'position' => 'done', + 'percentage' => 100, + 'url' => add_query_arg( array( 'nonce' => wp_create_nonce( 'product-csv' ) ), admin_url( 'edit.php?post_type=product&page=product_importer&step=done' ) ), + 'imported' => count( $results['imported'] ), + 'failed' => count( $results['failed'] ), + 'updated' => count( $results['updated'] ), + 'skipped' => count( $results['skipped'] ), + ) + ); + } else { + wp_send_json_success( + array( + 'position' => $importer->get_file_position(), + 'percentage' => $percent_complete, + 'imported' => count( $results['imported'] ), + 'failed' => count( $results['failed'] ), + 'updated' => count( $results['updated'] ), + 'skipped' => count( $results['skipped'] ), + ) + ); + } + } } -endif; - -return new WC_Admin_Importers(); +new WC_Admin_Importers(); diff --git a/includes/admin/class-wc-admin-log-table-list.php b/includes/admin/class-wc-admin-log-table-list.php index 1016705a8ce..669867bbb6d 100644 --- a/includes/admin/class-wc-admin-log-table-list.php +++ b/includes/admin/class-wc-admin-log-table-list.php @@ -13,7 +13,7 @@ if ( ! defined( 'ABSPATH' ) ) { } if ( ! class_exists( 'WP_List_Table' ) ) { - require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' ); + require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; } class WC_Admin_Log_Table_List extends WP_List_Table { @@ -22,11 +22,13 @@ class WC_Admin_Log_Table_List extends WP_List_Table { * Initialize the log table list. */ public function __construct() { - parent::__construct( array( - 'singular' => 'log', - 'plural' => 'logs', - 'ajax' => false, - ) ); + parent::__construct( + array( + 'singular' => 'log', + 'plural' => 'logs', + 'ajax' => false, + ) + ); } /** @@ -37,14 +39,38 @@ class WC_Admin_Log_Table_List extends WP_List_Table { public function level_dropdown() { $levels = array( - array( 'value' => WC_Log_Levels::EMERGENCY, 'label' => __( 'Emergency', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::ALERT, 'label' => __( 'Alert', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::CRITICAL, 'label' => __( 'Critical', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::ERROR, 'label' => __( 'Error', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::WARNING, 'label' => __( 'Warning', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::NOTICE, 'label' => __( 'Notice', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::INFO, 'label' => __( 'Info', 'woocommerce' ) ), - array( 'value' => WC_Log_Levels::DEBUG, 'label' => __( 'Debug', 'woocommerce' ) ), + array( + 'value' => WC_Log_Levels::EMERGENCY, + 'label' => __( 'Emergency', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::ALERT, + 'label' => __( 'Alert', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::CRITICAL, + 'label' => __( 'Critical', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::ERROR, + 'label' => __( 'Error', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::WARNING, + 'label' => __( 'Warning', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::NOTICE, + 'label' => __( 'Notice', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::INFO, + 'label' => __( 'Info', 'woocommerce' ), + ), + array( + 'value' => WC_Log_Levels::DEBUG, + 'label' => __( 'Debug', 'woocommerce' ), + ), ); $selected_level = isset( $_REQUEST['level'] ) ? $_REQUEST['level'] : ''; @@ -52,13 +78,16 @@ class WC_Admin_Log_Table_List extends WP_List_Table { '', 'timestamp' => __( 'Timestamp', 'woocommerce' ), - 'level' => __( 'Level', 'woocommerce' ), - 'message' => __( 'Message', 'woocommerce' ), - 'source' => __( 'Source', 'woocommerce' ), + 'level' => __( 'Level', 'woocommerce' ), + 'message' => __( 'Message', 'woocommerce' ), + 'source' => __( 'Source', 'woocommerce' ), ); } @@ -95,10 +124,12 @@ class WC_Admin_Log_Table_List extends WP_List_Table { * @return string */ public function column_timestamp( $log ) { - return esc_html( mysql2date( - get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), - $log['timestamp'] - ) ); + return esc_html( + mysql2date( + get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), + $log['timestamp'] + ) + ); } /** @@ -111,22 +142,22 @@ class WC_Admin_Log_Table_List extends WP_List_Table { $level_key = WC_Log_Levels::get_severity_level( $log['level'] ); $levels = array( 'emergency' => __( 'Emergency', 'woocommerce' ), - 'alert' => __( 'Alert', 'woocommerce' ), - 'critical' => __( 'Critical', 'woocommerce' ), - 'error' => __( 'Error', 'woocommerce' ), - 'warning' => __( 'Warning', 'woocommerce' ), - 'notice' => __( 'Notice', 'woocommerce' ), - 'info' => __( 'Info', 'woocommerce' ), - 'debug' => __( 'Debug', 'woocommerce' ), + 'alert' => __( 'Alert', 'woocommerce' ), + 'critical' => __( 'Critical', 'woocommerce' ), + 'error' => __( 'Error', 'woocommerce' ), + 'warning' => __( 'Warning', 'woocommerce' ), + 'notice' => __( 'Notice', 'woocommerce' ), + 'info' => __( 'Info', 'woocommerce' ), + 'debug' => __( 'Debug', 'woocommerce' ), ); - if ( isset( $levels[ $level_key ] ) ) { - $level = $levels[ $level_key ]; - $level_class = sanitize_html_class( 'log-level--' . $level_key ); - return '' . esc_html( $level ) . ''; - } else { + if ( ! isset( $levels[ $level_key ] ) ) { return ''; } + + $level = $levels[ $level_key ]; + $level_class = sanitize_html_class( 'log-level--' . $level_key ); + return '' . esc_html( $level ) . ''; } /** @@ -183,8 +214,8 @@ class WC_Admin_Log_Table_List extends WP_List_Table { protected function get_sortable_columns() { return array( 'timestamp' => array( 'timestamp', true ), - 'level' => array( 'level', true ), - 'source' => array( 'source', true ), + 'level' => array( 'level', true ), + 'source' => array( 'source', true ), ); } @@ -196,12 +227,12 @@ class WC_Admin_Log_Table_List extends WP_List_Table { protected function source_dropdown() { global $wpdb; - $sources = $wpdb->get_col( " - SELECT DISTINCT source + $sources = $wpdb->get_col( + "SELECT DISTINCT source FROM {$wpdb->prefix}woocommerce_log WHERE source != '' - ORDER BY source ASC - " ); + ORDER BY source ASC" + ); if ( ! empty( $sources ) ) { $selected_source = isset( $_REQUEST['source'] ) ? $_REQUEST['source'] : ''; @@ -209,13 +240,16 @@ class WC_Admin_Log_Table_List extends WP_List_Table { prefix}woocommerce_log {$where}"; $total_items = $wpdb->get_var( $query_count ); - $this->set_pagination_args( array( - 'total_items' => $total_items, - 'per_page' => $per_page, - 'total_pages' => ceil( $total_items / $per_page ), - ) ); + $this->set_pagination_args( + array( + 'total_items' => $total_items, + 'per_page' => $per_page, + 'total_pages' => ceil( $total_items / $per_page ), + ) + ); } /** @@ -280,7 +316,7 @@ class WC_Admin_Log_Table_List extends WP_List_Table { protected function get_items_query_offset() { global $wpdb; - $per_page = $this->get_items_per_page( 'woocommerce_status_log_items_per_page', 10 ); + $per_page = $this->get_items_per_page( 'woocommerce_status_log_items_per_page', 10 ); $current_page = $this->get_pagenum(); if ( 1 < $current_page ) { $offset = $per_page * ( $current_page - 1 ); @@ -311,7 +347,7 @@ class WC_Admin_Log_Table_List extends WP_List_Table { $order = 'DESC'; } - return "ORDER BY {$by} {$order}"; + return "ORDER BY {$by} {$order}, log_id {$order}"; } /** @@ -334,12 +370,16 @@ class WC_Admin_Log_Table_List extends WP_List_Table { $where_conditions[] = 'source = %s'; $where_values[] = wc_clean( $_REQUEST['source'] ); } + if ( ! empty( $_REQUEST['s'] ) ) { + $where_conditions[] = 'message like %s'; + $where_values[] = '%' . $wpdb->esc_like( wc_clean( wp_unslash( $_REQUEST['s'] ) ) ) . '%'; + } - if ( ! empty( $where_conditions ) ) { - return $wpdb->prepare( 'WHERE 1 = 1 AND ' . implode( ' AND ', $where_conditions ), $where_values ); - } else { + if ( empty( $where_conditions ) ) { return ''; } + + return $wpdb->prepare( 'WHERE 1 = 1 AND ' . implode( ' AND ', $where_conditions ), $where_values ); } /** diff --git a/includes/admin/class-wc-admin-menus.php b/includes/admin/class-wc-admin-menus.php index 09aee416b64..cfe052da251 100644 --- a/includes/admin/class-wc-admin-menus.php +++ b/includes/admin/class-wc-admin-menus.php @@ -2,17 +2,15 @@ /** * Setup menus in WP admin. * - * @author WooThemes - * @category Admin - * @package WooCommerce/Admin - * @version 2.5.0 + * @package WooCommerce\Admin + * @version 2.5.0 */ -if ( ! defined( 'ABSPATH' ) ) { - exit; -} +defined( 'ABSPATH' ) || exit; -if ( ! class_exists( 'WC_Admin_Menus', false ) ) : +if ( class_exists( 'WC_Admin_Menus', false ) ) { + return new WC_Admin_Menus(); +} /** * WC_Admin_Menus Class. @@ -23,7 +21,7 @@ class WC_Admin_Menus { * Hook in tabs. */ public function __construct() { - // Add menus + // Add menus. add_action( 'admin_menu', array( $this, 'admin_menu' ), 9 ); add_action( 'admin_menu', array( $this, 'reports_menu' ), 20 ); add_action( 'admin_menu', array( $this, 'settings_menu' ), 50 ); @@ -37,11 +35,12 @@ class WC_Admin_Menus { add_action( 'admin_head', array( $this, 'menu_order_count' ) ); add_filter( 'menu_order', array( $this, 'menu_order' ) ); add_filter( 'custom_menu_order', array( $this, 'custom_menu_order' ) ); + add_filter( 'set-screen-option', array( $this, 'set_screen_option' ), 10, 3 ); // Add endpoints custom URLs in Appearance > Menus > Pages. add_action( 'admin_head-nav-menus.php', array( $this, 'add_nav_menu_meta_boxes' ) ); - // Admin bar menus + // Admin bar menus. if ( apply_filters( 'woocommerce_show_admin_bar_visit_store', true ) ) { add_action( 'admin_bar_menu', array( $this, 'admin_bar_menus' ), 31 ); } @@ -54,7 +53,7 @@ class WC_Admin_Menus { global $menu; if ( current_user_can( 'manage_woocommerce' ) ) { - $menu[] = array( '', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce' ); + $menu[] = array( '', 'read', 'separator-woocommerce', '', 'wp-menu-separator woocommerce' ); // WPCS: override ok. } add_menu_page( __( 'WooCommerce', 'woocommerce' ), __( 'WooCommerce', 'woocommerce' ), 'manage_woocommerce', 'woocommerce', null, null, '55.5' ); @@ -67,9 +66,9 @@ class WC_Admin_Menus { */ public function reports_menu() { if ( current_user_can( 'manage_woocommerce' ) ) { - add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) ); + add_submenu_page( 'woocommerce', __( 'Reports', 'woocommerce' ), __( 'Reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ) ); } else { - add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ) , 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' ); + add_menu_page( __( 'Sales reports', 'woocommerce' ), __( 'Sales reports', 'woocommerce' ), 'view_woocommerce_reports', 'wc-reports', array( $this, 'reports_page' ), null, '55.6' ); } } @@ -77,7 +76,7 @@ class WC_Admin_Menus { * Add menu item. */ public function settings_menu() { - $settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ) , 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) ); + $settings_page = add_submenu_page( 'woocommerce', __( 'WooCommerce settings', 'woocommerce' ), __( 'Settings', 'woocommerce' ), 'manage_woocommerce', 'wc-settings', array( $this, 'settings_page' ) ); add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) ); } @@ -86,22 +85,52 @@ class WC_Admin_Menus { * Loads gateways and shipping methods into memory for use within settings. */ public function settings_page_init() { + global $current_tab, $current_section; + WC()->payment_gateways(); WC()->shipping(); + + // Include settings pages. + WC_Admin_Settings::get_settings_pages(); + + // Get current tab/section. + $current_tab = empty( $_GET['tab'] ) ? 'general' : sanitize_title( wp_unslash( $_GET['tab'] ) ); // WPCS: input var okay, CSRF ok. + $current_section = empty( $_REQUEST['section'] ) ? '' : sanitize_title( wp_unslash( $_REQUEST['section'] ) ); // WPCS: input var okay, CSRF ok. + + // Save settings if data has been posted. + if ( '' !== $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}_{$current_section}", ! empty( $_POST ) ) ) { // WPCS: input var okay, CSRF ok. + WC_Admin_Settings::save(); + } elseif ( '' === $current_section && apply_filters( "woocommerce_save_settings_{$current_tab}", ! empty( $_POST ) ) ) { // WPCS: input var okay, CSRF ok. + WC_Admin_Settings::save(); + } + + // Add any posted messages. + if ( ! empty( $_GET['wc_error'] ) ) { // WPCS: input var okay, CSRF ok. + WC_Admin_Settings::add_error( wp_kses_post( wp_unslash( $_GET['wc_error'] ) ) ); // WPCS: input var okay, CSRF ok. + } + + if ( ! empty( $_GET['wc_message'] ) ) { // WPCS: input var okay, CSRF ok. + WC_Admin_Settings::add_message( wp_kses_post( wp_unslash( $_GET['wc_message'] ) ) ); // WPCS: input var okay, CSRF ok. + } + + do_action( 'woocommerce_settings_page_init' ); } /** * Add menu item. */ public function status_menu() { - add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'Status', 'woocommerce' ) , 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) ); + add_submenu_page( 'woocommerce', __( 'WooCommerce status', 'woocommerce' ), __( 'Status', 'woocommerce' ), 'manage_woocommerce', 'wc-status', array( $this, 'status_page' ) ); } /** * Addons menu item. */ public function addons_menu() { - add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), __( 'Extensions', 'woocommerce' ) , 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) ); + $count_html = WC_Helper_Updater::get_updates_count_html(); + /* translators: %s: extensions count */ + $menu_title = sprintf( __( 'Extensions %s', 'woocommerce' ), $count_html ); + add_submenu_page( 'woocommerce', __( 'WooCommerce extensions', 'woocommerce' ), $menu_title, 'manage_woocommerce', 'wc-addons', array( $this, 'addons_page' ) ); } /** @@ -111,17 +140,17 @@ class WC_Admin_Menus { global $parent_file, $submenu_file, $post_type; switch ( $post_type ) { - case 'shop_order' : - case 'shop_coupon' : - $parent_file = 'woocommerce'; - break; - case 'product' : + case 'shop_order': + case 'shop_coupon': + $parent_file = 'woocommerce'; // WPCS: override ok. + break; + case 'product': $screen = get_current_screen(); if ( $screen && taxonomy_is_product_attribute( $screen->taxonomy ) ) { - $submenu_file = 'product_attributes'; - $parent_file = 'edit.php?post_type=product'; + $submenu_file = 'product_attributes'; // WPCS: override ok. + $parent_file = 'edit.php?post_type=product'; // WPCS: override ok. } - break; + break; } } @@ -132,14 +161,16 @@ class WC_Admin_Menus { global $submenu; if ( isset( $submenu['woocommerce'] ) ) { - // Remove 'WooCommerce' sub menu item + // Remove 'WooCommerce' sub menu item. unset( $submenu['woocommerce'][0] ); - // Add count if user has access - if ( apply_filters( 'woocommerce_include_processing_order_count_in_menu', true ) && current_user_can( 'manage_woocommerce' ) && ( $order_count = wc_processing_order_count() ) ) { + $order_count = wc_processing_order_count(); + + // Add count if user has access. + if ( apply_filters( 'woocommerce_include_processing_order_count_in_menu', true ) && current_user_can( 'manage_woocommerce' ) && $order_count ) { foreach ( $submenu['woocommerce'] as $key => $menu_item ) { if ( 0 === strpos( $menu_item[0], _x( 'Orders', 'Admin menu name', 'woocommerce' ) ) ) { - $submenu['woocommerce'][ $key ][0] .= ' ' . number_format_i18n( $order_count ) . ''; + $submenu['woocommerce'][ $key ][0] .= ' ' . number_format_i18n( $order_count ) . ''; // WPCS: override ok. break; } } @@ -150,44 +181,60 @@ class WC_Admin_Menus { /** * Reorder the WC menu items in admin. * - * @param mixed $menu_order + * @param int $menu_order Menu order. * @return array */ public function menu_order( $menu_order ) { - // Initialize our custom order array + // Initialize our custom order array. $woocommerce_menu_order = array(); - // Get the index of our custom separator - $woocommerce_separator = array_search( 'separator-woocommerce', $menu_order ); + // Get the index of our custom separator. + $woocommerce_separator = array_search( 'separator-woocommerce', $menu_order, true ); - // Get index of product menu - $woocommerce_product = array_search( 'edit.php?post_type=product', $menu_order ); + // Get index of product menu. + $woocommerce_product = array_search( 'edit.php?post_type=product', $menu_order, true ); - // Loop through menu order and do some rearranging + // Loop through menu order and do some rearranging. foreach ( $menu_order as $index => $item ) { - if ( ( ( 'woocommerce' ) == $item ) ) { + if ( 'woocommerce' === $item ) { $woocommerce_menu_order[] = 'separator-woocommerce'; $woocommerce_menu_order[] = $item; $woocommerce_menu_order[] = 'edit.php?post_type=product'; unset( $menu_order[ $woocommerce_separator ] ); unset( $menu_order[ $woocommerce_product ] ); - } elseif ( ! in_array( $item, array( 'separator-woocommerce' ) ) ) { + } elseif ( ! in_array( $item, array( 'separator-woocommerce' ), true ) ) { $woocommerce_menu_order[] = $item; } } - // Return order + // Return order. return $woocommerce_menu_order; } /** * Custom menu order. * + * @param bool $enabled Whether custom menu ordering is already enabled. * @return bool */ - public function custom_menu_order() { - return current_user_can( 'manage_woocommerce' ); + public function custom_menu_order( $enabled ) { + return $enabled || current_user_can( 'manage_woocommerce' ); + } + + /** + * Validate screen options on update. + * + * @param bool|int $status Screen option value. Default false to skip. + * @param string $option The option name. + * @param int $value The number of rows to use. + */ + public function set_screen_option( $status, $option, $value ) { + if ( in_array( $option, array( 'woocommerce_keys_per_page', 'woocommerce_webhooks_per_page' ), true ) ) { + return $value; + } + + return $status; } /** @@ -276,10 +323,10 @@ class WC_Admin_Menus {%sshop/sample-product/. This setting affects product URLs only, not things such as product categories.', 'woocommerce' ), esc_url( home_url( '/' ) ) ) ) );
- // Get shop page
- $shop_page_id = wc_get_page_id( 'shop' );
- $base_slug = urldecode( ( $shop_page_id > 0 && get_post( $shop_page_id ) ) ? get_page_uri( $shop_page_id ) : _x( 'shop', 'default-slug', 'woocommerce' ) );
- $product_base = _x( 'product', 'default-slug', 'woocommerce' );
+ $shop_page_id = wc_get_page_id( 'shop' );
+ $base_slug = urldecode( ( $shop_page_id > 0 && get_post( $shop_page_id ) ) ? get_page_uri( $shop_page_id ) : _x( 'shop', 'default-slug', 'woocommerce' ) );
+ $product_base = _x( 'product', 'default-slug', 'woocommerce' );
$structures = array(
0 => '',
@@ -115,28 +115,29 @@ class WC_Admin_Permalink_Settings {
| + | /?product=sample-product //sample-product/ |
|
|---|---|---|
| + | //sample-product/ |
|
| + | //product-category/sample-product/ |
|
| + | - must be set or WordPress will use default instead.', 'woocommerce' ); ?> + |
+
+
+
+
+
+ />
+
+
+
+
+
+
plugin_path() . '/i18n/locale-info.php';
+
+ if ( isset( $locale_info[ $country ] ) ) {
+ update_option( 'woocommerce_weight_unit', $locale_info[ $country ]['weight_unit'] );
+ update_option( 'woocommerce_dimension_unit', $locale_info[ $country ]['dimension_unit'] );
+
+ // Set currency formatting options based on chosen location and currency.
+ if ( $locale_info[ $country ]['currency_code'] === $currency_code ) {
+ update_option( 'woocommerce_currency_pos', $locale_info[ $country ]['currency_pos'] );
+ update_option( 'woocommerce_price_decimal_sep', $locale_info[ $country ]['decimal_sep'] );
+ update_option( 'woocommerce_price_num_decimals', $locale_info[ $country ]['num_decimals'] );
+ update_option( 'woocommerce_price_thousand_sep', $locale_info[ $country ]['thousand_sep'] );
+ }
+ }
+
+ if ( $tracking ) {
+ update_option( 'woocommerce_allow_tracking', 'yes' );
+ wp_schedule_single_event( time() + 10, 'woocommerce_tracker_send_event', array( true ) );
+ } else {
+ update_option( 'woocommerce_allow_tracking', 'no' );
+ }
+
WC_Install::create_pages();
- wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+ wp_safe_redirect( esc_url_raw( $this->get_next_step_link() ) );
exit;
}
/**
- * Locale settings.
+ * Finishes replying to the client, but keeps the process running for further (async) code execution.
+ *
+ * @see https://core.trac.wordpress.org/ticket/41358 .
*/
- public function wc_setup_locale() {
- $user_location = WC_Geolocation::geolocate_ip();
- $country = ! empty( $user_location['country'] ) ? $user_location['country'] : 'US';
- $state = ! empty( $user_location['state'] ) ? $user_location['state'] : '*';
- $state = 'US' === $country && '*' === $state ? 'AL' : $state;
+ protected function close_http_connection() {
+ // Only 1 PHP process can access a session object at a time, close this so the next request isn't kept waiting.
+ // @codingStandardsIgnoreStart
+ if ( session_id() ) {
+ session_write_close();
+ }
+ // @codingStandardsIgnoreEnd
- // Defaults
- $currency = get_option( 'woocommerce_currency', 'GBP' );
- $currency_pos = get_option( 'woocommerce_currency_pos', 'left' );
- $decimal_sep = get_option( 'woocommerce_price_decimal_sep', '.' );
- $num_decimals = get_option( 'woocommerce_price_num_decimals', '2' );
- $thousand_sep = get_option( 'woocommerce_price_thousand_sep', ',' );
- $dimension_unit = get_option( 'woocommerce_dimension_unit', 'cm' );
- $weight_unit = get_option( 'woocommerce_weight_unit', 'kg' );
- ?>
-
-
- get_next_step_link() ) );
- exit;
- }
-
- /**
- * Shipping and taxes.
- */
- public function wc_setup_shipping_taxes() {
- ?>
-
-
- set_zone_order( 0 );
- $zone->add_location( $location['country'], 'country' );
- $zone->set_zone_name( $zone->get_formatted_location() );
- $zone->add_shipping_method( 'free_shipping' );
- $zone->save();
- }
+ // fastcgi_finish_request is the cleanest way to send the response and keep the script running, but not every server has it.
+ if ( is_callable( 'fastcgi_finish_request' ) ) {
+ fastcgi_finish_request();
} else {
- update_option( 'woocommerce_ship_to_countries', 'disabled' );
- }
-
- update_option( 'woocommerce_calc_taxes', $enable_taxes ? 'yes' : 'no' );
- update_option( 'woocommerce_prices_include_tax', sanitize_text_field( $_POST['woocommerce_prices_include_tax'] ) );
-
- if ( $enable_taxes ) {
- $locale_info = include( WC()->plugin_path() . '/i18n/locale-info.php' );
- $tax_rates = array();
- $country = WC()->countries->get_base_country();
- $state = WC()->countries->get_base_state();
-
- if ( isset( $locale_info[ $country ] ) ) {
- if ( isset( $locale_info[ $country ]['tax_rates'][ $state ] ) ) {
- $tax_rates = $locale_info[ $country ]['tax_rates'][ $state ];
- } elseif ( isset( $locale_info[ $country ]['tax_rates'][''] ) ) {
- $tax_rates = $locale_info[ $country ]['tax_rates'][''];
- }
- if ( isset( $locale_info[ $country ]['tax_rates']['*'] ) ) {
- $tax_rates = array_merge( $locale_info[ $country ]['tax_rates']['*'], $tax_rates );
- }
- }
- if ( $tax_rates ) {
- $loop = 0;
- foreach ( $tax_rates as $rate ) {
- $tax_rate = array(
- 'tax_rate_country' => $rate['country'],
- 'tax_rate_state' => $rate['state'],
- 'tax_rate' => $rate['rate'],
- 'tax_rate_name' => $rate['name'],
- 'tax_rate_priority' => isset( $rate['priority'] ) ? absint( $rate['priority'] ) : 1,
- 'tax_rate_compound' => 0,
- 'tax_rate_shipping' => $rate['shipping'] ? 1 : 0,
- 'tax_rate_order' => $loop ++,
- 'tax_rate_class' => '',
- );
- WC_Tax::_insert_tax_rate( $tax_rate );
- }
+ // Fallback: send headers and flush buffers.
+ if ( ! headers_sent() ) {
+ header( 'Connection: close' );
}
+ @ob_end_flush(); // @codingStandardsIgnoreLine.
+ flush();
}
-
- wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
- exit;
}
/**
- * Simple array of gateways to show in wizard.
+ * Function called after the HTTP request is finished, so it's executed without the client having to wait for it.
+ *
+ * @see WC_Admin_Setup_Wizard::install_plugin
+ * @see WC_Admin_Setup_Wizard::install_theme
+ */
+ public function run_deferred_actions() {
+ $this->close_http_connection();
+ foreach ( $this->deferred_actions as $action ) {
+ call_user_func_array( $action['func'], $action['args'] );
+
+ // Clear the background installation flag if this is a plugin.
+ if (
+ isset( $action['func'][1] ) &&
+ 'background_installer' === $action['func'][1] &&
+ isset( $action['args'][0] )
+ ) {
+ delete_option( 'woocommerce_setup_background_installing_' . $action['args'][0] );
+ }
+ }
+ }
+
+ /**
+ * Helper method to queue the background install of a plugin.
+ *
+ * @param string $plugin_id Plugin id used for background install.
+ * @param array $plugin_info Plugin info array containing name and repo-slug, and optionally file if different from [repo-slug].php.
+ */
+ protected function install_plugin( $plugin_id, $plugin_info ) {
+ // Make sure we don't trigger multiple simultaneous installs.
+ if ( get_option( 'woocommerce_setup_background_installing_' . $plugin_id ) ) {
+ return;
+ }
+
+ $plugin_file = isset( $plugin_info['file'] ) ? $plugin_info['file'] : $plugin_info['repo-slug'] . '.php';
+ if ( is_plugin_active( $plugin_info['repo-slug'] . '/' . $plugin_file ) ) {
+ return;
+ }
+
+ if ( empty( $this->deferred_actions ) ) {
+ add_action( 'shutdown', array( $this, 'run_deferred_actions' ) );
+ }
+
+ array_push(
+ $this->deferred_actions,
+ array(
+ 'func' => array( 'WC_Install', 'background_installer' ),
+ 'args' => array( $plugin_id, $plugin_info ),
+ )
+ );
+
+ // Set the background installation flag for this plugin.
+ update_option( 'woocommerce_setup_background_installing_' . $plugin_id, true );
+ }
+
+
+ /**
+ * Helper method to queue the background install of a theme.
+ *
+ * @param string $theme_id Theme id used for background install.
+ */
+ protected function install_theme( $theme_id ) {
+ if ( empty( $this->deferred_actions ) ) {
+ add_action( 'shutdown', array( $this, 'run_deferred_actions' ) );
+ }
+ array_push(
+ $this->deferred_actions,
+ array(
+ 'func' => array( 'WC_Install', 'theme_background_installer' ),
+ 'args' => array( $theme_id ),
+ )
+ );
+ }
+
+ /**
+ * Helper method to install Jetpack.
+ */
+ protected function install_jetpack() {
+ $this->install_plugin(
+ 'jetpack',
+ array(
+ 'name' => __( 'Jetpack', 'woocommerce' ),
+ 'repo-slug' => 'jetpack',
+ )
+ );
+ }
+
+ /**
+ * Helper method to install WooCommerce Services and its Jetpack dependency.
+ */
+ protected function install_woocommerce_services() {
+ $this->install_jetpack();
+ $this->install_plugin(
+ 'woocommerce-services',
+ array(
+ 'name' => __( 'WooCommerce Services', 'woocommerce' ),
+ 'repo-slug' => 'woocommerce-services',
+ )
+ );
+ }
+
+ /**
+ * Retrieve info for missing WooCommerce Services and/or Jetpack plugin.
+ *
* @return array
*/
- protected function get_wizard_payment_gateways() {
- $gateways = array(
- 'paypal-braintree' => array(
- 'name' => __( 'PayPal by Braintree', 'woocommerce' ),
- 'image' => WC()->plugin_url() . '/assets/images/paypal-braintree.png',
- 'description' => __( "Safe and secure payments using credit cards or your customer's PayPal account.", 'woocommerce' ) . ' ' . __( 'Learn more about PayPal', 'woocommerce' ) . '',
- 'class' => 'featured featured-row-last',
- 'repo-slug' => 'woocommerce-gateway-paypal-powered-by-braintree',
- ),
- 'paypal-ec' => array(
- 'name' => __( 'PayPal Express Checkout', 'woocommerce' ),
- 'image' => WC()->plugin_url() . '/assets/images/paypal.png',
- 'description' => __( "Safe and secure payments using credit cards or your customer's PayPal account.", 'woocommerce' ) . ' ' . __( 'Learn more about PayPal', 'woocommerce' ) . '',
- 'class' => 'featured featured-row-last',
- 'repo-slug' => 'woocommerce-gateway-paypal-express-checkout',
- ),
- 'stripe' => array(
- 'name' => __( 'Stripe', 'woocommerce' ),
- 'image' => WC()->plugin_url() . '/assets/images/stripe.png',
- 'description' => sprintf( __( 'A modern and robust way to accept credit card payments on your store. Learn more about Stripe.', 'woocommerce' ), 'https://wordpress.org/plugins/woocommerce-gateway-stripe/' ),
- 'class' => 'featured featured-row-first',
- 'repo-slug' => 'woocommerce-gateway-stripe',
- ),
- 'paypal' => array(
- 'name' => __( 'PayPal Standard', 'woocommerce' ),
- 'description' => __( 'Accept payments via PayPal using account balance or credit card.', 'woocommerce' ),
- 'image' => '',
- 'class' => '',
+ protected function get_wcs_requisite_plugins() {
+ $plugins = array();
+ if ( ! is_plugin_active( 'woocommerce-services/woocommerce-services.php' ) && ! get_option( 'woocommerce_setup_background_installing_woocommerce-services' ) ) {
+ $plugins[] = array(
+ 'name' => __( 'WooCommerce Services', 'woocommerce' ),
+ 'slug' => 'woocommerce-services',
+ );
+ }
+ if ( ! is_plugin_active( 'jetpack/jetpack.php' ) && ! get_option( 'woocommerce_setup_background_installing_jetpack' ) ) {
+ $plugins[] = array(
+ 'name' => __( 'Jetpack', 'woocommerce' ),
+ 'slug' => 'jetpack',
+ );
+ }
+ return $plugins;
+ }
+
+ /**
+ * Plugin install info message markup with heading.
+ */
+ public function plugin_install_info() {
+ ?>
+
+
+
+
+ array(
+ 'name' => __( 'Flat Rate', 'woocommerce' ),
+ 'description' => __( 'Set a fixed price to cover shipping costs.', 'woocommerce' ),
'settings' => array(
- 'email' => array(
- 'label' => __( 'PayPal email address', 'woocommerce' ),
- 'type' => 'email',
- 'value' => get_option( 'admin_email' ),
- 'placeholder' => __( 'PayPal email address', 'woocommerce' ),
+ 'cost' => array(
+ 'type' => 'text',
+ 'default_value' => __( 'Cost', 'woocommerce' ),
+ 'description' => __( 'What would you like to charge for flat rate shipping?', 'woocommerce' ),
+ 'required' => true,
),
),
),
+ 'free_shipping' => array(
+ 'name' => __( 'Free Shipping', 'woocommerce' ),
+ 'description' => __( "Don't charge for shipping.", 'woocommerce' ),
+ ),
+ );
+
+ return $shipping_methods;
+ }
+
+ /**
+ * Render the available shipping methods for a given country code.
+ *
+ * @param string $country_code Country code.
+ * @param string $currency_code Currency code.
+ * @param string $input_prefix Input prefix.
+ */
+ protected function shipping_method_selection_form( $country_code, $currency_code, $input_prefix ) {
+ $selected = 'flat_rate';
+ $shipping_methods = $this->get_wizard_shipping_methods( $country_code, $currency_code );
+ ?>
+ + + +
++ ' . esc_html__( 'Read more about what we collect.', 'woocommerce' ) . ''; + ?> +
+
+
+
+
+
+
+
+ $method ) : ?>
+
+ + +
+ +
+ $method ) : ?>
+
+
+
+
+
+
+
+
+
+
+ countries->get_base_country();
+ $country_name = WC()->countries->countries[ $country_code ];
+ $prefixed_country_name = WC()->countries->estimated_for_prefix( $country_code ) . $country_name;
+ $currency_code = get_woocommerce_currency();
+ $existing_zones = WC_Shipping_Zones::get_zones();
+ $intro_text = '';
+
+ if ( empty( $existing_zones ) ) {
+ $intro_text = sprintf(
+ /* translators: %s: country name including the 'the' prefix if needed */
+ __( "We've created two Shipping Zones - for %s and for the rest of the world. Below you can set Flat Rate shipping costs for these Zones or offer Free Shipping.", 'woocommerce' ),
+ $prefixed_country_name
+ );
+ }
+
+ $is_wcs_labels_supported = $this->is_wcs_shipping_labels_supported_country( $country_code );
+ $is_shipstation_supported = $this->is_shipstation_supported_country( $country_code );
+
+ ?>
+
+
+
+
+
+ install_woocommerce_services();
+ }
+
+ if ( $setup_shipstation ) {
+ $this->install_plugin(
+ 'woocommerce-shipstation-integration',
+ array(
+ 'name' => __( 'ShipStation', 'woocommerce' ),
+ 'repo-slug' => 'woocommerce-shipstation-integration',
+ 'file' => 'woocommerce-shipstation.php',
+ )
+ );
+ }
+
+ // For now, limit this setup to the first run.
+ if ( ! empty( $existing_zones ) ) {
+ wp_safe_redirect( esc_url_raw( $this->get_next_step_link() ) );
+ exit;
+ }
+
+ /*
+ * If enabled, create a shipping zone containing the country the
+ * store is located in, with the selected method preconfigured.
+ */
+ if ( $setup_domestic ) {
+ $country = WC()->countries->get_base_country();
+
+ $zone = new WC_Shipping_Zone( null );
+ $zone->set_zone_order( 0 );
+ $zone->add_location( $country, 'country' );
+ $instance_id = $zone->add_shipping_method( $domestic_method );
+ $zone->save();
+
+ // Save chosen shipping method settings (using REST controller for convenience).
+ if ( isset( $instance_id ) && ! empty( $_POST['shipping_zones']['domestic'][ $domestic_method ] ) ) { // WPCS: input var ok.
+ $method_controller = new WC_REST_Shipping_Zone_Methods_Controller();
+ // @codingStandardsIgnoreStart
+ $method_controller->update_item( array(
+ 'zone_id' => $zone->get_id(),
+ 'instance_id' => $instance_id,
+ 'settings' => wp_unslash( $_POST['shipping_zones']['domestic'][ $domestic_method ] ),
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ }
+
+ // If enabled, set the selected method for the "rest of world" zone.
+ if ( $setup_intl ) {
+ $zone = new WC_Shipping_Zone( 0 );
+ $instance_id = $zone->add_shipping_method( $intl_method );
+
+ $zone->save();
+
+ // Save chosen shipping method settings (using REST controller for convenience).
+ if ( isset( $instance_id ) && ! empty( $_POST['shipping_zones']['intl'][ $intl_method ] ) ) { // WPCS: input var ok.
+ $method_controller = new WC_REST_Shipping_Zone_Methods_Controller();
+ // @codingStandardsIgnoreStart
+ $method_controller->update_item( array(
+ 'zone_id' => $zone->get_id(),
+ 'instance_id' => $instance_id,
+ 'settings' => wp_unslash( $_POST['shipping_zones']['intl'][ $intl_method ] ),
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ }
+
+ // Notify the user that no shipping methods are configured.
+ if ( ! $setup_domestic && ! $setup_intl ) {
+ WC_Admin_Notices::add_notice( 'no_shipping_methods' );
+ }
+
+ wp_safe_redirect( esc_url_raw( $this->get_next_step_link() ) );
+ exit;
+ }
+
+ /**
+ * Is Stripe country supported
+ * https://stripe.com/global .
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_stripe_supported_country( $country_code ) {
+ $stripe_supported_countries = array(
+ 'AU',
+ 'AT',
+ 'BE',
+ 'CA',
+ 'DK',
+ 'FI',
+ 'FR',
+ 'DE',
+ 'HK',
+ 'IE',
+ 'JP',
+ 'LU',
+ 'NL',
+ 'NZ',
+ 'NO',
+ 'SG',
+ 'ES',
+ 'SE',
+ 'CH',
+ 'GB',
+ 'US',
+ );
+
+ return in_array( $country_code, $stripe_supported_countries, true );
+ }
+
+ /**
+ * Is PayPal currency supported.
+ *
+ * @param string $currency Currency code.
+ * @return boolean
+ */
+ protected function is_paypal_supported_currency( $currency ) {
+ $supported_currencies = array(
+ 'AUD',
+ 'BRL',
+ 'CAD',
+ 'MXN',
+ 'NZD',
+ 'HKD',
+ 'SGD',
+ 'USD',
+ 'EUR',
+ 'JPY',
+ 'TRY',
+ 'NOK',
+ 'CZK',
+ 'DKK',
+ 'HUF',
+ 'ILS',
+ 'MYR',
+ 'PHP',
+ 'PLN',
+ 'SEK',
+ 'CHF',
+ 'TWD',
+ 'THB',
+ 'GBP',
+ 'RMB',
+ 'RUB',
+ 'INR',
+ );
+ return in_array( $currency, $supported_currencies, true );
+ }
+
+ /**
+ * Is Klarna Checkout country supported.
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_klarna_checkout_supported_country( $country_code ) {
+ $supported_countries = array(
+ 'SE', // Sweden.
+ 'FI', // Finland.
+ 'NO', // Norway.
+ 'NL', // Netherlands.
+ );
+ return in_array( $country_code, $supported_countries, true );
+ }
+
+ /**
+ * Is Klarna Payments country supported.
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_klarna_payments_supported_country( $country_code ) {
+ $supported_countries = array(
+ 'DK', // Denmark.
+ 'DE', // Germany.
+ 'AT', // Austria.
+ );
+ return in_array( $country_code, $supported_countries, true );
+ }
+
+ /**
+ * Is Square country supported
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_square_supported_country( $country_code ) {
+ $square_supported_countries = array(
+ 'US',
+ 'CA',
+ 'JP',
+ 'GB',
+ 'AU',
+ );
+ return in_array( $country_code, $square_supported_countries, true );
+ }
+
+ /**
+ * Is eWAY Payments country supported
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_eway_payments_supported_country( $country_code ) {
+ $supported_countries = array(
+ 'AU', // Australia.
+ 'NZ', // New Zealand.
+ );
+ return in_array( $country_code, $supported_countries, true );
+ }
+
+ /**
+ * Is ShipStation country supported
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_shipstation_supported_country( $country_code ) {
+ $supported_countries = array(
+ 'AU', // Australia.
+ 'CA', // Canada.
+ 'GB', // United Kingdom.
+ );
+ return in_array( $country_code, $supported_countries, true );
+ }
+
+ /**
+ * Is WooCommerce Services shipping label country supported
+ *
+ * @param string $country_code Country code.
+ */
+ protected function is_wcs_shipping_labels_supported_country( $country_code ) {
+ $supported_countries = array(
+ 'US', // United States.
+ );
+ return in_array( $country_code, $supported_countries, true );
+ }
+
+ /**
+ * Helper method to retrieve the current user's email address.
+ *
+ * @return string Email address
+ */
+ protected function get_current_user_email() {
+ $current_user = wp_get_current_user();
+ $user_email = $current_user->user_email;
+
+ return $user_email;
+ }
+
+ /**
+ * Array of all possible "in cart" gateways that can be offered.
+ *
+ * @return array
+ */
+ protected function get_wizard_available_in_cart_payment_gateways() {
+ $user_email = $this->get_current_user_email();
+
+ $stripe_description = '
+ $setting ) : ?>
+
+
+ />
+
+
+ + +
+ +' . sprintf( + /* translators: %s: URL */ + __( 'Accept debit and credit cards in 135+ currencies, methods such as Alipay, and one-touch checkout with Apple Pay. Learn more.', 'woocommerce' ), + 'https://woocommerce.com/products/stripe/' + ) . '
'; + $paypal_checkout_description = '' . sprintf( + /* translators: %s: URL */ + __( 'Safe and secure payments using credit cards or your customer\'s PayPal account. Learn more.', 'woocommerce' ), + 'https://woocommerce.com/products/woocommerce-gateway-paypal-checkout/' + ) . '
'; + $klarna_checkout_description = '' . sprintf( + /* translators: %s: URL */ + __( 'Full checkout experience with pay now, pay later and slice it. No credit card numbers, no passwords, no worries. Learn more about Klarna.', 'woocommerce' ), + 'https://woocommerce.com/products/klarna-checkout/' + ) . '
'; + $klarna_payments_description = '' . sprintf( + /* translators: %s: URL */ + __( 'Choose the payment that you want, pay now, pay later or slice it. No credit card numbers, no passwords, no worries. Learn more about Klarna.', 'woocommerce' ), + 'https://woocommerce.com/products/klarna-payments/ ' + ) . '
'; + $square_description = '' . sprintf( + /* translators: %s: URL */ + __( 'Securely accept credit and debit cards with one low rate, no surprise fees (custom rates available). Sell online and in store and track sales and inventory in one place. Learn more about Square.', 'woocommerce' ), + 'https://woocommerce.com/products/square/' + ) . '
'; + + return array( + 'stripe' => array( + 'name' => __( 'WooCommerce Stripe Gateway', 'woocommerce' ), + 'image' => WC()->plugin_url() . '/assets/images/stripe.png', + 'description' => $stripe_description, + 'class' => 'checked stripe-logo', + 'repo-slug' => 'woocommerce-gateway-stripe', + 'settings' => array( + 'create_account' => array( + 'label' => __( 'Set up Stripe for me using this email:', 'woocommerce' ), + 'type' => 'checkbox', + 'value' => 'yes', + 'default' => 'yes', + 'placeholder' => '', + 'required' => false, + 'plugins' => $this->get_wcs_requisite_plugins(), + ), + 'email' => array( + 'label' => __( 'Stripe email address:', 'woocommerce' ), + 'type' => 'email', + 'value' => $user_email, + 'placeholder' => __( 'Stripe email address', 'woocommerce' ), + 'required' => true, + ), + ), + ), + 'ppec_paypal' => array( + 'name' => __( 'WooCommerce PayPal Checkout Gateway', 'woocommerce' ), + 'image' => WC()->plugin_url() . '/assets/images/paypal.png', + 'description' => $paypal_checkout_description, + 'enabled' => true, + 'class' => 'checked paypal-logo', + 'repo-slug' => 'woocommerce-gateway-paypal-express-checkout', + 'settings' => array( + 'reroute_requests' => array( + 'label' => __( 'Set up PayPal for me using this email:', 'woocommerce' ), + 'type' => 'checkbox', + 'value' => 'yes', + 'default' => 'yes', + 'placeholder' => '', + 'required' => false, + 'plugins' => $this->get_wcs_requisite_plugins(), + ), + 'email' => array( + 'label' => __( 'Direct payments to email address:', 'woocommerce' ), + 'type' => 'email', + 'value' => $user_email, + 'placeholder' => __( 'Email address to receive payments', 'woocommerce' ), + 'required' => true, + ), + ), + ), + 'paypal' => array( + 'name' => __( 'PayPal Standard', 'woocommerce' ), + 'description' => __( 'Accept payments via PayPal using account balance or credit card.', 'woocommerce' ), + 'image' => '', + 'settings' => array( + 'email' => array( + 'label' => __( 'PayPal email address:', 'woocommerce' ), + 'type' => 'email', + 'value' => $user_email, + 'placeholder' => __( 'PayPal email address', 'woocommerce' ), + 'required' => true, + ), + ), + ), + 'klarna_checkout' => array( + 'name' => __( 'Klarna Checkout for WooCommerce', 'woocommerce' ), + 'description' => $klarna_checkout_description, + 'image' => WC()->plugin_url() . '/assets/images/klarna-white.png', + 'enabled' => true, + 'class' => 'klarna-logo', + 'repo-slug' => 'klarna-checkout-for-woocommerce', + ), + 'klarna_payments' => array( + 'name' => __( 'Klarna Payments for WooCommerce', 'woocommerce' ), + 'description' => $klarna_payments_description, + 'image' => WC()->plugin_url() . '/assets/images/klarna-white.png', + 'enabled' => true, + 'class' => 'klarna-logo', + 'repo-slug' => 'klarna-payments-for-woocommerce', + ), + 'square' => array( + 'name' => __( 'WooCommerce Square', 'woocommerce' ), + 'description' => $square_description, + 'image' => WC()->plugin_url() . '/assets/images/square-white.png', + 'class' => 'square-logo', + 'enabled' => true, + 'repo-slug' => 'woocommerce-square', + ), + 'eway' => array( + 'name' => __( 'WooCommerce eWAY Gateway', 'woocommerce' ), + 'description' => __( 'The eWAY extension for WooCommerce allows you to take credit card payments directly on your store without redirecting your customers to a third party site to make payment.', 'woocommerce' ), + 'image' => WC()->plugin_url() . '/assets/images/eway-logo.jpg', + 'enabled' => false, + 'class' => 'eway-logo', + 'repo-slug' => 'woocommerce-gateway-eway', + ), + 'payfast' => array( + 'name' => __( 'WooCommerce PayFast Gateway', 'woocommerce' ), + 'description' => __( 'The PayFast extension for WooCommerce enables you to accept payments by Credit Card and EFT via one of South Africa’s most popular payment gateways. No setup fees or monthly subscription costs.', 'woocommerce' ), + 'image' => WC()->plugin_url() . '/assets/images/payfast.png', + 'class' => 'payfast-logo', + 'enabled' => false, + 'repo-slug' => 'woocommerce-payfast-gateway', + 'file' => 'gateway-payfast.php', + ), + ); + } + + /** + * Simple array of "in cart" gateways to show in wizard. + * + * @return array + */ + public function get_wizard_in_cart_payment_gateways() { + $gateways = $this->get_wizard_available_in_cart_payment_gateways(); + $country = WC()->countries->get_base_country(); + $currency = get_woocommerce_currency(); + + $can_stripe = $this->is_stripe_supported_country( $country ); + $can_eway = $this->is_eway_payments_supported_country( $country ); + $can_payfast = ( 'ZA' === $country ); // South Africa. + $can_paypal = $this->is_paypal_supported_currency( $currency ); + + if ( ! current_user_can( 'install_plugins' ) ) { + return $can_paypal ? array( 'paypal' => $gateways['paypal'] ) : array(); + } + + $spotlight = ''; + + if ( $this->is_klarna_checkout_supported_country( $country ) ) { + $spotlight = 'klarna_checkout'; + } elseif ( $this->is_klarna_payments_supported_country( $country ) ) { + $spotlight = 'klarna_payments'; + } elseif ( $this->is_square_supported_country( $country ) && get_option( 'woocommerce_sell_in_person' ) ) { + $spotlight = 'square'; + } + + if ( $spotlight ) { + $offered_gateways = array( + $spotlight => $gateways[ $spotlight ], + ); + + if ( $can_paypal ) { + $offered_gateways += array( 'ppec_paypal' => $gateways['ppec_paypal'] ); + } + + if ( $can_stripe ) { + $offered_gateways += array( 'stripe' => $gateways['stripe'] ); + } + + if ( $can_eway ) { + $offered_gateways += array( 'eway' => $gateways['eway'] ); + } + + if ( $can_payfast ) { + $offered_gateways += array( 'payfast' => $gateways['payfast'] ); + } + + return $offered_gateways; + } + + $offered_gateways = array(); + + if ( $can_stripe ) { + $gateways['stripe']['enabled'] = true; + $gateways['stripe']['featured'] = true; + $offered_gateways += array( 'stripe' => $gateways['stripe'] ); + } + + if ( $can_paypal ) { + $offered_gateways += array( 'ppec_paypal' => $gateways['ppec_paypal'] ); + } + + if ( $can_eway ) { + $offered_gateways += array( 'eway' => $gateways['eway'] ); + } + + if ( $can_payfast ) { + $offered_gateways += array( 'payfast' => $gateways['payfast'] ); + } + + return $offered_gateways; + } + + /** + * Simple array of "manual" gateways to show in wizard. + * + * @return array + */ + protected function get_wizard_manual_payment_gateways() { + $gateways = array( 'cheque' => array( 'name' => _x( 'Check payments', 'Check payment method', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept a check as method of payment.', 'woocommerce' ), 'image' => '', 'class' => '', ), - 'bacs' => array( + 'bacs' => array( 'name' => __( 'Bank transfer (BACS) payments', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept BACS payment.', 'woocommerce' ), 'image' => '', 'class' => '', ), - 'cod' => array( + 'cod' => array( 'name' => __( 'Cash on delivery', 'woocommerce' ), 'description' => __( 'A simple offline gateway that lets you accept cash on delivery.', 'woocommerce' ), 'image' => '', @@ -657,74 +1566,201 @@ class WC_Admin_Setup_Wizard { ), ); - $country = WC()->countries->get_base_country(); - - if ( 'US' === $country ) { - unset( $gateways['paypal-ec'] ); - } else { - unset( $gateways['paypal-braintree'] ); - } - - if ( ! current_user_can( 'install_plugins' ) ) { - unset( $gateways['paypal-braintree'] ); - unset( $gateways['paypal-ec'] ); - unset( $gateways['stripe'] ); - } - return $gateways; } /** - * Payments Step. + * Display service item in list. + * + * @param int $item_id Item ID. + * @param array $item_info Item info array. */ - public function wc_setup_payments() { - $gateways = $this->get_wizard_payment_gateways(); - ?> - - @@ -732,30 +1768,198 @@ class WC_Admin_Setup_Wizard { } /** - * Payments Step save. + * Payment Step save. */ - public function wc_setup_payments_save() { + public function wc_setup_payment_save() { check_admin_referer( 'wc-setup' ); - $gateways = $this->get_wizard_payment_gateways(); + if ( + ( + // Install WooCommerce Services with Stripe to enable deferred account creation. + ! empty( $_POST['wc-wizard-service-stripe-enabled'] ) && // WPCS: CSRF ok, input var ok. + ! empty( $_POST['stripe_create_account'] ) // WPCS: CSRF ok, input var ok. + ) || ( + // Install WooCommerce Services with PayPal EC to enable proxied payments. + ! empty( $_POST['wc-wizard-service-ppec_paypal-enabled'] ) && // WPCS: CSRF ok, input var ok. + ! empty( $_POST['ppec_paypal_reroute_requests'] ) // WPCS: CSRF ok, input var ok. + ) + ) { + $this->install_woocommerce_services(); + } + + $gateways = array_merge( $this->get_wizard_in_cart_payment_gateways(), $this->get_wizard_manual_payment_gateways() ); foreach ( $gateways as $gateway_id => $gateway ) { // If repo-slug is defined, download and install plugin from .org. - if ( ! empty( $gateway['repo-slug'] ) && ! empty( $_POST[ 'wc-wizard-gateway-' . $gateway_id . '-enabled' ] ) ) { - wp_schedule_single_event( time() + 10, 'woocommerce_plugin_background_installer', array( $gateway_id, $gateway ) ); + if ( ! empty( $gateway['repo-slug'] ) && ! empty( $_POST[ 'wc-wizard-service-' . $gateway_id . '-enabled' ] ) ) { // WPCS: CSRF ok, input var ok. + $this->install_plugin( $gateway_id, $gateway ); } - $settings_key = 'woocommerce_' . $gateway_id . '_settings'; - $settings = array_filter( (array) get_option( $settings_key, array() ) ); - $settings['enabled'] = ! empty( $_POST[ 'wc-wizard-gateway-' . $gateway_id . '-enabled' ] ) ? 'yes' : 'no'; + $settings = array( 'enabled' => ! empty( $_POST[ 'wc-wizard-service-' . $gateway_id . '-enabled' ] ) ? 'yes' : 'no' ); // WPCS: CSRF ok, input var ok. + // @codingStandardsIgnoreStart if ( ! empty( $gateway['settings'] ) ) { foreach ( $gateway['settings'] as $setting_id => $setting ) { - $settings[ $setting_id ] = wc_clean( $_POST[ $gateway_id . '_' . $setting_id ] ); + $settings[ $setting_id ] = 'yes' === $settings['enabled'] && isset( $_POST[ $gateway_id . '_' . $setting_id ] ) + ? wc_clean( wp_unslash( $_POST[ $gateway_id . '_' . $setting_id ] ) ) + : false; } } + // @codingStandardsIgnoreSEnd - update_option( $settings_key, $settings ); + if ( 'ppec_paypal' === $gateway_id && empty( $settings['reroute_requests'] ) ) { + unset( $settings['enabled'] ); + } + + $settings_key = 'woocommerce_' . $gateway_id . '_settings'; + $previously_saved_settings = array_filter( (array) get_option( $settings_key, array() ) ); + update_option( $settings_key, array_merge( $previously_saved_settings, $settings ) ); + } + + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); + exit; + } + + protected function display_recommended_item( $item_info ) { + $type = $item_info['type']; + $title = $item_info['title']; + $description = $item_info['description']; + $img_url = $item_info['img_url']; + $img_alt = $item_info['img_alt']; + ?> +should_show_theme() + && $this->should_show_automated_tax() + && $this->should_show_mailchimp() + ) : + esc_html_e( 'Select from the list below to enable automated taxes and MailChimp’s best-in-class email services — and design your store with our official, free WooCommerce theme.', 'woocommerce' ); + else : + esc_html_e( 'Enhance your store with these recommended features.', 'woocommerce' ); + endif; + ?>
+ + install_theme( 'storefront' ); + } + + if ( $setup_automated_tax ) { + $this->install_woocommerce_services(); + } + + if ( $setup_mailchimp ) { + // Prevent MailChimp from redirecting to its settings page during the OBW flow. + add_option( 'mailchimp_woocommerce_plugin_do_activation_redirect', false ); + + $this->install_plugin( + 'mailchimp-for-woocommerce', + array( + 'name' => __( 'MailChimp for WooCommerce', 'woocommerce' ), + 'repo-slug' => 'mailchimp-for-woocommerce', + 'file' => 'mailchimp-woocommerce.php', + ) + ); } wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); @@ -763,58 +1967,359 @@ class WC_Admin_Setup_Wizard { } /** - * Actions on the final step. + * Go to the next step if Jetpack was connected. */ - private function wc_setup_ready_actions() { - WC_Admin_Notices::remove_notice( 'install' ); - - if ( isset( $_GET['wc_tracker_optin'] ) && isset( $_GET['wc_tracker_nonce'] ) && wp_verify_nonce( $_GET['wc_tracker_nonce'], 'wc_tracker_optin' ) ) { - update_option( 'woocommerce_allow_tracking', 'yes' ); - WC_Tracker::send_tracking_data( true ); - - } elseif ( isset( $_GET['wc_tracker_optout'] ) && isset( $_GET['wc_tracker_nonce'] ) && wp_verify_nonce( $_GET['wc_tracker_nonce'], 'wc_tracker_optout' ) ) { - update_option( 'woocommerce_allow_tracking', 'no' ); + protected function wc_setup_activate_actions() { + if ( + isset( $_GET['from'] ) && + 'wpcom' === $_GET['from'] && + class_exists( 'Jetpack' ) && + Jetpack::is_active() + ) { + wp_redirect( esc_url_raw( remove_query_arg( 'from', $this->get_next_step_link() ) ) ); + exit; } } + protected function wc_setup_activate_get_feature_list() { + $features = array(); + + $stripe_settings = get_option( 'woocommerce_stripe_settings', false ); + $stripe_enabled = is_array( $stripe_settings ) + && isset( $stripe_settings['create_account'] ) && 'yes' === $stripe_settings['create_account'] + && isset( $stripe_settings['enabled'] ) && 'yes' === $stripe_settings['enabled']; + $ppec_settings = get_option( 'woocommerce_ppec_paypal_settings', false ); + $ppec_enabled = is_array( $ppec_settings ) + && isset( $ppec_settings['reroute_requests'] ) && 'yes' === $ppec_settings['reroute_requests'] + && isset( $ppec_settings['enabled'] ) && 'yes' === $ppec_settings['enabled']; + + $features['payment'] = $stripe_enabled || $ppec_enabled; + $features['taxes'] = (bool) get_option( 'woocommerce_setup_automated_taxes', false ); + $features['labels'] = (bool) get_option( 'woocommerce_setup_shipping_labels', false ); + + return $features; + } + + protected function wc_setup_activate_get_feature_list_str() { + $features = $this->wc_setup_activate_get_feature_list(); + if ( $features['payment'] && $features['taxes'] && $features['labels'] ) { + return __( 'payment setup, automated taxes and discounted shipping labels', 'woocommerce' ); + } else if ( $features['payment'] && $features['taxes'] ) { + return __( 'payment setup and automated taxes', 'woocommerce' ); + } else if ( $features['payment'] && $features['labels'] ) { + return __( 'payment setup and discounted shipping labels', 'woocommerce' ); + } else if ( $features['payment'] ) { + return __( 'payment setup', 'woocommerce' ); + } else if ( $features['taxes'] && $features['labels'] ) { + return __( 'automated taxes and discounted shipping labels', 'woocommerce' ); + } else if ( $features['taxes'] ) { + return __( 'automated taxes', 'woocommerce' ); + } else if ( $features['labels'] ) { + return __( 'discounted shipping labels', 'woocommerce' ); + } + return false; + } + + /** + * Activate step. + */ + public function wc_setup_activate() { + $this->wc_setup_activate_actions(); + + $jetpack_connected = class_exists( 'Jetpack' ) && Jetpack::is_active(); + + $has_jetpack_error = false; + if ( isset( $_GET['activate_error'] ) ) { + $has_jetpack_error = true; + + $title = __( "Sorry, we couldn't connect your store to Jetpack", 'woocommerce' ); + + $error_message = $this->get_activate_error_message( sanitize_text_field( wp_unslash( $_GET['activate_error'] ) ) ); + $description = $error_message; + } else { + $feature_list = $this->wc_setup_activate_get_feature_list_str(); + + $description = false; + + if ( $feature_list ) { + if ( ! $jetpack_connected ) { + /* translators: %s: list of features, potentially comma separated */ + $description_base = __( 'Your store is almost ready! To activate services like %s, just connect with Jetpack.', 'woocommerce' ); + } else { + $description_base = __( 'Thanks for using Jetpack! Your store is almost ready: to activate services like %s, just connect your store.', 'woocommerce' ); + } + $description = sprintf( $description_base, $feature_list ); + } + + if ( ! $jetpack_connected ) { + $title = $feature_list ? + __( 'Connect your store to Jetpack', 'woocommerce' ) : + __( 'Connect your store to Jetpack to enable extra features', 'woocommerce' ); + $button_text = __( 'Continue with Jetpack', 'woocommerce' ); + } elseif ( $feature_list ) { + $title = __( 'Connect your store to activate WooCommerce Services', 'woocommerce' ); + $button_text = __( 'Continue with WooCommerce Services', 'woocommerce' ); + } else { + wp_redirect( esc_url_raw( $this->get_next_step_link() ) ); + exit; + } + } + ?> + + + + +
+ ->plugin_url() . '/assets/images/jetpack_horizontal_logo.png' ); ?>)
+ ->plugin_url() . '/assets/images/wcs-notice.png' ); ?>)
+
+
+
+
+ ->plugin_url() . '/assets/images/jetpack_vertical_logo.png' ); ?>){kind=logo}
+
+
+
+ + + + +
+ ++ Terms of Service and to share details with WordPress.com', 'woocommerce' ) ), + 'https://wordpress.com/tos', + 'https://jetpack.com/support/what-data-does-jetpack-sync' + ); + ?> +
+ + ++ +
+-
+
-
+
+ +
++ +
+
+ -
+
+ +
++ +
+
+ -
+
+ +
++ +
+
+ -
+
+ +
++ +
+
+
-
-
+
+
+
+
execute_tool( $action );
+
+ $tool = $tools[ $action ];
+ $tool = array(
+ 'id' => $action,
+ 'name' => $tool['name'],
+ 'action' => $tool['button'],
+ 'description' => $tool['desc'],
+ );
+ $tool = array_merge( $tool, $response );
+
+ /**
+ * Fires after a WooCommerce system status tool has been executed.
+ *
+ * @param array $tool Details about the tool that has been executed.
+ */
+ do_action( 'woocommerce_system_status_tool_executed', $tool );
} else {
- $response = array( 'success' => false, 'message' => __( 'Tool does not exist.', 'woocommerce' ) );
+ $response = array(
+ 'success' => false,
+ 'message' => __( 'Tool does not exist.', 'woocommerce' ),
+ );
}
if ( $response['success'] ) {
@@ -56,20 +69,21 @@ class WC_Admin_Status {
}
}
- // Display message if settings settings have been saved
- if ( isset( $_REQUEST['settings-updated'] ) ) {
- echo '';
+ // Display message if settings settings have been saved.
+ if ( isset( $_REQUEST['settings-updated'] ) ) { // WPCS: input var ok.
+ echo '';
}
- include_once( dirname( __FILE__ ) . '/views/html-admin-page-status-tools.php' );
+ include_once dirname( __FILE__ ) . '/views/html-admin-page-status-tools.php';
}
/**
* Get tools.
+ *
* @return array of tools
*/
public static function get_tools() {
- $tools_controller = new WC_REST_System_Status_Tools_Controller;
+ $tools_controller = new WC_REST_System_Status_Tools_Controller();
return $tools_controller->get_tools();
}
@@ -88,66 +102,63 @@ class WC_Admin_Status {
* Show the log page contents for file log handler.
*/
public static function status_logs_file() {
-
$logs = self::scan_log_files();
- if ( ! empty( $_REQUEST['log_file'] ) && isset( $logs[ sanitize_title( $_REQUEST['log_file'] ) ] ) ) {
- $viewed_log = $logs[ sanitize_title( $_REQUEST['log_file'] ) ];
+ if ( ! empty( $_REQUEST['log_file'] ) && isset( $logs[ sanitize_title( wp_unslash( $_REQUEST['log_file'] ) ) ] ) ) { // WPCS: input var ok, CSRF ok.
+ $viewed_log = $logs[ sanitize_title( wp_unslash( $_REQUEST['log_file'] ) ) ]; // WPCS: input var ok, CSRF ok.
} elseif ( ! empty( $logs ) ) {
$viewed_log = current( $logs );
}
$handle = ! empty( $viewed_log ) ? self::get_log_file_handle( $viewed_log ) : '';
- if ( ! empty( $_REQUEST['handle'] ) ) {
+ if ( ! empty( $_REQUEST['handle'] ) ) { // WPCS: input var ok, CSRF ok.
self::remove_log();
}
- include_once( 'views/html-admin-page-status-logs.php' );
+ include_once 'views/html-admin-page-status-logs.php';
}
/**
* Show the log page contents for db log handler.
*/
public static function status_logs_db() {
-
- // Flush
- if ( ! empty( $_REQUEST['flush-logs'] ) ) {
+ if ( ! empty( $_REQUEST['flush-logs'] ) ) { // WPCS: input var ok, CSRF ok.
self::flush_db_logs();
}
- // Bulk actions
- if ( isset( $_GET['action'] ) && isset( $_GET['log'] ) ) {
+ if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['log'] ) ) { // WPCS: input var ok, CSRF ok.
self::log_table_bulk_actions();
}
$log_table_list = new WC_Admin_Log_Table_List();
$log_table_list->prepare_items();
- include_once( 'views/html-admin-page-status-logs-db.php' );
+ include_once 'views/html-admin-page-status-logs-db.php';
}
/**
* Retrieve metadata from a file. Based on WP Core's get_file_data function.
+ *
* @since 2.1.1
- * @param string $file Path to the file
+ * @param string $file Path to the file.
* @return string
*/
public static function get_file_version( $file ) {
- // Avoid notices if file does not exist
+ // Avoid notices if file does not exist.
if ( ! file_exists( $file ) ) {
return '';
}
// We don't need to write to the file, so just open for reading.
- $fp = fopen( $file, 'r' );
+ $fp = fopen( $file, 'r' ); // @codingStandardsIgnoreLine.
// Pull only the first 8kiB of the file in.
- $file_data = fread( $fp, 8192 );
+ $file_data = fread( $fp, 8192 ); // @codingStandardsIgnoreLine.
// PHP will close file handle, but we are good citizens.
- fclose( $fp );
+ fclose( $fp ); // @codingStandardsIgnoreLine.
// Make sure we catch CR-only line endings.
$file_data = str_replace( "\r", "\n", $file_data );
@@ -157,34 +168,34 @@ class WC_Admin_Status {
$version = _cleanup_header_comment( $match[1] );
}
- return $version ;
+ return $version;
}
/**
* Return the log file handle.
*
- * @param string $filename
+ * @param string $filename Filename to get the handle for.
* @return string
*/
public static function get_log_file_handle( $filename ) {
- return substr( $filename, 0, strlen( $filename ) > 37 ? strlen( $filename ) - 37 : strlen( $filename ) - 4 );
+ return substr( $filename, 0, strlen( $filename ) > 48 ? strlen( $filename ) - 48 : strlen( $filename ) - 4 );
}
/**
* Scan the template files.
- * @param string $template_path
+ *
+ * @param string $template_path Path to the template directory.
* @return array
*/
public static function scan_template_files( $template_path ) {
-
- $files = @scandir( $template_path );
+ $files = @scandir( $template_path ); // @codingStandardsIgnoreLine.
$result = array();
if ( ! empty( $files ) ) {
foreach ( $files as $key => $value ) {
- if ( ! in_array( $value, array( ".", ".." ) ) ) {
+ if ( ! in_array( $value, array( '.', '..' ), true ) ) {
if ( is_dir( $template_path . DIRECTORY_SEPARATOR . $value ) ) {
$sub_files = self::scan_template_files( $template_path . DIRECTORY_SEPARATOR . $value );
@@ -202,64 +213,58 @@ class WC_Admin_Status {
/**
* Scan the log files.
+ *
* @return array
*/
public static function scan_log_files() {
- $files = @scandir( WC_LOG_DIR );
- $result = array();
-
- if ( ! empty( $files ) ) {
-
- foreach ( $files as $key => $value ) {
-
- if ( ! in_array( $value, array( '.', '..' ) ) ) {
- if ( ! is_dir( $value ) && strstr( $value, '.log' ) ) {
- $result[ sanitize_title( $value ) ] = $value;
- }
- }
- }
- }
-
- return $result;
+ return WC_Log_Handler_File::get_log_files();
}
/**
* Get latest version of a theme by slug.
+ *
* @param object $theme WP_Theme object.
* @return string Version number if found.
*/
public static function get_latest_theme_version( $theme ) {
- include_once( ABSPATH . 'wp-admin/includes/theme.php' );
+ include_once ABSPATH . 'wp-admin/includes/theme.php';
- $api = themes_api( 'theme_information', array(
- 'slug' => $theme->get_stylesheet(),
- 'fields' => array(
- 'sections' => false,
- 'tags' => false,
- ),
- ) );
+ $api = themes_api(
+ 'theme_information',
+ array(
+ 'slug' => $theme->get_stylesheet(),
+ 'fields' => array(
+ 'sections' => false,
+ 'tags' => false,
+ ),
+ )
+ );
$update_theme_version = 0;
// Check .org for updates.
if ( is_object( $api ) && ! is_wp_error( $api ) ) {
$update_theme_version = $api->version;
+ } elseif ( strstr( $theme->{'Author URI'}, 'woothemes' ) ) { // Check WooThemes Theme Version.
+ $theme_dir = substr( strtolower( str_replace( ' ', '', $theme->Name ) ), 0, 45 ); // @codingStandardsIgnoreLine.
+ $theme_version_data = get_transient( $theme_dir . '_version_data' );
- // Check WooThemes Theme Version.
- } elseif ( strstr( $theme->{'Author URI'}, 'woothemes' ) ) {
- $theme_dir = substr( strtolower( str_replace( ' ','', $theme->Name ) ), 0, 45 );
-
- if ( false === ( $theme_version_data = get_transient( $theme_dir . '_version_data' ) ) ) {
+ if ( false === $theme_version_data ) {
$theme_changelog = wp_safe_remote_get( 'http://dzv365zjfbd8v.cloudfront.net/changelogs/' . $theme_dir . '/changelog.txt' );
- $cl_lines = explode( "\n", wp_remote_retrieve_body( $theme_changelog ) );
+ $cl_lines = explode( "\n", wp_remote_retrieve_body( $theme_changelog ) );
if ( ! empty( $cl_lines ) ) {
foreach ( $cl_lines as $line_num => $cl_line ) {
if ( preg_match( '/^[0-9]/', $cl_line ) ) {
- $theme_date = str_replace( '.' , '-' , trim( substr( $cl_line , 0 , strpos( $cl_line , '-' ) ) ) );
- $theme_version = preg_replace( '~[^0-9,.]~' , '' ,stristr( $cl_line , "version" ) );
- $theme_update = trim( str_replace( "*" , "" , $cl_lines[ $line_num + 1 ] ) );
- $theme_version_data = array( 'date' => $theme_date , 'version' => $theme_version , 'update' => $theme_update , 'changelog' => $theme_changelog );
- set_transient( $theme_dir . '_version_data', $theme_version_data , DAY_IN_SECONDS );
+ $theme_date = str_replace( '.', '-', trim( substr( $cl_line, 0, strpos( $cl_line, '-' ) ) ) );
+ $theme_version = preg_replace( '~[^0-9,.]~', '', stristr( $cl_line, 'version' ) );
+ $theme_update = trim( str_replace( '*', '', $cl_lines[ $line_num + 1 ] ) );
+ $theme_version_data = array(
+ 'date' => $theme_date,
+ 'version' => $theme_version,
+ 'update' => $theme_update,
+ 'changelog' => $theme_changelog,
+ );
+ set_transient( $theme_dir . '_version_data', $theme_version_data, DAY_IN_SECONDS );
break;
}
}
@@ -278,13 +283,13 @@ class WC_Admin_Status {
* Remove/delete the chosen file.
*/
public static function remove_log() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'remove_log' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+ if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( wp_unslash( $_REQUEST['_wpnonce'] ), 'remove_log' ) ) { // WPCS: input var ok, sanitization ok.
+ wp_die( esc_html__( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
}
- if ( ! empty( $_REQUEST['handle'] ) ) {
+ if ( ! empty( $_REQUEST['handle'] ) ) { // WPCS: input var ok.
$log_handler = new WC_Log_Handler_File();
- $log_handler->remove( $_REQUEST['handle'] );
+ $log_handler->remove( wp_unslash( $_REQUEST['handle'] ) ); // WPCS: input var ok, sanitization ok.
}
wp_safe_redirect( esc_url_raw( admin_url( 'admin.php?page=wc-status&tab=logs' ) ) );
@@ -297,8 +302,8 @@ class WC_Admin_Status {
* @since 3.0.0
*/
private static function flush_db_logs() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+ if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) { // WPCS: input var ok, sanitization ok.
+ wp_die( esc_html__( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
}
WC_Log_Handler_DB::flush();
@@ -313,13 +318,13 @@ class WC_Admin_Status {
* @since 3.0.0
*/
private static function log_table_bulk_actions() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+ if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-status-logs' ) ) { // WPCS: input var ok, sanitization ok.
+ wp_die( esc_html__( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
}
- $log_ids = array_map( 'absint', (array) $_GET['log'] );
+ $log_ids = array_map( 'absint', (array) isset( $_REQUEST['log'] ) ? wp_unslash( $_REQUEST['log'] ) : array() ); // WPCS: input var ok, sanitization ok.
- if ( 'delete' === $_GET['action'] || 'delete' === $_GET['action2'] ) {
+ if ( ( isset( $_REQUEST['action'] ) && 'delete' === $_REQUEST['action'] ) || ( isset( $_REQUEST['action2'] ) && 'delete' === $_REQUEST['action2'] ) ) { // WPCS: input var ok, sanitization ok.
WC_Log_Handler_DB::delete( $log_ids );
wp_safe_redirect( esc_url_raw( admin_url( 'admin.php?page=wc-status&tab=logs' ) ) );
exit();
diff --git a/includes/admin/class-wc-admin-taxonomies.php b/includes/admin/class-wc-admin-taxonomies.php
index 0c2f4a45ad3..8b4e3e8bf41 100644
--- a/includes/admin/class-wc-admin-taxonomies.php
+++ b/includes/admin/class-wc-admin-taxonomies.php
@@ -18,10 +18,20 @@ if ( ! defined( 'ABSPATH' ) ) {
*/
class WC_Admin_Taxonomies {
+ /**
+ * Default category ID.
+ *
+ * @var int
+ */
+ private $default_cat_id = 0;
+
/**
* Constructor.
*/
public function __construct() {
+ // Default category ID.
+ $this->default_cat_id = get_option( 'default_product_cat', 0 );
+
// Category/term ordering
add_action( 'create_term', array( $this, 'create_term' ), 5, 3 );
add_action( 'delete_term', array( $this, 'delete_term' ), 5 );
@@ -36,8 +46,13 @@ class WC_Admin_Taxonomies {
add_filter( 'manage_edit-product_cat_columns', array( $this, 'product_cat_columns' ) );
add_filter( 'manage_product_cat_custom_column', array( $this, 'product_cat_column' ), 10, 3 );
+ // Add row actions.
+ add_filter( 'product_cat_row_actions', array( $this, 'product_cat_row_actions' ), 10, 2 );
+ add_filter( 'admin_init', array( $this, 'handle_product_cat_row_actions' ) );
+
// Taxonomy page descriptions
add_action( 'product_cat_pre_add_form', array( $this, 'product_cat_description' ) );
+ add_action( 'after-product_cat-table', array( $this, 'product_cat_notes' ) );
$attribute_taxonomies = wc_get_attribute_taxonomies();
@@ -49,13 +64,16 @@ class WC_Admin_Taxonomies {
// Maintain hierarchy of terms
add_filter( 'wp_terms_checklist_args', array( $this, 'disable_checked_ontop' ) );
+
+ // Admin footer scripts for this product categories admin screen
+ add_action( 'admin_footer', array( $this, 'scripts_at_product_cat_screen_footer' ) );
}
/**
* Order term when created (put in position 0).
*
- * @param mixed $term_id
- * @param mixed $tt_id
+ * @param mixed $term_id
+ * @param mixed $tt_id
* @param string $taxonomy
*/
public function create_term( $term_id, $tt_id = '', $taxonomy = '' ) {
@@ -127,9 +145,9 @@ class WC_Admin_Taxonomies {
// Create the media frame.
file_frame = wp.media.frames.downloadable_file = wp.media({
- title: '',
+ title: '',
button: {
- text: ''
+ text: ''
},
multiple: false
});
@@ -195,7 +213,7 @@ class WC_Admin_Taxonomies {
$image = wc_placeholder_img_src();
}
?>
-
+
-
+
; ?>)
@@ -237,9 +255,9 @@ class WC_Admin_Taxonomies {
// Create the media frame.
file_frame = wp.media.frames.downloadable_file = wp.media({
- title: '',
+ title: '',
button: {
- text: ''
+ text: ''
},
multiple: false
});
@@ -275,8 +293,8 @@ class WC_Admin_Taxonomies {
/**
* save_category_fields function.
*
- * @param mixed $term_id Term ID being saved
- * @param mixed $tt_id
+ * @param mixed $term_id Term ID being saved
+ * @param mixed $tt_id
* @param string $taxonomy
*/
public function save_category_fields( $term_id, $tt_id = '', $taxonomy = '' ) {
@@ -295,6 +313,29 @@ class WC_Admin_Taxonomies {
echo wpautop( __( 'Product categories for your store can be managed here. To change the order of categories on the front-end you can drag and drop to sort them. To see more categories listed click the "screen options" link at the top-right of this page.', 'woocommerce' ) );
}
+ /**
+ * Add some notes to describe the behavior of the default category.
+ */
+ public function product_cat_notes() {
+ $category_id = get_option( 'default_product_cat', 0 );
+ $category = get_term( $category_id, 'product_cat' );
+ $category_name = ( ! $category || is_wp_error( $category ) ) ? _x( 'Uncategorized', 'Default category slug', 'woocommerce' ) : $category->name;
+ ?>
+  . ')
';
-
}
-
+ if ( 'handle' === $column ) {
+ $columns .= '';
+ }
return $columns;
}
@@ -364,6 +449,26 @@ class WC_Admin_Taxonomies {
}
return $args;
}
+
+ /**
+ * Admin footer scripts for the product categories admin screen
+ *
+ * @return void
+ */
+ public function scripts_at_product_cat_screen_footer() {
+ if ( ! isset( $_GET['taxonomy'] ) || 'product_cat' !== $_GET['taxonomy'] ) {
+ return;
+ }
+ // Ensure the tooltip is displayed when the image column is disabled on product categories
+ wc_enqueue_js("
+ (function( $ ) {
+ 'use strict';
+ var product_cat = $( 'tr#tag-" . absint( $this->default_cat_id ) . "' );
+ product_cat.find( 'th' ).empty();
+ product_cat.find( 'td.thumb span' ).detach( 'span' ).appendTo( product_cat.find( 'th' ) );
+ })( jQuery );
+ ");
+ }
}
new WC_Admin_Taxonomies();
diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php
index 8a6b54e6b70..5650228026c 100644
--- a/includes/admin/class-wc-admin-webhooks-table-list.php
+++ b/includes/admin/class-wc-admin-webhooks-table-list.php
@@ -2,31 +2,39 @@
/**
* WooCommerce Webhooks Table List
*
- * @author WooThemes
- * @category Admin
- * @package WooCommerce/Admin
- * @version 2.4.0
+ * @package WooCommerce\Admin
+ * @version 3.3.0
*/
-if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
-}
+defined( 'ABSPATH' ) || exit;
if ( ! class_exists( 'WP_List_Table' ) ) {
- require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+ require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
}
+/**
+ * Webooks table list class.
+ */
class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
* Initialize the webhook table list.
*/
public function __construct() {
- parent::__construct( array(
- 'singular' => 'webhook',
- 'plural' => 'webhooks',
- 'ajax' => false,
- ) );
+ parent::__construct(
+ array(
+ 'singular' => 'webhook',
+ 'plural' => 'webhooks',
+ 'ajax' => false,
+ )
+ );
+ }
+
+ /**
+ * No items found text.
+ */
+ public function no_items() {
+ esc_html_e( 'No webhooks found.', 'woocommerce' );
}
/**
@@ -47,70 +55,44 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
* Column cb.
*
- * @param WC_Post $webhook
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_cb( $webhook ) {
- return sprintf( '', $this->_args['singular'], $webhook->ID );
- }
-
- /**
- * Get Webhook object.
- * @param object $webhook
- * @return WC_Webhook
- */
- private function get_webbook_object( $webhook ) {
- global $the_webhook;
-
- if ( empty( $the_webhook ) || $the_webhook->id != $webhook->ID ) {
- $the_webhook = new WC_Webhook( $webhook->ID );
- }
-
- return $the_webhook;
+ return sprintf( '', $this->_args['singular'], $webhook->get_id() );
}
/**
* Return title column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_title( $webhook ) {
- $the_webhook = $this->get_webbook_object( $webhook );
- $edit_link = admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $the_webhook->id );
- $title = _draft_or_post_title( $the_webhook->get_post_data() );
- $post_type_object = get_post_type_object( $the_webhook->get_post_data()->post_type );
- $post_status = $the_webhook->get_post_data()->post_status;
+ $edit_link = admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks&edit-webhook=' . $webhook->get_id() );
+ $output = '';
- // Title
- $output = '';
- if ( 'trash' == $post_status ) {
- $output .= esc_html( $title );
- } else {
- $output .= '' . esc_html( $title ) . '';
- }
- $output .= '';
+ // Title.
+ $output .= '' . esc_html( $webhook->get_name() ) . '';
- // Get actions
+ // Get actions.
$actions = array(
- 'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ),
+ /* translators: %s: webhook ID. */
+ 'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $webhook->get_id() ),
+ 'edit' => '' . esc_html__( 'Edit', 'woocommerce' ) . '',
+ /* translators: %s: webhook name */
+ 'delete' => 'get_name() ) ) . '" href="' . esc_url(
+ wp_nonce_url(
+ add_query_arg(
+ array(
+ 'delete' => $webhook->get_id(),
+ ), admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks' )
+ ), 'delete-webhook'
+ )
+ ) . '">' . esc_html__( 'Delete permanently', 'woocommerce' ) . '',
);
- if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) && 'trash' !== $post_status ) {
- $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . '';
- }
-
- if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) {
- if ( 'trash' == $post_status ) {
- $actions['untrash'] = '' . esc_html__( 'Restore', 'woocommerce' ) . '';
- } elseif ( EMPTY_TRASH_DAYS ) {
- $actions['trash'] = '' . esc_html__( 'Trash', 'woocommerce' ) . '';
- }
- if ( 'trash' == $post_status || ! EMPTY_TRASH_DAYS ) {
- $actions['delete'] = '' . esc_html__( 'Delete permanently', 'woocommerce' ) . '';
- }
- }
-
- $actions = apply_filters( 'post_row_actions', $actions, $the_webhook->get_post_data() );
+ $actions = apply_filters( 'webhook_row_actions', $actions, $webhook );
$row_actions = array();
foreach ( $actions as $action => $link ) {
@@ -124,75 +106,59 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
* Return status column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_status( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_i18n_status();
+ return $webhook->get_i18n_status();
}
/**
* Return topic column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_topic( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_topic();
+ return $webhook->get_topic();
}
/**
* Return delivery URL column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_delivery_url( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_delivery_url();
+ return $webhook->get_delivery_url();
}
/**
* Get the status label for webhooks.
*
- * @param string $status_name
- * @param stdClass $status
- *
+ * @param string $status_name Status name.
+ * @param int $amount Amount of webhooks.
* @return array
*/
- private function get_status_label( $status_name, $status ) {
- switch ( $status_name ) {
- case 'publish' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Activated (%s)', 'woocommerce' ),
- 'plural' => __( 'Activated (%s)', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
- case 'draft' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Paused (%s)', 'woocommerce' ),
- 'plural' => __( 'Paused (%s)', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
- case 'pending' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Disabled (%s)', 'woocommerce' ),
- 'plural' => __( 'Disabled (%s)', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
+ private function get_status_label( $status_name, $amount ) {
+ $statuses = wc_get_webhook_statuses();
- default:
- $label = $status->label_count;
- break;
+ if ( isset( $statuses[ $status_name ] ) ) {
+ return array(
+ 'singular' => sprintf( '%s (%s)', esc_html( $statuses[ $status_name ] ), $amount ),
+ 'plural' => sprintf( '%s (%s)', esc_html( $statuses[ $status_name ] ), $amount ),
+ 'context' => '',
+ 'domain' => 'woocommerce',
+ );
}
- return $label;
+ return array(
+ 'singular' => sprintf( '%s (%s)', esc_html( $status_name ), $amount ),
+ 'plural' => sprintf( '%s (%s)', esc_html( $status_name ), $amount ),
+ 'context' => '',
+ 'domain' => 'woocommerce',
+ );
}
/**
@@ -201,39 +167,30 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
* @return array
*/
protected function get_views() {
- $status_links = array();
- $num_posts = wp_count_posts( 'shop_webhook', 'readable' );
- $class = '';
- $total_posts = array_sum( (array) $num_posts );
+ $status_links = array();
+ $data_store = WC_Data_Store::load( 'webhook' );
+ $num_webhooks = $data_store->get_count_webhooks_by_status();
+ $total_webhooks = array_sum( (array) $num_webhooks );
+ $statuses = array_keys( wc_get_webhook_statuses() );
+ $class = empty( $_REQUEST['status'] ) ? ' class="current"' : ''; // WPCS: input var okay. CSRF ok.
- // Subtract post types that are not included in the admin all list.
- foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
- $total_posts -= $num_posts->$state;
- }
-
- $class = empty( $class ) && empty( $_REQUEST['status'] ) ? ' class="current"' : '';
/* translators: %s: count */
- $status_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_posts, 'posts', 'woocommerce' ), number_format_i18n( $total_posts ) ) . '';
+ $status_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_webhooks, 'posts', 'woocommerce' ), number_format_i18n( $total_webhooks ) ) . '';
- foreach ( get_post_stati( array( 'show_in_admin_status_list' => true ), 'objects' ) as $status ) {
+ foreach ( $statuses as $status_name ) {
$class = '';
- $status_name = $status->name;
- if ( ! in_array( $status_name, array( 'publish', 'draft', 'pending', 'trash', 'future', 'private', 'auto-draft' ) ) ) {
+ if ( empty( $num_webhooks[ $status_name ] ) ) {
continue;
}
- if ( empty( $num_posts->$status_name ) ) {
- continue;
- }
-
- if ( isset( $_REQUEST['status'] ) && $status_name == $_REQUEST['status'] ) {
+ if ( isset( $_REQUEST['status'] ) && sanitize_key( wp_unslash( $_REQUEST['status'] ) ) === $status_name ) { // WPCS: input var okay, CSRF ok.
$class = ' class="current"';
}
- $label = $this->get_status_label( $status_name, $status );
+ $label = $this->get_status_label( $status_name, $num_webhooks[ $status_name ] );
- $status_links[ $status_name ] = "" . sprintf( translate_nooped_plural( $label, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '';
+ $status_links[ $status_name ] = "" . sprintf( translate_nooped_plural( $label, $num_webhooks[ $status_name ] ), number_format_i18n( $num_webhooks[ $status_name ] ) ) . '';
}
return $status_links;
@@ -245,69 +202,113 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
* @return array
*/
protected function get_bulk_actions() {
- if ( isset( $_GET['status'] ) && 'trash' == $_GET['status'] ) {
- return array(
- 'untrash' => __( 'Restore', 'woocommerce' ),
- 'delete' => __( 'Delete permanently', 'woocommerce' ),
- );
- }
-
return array(
- 'trash' => __( 'Move to trash', 'woocommerce' ),
+ 'delete' => __( 'Delete permanently', 'woocommerce' ),
);
}
/**
- * Extra controls to be displayed between bulk actions and pagination.
- *
- * @param string $which
+ * Process bulk actions.
*/
- protected function extra_tablenav( $which ) {
- if ( 'top' == $which && isset( $_GET['status'] ) && 'trash' == $_GET['status'] && current_user_can( 'delete_shop_webhooks' ) ) {
- echo '';
+ public function process_bulk_action() {
+ $action = $this->current_action();
+ $webhooks = isset( $_REQUEST['webhook'] ) ? array_map( 'absint', (array) $_REQUEST['webhook'] ) : array(); // WPCS: input var okay, CSRF ok.
+
+ if ( ! current_user_can( 'manage_woocommerce' ) ) {
+ wp_die( esc_html__( 'You do not have permission to edit Webhooks', 'woocommerce' ) );
}
+
+ if ( 'delete' === $action ) {
+ WC_Admin_Webhooks::bulk_delete( $webhooks );
+ }
+ }
+
+ /**
+ * Generate the table navigation above or below the table.
+ * Included to remove extra nonce input.
+ *
+ * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
+ */
+ protected function display_tablenav( $which ) {
+ echo '';
@@ -178,7 +188,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
* Performs post-import cleanup of files and the cache.
*/
public function import_end() {
- echo '
' . sprintf( _n( 'Plus %d other note', 'Plus %d other notes', ( $approved_comments_count - 1 ), 'woocommerce' ), $approved_comments_count - 1 ) . '' ); + } else { + /* translators: %d: notes count */ + $tooltip = wc_sanitize_tooltip( sprintf( _n( '%d note', '%d notes', $approved_comments_count, 'woocommerce' ), $approved_comments_count ) ); + } + } + + if ( $tooltip ) { + printf( '%s', esc_attr( sanitize_html_class( 'status-' . $this->object->get_status() ) ), wp_kses_post( $tooltip ), esc_html( wc_get_order_status_name( $this->object->get_status() ) ) ); + } else { + printf( '%s', esc_attr( sanitize_html_class( 'status-' . $this->object->get_status() ) ), esc_html( wc_get_order_status_name( $this->object->get_status() ) ) ); + } + } + + /** + * Render columm: order_date. + */ + protected function render_order_date_column() { + $order_timestamp = $this->object->get_date_created() ? $this->object->get_date_created()->getTimestamp() : ''; + + if ( ! $order_timestamp ) { + echo '–'; + return; + } + + // Check if the order was created within the last 24 hours, and not in the future. + if ( $order_timestamp > strtotime( '-1 day', current_time( 'timestamp', true ) ) && $order_timestamp <= current_time( 'timestamp', true ) ) { + $show_date = sprintf( + /* translators: %s: human-readable time difference */ + _x( '%s ago', '%s = human-readable time difference', 'woocommerce' ), + human_time_diff( $this->object->get_date_created()->getTimestamp(), current_time( 'timestamp', true ) ) + ); + } else { + $show_date = $this->object->get_date_created()->date_i18n( apply_filters( 'woocommerce_admin_order_date_format', __( 'M j, Y', 'woocommerce' ) ) ); + } + printf( + '', + esc_attr( $this->object->get_date_created()->date( 'c' ) ), + esc_html( $this->object->get_date_created()->date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ) ), + esc_html( $show_date ) + ); + } + + /** + * Render columm: order_total. + */ + protected function render_order_total_column() { + if ( $this->object->get_payment_method_title() ) { + /* translators: %s: method */ + echo '' . wp_kses_post( $this->object->get_formatted_order_total() ) . ''; + } else { + echo wp_kses_post( $this->object->get_formatted_order_total() ); + } + } + + /** + * Render columm: wc_actions. + */ + protected function render_wc_actions_column() { + echo '#i', ', ', $address ) );
+
+ if ( $this->object->get_payment_method() ) {
+ /* translators: %s: payment method */
+ echo '' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_payment_method_title() ) ) . ''; // WPCS: XSS ok.
+ }
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Render columm: shipping_address.
+ */
+ protected function render_shipping_address_column() {
+ $address = $this->object->get_formatted_shipping_address();
+
+ if ( $address ) {
+ echo '' . esc_html( preg_replace( '##i', ', ', $address ) ) . ' ';
+ if ( $this->object->get_shipping_method() ) {
+ /* translators: %s: shipping method */
+ echo '' . sprintf( __( 'via %s', 'woocommerce' ), esc_html( $this->object->get_shipping_method() ) ) . ''; // WPCS: XSS ok.
+ }
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Template for order preview.
+ *
+ * @since 3.3.0
+ */
+ public function order_preview_template() {
+ ?>
+
+ get_items(), $order );
+ $columns = apply_filters(
+ 'woocommerce_admin_order_preview_line_item_columns', array(
+ 'product' => __( 'Product', 'woocommerce' ),
+ 'quantity' => __( 'Quantity', 'woocommerce' ),
+ 'tax' => __( 'Tax', 'woocommerce' ),
+ 'total' => __( 'Total', 'woocommerce' ),
+ ), $order
+ );
+
+ if ( ! wc_tax_enabled() ) {
+ unset( $columns['tax'] );
+ }
+
+ $html = '
+ ';
+ break;
+ }
+ }
+
+ if ( 'removed_personal_data' === $bulk_action ) { // WPCS: input var ok, CSRF ok.
+ /* translators: %d: orders count */
+ $message = sprintf( _n( 'Removed personal data from %d order.', 'Removed personal data from %d orders.', $number, 'woocommerce' ), number_format_i18n( $number ) );
+ echo '';
+ }
+ }
+
+ /**
+ * See if we should render search filters or not.
+ */
+ public function restrict_manage_posts() {
+ global $typenow;
+
+ if ( in_array( $typenow, wc_get_order_types( 'order-meta-boxes' ), true ) ) {
+ $this->render_filters();
+ }
+ }
+
+ /**
+ * Render any custom filters and search inputs for the list table.
+ */
+ protected function render_filters() {
+ $user_string = '';
+ $user_id = '';
+
+ if ( ! empty( $_GET['_customer_user'] ) ) { // WPCS: input var ok.
+ $user_id = absint( $_GET['_customer_user'] ); // WPCS: input var ok, sanitization ok.
+ $user = get_user_by( 'id', $user_id );
+
+ $user_string = sprintf(
+ /* translators: 1: user display name 2: user ID 3: user email */
+ esc_html__( '%1$s (#%2$s – %3$s)', 'woocommerce' ),
+ $user->display_name,
+ absint( $user->ID ),
+ $user->user_email
+ );
+ }
+ ?>
+
+ query_filters( $query_vars );
+ }
+
+ return $query_vars;
+ }
+
+ /**
+ * Handle any custom filters.
+ *
+ * @param array $query_vars Query vars.
+ * @return array
+ */
+ protected function query_filters( $query_vars ) {
+ global $wp_post_statuses;
+
+ // Filter the orders by the posted customer.
+ if ( ! empty( $_GET['_customer_user'] ) ) { // WPCS: input var ok.
+ // @codingStandardsIgnoreStart
+ $query_vars['meta_query'] = array(
+ array(
+ 'key' => '_customer_user',
+ 'value' => (int) $_GET['_customer_user'], // WPCS: input var ok, sanitization ok.
+ 'compare' => '=',
+ ),
+ );
+ // @codingStandardsIgnoreEnd
+ }
+
+ // Sorting.
+ if ( isset( $query_vars['orderby'] ) ) {
+ if ( 'order_total' === $query_vars['orderby'] ) {
+ // @codingStandardsIgnoreStart
+ $query_vars = array_merge( $query_vars, array(
+ 'meta_key' => '_order_total',
+ 'orderby' => 'meta_value_num',
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ }
+
+ // Status.
+ if ( ! isset( $query_vars['post_status'] ) ) {
+ $post_statuses = wc_get_order_statuses();
+
+ foreach ( $post_statuses as $status => $value ) {
+ if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
+ unset( $post_statuses[ $status ] );
+ }
+ }
+
+ $query_vars['post_status'] = array_keys( $post_statuses );
+ }
+ return $query_vars;
+ }
+
+ /**
+ * Change the label when searching orders.
+ *
+ * @param mixed $query Current search query.
+ * @return string
+ */
+ public function search_label( $query ) {
+ global $pagenow, $typenow;
+
+ if ( 'edit.php' !== $pagenow || 'shop_order' !== $typenow || ! get_query_var( 'shop_order_search' ) || ! isset( $_GET['s'] ) ) { // WPCS: input var ok.
+ return $query;
+ }
+
+ return wc_clean( wp_unslash( $_GET['s'] ) ); // WPCS: input var ok, sanitization ok.
+ }
+
+ /**
+ * Query vars for custom searches.
+ *
+ * @param mixed $public_query_vars Array of query vars.
+ * @return array
+ */
+ public function add_custom_query_var( $public_query_vars ) {
+ $public_query_vars[] = 'shop_order_search';
+ return $public_query_vars;
+ }
+
+ /**
+ * Search custom fields as well as content.
+ *
+ * @param WP_Query $wp Query object.
+ */
+ public function search_custom_fields( $wp ) {
+ global $pagenow;
+
+ if ( 'edit.php' !== $pagenow || empty( $wp->query_vars['s'] ) || 'shop_order' !== $wp->query_vars['post_type'] || ! isset( $_GET['s'] ) ) { // WPCS: input var ok.
+ return;
+ }
+
+ $post_ids = wc_order_search( wc_clean( wp_unslash( $_GET['s'] ) ) ); // WPCS: input var ok, sanitization ok.
+
+ if ( ! empty( $post_ids ) ) {
+ // Remove "s" - we don't want to search order name.
+ unset( $wp->query_vars['s'] );
+
+ // so we know we're doing this.
+ $wp->query_vars['shop_order_search'] = true;
+
+ // Search by found posts.
+ $wp->query_vars['post__in'] = array_merge( $post_ids, array( 0 ) );
+ }
+ }
+}
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-products.php b/includes/admin/list-tables/class-wc-admin-list-table-products.php
new file mode 100644
index 00000000000..c549029fceb
--- /dev/null
+++ b/includes/admin/list-tables/class-wc-admin-list-table-products.php
@@ -0,0 +1,532 @@
+';
+ echo '
' . __( 'Your changes have been saved.', 'woocommerce' ) . '
' . esc_html__( 'Your changes have been saved.', 'woocommerce' ) . '
+
+ term_id && current_user_can( 'edit_term', $term->term_id ) ) {
+ $actions['make_default'] = sprintf(
+ '%s',
+ wp_nonce_url( 'edit-tags.php?action=make_default&taxonomy=product_cat&tag_ID=' . absint( $term->term_id ), 'make_default_' . absint( $term->term_id ) ),
+ /* translators: %s: taxonomy term name */
+ esc_attr( sprintf( __( 'Make “%s” the default category', 'woocommerce' ), $term->name ) ),
+ __( 'Make default', 'woocommerce' )
+ );
+ }
+
+ return $actions;
+ }
+
+ /**
+ * Handle custom row actions.
+ */
+ public function handle_product_cat_row_actions() {
+ if ( isset( $_GET['action'], $_GET['tag_ID'], $_GET['_wpnonce'] ) && 'make_default' === $_GET['action'] ) {
+ $make_default_id = absint( $_GET['tag_ID'] );
+
+ if ( wp_verify_nonce( $_GET['_wpnonce'], 'make_default_' . $make_default_id ) && current_user_can( 'edit_term', $make_default_id ) ) {
+ update_option( 'default_product_cat', $make_default_id );
+ }
+ }
}
/**
@@ -326,12 +406,18 @@ class WC_Admin_Taxonomies {
*
* @param string $columns
* @param string $column
- * @param int $id
- * @return array
+ * @param int $id
+ *
+ * @return string
*/
public function product_cat_column( $columns, $column, $id ) {
+ if ( 'thumb' === $column ) {
+ // Prepend tooltip for default category.
+ $default_category_id = absint( get_option( 'default_product_cat', 0 ) );
- if ( 'thumb' == $column ) {
+ if ( $default_category_id === $id ) {
+ $columns .= wc_help_tip( __( 'This is the default category and it cannot be deleted. It will be automatically assigned to products with no category.', 'woocommerce' ) );
+ }
$thumbnail_id = get_woocommerce_term_meta( $id, 'thumbnail_id', true );
@@ -341,14 +427,13 @@ class WC_Admin_Taxonomies {
$image = wc_placeholder_img_src();
}
- // Prevent esc_url from breaking spaces in urls for image embeds
- // Ref: https://core.trac.wordpress.org/ticket/23605
- $image = str_replace( ' ', '%20', $image );
-
+ // Prevent esc_url from breaking spaces in urls for image embeds. Ref: https://core.trac.wordpress.org/ticket/23605
+ $image = str_replace( ' ', '%20', $image );
$columns .= '
+
+ ' . esc_html( $category_name ) . ''
+ );
+ ?>
+
';
+
+ if ( $this->has_items() ) {
+ echo '
'; + echo '
';
+ }
+
+ /**
+ * Search box.
+ *
+ * @param string $text Button text.
+ * @param string $input_id Input ID.
+ */
+ public function search_box( $text, $input_id ) {
+ if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) { // WPCS: input var okay, CSRF ok.
+ return;
+ }
+
+ $input_id = $input_id . '-search-input';
+ $search_query = isset( $_REQUEST['s'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ) : ''; // WPCS: input var okay, CSRF ok.
+
+ echo '';
+ $this->bulk_actions( $which );
+ echo '
';
+ }
+
+ $this->extra_tablenav( $which );
+ $this->pagination( $which );
+ echo ''; + echo '
'; + echo ''; + echo ''; + submit_button( + $text, '', '', false, + array( + 'id' => 'search-submit', + ) + ); + echo '
'; } /** * Prepare table list items. */ public function prepare_items() { - $per_page = apply_filters( 'woocommerce_webhooks_settings_posts_per_page', 10 ); - $columns = $this->get_columns(); - $hidden = array(); - $sortable = $this->get_sortable_columns(); - - // Column headers - $this->_column_headers = array( $columns, $hidden, $sortable ); - + $per_page = $this->get_items_per_page( 'woocommerce_webhooks_per_page' ); $current_page = $this->get_pagenum(); - // Query args + // Query args. $args = array( - 'post_type' => 'shop_webhook', - 'posts_per_page' => $per_page, - 'ignore_sticky_posts' => true, - 'paged' => $current_page, + 'limit' => $per_page, + 'offset' => $per_page * ( $current_page - 1 ), ); - // Handle the status query - if ( ! empty( $_REQUEST['status'] ) ) { - $args['post_status'] = sanitize_text_field( $_REQUEST['status'] ); + // Handle the status query. + if ( ! empty( $_REQUEST['status'] ) ) { // WPCS: input var okay, CSRF ok. + $args['status'] = sanitize_key( wp_unslash( $_REQUEST['status'] ) ); // WPCS: input var okay, CSRF ok. } - if ( ! empty( $_REQUEST['s'] ) ) { - $args['s'] = sanitize_text_field( $_REQUEST['s'] ); + if ( ! empty( $_REQUEST['s'] ) ) { // WPCS: input var okay, CSRF ok. + $args['search'] = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ); // WPCS: input var okay, CSRF ok. } - // Get the webhooks - $webhooks = new WP_Query( $args ); - $this->items = $webhooks->posts; + // Get the webhooks. + $data_store = WC_Data_Store::load( 'webhook' ); + $webhooks = $data_store->search_webhooks( $args ); + $this->items = array_map( 'wc_get_webhook', $webhooks ); - // Set the pagination - $this->set_pagination_args( array( - 'total_items' => $webhooks->found_posts, - 'per_page' => $per_page, - 'total_pages' => $webhooks->max_num_pages, - ) ); + // Get total items. + $args['limit'] = -1; + $args['offset'] = 0; + $total_items = count( $data_store->search_webhooks( $args ) ); + + // Set the pagination. + $this->set_pagination_args( + array( + 'total_items' => $total_items, + 'per_page' => $per_page, + 'total_pages' => ceil( $total_items / $per_page ), + ) + ); } } diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index 487b9bcb6ec..c4216044c3e 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -2,15 +2,11 @@ /** * WooCommerce Admin Webhooks Class * - * @author WooThemes - * @category Admin - * @package WooCommerce/Admin - * @version 2.4.0 + * @package WooCommerce\Admin + * @version 3.3.0 */ -if ( ! defined( 'ABSPATH' ) ) { - exit; // Exit if accessed directly -} +defined( 'ABSPATH' ) || exit; /** * WC_Admin_Webhooks. @@ -22,6 +18,23 @@ class WC_Admin_Webhooks { */ public function __construct() { add_action( 'admin_init', array( $this, 'actions' ) ); + add_action( 'woocommerce_settings_page_init', array( $this, 'screen_option' ) ); + add_filter( 'woocommerce_save_settings_advanced_webhooks', array( $this, 'allow_save_settings' ) ); + } + + /** + * Check if should allow save settings. + * This prevents "Your settings have been saved." notices on the table list. + * + * @param bool $allow If allow save settings. + * @return bool + */ + public function allow_save_settings( $allow ) { + if ( ! isset( $_GET['edit-webhook'] ) ) { // WPCS: input var okay, CSRF ok. + return false; + } + + return $allow; } /** @@ -30,88 +43,69 @@ class WC_Admin_Webhooks { * @return bool */ private function is_webhook_settings_page() { - return isset( $_GET['page'] ) - && 'wc-settings' == $_GET['page'] - && isset( $_GET['tab'] ) - && 'api' == $_GET['tab'] - && isset( $_GET['section'] ) - && 'webhooks' == isset( $_GET['section'] ); + return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'advanced' === $_GET['tab'] && 'webhooks' === $_GET['section']; // WPCS: input var okay, CSRF ok. } /** - * Updated the Webhook name. - * - * @param int $webhook_id + * Save method. */ - private function update_name( $webhook_id ) { - global $wpdb; + private function save() { + check_admin_referer( 'woocommerce-settings' ); - // @codingStandardsIgnoreStart - /* translators: %s: date` */ - $name = ! empty( $_POST['webhook_name'] ) ? $_POST['webhook_name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ); - // @codingStandardsIgnoreEnd - $wpdb->update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) ); - } + if ( ! current_user_can( 'manage_woocommerce' ) ) { + wp_die( esc_html__( 'You do not have permission to update Webhooks', 'woocommerce' ) ); + } - /** - * Updated the Webhook status. - * - * @param WC_Webhook $webhook - */ - private function update_status( $webhook ) { - $status = ! empty( $_POST['webhook_status'] ) ? wc_clean( $_POST['webhook_status'] ) : ''; + $errors = array(); + $webhook_id = isset( $_POST['webhook_id'] ) ? absint( $_POST['webhook_id'] ) : 0; // WPCS: input var okay, CSRF ok. + $webhook = new WC_Webhook( $webhook_id ); - $webhook->update_status( $status ); - } + // Name. + if ( ! empty( $_POST['webhook_name'] ) ) { // WPCS: input var okay, CSRF ok. + $name = sanitize_text_field( wp_unslash( $_POST['webhook_name'] ) ); // WPCS: input var okay, CSRF ok. + } else { + $name = sprintf( + /* translators: %s: date */ + __( 'Webhook created on %s', 'woocommerce' ), + // @codingStandardsIgnoreStart + strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) + // @codingStandardsIgnoreEnd + ); + } - /** - * Updated the Webhook delivery URL. - * - * @param WC_Webhook $webhook - */ - private function update_delivery_url( $webhook ) { - $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? $_POST['webhook_delivery_url'] : ''; + $webhook->set_name( $name ); + + if ( ! $webhook->get_user_id() ) { + $webhook->set_user_id( get_current_user_id() ); + } + + // Status. + $webhook->set_status( ! empty( $_POST['webhook_status'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_status'] ) ) : 'disabled' ); // WPCS: input var okay, CSRF ok. + + // Delivery URL. + $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? esc_url_raw( wp_unslash( $_POST['webhook_delivery_url'] ) ) : ''; // WPCS: input var okay, CSRF ok. if ( wc_is_valid_url( $delivery_url ) ) { $webhook->set_delivery_url( $delivery_url ); } - } - - /** - * Updated the Webhook secret. - * - * @param WC_Webhook $webhook - */ - private function update_secret( $webhook ) { - $secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : wp_generate_password( 50, true, true ); + // Secret. + $secret = ! empty( $_POST['webhook_secret'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_secret'] ) ) : wp_generate_password( 50, true, true ); // WPCS: input var okay, CSRF ok. $webhook->set_secret( $secret ); - } - - /** - * Updated the Webhook topic. - * - * @param WC_Webhook $webhook - */ - private function update_topic( $webhook ) { - if ( ! empty( $_POST['webhook_topic'] ) ) { + // Topic. + if ( ! empty( $_POST['webhook_topic'] ) ) { // WPCS: input var okay, CSRF ok. $resource = ''; $event = ''; - switch ( $_POST['webhook_topic'] ) { - case 'custom' : - if ( ! empty( $_POST['webhook_custom_topic'] ) ) { - list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_custom_topic'] ) ); - } - break; - case 'action' : + switch ( $_POST['webhook_topic'] ) { // WPCS: input var okay, CSRF ok. + case 'action': $resource = 'action'; - $event = ! empty( $_POST['webhook_action_event'] ) ? wc_clean( $_POST['webhook_action_event'] ) : ''; + $event = ! empty( $_POST['webhook_action_event'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_action_event'] ) ) : ''; // WPCS: input var okay, CSRF ok. break; - default : - list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_topic'] ) ); + default: + list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_topic'] ) ) ); // WPCS: input var okay, CSRF ok. break; } @@ -119,224 +113,71 @@ class WC_Admin_Webhooks { if ( wc_is_webhook_valid_topic( $topic ) ) { $webhook->set_topic( $topic ); + } else { + $errors[] = __( 'Webhook topic unknown. Please select a valid topic.', 'woocommerce' ); } } - } - - /** - * Update webhook api version. - * - * @param WC_Webhook $webhook Webhook instance. - */ - private function update_api_version( $webhook ) { - $version = ! empty( $_POST['webhook_api_version'] ) ? wc_clean( $_POST['webhook_api_version'] ) : 'wp_api_v2'; - - $webhook->set_api_version( $version ); - } - - /** - * Save method. - */ - private function save() { - if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) { - wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); - } - - $webhook_id = absint( $_POST['webhook_id'] ); - - if ( ! current_user_can( 'edit_shop_webhook', $webhook_id ) ) { - return; - } - - $webhook = new WC_Webhook( $webhook_id ); - - // Name - $this->update_name( $webhook->id ); - - // Status - $this->update_status( $webhook ); - - // Delivery URL - $this->update_delivery_url( $webhook ); - - // Secret - $this->update_secret( $webhook ); - - // Topic - $this->update_topic( $webhook ); // API version. - $this->update_api_version( $webhook ); + $rest_api_versions = wc_get_webhook_rest_api_versions(); + $webhook->set_api_version( ! empty( $_POST['webhook_api_version'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_api_version'] ) ) : end( $rest_api_versions ) ); // WPCS: input var okay, CSRF ok. - // Update date. - wp_update_post( array( 'ID' => $webhook->id, 'post_modified' => current_time( 'mysql' ) ) ); + $webhook->save(); - // Run actions - do_action( 'woocommerce_webhook_options_save', $webhook->id ); - - delete_transient( 'woocommerce_webhook_ids' ); - - // Ping the webhook at the first time that is activated - $pending_delivery = get_post_meta( $webhook->id, '_webhook_pending_delivery', true ); - - if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $pending_delivery ) { + // Run actions. + do_action( 'woocommerce_webhook_options_save', $webhook->get_id() ); + if ( $errors ) { + // Redirect to webhook edit page to avoid settings save actions. + wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( implode( '|', $errors ) ) ) ); + exit(); + } elseif ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery() ) { // WPCS: input var okay, CSRF ok. + // Ping the webhook at the first time that is activated. $result = $webhook->deliver_ping(); if ( is_wp_error( $result ) ) { - // Redirect to webhook edit page to avoid settings save actions - wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->id . '&error=' . urlencode( $result->get_error_message() ) ) ); + // Redirect to webhook edit page to avoid settings save actions. + wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( $result->get_error_message() ) ) ); exit(); } } - // Redirect to webhook edit page to avoid settings save actions - wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->id . '&updated=1' ) ); + // Redirect to webhook edit page to avoid settings save actions. + wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1' ) ); exit(); } /** - * Create Webhook. - */ - private function create() { - if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'create-webhook' ) ) { - wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); - } - - if ( ! current_user_can( 'publish_shop_webhooks' ) ) { - wp_die( __( 'You do not have permissions to create Webhooks!', 'woocommerce' ) ); - } - - $webhook_id = wp_insert_post( array( - 'post_type' => 'shop_webhook', - 'post_status' => 'pending', - 'ping_status' => 'closed', - 'post_author' => get_current_user_id(), - 'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password, - // @codingStandardsIgnoreStart - /* translators: %s: date */ - 'post_title' => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ), - // @codingStandardsIgnoreEnd - 'comment_status' => 'open', - ) ); - - if ( is_wp_error( $webhook_id ) ) { - wp_die( $webhook_id->get_error_messages() ); - } - - update_post_meta( $webhook_id, '_webhook_pending_delivery', true ); - $webhook = new WC_Webhook( $webhook_id ); - $webhook->set_api_version( 'wp_api_v2' ); - - delete_transient( 'woocommerce_webhook_ids' ); - - // Redirect to edit page - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook_id . '&created=1' ) ); - exit(); - } - - /** - * Bulk trash/delete. + * Bulk delete. * - * @param array $webhooks - * @param bool $delete + * @param array $webhooks List of webhooks IDs. */ - private function bulk_trash( $webhooks, $delete = false ) { + public static function bulk_delete( $webhooks ) { foreach ( $webhooks as $webhook_id ) { - if ( $delete ) { - wp_delete_post( $webhook_id, true ); - } else { - wp_trash_post( $webhook_id ); + $webhook = new WC_Webhook( (int) $webhook_id ); + $webhook->delete( true ); + } + + $qty = count( $webhooks ); + $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( wp_unslash( $_GET['status'] ) ) : ''; // WPCS: input var okay, CSRF ok. + + // Redirect to webhooks page. + wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=advanced§ion=webhooks' . $status . '&deleted=' . $qty ) ); + exit(); + } + + /** + * Delete webhook. + */ + private function delete() { + check_admin_referer( 'delete-webhook' ); + + if ( isset( $_GET['delete'] ) ) { // WPCS: input var okay, CSRF ok. + $webhook_id = absint( $_GET['delete'] ); // WPCS: input var okay, CSRF ok. + + if ( $webhook_id ) { + $this->bulk_delete( array( $webhook_id ) ); } } - - $type = ! EMPTY_TRASH_DAYS || $delete ? 'deleted' : 'trashed'; - $qty = count( $webhooks ); - $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( $_GET['status'] ) : ''; - - delete_transient( 'woocommerce_webhook_ids' ); - - // Redirect to webhooks page - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks' . $status . '&' . $type . '=' . $qty ) ); - exit(); - } - - /** - * Bulk untrash. - * - * @param array $webhooks - */ - private function bulk_untrash( $webhooks ) { - foreach ( $webhooks as $webhook_id ) { - wp_untrash_post( $webhook_id ); - } - - $qty = count( $webhooks ); - - delete_transient( 'woocommerce_webhook_ids' ); - - // Redirect to webhooks page - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&status=trash&untrashed=' . $qty ) ); - exit(); - } - - /** - * Bulk actions. - */ - private function bulk_actions() { - if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) { - wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); - } - - if ( ! current_user_can( 'edit_shop_webhooks' ) ) { - wp_die( __( 'You do not have permissions to edit Webhooks!', 'woocommerce' ) ); - } - - $webhooks = array_map( 'absint', (array) $_GET['webhook'] ); - - switch ( $_GET['action'] ) { - case 'trash' : - $this->bulk_trash( $webhooks ); - break; - case 'untrash' : - $this->bulk_untrash( $webhooks ); - break; - case 'delete' : - $this->bulk_trash( $webhooks, true ); - break; - default : - break; - } - } - - /** - * Empty Trash. - */ - private function empty_trash() { - if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'empty_trash' ) ) { - wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); - } - - if ( ! current_user_can( 'delete_shop_webhooks' ) ) { - wp_die( __( 'You do not have permissions to delete Webhooks!', 'woocommerce' ) ); - } - - $webhooks = get_posts( array( - 'post_type' => 'shop_webhook', - 'ignore_sticky_posts' => true, - 'nopaging' => true, - 'post_status' => 'trash', - 'fields' => 'ids', - ) ); - - foreach ( $webhooks as $webhook_id ) { - wp_delete_post( $webhook_id, true ); - } - - $qty = count( $webhooks ); - - // Redirect to webhooks page - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&deleted=' . $qty ) ); - exit(); } /** @@ -344,24 +185,14 @@ class WC_Admin_Webhooks { */ public function actions() { if ( $this->is_webhook_settings_page() ) { - // Save - if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { + // Save. + if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { // WPCS: input var okay, CSRF ok. $this->save(); } - // Create - if ( isset( $_GET['create-webhook'] ) ) { - $this->create(); - } - - // Bulk actions - if ( isset( $_GET['action'] ) && isset( $_GET['webhook'] ) ) { - $this->bulk_actions(); - } - - // Empty trash - if ( isset( $_GET['empty_trash'] ) ) { - $this->empty_trash(); + // Delete webhook. + if ( isset( $_GET['delete'] ) ) { // WPCS: input var okay, CSRF ok. + $this->delete(); } } } @@ -370,17 +201,15 @@ class WC_Admin_Webhooks { * Page output. */ public static function page_output() { - // Hide the save button + // Hide the save button. $GLOBALS['hide_save_button'] = true; - if ( isset( $_GET['edit-webhook'] ) ) { - $webhook_id = absint( $_GET['edit-webhook'] ); + if ( isset( $_GET['edit-webhook'] ) ) { // WPCS: input var okay, CSRF ok. + $webhook_id = absint( $_GET['edit-webhook'] ); // WPCS: input var okay, CSRF ok. $webhook = new WC_Webhook( $webhook_id ); - if ( 'trash' != $webhook->post_data->post_status ) { - include( 'settings/views/html-webhooks-edit.php' ); - return; - } + include 'settings/views/html-webhooks-edit.php'; + return; } self::table_list_output(); @@ -390,37 +219,45 @@ class WC_Admin_Webhooks { * Notices. */ public static function notices() { - if ( isset( $_GET['trashed'] ) ) { - $trashed = absint( $_GET['trashed'] ); - - /* translators: %d: count */ - WC_Admin_Settings::add_message( sprintf( _n( '%d webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) ); - } - - if ( isset( $_GET['untrashed'] ) ) { - $untrashed = absint( $_GET['untrashed'] ); - - /* translators: %d: count */ - WC_Admin_Settings::add_message( sprintf( _n( '%d webhook restored from the Trash.', '%d webhooks restored from the Trash.', $untrashed, 'woocommerce' ), $untrashed ) ); - } - - if ( isset( $_GET['deleted'] ) ) { - $deleted = absint( $_GET['deleted'] ); + if ( isset( $_GET['deleted'] ) ) { // WPCS: input var okay, CSRF ok. + $deleted = absint( $_GET['deleted'] ); // WPCS: input var okay, CSRF ok. /* translators: %d: count */ WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) ); } - if ( isset( $_GET['updated'] ) ) { + if ( isset( $_GET['updated'] ) ) { // WPCS: input var okay, CSRF ok. WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) ); } - if ( isset( $_GET['created'] ) ) { + if ( isset( $_GET['created'] ) ) { // WPCS: input var okay, CSRF ok. WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) ); } - if ( isset( $_GET['error'] ) ) { - WC_Admin_Settings::add_error( wc_clean( $_GET['error'] ) ); + if ( isset( $_GET['error'] ) ) { // WPCS: input var okay, CSRF ok. + foreach ( explode( '|', sanitize_text_field( wp_unslash( $_GET['error'] ) ) ) as $message ) { // WPCS: input var okay, CSRF ok. + WC_Admin_Settings::add_error( trim( $message ) ); + } + } + } + + /** + * Add screen option. + */ + public function screen_option() { + global $webhooks_table_list; + + if ( ! isset( $_GET['edit-webhook'] ) && $this->is_webhook_settings_page() ) { // WPCS: input var okay, CSRF ok. + $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); + + // Add screen option. + add_screen_option( + 'per_page', + array( + 'default' => 10, + 'option' => 'woocommerce_webhooks_per_page', + ) + ); } } @@ -428,20 +265,20 @@ class WC_Admin_Webhooks { * Table list output. */ private static function table_list_output() { + global $webhooks_table_list; - global $wpdb; + echo '' . esc_html__( 'Webhooks', 'woocommerce' ) . ' ' . esc_html__( 'Add webhook', 'woocommerce' ) . '
'; - echo '' . __( 'Webhooks', 'woocommerce' ) . ' ' . __( 'Add webhook', 'woocommerce' ) . '
'; + // Get the webhooks count. + $data_store = WC_Data_Store::load( 'webhook' ); + $count = count( $data_store->get_webhooks_ids() ); - // Get the webhooks count - $count = array_sum( (array) wp_count_posts( 'shop_webhook', 'readable' ) ); - - if ( absint( $count ) && $count > 0 ) { - $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); + if ( 0 < $count ) { + $webhooks_table_list->process_bulk_action(); $webhooks_table_list->prepare_items(); echo ''; - echo ''; + echo ''; echo ''; $webhooks_table_list->views(); @@ -450,47 +287,28 @@ class WC_Admin_Webhooks { } else { echo '';
?>
-
-
-
- #posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }
';
+
+
+
+ $webhook->id,
- 'status' => 'approve',
- 'type' => 'webhook_delivery',
- 'number' => 10,
- );
-
- if ( 1 < $current ) {
- $args['offset'] = ( $current - 1 ) * 10;
- }
-
- remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 );
-
- $logs = get_comments( $args );
-
- add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 );
-
- if ( $logs ) {
- include_once( dirname( __FILE__ ) . '/settings/views/html-webhook-logs.php' );
- } else {
- echo '' . __( 'This Webhook has no log yet.', 'woocommerce' ) . '
'; - } + public static function logs_output( $webhook = 'deprecated' ) { + wc_deprecated_function( 'WC_Admin_Webhooks::logs_output', '3.3' ); } /** * Get the webhook topic data. * + * @param WC_Webhook $webhook Webhook instance. + * * @return array */ public static function get_topic_data( $webhook ) { @@ -503,7 +321,7 @@ class WC_Admin_Webhooks { if ( 'action' === $resource ) { $topic = 'action'; - } elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) ) { + } elseif ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ), true ) ) { $topic = 'custom'; } } @@ -518,45 +336,12 @@ class WC_Admin_Webhooks { /** * Get the logs navigation. * - * @param int $total - * - * @return string + * @deprecated 3.3.0 + * @param int $total Deprecated. + * @param WC_Webhook $webhook Deprecated. */ public static function get_logs_navigation( $total, $webhook ) { - $pages = ceil( $total / 10 ); - $current = isset( $_GET['log_page'] ) ? absint( $_GET['log_page'] ) : 1; - - $html = ''; - - return $html; + wc_deprecated_function( 'WC_Admin_Webhooks::get_logs_navigation', '3.3' ); } } diff --git a/includes/admin/class-wc-admin.php b/includes/admin/class-wc-admin.php index 0a73b97efb9..0d95cb3b097 100644 --- a/includes/admin/class-wc-admin.php +++ b/includes/admin/class-wc-admin.php @@ -30,6 +30,7 @@ class WC_Admin { add_action( 'admin_init', array( $this, 'admin_redirects' ) ); add_action( 'admin_footer', 'wc_print_js', 25 ); add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ), 1 ); + add_action( 'wp_ajax_setup_wizard_check_jetpack', array( $this, 'setup_wizard_check_jetpack' ) ); } /** @@ -43,36 +44,46 @@ class WC_Admin { * Include any classes we need within admin. */ public function includes() { - include_once( dirname( __FILE__ ) . '/wc-admin-functions.php' ); - include_once( dirname( __FILE__ ) . '/wc-meta-box-functions.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-post-types.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-taxonomies.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-menus.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-customize.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-notices.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-assets.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-api-keys.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-webhooks.php' ); - include_once( dirname( __FILE__ ) . '/class-wc-admin-pointers.php' ); + include_once dirname( __FILE__ ) . '/wc-admin-functions.php'; + include_once dirname( __FILE__ ) . '/wc-meta-box-functions.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-post-types.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-taxonomies.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-menus.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-customize.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-notices.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-assets.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-api-keys.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-webhooks.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-pointers.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-importers.php'; + include_once dirname( __FILE__ ) . '/class-wc-admin-exporters.php'; // Help Tabs if ( apply_filters( 'woocommerce_enable_admin_help_tab', true ) ) { - include_once( dirname( __FILE__ ) . '/class-wc-admin-help.php' ); + include_once dirname( __FILE__ ) . '/class-wc-admin-help.php'; } // Setup/welcome if ( ! empty( $_GET['page'] ) ) { switch ( $_GET['page'] ) { - case 'wc-setup' : - include_once( dirname( __FILE__ ) . '/class-wc-admin-setup-wizard.php' ); - break; + case 'wc-setup': + include_once dirname( __FILE__ ) . '/class-wc-admin-setup-wizard.php'; + break; } } // Importers if ( defined( 'WP_LOAD_IMPORTERS' ) ) { - include_once( dirname( __FILE__ ) . '/class-wc-admin-importers.php' ); + include_once dirname( __FILE__ ) . '/class-wc-admin-importers.php'; } + + // Helper + include_once dirname( __FILE__ ) . '/helper/class-wc-helper-options.php'; + include_once dirname( __FILE__ ) . '/helper/class-wc-helper-api.php'; + include_once dirname( __FILE__ ) . '/helper/class-wc-helper-updater.php'; + include_once dirname( __FILE__ ) . '/helper/class-wc-helper-plugin-info.php'; + include_once dirname( __FILE__ ) . '/helper/class-wc-helper-compat.php'; + include_once dirname( __FILE__ ) . '/helper/class-wc-helper.php'; } /** @@ -84,18 +95,25 @@ class WC_Admin { } switch ( $screen->id ) { - case 'dashboard' : - include( 'class-wc-admin-dashboard.php' ); - break; - case 'options-permalink' : - include( 'class-wc-admin-permalink-settings.php' ); - break; - case 'users' : - case 'user' : - case 'profile' : - case 'user-edit' : - include( 'class-wc-admin-profile.php' ); - break; + case 'dashboard': + case 'dashboard-network': + include 'class-wc-admin-dashboard.php'; + break; + case 'options-permalink': + include 'class-wc-admin-permalink-settings.php'; + break; + case 'plugins': + include 'plugin-updates/class-wc-plugins-screen-updates.php'; + break; + case 'update-core': + include 'plugin-updates/class-wc-updates-screen-updates.php'; + break; + case 'users': + case 'user': + case 'profile': + case 'user-edit': + include 'class-wc-admin-profile.php'; + break; } } @@ -142,7 +160,7 @@ class WC_Admin { public function prevent_admin_access() { $prevent_access = false; - if ( 'yes' === get_option( 'woocommerce_lock_down_admin', 'yes' ) && ! is_ajax() && basename( $_SERVER["SCRIPT_FILENAME"] ) !== 'admin-post.php' ) { + if ( 'yes' === get_option( 'woocommerce_lock_down_admin', 'yes' ) && ! is_ajax() && basename( $_SERVER['SCRIPT_FILENAME'] ) !== 'admin-post.php' ) { $has_cap = false; $access_caps = array( 'edit_posts', 'manage_woocommerce', 'view_admin_dashboard' ); @@ -166,8 +184,6 @@ class WC_Admin { /** * Preview email template. - * - * @return string */ public function preview_emails() { @@ -177,21 +193,21 @@ class WC_Admin { } // load the mailer class - $mailer = WC()->mailer(); + $mailer = WC()->mailer(); // get the preview email subject $email_heading = __( 'HTML email template', 'woocommerce' ); // get the preview email content ob_start(); - include( 'views/html-email-template-preview.php' ); - $message = ob_get_clean(); + include 'views/html-email-template-preview.php'; + $message = ob_get_clean(); // create a new email - $email = new WC_Email(); + $email = new WC_Email(); // wrap the content with the email template and then add styles - $message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) ); + $message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) ); // print the preview email echo $message; @@ -220,14 +236,18 @@ class WC_Admin { if ( isset( $current_screen->id ) && apply_filters( 'woocommerce_display_admin_footer_text', in_array( $current_screen->id, $wc_pages ) ) ) { // Change the footer text if ( ! get_option( 'woocommerce_admin_footer_text_rated' ) ) { - /* translators: %s: five stars */ - $footer_text = sprintf( __( 'If you like WooCommerce please leave us a %s rating. A huge thanks in advance!', 'woocommerce' ), '★★★★★' ); - wc_enqueue_js( " - jQuery( 'a.wc-rating-link' ).click( function() { + $footer_text = sprintf( + /* translators: 1: WooCommerce 2:: five stars */ + __( 'If you like %1$s please leave us a %2$s rating. A huge thanks in advance!', 'woocommerce' ), + sprintf( '%s', esc_html__( 'WooCommerce', 'woocommerce' ) ), + '★★★★★' + ); + wc_enqueue_js( + "jQuery( 'a.wc-rating-link' ).click( function() { jQuery.post( '" . WC()->ajax_url() . "', { action: 'woocommerce_rated' } ); jQuery( this ).parent().text( jQuery( this ).data( 'rated' ) ); - }); - " ); + });" + ); } else { $footer_text = __( 'Thank you for selling with WooCommerce.', 'woocommerce' ); } @@ -235,6 +255,21 @@ class WC_Admin { return $footer_text; } + + /** + * Check on a Jetpack install queued by the Setup Wizard. + * + * See: WC_Admin_Setup_Wizard::install_jetpack() + */ + public function setup_wizard_check_jetpack() { + $jetpack_active = class_exists( 'Jetpack' ); + + wp_send_json_success( + array( + 'is_active' => $jetpack_active ? 'yes' : 'no', + ) + ); + } } return new WC_Admin(); diff --git a/includes/admin/helper/class-wc-helper-api.php b/includes/admin/helper/class-wc-helper-api.php new file mode 100644 index 00000000000..a5f159f95b9 --- /dev/null +++ b/includes/admin/helper/class-wc-helper-api.php @@ -0,0 +1,137 @@ + parse_url( $url, PHP_URL_HOST ), + 'request_uri' => $request_uri, + 'method' => ! empty( $args['method'] ) ? $args['method'] : 'GET', + ); + + if ( ! empty( $args['body'] ) ) { + $data['body'] = $args['body']; + } + + $signature = hash_hmac( 'sha256', json_encode( $data ), $auth['access_token_secret'] ); + if ( empty( $args['headers'] ) ) { + $args['headers'] = array(); + } + + $args['headers'] = array( + 'Authorization' => 'Bearer ' . $auth['access_token'], + 'X-Woo-Signature' => $signature, + ); + + return true; + } + + /** + * Wrapper for self::request(). + * + * @param string $endpoint The helper API endpoint to request. + * @param array $args Arguments passed to wp_remote_request(). + * + * @return array The response object from wp_safe_remote_request(). + */ + public static function get( $endpoint, $args = array() ) { + $args['method'] = 'GET'; + return self::request( $endpoint, $args ); + } + + /** + * Wrapper for self::request(). + * + * @param string $endpoint The helper API endpoint to request. + * @param array $args Arguments passed to wp_remote_request(). + * + * @return array The response object from wp_safe_remote_request(). + */ + public static function post( $endpoint, $args = array() ) { + $args['method'] = 'POST'; + return self::request( $endpoint, $args ); + } + + /** + * Using the API base, form a request URL from a given endpoint. + * + * @param string $endpoint The endpoint to request. + * + * @return string The absolute endpoint URL. + */ + public static function url( $endpoint ) { + $endpoint = ltrim( $endpoint, '/' ); + $endpoint = sprintf( '%s/%s', self::$api_base, $endpoint ); + $endpoint = esc_url_raw( $endpoint ); + return $endpoint; + } +} + +WC_Helper_API::load(); diff --git a/includes/admin/helper/class-wc-helper-compat.php b/includes/admin/helper/class-wc-helper-compat.php new file mode 100644 index 00000000000..e967da65e95 --- /dev/null +++ b/includes/admin/helper/class-wc-helper-compat.php @@ -0,0 +1,197 @@ +admin, 'maybe_display_activation_notice' ) ); + remove_action( 'admin_notices', array( $GLOBALS['woothemes_updater']->admin, 'maybe_display_activation_notice' ) ); + remove_action( 'network_admin_menu', array( $GLOBALS['woothemes_updater']->admin, 'register_settings_screen' ) ); + remove_action( 'admin_menu', array( $GLOBALS['woothemes_updater']->admin, 'register_settings_screen' ) ); + } + + /** + * Attempt to migrate a legacy connection to a new one. + */ + public static function migrate_connection() { + // Don't attempt to migrate if attempted before. + if ( WC_Helper_Options::get( 'did-migrate' ) ) { + return; + } + + $auth = WC_Helper_Options::get( 'auth' ); + if ( ! empty( $auth ) ) { + return; + } + + WC_Helper::log( 'Attempting oauth/migrate' ); + WC_Helper_Options::update( 'did-migrate', true ); + + $master_key = get_option( 'woothemes_helper_master_key' ); + if ( empty( $master_key ) ) { + WC_Helper::log( 'Master key not found, aborting' ); + return; + } + + $request = WC_Helper_API::post( + 'oauth/migrate', + array( + 'body' => array( + 'home_url' => home_url(), + 'master_key' => $master_key, + ), + ) + ); + + if ( is_wp_error( $request ) || wp_remote_retrieve_response_code( $request ) !== 200 ) { + WC_Helper::log( 'Call to oauth/migrate returned a non-200 response code' ); + return; + } + + $request_token = json_decode( wp_remote_retrieve_body( $request ) ); + if ( empty( $request_token ) ) { + WC_Helper::log( 'Call to oauth/migrate returned an empty token' ); + return; + } + + // Obtain an access token. + $request = WC_Helper_API::post( + 'oauth/access_token', + array( + 'body' => array( + 'request_token' => $request_token, + 'home_url' => home_url(), + 'migrate' => true, + ), + ) + ); + + if ( is_wp_error( $request ) || wp_remote_retrieve_response_code( $request ) !== 200 ) { + WC_Helper::log( 'Call to oauth/access_token returned a non-200 response code' ); + return; + } + + $access_token = json_decode( wp_remote_retrieve_body( $request ), true ); + if ( empty( $access_token ) ) { + WC_Helper::log( 'Call to oauth/access_token returned an invalid token' ); + return; + } + + WC_Helper_Options::update( + 'auth', + array( + 'access_token' => $access_token['access_token'], + 'access_token_secret' => $access_token['access_token_secret'], + 'site_id' => $access_token['site_id'], + 'user_id' => null, // Set this later + 'updated' => time(), + ) + ); + + // Obtain the connected user info. + if ( ! WC_Helper::_flush_authentication_cache() ) { + WC_Helper::log( 'Could not obtain connected user info in migrate_connection' ); + WC_Helper_Options::update( 'auth', array() ); + return; + } + } + + /** + * Attempt to deactivate the legacy helper plugin. + */ + public static function deactivate_plugin() { + include_once ABSPATH . 'wp-admin/includes/plugin.php'; + if ( ! function_exists( 'deactivate_plugins' ) ) { + return; + } + + if ( is_plugin_active( 'woothemes-updater/woothemes-updater.php' ) ) { + deactivate_plugins( 'woothemes-updater/woothemes-updater.php' ); + + // Notify the user when the plugin is deactivated. + add_action( 'pre_current_active_plugins', array( __CLASS__, 'plugin_deactivation_notice' ) ); + } + } + + /** + * Display admin notice directing the user where to go. + */ + public static function plugin_deactivation_notice() { + ?> +
+
+ 'wc-addons',
+ 'section' => 'helper',
+ ), admin_url( 'admin.php' )
+ );
+ include WC_Helper::get_view_filename( 'html-helper-compat.php' );
+ }
+}
+
+WC_Helper_Compat::load();
diff --git a/includes/admin/helper/class-wc-helper-options.php b/includes/admin/helper/class-wc-helper-options.php
new file mode 100644
index 00000000000..f0e811d8aeb
--- /dev/null
+++ b/includes/admin/helper/class-wc-helper-options.php
@@ -0,0 +1,54 @@
+slug ) ) {
+ return $response;
+ }
+
+ // Only for slugs that start with woo-
+ if ( 0 !== strpos( $args->slug, 'woocommerce-com-' ) ) {
+ return $response;
+ }
+
+ $clean_slug = str_replace( 'woocommerce-com-', '', $args->slug );
+
+ // Look through update data by slug.
+ $update_data = WC_Helper_Updater::get_update_data();
+ $products = wp_list_filter( $update_data, array( 'slug' => $clean_slug ) );
+
+ if ( empty( $products ) ) {
+ return $response;
+ }
+
+ $product_id = array_keys( $products );
+ $product_id = array_shift( $product_id );
+
+ // Fetch the product information from the Helper API.
+ $request = WC_Helper_API::get(
+ add_query_arg(
+ array(
+ 'product_id' => absint( $product_id ),
+ ), 'info'
+ ), array( 'authenticated' => true )
+ );
+
+ $results = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( ! empty( $results ) ) {
+ $response = (object) $results;
+ }
+
+ return $response;
+ }
+}
+
+WC_Helper_Plugin_Info::load();
diff --git a/includes/admin/helper/class-wc-helper-updater.php b/includes/admin/helper/class-wc-helper-updater.php
new file mode 100644
index 00000000000..c4e6cd27f2a
--- /dev/null
+++ b/includes/admin/helper/class-wc-helper-updater.php
@@ -0,0 +1,322 @@
+ 'woocommerce-com-' . $plugin['_product_id'],
+ 'slug' => 'woocommerce-com-' . $data['slug'],
+ 'plugin' => $filename,
+ 'new_version' => $data['version'],
+ 'url' => $data['url'],
+ 'package' => '',
+ 'upgrade_notice' => $data['upgrade_notice'],
+ );
+
+ if ( self::_has_active_subscription( $plugin['_product_id'] ) ) {
+ $item['package'] = $data['package'];
+ }
+
+ if ( version_compare( $plugin['Version'], $data['version'], '<' ) ) {
+ $transient->response[ $filename ] = (object) $item;
+ unset( $transient->no_update[ $filename ] );
+ } else {
+ $transient->no_update[ $filename ] = (object) $item;
+ unset( $transient->response[ $filename ] );
+ }
+ }
+
+ return $transient;
+ }
+
+ /**
+ * Runs on pre_set_site_transient_update_themes, provides custom
+ * packages for WooCommerce.com-hosted extensions.
+ *
+ * @param object $transient The update_themes transient object.
+ *
+ * @return object The same or a modified version of the transient.
+ */
+ public static function transient_update_themes( $transient ) {
+ $update_data = self::get_update_data();
+
+ foreach ( WC_Helper::get_local_woo_themes() as $theme ) {
+ if ( empty( $update_data[ $theme['_product_id'] ] ) ) {
+ continue;
+ }
+
+ $data = $update_data[ $theme['_product_id'] ];
+ $slug = $theme['_stylesheet'];
+
+ $item = array(
+ 'theme' => $slug,
+ 'new_version' => $data['version'],
+ 'url' => $data['url'],
+ 'package' => '',
+ );
+
+ if ( self::_has_active_subscription( $theme['_product_id'] ) ) {
+ $item['package'] = $data['package'];
+ }
+
+ if ( version_compare( $theme['Version'], $data['version'], '<' ) ) {
+ $transient->response[ $slug ] = $item;
+ } else {
+ unset( $transient->response[ $slug ] );
+ $transient->checked[ $slug ] = $data['version'];
+ }
+ }
+
+ return $transient;
+ }
+
+ /**
+ * Get update data for all extensions.
+ *
+ * Scans through all subscriptions for the connected user, as well
+ * as all Woo extensions without a subscription, and obtains update
+ * data for each product.
+ *
+ * @return array Update data {product_id => data}
+ */
+ public static function get_update_data() {
+ $payload = array();
+
+ // Scan subscriptions.
+ foreach ( WC_Helper::get_subscriptions() as $subscription ) {
+ $payload[ $subscription['product_id'] ] = array(
+ 'product_id' => $subscription['product_id'],
+ 'file_id' => '',
+ );
+ }
+
+ // Scan local plugins which may or may not have a subscription.
+ foreach ( WC_Helper::get_local_woo_plugins() as $data ) {
+ if ( ! isset( $payload[ $data['_product_id'] ] ) ) {
+ $payload[ $data['_product_id'] ] = array(
+ 'product_id' => $data['_product_id'],
+ );
+ }
+
+ $payload[ $data['_product_id'] ]['file_id'] = $data['_file_id'];
+ }
+
+ // Scan local themes
+ foreach ( WC_Helper::get_local_woo_themes() as $data ) {
+ if ( ! isset( $payload[ $data['_product_id'] ] ) ) {
+ $payload[ $data['_product_id'] ] = array(
+ 'product_id' => $data['_product_id'],
+ );
+ }
+
+ $payload[ $data['_product_id'] ]['file_id'] = $data['_file_id'];
+ }
+
+ return self::_update_check( $payload );
+ }
+
+ /**
+ * Run an update check API call.
+ *
+ * The call is cached based on the payload (product ids, file ids). If
+ * the payload changes, the cache is going to miss.
+ *
+ * @return array Update data for each requested product.
+ */
+ private static function _update_check( $payload ) {
+ ksort( $payload );
+ $hash = md5( json_encode( $payload ) );
+
+ $cache_key = '_woocommerce_helper_updates';
+ if ( false !== ( $data = get_transient( $cache_key ) ) ) {
+ if ( hash_equals( $hash, $data['hash'] ) ) {
+ return $data['products'];
+ }
+ }
+
+ $data = array(
+ 'hash' => $hash,
+ 'updated' => time(),
+ 'products' => array(),
+ 'errors' => array(),
+ );
+
+ $request = WC_Helper_API::post(
+ 'update-check', array(
+ 'body' => json_encode( array( 'products' => $payload ) ),
+ 'authenticated' => true,
+ )
+ );
+
+ if ( wp_remote_retrieve_response_code( $request ) !== 200 ) {
+ $data['errors'][] = 'http-error';
+ } else {
+ $data['products'] = json_decode( wp_remote_retrieve_body( $request ), true );
+ }
+
+ set_transient( $cache_key, $data, 12 * HOUR_IN_SECONDS );
+ return $data['products'];
+ }
+
+ /**
+ * Check for an active subscription.
+ *
+ * Checks a given product id against all subscriptions on
+ * the current site. Returns true if at least one active
+ * subscription is found.
+ *
+ * @param int $product_id The product id to look for.
+ *
+ * @return bool True if active subscription found.
+ */
+ private static function _has_active_subscription( $product_id ) {
+ if ( ! isset( $auth ) ) {
+ $auth = WC_Helper_Options::get( 'auth' );
+ }
+
+ if ( ! isset( $subscriptions ) ) {
+ $subscriptions = WC_Helper::get_subscriptions();
+ }
+
+ if ( empty( $auth['site_id'] ) || empty( $subscriptions ) ) {
+ return false;
+ }
+
+ // Check for an active subscription.
+ foreach ( $subscriptions as $subscription ) {
+ if ( $subscription['product_id'] != $product_id ) {
+ continue;
+ }
+
+ if ( in_array( absint( $auth['site_id'] ), $subscription['connections'] ) ) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get the number of products that have updates.
+ *
+ * @return int The number of products with updates.
+ */
+ public static function get_updates_count() {
+ $cache_key = '_woocommerce_helper_updates_count';
+ if ( false !== ( $count = get_transient( $cache_key ) ) ) {
+ return $count;
+ }
+
+ // Don't fetch any new data since this function in high-frequency.
+ if ( ! get_transient( '_woocommerce_helper_subscriptions' ) ) {
+ return 0;
+ }
+
+ if ( ! get_transient( '_woocommerce_helper_updates' ) ) {
+ return 0;
+ }
+
+ $count = 0;
+ $update_data = self::get_update_data();
+
+ if ( empty( $update_data ) ) {
+ set_transient( $cache_key, $count, 12 * HOUR_IN_SECONDS );
+ return $count;
+ }
+
+ // Scan local plugins.
+ foreach ( WC_Helper::get_local_woo_plugins() as $plugin ) {
+ if ( empty( $update_data[ $plugin['_product_id'] ] ) ) {
+ continue;
+ }
+
+ if ( version_compare( $plugin['Version'], $update_data[ $plugin['_product_id'] ]['version'], '<' ) ) {
+ $count++;
+ }
+ }
+
+ // Scan local themes.
+ foreach ( WC_Helper::get_local_woo_themes() as $theme ) {
+ if ( empty( $update_data[ $theme['_product_id'] ] ) ) {
+ continue;
+ }
+
+ if ( version_compare( $theme['Version'], $update_data[ $theme['_product_id'] ]['version'], '<' ) ) {
+ $count++;
+ }
+ }
+
+ set_transient( $cache_key, $count, 12 * HOUR_IN_SECONDS );
+ return $count;
+ }
+
+ /**
+ * Return the updates count markup.
+ *
+ * @return string Updates count markup, empty string if no updates avairable.
+ */
+ public static function get_updates_count_html() {
+ $count = self::get_updates_count();
+ if ( ! $count ) {
+ return '';
+ }
+
+ $count_html = sprintf( '%d', $count, number_format_i18n( $count ) );
+ return $count_html;
+ }
+
+ /**
+ * Flushes cached update data.
+ */
+ public static function flush_updates_cache() {
+ delete_transient( '_woocommerce_helper_updates' );
+ delete_transient( '_woocommerce_helper_updates_count' );
+ delete_site_transient( 'update_plugins' );
+ delete_site_transient( 'update_themes' );
+ }
+
+ /**
+ * Fires when a user successfully updated a theme or a plugin.
+ */
+ public static function upgrader_process_complete() {
+ delete_transient( '_woocommerce_helper_updates_count' );
+ }
+}
+
+WC_Helper_Updater::load();
diff --git a/includes/admin/helper/class-wc-helper.php b/includes/admin/helper/class-wc-helper.php
new file mode 100644
index 00000000000..7f05b4c5be4
--- /dev/null
+++ b/includes/admin/helper/class-wc-helper.php
@@ -0,0 +1,1514 @@
+ 'wc-addons',
+ 'section' => 'helper',
+ 'wc-helper-connect' => 1,
+ 'wc-helper-nonce' => wp_create_nonce( 'connect' ),
+ ), admin_url( 'admin.php' )
+ );
+
+ include self::get_view_filename( 'html-oauth-start.php' );
+ return;
+ }
+ $disconnect_url = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'wc-helper-disconnect' => 1,
+ 'wc-helper-nonce' => wp_create_nonce( 'disconnect' ),
+ ), admin_url( 'admin.php' )
+ );
+
+ $current_filter = self::get_current_filter();
+ $refresh_url = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => $current_filter,
+ 'wc-helper-refresh' => 1,
+ 'wc-helper-nonce' => wp_create_nonce( 'refresh' ),
+ ), admin_url( 'admin.php' )
+ );
+
+ // Installed plugins and themes, with or without an active subscription.
+ $woo_plugins = self::get_local_woo_plugins();
+ $woo_themes = self::get_local_woo_themes();
+
+ $site_id = absint( $auth['site_id'] );
+ $subscriptions = self::get_subscriptions();
+ $updates = WC_Helper_Updater::get_update_data();
+ $subscriptions_product_ids = wp_list_pluck( $subscriptions, 'product_id' );
+
+ foreach ( $subscriptions as &$subscription ) {
+ $subscription['active'] = in_array( $site_id, $subscription['connections'] );
+
+ $subscription['activate_url'] = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => $current_filter,
+ 'wc-helper-activate' => 1,
+ 'wc-helper-product-key' => $subscription['product_key'],
+ 'wc-helper-product-id' => $subscription['product_id'],
+ 'wc-helper-nonce' => wp_create_nonce( 'activate:' . $subscription['product_key'] ),
+ ), admin_url( 'admin.php' )
+ );
+
+ $subscription['deactivate_url'] = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => $current_filter,
+ 'wc-helper-deactivate' => 1,
+ 'wc-helper-product-key' => $subscription['product_key'],
+ 'wc-helper-product-id' => $subscription['product_id'],
+ 'wc-helper-nonce' => wp_create_nonce( 'deactivate:' . $subscription['product_key'] ),
+ ), admin_url( 'admin.php' )
+ );
+
+ $subscription['local'] = array(
+ 'installed' => false,
+ 'active' => false,
+ 'version' => null,
+ );
+
+ $subscription['update_url'] = admin_url( 'update-core.php' );
+
+ $local = wp_list_filter( array_merge( $woo_plugins, $woo_themes ), array( '_product_id' => $subscription['product_id'] ) );
+
+ if ( ! empty( $local ) ) {
+ $local = array_shift( $local );
+ $subscription['local']['installed'] = true;
+ $subscription['local']['version'] = $local['Version'];
+
+ if ( 'plugin' == $local['_type'] ) {
+ if ( is_plugin_active( $local['_filename'] ) ) {
+ $subscription['local']['active'] = true;
+ } elseif ( is_multisite() && is_plugin_active_for_network( $local['_filename'] ) ) {
+ $subscription['local']['active'] = true;
+ }
+
+ // A magic update_url.
+ $subscription['update_url'] = wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $local['_filename'], 'upgrade-plugin_' . $local['_filename'] );
+
+ } elseif ( 'theme' == $local['_type'] ) {
+ if ( in_array( $local['_stylesheet'], array( get_stylesheet(), get_template() ) ) ) {
+ $subscription['local']['active'] = true;
+ }
+
+ // Another magic update_url.
+ $subscription['update_url'] = wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' . $local['_stylesheet'] ), 'upgrade-theme_' . $local['_stylesheet'] );
+ }
+ }
+
+ $subscription['has_update'] = false;
+ if ( $subscription['local']['installed'] && ! empty( $updates[ $subscription['product_id'] ] ) ) {
+ $subscription['has_update'] = version_compare( $updates[ $subscription['product_id'] ]['version'], $subscription['local']['version'], '>' );
+ }
+
+ $subscription['download_primary'] = true;
+ $subscription['download_url'] = $subscription['product_url'];
+ if ( ! $subscription['local']['installed'] && ! empty( $updates[ $subscription['product_id'] ] ) ) {
+ $subscription['download_url'] = $updates[ $subscription['product_id'] ]['package'];
+ }
+
+ $subscription['actions'] = array();
+
+ if ( $subscription['has_update'] && ! $subscription['expired'] ) {
+ $action = array(
+ /* translators: %s: version number */
+ 'message' => sprintf( __( 'Version %s is available.', 'woocommerce' ), esc_html( $updates[ $subscription['product_id'] ]['version'] ) ),
+ 'button_label' => __( 'Update', 'woocommerce' ),
+ 'button_url' => $subscription['update_url'],
+ 'status' => 'update-available',
+ 'icon' => 'dashicons-update',
+ );
+
+ // Subscription is not active on this site.
+ if ( ! $subscription['active'] ) {
+ $action['message'] .= ' ' . __( 'To enable this update you need to activate this subscription.', 'woocommerce' );
+ $action['button_label'] = null;
+ $action['button_url'] = null;
+ }
+
+ $subscription['actions'][] = $action;
+ }
+
+ if ( $subscription['has_update'] && $subscription['expired'] ) {
+ $action = array(
+ /* translators: %s: version number */
+ 'message' => sprintf( __( 'Version %s is available.', 'woocommerce' ), esc_html( $updates[ $subscription['product_id'] ]['version'] ) ),
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $action['message'] .= ' ' . __( 'To enable this update you need to purchase a new subscription.', 'woocommerce' );
+ $action['button_label'] = __( 'Purchase', 'woocommerce' );
+ $action['button_url'] = $subscription['product_url'];
+
+ $subscription['actions'][] = $action;
+ } elseif ( $subscription['expired'] && ! empty( $subscription['master_user_email'] ) ) {
+ $action = array(
+ 'message' => sprintf( __( 'This subscription has expired. Contact the owner to renew the subscription to receive updates and support.', 'woocommerce' ) ),
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $subscription['actions'][] = $action;
+ } elseif ( $subscription['expired'] ) {
+ $action = array(
+ 'message' => sprintf( __( 'This subscription has expired. Please renew to receive updates and support.', 'woocommerce' ) ),
+ 'button_label' => __( 'Renew', 'woocommerce' ),
+ 'button_url' => 'https://woocommerce.com/my-account/my-subscriptions/',
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $subscription['actions'][] = $action;
+ }
+
+ if ( $subscription['expiring'] && ! $subscription['autorenew'] ) {
+ $action = array(
+ 'message' => __( 'Subscription is expiring soon.', 'woocommerce' ),
+ 'button_label' => __( 'Enable auto-renew', 'woocommerce' ),
+ 'button_url' => 'https://woocommerce.com/my-account/my-subscriptions/',
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $subscription['download_primary'] = false;
+ $subscription['actions'][] = $action;
+ } elseif ( $subscription['expiring'] ) {
+ $action = array(
+ 'message' => sprintf( __( 'This subscription is expiring soon. Please renew to continue receiving updates and support.', 'woocommerce' ) ),
+ 'button_label' => __( 'Renew', 'woocommerce' ),
+ 'button_url' => 'https://woocommerce.com/my-account/my-subscriptions/',
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $subscription['download_primary'] = false;
+ $subscription['actions'][] = $action;
+ }
+
+ // Mark the first action primary.
+ foreach ( $subscription['actions'] as $key => $action ) {
+ if ( ! empty( $action['button_label'] ) ) {
+ $subscription['actions'][ $key ]['primary'] = true;
+ break;
+ }
+ }
+ }
+
+ // Break the by-ref.
+ unset( $subscription );
+
+ // Installed products without a subscription.
+ $no_subscriptions = array();
+ foreach ( array_merge( $woo_plugins, $woo_themes ) as $filename => $data ) {
+ if ( in_array( $data['_product_id'], $subscriptions_product_ids ) ) {
+ continue;
+ }
+
+ $data['_product_url'] = '#';
+ $data['_has_update'] = false;
+
+ if ( ! empty( $updates[ $data['_product_id'] ] ) ) {
+ $data['_has_update'] = version_compare( $updates[ $data['_product_id'] ]['version'], $data['Version'], '>' );
+
+ if ( ! empty( $updates[ $data['_product_id'] ]['url'] ) ) {
+ $data['_product_url'] = $updates[ $data['_product_id'] ]['url'];
+ } elseif ( ! empty( $data['PluginURI'] ) ) {
+ $data['_product_url'] = $data['PluginURI'];
+ }
+ }
+
+ $data['_actions'] = array();
+
+ if ( $data['_has_update'] ) {
+ $action = array(
+ 'message' => sprintf( __( 'Version %s is available. To enable this update you need to purchase a new subscription.', 'woocommerce' ), esc_html( $updates[ $data['_product_id'] ]['version'] ) ),
+ 'button_label' => __( 'Purchase', 'woocommerce' ),
+ 'button_url' => $data['_product_url'],
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $data['_actions'][] = $action;
+ } else {
+ $action = array(
+ /* translators: 1: subscriptions docs 2: subscriptions docs */
+ 'message' => sprintf( __( 'To receive updates and support for this extension, you need to purchase a new subscription or consolidate your extensions to one connected account by sharing or transferring this extension to this connected account.', 'woocommerce' ), 'https://docs.woocommerce.com/document/managing-woocommerce-com-subscriptions/#section-10', 'https://docs.woocommerce.com/document/managing-woocommerce-com-subscriptions/#section-5' ),
+ 'button_label' => __( 'Purchase', 'woocommerce' ),
+ 'button_url' => $data['_product_url'],
+ 'status' => 'expired',
+ 'icon' => 'dashicons-info',
+ );
+
+ $data['_actions'][] = $action;
+ }
+
+ $no_subscriptions[ $filename ] = $data;
+ }
+
+ // Update the user id if it came from a migrated connection.
+ if ( empty( $auth['user_id'] ) ) {
+ $auth['user_id'] = get_current_user_id();
+ WC_Helper_Options::update( 'auth', $auth );
+ }
+
+ // Sort alphabetically
+ uasort( $subscriptions, array( __CLASS__, '_sort_by_product_name' ) );
+ uasort( $no_subscriptions, array( __CLASS__, '_sort_by_name' ) );
+
+ // Filters
+ self::get_filters_counts( $subscriptions ); // Warm it up.
+ self::_filter( $subscriptions, self::get_current_filter() );
+
+ // We have an active connection.
+ include self::get_view_filename( 'html-main.php' );
+ return;
+ }
+
+ /**
+ * Get available subscriptions filters.
+ *
+ * @return array An array of filter keys and labels.
+ */
+ public static function get_filters() {
+ $filters = array(
+ 'all' => __( 'All', 'woocommerce' ),
+ 'active' => __( 'Active', 'woocommerce' ),
+ 'inactive' => __( 'Inactive', 'woocommerce' ),
+ 'installed' => __( 'Installed', 'woocommerce' ),
+ 'update-available' => __( 'Update Available', 'woocommerce' ),
+ 'expiring' => __( 'Expiring Soon', 'woocommerce' ),
+ 'expired' => __( 'Expired', 'woocommerce' ),
+ 'download' => __( 'Download', 'woocommerce' ),
+ );
+
+ return $filters;
+ }
+
+ /**
+ * Get counts data for the filters array.
+ *
+ * @param array $subscriptions The array of all available subscriptions.
+ *
+ * @return array Filter counts (filter => count)
+ */
+ public static function get_filters_counts( $subscriptions = null ) {
+ static $filters;
+
+ if ( isset( $filters ) ) {
+ return $filters;
+ }
+
+ $filters = array_fill_keys( array_keys( self::get_filters() ), 0 );
+ if ( empty( $subscriptions ) ) {
+ return array();
+ }
+
+ foreach ( $filters as $key => $count ) {
+ $_subs = $subscriptions;
+ self::_filter( $_subs, $key );
+ $filters[ $key ] = count( $_subs );
+ }
+
+ return $filters;
+ }
+
+ /**
+ * Get current filter.
+ *
+ * @return string The current filter.
+ */
+ public static function get_current_filter() {
+ $current_filter = 'all';
+ $valid_filters = array_keys( self::get_filters() );
+
+ if ( ! empty( $_GET['filter'] ) && in_array( $_GET['filter'], $valid_filters ) ) {
+ $current_filter = $_GET['filter'];
+ }
+
+ return $current_filter;
+ }
+
+ /**
+ * Filter an array of subscriptions by $filter.
+ *
+ * @param array $subscriptions The subscriptions array, passed by ref.
+ * @param string $filter The filter.
+ */
+ private static function _filter( &$subscriptions, $filter ) {
+ switch ( $filter ) {
+ case 'active':
+ $subscriptions = wp_list_filter( $subscriptions, array( 'active' => true ) );
+ break;
+
+ case 'inactive':
+ $subscriptions = wp_list_filter( $subscriptions, array( 'active' => false ) );
+ break;
+
+ case 'installed':
+ foreach ( $subscriptions as $key => $subscription ) {
+ if ( empty( $subscription['local']['installed'] ) ) {
+ unset( $subscriptions[ $key ] );
+ }
+ }
+ break;
+
+ case 'update-available':
+ $subscriptions = wp_list_filter( $subscriptions, array( 'has_update' => true ) );
+ break;
+
+ case 'expiring':
+ $subscriptions = wp_list_filter( $subscriptions, array( 'expiring' => true ) );
+ break;
+
+ case 'expired':
+ $subscriptions = wp_list_filter( $subscriptions, array( 'expired' => true ) );
+ break;
+
+ case 'download':
+ foreach ( $subscriptions as $key => $subscription ) {
+ if ( $subscription['local']['installed'] || $subscription['expired'] ) {
+ unset( $subscriptions[ $key ] );
+ }
+ }
+ break;
+ }
+ }
+
+ /**
+ * Enqueue admin scripts and styles.
+ */
+ public static function admin_enqueue_scripts() {
+ $screen = get_current_screen();
+ $screen_id = $screen ? $screen->id : '';
+ $wc_screen_id = sanitize_title( __( 'WooCommerce', 'woocommerce' ) );
+
+ if ( $wc_screen_id . '_page_wc-addons' === $screen_id && isset( $_GET['section'] ) && 'helper' === $_GET['section'] ) {
+ wp_enqueue_style( 'woocommerce-helper', WC()->plugin_url() . '/assets/css/helper.css', array(), WC_VERSION );
+ }
+ }
+
+ /**
+ * Various success/error notices.
+ *
+ * Runs during admin page render, so no headers/redirects here.
+ *
+ * @return array Array pairs of message/type strings with notices.
+ */
+ private static function _get_return_notices() {
+ $return_status = isset( $_GET['wc-helper-status'] ) ? $_GET['wc-helper-status'] : null;
+ $notices = array();
+
+ switch ( $return_status ) {
+ case 'activate-success':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $notices[] = array(
+ 'type' => 'updated',
+ /* translators: %s: product name */
+ 'message' => sprintf(
+ __( '%s activated successfully. You will now receive updates for this product.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . ''
+ ),
+ );
+ break;
+
+ case 'activate-error':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $notices[] = array(
+ 'type' => 'error',
+ /* translators: %s: product name */
+ 'message' => sprintf(
+ __( 'An error has occurred when activating %s. Please try again later.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . ''
+ ),
+ );
+ break;
+
+ case 'deactivate-success':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $local = self::_get_local_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+
+ /* translators: %s: product name */
+ $message = sprintf(
+ __( 'Subscription for %s deactivated successfully. You will no longer receive updates for this product.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . ''
+ );
+
+ if ( $local && is_plugin_active( $local['_filename'] ) && current_user_can( 'activate_plugins' ) ) {
+ $deactivate_plugin_url = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => self::get_current_filter(),
+ 'wc-helper-deactivate-plugin' => 1,
+ 'wc-helper-product-id' => $subscription['product_id'],
+ 'wc-helper-nonce' => wp_create_nonce( 'deactivate-plugin:' . $subscription['product_id'] ),
+ ), admin_url( 'admin.php' )
+ );
+
+ /* translators: %1$s: product name, %2$s: deactivate url */
+ $message = sprintf(
+ __( 'Subscription for %1$s deactivated successfully. You will no longer receive updates for this product. Click here if you wish to deactivate the plugin as well.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . '', esc_url( $deactivate_plugin_url )
+ );
+ }
+
+ $notices[] = array(
+ 'message' => $message,
+ 'type' => 'updated',
+ );
+ break;
+
+ case 'deactivate-error':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $notices[] = array(
+ 'type' => 'error',
+ /* translators: %s: product name */
+ 'message' => sprintf(
+ __( 'An error has occurred when deactivating the subscription for %s. Please try again later.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . ''
+ ),
+ );
+ break;
+
+ case 'deactivate-plugin-success':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $notices[] = array(
+ 'type' => 'updated',
+ /* translators: %s: product name */
+ 'message' => sprintf(
+ __( 'The extension %s has been deactivated successfully.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . ''
+ ),
+ );
+ break;
+
+ case 'deactivate-plugin-error':
+ $subscription = self::_get_subscriptions_from_product_id( absint( $_GET['wc-helper-product-id'] ) );
+ $notices[] = array(
+ 'type' => 'error',
+ /* translators: %1$s: product name, %2$s: plugins screen url */
+ 'message' => sprintf(
+ __( 'An error has occurred when deactivating the extension %1$s. Please proceed to the Plugins screen to deactivate it manually.', 'woocommerce' ),
+ '' . esc_html( $subscription['product_name'] ) . '', admin_url( 'plugins.php' )
+ ),
+ );
+ break;
+
+ case 'helper-connected':
+ $notices[] = array(
+ 'message' => __( 'You have successfully connected your store to WooCommerce.com', 'woocommerce' ),
+ 'type' => 'updated',
+ );
+ break;
+
+ case 'helper-disconnected':
+ $notices[] = array(
+ 'message' => __( 'You have successfully disconnected your store from WooCommerce.com', 'woocommerce' ),
+ 'type' => 'updated',
+ );
+ break;
+
+ case 'helper-refreshed':
+ $notices[] = array(
+ 'message' => __( 'Authentication and subscription caches refreshed successfully.', 'woocommerce' ),
+ 'type' => 'updated',
+ );
+ break;
+ }
+
+ return $notices;
+ }
+
+ /**
+ * Various early-phase actions with possible redirects.
+ */
+ public static function current_screen( $screen ) {
+ $wc_screen_id = sanitize_title( __( 'WooCommerce', 'woocommerce' ) );
+
+ if ( $wc_screen_id . '_page_wc-addons' !== $screen->id ) {
+ return;
+ }
+
+ if ( empty( $_GET['section'] ) || 'helper' !== $_GET['section'] ) {
+ return;
+ }
+
+ if ( ! empty( $_GET['wc-helper-connect'] ) ) {
+ return self::_helper_auth_connect();
+ }
+
+ if ( ! empty( $_GET['wc-helper-return'] ) ) {
+ return self::_helper_auth_return();
+ }
+
+ if ( ! empty( $_GET['wc-helper-disconnect'] ) ) {
+ return self::_helper_auth_disconnect();
+ }
+
+ if ( ! empty( $_GET['wc-helper-refresh'] ) ) {
+ return self::_helper_auth_refresh();
+ }
+
+ if ( ! empty( $_GET['wc-helper-activate'] ) ) {
+ return self::_helper_subscription_activate();
+ }
+
+ if ( ! empty( $_GET['wc-helper-deactivate'] ) ) {
+ return self::_helper_subscription_deactivate();
+ }
+
+ if ( ! empty( $_GET['wc-helper-deactivate-plugin'] ) ) {
+ return self::_helper_plugin_deactivate();
+ }
+ }
+
+ /**
+ * Initiate a new OAuth connection.
+ */
+ private static function _helper_auth_connect() {
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'connect' ) ) {
+ self::log( 'Could not verify nonce in _helper_auth_connect' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'wc-helper-return' => 1,
+ 'wc-helper-nonce' => wp_create_nonce( 'connect' ),
+ ), admin_url( 'admin.php' )
+ );
+
+ $request = WC_Helper_API::post(
+ 'oauth/request_token', array(
+ 'body' => array(
+ 'home_url' => home_url(),
+ 'redirect_uri' => $redirect_uri,
+ ),
+ )
+ );
+
+ $code = wp_remote_retrieve_response_code( $request );
+
+ if ( 200 !== $code ) {
+ self::log( sprintf( 'Call to oauth/request_token returned a non-200 response code (%d)', $code ) );
+ wp_die( 'Something went wrong' );
+ }
+
+ $secret = json_decode( wp_remote_retrieve_body( $request ) );
+ if ( empty( $secret ) ) {
+ self::log( sprintf( 'Call to oauth/request_token returned an invalid body: %s', wp_remote_retrieve_body( $request ) ) );
+ wp_die( 'Something went wrong' );
+ }
+
+ $connect_url = add_query_arg(
+ array(
+ 'home_url' => rawurlencode( home_url() ),
+ 'redirect_uri' => rawurlencode( $redirect_uri ),
+ 'secret' => rawurlencode( $secret ),
+ ), WC_Helper_API::url( 'oauth/authorize' )
+ );
+
+ wp_redirect( esc_url_raw( $connect_url ) );
+ die();
+ }
+
+ /**
+ * Return from WooCommerce.com OAuth flow.
+ */
+ private static function _helper_auth_return() {
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'connect' ) ) {
+ self::log( 'Could not verify nonce in _helper_auth_return' );
+ wp_die( 'Something went wrong' );
+ }
+
+ // Bail if the user clicked deny.
+ if ( ! empty( $_GET['deny'] ) ) {
+ wp_safe_redirect( admin_url( 'admin.php?page=wc-addons§ion=helper' ) );
+ die();
+ }
+
+ // We do need a request token...
+ if ( empty( $_GET['request_token'] ) ) {
+ self::log( 'Request token not found in _helper_auth_return' );
+ wp_die( 'Something went wrong' );
+ }
+
+ // Obtain an access token.
+ $request = WC_Helper_API::post(
+ 'oauth/access_token', array(
+ 'body' => array(
+ 'request_token' => $_GET['request_token'],
+ 'home_url' => home_url(),
+ ),
+ )
+ );
+
+ $code = wp_remote_retrieve_response_code( $request );
+
+ if ( 200 !== $code ) {
+ self::log( sprintf( 'Call to oauth/access_token returned a non-200 response code (%d)', $code ) );
+ wp_die( 'Something went wrong' );
+ }
+
+ $access_token = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( ! $access_token ) {
+ self::log( sprintf( 'Call to oauth/access_token returned an invalid body: %s', wp_remote_retrieve_body( $request ) ) );
+ wp_die( 'Something went wrong' );
+ }
+
+ WC_Helper_Options::update(
+ 'auth', array(
+ 'access_token' => $access_token['access_token'],
+ 'access_token_secret' => $access_token['access_token_secret'],
+ 'site_id' => $access_token['site_id'],
+ 'user_id' => get_current_user_id(),
+ 'updated' => time(),
+ )
+ );
+
+ // Obtain the connected user info.
+ if ( ! self::_flush_authentication_cache() ) {
+ self::log( 'Could not obtain connected user info in _helper_auth_return' );
+ WC_Helper_Options::update( 'auth', array() );
+ wp_die( 'Something went wrong.' );
+ }
+
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+
+ // Enable tracking when connected.
+ if ( class_exists( 'WC_Tracker' ) ) {
+ update_option( 'woocommerce_allow_tracking', 'yes' );
+ WC_Tracker::send_tracking_data( true );
+ }
+
+ wp_safe_redirect(
+ add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'wc-helper-status' => 'helper-connected',
+ ), admin_url( 'admin.php' )
+ )
+ );
+ die();
+ }
+
+ /**
+ * Disconnect from WooCommerce.com, clear OAuth tokens.
+ */
+ private static function _helper_auth_disconnect() {
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'disconnect' ) ) {
+ self::log( 'Could not verify nonce in _helper_auth_disconnect' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'wc-helper-status' => 'helper-disconnected',
+ ), admin_url( 'admin.php' )
+ );
+
+ WC_Helper_API::post(
+ 'oauth/invalidate_token', array(
+ 'authenticated' => true,
+ )
+ );
+
+ WC_Helper_Options::update( 'auth', array() );
+ WC_Helper_Options::update( 'auth_user_data', array() );
+
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+
+ // Disable tracking when disconnected.
+ update_option( 'woocommerce_allow_tracking', 'no' );
+
+ wp_safe_redirect( $redirect_uri );
+ die();
+ }
+
+ /**
+ * User hit the Refresh button, clear all caches.
+ */
+ private static function _helper_auth_refresh() {
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'refresh' ) ) {
+ self::log( 'Could not verify nonce in _helper_auth_refresh' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => self::get_current_filter(),
+ 'wc-helper-status' => 'helper-refreshed',
+ ), admin_url( 'admin.php' )
+ );
+
+ self::_flush_authentication_cache();
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+
+ wp_safe_redirect( $redirect_uri );
+ die();
+ }
+
+ /**
+ * Active a product subscription.
+ */
+ private static function _helper_subscription_activate() {
+ $product_key = $_GET['wc-helper-product-key'];
+ $product_id = absint( $_GET['wc-helper-product-id'] );
+
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'activate:' . $product_key ) ) {
+ self::log( 'Could not verify nonce in _helper_subscription_activate' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ $request = WC_Helper_API::post(
+ 'activate', array(
+ 'authenticated' => true,
+ 'body' => json_encode(
+ array(
+ 'product_key' => $product_key,
+ )
+ ),
+ )
+ );
+
+ $activated = wp_remote_retrieve_response_code( $request ) === 200;
+ $body = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( ! $activated && ! empty( $body['code'] ) && 'already_connected' == $body['code'] ) {
+ $activated = true;
+ }
+
+ // Attempt to activate this plugin.
+ $local = self::_get_local_from_product_id( $product_id );
+ if ( $local && 'plugin' == $local['_type'] && current_user_can( 'activate_plugins' ) && ! is_plugin_active( $local['_filename'] ) ) {
+ activate_plugin( $local['_filename'] );
+ }
+
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => self::get_current_filter(),
+ 'wc-helper-status' => $activated ? 'activate-success' : 'activate-error',
+ 'wc-helper-product-id' => $product_id,
+ ), admin_url( 'admin.php' )
+ );
+
+ wp_safe_redirect( $redirect_uri );
+ die();
+ }
+
+ /**
+ * Deactivate a product subscription.
+ */
+ private static function _helper_subscription_deactivate() {
+ $product_key = $_GET['wc-helper-product-key'];
+ $product_id = absint( $_GET['wc-helper-product-id'] );
+
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'deactivate:' . $product_key ) ) {
+ self::log( 'Could not verify nonce in _helper_subscription_deactivate' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ $request = WC_Helper_API::post(
+ 'deactivate', array(
+ 'authenticated' => true,
+ 'body' => json_encode(
+ array(
+ 'product_key' => $product_key,
+ )
+ ),
+ )
+ );
+
+ $code = wp_remote_retrieve_response_code( $request );
+ $deactivated = 200 === $code;
+ if ( ! $deactivated ) {
+ self::log( sprintf( 'Deactivate API call returned a non-200 response code (%d)', $code ) );
+ }
+
+ self::_flush_subscriptions_cache();
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => self::get_current_filter(),
+ 'wc-helper-status' => $deactivated ? 'deactivate-success' : 'deactivate-error',
+ 'wc-helper-product-id' => $product_id,
+ ), admin_url( 'admin.php' )
+ );
+
+ wp_safe_redirect( $redirect_uri );
+ die();
+ }
+
+ /**
+ * Deactivate a plugin.
+ */
+ private static function _helper_plugin_deactivate() {
+ $product_id = absint( $_GET['wc-helper-product-id'] );
+ $deactivated = false;
+
+ if ( empty( $_GET['wc-helper-nonce'] ) || ! wp_verify_nonce( $_GET['wc-helper-nonce'], 'deactivate-plugin:' . $product_id ) ) {
+ self::log( 'Could not verify nonce in _helper_plugin_deactivate' );
+ wp_die( 'Could not verify nonce' );
+ }
+
+ if ( ! current_user_can( 'activate_plugins' ) ) {
+ wp_die( 'You are not allowed to manage plugins on this site.' );
+ }
+
+ $local = wp_list_filter(
+ array_merge(
+ self::get_local_woo_plugins(),
+ self::get_local_woo_themes()
+ ), array( '_product_id' => $product_id )
+ );
+
+ // Attempt to deactivate this plugin or theme.
+ if ( ! empty( $local ) ) {
+ $local = array_shift( $local );
+ if ( is_plugin_active( $local['_filename'] ) ) {
+ deactivate_plugins( $local['_filename'] );
+ }
+
+ $deactivated = ! is_plugin_active( $local['_filename'] );
+ }
+
+ $redirect_uri = add_query_arg(
+ array(
+ 'page' => 'wc-addons',
+ 'section' => 'helper',
+ 'filter' => self::get_current_filter(),
+ 'wc-helper-status' => $deactivated ? 'deactivate-plugin-success' : 'deactivate-plugin-error',
+ 'wc-helper-product-id' => $product_id,
+ ), admin_url( 'admin.php' )
+ );
+
+ wp_safe_redirect( $redirect_uri );
+ die();
+ }
+
+ /**
+ * Get a local plugin/theme entry from product_id.
+ *
+ * @param int $product_id The product id.
+ *
+ * @return array|bool The array containing the local plugin/theme data or false.
+ */
+ private static function _get_local_from_product_id( $product_id ) {
+ $local = wp_list_filter(
+ array_merge(
+ self::get_local_woo_plugins(),
+ self::get_local_woo_themes()
+ ), array( '_product_id' => $product_id )
+ );
+
+ if ( ! empty( $local ) ) {
+ return array_shift( $local );
+ }
+
+ return false;
+ }
+
+ /**
+ * 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
+ * first one in the list, so you can use this method to get things like extension
+ * name, version, etc.
+ *
+ * @param int $product_id The product id.
+ * @param bool $single Whether to return a single subscription or all matching a product id.
+ *
+ * @return array|bool The array containing sub data or false.
+ */
+ private static function _get_subscriptions_from_product_id( $product_id, $single = true ) {
+ $subscriptions = wp_list_filter( self::get_subscriptions(), array( 'product_id' => $product_id ) );
+ if ( ! empty( $subscriptions ) ) {
+ return $single ? array_shift( $subscriptions ) : $subscriptions;
+ }
+
+ return false;
+ }
+
+ /**
+ * Additional theme style.css and plugin file headers.
+ *
+ * Format: Woo: product_id:file_id
+ */
+ public static function extra_headers( $headers ) {
+ $headers[] = 'Woo';
+ return $headers;
+ }
+
+ /**
+ * Obtain a list of locally installed Woo extensions.
+ */
+ public static function get_local_woo_plugins() {
+ if ( ! function_exists( 'get_plugins' ) ) {
+ require_once ABSPATH . 'wp-admin/includes/plugin.php';
+ }
+
+ $plugins = get_plugins();
+ $woo_plugins = array();
+
+ // Backwards compatibility for woothemes_queue_update().
+ $_compat = array();
+ if ( ! empty( $GLOBALS['woothemes_queued_updates'] ) ) {
+ foreach ( $GLOBALS['woothemes_queued_updates'] as $_compat_plugin ) {
+ $_compat[ $_compat_plugin->file ] = array(
+ 'product_id' => $_compat_plugin->product_id,
+ 'file_id' => $_compat_plugin->file_id,
+ );
+ }
+ }
+
+ foreach ( $plugins as $filename => $data ) {
+ if ( empty( $data['Woo'] ) && ! empty( $_compat[ $filename ] ) ) {
+ $data['Woo'] = sprintf( '%d:%s', $_compat[ $filename ]['product_id'], $_compat[ $filename ]['file_id'] );
+ }
+
+ if ( empty( $data['Woo'] ) ) {
+ continue;
+ }
+
+ list( $product_id, $file_id ) = explode( ':', $data['Woo'] );
+ if ( empty( $product_id ) || empty( $file_id ) ) {
+ continue;
+ }
+
+ $data['_filename'] = $filename;
+ $data['_product_id'] = absint( $product_id );
+ $data['_file_id'] = $file_id;
+ $data['_type'] = 'plugin';
+ $woo_plugins[ $filename ] = $data;
+ }
+
+ return $woo_plugins;
+ }
+
+ /**
+ * Get locally installed Woo themes.
+ */
+ public static function get_local_woo_themes() {
+ $themes = wp_get_themes();
+ $woo_themes = array();
+
+ foreach ( $themes as $theme ) {
+ $header = $theme->get( 'Woo' );
+
+ // Backwards compatibility for theme_info.txt
+ if ( ! $header ) {
+ $txt = $theme->get_stylesheet_directory() . '/theme_info.txt';
+ if ( is_readable( $txt ) ) {
+ $txt = file_get_contents( $txt );
+ $txt = preg_split( '#\s#', $txt );
+ if ( count( $txt ) >= 2 ) {
+ $header = sprintf( '%d:%s', $txt[0], $txt[1] );
+ }
+ }
+ }
+
+ if ( empty( $header ) ) {
+ continue;
+ }
+
+ list( $product_id, $file_id ) = explode( ':', $header );
+ if ( empty( $product_id ) || empty( $file_id ) ) {
+ continue;
+ }
+
+ $data = array(
+ 'Name' => $theme->get( 'Name' ),
+ 'Version' => $theme->get( 'Version' ),
+ 'Woo' => $header,
+
+ '_filename' => $theme->get_stylesheet() . '/style.css',
+ '_stylesheet' => $theme->get_stylesheet(),
+ '_product_id' => absint( $product_id ),
+ '_file_id' => $file_id,
+ '_type' => 'theme',
+ );
+
+ $woo_themes[ $data['_filename'] ] = $data;
+ }
+
+ return $woo_themes;
+ }
+
+ /**
+ * Get the connected user's subscriptions.
+ *
+ * @return array
+ */
+ public static function get_subscriptions() {
+ $cache_key = '_woocommerce_helper_subscriptions';
+ if ( false !== ( $data = get_transient( $cache_key ) ) ) {
+ return $data;
+ }
+
+ // Obtain the connected user info.
+ $request = WC_Helper_API::get(
+ 'subscriptions', array(
+ 'authenticated' => true,
+ )
+ );
+
+ 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;
+ }
+
+ /**
+ * Runs when any plugin is activated.
+ *
+ * Depending on the activated plugin attempts to look through available
+ * subscriptions and auto-activate one if possible, so the user does not
+ * need to visit the Helper UI at all after installing a new extension.
+ *
+ * @param string $filename The filename of the activated plugin.
+ */
+ public static function activated_plugin( $filename ) {
+ $plugins = self::get_local_woo_plugins();
+
+ // Not a local woo plugin
+ if ( empty( $plugins[ $filename ] ) ) {
+ return;
+ }
+
+ // Make sure we have a connection.
+ $auth = WC_Helper_Options::get( 'auth' );
+ if ( empty( $auth ) ) {
+ return;
+ }
+
+ $plugin = $plugins[ $filename ];
+ $subscriptions = self::_get_subscriptions_from_product_id( $plugin['_product_id'], false );
+
+ // No valid subscriptions for this product
+ if ( empty( $subscriptions ) ) {
+ return;
+ }
+
+ $subscription = null;
+ foreach ( $subscriptions as $_sub ) {
+
+ // Don't attempt to activate expired subscriptions.
+ if ( $_sub['expired'] ) {
+ continue;
+ }
+
+ // No more sites available in this subscription.
+ if ( $_sub['sites_max'] && $_sub['sites_active'] >= $_sub['sites_max'] ) {
+ continue;
+ }
+
+ // Looks good.
+ $subscription = $_sub;
+ break;
+ }
+
+ // No valid subscription found.
+ if ( ! $subscription ) {
+ return;
+ }
+
+ $request = WC_Helper_API::post(
+ 'activate', array(
+ 'authenticated' => true,
+ 'body' => json_encode(
+ array(
+ 'product_key' => $subscription['product_key'],
+ )
+ ),
+ )
+ );
+
+ $activated = wp_remote_retrieve_response_code( $request ) === 200;
+ $body = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( ! $activated && ! empty( $body['code'] ) && 'already_connected' == $body['code'] ) {
+ $activated = true;
+ }
+
+ if ( ! $activated ) {
+ self::log( 'Could not activate a subscription upon plugin activation: ' . $filename );
+ return;
+ }
+
+ self::log( 'Auto-activated a subscription for ' . $filename );
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+ }
+
+ /**
+ * Runs when any plugin is deactivated.
+ *
+ * When a user deactivates a plugin, attempt to deactivate any subscriptions
+ * associated with the extension.
+ *
+ * @param string $filename The filename of the deactivated plugin.
+ */
+ public static function deactivated_plugin( $filename ) {
+ $plugins = self::get_local_woo_plugins();
+
+ // Not a local woo plugin
+ if ( empty( $plugins[ $filename ] ) ) {
+ return;
+ }
+
+ // Make sure we have a connection.
+ $auth = WC_Helper_Options::get( 'auth' );
+ if ( empty( $auth ) ) {
+ return;
+ }
+
+ $plugin = $plugins[ $filename ];
+ $subscriptions = self::_get_subscriptions_from_product_id( $plugin['_product_id'], false );
+ $site_id = absint( $auth['site_id'] );
+
+ // No valid subscriptions for this product
+ if ( empty( $subscriptions ) ) {
+ return;
+ }
+
+ $deactivated = 0;
+
+ foreach ( $subscriptions as $subscription ) {
+ // Don't touch subscriptions that aren't activated on this site.
+ if ( ! in_array( $site_id, $subscription['connections'] ) ) {
+ continue;
+ }
+
+ $request = WC_Helper_API::post(
+ 'deactivate', array(
+ 'authenticated' => true,
+ 'body' => json_encode(
+ array(
+ 'product_key' => $subscription['product_key'],
+ )
+ ),
+ )
+ );
+
+ if ( wp_remote_retrieve_response_code( $request ) === 200 ) {
+ $deactivated++;
+ }
+ }
+
+ if ( $deactivated ) {
+ self::log( sprintf( 'Auto-deactivated %d subscription(s) for %s', $deactivated, $filename ) );
+ self::_flush_subscriptions_cache();
+ self::_flush_updates_cache();
+ }
+ }
+
+ /**
+ * Various Helper-related admin notices.
+ */
+ public static function admin_notices() {
+ if ( apply_filters( 'woocommerce_helper_suppress_admin_notices', false ) ) {
+ return;
+ }
+
+ $screen = get_current_screen();
+ $screen_id = $screen ? $screen->id : '';
+
+ self::_prompt_helper_connect( $screen_id );
+
+ if ( 'update-core' !== $screen_id ) {
+ return;
+ }
+
+ // Don't nag if Woo doesn't have an update available.
+ if ( ! self::_woo_core_update_available() ) {
+ return;
+ }
+
+ // Add a note about available extension updates if Woo core has an update available.
+ $notice = self::_get_extensions_update_notice();
+ if ( ! empty( $notice ) ) {
+ echo '';
+ }
+ }
+
+ /**
+ * Prompt a Helper connection if the user has WooCommerce.com extensions.
+ *
+ * @param string $screen_id Current screen ID.
+ */
+ private static function _prompt_helper_connect( $screen_id ) {
+ if ( apply_filters( 'woocommerce_helper_suppress_connect_notice', false ) ) {
+ return;
+ }
+
+ $screens = wc_get_screen_ids();
+ $screens[] = 'plugins';
+
+ if ( ! in_array( $screen_id, $screens, true ) ) {
+ return;
+ }
+
+ // Don't show the notice on the Helper screens.
+ $screen_addons = sanitize_title( __( 'WooCommerce', 'woocommerce' ) ) . '_page_wc-addons';
+
+ if ( $screen_addons === $screen_id && ! empty( $_REQUEST['section'] ) && 'helper' === $_REQUEST['section'] ) {
+ return;
+ }
+
+ // We believe we have an active connection.
+ $auth = WC_Helper_Options::get( 'auth' );
+ if ( ! empty( $auth['access_token'] ) ) {
+ return;
+ }
+
+ $active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
+ if ( empty( $active_plugins ) ) {
+ return;
+ }
+
+ $woo_plugins = self::get_local_woo_plugins();
+ if ( empty( $woo_plugins ) ) {
+ return;
+ }
+
+ $active_woo_plugins = array_intersect_key( $woo_plugins, array_flip( $active_plugins ) );
+
+ if ( count( $active_woo_plugins ) > 0 ) {
+ /* translators: %s: helper screen url */
+ $notice = __( 'Connect your store to WooCommerce.com to receive extensions updates and support.', 'woocommerce' );
+ $notice = sprintf( $notice, admin_url( 'admin.php?page=wc-addons§ion=helper' ) );
+ echo '';
+ }
+ }
+
+ /**
+ * Get an update notice if one or more Woo extensions has an update available.
+ *
+ * @return string|null The update notice or null if everything is up to date.
+ */
+ private static function _get_extensions_update_notice() {
+ $plugins = self::get_local_woo_plugins();
+ $updates = WC_Helper_Updater::get_update_data();
+ $available = 0;
+
+ foreach ( $plugins as $data ) {
+ if ( empty( $updates[ $data['_product_id'] ] ) ) {
+ continue;
+ }
+
+ $product_id = $data['_product_id'];
+ if ( version_compare( $updates[ $product_id ]['version'], $data['Version'], '>' ) ) {
+ $available++;
+ }
+ }
+
+ if ( ! $available ) {
+ return;
+ }
+
+ /* translators: %1$s: helper url, %2$d: number of extensions */
+ return sprintf(
+ _n( 'Note: You currently have %2$d paid extension which should be updated first before updating WooCommerce.', 'Note: You currently have %2$d paid extensions which should be updated first before updating WooCommerce.', $available, 'woocommerce' ),
+ admin_url( 'admin.php?page=wc-addons§ion=helper' ), $available
+ );
+ }
+
+ /**
+ * Whether WooCommerce has an update available.
+ *
+ * @return bool True if a Woo core update is available.
+ */
+ private static function _woo_core_update_available() {
+ $updates = get_site_transient( 'update_plugins' );
+ if ( empty( $updates->response ) ) {
+ return false;
+ }
+
+ if ( empty( $updates->response['woocommerce/woocommerce.php'] ) ) {
+ return false;
+ }
+
+ $data = $updates->response['woocommerce/woocommerce.php'];
+ if ( version_compare( WC_VERSION, $data->new_version, '>=' ) ) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Flush subscriptions cache.
+ */
+ private static function _flush_subscriptions_cache() {
+ delete_transient( '_woocommerce_helper_subscriptions' );
+ }
+
+ /**
+ * Flush auth cache.
+ *
+ * @access private
+ */
+ public static function _flush_authentication_cache() {
+ $request = WC_Helper_API::get(
+ 'oauth/me', array(
+ 'authenticated' => true,
+ )
+ );
+
+ if ( wp_remote_retrieve_response_code( $request ) !== 200 ) {
+ return false;
+ }
+
+ $user_data = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( ! $user_data ) {
+ return false;
+ }
+
+ WC_Helper_Options::update(
+ 'auth_user_data', array(
+ 'name' => $user_data['name'],
+ 'email' => $user_data['email'],
+ )
+ );
+
+ return true;
+ }
+
+ /**
+ * Flush updates cache.
+ */
+ private static function _flush_updates_cache() {
+ WC_Helper_Updater::flush_updates_cache();
+ }
+
+ /**
+ * Sort subscriptions by the product_name.
+ *
+ * @param array $a Subscription array
+ * @param array $b Subscription array
+ *
+ * @return int
+ */
+ public static function _sort_by_product_name( $a, $b ) {
+ return strcmp( $a['product_name'], $b['product_name'] );
+ }
+
+ /**
+ * Sort subscriptions by the Name.
+ *
+ * @param array $a Product array
+ * @param array $b Product array
+ *
+ * @return int
+ */
+ public static function _sort_by_name( $a, $b ) {
+ return strcmp( $a['Name'], $b['Name'] );
+ }
+
+ /**
+ * Log a helper event.
+ *
+ * @param string $message Log message.
+ * @param string $level Optional, defaults to info, valid levels:
+ * emergency|alert|critical|error|warning|notice|info|debug
+ */
+ public static function log( $message, $level = 'info' ) {
+ if ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) {
+ return;
+ }
+
+ if ( ! isset( self::$log ) ) {
+ self::$log = wc_get_logger();
+ }
+
+ self::$log->log( $level, $message, array( 'source' => 'helper' ) );
+ }
+}
+
+WC_Helper::load();
diff --git a/includes/admin/helper/views/html-helper-compat.php b/includes/admin/helper/views/html-helper-compat.php
new file mode 100644
index 00000000000..24ecce533f2
--- /dev/null
+++ b/includes/admin/helper/views/html-helper-compat.php
@@ -0,0 +1,6 @@
+
+
+Manage subscriptions from the extensions tab instead.', 'woocommerce' ), esc_url( admin_url( 'admin.php?page=wc-addons§ion=helper' ) ) ); ?>
+
+
+
diff --git a/includes/admin/helper/views/html-main.php b/includes/admin/helper/views/html-main.php
new file mode 100644
index 00000000000..3023a192b14
--- /dev/null
+++ b/includes/admin/helper/views/html-main.php
@@ -0,0 +1,214 @@
+
+
+View and manage your extensions now.', 'woocommerce' ), esc_url( $helper_url ) ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $data ) : ?>
+
+
+
+
diff --git a/includes/admin/helper/views/html-oauth-start.php b/includes/admin/helper/views/html-oauth-start.php
new file mode 100644
index 00000000000..36e87259e42
--- /dev/null
+++ b/includes/admin/helper/views/html-oauth-start.php
@@ -0,0 +1,30 @@
+ WooCommerce -> Extensions -> WooCommerce.com Subscriptions main page.
+ *
+ * @package WooCommerce\Views
+ */
+
+defined( 'ABSPATH' ) || exit();
+
+?>
+
+
+
+
+
+
+ Plugins screen.', 'woocommerce' ), admin_url( 'plugins.php' ) ); ?>
+-
+
+
+
+ $label ) :
+ // Don't show empty filters.
+ if ( empty( $counts[ $key ] ) ) {
+ continue;
+ }
+
+ $url = admin_url( 'admin.php?page=wc-addons§ion=helper&filter=' . $key );
+ $class_html = $current_filter === $key ? 'class="current"' : '';
+ ?>
+
- + href=""> + + () + + + +
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + 0 ) { + /* translators: %1$d: sites active, %2$d max sites active */ + printf( __( 'Subscription: Using %1$d of %2$d sites available', 'woocommerce' ), absint( $subscription['sites_active'] ), absint( $subscription['sites_max'] ) ); + } else { + _e( 'Subscription: Unlimited', 'woocommerce' ); + } + + // Check shared. + if ( ! empty( $subscription['is_shared'] ) && ! empty( $subscription['owner_email'] ) ) { + printf( '' . __( 'Shared by %s', 'woocommerce' ), esc_html( $subscription['owner_email'] ) ); + } elseif ( isset( $subscription['master_user_email'] ) ) { + printf( '' . __( 'Shared by %s', 'woocommerce' ), esc_html( $subscription['master_user_email'] ) ); + } + ?> + + |
+ + + + + + + + + + + + + + + + + + + + + + | +|
|
+ + + + |
+ + + + + | +|
| + | ||
Below is a list of WooCommerce.com products available on your site - but are either out-dated or do not have a valid subscription.
+ +|
+
+
+
+ |
+ + + + + + | +
|
+ + + + |
+ + + | +
+
+
+
+
+
diff --git a/includes/admin/helper/views/html-section-account.php b/includes/admin/helper/views/html-section-account.php
new file mode 100644
index 00000000000..72f2c60df5c
--- /dev/null
+++ b/includes/admin/helper/views/html-section-account.php
@@ -0,0 +1,15 @@
+
+
+
+
diff --git a/includes/admin/helper/views/html-section-nav.php b/includes/admin/helper/views/html-section-nav.php
new file mode 100644
index 00000000000..6f45b07a51d
--- /dev/null
+++ b/includes/admin/helper/views/html-section-nav.php
@@ -0,0 +1,11 @@
+
+
+
diff --git a/includes/admin/helper/views/html-section-notices.php b/includes/admin/helper/views/html-section-notices.php
new file mode 100644
index 00000000000..46792dab880
--- /dev/null
+++ b/includes/admin/helper/views/html-section-notices.php
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/includes/admin/importers/class-wc-product-csv-importer-controller.php b/includes/admin/importers/class-wc-product-csv-importer-controller.php
new file mode 100644
index 00000000000..f8cef598026
--- /dev/null
+++ b/includes/admin/importers/class-wc-product-csv-importer-controller.php
@@ -0,0 +1,738 @@
+ 'text/csv',
+ 'txt' => 'text/plain',
+ )
+ );
+ }
+
+ /**
+ * Constructor.
+ */
+ public function __construct() {
+ $default_steps = array(
+ 'upload' => array(
+ 'name' => __( 'Upload CSV file', 'woocommerce' ),
+ 'view' => array( $this, 'upload_form' ),
+ 'handler' => array( $this, 'upload_form_handler' ),
+ ),
+ 'mapping' => array(
+ 'name' => __( 'Column mapping', 'woocommerce' ),
+ 'view' => array( $this, 'mapping_form' ),
+ 'handler' => '',
+ ),
+ 'import' => array(
+ 'name' => __( 'Import', 'woocommerce' ),
+ 'view' => array( $this, 'import' ),
+ 'handler' => '',
+ ),
+ 'done' => array(
+ 'name' => __( 'Done!', 'woocommerce' ),
+ 'view' => array( $this, 'done' ),
+ 'handler' => '',
+ ),
+ );
+
+ $this->steps = apply_filters( 'woocommerce_product_csv_importer_steps', $default_steps );
+
+ // phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification
+ $this->step = isset( $_REQUEST['step'] ) ? sanitize_key( $_REQUEST['step'] ) : current( array_keys( $this->steps ) );
+ $this->file = isset( $_REQUEST['file'] ) ? wc_clean( wp_unslash( $_REQUEST['file'] ) ) : '';
+ $this->update_existing = isset( $_REQUEST['update_existing'] ) ? (bool) $_REQUEST['update_existing'] : false;
+ $this->delimiter = ! empty( $_REQUEST['delimiter'] ) ? wc_clean( wp_unslash( $_REQUEST['delimiter'] ) ) : ',';
+ $this->map_preferences = isset( $_REQUEST['map_preferences'] ) ? (bool) $_REQUEST['map_preferences'] : false;
+ // phpcs:enable
+
+ if ( $this->map_preferences ) {
+ add_filter( 'woocommerce_csv_product_import_mapped_columns', array( $this, 'auto_map_user_preferences' ), 9999 );
+ }
+ }
+
+ /**
+ * Get the URL for the next step's screen.
+ *
+ * @param string $step slug (default: current step).
+ * @return string URL for next step if a next step exists.
+ * Admin URL if it's the last step.
+ * Empty string on failure.
+ */
+ public function get_next_step_link( $step = '' ) {
+ if ( ! $step ) {
+ $step = $this->step;
+ }
+
+ $keys = array_keys( $this->steps );
+
+ if ( end( $keys ) === $step ) {
+ return admin_url();
+ }
+
+ $step_index = array_search( $step, $keys, true );
+
+ if ( false === $step_index ) {
+ return '';
+ }
+
+ $params = array(
+ 'step' => $keys[ $step_index + 1 ],
+ 'file' => str_replace( DIRECTORY_SEPARATOR, '/', $this->file ),
+ 'delimiter' => $this->delimiter,
+ 'update_existing' => $this->update_existing,
+ 'map_preferences' => $this->map_preferences,
+ '_wpnonce' => wp_create_nonce( 'woocommerce-csv-importer' ), // wp_nonce_url() escapes & to & breaking redirects.
+ );
+
+ return add_query_arg( $params );
+ }
+
+ /**
+ * Output header view.
+ */
+ protected function output_header() {
+ include dirname( __FILE__ ) . '/views/html-csv-import-header.php';
+ }
+
+ /**
+ * Output steps view.
+ */
+ protected function output_steps() {
+ include dirname( __FILE__ ) . '/views/html-csv-import-steps.php';
+ }
+
+ /**
+ * Output footer view.
+ */
+ protected function output_footer() {
+ include dirname( __FILE__ ) . '/views/html-csv-import-footer.php';
+ }
+
+ /**
+ * Add error message.
+ *
+ * @param string $message Error message.
+ * @param array $actions List of actions with 'url' and 'label'.
+ */
+ protected function add_error( $message, $actions = array() ) {
+ $this->errors[] = array(
+ 'message' => $message,
+ 'actions' => $actions,
+ );
+ }
+
+ /**
+ * Add error message.
+ */
+ protected function output_errors() {
+ if ( ! $this->errors ) {
+ return;
+ }
+
+ foreach ( $this->errors as $error ) {
+ echo '';
+ echo '
';
+ }
+ }
+
+ /**
+ * Dispatch current step and show correct view.
+ */
+ public function dispatch() {
+ // phpcs:ignore WordPress.Security.NonceVerification.NoNonceVerification
+ if ( ! empty( $_POST['save_step'] ) && ! empty( $this->steps[ $this->step ]['handler'] ) ) {
+ call_user_func( $this->steps[ $this->step ]['handler'], $this );
+ }
+ $this->output_header();
+ $this->output_steps();
+ $this->output_errors();
+ call_user_func( $this->steps[ $this->step ]['view'], $this );
+ $this->output_footer();
+ }
+
+ /**
+ * Output information about the uploading process.
+ */
+ protected function upload_form() {
+ $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
+ $size = size_format( $bytes );
+ $upload_dir = wp_upload_dir();
+
+ include dirname( __FILE__ ) . '/views/html-product-csv-import-form.php';
+ }
+
+ /**
+ * Handle the upload form and store options.
+ */
+ public function upload_form_handler() {
+ check_admin_referer( 'woocommerce-csv-importer' );
+
+ $file = $this->handle_upload();
+
+ if ( is_wp_error( $file ) ) {
+ $this->add_error( $file->get_error_message() );
+ return;
+ } else {
+ $this->file = $file;
+ }
+
+ wp_redirect( esc_url_raw( $this->get_next_step_link() ) );
+ exit;
+ }
+
+ /**
+ * Handles the CSV upload and initial parsing of the file to prepare for
+ * displaying author import options.
+ *
+ * @return string|WP_Error
+ */
+ public function handle_upload() {
+ // phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification -- Nonce already verified in WC_Product_CSV_Importer_Controller::upload_form_handler()
+ $file_url = isset( $_POST['file_url'] ) ? wc_clean( wp_unslash( $_POST['file_url'] ) ) : '';
+
+ if ( empty( $file_url ) ) {
+ if ( ! isset( $_FILES['import'] ) ) {
+ return new WP_Error( 'woocommerce_product_csv_importer_upload_file_empty', __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.', 'woocommerce' ) );
+ }
+
+ if ( ! self::is_file_valid_csv( wc_clean( wp_unslash( $_FILES['import']['name'] ) ), false ) ) {
+ return new WP_Error( 'woocommerce_product_csv_importer_upload_file_invalid', __( 'Invalid file type. The importer supports CSV and TXT file formats.', 'woocommerce' ) );
+ }
+
+ $overrides = array(
+ 'test_form' => false,
+ 'mimes' => self::get_valid_csv_filetypes(),
+ );
+ $import = $_FILES['import']; // WPCS: sanitization ok, input var ok.
+ $upload = wp_handle_upload( $import, $overrides );
+
+ if ( isset( $upload['error'] ) ) {
+ return new WP_Error( 'woocommerce_product_csv_importer_upload_error', $upload['error'] );
+ }
+
+ // Construct the object array.
+ $object = array(
+ 'post_title' => basename( $upload['file'] ),
+ 'post_content' => $upload['url'],
+ 'post_mime_type' => $upload['type'],
+ 'guid' => $upload['url'],
+ 'context' => 'import',
+ 'post_status' => 'private',
+ );
+
+ // Save the data.
+ $id = wp_insert_attachment( $object, $upload['file'] );
+
+ /*
+ * Schedule a cleanup for one day from now in case of failed
+ * import or missing wp_import_cleanup() call.
+ */
+ wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+
+ return $upload['file'];
+ } elseif ( file_exists( ABSPATH . $file_url ) ) {
+ if ( ! self::is_file_valid_csv( ABSPATH . $file_url ) ) {
+ return new WP_Error( 'woocommerce_product_csv_importer_upload_file_invalid', __( 'Invalid file type. The importer supports CSV and TXT file formats.', 'woocommerce' ) );
+ }
+
+ return ABSPATH . $file_url;
+ }
+ // phpcs:enable
+
+ return new WP_Error( 'woocommerce_product_csv_importer_upload_invalid_file', __( 'Please upload or provide the link to a valid CSV file.', 'woocommerce' ) );
+ }
+
+ /**
+ * Mapping step.
+ */
+ protected function mapping_form() {
+ $args = array(
+ 'lines' => 1,
+ 'delimiter' => $this->delimiter,
+ );
+
+ $importer = self::get_importer( $this->file, $args );
+ $headers = $importer->get_raw_keys();
+ $mapped_items = $this->auto_map_columns( $headers );
+ $sample = current( $importer->get_raw_data() );
+
+ if ( empty( $sample ) ) {
+ $this->add_error(
+ __( 'The file is empty or using a different encoding than UTF-8, please try again with a new file.', 'woocommerce' ),
+ array(
+ array(
+ 'url' => admin_url( 'edit.php?post_type=product&page=product_importer' ),
+ 'label' => __( 'Upload a new file', 'woocommerce' ),
+ ),
+ )
+ );
+
+ // Force output the errors in the same page.
+ $this->output_errors();
+ return;
+ }
+
+ include_once dirname( __FILE__ ) . '/views/html-csv-import-mapping.php';
+ }
+
+ /**
+ * Import the file if it exists and is valid.
+ */
+ public function import() {
+ if ( ! self::is_file_valid_csv( $this->file ) ) {
+ $this->add_error( __( 'Invalid file type. The importer supports CSV and TXT file formats.', 'woocommerce' ) );
+ $this->output_errors();
+ return;
+ }
+
+ if ( ! is_file( $this->file ) ) {
+ $this->add_error( __( 'The file does not exist, please try again.', 'woocommerce' ) );
+ $this->output_errors();
+ return;
+ }
+
+ // phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification -- Nonce already verified in WC_Admin_Importers::do_ajax_product_import()
+ if ( ! empty( $_POST['map_from'] ) && ! empty( $_POST['map_to'] ) ) {
+ $mapping_from = wc_clean( wp_unslash( $_POST['map_from'] ) );
+ $mapping_to = wc_clean( wp_unslash( $_POST['map_to'] ) );
+
+ // Save mapping preferences for future imports.
+ update_user_option( get_current_user_id(), 'woocommerce_product_import_mapping', $mapping_to );
+ } else {
+ wp_redirect( esc_url_raw( $this->get_next_step_link( 'upload' ) ) );
+ exit;
+ }
+ // phpcs:enable
+
+ wp_localize_script(
+ 'wc-product-import',
+ 'wc_product_import_params',
+ array(
+ 'import_nonce' => wp_create_nonce( 'wc-product-import' ),
+ 'mapping' => array(
+ 'from' => $mapping_from,
+ 'to' => $mapping_to,
+ ),
+ 'file' => $this->file,
+ 'update_existing' => $this->update_existing,
+ 'delimiter' => $this->delimiter,
+ )
+ );
+ wp_enqueue_script( 'wc-product-import' );
+
+ include_once dirname( __FILE__ ) . '/views/html-csv-import-progress.php';
+ }
+
+ /**
+ * Done step.
+ */
+ protected function done() {
+ // phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification
+ $imported = isset( $_GET['products-imported'] ) ? absint( $_GET['products-imported'] ) : 0;
+ $updated = isset( $_GET['products-updated'] ) ? absint( $_GET['products-updated'] ) : 0;
+ $failed = isset( $_GET['products-failed'] ) ? absint( $_GET['products-failed'] ) : 0;
+ $skipped = isset( $_GET['products-skipped'] ) ? absint( $_GET['products-skipped'] ) : 0;
+ $errors = array_filter( (array) get_user_option( 'product_import_error_log' ) );
+ // phpcs:enable
+
+ include_once dirname( __FILE__ ) . '/views/html-csv-import-done.php';
+ }
+
+ /**
+ * Columns to normalize.
+ *
+ * @param array $columns List of columns names and keys.
+ * @return array
+ */
+ protected function normalize_columns_names( $columns ) {
+ $normalized = array();
+
+ foreach ( $columns as $key => $value ) {
+ $normalized[ strtolower( $key ) ] = $value;
+ }
+
+ return $normalized;
+ }
+
+ /**
+ * Auto map column names.
+ *
+ * @param array $raw_headers Raw header columns.
+ * @param bool $num_indexes If should use numbers or raw header columns as indexes.
+ * @return array
+ */
+ protected function auto_map_columns( $raw_headers, $num_indexes = true ) {
+ $weight_unit = get_option( 'woocommerce_weight_unit' );
+ $dimension_unit = get_option( 'woocommerce_dimension_unit' );
+
+ include dirname( __FILE__ ) . '/mappings/mappings.php';
+
+ /*
+ * @hooked wc_importer_generic_mappings - 10
+ * @hooked wc_importer_wordpress_mappings - 10
+ * @hooked wc_importer_default_english_mappings - 100
+ */
+ $default_columns = $this->normalize_columns_names(
+ apply_filters(
+ 'woocommerce_csv_product_import_mapping_default_columns',
+ array(
+ __( 'ID', 'woocommerce' ) => 'id',
+ __( 'Type', 'woocommerce' ) => 'type',
+ __( 'SKU', 'woocommerce' ) => 'sku',
+ __( 'Name', 'woocommerce' ) => 'name',
+ __( 'Published', 'woocommerce' ) => 'published',
+ __( 'Is featured?', 'woocommerce' ) => 'featured',
+ __( 'Visibility in catalog', 'woocommerce' ) => 'catalog_visibility',
+ __( 'Short description', 'woocommerce' ) => 'short_description',
+ __( 'Description', 'woocommerce' ) => 'description',
+ __( 'Date sale price starts', 'woocommerce' ) => 'date_on_sale_from',
+ __( 'Date sale price ends', 'woocommerce' ) => 'date_on_sale_to',
+ __( 'Tax status', 'woocommerce' ) => 'tax_status',
+ __( 'Tax class', 'woocommerce' ) => 'tax_class',
+ __( 'In stock?', 'woocommerce' ) => 'stock_status',
+ __( 'Stock', 'woocommerce' ) => 'stock_quantity',
+ __( 'Backorders allowed?', 'woocommerce' ) => 'backorders',
+ __( 'Low stock amount', 'woocommerce' ) => 'low_stock_amount',
+ __( 'Sold individually?', 'woocommerce' ) => 'sold_individually',
+ /* translators: %s: Weight unit */
+ sprintf( __( 'Weight (%s)', 'woocommerce' ), $weight_unit ) => 'weight',
+ /* translators: %s: Length unit */
+ sprintf( __( 'Length (%s)', 'woocommerce' ), $dimension_unit ) => 'length',
+ /* translators: %s: Width unit */
+ sprintf( __( 'Width (%s)', 'woocommerce' ), $dimension_unit ) => 'width',
+ /* translators: %s: Height unit */
+ sprintf( __( 'Height (%s)', 'woocommerce' ), $dimension_unit ) => 'height',
+ __( 'Allow customer reviews?', 'woocommerce' ) => 'reviews_allowed',
+ __( 'Purchase note', 'woocommerce' ) => 'purchase_note',
+ __( 'Sale price', 'woocommerce' ) => 'sale_price',
+ __( 'Regular price', 'woocommerce' ) => 'regular_price',
+ __( 'Categories', 'woocommerce' ) => 'category_ids',
+ __( 'Tags', 'woocommerce' ) => 'tag_ids',
+ __( 'Shipping class', 'woocommerce' ) => 'shipping_class_id',
+ __( 'Images', 'woocommerce' ) => 'images',
+ __( 'Download limit', 'woocommerce' ) => 'download_limit',
+ __( 'Download expiry days', 'woocommerce' ) => 'download_expiry',
+ __( 'Parent', 'woocommerce' ) => 'parent_id',
+ __( 'Upsells', 'woocommerce' ) => 'upsell_ids',
+ __( 'Cross-sells', 'woocommerce' ) => 'cross_sell_ids',
+ __( 'Grouped products', 'woocommerce' ) => 'grouped_products',
+ __( 'External URL', 'woocommerce' ) => 'product_url',
+ __( 'Button text', 'woocommerce' ) => 'button_text',
+ __( 'Position', 'woocommerce' ) => 'menu_order',
+ )
+ )
+ );
+
+ $special_columns = $this->get_special_columns(
+ $this->normalize_columns_names(
+ apply_filters(
+ 'woocommerce_csv_product_import_mapping_special_columns',
+ array(
+ /* translators: %d: Attribute number */
+ __( 'Attribute %d name', 'woocommerce' ) => 'attributes:name',
+ /* translators: %d: Attribute number */
+ __( 'Attribute %d value(s)', 'woocommerce' ) => 'attributes:value',
+ /* translators: %d: Attribute number */
+ __( 'Attribute %d visible', 'woocommerce' ) => 'attributes:visible',
+ /* translators: %d: Attribute number */
+ __( 'Attribute %d global', 'woocommerce' ) => 'attributes:taxonomy',
+ /* translators: %d: Attribute number */
+ __( 'Attribute %d default', 'woocommerce' ) => 'attributes:default',
+ /* translators: %d: Download number */
+ __( 'Download %d name', 'woocommerce' ) => 'downloads:name',
+ /* translators: %d: Download number */
+ __( 'Download %d URL', 'woocommerce' ) => 'downloads:url',
+ /* translators: %d: Meta number */
+ __( 'Meta: %s', 'woocommerce' ) => 'meta:',
+ )
+ )
+ )
+ );
+
+ $headers = array();
+ foreach ( $raw_headers as $key => $field ) {
+ $field = strtolower( $field );
+ $index = $num_indexes ? $key : $field;
+ $headers[ $index ] = $field;
+
+ if ( isset( $default_columns[ $field ] ) ) {
+ $headers[ $index ] = $default_columns[ $field ];
+ } else {
+ foreach ( $special_columns as $regex => $special_key ) {
+ if ( preg_match( $regex, $field, $matches ) ) {
+ $headers[ $index ] = $special_key . $matches[1];
+ break;
+ }
+ }
+ }
+ }
+
+ return apply_filters( 'woocommerce_csv_product_import_mapped_columns', $headers, $raw_headers );
+ }
+
+ /**
+ * Map columns using the user's lastest import mappings.
+ *
+ * @param array $headers Header columns.
+ * @return array
+ */
+ public function auto_map_user_preferences( $headers ) {
+ $mapping_preferences = get_user_option( 'woocommerce_product_import_mapping' );
+
+ if ( ! empty( $mapping_preferences ) && is_array( $mapping_preferences ) ) {
+ return $mapping_preferences;
+ }
+
+ return $headers;
+ }
+
+ /**
+ * Sanitize special column name regex.
+ *
+ * @param string $value Raw special column name.
+ * @return string
+ */
+ protected function sanitize_special_column_name_regex( $value ) {
+ return '/' . str_replace( array( '%d', '%s' ), '(.*)', trim( quotemeta( $value ) ) ) . '/';
+ }
+
+ /**
+ * Get special columns.
+ *
+ * @param array $columns Raw special columns.
+ * @return array
+ */
+ protected function get_special_columns( $columns ) {
+ $formatted = array();
+
+ foreach ( $columns as $key => $value ) {
+ $regex = $this->sanitize_special_column_name_regex( $key );
+
+ $formatted[ $regex ] = $value;
+ }
+
+ return $formatted;
+ }
+
+ /**
+ * Get mapping options.
+ *
+ * @param string $item Item name.
+ * @return array
+ */
+ protected function get_mapping_options( $item = '' ) {
+ // Get index for special column names.
+ $index = $item;
+
+ if ( preg_match( '/\d+$/', $item, $matches ) ) {
+ $index = $matches[0];
+ }
+
+ // Properly format for meta field.
+ $meta = str_replace( 'meta:', '', $item );
+
+ // Available options.
+ $weight_unit = get_option( 'woocommerce_weight_unit' );
+ $dimension_unit = get_option( 'woocommerce_dimension_unit' );
+ $options = array(
+ 'id' => __( 'ID', 'woocommerce' ),
+ 'type' => __( 'Type', 'woocommerce' ),
+ 'sku' => __( 'SKU', 'woocommerce' ),
+ 'name' => __( 'Name', 'woocommerce' ),
+ 'published' => __( 'Published', 'woocommerce' ),
+ 'featured' => __( 'Is featured?', 'woocommerce' ),
+ 'catalog_visibility' => __( 'Visibility in catalog', 'woocommerce' ),
+ 'short_description' => __( 'Short description', 'woocommerce' ),
+ 'description' => __( 'Description', 'woocommerce' ),
+ 'price' => array(
+ 'name' => __( 'Price', 'woocommerce' ),
+ 'options' => array(
+ 'regular_price' => __( 'Regular price', 'woocommerce' ),
+ 'sale_price' => __( 'Sale price', 'woocommerce' ),
+ 'date_on_sale_from' => __( 'Date sale price starts', 'woocommerce' ),
+ 'date_on_sale_to' => __( 'Date sale price ends', 'woocommerce' ),
+ ),
+ ),
+ 'tax_status' => __( 'Tax status', 'woocommerce' ),
+ 'tax_class' => __( 'Tax class', 'woocommerce' ),
+ 'stock_status' => __( 'In stock?', 'woocommerce' ),
+ 'stock_quantity' => _x( 'Stock', 'Quantity in stock', 'woocommerce' ),
+ 'backorders' => __( 'Backorders allowed?', 'woocommerce' ),
+ 'low_stock_amount' => __( 'Low stock amount', 'woocommerce' ),
+ 'sold_individually' => __( 'Sold individually?', 'woocommerce' ),
+ /* translators: %s: weight unit */
+ 'weight' => sprintf( __( 'Weight (%s)', 'woocommerce' ), $weight_unit ),
+ 'dimensions' => array(
+ 'name' => __( 'Dimensions', 'woocommerce' ),
+ 'options' => array(
+ /* translators: %s: dimension unit */
+ 'length' => sprintf( __( 'Length (%s)', 'woocommerce' ), $dimension_unit ),
+ /* translators: %s: dimension unit */
+ 'width' => sprintf( __( 'Width (%s)', 'woocommerce' ), $dimension_unit ),
+ /* translators: %s: dimension unit */
+ 'height' => sprintf( __( 'Height (%s)', 'woocommerce' ), $dimension_unit ),
+ ),
+ ),
+ 'category_ids' => __( 'Categories', 'woocommerce' ),
+ 'tag_ids' => __( 'Tags', 'woocommerce' ),
+ 'shipping_class_id' => __( 'Shipping class', 'woocommerce' ),
+ 'images' => __( 'Images', 'woocommerce' ),
+ 'parent_id' => __( 'Parent', 'woocommerce' ),
+ 'upsell_ids' => __( 'Upsells', 'woocommerce' ),
+ 'cross_sell_ids' => __( 'Cross-sells', 'woocommerce' ),
+ 'grouped_products' => __( 'Grouped products', 'woocommerce' ),
+ 'external' => array(
+ 'name' => __( 'External product', 'woocommerce' ),
+ 'options' => array(
+ 'product_url' => __( 'External URL', 'woocommerce' ),
+ 'button_text' => __( 'Button text', 'woocommerce' ),
+ ),
+ ),
+ 'downloads' => array(
+ 'name' => __( 'Downloads', 'woocommerce' ),
+ 'options' => array(
+ 'downloads:name' . $index => __( 'Download name', 'woocommerce' ),
+ 'downloads:url' . $index => __( 'Download URL', 'woocommerce' ),
+ 'download_limit' => __( 'Download limit', 'woocommerce' ),
+ 'download_expiry' => __( 'Download expiry days', 'woocommerce' ),
+ ),
+ ),
+ 'attributes' => array(
+ 'name' => __( 'Attributes', 'woocommerce' ),
+ 'options' => array(
+ 'attributes:name' . $index => __( 'Attribute name', 'woocommerce' ),
+ 'attributes:value' . $index => __( 'Attribute value(s)', 'woocommerce' ),
+ 'attributes:taxonomy' . $index => __( 'Is a global attribute?', 'woocommerce' ),
+ 'attributes:visible' . $index => __( 'Attribute visibility', 'woocommerce' ),
+ 'attributes:default' . $index => __( 'Default attribute', 'woocommerce' ),
+ ),
+ ),
+ 'reviews_allowed' => __( 'Allow customer reviews?', 'woocommerce' ),
+ 'purchase_note' => __( 'Purchase note', 'woocommerce' ),
+ 'meta:' . $meta => __( 'Import as meta', 'woocommerce' ),
+ 'menu_order' => __( 'Position', 'woocommerce' ),
+ );
+
+ return apply_filters( 'woocommerce_csv_product_import_mapping_options', $options, $item );
+ }
+}
diff --git a/includes/admin/importers/class-wc-tax-rate-importer.php b/includes/admin/importers/class-wc-tax-rate-importer.php
index 61fdacbc704..32e49b53943 100644
--- a/includes/admin/importers/class-wc-tax-rate-importer.php
+++ b/includes/admin/importers/class-wc-tax-rate-importer.php
@@ -1,4 +1,11 @@
import_page = 'woocommerce_tax_rate_csv';
- $this->delimiter = empty( $_POST['delimiter'] ) ? ',' : (string) wc_clean( $_POST['delimiter'] );
+ $this->delimiter = empty( $_POST['delimiter'] ) ? ',' : (string) wc_clean( wp_unslash( $_POST['delimiter'] ) ); // WPCS: CSRF ok.
}
/**
@@ -96,7 +101,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
*/
private function import_start() {
if ( function_exists( 'gc_enable' ) ) {
- gc_enable();
+ gc_enable(); // phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.gc_enableFound
}
wc_set_time_limit( 0 );
@ob_flush();
@@ -107,8 +112,8 @@ class WC_Tax_Rate_Importer extends WP_Importer {
/**
* UTF-8 encode the data if `$enc` value isn't UTF-8.
*
- * @param mixed $data
- * @param string $enc
+ * @param mixed $data Data.
+ * @param string $enc Encoding.
* @return string
*/
public function format_data_from_csv( $data, $enc ) {
@@ -118,7 +123,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
/**
* Import the file if it exists and is valid.
*
- * @param mixed $file
+ * @param mixed $file File.
*/
public function import( $file ) {
if ( ! is_file( $file ) ) {
@@ -127,15 +132,18 @@ class WC_Tax_Rate_Importer extends WP_Importer {
$this->import_start();
- $loop = 0;
+ $loop = 0;
+ $handle = fopen( $file, 'r' );
- if ( ( $handle = fopen( $file, "r" ) ) !== false ) {
+ if ( false !== $handle ) {
$header = fgetcsv( $handle, 0, $this->delimiter );
- if ( 10 === sizeof( $header ) ) {
+ if ( 10 === count( $header ) ) {
- while ( ( $row = fgetcsv( $handle, 0, $this->delimiter ) ) !== false ) {
+ $row = fgetcsv( $handle, 0, $this->delimiter );
+
+ while ( false !== $row ) {
list( $country, $state, $postcode, $city, $rate, $name, $priority, $compound, $shipping, $class ) = $row;
@@ -154,6 +162,8 @@ class WC_Tax_Rate_Importer extends WP_Importer {
$tax_rate_id = WC_Tax::_insert_tax_rate( $tax_rate );
WC_Tax::_update_tax_rate_postcodes( $tax_rate_id, wc_clean( $postcode ) );
WC_Tax::_update_tax_rate_cities( $tax_rate_id, wc_clean( $city ) );
+
+ $row = fgetcsv( $handle, 0, $this->delimiter );
}
} else {
$this->import_error( __( 'The CSV is invalid.', 'woocommerce' ) );
@@ -162,12 +172,12 @@ class WC_Tax_Rate_Importer extends WP_Importer {
fclose( $handle );
}
- // Show Result
+ // Show Result.
echo '' . esc_html( $error['message'] ) . '
'; + + if ( ! empty( $error['actions'] ) ) { + echo ''; + foreach ( $error['actions'] as $action ) { + echo '' . esc_html( $action['label'] ) . ' '; + } + echo '
'; + } + echo ''; - /* translators: %s: tax rates count */ printf( - __( 'Import complete - imported %s tax rates.', 'woocommerce' ), - '' . $loop . '' + /* translators: %s: tax rates count */ + esc_html__( 'Import complete - imported %s tax rates.', 'woocommerce' ), + '' . absint( $loop ) . '' ); echo '
' . __( 'All done!', 'woocommerce' ) . ' ' . __( 'View tax rates', 'woocommerce' ) . '' . '
'; + echo '' . esc_html__( 'All done!', 'woocommerce' ) . ' ' . esc_html__( 'View tax rates', 'woocommerce' ) . '
'; do_action( 'import_end' ); } @@ -190,8 +200,10 @@ class WC_Tax_Rate_Importer extends WP_Importer { * @return bool False if error uploading or invalid file, true otherwise */ public function handle_upload() { - if ( empty( $_POST['file_url'] ) ) { + // phpcs:disable WordPress.Security.NonceVerification.NoNonceVerification -- Nonce already verified in WC_Tax_Rate_Importer::dispatch() + $file_url = isset( $_POST['file_url'] ) ? wc_clean( wp_unslash( $_POST['file_url'] ) ) : ''; + if ( empty( $file_url ) ) { $file = wp_import_handle_upload(); if ( isset( $file['error'] ) ) { @@ -199,12 +211,12 @@ class WC_Tax_Rate_Importer extends WP_Importer { } $this->id = absint( $file['id'] ); - - } elseif ( file_exists( ABSPATH . $_POST['file_url'] ) ) { - $this->file_url = esc_attr( $_POST['file_url'] ); + } elseif ( file_exists( ABSPATH . $file_url ) ) { + $this->file_url = esc_attr( $file_url ); } else { $this->import_error(); } + // phpcs:enable return true; } @@ -214,7 +226,7 @@ class WC_Tax_Rate_Importer extends WP_Importer { */ public function header() { echo '';
- echo '
diff --git a/includes/admin/importers/views/html-csv-import-header.php b/includes/admin/importers/views/html-csv-import-header.php
new file mode 100644
index 00000000000..78c42e19433
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-header.php
@@ -0,0 +1,15 @@
+
+' . __( 'Import tax rates', 'woocommerce' ) . '
'; + echo '' . esc_html__( 'Import tax rates', 'woocommerce' ) . '
'; } /** @@ -230,56 +242,61 @@ class WC_Tax_Rate_Importer extends WP_Importer { public function greet() { echo '';
- echo '
'; + echo '
+' . __( 'Hi there! Upload a CSV file containing tax rates to import the contents into your shop. Choose a .csv file to upload, then click "Upload file and import".', 'woocommerce' ) . '
'; + echo '' . esc_html__( 'Hi there! Upload a CSV file containing tax rates to import the contents into your shop. Choose a .csv file to upload, then click "Upload file and import".', 'woocommerce' ) . '
'; - echo '' . sprintf( __( 'Tax rates need to be defined with columns in a specific order (10 columns). Click here to download a sample.', 'woocommerce' ), WC()->plugin_url() . '/dummy-data/sample_tax_rates.csv' ) . '
'; + /* translators: 1: Link to tax rates sample file 2: Closing link. */ + echo '' . sprintf( esc_html__( 'Your CSV needs to include columns in a specific order. %1$sClick here to download a sample%2$s.', 'woocommerce' ), '', '' ) . '
'; $action = 'admin.php?import=woocommerce_tax_rate_csv&step=1'; - $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() ); - $size = size_format( $bytes ); + $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() ); + $size = size_format( $bytes ); $upload_dir = wp_upload_dir(); if ( ! empty( $upload_dir['error'] ) ) : - ?>
-
+
+
+
+
' . __( 'Sorry, there has been an error.', 'woocommerce' ) . '+
'; + echo '
' . esc_html__( 'Sorry, there has been an error.', 'woocommerce' ) . '
';
if ( $message ) {
echo esc_html( $message );
}
@@ -305,7 +323,7 @@ class WC_Tax_Rate_Importer extends WP_Importer {
/**
* Added to http_request_timeout filter to force timeout at 60 seconds during import.
*
- * @param int $val
+ * @param int $val Value.
* @return int 60
*/
public function bump_request_timeout( $val ) {
diff --git a/includes/admin/importers/mappings/default.php b/includes/admin/importers/mappings/default.php
new file mode 100644
index 00000000000..4de9337d89c
--- /dev/null
+++ b/includes/admin/importers/mappings/default.php
@@ -0,0 +1,112 @@
+ 'id',
+ 'Type' => 'type',
+ 'SKU' => 'sku',
+ 'Name' => 'name',
+ 'Published' => 'published',
+ 'Is featured?' => 'featured',
+ 'Visibility in catalog' => 'catalog_visibility',
+ 'Short description' => 'short_description',
+ 'Description' => 'description',
+ 'Date sale price starts' => 'date_on_sale_from',
+ 'Date sale price ends' => 'date_on_sale_to',
+ 'Tax status' => 'tax_status',
+ 'Tax class' => 'tax_class',
+ 'In stock?' => 'stock_status',
+ 'Stock' => 'stock_quantity',
+ 'Backorders allowed?' => 'backorders',
+ 'Low stock amount' => 'low_stock_amount',
+ 'Sold individually?' => 'sold_individually',
+ sprintf( 'Weight (%s)', $weight_unit ) => 'weight',
+ sprintf( 'Length (%s)', $dimension_unit ) => 'length',
+ sprintf( 'Width (%s)', $dimension_unit ) => 'width',
+ sprintf( 'Height (%s)', $dimension_unit ) => 'height',
+ 'Allow customer reviews?' => 'reviews_allowed',
+ 'Purchase note' => 'purchase_note',
+ 'Sale price' => 'sale_price',
+ 'Regular price' => 'regular_price',
+ 'Categories' => 'category_ids',
+ 'Tags' => 'tag_ids',
+ 'Shipping class' => 'shipping_class_id',
+ 'Images' => 'images',
+ 'Download limit' => 'download_limit',
+ 'Download expiry days' => 'download_expiry',
+ 'Parent' => 'parent_id',
+ 'Upsells' => 'upsell_ids',
+ 'Cross-sells' => 'cross_sell_ids',
+ 'Grouped products' => 'grouped_products',
+ 'External URL' => 'product_url',
+ 'Button text' => 'button_text',
+ 'Position' => 'menu_order',
+ );
+
+ return array_merge( $mappings, $new_mappings );
+}
+add_filter( 'woocommerce_csv_product_import_mapping_default_columns', 'wc_importer_default_english_mappings', 100 );
+
+/**
+ * Add English special mapping placeholders when not using English as current language.
+ *
+ * @since 3.1.0
+ * @param array $mappings Importer columns mappings.
+ * @return array
+ */
+function wc_importer_default_special_english_mappings( $mappings ) {
+ if ( 'en_US' === wc_importer_current_locale() ) {
+ return $mappings;
+ }
+
+ $new_mappings = array(
+ 'Attribute %d name' => 'attributes:name',
+ 'Attribute %d value(s)' => 'attributes:value',
+ 'Attribute %d visible' => 'attributes:visible',
+ 'Attribute %d global' => 'attributes:taxonomy',
+ 'Attribute %d default' => 'attributes:default',
+ 'Download %d name' => 'downloads:name',
+ 'Download %d URL' => 'downloads:url',
+ 'Meta: %s' => 'meta:',
+ );
+
+ return array_merge( $mappings, $new_mappings );
+}
+add_filter( 'woocommerce_csv_product_import_mapping_special_columns', 'wc_importer_default_special_english_mappings', 100 );
diff --git a/includes/admin/importers/mappings/generic.php b/includes/admin/importers/mappings/generic.php
new file mode 100644
index 00000000000..d5b14ab26f3
--- /dev/null
+++ b/includes/admin/importers/mappings/generic.php
@@ -0,0 +1,31 @@
+ 'name',
+ __( 'Product Title', 'woocommerce' ) => 'name',
+ __( 'Price', 'woocommerce' ) => 'regular_price',
+ __( 'Parent SKU', 'woocommerce' ) => 'parent_id',
+ __( 'Quantity', 'woocommerce' ) => 'stock_quantity',
+ __( 'Menu order', 'woocommerce' ) => 'menu_order',
+ );
+
+ return array_merge( $mappings, $generic_mappings );
+}
+add_filter( 'woocommerce_csv_product_import_mapping_default_columns', 'wc_importer_generic_mappings' );
diff --git a/includes/admin/importers/mappings/mappings.php b/includes/admin/importers/mappings/mappings.php
new file mode 100644
index 00000000000..11422da921b
--- /dev/null
+++ b/includes/admin/importers/mappings/mappings.php
@@ -0,0 +1,14 @@
+ 'id',
+ 'post_title' => 'name',
+ 'post_content' => 'description',
+ 'post_excerpt' => 'short_description',
+ 'post_parent' => 'parent_id',
+ );
+
+ return array_merge( $mappings, $wp_mappings );
+}
+add_filter( 'woocommerce_csv_product_import_mapping_default_columns', 'wc_importer_wordpress_mappings' );
diff --git a/includes/admin/importers/views/html-csv-import-done.php b/includes/admin/importers/views/html-csv-import-done.php
new file mode 100644
index 00000000000..3f43869edb8
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-done.php
@@ -0,0 +1,96 @@
+
+
+
+ ' . number_format_i18n( $imported ) . ''
+ );
+ }
+
+ if ( 0 < $updated ) {
+ $results[] = sprintf(
+ /* translators: %d: products count */
+ _n( '%s product updated', '%s products updated', $updated, 'woocommerce' ),
+ '' . number_format_i18n( $updated ) . ''
+ );
+ }
+
+ if ( 0 < $skipped ) {
+ $results[] = sprintf(
+ /* translators: %d: products count */
+ _n( '%s product was skipped', '%s products were skipped', $skipped, 'woocommerce' ),
+ '' . number_format_i18n( $skipped ) . ''
+ );
+ }
+
+ if ( 0 < $failed ) {
+ $results [] = sprintf(
+ /* translators: %d: products count */
+ _n( 'Failed to import %s product', 'Failed to import %s products', $failed, 'woocommerce' ),
+ '' . number_format_i18n( $failed ) . ''
+ );
+ }
+
+ if ( 0 < $failed || 0 < $skipped ) {
+ $results[] = '' . __( 'View import log', 'woocommerce' ) . '';
+ }
+
+ /* translators: %d: import results */
+ echo wp_kses_post( __( 'Import complete!', 'woocommerce' ) . ' ' . implode( '. ', $results ) );
+ ?>
+
+
+
+
+
diff --git a/includes/admin/importers/views/html-csv-import-footer.php b/includes/admin/importers/views/html-csv-import-footer.php
new file mode 100644
index 00000000000..cf35e17f042
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-footer.php
@@ -0,0 +1,13 @@
+
+
+
+
+
';
+ }
+
+ /**
+ * Define primary column.
+ *
+ * @return string
+ */
+ protected function get_primary_column() {
+ return 'order_number';
+ }
+
+ /**
+ * Get row actions to show in the list table.
+ *
+ * @param array $actions Array of actions.
+ * @param WP_Post $post Current post object.
+ * @return array
+ */
+ protected function get_row_actions( $actions, $post ) {
+ return array();
+ }
+
+ /**
+ * Define hidden columns.
+ *
+ * @return array
+ */
+ protected function define_hidden_columns() {
+ return array(
+ 'shipping_address',
+ 'billing_address',
+ 'wc_actions',
+ );
+ }
+
+ /**
+ * Define which columns are sortable.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_sortable_columns( $columns ) {
+ $custom = array(
+ 'order_number' => 'ID',
+ 'order_total' => 'order_total',
+ 'order_date' => 'date',
+ );
+ unset( $columns['comments'] );
+
+ return wp_parse_args( $custom, $columns );
+ }
+
+ /**
+ * Define which columns to show on this screen.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_columns( $columns ) {
+ $show_columns = array();
+ $show_columns['cb'] = $columns['cb'];
+ $show_columns['order_number'] = __( 'Order', 'woocommerce' );
+ $show_columns['order_date'] = __( 'Date', 'woocommerce' );
+ $show_columns['order_status'] = __( 'Status', 'woocommerce' );
+ $show_columns['billing_address'] = __( 'Billing', 'woocommerce' );
+ $show_columns['shipping_address'] = __( 'Ship to', 'woocommerce' );
+ $show_columns['order_total'] = __( 'Total', 'woocommerce' );
+ $show_columns['wc_actions'] = __( 'Actions', 'woocommerce' );
+
+ wp_enqueue_script( 'wc-orders' );
+
+ return $show_columns;
+ }
+
+ /**
+ * Define bulk actions.
+ *
+ * @param array $actions Existing actions.
+ * @return array
+ */
+ public function define_bulk_actions( $actions ) {
+ if ( isset( $actions['edit'] ) ) {
+ unset( $actions['edit'] );
+ }
+
+ $actions['mark_processing'] = __( 'Change status to processing', 'woocommerce' );
+ $actions['mark_on-hold'] = __( 'Change status to on-hold', 'woocommerce' );
+ $actions['mark_completed'] = __( 'Change status to completed', 'woocommerce' );
+ $actions['remove_personal_data'] = __( 'Remove personal data', 'woocommerce' );
+
+ return $actions;
+ }
+
+ /**
+ * Pre-fetch any data for the row each column has access to it. the_order global is there for bw compat.
+ *
+ * @param int $post_id Post ID being shown.
+ */
+ protected function prepare_row_data( $post_id ) {
+ global $the_order;
+
+ if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
+ $this->object = wc_get_order( $post_id );
+ $the_order = $this->object;
+ }
+ }
+
+ /**
+ * Render columm: order_number.
+ */
+ protected function render_order_number_column() {
+ $buyer = '';
+
+ if ( $this->object->get_billing_first_name() || $this->object->get_billing_last_name() ) {
+ /* translators: 1: first name 2: last name */
+ $buyer = trim( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $this->object->get_billing_first_name(), $this->object->get_billing_last_name() ) );
+ } elseif ( $this->object->get_billing_company() ) {
+ $buyer = trim( $this->object->get_billing_company() );
+ } elseif ( $this->object->get_customer_id() ) {
+ $user = get_user_by( 'id', $this->object->get_customer_id() );
+ $buyer = ucwords( $user->display_name );
+ }
+
+ if ( $this->object->get_status() === 'trash' ) {
+ echo '#' . esc_attr( $this->object->get_order_number() ) . ' ' . esc_html( $buyer ) . '';
+ } else {
+ echo '' . esc_html( __( 'Preview', 'woocommerce' ) ) . '';
+ echo '#' . esc_attr( $this->object->get_order_number() ) . ' ' . esc_html( $buyer ) . '';
+ }
+ }
+
+ /**
+ * Render columm: order_status.
+ */
+ protected function render_order_status_column() {
+ $tooltip = '';
+ $comment_count = get_comment_count( $this->object->get_id() );
+ $approved_comments_count = absint( $comment_count['approved'] );
+
+ if ( $approved_comments_count ) {
+ $latest_notes = wc_get_order_notes(
+ array(
+ 'order_id' => $this->object->get_id(),
+ 'limit' => 1,
+ 'orderby' => 'date_created_gmt',
+ )
+ );
+
+ $latest_note = current( $latest_notes );
+
+ if ( isset( $latest_note->content ) && 1 === $approved_comments_count ) {
+ $tooltip = wc_sanitize_tooltip( $latest_note->content );
+ } elseif ( isset( $latest_note->content ) ) {
+ /* translators: %d: notes count */
+ $tooltip = wc_sanitize_tooltip( $latest_note->content . '
diff --git a/includes/admin/importers/views/html-csv-import-mapping.php b/includes/admin/importers/views/html-csv-import-mapping.php
new file mode 100644
index 00000000000..20cdc422c7c
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-mapping.php
@@ -0,0 +1,65 @@
+
+
diff --git a/includes/admin/importers/views/html-csv-import-progress.php b/includes/admin/importers/views/html-csv-import-progress.php
new file mode 100644
index 00000000000..ea1ed336b0a
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-progress.php
@@ -0,0 +1,21 @@
+
+
';
+ }
+
+ /**
+ * Define primary column.
+ *
+ * @return string
+ */
+ protected function get_primary_column() {
+ return 'coupon_code';
+ }
+
+ /**
+ * Get row actions to show in the list table.
+ *
+ * @param array $actions Array of actions.
+ * @param WP_Post $post Current post object.
+ * @return array
+ */
+ protected function get_row_actions( $actions, $post ) {
+ unset( $actions['inline hide-if-no-js'] );
+ return $actions;
+ }
+
+ /**
+ * Define which columns to show on this screen.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_columns( $columns ) {
+ $show_columns = array();
+ $show_columns['cb'] = $columns['cb'];
+ $show_columns['coupon_code'] = __( 'Code', 'woocommerce' );
+ $show_columns['type'] = __( 'Coupon type', 'woocommerce' );
+ $show_columns['amount'] = __( 'Coupon amount', 'woocommerce' );
+ $show_columns['description'] = __( 'Description', 'woocommerce' );
+ $show_columns['products'] = __( 'Product IDs', 'woocommerce' );
+ $show_columns['usage'] = __( 'Usage / Limit', 'woocommerce' );
+ $show_columns['expiry_date'] = __( 'Expiry date', 'woocommerce' );
+
+ return $show_columns;
+ }
+
+ /**
+ * Pre-fetch any data for the row each column has access to it. the_coupon global is there for bw compat.
+ *
+ * @param int $post_id Post ID being shown.
+ */
+ protected function prepare_row_data( $post_id ) {
+ global $the_coupon;
+
+ if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
+ $this->object = new WC_Coupon( $post_id );
+ $the_coupon = $this->object;
+ }
+ }
+
+ /**
+ * Render columm: coupon_code.
+ */
+ protected function render_coupon_code_column() {
+ global $post;
+
+ $edit_link = get_edit_post_link( $this->object->get_id() );
+ $title = $this->object->get_code();
+
+ echo '' . esc_html( $title ) . '';
+ _post_states( $post );
+ echo '';
+ }
+
+ /**
+ * Render columm: type.
+ */
+ protected function render_type_column() {
+ echo esc_html( wc_get_coupon_type( $this->object->get_discount_type() ) );
+ }
+
+ /**
+ * Render columm: amount.
+ */
+ protected function render_amount_column() {
+ echo esc_html( wc_format_localized_price( $this->object->get_amount() ) );
+ }
+ /**
+ * Render columm: products.
+ */
+ protected function render_products_column() {
+ $product_ids = $this->object->get_product_ids();
+
+ if ( count( $product_ids ) > 0 ) {
+ echo esc_html( implode( ', ', $product_ids ) );
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Render columm: usage_limit.
+ */
+ protected function render_usage_limit_column() {
+ $usage_limit = $this->object->get_usage_limit();
+
+ if ( $usage_limit ) {
+ echo esc_html( $usage_limit );
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Render columm: usage.
+ */
+ protected function render_usage_column() {
+ $usage_count = $this->object->get_usage_count();
+ $usage_limit = $this->object->get_usage_limit();
+
+ printf(
+ /* translators: 1: count 2: limit */
+ __( '%1$s / %2$s', 'woocommerce' ),
+ esc_html( $usage_count ),
+ $usage_limit ? esc_html( $usage_limit ) : '∞'
+ );
+ }
+
+ /**
+ * Render columm: expiry_date.
+ */
+ protected function render_expiry_date_column() {
+ $expiry_date = $this->object->get_date_expires();
+
+ if ( $expiry_date ) {
+ echo esc_html( $expiry_date->date_i18n( 'F j, Y' ) );
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Render columm: description.
+ */
+ protected function render_description_column() {
+ echo wp_kses_post( $this->object->get_description() ? $this->object->get_description() : '–' );
+ }
+
+ /**
+ * Render any custom filters and search inputs for the list table.
+ */
+ protected function render_filters() {
+ ?>
+
+ ';
+ echo '
+
+
+
+
+
+
+
+
+
diff --git a/includes/admin/importers/views/html-csv-import-steps.php b/includes/admin/importers/views/html-csv-import-steps.php
new file mode 100644
index 00000000000..2f8c8f81bde
--- /dev/null
+++ b/includes/admin/importers/views/html-csv-import-steps.php
@@ -0,0 +1,26 @@
+
+-
+ steps as $step_key => $step ) : ?>
+ step ) {
+ $step_class = 'active';
+ } elseif ( array_search( $this->step, array_keys( $this->steps ), true ) > array_search( $step_key, array_keys( $this->steps ), true ) ) {
+ $step_class = 'done';
+ }
+ ?>
+
- + + + +
' . esc_html__( 'Coupons are a great way to offer discounts and rewards to your customers. They will appear here once created.', 'woocommerce' ) . '
'; + echo '' . esc_html__( 'Create your first coupon', 'woocommerce' ) . ''; + echo '' . esc_html__( 'Learn more about coupons', 'woocommerce' ) . ''; + echo '' . esc_html__( 'When you receive a new order, it will appear here.', 'woocommerce' ) . '
'; + echo '' . esc_html__( 'Learn more about orders', 'woocommerce' ) . ''; + echo '' . sprintf( _n( 'Plus %d other note', 'Plus %d other notes', ( $approved_comments_count - 1 ), 'woocommerce' ), $approved_comments_count - 1 ) . '' ); + } else { + /* translators: %d: notes count */ + $tooltip = wc_sanitize_tooltip( sprintf( _n( '%d note', '%d notes', $approved_comments_count, 'woocommerce' ), $approved_comments_count ) ); + } + } + + if ( $tooltip ) { + printf( '%s', esc_attr( sanitize_html_class( 'status-' . $this->object->get_status() ) ), wp_kses_post( $tooltip ), esc_html( wc_get_order_status_name( $this->object->get_status() ) ) ); + } else { + printf( '%s', esc_attr( sanitize_html_class( 'status-' . $this->object->get_status() ) ), esc_html( wc_get_order_status_name( $this->object->get_status() ) ) ); + } + } + + /** + * Render columm: order_date. + */ + protected function render_order_date_column() { + $order_timestamp = $this->object->get_date_created() ? $this->object->get_date_created()->getTimestamp() : ''; + + if ( ! $order_timestamp ) { + echo '–'; + return; + } + + // Check if the order was created within the last 24 hours, and not in the future. + if ( $order_timestamp > strtotime( '-1 day', current_time( 'timestamp', true ) ) && $order_timestamp <= current_time( 'timestamp', true ) ) { + $show_date = sprintf( + /* translators: %s: human-readable time difference */ + _x( '%s ago', '%s = human-readable time difference', 'woocommerce' ), + human_time_diff( $this->object->get_date_created()->getTimestamp(), current_time( 'timestamp', true ) ) + ); + } else { + $show_date = $this->object->get_date_created()->date_i18n( apply_filters( 'woocommerce_admin_order_date_format', __( 'M j, Y', 'woocommerce' ) ) ); + } + printf( + '', + esc_attr( $this->object->get_date_created()->date( 'c' ) ), + esc_html( $this->object->get_date_created()->date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ) ), + esc_html( $show_date ) + ); + } + + /** + * Render columm: order_total. + */ + protected function render_order_total_column() { + if ( $this->object->get_payment_method_title() ) { + /* translators: %s: method */ + echo '' . wp_kses_post( $this->object->get_formatted_order_total() ) . ''; + } else { + echo wp_kses_post( $this->object->get_formatted_order_total() ); + } + } + + /** + * Render columm: wc_actions. + */ + protected function render_wc_actions_column() { + echo '
'; + + do_action( 'woocommerce_admin_order_actions_start', $this->object ); + + $actions = array(); + + if ( $this->object->has_status( array( 'pending', 'on-hold' ) ) ) { + $actions['processing'] = array( + 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ), + 'name' => __( 'Processing', 'woocommerce' ), + 'action' => 'processing', + ); + } + + if ( $this->object->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) { + $actions['complete'] = array( + 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ), + 'name' => __( 'Complete', 'woocommerce' ), + 'action' => 'complete', + ); + } + + $actions = apply_filters( 'woocommerce_admin_order_actions', $actions, $this->object ); + + echo wc_render_action_buttons( $actions ); // WPCS: XSS ok. + + do_action( 'woocommerce_admin_order_actions_end', $this->object ); + + echo '
'; + } + + /** + * Render columm: billing_address. + */ + protected function render_billing_address_column() { + $address = $this->object->get_formatted_billing_address(); + + if ( $address ) { + echo esc_html( preg_replace( '#
+
+
+
+
';
+
+ return $html;
+ }
+
+ /**
+ * Get actions to display in the preview as HTML.
+ *
+ * @param WC_Order $order Order object.
+ * @return string
+ */
+ public static function get_order_preview_actions_html( $order ) {
+ $actions = array();
+ $status_actions = array();
+
+ if ( $order->has_status( array( 'pending' ) ) ) {
+ $status_actions['on-hold'] = array(
+ 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=on-hold&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+ 'name' => __( 'On-hold', 'woocommerce' ),
+ 'title' => __( 'Change order status to on-hold', 'woocommerce' ),
+ 'action' => 'on-hold',
+ );
+ }
+
+ if ( $order->has_status( array( 'pending', 'on-hold' ) ) ) {
+ $status_actions['processing'] = array(
+ 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+ 'name' => __( 'Processing', 'woocommerce' ),
+ 'title' => __( 'Change order status to processing', 'woocommerce' ),
+ 'action' => 'processing',
+ );
+ }
+
+ if ( $order->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) {
+ $status_actions['complete'] = array(
+ 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $order->get_id() ), 'woocommerce-mark-order-status' ),
+ 'name' => __( 'Completed', 'woocommerce' ),
+ 'title' => __( 'Change order status to completed', 'woocommerce' ),
+ 'action' => 'complete',
+ );
+ }
+
+ if ( $status_actions ) {
+ $actions['status'] = array(
+ 'group' => __( 'Change status: ', 'woocommerce' ),
+ 'actions' => $status_actions,
+ );
+ }
+
+ return wc_render_action_buttons( apply_filters( 'woocommerce_admin_order_preview_actions', $actions, $order ) );
+ }
+
+ /**
+ * Get order details to send to the ajax endpoint for previews.
+ *
+ * @param WC_Order $order Order object.
+ * @return array
+ */
+ public static function order_preview_get_order_details( $order ) {
+ if ( ! $order ) {
+ return array();
+ }
+
+ $payment_via = $order->get_payment_method_title();
+ $payment_method = $order->get_payment_method();
+ $payment_gateways = WC()->payment_gateways() ? WC()->payment_gateways->payment_gateways() : array();
+ $transaction_id = $order->get_transaction_id();
+
+ if ( $transaction_id ) {
+
+ $url = isset( $payment_gateways[ $payment_method ] ) ? $payment_gateways[ $payment_method ]->get_transaction_url( $order ) : false;
+
+ if ( $url ) {
+ $payment_via .= ' (' . esc_html( $transaction_id ) . ')';
+ } else {
+ $payment_via .= ' (' . esc_html( $transaction_id ) . ')';
+ }
+ }
+
+ $billing_address = $order->get_formatted_billing_address();
+ $shipping_address = $order->get_formatted_shipping_address();
+
+ return apply_filters(
+ 'woocommerce_admin_order_preview_get_order_details', array(
+ 'data' => $order->get_data(),
+ 'order_number' => $order->get_order_number(),
+ 'item_html' => WC_Admin_List_Table_Orders::get_order_preview_item_html( $order ),
+ 'actions_html' => WC_Admin_List_Table_Orders::get_order_preview_actions_html( $order ),
+ 'ship_to_billing' => wc_ship_to_billing_address_only(),
+ 'needs_shipping' => $order->needs_shipping_address(),
+ 'formatted_billing_address' => $billing_address ? $billing_address : __( 'N/A', 'woocommerce' ),
+ 'formatted_shipping_address' => $shipping_address ? $shipping_address : __( 'N/A', 'woocommerce' ),
+ 'shipping_address_map_url' => $order->get_shipping_address_map_url(),
+ 'payment_via' => $payment_via,
+ 'shipping_via' => $order->get_shipping_method(),
+ 'status' => $order->get_status(),
+ 'status_name' => wc_get_order_status_name( $order->get_status() ),
+ ), $order
+ );
+ }
+
+ /**
+ * Handle bulk actions.
+ *
+ * @param string $redirect_to URL to redirect to.
+ * @param string $action Action name.
+ * @param array $ids List of ids.
+ * @return string
+ */
+ public function handle_bulk_actions( $redirect_to, $action, $ids ) {
+ $ids = apply_filters( 'woocommerce_bulk_action_ids', array_reverse( array_map( 'absint', $ids ) ), $action, 'order' );
+ $changed = 0;
+
+ if ( 'remove_personal_data' === $action ) {
+ $report_action = 'removed_personal_data';
+
+ foreach ( $ids as $id ) {
+ $order = wc_get_order( $id );
+
+ if ( $order ) {
+ do_action( 'woocommerce_remove_order_personal_data', $order );
+ $changed++;
+ }
+ }
+ } elseif ( false !== strpos( $action, 'mark_' ) ) {
+ $order_statuses = wc_get_order_statuses();
+ $new_status = substr( $action, 5 ); // Get the status name from action.
+ $report_action = 'marked_' . $new_status;
+
+ // Sanity check: bail out if this is actually not a status, or is not a registered status.
+ if ( isset( $order_statuses[ 'wc-' . $new_status ] ) ) {
+ // Initialize payment gateways in case order has hooked status transition actions.
+ wc()->payment_gateways();
+
+ foreach ( $ids as $id ) {
+ $order = wc_get_order( $id );
+ $order->update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ), true );
+ do_action( 'woocommerce_order_edit_status', $id, $new_status );
+ $changed++;
+ }
+ }
+ }
+
+ if ( $changed ) {
+ $redirect_to = add_query_arg(
+ array(
+ 'post_type' => $this->list_table_type,
+ 'bulk_action' => $report_action,
+ 'changed' => $changed,
+ 'ids' => join( ',', $ids ),
+ ), $redirect_to
+ );
+ }
+
+ return esc_url_raw( $redirect_to );
+ }
+
+ /**
+ * Show confirmation message that order status changed for number of orders.
+ */
+ public function bulk_admin_notices() {
+ global $post_type, $pagenow;
+
+ // Bail out if not on shop order list page.
+ if ( 'edit.php' !== $pagenow || 'shop_order' !== $post_type || ! isset( $_REQUEST['bulk_action'] ) ) { // WPCS: input var ok, CSRF ok.
+ return;
+ }
+
+ $order_statuses = wc_get_order_statuses();
+ $number = isset( $_REQUEST['changed'] ) ? absint( $_REQUEST['changed'] ) : 0; // WPCS: input var ok, CSRF ok.
+ $bulk_action = wc_clean( wp_unslash( $_REQUEST['bulk_action'] ) ); // WPCS: input var ok, CSRF ok.
+
+ // Check if any status changes happened.
+ foreach ( $order_statuses as $slug => $name ) {
+ if ( 'marked_' . str_replace( 'wc-', '', $slug ) === $bulk_action ) { // WPCS: input var ok, CSRF ok.
+ /* translators: %d: orders count */
+ $message = sprintf( _n( '%d order status changed.', '%d order statuses changed.', $number, 'woocommerce' ), number_format_i18n( $number ) );
+ echo '| ' . esc_html( $label ) . ' | '; + } + + $html .= ' +||
|---|---|---|
| ';
+ switch ( $column ) {
+ case 'product':
+ $html .= wp_kses_post( $item->get_name() );
+
+ if ( $product_object ) {
+ $html .= ' ' . esc_html( $product_object->get_sku() ) . ' ';
+ }
+
+ $meta_data = $item->get_formatted_meta_data( '' );
+
+ if ( $meta_data ) {
+ $html .= '
| ';
+ }
+
+ $html .= '
' . esc_html( $message ) . '
' . esc_html( $message ) . '
' . esc_html__( 'Ready to start selling something awesome?', 'woocommerce' ) . '
'; + echo '' . esc_html__( 'Create your first product!', 'woocommerce' ) . ''; + echo '' . esc_html__( 'Import products from a CSV file', 'woocommerce' ) . ''; + echo ''; + } + + /** + * Define primary column. + * + * @return string + */ + protected function get_primary_column() { + return 'name'; + } + + /** + * Get row actions to show in the list table. + * + * @param array $actions Array of actions. + * @param WP_Post $post Current post object. + * @return array + */ + protected function get_row_actions( $actions, $post ) { + /* translators: %d: product ID. */ + return array_merge( array( 'id' => sprintf( __( 'ID: %d', 'woocommerce' ), $post->ID ) ), $actions ); + } + + /** + * Define which columns are sortable. + * + * @param array $columns Existing columns. + * @return array + */ + public function define_sortable_columns( $columns ) { + $custom = array( + 'price' => 'price', + 'sku' => 'sku', + 'name' => 'title', + ); + return wp_parse_args( $custom, $columns ); + } + + /** + * Define which columns to show on this screen. + * + * @param array $columns Existing columns. + * @return array + */ + public function define_columns( $columns ) { + if ( empty( $columns ) && ! is_array( $columns ) ) { + $columns = array(); + } + + unset( $columns['title'], $columns['comments'], $columns['date'] ); + + $show_columns = array(); + $show_columns['cb'] = ''; + $show_columns['thumb'] = '' . __( 'Image', 'woocommerce' ) . ''; + $show_columns['name'] = __( 'Name', 'woocommerce' ); + + if ( wc_product_sku_enabled() ) { + $show_columns['sku'] = __( 'SKU', 'woocommerce' ); + } + + if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) { + $show_columns['is_in_stock'] = __( 'Stock', 'woocommerce' ); + } + + $show_columns['price'] = __( 'Price', 'woocommerce' ); + $show_columns['product_cat'] = __( 'Categories', 'woocommerce' ); + $show_columns['product_tag'] = __( 'Tags', 'woocommerce' ); + $show_columns['featured'] = '' . __( 'Featured', 'woocommerce' ) . ''; + $show_columns['date'] = __( 'Date', 'woocommerce' ); + + return array_merge( $show_columns, $columns ); + } + + /** + * Pre-fetch any data for the row each column has access to it. the_product global is there for bw compat. + * + * @param int $post_id Post ID being shown. + */ + protected function prepare_row_data( $post_id ) { + global $the_product; + + if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) { + $the_product = wc_get_product( $post_id ); + $this->object = $the_product; + } + } + + /** + * Render columm: thumb. + */ + protected function render_thumb_column() { + echo '' . $this->object->get_image( 'thumbnail' ) . ''; // WPCS: XSS ok. + } + + /** + * Render column: name. + */ + protected function render_name_column() { + global $post; + + $edit_link = get_edit_post_link( $this->object->get_id() ); + $title = _draft_or_post_title(); + + echo '' . esc_html( $title ) . ''; + + _post_states( $post ); + + echo ''; + + if ( $this->object->get_parent_id() > 0 ) { + echo ' ← ' . get_the_title( $this->object->get_parent_id() ) . ''; + } + + get_inline_data( $post ); + + /* Custom inline data for woocommerce. */ + echo ' +
+
+
+ ';
+ }
+
+ /**
+ * Render columm: sku.
+ */
+ protected function render_sku_column() {
+ echo $this->object->get_sku() ? esc_html( $this->object->get_sku() ) : '–';
+ }
+
+ /**
+ * Render columm: price.
+ */
+ protected function render_price_column() {
+ echo $this->object->get_price_html() ? wp_kses_post( $this->object->get_price_html() ) : '–';
+ }
+
+ /**
+ * Render columm: product_cat.
+ */
+ protected function render_product_cat_column() {
+ $terms = get_the_terms( $this->object->get_id(), 'product_cat' );
+ if ( ! $terms ) {
+ echo '–';
+ } else {
+ $termlist = array();
+ foreach ( $terms as $term ) {
+ $termlist[] = '' . esc_html( $term->name ) . '';
+ }
+
+ echo apply_filters( 'woocommerce_admin_product_term_list', implode( ', ', $termlist ), 'product_cat', $this->object->get_id(), $termlist, $terms ); // WPCS: XSS ok.
+ }
+ }
+
+ /**
+ * Render columm: product_tag.
+ */
+ protected function render_product_tag_column() {
+ $terms = get_the_terms( $this->object->get_id(), 'product_tag' );
+ if ( ! $terms ) {
+ echo '–';
+ } else {
+ $termlist = array();
+ foreach ( $terms as $term ) {
+ $termlist[] = '' . esc_html( $term->name ) . '';
+ }
+
+ echo apply_filters( 'woocommerce_admin_product_term_list', implode( ', ', $termlist ), 'product_tag', $this->object->get_id(), $termlist, $terms ); // WPCS: XSS ok.
+ }
+ }
+
+ /**
+ * Render columm: featured.
+ */
+ protected function render_featured_column() {
+ $url = wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_feature_product&product_id=' . $this->object->get_id() ), 'woocommerce-feature-product' );
+ echo '';
+ if ( $this->object->is_featured() ) {
+ echo '' . esc_html__( 'Yes', 'woocommerce' ) . '';
+ } else {
+ echo '' . esc_html__( 'No', 'woocommerce' ) . '';
+ }
+ echo '';
+ }
+
+ /**
+ * Render columm: is_in_stock.
+ */
+ protected function render_is_in_stock_column() {
+ if ( $this->object->is_on_backorder() ) {
+ $stock_html = '' . __( 'On backorder', 'woocommerce' ) . '';
+ } elseif ( $this->object->is_in_stock() ) {
+ $stock_html = '' . __( 'In stock', 'woocommerce' ) . '';
+ } else {
+ $stock_html = '' . __( 'Out of stock', 'woocommerce' ) . '';
+ }
+
+ if ( $this->object->managing_stock() ) {
+ $stock_html .= ' (' . wc_stock_amount( $this->object->get_stock_quantity() ) . ')';
+ }
+
+ echo wp_kses_post( apply_filters( 'woocommerce_admin_stock_html', $stock_html, $this->object ) );
+ }
+
+ /**
+ * Query vars for custom searches.
+ *
+ * @param mixed $public_query_vars Array of query vars.
+ * @return array
+ */
+ public function add_custom_query_var( $public_query_vars ) {
+ $public_query_vars[] = 'sku';
+ return $public_query_vars;
+ }
+
+ /**
+ * Render any custom filters and search inputs for the list table.
+ */
+ protected function render_filters() {
+ $filters = apply_filters(
+ 'woocommerce_products_admin_list_table_filters',
+ array(
+ 'product_category' => array( $this, 'render_products_category_filter' ),
+ 'product_type' => array( $this, 'render_products_type_filter' ),
+ 'stock_status' => array( $this, 'render_products_stock_status_filter' ),
+ )
+ );
+
+ ob_start();
+ foreach ( $filters as $filter_callback ) {
+ call_user_func( $filter_callback );
+ }
+ $output = ob_get_clean();
+
+ echo apply_filters( 'woocommerce_product_filters', $output ); // WPCS: XSS ok.
+ }
+
+ /**
+ * Render the product category filter for the list table.
+ *
+ * @since 3.5.0
+ */
+ protected function render_products_category_filter() {
+ $categories_count = (int) wp_count_terms( 'product_cat' );
+
+ if ( $categories_count <= apply_filters( 'woocommerce_product_category_filter_threshold', 100 ) ) {
+ wc_product_dropdown_categories(
+ array(
+ 'option_select_text' => __( 'Filter by category', 'woocommerce' ),
+ 'hide_empty' => 0,
+ )
+ );
+ } else {
+ $current_category_slug = isset( $_GET['product_cat'] ) ? wc_clean( wp_unslash( $_GET['product_cat'] ) ) : false; // WPCS: input var ok, CSRF ok.
+ $current_category = $current_category_slug ? get_term_by( 'slug', $current_category_slug, 'product_cat' ) : false;
+ ?>
+
+ ';
+
+ foreach ( wc_get_product_types() as $value => $label ) {
+ $output .= '' . esc_html( $this->object->get_sku() ) . '
+ ' . esc_html( $this->object->get_regular_price() ) . '
+ ' . esc_html( $this->object->get_sale_price() ) . '
+ ' . esc_html( $this->object->get_weight() ) . '
+ ' . esc_html( $this->object->get_length() ) . '
+ ' . esc_html( $this->object->get_width() ) . '
+ ' . esc_html( $this->object->get_height() ) . '
+ ' . esc_html( $this->object->get_shipping_class() ) . '
+ ' . esc_html( $this->object->get_catalog_visibility() ) . '
+ ' . esc_html( $this->object->get_stock_status() ) . '
+ ' . esc_html( $this->object->get_stock_quantity() ) . '
+ ' . esc_html( wc_bool_to_string( $this->object->get_manage_stock() ) ) . '
+ ' . esc_html( wc_bool_to_string( $this->object->get_featured() ) ) . '
+ ' . esc_html( $this->object->get_type() ) . '
+ ' . esc_html( wc_bool_to_string( $this->object->get_virtual() ) ) . '
+ ' . esc_html( $this->object->get_tax_status() ) . '
+ ' . esc_html( $this->object->get_tax_class() ) . '
+ ' . esc_html( $this->object->get_backorders() ) . '
+ ' . esc_html( $this->object->get_low_stock_amount() ) . '
+