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

Corrected format_ methods

This commit is contained in:
Mike Jolley 2014-11-20 15:43:40 +00:00
parent db13b2224f
commit 7472a722b2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/admin/settings/class-wc-settings-tax.php
View File

@ -199,7 +199,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
* @param string $state
* @return string
*/
private function tax_rate_state( $state ) {
private function format_tax_rate_state( $state ) {
$state = strtoupper( $state );
return $state === '*' ? '' : $state;
}
@ -209,7 +209,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
* @param string $state
* @return string
*/
private function tax_rate_country( $country ) {
private function format_tax_rate_country( $country ) {
$country = strtoupper( $country );
return $country === '*' ? '' : $country;
}
@ -219,7 +219,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
* @param string $state
* @return string
*/
private function tax_rate_name( $name ) {
private function format_tax_rate_name( $name ) {
return $name ? $name : __( 'Tax', 'woocommerce' );
}
@ -250,6 +250,15 @@ class WC_Settings_Tax extends WC_Settings_Page {
return strtoupper( $postcode );
}
/**
* format the priority
* @param string $priority
* @return int
*/
private function format_tax_rate_priority( $priority ) {
return absint( $priority );
}
/**
* Update postcodes for a tax rate in the DB
* @param int $tax_rate_id
@ -338,10 +347,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
foreach ( $tax_rate_keys as $tax_rate_key ) {
if ( isset( $_POST[ $tax_rate_key ] ) && isset( $_POST[ $tax_rate_key ][ $key ] ) ) {
$_tax_rate[ $tax_rate_key ] = wc_clean( $_POST[ $tax_rate_key ][ $key ] );
if ( method_exists( $this, 'format_' . $tax_rate_key ) ) {
$_tax_rate[ $tax_rate_key ] = call_user_func( array( $this, 'format_' . $tax_rate_key ), $_tax_rate[ $tax_rate_key ] );
}
$_tax_rate[ $tax_rate_key ] = call_user_func( array( $this, 'format_' . $tax_rate_key ), $_tax_rate[ $tax_rate_key ] );
}
}
@ -374,7 +380,7 @@ class WC_Settings_Tax extends WC_Settings_Page {
} else {
// Remove rates
if ( 1 == $_POST['remove_tax_rate'][ $key ] ) {
$this->delete_tax_rate( $tax_rate_id );
$this->delete_tax_rate( $key );
continue;
}