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 #17021 from woocommerce/fix/17004 

Allow wc_get_formatted_variation to skip attributes used in the variation's name
This commit is contained in:
Claudio Sanches 2017-10-02 13:10:31 -03:00 committed by GitHub
parent 590838eb82 8eb500b8c1
commit fe819a8be2
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/class-wc-product-variation.php
View File

@ -90,7 +90,7 @@ class WC_Product_Variation extends WC_Product_Simple {
$identifier = '#' . $this->get_id();
}
$formatted_variation_list = wc_get_formatted_variation( $this, true, true );
$formatted_variation_list = wc_get_formatted_variation( $this, true, true, true );
return sprintf( '%2$s (%1$s)', $identifier, $this->get_name() ) . '<span class="description">' . $formatted_variation_list . '</span>';
}

24
includes/wc-product-functions.php
View File

@ -293,19 +293,22 @@ function wc_placeholder_img( $size = 'shop_thumbnail' ) {
*
* Gets a formatted version of variation data or item meta.
*
* @param array|WC_Product_Variation $variation
* @param bool $flat (default: false)
* @param bool $include_names include attribute names/labels
* @param array|WC_Product_Variation $variation Variation object.
* @param bool $flat (default: false) Should this be a flat list or HTML list?
* @param bool $include_names include attribute names/labels in the list.
* @param bool $skip_attributes_in_name Do not list attributes already part of the variation name.
* @return string
*/
function wc_get_formatted_variation( $variation, $flat = false, $include_names = true ) {
function wc_get_formatted_variation( $variation, $flat = false, $include_names = true, $skip_attributes_in_name = false ) {
$return = '';
if ( is_a( $variation, 'WC_Product_Variation' ) ) {
$variation_attributes = $variation->get_attributes();
$product = $variation;
$variation_name = $variation->get_name();
} else {
$product = false;
$product = false;
$variation_name = '';
// Remove attribute_ prefix from names.
$variation_attributes = array();
if ( is_array( $variation ) ) {
@ -326,11 +329,7 @@ function wc_get_formatted_variation( $variation, $flat = false, $include_names =
$variation_list = array();
foreach ( $variation_attributes as $name => $value ) {
if ( ! $value ) {
continue;
}
// If this is a term slug, get the term's nice name
// If this is a term slug, get the term's nice name.
if ( taxonomy_exists( $name ) ) {
$term = get_term_by( 'slug', $value, $name );
if ( ! is_wp_error( $term ) && ! empty( $term->name ) ) {
@ -338,6 +337,11 @@ function wc_get_formatted_variation( $variation, $flat = false, $include_names =
}
}
// Do not list attributes already part of the variation name.
if ( '' === $value || ( $skip_attributes_in_name && wc_is_attribute_in_product_name( $value, $variation_name ) ) ) {
continue;
}
if ( $include_names ) {
if ( $flat ) {
$variation_list[] = wc_attribute_label( $name, $product ) . ': ' . rawurldecode( $value );