Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17389 from woocommerce/fix/importer-placeholders 

Fixed how apply strtolower in columns names in the importer auto map
This commit is contained in:
Mike Jolley 2017-10-26 12:56:31 +01:00 committed by GitHub
parent 3b6361b28f 6782cfaca5
commit 82c5edc7aa
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
includes/admin/importers/class-wc-product-csv-importer-controller.php
View File

@ -379,6 +379,22 @@ class WC_Product_CSV_Importer_Controller {
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.
*
@ -395,8 +411,9 @@ class WC_Product_CSV_Importer_Controller {
/**
* @hooked wc_importer_generic_mappings - 10
* @hooked wc_importer_wordpress_mappings - 10
* @hooked wc_importer_default_english_mappings - 100
*/
$default_columns = apply_filters( 'woocommerce_csv_product_import_mapping_default_columns', array(
$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',
@ -435,26 +452,20 @@ class WC_Product_CSV_Importer_Controller {
__( 'External URL', 'woocommerce' ) => 'product_url',
__( 'Button text', 'woocommerce' ) => 'button_text',
__( 'Position', 'woocommerce' ) => 'menu_order',
) );
) ) );
// Normalize the columns so they are case-insensitive.
$normalized_default_columns = array();
foreach ( $default_columns as $key => $val ) {
$normalized_default_columns[ strtolower( $key ) ] = $val;
}
$special_columns = $this->get_special_columns( apply_filters( 'woocommerce_csv_product_import_mapping_special_columns',
$special_columns = $this->get_special_columns( $this->normalize_columns_names( apply_filters( 'woocommerce_csv_product_import_mapping_special_columns',
array(
strtolower( __( 'Attribute %d name', 'woocommerce' ) ) => 'attributes:name',
strtolower( __( 'Attribute %d value(s)', 'woocommerce' ) ) => 'attributes:value',
strtolower( __( 'Attribute %d visible', 'woocommerce' ) ) => 'attributes:visible',
strtolower( __( 'Attribute %d global', 'woocommerce' ) ) => 'attributes:taxonomy',
strtolower( __( 'Attribute %d default', 'woocommerce' ) ) => 'attributes:default',
strtolower( __( 'Download %d name', 'woocommerce' ) ) => 'downloads:name',
strtolower( __( 'Download %d URL', 'woocommerce' ) ) => 'downloads:url',
strtolower( __( 'Meta: %s', 'woocommerce' ) ) => 'meta:',
__( 'Attribute %d name', 'woocommerce' ) => 'attributes:name',
__( 'Attribute %d value(s)', 'woocommerce' ) => 'attributes:value',
__( 'Attribute %d visible', 'woocommerce' ) => 'attributes:visible',
__( 'Attribute %d global', 'woocommerce' ) => 'attributes:taxonomy',
__( 'Attribute %d default', 'woocommerce' ) => 'attributes:default',
__( 'Download %d name', 'woocommerce' ) => 'downloads:name',
__( 'Download %d URL', 'woocommerce' ) => 'downloads:url',
__( 'Meta: %s', 'woocommerce' ) => 'meta:',
)
) );
) ) );
$headers = array();
foreach ( $raw_headers as $key => $field ) {
@ -462,8 +473,8 @@ class WC_Product_CSV_Importer_Controller {
$index = $num_indexes ? $key : $field;
$headers[ $index ] = $field;
if ( isset( $normalized_default_columns[ $field ] ) ) {
$headers[ $index ] = $normalized_default_columns[ $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 ) ) {