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

Allow quantities less than 1, but not 0.

This commit is contained in:
Mike Jolley 2018-01-05 12:48:24 +00:00
parent ae9a98b0a0
commit 2c915ba961
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1453,11 +1453,11 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
public function get_item_subtotal( $item, $inc_tax = false, $round = true ) {
$subtotal = 0;
if ( is_callable( array( $item, 'get_subtotal' ) ) ) {
if ( is_callable( array( $item, 'get_subtotal' ) ) && $item->get_quantity() ) {
if ( $inc_tax ) {
$subtotal = ( $item->get_subtotal() + $item->get_subtotal_tax() ) / max( 1, $item->get_quantity() );
$subtotal = ( $item->get_subtotal() + $item->get_subtotal_tax() ) / $item->get_quantity();
} else {
$subtotal = ( floatval( $item->get_subtotal() ) / max( 1, $item->get_quantity() ) );
$subtotal = floatval( $item->get_subtotal() ) / $item->get_quantity();
}
$subtotal = $round ? number_format( (float) $subtotal, wc_get_price_decimals(), '.', '' ) : $subtotal;
@ -1501,11 +1501,11 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
public function get_item_total( $item, $inc_tax = false, $round = true ) {
$total = 0;
if ( is_callable( array( $item, 'get_total' ) ) ) {
if ( is_callable( array( $item, 'get_total' ) ) && $item->get_quantity() ) {
if ( $inc_tax ) {
$total = ( $item->get_total() + $item->get_total_tax() ) / max( 1, $item->get_quantity() );
$total = ( $item->get_total() + $item->get_total_tax() ) / $item->get_quantity();
} else {
$total = floatval( $item->get_total() ) / max( 1, $item->get_quantity() );
$total = floatval( $item->get_total() ) / $item->get_quantity();
}
$total = $round ? round( $total, wc_get_price_decimals() ) : $total;
@ -1546,8 +1546,8 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
public function get_item_tax( $item, $round = true ) {
$tax = 0;
if ( is_callable( array( $item, 'get_total_tax' ) ) ) {
$tax = $item->get_total_tax() / max( 1, $item->get_quantity() );
if ( is_callable( array( $item, 'get_total_tax' ) ) && $item->get_quantity() ) {
$tax = $item->get_total_tax() / $item->get_quantity();
$tax = $round ? wc_round_tax_total( $tax ) : $tax;
}

2
includes/api/class-wc-rest-orders-controller.php
View File

@ -153,7 +153,7 @@ class WC_REST_Orders_Controller extends WC_REST_Legacy_Orders_Controller {
// Add SKU and PRICE to products.
if ( is_callable( array( $item, 'get_product' ) ) ) {
$data['sku'] = $item->get_product() ? $item->get_product()->get_sku(): null;
$data['price'] = $item->get_total() / max( 1, $item->get_quantity() );
$data['price'] = $item->get_quantity() ? $item->get_total() / $item->get_quantity() : 0;
}
// Format taxes.