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 orders-crud-function-update

This commit is contained in:
Mike Jolley 2016-08-08 17:24:40 +01:00
parent e8d85005d7 cfe28c9b25
commit 39eb584321
21 changed files with 86 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/css/woocommerce-smallscreen.scss
View File

@ -41,7 +41,7 @@
text-align: right !important; // Important to overwrite order status inline styling
&.order-actions {
text-align: left !important;
text-align: left !important; // This must always align left on handheld
}
&:before {
@ -109,7 +109,7 @@
&:nth-child(2n) {
float: right;
clear: none !important;
clear: none !important; // This should never clear.
}
}
}

16
assets/css/woocommerce.scss
View File

@ -69,13 +69,13 @@ p.demo_store {
text-align: center;
line-height: 1;
border-radius: 100%;
color: red !important;
color: red !important; // Required for default theme compatibility
text-decoration: none;
font-weight: 700;
border: 0;
&:hover {
color: #fff !important;
color: #fff !important; // Required for default theme compatibility
background: red;
}
}
@ -1496,13 +1496,13 @@ p.demo_store {
.woocommerce-message,
.woocommerce-error,
.woocommerce-info {
padding: 1em 2em 1em 3.5em !important;
margin: 0 0 2em !important;
padding: 1em 2em 1em 3.5em;
margin: 0 0 2em;
position: relative;
background-color: lighten($secondary,5%);
color: $secondarytext;
border-top: 3px solid $primary;
list-style: none outside !important;
list-style: none outside;
@include clearfix();
width: auto;
word-wrap: break-word;
@ -1521,9 +1521,9 @@ p.demo_store {
}
li {
list-style: none outside !important;
padding-left: 0 !important;
margin-left: 0 !important;
list-style: none outside !important; // Required for default theme compatibility
padding-left: 0 !important; // Required for default theme compatibility
margin-left: 0 !important; // Required for default theme compatibility
}
}

1
includes/abstracts/abstract-wc-order.php
View File

@ -1205,6 +1205,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
// Inherit tax class from items
if ( '' === $shipping_tax_class ) {
$tax_rates = array();
$tax_classes = WC_Tax::get_tax_classes();
$found_tax_classes = $this->get_items_tax_classes();

2
includes/abstracts/abstract-wc-rest-posts-controller.php
View File

@ -521,6 +521,8 @@ abstract class WC_REST_Posts_Controller extends WC_REST_Controller {
if ( 'include' === $query_args['orderby'] ) {
$query_args['orderby'] = 'post__in';
} elseif ( 'id' === $query_args['orderby'] ) {
$query_args['orderby'] = 'ID'; // ID must be capitalized
}
return $query_args;

2
includes/admin/class-wc-admin-status.php
View File

@ -368,7 +368,7 @@ class WC_Admin_Status {
}
if ( ! empty( $_REQUEST[ 'handle' ] ) ) {
$logger = new WC_Logger();
$logger = wc_get_logger();
$logger->remove( $_REQUEST[ 'handle' ] );
}

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

@ -62,9 +62,7 @@ function wc_create_page( $slug, $option = '', $page_title = '', $page_content =
$option_value = get_option( $option );
if ( $option_value > 0 ) {
$page_object = get_post( $option_value );
if ( $option_value > 0 && ( $page_object = get_post( $option_value ) ) ) {
if ( 'page' === $page_object->post_type && ! in_array( $page_object->post_status, array( 'pending', 'trash', 'future', 'auto-draft' ) ) ) {
// Valid page is already in place
return $page_object->ID;

4
includes/api/class-wc-rest-coupons-controller.php
View File

@ -246,8 +246,8 @@ class WC_REST_Coupons_Controller extends WC_REST_Posts_Controller {
// Content.
$data->post_content = '';
// Excerpt.
if ( ! empty( $schema['properties']['excerpt'] ) && isset( $request['description'] ) ) {
// Coupon description (excerpt).
if ( ! empty( $schema['properties']['description'] ) && isset( $request['description'] ) ) {
$data->post_excerpt = wp_filter_post_kses( $request['description'] );
}

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

@ -36,7 +36,7 @@ class WC_Background_Updater extends WP_Background_Process {
*/
public function dispatch() {
$dispatched = parent::dispatch();
$logger = new WC_Logger();
$logger = wc_get_logger();
if ( is_wp_error( $dispatched ) ) {
$logger->add( 'wc_db_updates', sprintf( 'Unable to dispatch WooCommerce updater: %s', $dispatched->get_error_message() ) );
@ -97,7 +97,7 @@ class WC_Background_Updater extends WP_Background_Process {
define( 'WC_UPDATING', true );
}
$logger = new WC_Logger();
$logger = wc_get_logger();
include_once( dirname( __FILE__ ) . '/wc-update-functions.php' );
@ -119,7 +119,7 @@ class WC_Background_Updater extends WP_Background_Process {
* performed, or, call parent::complete().
*/
protected function complete() {
$logger = new WC_Logger();
$logger = wc_get_logger();
$logger->add( 'wc_db_updates', 'Data update complete' );
WC_Install::update_db_version();
parent::complete();

36
includes/class-wc-cart.php
View File

@ -1289,8 +1289,8 @@ class WC_Cart {
// Apply discounts and get the discounted price FOR A SINGLE ITEM
$discounted_price = $this->get_discounted_price( $values, $adjusted_price, true );
// Convert back to line price and round nicely
$discounted_line_price = round( $discounted_price * $values['quantity'], $this->dp );
// Convert back to line price
$discounted_line_price = $discounted_price * $values['quantity'];
// Now use rounded line price to get taxes.
$discounted_taxes = WC_Tax::calc_tax( $discounted_line_price, $item_tax_rates, true );
@ -1312,8 +1312,8 @@ class WC_Cart {
// Calc prices and tax (discounted)
$discounted_price = $this->get_discounted_price( $values, $base_price, true );
// Convert back to line price and round nicely
$discounted_line_price = round( $discounted_price * $values['quantity'], $this->dp );
// Convert back to line price
$discounted_line_price = $discounted_price * $values['quantity'];
// Now use rounded line price to get taxes.
$discounted_taxes = WC_Tax::calc_tax( $discounted_line_price, $item_tax_rates, true );
@ -1356,14 +1356,26 @@ class WC_Cart {
// Cart contents total is based on discounted prices and is used for the final total calculation
$this->cart_contents_total += $line_total;
// Store costs + taxes for lines
$this->cart_contents[ $cart_item_key ]['line_total'] = $line_total;
$this->cart_contents[ $cart_item_key ]['line_tax'] = $line_tax;
$this->cart_contents[ $cart_item_key ]['line_subtotal'] = $line_subtotal;
$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $line_subtotal_tax;
// Store rates ID and costs - Since 2.2
$this->cart_contents[ $cart_item_key ]['line_tax_data'] = array( 'total' => $discounted_taxes, 'subtotal' => $taxes );
/**
* Store costs + taxes for lines. For tax inclusive prices, we do some extra rounding logic so the stored
* values "add up" when viewing the order in admin. This does have the disadvatage of not being able to
* recalculate the tax total/subtotal accurately in the future, but it does ensure the data looks correct.
*
* Tax exclusive prices are not affected.
*/
if ( ! $_product->is_taxable() || $this->prices_include_tax ) {
$this->cart_contents[ $cart_item_key ]['line_total'] = round( $line_total + $line_tax - wc_round_tax_total( $line_tax ), $this->dp );
$this->cart_contents[ $cart_item_key ]['line_subtotal'] = round( $line_subtotal + $line_subtotal_tax - wc_round_tax_total( $line_subtotal_tax ), $this->dp );
$this->cart_contents[ $cart_item_key ]['line_tax'] = wc_round_tax_total( $line_tax );
$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = wc_round_tax_total( $line_subtotal_tax );
$this->cart_contents[ $cart_item_key ]['line_tax_data'] = array( 'total' => array_map( 'wc_round_tax_total', $discounted_taxes ), 'subtotal' => array_map( 'wc_round_tax_total', $taxes ) );
} else {
$this->cart_contents[ $cart_item_key ]['line_total'] = $line_total;
$this->cart_contents[ $cart_item_key ]['line_subtotal'] = $line_subtotal;
$this->cart_contents[ $cart_item_key ]['line_tax'] = $line_tax;
$this->cart_contents[ $cart_item_key ]['line_subtotal_tax'] = $line_subtotal_tax;
$this->cart_contents[ $cart_item_key ]['line_tax_data'] = array( 'total' => $discounted_taxes, 'subtotal' => $taxes );
}
}
// Only calculate the grand total + shipping if on the cart/checkout

2
includes/class-wc-form-handler.php
View File

@ -146,7 +146,7 @@ class WC_Form_Handler {
do_action( 'woocommerce_customer_save_address', $user_id, $load_address );
wp_safe_redirect( wc_get_page_permalink( 'myaccount' ) );
wp_safe_redirect( wc_get_endpoint_url( 'edit-address', '', wc_get_page_permalink( 'myaccount' ) ) );
exit;
}
}

6
includes/class-wc-geo-ip.php
View File

@ -1168,12 +1168,8 @@ class WC_Geo_IP {
* @param string $message
*/
public static function log( $message ) {
if ( ! class_exists( 'WC_Logger' ) ) {
include_once( dirname( __FILE__ ) . '/class-wc-logger.php' );
}
if ( empty( self::$log ) ) {
self::$log = new WC_Logger();
self::$log = wc_get_logger();
}
self::$log->add( 'geoip', $message );
}

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

@ -176,7 +176,7 @@ class WC_Geolocation {
* Update geoip database. Adapted from https://wordpress.org/plugins/geoip-detect/.
*/
public static function update_database() {
$logger = new WC_Logger();
$logger = wc_get_logger();
if ( ! is_callable( 'gzopen' ) ) {
$logger->add( 'geolocation', 'Server does not support gzopen' );

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

@ -221,7 +221,7 @@ class WC_Install {
*/
private static function update() {
$current_db_version = get_option( 'woocommerce_db_version' );
$logger = new WC_Logger();
$logger = wc_get_logger();
$update_queued = false;
foreach ( self::$db_updates as $version => $update_callbacks ) {

2
includes/emails/class-wc-email.php
View File

@ -411,7 +411,7 @@ class WC_Email extends WC_Settings_API {
$emogrifier = new Emogrifier( $content, $css );
$content = $emogrifier->emogrify();
} catch ( Exception $e ) {
$logger = new WC_Logger();
$logger = wc_get_logger();
$logger->add( 'emogrifier', $e->getMessage() );
}
}

2
includes/gateways/paypal/class-wc-gateway-paypal.php
View File

@ -79,7 +79,7 @@ class WC_Gateway_Paypal extends WC_Payment_Gateway {
public static function log( $message ) {
if ( self::$log_enabled ) {
if ( empty( self::$log ) ) {
self::$log = new WC_Logger();
self::$log = wc_get_logger();
}
self::$log->add( 'paypal', $message );
}

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

@ -1415,3 +1415,16 @@ function wc_get_rounding_precision() {
}
return $precision;
}
/**
* Returns a new instance of a WC Logger.
* Use woocommerce_logging_class filter to change the logging class.
* @return WC_Logger
*/
function wc_get_logger() {
if ( ! class_exists( 'WC_Logger' ) ) {
include_once( dirname( __FILE__ ) . '/class-wc-logger.php' );
}
$class = apply_filters( 'woocommerce_logging_class', 'WC_Logger' );
return new $class;
}

12
includes/wc-template-functions.php
View File

@ -423,7 +423,7 @@ if ( ! function_exists( 'woocommerce_content' ) ) {
<?php elseif ( ! woocommerce_product_subcategories( array( 'before' => woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?>
<?php wc_get_template( 'loop/no-products-found.php' ); ?>
<?php do_action( 'woocommerce_no_products_found' ); ?>
<?php endif;
@ -2305,6 +2305,16 @@ if ( ! function_exists( 'woocommerce_account_edit_account' ) ) {
}
}
if ( ! function_exists( 'wc_no_products_found' ) ) {
/**
* Show no products found message.
*/
function wc_no_products_found() {
wc_get_template( 'loop/no-products-found.php' );
}
}
if ( ! function_exists( 'wc_get_email_order_items' ) ) {
/**

1
includes/wc-template-hooks.php
View File

@ -74,6 +74,7 @@ add_action( 'woocommerce_archive_description', 'woocommerce_product_archive_desc
*/
add_action( 'woocommerce_before_shop_loop', 'woocommerce_result_count', 20 );
add_action( 'woocommerce_before_shop_loop', 'woocommerce_catalog_ordering', 30 );
add_action( 'woocommerce_no_products_found', 'wc_no_products_found' );
/**
* Product Loop Items.

1
readme.txt
View File

@ -167,6 +167,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* On multisite, when a user logs into a store with an account on a site, but not the current site, rather than error, add the user to the current site as a customer.
* Show variable weights/dimensions even when parent values are not set.
* Automatically sort tax rates rather than allow clunky manual sorting.
* Made WC_Logger pluggable via wc_get_logger function.
[See changelog for all versions](https://raw.githubusercontent.com/woothemes/woocommerce/master/CHANGELOG.txt).

9
templates/archive-product.php
View File

@ -87,7 +87,14 @@ get_header( 'shop' ); ?>
<?php elseif ( ! woocommerce_product_subcategories( array( 'before' => woocommerce_product_loop_start( false ), 'after' => woocommerce_product_loop_end( false ) ) ) ) : ?>
<?php wc_get_template( 'loop/no-products-found.php' ); ?>
<?php
/**
* woocommerce_no_products_found hook.
*
* @hooked wc_no_products_found - 10
*/
do_action( 'woocommerce_no_products_found' );
?>
<?php endif; ?>

4
tests/unit-tests/util/log.php
View File

@ -16,7 +16,7 @@ class WC_Tests_Log extends WC_Unit_Test_Case {
* @since 2.4
*/
public function test_add() {
$log = new WC_Logger();
$log = wc_get_logger();
$log->add( 'unit-tests', 'this is a message' );
@ -30,7 +30,7 @@ class WC_Tests_Log extends WC_Unit_Test_Case {
* @since 2.4
*/
public function test_clear() {
$log = new WC_Logger();
$log = wc_get_logger();
$log->add( 'unit-tests', 'this is a message' );
$log->clear( 'unit-tests' );