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

Merge branch 'master' into regenerate-warning

This commit is contained in:
Umesh Ghimire 2017-11-29 12:58:29 +05:45
parent 9cfdb6cbea eb6374dc7a
commit f642440b99
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/api/v1/class-wc-rest-report-sales-controller.php
View File

@ -378,7 +378,7 @@ class WC_REST_Report_Sales_V1_Controller extends WC_REST_Controller {
), ),
'date_min' => array( 'date_min' => array(
/* translators: %s: date format */ /* translators: %s: date format */
'description' => sprintf( __( 'Return sales for a specific start date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-AA' ), 'description' => sprintf( __( 'Return sales for a specific start date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-DD' ),
'type' => 'string', 'type' => 'string',
'format' => 'date', 'format' => 'date',
'validate_callback' => 'wc_rest_validate_reports_request_arg', 'validate_callback' => 'wc_rest_validate_reports_request_arg',
@ -386,7 +386,7 @@ class WC_REST_Report_Sales_V1_Controller extends WC_REST_Controller {
), ),
'date_max' => array( 'date_max' => array(
/* translators: %s: date format */ /* translators: %s: date format */
'description' => sprintf( __( 'Return sales for a specific end date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-AA' ), 'description' => sprintf( __( 'Return sales for a specific end date, the date need to be in the %s format.', 'woocommerce' ), 'YYYY-MM-DD' ),
'type' => 'string', 'type' => 'string',
'format' => 'date', 'format' => 'date',
'validate_callback' => 'wc_rest_validate_reports_request_arg', 'validate_callback' => 'wc_rest_validate_reports_request_arg',

4
includes/import/abstract-wc-product-importer.php
View File

@ -503,7 +503,7 @@ abstract class WC_Product_Importer implements WC_Importer_Interface {
* @param int $product_id Product ID. * @param int $product_id Product ID.
* @return int * @return int
*/ */
protected function get_attachment_id_from_url( $url, $product_id ) { public function get_attachment_id_from_url( $url, $product_id ) {
if ( empty( $url ) ) { if ( empty( $url ) ) {
return 0; return 0;
} }
@ -590,7 +590,7 @@ abstract class WC_Product_Importer implements WC_Importer_Interface {
* @param string $name Attribute name. * @param string $name Attribute name.
* @return int * @return int
*/ */
protected function get_attribute_taxonomy_id( $raw_name ) { public function get_attribute_taxonomy_id( $raw_name ) {
global $wpdb, $wc_product_attributes; global $wpdb, $wc_product_attributes;
// These are exported as labels, so convert the label to a name if possible first. // These are exported as labels, so convert the label to a name if possible first.

2
package.json
View File

@ -10,6 +10,8 @@
"license": "GPL-3.0+", "license": "GPL-3.0+",
"main": "Gruntfile.js", "main": "Gruntfile.js",
"scripts": { "scripts": {
"build": "grunt",
"build-watch": "grunt watch",
"test": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha \"tests/e2e-tests\" --compilers js:babel-register --recursive", "test": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha \"tests/e2e-tests\" --compilers js:babel-register --recursive",
"test:grep": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha \"tests/e2e-tests\" --compilers js:babel-register --grep ", "test:grep": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha \"tests/e2e-tests\" --compilers js:babel-register --grep ",
"test:single": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha --compilers js:babel-register" "test:single": "cross-env NODE_CONFIG_DIR='./tests/e2e-tests/config' BABEL_ENV=commonjs mocha --compilers js:babel-register"