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

Merge pull request #13327 from woocommerce/fix-13321 

Map legacy tax array keys
This commit is contained in:
Claudio Sanches 2017-02-23 17:03:33 -03:00 committed by GitHub
parent 6aa9a3936c 252c08b943
commit 688f77b1c3
2 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
includes/class-wc-order-item-tax.php
View File

@ -209,4 +209,55 @@ class WC_Order_Item_Tax extends WC_Order_Item {
public function is_compound() { public function is_compound() {
return $this->get_compound(); return $this->get_compound();
} }
/*
|--------------------------------------------------------------------------
| Array Access Methods
|--------------------------------------------------------------------------
|
| For backwards compat with legacy arrays.
|
*/
/**
* offsetGet for ArrayAccess/Backwards compatibility.
* @deprecated Add deprecation notices in future release.
* @param string $offset
* @return mixed
*/
public function offsetGet( $offset ) {
if ( 'tax_amount' === $offset ) {
$offset = 'tax_total';
} elseif ( 'shipping_tax_amount' === $offset ) {
$offset = 'shipping_tax_total';
}
return parent::offsetGet( $offset );
}
/**
* offsetSet for ArrayAccess/Backwards compatibility.
* @deprecated Add deprecation notices in future release.
* @param string $offset
* @param mixed $value
*/
public function offsetSet( $offset, $value ) {
if ( 'tax_amount' === $offset ) {
$offset = 'tax_total';
} elseif ( 'shipping_tax_amount' === $offset ) {
$offset = 'shipping_tax_total';
}
parent::offsetSet( $offset, $value );
}
/**
* offsetExists for ArrayAccess
* @param string $offset
* @return bool
*/
public function offsetExists( $offset ) {
if ( in_array( $offset, array( 'tax_amount', 'shipping_tax_amount' ) ) ) {
return true;
}
return parent::offsetExists( $offset );
}
} }

18
tests/unit-tests/order/crud.php
View File

@ -334,6 +334,24 @@ class WC_Tests_CRUD_Orders extends WC_Unit_Test_Case {
update_option( 'woocommerce_calc_taxes', 'no' ); update_option( 'woocommerce_calc_taxes', 'no' );
} }
/**
* Test mapping from old tax array keys to CRUD functions
*/
function test_tax_legacy_arrayaccess() {
$tax = new WC_Order_item_Tax();
$tax->set_rate_id( 5 );
$tax->set_compound( true );
$tax->set_tax_total( 2.00 );
$tax->set_shipping_tax_total( 1.50 );
$this->assertEquals( $tax->get_rate_id(), $tax['rate_id'] );
$this->assertEquals( $tax->get_compound(), $tax['compound'] );
$this->assertEquals( $tax->get_tax_total(), $tax['tax_total'] );
$this->assertEquals( $tax->get_tax_total(), $tax['tax_amount'] );
$this->assertEquals( $tax->get_shipping_tax_total(), $tax['shipping_tax_total'] );
$this->assertEquals( $tax->get_shipping_tax_total(), $tax['shipping_tax_amount'] );
}
/** /**
* Test: get_shipping_methods * Test: get_shipping_methods
*/ */