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

Closes woocommerce/woocommerce-blocks#84: Adds order setting to individual product scope

This commit is contained in:
Tiago Noronha 2018-04-05 18:22:44 +01:00
parent 08ec9fa803
commit 5d42920036
2 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
plugins/woocommerce-blocks/assets/js/products-block.js
View File

@ -570,7 +570,6 @@ var ProductsBlockPreview = withAPIData(function (_ref) {
if ('specific' === display) {
query.include = display_setting.join(',');
query.orderby = 'include';
} else if ('category' === display) {
query.category = display_setting.join(',');
} else if ('attribute' === display && display_setting.length) {
@ -586,7 +585,7 @@ var ProductsBlockPreview = withAPIData(function (_ref) {
}
// @todo Add support for orderby by sales, rating, and price to the API.
if ('specific' !== display && ('title' === orderby || 'date' === orderby)) {
if ('title' === orderby || 'date' === orderby) {
query.orderby = orderby;
if ('title' === orderby) {
@ -753,37 +752,34 @@ registerBlockType('woocommerce/products', {
});
}
// Orderby settings don't make sense for specific-selected products display.
var orderControl = null;
if ('specific' !== display) {
orderControl = wp.element.createElement(SelectControl, {
key: 'query-panel-select',
label: __('Order Products By'),
value: orderby,
options: [{
label: __('Newness - newest first'),
value: 'date'
}, {
label: __('Price - low to high'),
value: 'price_asc'
}, {
label: __('Price - high to low'),
value: 'price_desc'
}, {
label: __('Rating - highest first'),
value: 'rating'
}, {
label: __('Sales - most first'),
value: 'popularity'
}, {
label: __('Title - alphabetical'),
value: 'title'
}],
onChange: function onChange(value) {
return setAttributes({ orderby: value });
}
});
}
// Order controls
var orderControl = wp.element.createElement(SelectControl, {
key: 'query-panel-select',
label: __('Order Products By'),
value: orderby,
options: [{
label: __('Newness - newest first'),
value: 'date'
}, {
label: __('Price - low to high'),
value: 'price_asc'
}, {
label: __('Price - high to low'),
value: 'price_desc'
}, {
label: __('Rating - highest first'),
value: 'rating'
}, {
label: __('Sales - most first'),
value: 'popularity'
}, {
label: __('Title - alphabetical'),
value: 'title'
}],
onChange: function onChange(value) {
return setAttributes({ orderby: value });
}
});
// Row settings don't make sense for specific-selected products display.
var rowControl = null;

76
plugins/woocommerce-blocks/assets/js/products-block.jsx
View File

@ -337,7 +337,6 @@ const ProductsBlockPreview = withAPIData( ( { attributes } ) => {
if ( 'specific' === display ) {
query.include = display_setting.join( ',' );
query.orderby = 'include';
} else if ( 'category' === display ) {
query.category = display_setting.join( ',' );
} else if ( 'attribute' === display && display_setting.length ) {
@ -353,7 +352,7 @@ const ProductsBlockPreview = withAPIData( ( { attributes } ) => {
}
// @todo Add support for orderby by sales, rating, and price to the API.
if ( 'specific' !== display && ( 'title' === orderby || 'date' === orderby ) ) {
if ( 'title' === orderby || 'date' === orderby ) {
query.orderby = orderby;
if ( 'title' === orderby ) {
@ -486,44 +485,41 @@ registerBlockType( 'woocommerce/products', {
);
}
// Orderby settings don't make sense for specific-selected products display.
let orderControl = null;
if ( 'specific' !== display ) {
orderControl = (
<SelectControl
key="query-panel-select"
label={ __( 'Order Products By' ) }
value={ orderby }
options={ [
{
label: __( 'Newness - newest first' ),
value: 'date',
},
{
label: __( 'Price - low to high' ),
value: 'price_asc',
},
{
label: __( 'Price - high to low' ),
value: 'price_desc',
},
{
label: __( 'Rating - highest first' ),
value: 'rating',
},
{
label: __( 'Sales - most first' ),
value: 'popularity',
},
{
label: __( 'Title - alphabetical' ),
value: 'title',
},
] }
onChange={ ( value ) => setAttributes( { orderby: value } ) }
/>
);
}
// Order controls
let orderControl = (
<SelectControl
key="query-panel-select"
label={ __( 'Order Products By' ) }
value={ orderby }
options={ [
{
label: __( 'Newness - newest first' ),
value: 'date',
},
{
label: __( 'Price - low to high' ),
value: 'price_asc',
},
{
label: __( 'Price - high to low' ),
value: 'price_desc',
},
{
label: __( 'Rating - highest first' ),
value: 'rating',
},
{
label: __( 'Sales - most first' ),
value: 'popularity',
},
{
label: __( 'Title - alphabetical' ),
value: 'title',
},
] }
onChange={ ( value ) => setAttributes( { orderby: value } ) }
/>
);
// Row settings don't make sense for specific-selected products display.
let rowControl = null;