Merge remote-tracking branch 'woothemes/master'

This commit is contained in:
Job 2016-06-06 12:37:32 +02:00
commit f231b6edbb
17 changed files with 224 additions and 111 deletions

File diff suppressed because one or more lines are too long

View File

@ -106,11 +106,8 @@
}
}
.woocommerce-message {
position: relative;
border-left-color: #cc99c2 !important;
overflow: hidden;
.woocommerce-message,
.woocommerce-BlankState {
a.button-primary,
button.button-primary {
background: #bb77ae;
@ -127,6 +124,12 @@
box-shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 0 #A36597;
}
}
}
.woocommerce-message {
position: relative;
border-left-color: #cc99c2 !important;
overflow: hidden;
a.skip,
a.docs {
@ -4613,6 +4616,55 @@ table.bar_chart {
}
}
.post-type-shop_order {
.woocommerce-BlankState-message:before {
@include icon( "\e01d" );
}
}
.post-type-shop_coupon {
.woocommerce-BlankState-message:before {
@include icon( "\e600" );
}
}
.post-type-product {
.woocommerce-BlankState-message:before {
@include icon( "\e006" );
}
}
.woocommerce-BlankState {
text-align: center;
padding: 5em 0 0;
.woocommerce-BlankState-message {
color: #aaa;
margin: 0 auto 1.5em;
line-height: 1.5em;
font-size: 1.2em;
max-width: 500px;
&:before {
color: #ddd;
text-shadow: 0 -1px 1px rgba(0,0,0,0.2), 0 1px 0 rgba(255,255,255,0.8);
font-size: 8em;
display: block;
position: relative !important;
top: auto;
left: auto;
line-height: 1em;
margin: 0 0 0.1875em 0;
}
}
.woocommerce-BlankState-cta {
font-size: 1.2em;
padding: .75em 1.5em;
height: auto;
}
}
/**
* Small screen optimisation
*/

View File

@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.6.0-beta-4\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
"POT-Creation-Date: 2016-06-02 22:50:08+00:00\n"
"POT-Creation-Date: 2016-06-05 22:43:09+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -5045,19 +5045,19 @@ msgstr ""
msgid "out of 5"
msgstr ""
#: includes/abstracts/abstract-wc-rest-controller.php:64
#: includes/abstracts/abstract-wc-rest-controller.php:96
msgid "Unable to accept more than %s items for this request."
msgstr ""
#: includes/abstracts/abstract-wc-rest-controller.php:168
#: includes/abstracts/abstract-wc-rest-controller.php:200
msgid "List of created resources."
msgstr ""
#: includes/abstracts/abstract-wc-rest-controller.php:173
#: includes/abstracts/abstract-wc-rest-controller.php:205
msgid "List of updated resources."
msgstr ""
#: includes/abstracts/abstract-wc-rest-controller.php:178
#: includes/abstracts/abstract-wc-rest-controller.php:210
msgid "List of delete resources."
msgstr ""
@ -5070,6 +5070,8 @@ msgstr ""
#: includes/api/class-wc-rest-product-reviews-controller.php:74
#: includes/api/class-wc-rest-report-sales-controller.php:69
#: includes/api/class-wc-rest-reports-controller.php:62
#: includes/api/class-wc-rest-tax-classes-controller.php:83
#: includes/api/class-wc-rest-taxes-controller.php:107
#: includes/api/class-wc-rest-webhook-deliveries.php:74
msgid "Sorry, you cannot list resources."
msgstr ""
@ -5086,6 +5088,7 @@ msgstr ""
#: includes/abstracts/abstract-wc-rest-terms-controller.php:146
#: includes/api/class-wc-rest-customers-controller.php:148
#: includes/api/class-wc-rest-order-notes-controller.php:132
#: includes/api/class-wc-rest-product-attributes-controller.php:150
#: includes/api/class-wc-rest-product-reviews-controller.php:90
#: includes/api/class-wc-rest-taxes-controller.php:135
#: includes/api/class-wc-rest-webhook-deliveries.php:90
@ -5428,7 +5431,7 @@ msgstr ""
#: includes/admin/class-wc-admin-api-keys.php:142
#: includes/admin/class-wc-admin-api-keys.php:157
#: includes/admin/class-wc-admin-notices.php:128
#: includes/admin/class-wc-admin-notices.php:129
#: includes/admin/class-wc-admin-settings.php:75
#: includes/admin/class-wc-admin-webhooks.php:128
#: includes/admin/class-wc-admin-webhooks.php:185
@ -6240,7 +6243,7 @@ msgstr ""
msgid "Reviews"
msgstr ""
#: includes/admin/class-wc-admin-notices.php:132
#: includes/admin/class-wc-admin-notices.php:133
#: includes/class-wc-checkout.php:74 includes/class-wc-checkout.php:83
#: includes/class-wc-emails.php:48 includes/class-wc-emails.php:57
#: includes/class-wc-payment-gateways.php:51
@ -10191,7 +10194,7 @@ msgid "Set Default Payment Method"
msgstr ""
#: includes/admin/settings/class-wc-settings-checkout.php:215
msgid "Endpoint for the setting a default payment page"
msgid "Endpoint for the setting a default payment method page"
msgstr ""
#: includes/admin/settings/class-wc-settings-checkout.php:229
@ -10826,6 +10829,7 @@ msgstr ""
#: includes/admin/settings/views/html-admin-page-shipping-zone-methods.php:8
#: includes/admin/settings/views/html-admin-page-shipping-zones-instance.php:7
#: includes/admin/settings/views/html-admin-page-shipping-zones.php:8
#: includes/admin/views/html-notice-legacy-shipping.php:13
msgid "Shipping Zones"
msgstr ""
@ -11466,8 +11470,7 @@ msgstr ""
#: includes/admin/settings/views/html-webhooks-edit.php:103
msgid ""
"The Secret Key is used to generate a hash of the delivered webhook and "
"provided in the request headers. This will default to the current API "
"user's consumer secret if not provided."
"provided in the request headers."
msgstr ""
#: includes/admin/settings/views/html-webhooks-edit.php:116
@ -11827,11 +11830,11 @@ msgid ""
msgstr ""
#: includes/admin/views/html-admin-page-status-report.php:159
msgid "CURL Version"
msgid "cURL Version"
msgstr ""
#: includes/admin/views/html-admin-page-status-report.php:160
msgid "The version of CURL installed on your server."
msgid "The version of cURL installed on your server."
msgstr ""
#: includes/admin/views/html-admin-page-status-report.php:171
@ -12403,6 +12406,8 @@ msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:11
#: includes/admin/views/html-notice-no-shipping-methods.php:11
#: includes/admin/views/html-notice-simplify-commerce.php:19
#: includes/admin/views/html-notice-template-check.php:13
#: includes/admin/views/html-notice-theme-support.php:12
#: includes/admin/views/html-notice-updated.php:12
msgid "Dismiss"
msgstr ""
@ -12422,17 +12427,17 @@ msgid "Skip Setup"
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:13
msgid "New feature: shipping zones!"
msgid "New:"
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:13
msgid ""
"a group of regions that can be assigned different shipping methods and "
"rates."
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:14
msgid ""
"A shipping zone is a group of regions that can be assigned different "
"shipping methods and rates."
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:15
msgid ""
"Legacy shipping methods (Flat Rate, International Flat Rate, Local Pickup "
"and Delivery, and Free Shipping) are deprecated but will continue to work "
"as normal for now. <b><em>They will be removed in future versions of "
@ -12440,12 +12445,12 @@ msgid ""
"within shipping zones as soon as possible."
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:19
#: includes/admin/views/html-notice-legacy-shipping.php:18
#: includes/admin/views/html-notice-no-shipping-methods.php:18
msgid "Setup shipping zones"
msgstr ""
#: includes/admin/views/html-notice-legacy-shipping.php:21
#: includes/admin/views/html-notice-legacy-shipping.php:20
#: includes/admin/views/html-notice-no-shipping-methods.php:19
msgid "Learn more about shipping zones"
msgstr ""
@ -12478,7 +12483,7 @@ msgstr ""
msgid "Install our new Simplify Commerce plugin"
msgstr ""
#: includes/admin/views/html-notice-template-check.php:13
#: includes/admin/views/html-notice-template-check.php:15
msgid ""
"<strong>Your theme (%s) contains outdated copies of some WooCommerce "
"template files.</strong> These files may need updating to ensure they are "
@ -12487,16 +12492,11 @@ msgid ""
"author of the theme."
msgstr ""
#: includes/admin/views/html-notice-template-check.php:14
#: includes/admin/views/html-notice-template-check.php:16
msgid "Learn More About Templates"
msgstr ""
#: includes/admin/views/html-notice-template-check.php:14
#: includes/admin/views/html-notice-theme-support.php:16
msgid "Hide This Notice"
msgstr ""
#: includes/admin/views/html-notice-theme-support.php:12
#: includes/admin/views/html-notice-theme-support.php:14
msgid ""
"<strong>Your theme does not declare WooCommerce support</strong> &#8211; "
"Please read our %sintegration%s guide or check out our %sStorefront%s theme "
@ -12504,11 +12504,11 @@ msgid ""
"WooCommerce."
msgstr ""
#: includes/admin/views/html-notice-theme-support.php:14
#: includes/admin/views/html-notice-theme-support.php:16
msgid "Read More About Storefront"
msgstr ""
#: includes/admin/views/html-notice-theme-support.php:15
#: includes/admin/views/html-notice-theme-support.php:17
msgid "Theme Integration Guide"
msgstr ""
@ -12799,7 +12799,7 @@ msgid "Email address is invalid."
msgstr ""
#: includes/api/class-wc-rest-customers-controller.php:384
msgid "Username isn't editable"
msgid "Username isn't editable."
msgstr ""
#: includes/api/class-wc-rest-customers-controller.php:430
@ -13053,6 +13053,7 @@ msgstr ""
#: includes/api/class-wc-rest-order-refunds-controller.php:379
#: includes/api/class-wc-rest-orders-controller.php:1389
#: includes/api/class-wc-rest-products-controller.php:1721
#: includes/api/class-wc-rest-report-top-sellers-controller.php:152
msgid "Product name."
msgstr ""
@ -13488,21 +13489,17 @@ msgid "HTML description of the resource."
msgstr ""
#: includes/api/class-wc-rest-product-attribute-terms-controller.php:136
#: includes/api/class-wc-rest-product-categories-controller.php:246
#: includes/api/class-wc-rest-product-categories-controller.php:245
msgid "Menu order, used to custom sort the resource."
msgstr ""
#: includes/api/class-wc-rest-product-attribute-terms-controller.php:141
#: includes/api/class-wc-rest-product-categories-controller.php:251
#: includes/api/class-wc-rest-product-categories-controller.php:250
#: includes/api/class-wc-rest-product-shipping-classes-controller.php:124
#: includes/api/class-wc-rest-product-tags-controller.php:124
msgid "Number of published products for the resource."
msgstr ""
#: includes/api/class-wc-rest-product-attributes-controller.php:150
msgid "Sorry, you cannot view this resource"
msgstr ""
#: includes/api/class-wc-rest-product-attributes-controller.php:363
#: includes/api/legacy/v2/class-wc-api-products.php:2226
#: includes/api/legacy/v3/class-wc-api-products.php:2808
@ -13512,7 +13509,7 @@ msgstr ""
#: includes/api/class-wc-rest-product-attributes-controller.php:532
#: includes/api/class-wc-rest-products-controller.php:2158
#: includes/api/class-wc-rest-products-controller.php:2197
#: includes/api/class-wc-rest-products-controller.php:2471
#: includes/api/class-wc-rest-products-controller.php:2470
msgid "Attribute name."
msgstr ""
@ -13563,33 +13560,33 @@ msgstr ""
msgid "Image ID."
msgstr ""
#: includes/api/class-wc-rest-product-categories-controller.php:216
#: includes/api/class-wc-rest-product-categories-controller.php:215
#: includes/api/class-wc-rest-products-controller.php:2113
#: includes/api/class-wc-rest-products-controller.php:2426
#: includes/api/class-wc-rest-products-controller.php:2425
msgid "The date the image was created, in the site's timezone."
msgstr ""
#: includes/api/class-wc-rest-product-categories-controller.php:222
#: includes/api/class-wc-rest-product-categories-controller.php:221
#: includes/api/class-wc-rest-products-controller.php:2119
#: includes/api/class-wc-rest-products-controller.php:2432
#: includes/api/class-wc-rest-products-controller.php:2431
msgid "The date the image was last modified, in the site's timezone."
msgstr ""
#: includes/api/class-wc-rest-product-categories-controller.php:228
#: includes/api/class-wc-rest-product-categories-controller.php:227
#: includes/api/class-wc-rest-products-controller.php:2125
#: includes/api/class-wc-rest-products-controller.php:2438
#: includes/api/class-wc-rest-products-controller.php:2437
msgid "Image URL."
msgstr ""
#: includes/api/class-wc-rest-product-categories-controller.php:234
#: includes/api/class-wc-rest-product-categories-controller.php:233
#: includes/api/class-wc-rest-products-controller.php:2131
#: includes/api/class-wc-rest-products-controller.php:2444
#: includes/api/class-wc-rest-products-controller.php:2443
msgid "Image name."
msgstr ""
#: includes/api/class-wc-rest-product-categories-controller.php:239
#: includes/api/class-wc-rest-product-categories-controller.php:238
#: includes/api/class-wc-rest-products-controller.php:2136
#: includes/api/class-wc-rest-products-controller.php:2449
#: includes/api/class-wc-rest-products-controller.php:2448
msgid "Image alternative text."
msgstr ""
@ -13799,7 +13796,7 @@ msgid "Shows if backorders are allowed."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:1949
msgid "Shows if a product is on backorder."
msgid "Shows if the product is on backordered."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:1955
@ -13905,18 +13902,18 @@ msgid "List of images."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2141
#: includes/api/class-wc-rest-products-controller.php:2454
#: includes/api/class-wc-rest-products-controller.php:2453
msgid "Image position. 0 means that the image is featured."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2148
#: includes/api/class-wc-rest-products-controller.php:2461
#: includes/api/class-wc-rest-products-controller.php:2460
msgid "List of attributes."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2153
#: includes/api/class-wc-rest-products-controller.php:2192
#: includes/api/class-wc-rest-products-controller.php:2466
#: includes/api/class-wc-rest-products-controller.php:2465
msgid "Attribute ID."
msgstr ""
@ -13943,7 +13940,7 @@ msgid "Defaults variation attributes."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2202
#: includes/api/class-wc-rest-products-controller.php:2476
#: includes/api/class-wc-rest-products-controller.php:2475
msgid "Selected attribute term name."
msgstr ""
@ -14016,7 +14013,7 @@ msgid ""
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2371
msgid "Shows if a variation is on backorder."
msgid "Shows if the variation is on backordered."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2377
@ -14040,52 +14037,52 @@ msgid "Variation height (%s)."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2415
msgid "Varition image data."
msgid "Variation image data."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2485
#: includes/api/class-wc-rest-products-controller.php:2484
msgid "List of grouped products ID."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2491
#: includes/api/class-wc-rest-products-controller.php:2490
msgid "Menu order, used to custom sort products."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2510
#: includes/api/class-wc-rest-products-controller.php:2509
msgid "Limit result set to products with a specific slug."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2516
#: includes/api/class-wc-rest-products-controller.php:2515
msgid "Limit result set to products assigned a specific status."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2523
#: includes/api/class-wc-rest-products-controller.php:2522
msgid "Limit result set to products assigned a specific type."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2530
#: includes/api/class-wc-rest-products-controller.php:2529
msgid "Limit result set to products assigned a specific category."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2536
#: includes/api/class-wc-rest-products-controller.php:2535
msgid "Limit result set to products assigned a specific tag."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2542
#: includes/api/class-wc-rest-products-controller.php:2541
msgid "Limit result set to products assigned a specific shipping class."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2548
#: includes/api/class-wc-rest-products-controller.php:2547
msgid "Limit result set to products with a specific attribute."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2554
#: includes/api/class-wc-rest-products-controller.php:2553
msgid ""
"Limit result set to products with a specific attribute term (required an "
"assigned attribute)."
msgstr ""
#: includes/api/class-wc-rest-products-controller.php:2560
#: includes/api/class-wc-rest-products-controller.php:2559
msgid "Limit result set to products with a specific SKU."
msgstr ""
@ -14147,10 +14144,6 @@ msgstr ""
msgid "Return sales for a specific end date, the date need to be in the %s format."
msgstr ""
#: includes/api/class-wc-rest-report-top-sellers-controller.php:152
msgid "Product title."
msgstr ""
#: includes/api/class-wc-rest-report-top-sellers-controller.php:164
msgid "Total number of purchases."
msgstr ""
@ -14171,10 +14164,6 @@ msgstr ""
msgid "A human-readable description of the resource."
msgstr ""
#: includes/api/class-wc-rest-tax-classes-controller.php:83
msgid "Sorry, you cannot list tax classes."
msgstr ""
#: includes/api/class-wc-rest-tax-classes-controller.php:129
#: includes/api/legacy/v3/class-wc-api-taxes.php:534
#: includes/cli/class-wc-cli-tax.php:434
@ -14190,10 +14179,6 @@ msgstr ""
msgid "Tax class name."
msgstr ""
#: includes/api/class-wc-rest-taxes-controller.php:107
msgid "Sorry, you cannot list taxes."
msgstr ""
#: includes/api/class-wc-rest-taxes-controller.php:574
msgid "Country ISO 3166 code."
msgstr ""

View File

@ -29,6 +29,38 @@ abstract class WC_REST_Controller extends WP_REST_Controller {
*/
protected $rest_base = '';
/**
* Add the schema from additional fields to an schema array.
*
* The type of object is inferred from the passed schema.
*
* @param array $schema Schema array.
*/
protected function add_additional_fields_schema( $schema ) {
if ( empty( $schema['title'] ) ) {
return $schema;
}
/**
* Can't use $this->get_object_type otherwise we cause an inf loop.
*/
$object_type = $schema['title'];
$additional_fields = $this->get_additional_fields( $object_type );
foreach ( $additional_fields as $field_name => $field_options ) {
if ( ! $field_options['schema'] ) {
continue;
}
$schema['properties'][ $field_name ] = $field_options['schema'];
}
$schema['properties'] = apply_filters( 'woocommerce_rest_' . $object_type . '_schema', $schema['properties'] );
return $schema;
}
/**
* Get normalized rest base.
*

View File

@ -109,6 +109,9 @@ class WC_Admin_Post_Types {
$user = wp_get_current_user();
update_user_option( $user->ID, 'manageedit-shop_ordercolumnshidden', array( 0 => 'billing_address' ), true );
}
// Show blank state
add_action( 'manage_posts_extra_tablenav', array( $this, 'maybe_render_blank_state' ) );
}
/**
@ -2285,7 +2288,6 @@ class WC_Admin_Post_Types {
}
}
/**
* Disable DFW feature pointer.
*/
@ -2310,6 +2312,45 @@ class WC_Admin_Post_Types {
unset( $post_types['product'], $post_types['shop_order'], $post_types['shop_coupon'] );
return $post_types;
}
public function maybe_render_blank_state( $which ) {
global $post_type;
if ( in_array( $post_type, array( 'shop_order', 'product', 'shop_coupon' ) ) && 'bottom' === $which ) {
$counts = (array) wp_count_posts( $post_type );
unset( $counts['auto-draft'] );
$count = array_sum( $counts );
if ( 0 < $count ) {
return;
}
echo '<div class="woocommerce-BlankState">';
switch ( $post_type ) {
case 'shop_order' :
?>
<h2 class="woocommerce-BlankState-message"><?php _e( 'When you receive a new order, it will appear here.', 'woocommerce' ); ?></h2>
<a class="woocommerce-BlankState-cta button-primary button" target="_blank" href="https://docs.woothemes.com/document/managing-orders/?utm_source=blankslate&utm_medium=product&utm_content=ordersdoc&utm_campaign=woocommerceplugin"><?php _e( 'Learn more about orders', 'woocommerce' ); ?></a>
<?php
break;
case 'shop_coupon' :
?>
<h2 class="woocommerce-BlankState-message"><?php _e( 'Coupons are a great way to offer discounts and rewards to your customers. They will appear here once created.', 'woocommerce' ); ?></h2>
<a class="woocommerce-BlankState-cta button-primary button" target="_blank" href="https://docs.woothemes.com/document/coupon-management/?utm_source=blankslate&utm_medium=product&utm_content=couponsdoc&utm_campaign=woocommerceplugin"><?php _e( 'Learn more about coupons', 'woocommerce' ); ?></a>
<?php
break;
case 'product' :
?>
<h2 class="woocommerce-BlankState-message"><?php _e( 'Ready to start selling something awesome?', 'woocommerce' ); ?></h2>
<a class="woocommerce-BlankState-cta button-primary button" target="_blank" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php _e( 'Create your first product!', 'woocommerce' ); ?></a>
<?php
break;
}
echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .wrap .subsubsub { display: none; } </style></div>';
}
}
}
endif;

View File

@ -29,10 +29,14 @@
<select multiple="multiple" data-placeholder="<?php esc_attr_e( 'Select terms', 'woocommerce' ); ?>" class="multiselect attribute_values wc-enhanced-select" name="attribute_values[<?php echo $i; ?>][]">
<?php
$all_terms = get_terms( $taxonomy, 'orderby=name&hide_empty=0' );
$args = array(
'orderby' => 'name',
'hide_empty' => 0
);
$all_terms = get_terms( $taxonomy, apply_filters( 'woocommerce_product_attribute_terms', $args ) );
if ( $all_terms ) {
foreach ( $all_terms as $term ) {
echo '<option value="' . esc_attr( $term->slug ) . '" ' . selected( has_term( absint( $term->term_id ), $taxonomy, $thepostid ), true, false ) . '>' . $term->name . '</option>';
echo '<option value="' . esc_attr( $term->slug ) . '" ' . selected( has_term( absint( $term->term_id ), $taxonomy, $thepostid ), true, false ) . '>' . esc_attr( apply_filters( 'woocommerce_product_attribute_term_name', $term->name, $term ) ) . '</option>';
}
}
?>

View File

@ -212,7 +212,7 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page {
array(
'title' => __( 'Set Default Payment Method', 'woocommerce' ),
'desc' => __( 'Endpoint for the setting a default payment page', 'woocommerce' ),
'desc' => __( 'Endpoint for the setting a default payment method page', 'woocommerce' ),
'id' => 'woocommerce_myaccount_set_default_payment_method_endpoint',
'type' => 'text',
'default' => 'set-default-payment-method',

View File

@ -100,7 +100,7 @@ if ( ! defined( 'ABSPATH' ) ) {
<tr valign="top">
<th scope="row" class="titledesc">
<label for="webhook_secret"><?php _e( 'Secret', 'woocommerce' ); ?></label>
<?php echo wc_help_tip( __( 'The Secret Key is used to generate a hash of the delivered webhook and provided in the request headers. This will default to the current API user\'s consumer secret if not provided.', 'woocommerce' ) ); ?>
<?php echo wc_help_tip( __( 'The Secret Key is used to generate a hash of the delivered webhook and provided in the request headers.', 'woocommerce' ) ); ?>
</th>
<td class="forminp">
<input name="webhook_secret" id="webhook_secret" type="text" class="input-text regular-input" value="<?php echo esc_attr( $webhook->get_secret() ); ?>" />

View File

@ -156,8 +156,8 @@ global $wpdb;
<td><?php echo ini_get( 'max_input_vars' ); ?></td>
</tr>
<tr>
<td data-export-label="CURL Version"><?php _e( 'CURL Version', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( __( 'The version of CURL installed on your server.', 'woocommerce' ) ); ?></td>
<td data-export-label="cURL Version"><?php _e( 'cURL Version', 'woocommerce' ); ?>:</td>
<td class="help"><?php echo wc_help_tip( __( 'The version of cURL installed on your server.', 'woocommerce' ) ); ?></td>
<td><?php
if ( function_exists( 'curl_version' ) ) {
$curl_version = curl_version();

View File

@ -381,7 +381,7 @@ class WC_REST_Customers_Controller extends WC_REST_Controller {
}
if ( ! empty( $request['username'] ) && $request['username'] !== $customer->user_login ) {
return new WP_Error( 'woocommerce_rest_customer_invalid_argument', __( "Username isn't editable", 'woocommerce' ), array( 'status' => 400 ) );
return new WP_Error( 'woocommerce_rest_customer_invalid_argument', __( "Username isn't editable.", 'woocommerce' ), array( 'status' => 400 ) );
}
// Customer email.

View File

@ -147,7 +147,7 @@ class WC_REST_Product_Attributes_Controller extends WC_REST_Controller {
}
if ( ! wc_rest_check_manager_permissions( 'attributes', 'read' ) ) {
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot view this resource.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
}
return true;

View File

@ -1946,7 +1946,7 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
'readonly' => true,
),
'backordered' => array(
'description' => __( 'Shows if a product is on backorder.', 'woocommerce' ),
'description' => __( 'Shows if the product is on backordered.', 'woocommerce' ),
'type' => 'boolean',
'context' => array( 'view', 'edit' ),
'readonly' => true,
@ -2368,7 +2368,7 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
'readonly' => true,
),
'backordered' => array(
'description' => __( 'Shows if a variation is on backorder.', 'woocommerce' ),
'description' => __( 'Shows if the variation is on backordered.', 'woocommerce' ),
'type' => 'boolean',
'context' => array( 'view', 'edit' ),
'readonly' => true,
@ -2412,7 +2412,7 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
'readonly' => true,
),
'image' => array(
'description' => __( 'Varition image data.', 'woocommerce' ),
'description' => __( 'Variation image data.', 'woocommerce' ),
'type' => 'array',
'context' => array( 'view', 'edit' ),
'properties' => array(

View File

@ -80,7 +80,7 @@ class WC_REST_Report_Top_Sellers_Controller extends WC_REST_Report_Sales_Control
if ( $product ) {
$top_sellers[] = array(
'title' => $product->get_title(),
'name' => $product->get_title(),
'product_id' => (int) $item->product_id,
'quantity' => wc_stock_amount( $item->order_item_qty ),
);
@ -105,7 +105,7 @@ class WC_REST_Report_Top_Sellers_Controller extends WC_REST_Report_Sales_Control
*/
public function prepare_item_for_response( $top_seller, $request ) {
$data = array(
'title' => $top_seller->title,
'name' => $top_seller->name,
'product_id' => $top_seller->product_id,
'quantity' => $top_seller->quantity,
);
@ -148,8 +148,8 @@ class WC_REST_Report_Top_Sellers_Controller extends WC_REST_Report_Sales_Control
'title' => 'top_sellers_report',
'type' => 'object',
'properties' => array(
'title' => array(
'description' => __( 'Product title.', 'woocommerce' ),
'name' => array(
'description' => __( 'Product name.', 'woocommerce' ),
'type' => 'string',
'context' => array( 'view' ),
'readonly' => true,

View File

@ -80,7 +80,7 @@ class WC_REST_Tax_Classes_Controller extends WC_REST_Controller {
*/
public function get_items_permissions_check( $request ) {
if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list tax classes.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
}
return true;

View File

@ -104,7 +104,7 @@ class WC_REST_Taxes_Controller extends WC_REST_Controller {
*/
public function get_items_permissions_check( $request ) {
if ( ! wc_rest_check_manager_permissions( 'settings', 'read' ) ) {
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list taxes.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
return new WP_Error( 'woocommerce_rest_cannot_view', __( 'Sorry, you cannot list resources.', 'woocommerce' ), array( 'status' => rest_authorization_required_code() ) );
}
return true;

View File

@ -12,7 +12,7 @@ if ( ! class_exists( 'WC_Email_Customer_Processing_Order' ) ) :
* An email sent to the customer when a new order is on-hold for.
*
* @class WC_Email_Customer_On_Hold_Order
* @version 2.0.0
* @version 2.6.0
* @package WooCommerce/Classes/Emails
* @author WooThemes
* @extends WC_Email

View File

@ -10,15 +10,14 @@
* happen. When this occurs the version of the template file will be bumped and
* the readme will list any important changes.
*
* @see https://docs.woothemes.com/document/template-structure/
* @author WooThemes
* @package WooCommerce/Templates
* @version 1.6.4
* @see https://docs.woothemes.com/document/template-structure/
* @author WooThemes
* @package WooCommerce/Templates
* @version 1.6.4
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
exit; // Exit if accessed directly.
}
?>
<h1 itemprop="name" class="product_title entry-title"><?php the_title(); ?></h1>
the_title( '<h1 itemprop="name" class="product_title entry-title">', '</h1>' );