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

Merge remote-tracking branch 'woothemes/master'

This commit is contained in:
Job 2016-06-13 15:31:46 +02:00
parent 1deec0a87f 34f2bd683e
commit c6b08297e6
25 changed files with 270 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/ISSUE_TEMPLATE.md vendored
View File

@ -1,5 +1,19 @@
## EXPLANATION OF THE ISSUE
<!-- What happens, under which versions, under what conditions, when, and what were you expecting instead. -->
## STEPS TO REPRODUCE THE ISSUE
<!-- 1. List steps to reproduce your issue so we can replicate. -->
## SYSTEM STATUS REPORT
```
Grab the system status report from WooCommerce > System Status and paste it here.
```
<!-- <!--
PLEASE NOTE: BEFORE POSTING YOUR ISSUE
- These comments won't show up when you submit the issue. - These comments won't show up when you submit the issue.
- Try to add as much detail as possible. Be specific! - Try to add as much detail as possible. Be specific!
- GitHub issues ARE NOT FOR SUPPORT! If you have questions, use the either: - GitHub issues ARE NOT FOR SUPPORT! If you have questions, use the either:
@ -8,22 +22,8 @@ PLEASE NOTE:
- If you're requesting a new feature, explain why you'd like it to be added. - If you're requesting a new feature, explain why you'd like it to be added.
- Search this repository (top of the page) for the issue and it has not been fixed or reported already. - Search this repository (top of the page) for the issue and it has not been fixed or reported already.
And before logging BUGS, ensure you: Before logging BUGS, ensure you:
- Use the latest stable release of WooCommerce. - Use the latest stable release of WooCommerce.
- Disabled all plugins to ensure it's a core bug and not a plugin issue. - Disabled all plugins to ensure it's a core bug and not a plugin issue.
- Switched to Twenty Twelve theme to ensure it's a core bug and not a theme issue. - Switched to Twenty Twelve theme to ensure it's a core bug and not a theme issue.
--> -->
## EXPLANATION OF THE ISSUE
What happens, under which versions, under what conditions, when, and what were you expecting instead.
## STEPS TO REPRODUCE THE ISSUE
1. List steps to reproduce your issue so we can replicate.
## SYSTEM STATUS REPORT
```
Grab the system status report from WooCommerce > System Status and paste it here.
```

1
assets/js/admin/wc-shipping-zones.js
View File

@ -90,7 +90,6 @@
$save_button.on( 'click', { view: this }, this.onSubmit ); $save_button.on( 'click', { view: this }, this.onSubmit );
$( document.body ).on( 'click', '.add_shipping_method:not(.disabled)', { view: this }, this.onAddShippingMethod ); $( document.body ).on( 'click', '.add_shipping_method:not(.disabled)', { view: this }, this.onAddShippingMethod );
$( document.body ).on( 'click', '.wc-shipping-zone-add', { view: this }, this.onAddNewRow ); $( document.body ).on( 'click', '.wc-shipping-zone-add', { view: this }, this.onAddNewRow );
$( document.body ).on( 'click', '.wc-shipping-zone-save-changes', { view: this }, this.onSubmit );
$( document.body ).on( 'wc_backbone_modal_response', this.onAddShippingMethodSubmitted ); $( document.body ).on( 'wc_backbone_modal_response', this.onAddShippingMethodSubmitted );
$( document.body ).on( 'change', '.wc-shipping-zone-method-selector select', this.onChangeShippingMethodSelector ); $( document.body ).on( 'change', '.wc-shipping-zone-method-selector select', this.onChangeShippingMethodSelector );
}, },

2
assets/js/admin/wc-shipping-zones.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
includes/admin/class-wc-admin-notices.php
View File

