eventespresso / event-espresso-core

core/db_models/fields/EE_Money_Field.php

Braces +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		if($schema == 'no_currency_code'){
 //			echo "schema no currency!";
 			$display_code = false;
-		}else{
+		} else{
 			$display_code = true;
 		}
 		//we don't use the $pretty_float because format_currency will take care of it.

Spacing +21 added lines, -22 removed lines

@@ -2,7 +2,7 @@ 
 /**
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Money_Field extends EE_Float_Field{
+class EE_Money_Field extends EE_Float_Field {
 	protected $_whole_pennies_only;
 	/**
 	 * 
@@ -13,13 +13,13 @@ 
 	 * @param boolean $whole_pennies_only if TRUE (default) then the internal representation of this 
 	 *	amount will be rounded to a whole penny. If FALSE, then it can be arbitrarily precise
 	 */
-	public function __construct( $table_column, $nicename, $nullable,
-		$default_value = null, $whole_pennies_only = true ) {
+	public function __construct($table_column, $nicename, $nullable,
+		$default_value = null, $whole_pennies_only = true) {
 		$this->_whole_pennies_only = $whole_pennies_only;
-		parent::__construct( $table_column,
+		parent::__construct($table_column,
 			$nicename,
 			$nullable,
-			$default_value );
+			$default_value);
 	}
 	
 	/**
@@ -30,7 +30,7 @@ 
 		return $this->_whole_pennies_only;
 	}
 	
-	function get_wpdb_data_type(){
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -42,13 +42,13 @@ 
 	 * @param type $schema
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
-		if( $schema === 'localized_float') {
-			$local_float_with_whole_pennies = number_format( $value_on_field_to_be_outputted, EE_Config::instance()->currency->dec_plc, EE_Config::instance()->currency->dec_mrk, EE_Config::instance()->currency->thsnds) ;
-			if( $this->whole_pennies_only() ) {
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
+		if ($schema === 'localized_float') {
+			$local_float_with_whole_pennies = number_format($value_on_field_to_be_outputted, EE_Config::instance()->currency->dec_plc, EE_Config::instance()->currency->dec_mrk, EE_Config::instance()->currency->thsnds);
+			if ($this->whole_pennies_only()) {
 				return $local_float_with_whole_pennies;
 			}
-			$local_float_arbitrary_precision = parent::prepare_for_pretty_echoing( $value_on_field_to_be_outputted );
+			$local_float_arbitrary_precision = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted);
 			$pos_of_decimal_place = strpos( 
 				$local_float_arbitrary_precision, 
 				EE_Config::instance()->currency->dec_mrk 
@@ -58,23 +58,22 @@ 
 						$local_float_arbitrary_precision,
 						$pos_of_decimal_place
 					)
-				) : 
-				0;
-			if( $local_float_arbitrary_precision_length_after_decimal <= EE_Config::instance()->currency->dec_plc ){ 
+				) : 0;
+			if ($local_float_arbitrary_precision_length_after_decimal <= EE_Config::instance()->currency->dec_plc) { 
 				return $local_float_with_whole_pennies;
 			} else {
 				return $local_float_arbitrary_precision;
 			}
 		}
 		
-		if($schema == 'no_currency_code'){
+		if ($schema == 'no_currency_code') {
 //			echo "schema no currency!";
 			$display_code = false;
-		}else{
+		} else {
 			$display_code = true;
 		}
 		//we don't use the $pretty_float because format_currency will take care of it.
-		return EEH_Template::format_currency( $value_on_field_to_be_outputted, false, $display_code );
+		return EEH_Template::format_currency($value_on_field_to_be_outputted, false, $display_code);
 	}
 
 	/**
@@ -89,12 +88,12 @@ 
 		//now it's a float-style string or number
 		$float_val = parent::prepare_for_set($value_inputted_for_field_on_model_object);
 		//round to the correctly number of decimal places for this  currency
-		return $this->_round_if_no_partial_pennies( $float_val );
+		return $this->_round_if_no_partial_pennies($float_val);
 			
 	}
 
 	function prepare_for_get($value_of_field_on_model_object) {
-		return $this->_round_if_no_partial_pennies( parent::prepare_for_get($value_of_field_on_model_object) );
+		return $this->_round_if_no_partial_pennies(parent::prepare_for_get($value_of_field_on_model_object));
 	}
 	
 	/**
@@ -103,9 +102,9 @@ 
 	 * @param type $amount
 	 * @return float
 	 */
-	protected function _round_if_no_partial_pennies( $amount ) {
-		if( $this->whole_pennies_only() ) {
-			return  EEH_Money::round_for_currency($amount,  EE_Registry::instance()->CFG->currency->code );
+	protected function _round_if_no_partial_pennies($amount) {
+		if ($this->whole_pennies_only()) {
+			return  EEH_Money::round_for_currency($amount, EE_Registry::instance()->CFG->currency->code);
 		} else {
 			return $amount;
 		}

core/db_models/fields/EE_Float_Field.php

Spacing +11 added lines, -11 removed lines

@@ -2,8 +2,8 @@ 
 /**
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Float_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Float_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -17,26 +17,26 @@ 
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 		//remove whitespaces and thousands separators
-		if(is_string($value_inputted_for_field_on_model_object)){
-			$value_inputted_for_field_on_model_object = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_inputted_for_field_on_model_object);
+		if (is_string($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now)
-			$value_inputted_for_field_on_model_object = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object) ;
+			$value_inputted_for_field_on_model_object = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //double-check there's absolutely nothing left on this string besides numbers
-			$value_inputted_for_field_on_model_object = preg_replace( "/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
+			$value_inputted_for_field_on_model_object = preg_replace("/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
 		}
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
-		return floatval( $value_inputted_for_field_on_model_object );
+		return floatval($value_inputted_for_field_on_model_object);
 	}
 	/**
 	 * Returns the number formatted according to local custom (set by the country of the blog).
 	 * @param float $value_on_field_to_be_outputted
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		$EE = EE_Registry::instance();
-		$localized_float = number_format( $value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds) ;
+		$localized_float = number_format($value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds);
 		//note however: this only includes the number of decimal places we'd want for currency, which might not be right
 		//we don't want to lose any extra precision, 
 		//so: compare everything after the decimal place (of original and localized)
@@ -45,7 +45,7 @@ 
 				$localized_float, 
 				EE_Config::instance()->currency->dec_mrk 
 			);
-		$float_as_string = (string)$value_on_field_to_be_outputted;
+		$float_as_string = (string) $value_on_field_to_be_outputted;
 		$contents_after_decimal = substr(
 			$float_as_string,
 			strpos(
@@ -53,7 +53,7 @@ 
 				'.'
 			) - 1
 		);
-		$localized_float = substr( $localized_float, 0, $pos_of_decimal_in_localized_string - 1 ) . $contents_after_decimal;			
+		$localized_float = substr($localized_float, 0, $pos_of_decimal_in_localized_string - 1).$contents_after_decimal;			
 		return $localized_float;
 	}