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

Order items

This commit is contained in:
Mike Jolley 2017-07-26 15:47:30 +01:00
parent 1faae6a7aa
commit abdb325d83
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1174,7 +1174,6 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
$this->calculate_taxes();
}
// line items
foreach ( $this->get_items() as $item ) {
$cart_subtotal += $item->get_subtotal();
$cart_total += $item->get_total();

8
includes/abstracts/abstract-wc-totals.php
View File

@ -197,14 +197,12 @@ abstract class WC_Totals {
'quantity' => 0,
'price' => 0,
'product' => false,
'price_includes_tax' => wc_prices_include_tax(),
'price_includes_tax' => false,
'subtotal' => 0,
'subtotal_tax' => 0,
'subtotal_taxes' => array(),
'total' => 0,
'total_tax' => 0,
'taxes' => array(),
'discounted_price' => 0,
);
}
@ -418,8 +416,8 @@ abstract class WC_Totals {
$item->subtotal_tax = 0;
if ( wc_tax_enabled() && $item->product->is_taxable() ) {
$item->subtotal_taxes = WC_Tax::calc_tax( $item->subtotal, $this->get_item_tax_rates( $item ), $item->price_includes_tax );
$item->subtotal_tax = array_sum( $item->subtotal_taxes );
$subtotal_taxes = WC_Tax::calc_tax( $item->subtotal, $this->get_item_tax_rates( $item ), $item->price_includes_tax );
$item->subtotal_tax = array_sum( $subtotal_taxes );
if ( $item->price_includes_tax ) {
$item->subtotal = $item->subtotal - $item->subtotal_tax;

4
includes/class-wc-cart-totals.php
View File

@ -31,8 +31,9 @@ final class WC_Cart_Totals extends WC_Totals {
* @param object $object Cart or order object to calculate totals for.
*/
public function __construct( &$object = null ) {
parent::__construct( $object );
if ( is_a( $object, 'WC_Cart' ) ) {
parent::__construct( $object );
$this->calculate();
}
}
@ -57,6 +58,7 @@ final class WC_Cart_Totals extends WC_Totals {
$item = $this->get_default_item_props();
$item->key = $cart_item_key;
$item->object = $cart_item;
$item->price_includes_tax = wc_prices_include_tax();
$item->quantity = $cart_item['quantity'];
$item->price = $this->add_precision( $cart_item['data']->get_price() ) * $cart_item['quantity'];
$item->product = $cart_item['data'];

38
includes/class-wc-order-totals.php
View File

@ -27,8 +27,9 @@ final class WC_Order_Totals extends WC_Totals {
* @param object $object Cart or order object to calculate totals for.
*/
public function __construct( &$object = null ) {
parent::__construct( $object );
if ( is_a( $object, 'WC_Order' ) ) {
parent::__construct( $object );
$this->calculate();
}
}
@ -41,14 +42,19 @@ final class WC_Order_Totals extends WC_Totals {
protected function set_items() {
$this->items = array();
foreach ( $this->object->get_items() as $order_item_id => $order_item ) {
$item = $this->get_default_item_props();
$item->key = $order_item_id;
$item->object = $order_item;
$item->product = $order_item->get_product();
$item->quantity = $order_item->get_quantity();
$item->price = $this->add_precision( $order_item->get_subtotal() );
$this->items[ $order_item_id ] = $item;
foreach ( $this->object->get_items() as $item_key => $item_object ) {
$item = $this->get_default_item_props();
$item->key = $item_key;
$item->object = $item_object;
$item->product = $item_object->get_product();
$item->quantity = $item_object->get_quantity();
$item->price = $this->add_precision( $item_object->get_subtotal() );
$item->subtotal = $this->add_precision( $item_object->get_subtotal() );
$item->subtotal_tax = $this->add_precision( $item_object->get_subtotal_tax() );
$item->total = $this->add_precision( $item_object->get_total() );
$item->total_tax = $this->add_precision( $item_object->get_total_tax() );
$item->taxes = $this->add_precision( $item_object->get_taxes() );
$this->items[ $item_key ] = $item;
}
}
@ -61,11 +67,11 @@ final class WC_Order_Totals extends WC_Totals {
$this->fees = array();
foreach ( $this->object->get_fees() as $fee_key => $fee_object ) {
$fee = $this->get_default_fee_props();
$fee->object = $fee_object;
$fee->total = $this->add_precision( $fee_object->get_total() );
$fee->taxes = $this->add_precision( $fee_object->get_taxes() );
$fee->total_tax = $this->add_precision( $fee_object->get_total_tax() );
$fee = $this->get_default_fee_props();
$fee->object = $fee_object;
$fee->total = $this->add_precision( $fee_object->get_total() );
$fee->taxes = $this->add_precision( $fee_object->get_taxes() );
$fee->total_tax = $this->add_precision( $fee_object->get_total_tax() );
$this->fees[ $fee_key ] = $fee;
}
}
@ -95,7 +101,7 @@ final class WC_Order_Totals extends WC_Totals {
* @since 3.2.0
*/
protected function set_coupons() {
//$this->coupons = $this->object->get_coupons(); @todo
//$this->coupons = $this->object->get_coupons(); @todo get_used_coupons = codes
}
/**
@ -106,6 +112,8 @@ final class WC_Order_Totals extends WC_Totals {
protected function calculate_totals() {
parent::calculate_totals();
$this->object->set_discount_total( $this->get_total( 'discounts_total' ) );
$this->object->set_discount_tax( $this->get_total( 'discounts_tax_total' ) );
$this->object->set_shipping_total( $this->get_total( 'shipping_total' ) );
$this->object->set_shipping_tax( $this->get_total( 'shipping_tax_total' ) );
$this->object->set_cart_tax( $this->get_total( 'tax_total' ) );