@ -30,7 +30,6 @@ class WC_Admin_Notices {
private static $core_notices = array( private static $core_notices = array(
'install' => 'install_notice', 'install' => 'install_notice',
'update' => 'update_notice', 'update' => 'update_notice',
'updating' => 'updating_notice',
'template_files' => 'template_file_check_notice', 'template_files' => 'template_file_check_notice',
'theme_support' => 'theme_check_notice', 'theme_support' => 'theme_check_notice',
'legacy_shipping' => 'legacy_shipping_notice', 'legacy_shipping' => 'legacy_shipping_notice',
@ -190,15 +189,13 @@ class WC_Admin_Notices {
* If we need to update, include a message with the update button. * If we need to update, include a message with the update button.
*/ */
public static function update_notice() { public static function update_notice() {
include( 'views/html-notice-update.php' );
}
/**
* If we are updating, show progress.
*/
public static function updating_notice() {
if ( version_compare( get_option( 'woocommerce_db_version' ), WC_VERSION, '<' ) ) { if ( version_compare( get_option( 'woocommerce_db_version' ), WC_VERSION, '<' ) ) {
include( 'views/html-notice-updating.php' ); $updater = new WC_Background_Updater();
if ( ! $updater->is_updating() ) {
include( 'views/html-notice-update.php' );
} else {
include( 'views/html-notice-updating.php' );
}
} else { } else {
include( 'views/html-notice-updated.php' ); include( 'views/html-notice-updated.php' );
} }

2
includes/admin/class-wc-admin-permalink-settings.php
View File

@ -167,8 +167,6 @@ class WC_Admin_Permalink_Settings {
return; return;
} }
global $wpdb;
// We need to save the options ourselves; settings api does not trigger save for the permalinks page. // We need to save the options ourselves; settings api does not trigger save for the permalinks page.
if ( isset( $_POST['permalink_structure'] ) ) { if ( isset( $_POST['permalink_structure'] ) ) {
$permalinks = get_option( 'woocommerce_permalinks' ); $permalinks = get_option( 'woocommerce_permalinks' );

2
includes/admin/views/html-notice-updated.php
View File

@ -9,7 +9,7 @@ if ( ! defined( 'ABSPATH' ) ) {
?> ?>
<div id="message" class="updated woocommerce-message wc-connect"> <div id="message" class="updated woocommerce-message wc-connect">
<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'updating' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a> <a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'update', remove_query_arg( 'do_update_woocommerce' ) ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'woocommerce' ); ?></a>
<p><?php _e( 'WooCommerce data update complete. Thank you for updating to the latest version!', 'woocommerce' ); ?></p> <p><?php _e( 'WooCommerce data update complete. Thank you for updating to the latest version!', 'woocommerce' ); ?></p>
</div> </div>

6
includes/api/class-wc-rest-products-controller.php
View File

@ -502,10 +502,12 @@ class WC_REST_Products_Controller extends WC_REST_Posts_Controller {
continue; continue;
} }
$post_data = get_post( $variation->get_variation_id() );
$variations[] = array( $variations[] = array(
'id' => $variation->get_variation_id(), 'id' => $variation->get_variation_id(),
'date_created' => wc_rest_prepare_date_response( $variation->get_post_data()->post_date_gmt ), 'date_created' => wc_rest_prepare_date_response( $post_data->post_date_gmt ),
'date_modified' => wc_rest_prepare_date_response( $variation->get_post_data()->post_modified_gmt ), 'date_modified' => wc_rest_prepare_date_response( $post_data->post_modified_gmt ),
'permalink' => $variation->get_permalink(), 'permalink' => $variation->get_permalink(),
'sku' => $variation->get_sku(), 'sku' => $variation->get_sku(),
'price' => $variation->get_price(), 'price' => $variation->get_price(),

9
includes/api/legacy/v1/class-wc-api-products.php
View File

@ -348,13 +348,16 @@ class WC_API_Products extends WC_API_Resource {
$variation = $product->get_child( $child_id ); $variation = $product->get_child( $child_id );
if ( ! $variation->exists() ) if ( ! $variation->exists() ) {
continue; continue;
}
$post_data = get_post( $variation->get_variation_id() );
$variations[] = array( $variations[] = array(
'id' => $variation->get_variation_id(), 'id' => $variation->get_variation_id(),
'created_at' => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ), 'created_at' => $this->server->format_datetime( $post_data->post_date_gmt ),
'updated_at' => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ), 'updated_at' => $this->server->format_datetime( $post_data->post_modified_gmt ),
'downloadable' => $variation->is_downloadable(), 'downloadable' => $variation->is_downloadable(),
'virtual' => $variation->is_virtual(), 'virtual' => $variation->is_virtual(),
'permalink' => $variation->get_permalink(), 'permalink' => $variation->get_permalink(),

4
includes/api/legacy/v2/class-wc-api-customers.php
View File

@ -159,6 +159,8 @@ class WC_API_Customers extends WC_API_Resource {
ORDER BY posts.ID DESC ORDER BY posts.ID DESC
" ); " );
$roles = array_values( $customer->roles );
$customer_data = array( $customer_data = array(
'id' => $customer->ID, 'id' => $customer->ID,
'created_at' => $this->server->format_datetime( $customer->user_registered ), 'created_at' => $this->server->format_datetime( $customer->user_registered ),
@ -166,7 +168,7 @@ class WC_API_Customers extends WC_API_Resource {
'first_name' => $customer->first_name, 'first_name' => $customer->first_name,
'last_name' => $customer->last_name, 'last_name' => $customer->last_name,
'username' => $customer->user_login, 'username' => $customer->user_login,
'role' => $customer->roles[0], 'role' => $roles[0],
'last_order_id' => is_object( $last_order ) ? $last_order->id : null, 'last_order_id' => is_object( $last_order ) ? $last_order->id : null,
'last_order_date' => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null, 'last_order_date' => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null,
'orders_count' => wc_get_customer_order_count( $customer->ID ), 'orders_count' => wc_get_customer_order_count( $customer->ID ),

74
includes/api/legacy/v2/class-wc-api-products.php
View File

@ -740,41 +740,43 @@ class WC_API_Products extends WC_API_Resource {
continue; continue;
} }
$post_data = get_post( $variation->get_variation_id() );
$variations[] = array( $variations[] = array(
'id' => $variation->get_variation_id(), 'id' => $variation->get_variation_id(),
'created_at' => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ), 'created_at' => $this->server->format_datetime( $post_data->post_date_gmt ),
'updated_at' => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ), 'updated_at' => $this->server->format_datetime( $post_data->post_modified_gmt ),
'downloadable' => $variation->is_downloadable(), 'downloadable' => $variation->is_downloadable(),
'virtual' => $variation->is_virtual(), 'virtual' => $variation->is_virtual(),
'permalink' => $variation->get_permalink(), 'permalink' => $variation->get_permalink(),
'sku' => $variation->get_sku(), 'sku' => $variation->get_sku(),
'price' => wc_format_decimal( $variation->get_price(), $prices_precision ), 'price' => wc_format_decimal( $variation->get_price(), $prices_precision ),
'regular_price' => wc_format_decimal( $variation->get_regular_price(), $prices_precision ), 'regular_price' => wc_format_decimal( $variation->get_regular_price(), $prices_precision ),
'sale_price' => $variation->get_sale_price() ? wc_format_decimal( $variation->get_sale_price(), $prices_precision ) : null, 'sale_price' => $variation->get_sale_price() ? wc_format_decimal( $variation->get_sale_price(), $prices_precision ) : null,
'taxable' => $variation->is_taxable(), 'taxable' => $variation->is_taxable(),
'tax_status' => $variation->get_tax_status(), 'tax_status' => $variation->get_tax_status(),
'tax_class' => $variation->get_tax_class(), 'tax_class' => $variation->get_tax_class(),
'managing_stock' => $variation->managing_stock(), 'managing_stock' => $variation->managing_stock(),
'stock_quantity' => (int) $variation->get_stock_quantity(), 'stock_quantity' => (int) $variation->get_stock_quantity(),
'in_stock' => $variation->is_in_stock(), 'in_stock' => $variation->is_in_stock(),
'backordered' => $variation->is_on_backorder(), 'backordered' => $variation->is_on_backorder(),
'purchaseable' => $variation->is_purchasable(), 'purchaseable' => $variation->is_purchasable(),
'visible' => $variation->variation_is_visible(), 'visible' => $variation->variation_is_visible(),
'on_sale' => $variation->is_on_sale(), 'on_sale' => $variation->is_on_sale(),
'weight' => $variation->get_weight() ? wc_format_decimal( $variation->get_weight(), 2 ) : null, 'weight' => $variation->get_weight() ? wc_format_decimal( $variation->get_weight(), 2 ) : null,
'dimensions' => array( 'dimensions' => array(
'length' => $variation->length, 'length' => $variation->length,
'width' => $variation->width, 'width' => $variation->width,
'height' => $variation->height, 'height' => $variation->height,
'unit' => get_option( 'woocommerce_dimension_unit' ), 'unit' => get_option( 'woocommerce_dimension_unit' ),
), ),
'shipping_class' => $variation->get_shipping_class(), 'shipping_class' => $variation->get_shipping_class(),
'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null, 'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
'image' => $this->get_images( $variation ), 'image' => $this->get_images( $variation ),
'attributes' => $this->get_attributes( $variation ), 'attributes' => $this->get_attributes( $variation ),
'downloads' => $this->get_downloads( $variation ), 'downloads' => $this->get_downloads( $variation ),
'download_limit' => (int) $product->download_limit, 'download_limit' => (int) $product->download_limit,
'download_expiry' => (int) $product->download_expiry, 'download_expiry' => (int) $product->download_expiry,
); );
} }
@ -1834,10 +1836,10 @@ class WC_API_Products extends WC_API_Resource {
} }
/** /**
* Get product image as attachment * Sets product image as attachment and returns the attachment ID.
* *
* @since 2.2 * @since 2.2
* @param integer $upload * @param array $upload
* @param int $id * @param int $id
* @return int * @return int
*/ */

4
includes/api/legacy/v3/class-wc-api-customers.php
View File

@ -159,6 +159,8 @@ class WC_API_Customers extends WC_API_Resource {
ORDER BY posts.ID DESC ORDER BY posts.ID DESC
" ); " );
$roles = array_values( $customer->roles );
$customer_data = array( $customer_data = array(
'id' => $customer->ID, 'id' => $customer->ID,
'created_at' => $this->server->format_datetime( $customer->user_registered ), 'created_at' => $this->server->format_datetime( $customer->user_registered ),
@ -167,7 +169,7 @@ class WC_API_Customers extends WC_API_Resource {
'first_name' => $customer->first_name, 'first_name' => $customer->first_name,
'last_name' => $customer->last_name, 'last_name' => $customer->last_name,
'username' => $customer->user_login, 'username' => $customer->user_login,
'role' => $customer->roles[0], 'role' => $roles[0],
'last_order_id' => is_object( $last_order ) ? $last_order->id : null, 'last_order_id' => is_object( $last_order ) ? $last_order->id : null,
'last_order_date' => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null, 'last_order_date' => is_object( $last_order ) ? $this->server->format_datetime( $last_order->post_date_gmt ) : null,
'orders_count' => wc_get_customer_order_count( $customer->ID ), 'orders_count' => wc_get_customer_order_count( $customer->ID ),

74
includes/api/legacy/v3/class-wc-api-products.php
View File

@ -1199,42 +1199,44 @@ class WC_API_Products extends WC_API_Resource {
continue; continue;
} }
$post_data = get_post( $variation->get_variation_id() );
$variations[] = array( $variations[] = array(
'id' => $variation->get_variation_id(), 'id' => $variation->get_variation_id(),
'created_at' => $this->server->format_datetime( $variation->get_post_data()->post_date_gmt ), 'created_at' => $this->server->format_datetime( $post_data->post_date_gmt ),
'updated_at' => $this->server->format_datetime( $variation->get_post_data()->post_modified_gmt ), 'updated_at' => $this->server->format_datetime( $post_data->post_modified_gmt ),
'downloadable' => $variation->is_downloadable(), 'downloadable' => $variation->is_downloadable(),
'virtual' => $variation->is_virtual(), 'virtual' => $variation->is_virtual(),
'permalink' => $variation->get_permalink(), 'permalink' => $variation->get_permalink(),
'sku' => $variation->get_sku(), 'sku' => $variation->get_sku(),
'price' => $variation->get_price(), 'price' => $variation->get_price(),
'regular_price' => $variation->get_regular_price(), 'regular_price' => $variation->get_regular_price(),
'sale_price' => $variation->get_sale_price() ? $variation->get_sale_price() : null, 'sale_price' => $variation->get_sale_price() ? $variation->get_sale_price() : null,
'taxable' => $variation->is_taxable(), 'taxable' => $variation->is_taxable(),
'tax_status' => $variation->get_tax_status(), 'tax_status' => $variation->get_tax_status(),
'tax_class' => $variation->get_tax_class(), 'tax_class' => $variation->get_tax_class(),
'managing_stock' => $variation->managing_stock(), 'managing_stock' => $variation->managing_stock(),
'stock_quantity' => $variation->get_stock_quantity(), 'stock_quantity' => $variation->get_stock_quantity(),
'in_stock' => $variation->is_in_stock(), 'in_stock' => $variation->is_in_stock(),
'backorders_allowed' => $variation->backorders_allowed(), 'backorders_allowed' => $variation->backorders_allowed(),
'backordered' => $variation->is_on_backorder(), 'backordered' => $variation->is_on_backorder(),
'purchaseable' => $variation->is_purchasable(), 'purchaseable' => $variation->is_purchasable(),
'visible' => $variation->variation_is_visible(), 'visible' => $variation->variation_is_visible(),
'on_sale' => $variation->is_on_sale(), 'on_sale' => $variation->is_on_sale(),
'weight' => $variation->get_weight() ? $variation->get_weight() : null, 'weight' => $variation->get_weight() ? $variation->get_weight() : null,
'dimensions' => array( 'dimensions' => array(
'length' => $variation->length, 'length' => $variation->length,
'width' => $variation->width, 'width' => $variation->width,
'height' => $variation->height, 'height' => $variation->height,
'unit' => get_option( 'woocommerce_dimension_unit' ), 'unit' => get_option( 'woocommerce_dimension_unit' ),
), ),
'shipping_class' => $variation->get_shipping_class(), 'shipping_class' => $variation->get_shipping_class(),
'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null, 'shipping_class_id' => ( 0 !== $variation->get_shipping_class_id() ) ? $variation->get_shipping_class_id() : null,
'image' => $this->get_images( $variation ), 'image' => $this->get_images( $variation ),
'attributes' => $this->get_attributes( $variation ), 'attributes' => $this->get_attributes( $variation ),
'downloads' => $this->get_downloads( $variation ), 'downloads' => $this->get_downloads( $variation ),
'download_limit' => (int) $product->download_limit, 'download_limit' => (int) $product->download_limit,
'download_expiry' => (int) $product->download_expiry, 'download_expiry' => (int) $product->download_expiry,
); );
} }
@ -2395,7 +2397,7 @@ class WC_API_Products extends WC_API_Resource {
* Sets product image as attachment and returns the attachment ID. * Sets product image as attachment and returns the attachment ID.
* *
* @since 2.2 * @since 2.2
* @param integer $upload * @param array $upload
* @param int $id * @param int $id
* @return int * @return int
*/ */

20
includes/class-wc-background-updater.php
View File

@ -40,8 +40,6 @@ class WC_Background_Updater extends WP_Background_Process {
* Updater will still run via cron job if this fails for any reason. * Updater will still run via cron job if this fails for any reason.
*/ */
public function dispatch() { public function dispatch() {
WC_Admin_Notices::add_notice( 'updating' );
$dispatched = parent::dispatch(); $dispatched = parent::dispatch();
if ( is_wp_error( $dispatched ) ) { if ( is_wp_error( $dispatched ) ) {
@ -50,6 +48,15 @@ class WC_Background_Updater extends WP_Background_Process {
} }
} }
/**
* Schedule event
*/
protected function schedule_event() {
if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
wp_schedule_event( time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier );
}
}
/** /**
* Error shown when the updater cannot dispatch. * Error shown when the updater cannot dispatch.
*/ */
@ -57,6 +64,14 @@ class WC_Background_Updater extends WP_Background_Process {
echo '<div class="error"><p>' . __( 'Unable to dispatch WooCommerce updater:', 'woocommerce' ) . ' ' . esc_html( $this->error ) . '</p></div>'; echo '<div class="error"><p>' . __( 'Unable to dispatch WooCommerce updater:', 'woocommerce' ) . ' ' . esc_html( $this->error ) . '</p></div>';
} }
/**
* Is the updater running?
* @return boolean
*/
public function is_updating() {
return false === $this->is_queue_empty();
}
/** /**
* Task * Task
* *
@ -96,7 +111,6 @@ class WC_Background_Updater extends WP_Background_Process {
*/ */
protected function complete() { protected function complete() {
$logger = new WC_Logger(); $logger = new WC_Logger();
$logger->add( 'wc_db_updates', 'Data update complete' ); $logger->add( 'wc_db_updates', 'Data update complete' );
WC_Install::update_db_version(); WC_Install::update_db_version();
parent::complete(); parent::complete();

2
includes/class-wc-install.php
View File

@ -114,7 +114,7 @@ class WC_Install {
public static function install_actions() { public static function install_actions() {
if ( ! empty( $_GET['do_update_woocommerce'] ) ) { if ( ! empty( $_GET['do_update_woocommerce'] ) ) {
self::update(); self::update();
WC_Admin_Notices::remove_notice( 'update' ); WC_Admin_Notices::add_notice( 'update' );
} }
} }

2
includes/class-wc-shipping-zones.php
View File

@ -90,7 +90,7 @@ class WC_Shipping_Zones {
$wc_shipping = WC_Shipping::instance(); $wc_shipping = WC_Shipping::instance();
$allowed_classes = $wc_shipping->get_shipping_method_class_names(); $allowed_classes = $wc_shipping->get_shipping_method_class_names();
if ( in_array( $raw_shipping_method->method_id, array_keys( $allowed_classes ) ) ) { if ( ! empty( $raw_shipping_method ) && in_array( $raw_shipping_method->method_id, array_keys( $allowed_classes ) ) ) {
$class_name = $allowed_classes[ $raw_shipping_method->method_id ]; $class_name = $allowed_classes[ $raw_shipping_method->method_id ];
if ( is_object( $class_name ) ) { if ( is_object( $class_name ) ) {
$class_name = get_class( $class_name ); $class_name = get_class( $class_name );

3
includes/class-wc-shortcodes.php
View File

@ -267,9 +267,6 @@ class WC_Shortcodes {
ob_start(); ob_start();
// Reset loop/columns globals when starting a new loop
$woocommerce_loop['loop'] = $woocommerce_loop['column'] = '';
if ( $product_categories ) { if ( $product_categories ) {
woocommerce_product_loop_start(); woocommerce_product_loop_start();

8
includes/class-wc-tax.php
View File

@ -291,9 +291,15 @@ class WC_Tax {
if ( $postcode_ranges ) { if ( $postcode_ranges ) {
$matches = wc_postcode_location_matcher( $postcode, $postcode_ranges, 'tax_rate_id', 'location_code' ); $matches = wc_postcode_location_matcher( $postcode, $postcode_ranges, 'tax_rate_id', 'location_code' );
$postcode_search = array_unique( array_merge( $postcode_search, array_values( $matches ) ) ); if ( ! empty( $matches ) ) {
foreach ( $matches as $matched_postcodes ) {
$postcode_search = array_merge( $postcode_search, $matched_postcodes );
}
}
} }
$postcode_search = array_unique( $postcode_search );
/** /**
* Location matching criteria - ORed * Location matching criteria - ORed
* Needs to match: * Needs to match:

4
includes/cli/class-wc-cli-product.php
View File

@ -2057,10 +2057,10 @@ class WC_CLI_Product extends WC_CLI_Command {
} }
/** /**
* Get product image as attachment * Sets product image as attachment and returns the attachment ID.
* *
* @since 2.5.0 * @since 2.5.0
* @param int $upload * @param array $upload
* @param int $id * @param int $id
* @return int * @return int
*/ */

1
includes/emails/class-wc-email-customer-on-hold-order.php
View File

@ -34,6 +34,7 @@ class WC_Email_Customer_On_Hold_Order extends WC_Email {
// Triggers for this email // Triggers for this email
add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ) ); add_action( 'woocommerce_order_status_pending_to_on-hold_notification', array( $this, 'trigger' ) );
add_action( 'woocommerce_order_status_failed_to_on-hold_notification', array( $this, 'trigger' ) );
// Call parent constructor // Call parent constructor
parent::__construct(); parent::__construct();

33
includes/libraries/wp-async-request.php
View File

@ -1,25 +1,54 @@
<?php <?php
/**
* WP Async Request
*
* @package WP-Background-Processing
*/
if ( ! class_exists( 'WP_Async_Request' ) ) { if ( ! class_exists( 'WP_Async_Request' ) ) {
/**
* Abstract WP_Async_Request class.
*
* @abstract
*/
abstract class WP_Async_Request { abstract class WP_Async_Request {
/** /**
* Prefix
*
* (default value: 'wp')
*
* @var string * @var string
* @access protected
*/ */
protected $prefix = 'wp'; protected $prefix = 'wp';
/** /**
* Action
*
* (default value: 'async_request')
*
* @var string * @var string
* @access protected
*/ */
protected $action = 'async_request'; protected $action = 'async_request';
/** /**
* @var string * Identifier
*
* @var mixed
* @access protected
*/ */
protected $identifier; protected $identifier;
/** /**
* Data
*
* (default value: array())
*
* @var array * @var array
* @access protected
*/ */
protected $data = array(); protected $data = array();
@ -36,7 +65,7 @@ if ( ! class_exists( 'WP_Async_Request' ) ) {
/** /**
* Set data used during the request * Set data used during the request
* *
* @param array $data * @param array $data Data.
* *
* @return $this * @return $this
*/ */

106
includes/libraries/wp-background-process.php
View File

@ -1,27 +1,53 @@
<?php <?php
/**
* WP Background Process
*
* @package WP-Background-Processing
*/
if ( ! class_exists( 'WP_Background_Process' ) ) { if ( ! class_exists( 'WP_Background_Process' ) ) {
/**
* Abstract WP_Background_Process class.
*
* @abstract
* @extends WP_Async_Request
*/
abstract class WP_Background_Process extends WP_Async_Request { abstract class WP_Background_Process extends WP_Async_Request {
/** /**
* @var * Action
*
* (default value: 'background_process')
*
* @var string
* @access protected
*/ */
protected $action = 'background_process'; protected $action = 'background_process';
/** /**
* Start time of current process * Start time of current process.
*
* (default value: 0)
* *
* @var int * @var int
* @access protected
*/ */
protected $start_time = 0; protected $start_time = 0;
/** /**
* @var string * Cron_hook_identifier
*
* @var mixed
* @access protected
*/ */
protected $cron_hook_identifier; protected $cron_hook_identifier;
/** /**
* @var string * Cron_interval_identifier
*
* @var mixed
* @access protected
*/ */
protected $cron_interval_identifier; protected $cron_interval_identifier;
@ -41,20 +67,21 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
/** /**
* Dispatch * Dispatch
* *
* @return array|WP_Error * @access public
* @return void
*/ */
public function dispatch() { public function dispatch() {
// Schedule the cron healthcheck // Schedule the cron healthcheck.
$this->schedule_event(); $this->schedule_event();
// Perform remote post // Perform remote post.
return parent::dispatch(); return parent::dispatch();
} }
/** /**
* Push to queue * Push to queue
* *
* @param mixed $data * @param mixed $data Data.
* *
* @return $this * @return $this
*/ */
@ -82,8 +109,8 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
/** /**
* Update queue * Update queue
* *
* @param string $key * @param string $key Key.
* @param array $data * @param array $data Data.
* *
* @return $this * @return $this
*/ */
@ -98,7 +125,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
/** /**
* Delete queue * Delete queue
* *
* @param string $key * @param string $key Key.
* *
* @return $this * @return $this
*/ */
@ -114,7 +141,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
* Generates a unique key based on microtime. Queue items are * Generates a unique key based on microtime. Queue items are
* given a unique key so that they can be merged upon save. * given a unique key so that they can be merged upon save.
* *
* @param int $length * @param int $length Length.
* *
* @return string * @return string
*/ */
@ -133,12 +160,12 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
*/ */
public function maybe_handle() { public function maybe_handle() {
if ( $this->is_process_running() ) { if ( $this->is_process_running() ) {
// Background process already running // Background process already running.
wp_die(); wp_die();
} }
if ( $this->is_queue_empty() ) { if ( $this->is_queue_empty() ) {
// No data to process // No data to process.
wp_die(); wp_die();
} }
@ -184,7 +211,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
*/ */
protected function is_process_running() { protected function is_process_running() {
if ( get_site_transient( $this->identifier . '_process_lock' ) ) { if ( get_site_transient( $this->identifier . '_process_lock' ) ) {
// Process already running // Process already running.
return true; return true;
} }
@ -199,7 +226,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
* defined in the time_exceeded() method. * defined in the time_exceeded() method.
*/ */
protected function lock_process() { protected function lock_process() {
$this->start_time = time(); // Set start time of current process $this->start_time = time(); // Set start time of current process.
$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute $lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration ); $lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
@ -279,12 +306,12 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
} }
if ( $this->time_exceeded() || $this->memory_exceeded() ) { if ( $this->time_exceeded() || $this->memory_exceeded() ) {
// Batch limits reached // Batch limits reached.
break; break;
} }
} }
// Update or delete current batch // Update or delete current batch.
if ( ! empty( $batch->data ) ) { if ( ! empty( $batch->data ) ) {
$this->update( $batch->key, $batch->data ); $this->update( $batch->key, $batch->data );
} else { } else {
@ -294,7 +321,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
$this->unlock_process(); $this->unlock_process();
// Start next batch or complete process // Start next batch or complete process.
if ( ! $this->is_queue_empty() ) { if ( ! $this->is_queue_empty() ) {
$this->dispatch(); $this->dispatch();
} else { } else {
@ -313,7 +340,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
* @return bool * @return bool
*/ */
protected function memory_exceeded() { protected function memory_exceeded() {
$memory_limit = $this->get_memory_limit() * 0.9; // 90% of max memory $memory_limit = $this->get_memory_limit() * 0.9; // 90% of max memory
$current_memory = memory_get_usage( true ); $current_memory = memory_get_usage( true );
$return = false; $return = false;
@ -333,12 +360,12 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
if ( function_exists( 'ini_get' ) ) { if ( function_exists( 'ini_get' ) ) {
$memory_limit = ini_get( 'memory_limit' ); $memory_limit = ini_get( 'memory_limit' );
} else { } else {
// Sensible default // Sensible default.
$memory_limit = '128M'; $memory_limit = '128M';
} }
if ( ! $memory_limit || -1 == $memory_limit ) { if ( ! $memory_limit || -1 === $memory_limit ) {
// Unlimited, set to 32GB // Unlimited, set to 32GB.
$memory_limit = '32000M'; $memory_limit = '32000M';
} }
@ -346,7 +373,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
} }
/** /**
* Time exceeded * Time exceeded.
* *
* Ensures the batch never exceeds a sensible time limit. * Ensures the batch never exceeds a sensible time limit.
* A timeout limit of 30s is common on shared hosting. * A timeout limit of 30s is common on shared hosting.
@ -365,21 +392,21 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
} }
/** /**
* Complete * Complete.
* *
* Override if applicable, but ensure that the below actions are * Override if applicable, but ensure that the below actions are
* performed, or, call parent::complete(). * performed, or, call parent::complete().
*/ */
protected function complete() { protected function complete() {
// Unschedule the cron healthcheck // Unschedule the cron healthcheck.
$this->clear_scheduled_event(); $this->clear_scheduled_event();
} }
/** /**
* Schedule cron healthcheck * Schedule cron healthcheck
* *
* @param $schedules * @access public
* * @param mixed $schedules Schedules.
* @return mixed * @return mixed
*/ */
public function schedule_cron_healthcheck( $schedules ) { public function schedule_cron_healthcheck( $schedules ) {
@ -406,12 +433,12 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
*/ */
public function handle_cron_healthcheck() { public function handle_cron_healthcheck() {
if ( $this->is_process_running() ) { if ( $this->is_process_running() ) {
// Background process already running // Background process already running.
exit; exit;
} }
if ( $this->is_queue_empty() ) { if ( $this->is_queue_empty() ) {
// No data to process // No data to process.
$this->clear_scheduled_event(); $this->clear_scheduled_event();
exit; exit;
} }
@ -441,6 +468,23 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
} }
} }
/**
* Cancel Process
*
* Stop processing queue items, clear cronjob and delete batch.
*
*/
public function cancel_process() {
if ( ! $this->is_queue_empty() ) {
$batch = $this->get_batch();
$this->delete( $batch->key );
wp_clear_scheduled_hook( $this->cron_hook_identifier );
}
}
/** /**
* Task * Task
* *
@ -449,7 +493,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
* in the next pass through. Or, return false to remove the * in the next pass through. Or, return false to remove the
* item from the queue. * item from the queue.
* *
* @param mixed $item Queue item to iterate over * @param mixed $item Queue item to iterate over.
* *
* @return mixed * @return mixed
*/ */

3
includes/shortcodes/class-wc-shortcode-checkout.php
View File

@ -206,6 +206,9 @@ class WC_Shortcode_Checkout {
// Empty awaiting payment session // Empty awaiting payment session
unset( WC()->session->order_awaiting_payment ); unset( WC()->session->order_awaiting_payment );
// Empty current cart
wc_empty_cart();
wc_get_template( 'checkout/thankyou.php', array( 'order' => $order ) ); wc_get_template( 'checkout/thankyou.php', array( 'order' => $order ) );
} }

21
includes/wc-core-functions.php
View File

@ -1249,19 +1249,18 @@ function wc_get_wildcard_postcodes( $postcode ) {
* @since 2.6.0 * @since 2.6.0
* @param string $postcode Postcode you want to match against stored postcodes * @param string $postcode Postcode you want to match against stored postcodes
* @param array $objects Array of postcode objects from Database * @param array $objects Array of postcode objects from Database
* @param string $object_compare_key DB column name for the ID. * @param string $object_id_key DB column name for the ID.
* @param string $object_compare_key DB column name for the value. * @param string $object_compare_key DB column name for the value.
* @param string $object_id_key * @return array Array of matching object ID and matching values.
* @return array Array of matching object ID and values.
*/ */
function wc_postcode_location_matcher( $postcode, $objects, $object_id_key, $object_compare_key ) { function wc_postcode_location_matcher( $postcode, $objects, $object_id_key, $object_compare_key ) {
$postcode = wc_normalize_postcode( $postcode ); $postcode = wc_normalize_postcode( $postcode );
$wildcard_postcodes = array_map( 'wc_clean', wc_get_wildcard_postcodes( $postcode ) ); $wildcard_postcodes = array_map( 'wc_clean', wc_get_wildcard_postcodes( $postcode ) );
$postcodes = array_map( 'wc_normalize_postcode', wp_list_pluck( $objects, $object_compare_key, $object_id_key ) );
$matches = array(); $matches = array();
foreach ( $postcodes as $object_id => $compare_against ) { foreach ( $objects as $object ) {
$compare = $postcode; $object_id = $object->$object_id_key;
$compare_against = $object->$object_compare_key;
// Handle postcodes containing ranges. // Handle postcodes containing ranges.
if ( strstr( $compare_against, '...' ) ) { if ( strstr( $compare_against, '...' ) ) {
@ -1275,18 +1274,22 @@ function wc_postcode_location_matcher( $postcode, $objects, $object_id_key, $obj
// If the postcode is non-numeric, make it numeric. // If the postcode is non-numeric, make it numeric.
if ( ! is_numeric( $min ) || ! is_numeric( $max ) ) { if ( ! is_numeric( $min ) || ! is_numeric( $max ) ) {
$compare = wc_make_numeric_postcode( $compare ); $compare = wc_make_numeric_postcode( $postcode );
$min = str_pad( wc_make_numeric_postcode( $min ), strlen( $compare ), '0' ); $min = str_pad( wc_make_numeric_postcode( $min ), strlen( $compare ), '0' );
$max = str_pad( wc_make_numeric_postcode( $max ), strlen( $compare ), '0' ); $max = str_pad( wc_make_numeric_postcode( $max ), strlen( $compare ), '0' );
} else {
$compare = $postcode;
} }
if ( $compare >= $min && $compare <= $max ) { if ( $compare >= $min && $compare <= $max ) {
$matches[ $object_id ] = $compare_against; $matches[ $object_id ] = isset( $matches[ $object_id ] ) ? $matches[ $object_id ]: array();
$matches[ $object_id ][] = $compare_against;
} }
// Wildcard and standard comparison. // Wildcard and standard comparison.
} elseif ( in_array( $compare_against, $wildcard_postcodes ) ) { } elseif ( in_array( $compare_against, $wildcard_postcodes ) ) {
$matches[ $object_id ] = $compare_against; $matches[ $object_id ] = isset( $matches[ $object_id ] ) ? $matches[ $object_id ]: array();
$matches[ $object_id ][] = $compare_against;
} }
} }

4
includes/wc-formatting-functions.php
View File

@ -31,8 +31,8 @@ function wc_sanitize_taxonomy_name( $taxonomy ) {
* *
* Cannot use wc_clean because it sometimes strips % chars and breaks the user's setting. * Cannot use wc_clean because it sometimes strips % chars and breaks the user's setting.
* *
* @since 2.6.0 * @since 2.6.0
* @param string $taxonomy * @param string $value
* @return string * @return string
*/ */
function wc_sanitize_permalink( $value ) { function wc_sanitize_permalink( $value ) {

2
templates/single-product/add-to-cart/grouped.php
View File

@ -95,7 +95,7 @@ do_action( 'woocommerce_before_add_to_cart_form' ); ?>
<?php do_action( 'woocommerce_before_add_to_cart_button' ); ?> <?php do_action( 'woocommerce_before_add_to_cart_button' ); ?>
<button type="submit" class="single_add_to_cart_button button alt"><?php echo $product->single_add_to_cart_text(); ?></button> <button type="submit" class="single_add_to_cart_button button alt"><?php echo esc_html( $product->single_add_to_cart_text() ); ?></button>
<?php do_action( 'woocommerce_after_add_to_cart_button' ); ?> <?php do_action( 'woocommerce_after_add_to_cart_button' ); ?>