fixed pivot viz if sul field had nulber formatting already applied

Fabrik · Aug 8, 2014 · 99c967e · 99c967e
1 parent 094a111
commit 99c967e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/plugins/fabrik_list/pivot/pivot.php b/plugins/fabrik_list/pivot/pivot.php
@@ -34,6 +34,7 @@ class PlgFabrik_ListPivot extends PlgFabrik_List
 	public function onBuildQuerySelect($params, &$model, $args)
 	{
 		$sum = $this->sums($model);
+
 		if ($query = $this->hasQuery($args))
 		{
 			$query->select($sum);
@@ -42,6 +43,7 @@ public function onBuildQuerySelect($params, &$model, $args)
 		{
 			$model->_pluginQuerySelect[] = $sum;
 		}
+
 		return;
 	}
 
@@ -318,7 +320,7 @@ public function onLoadData($params, &$model, &$args)
 						{
 							if (!empty($xColData))
 							{
-								$newRow->$xColData = $row->$sums;
+								$newRow->$xColData = $row->$rawSums;
 							}
 
 							$total += (float) $row->$rawSums;
@@ -339,7 +341,8 @@ public function onLoadData($params, &$model, &$args)
 
 		if ($order == '1')
 		{
-			usort($new, function($a, $b) {
+			usort($new, function($a, $b)
+			{
 				if ($a->pivot_total == $b->pivot_total)
 				{
 					return 0;
@@ -356,7 +359,8 @@ public function onLoadData($params, &$model, &$args)
 		}
 		else if ($order == '2')
 		{
-			usort($new, function($a, $b) {
+			usort($new, function($a, $b)
+			{
 				if ($a->pivot_total == $b->pivot_total)
 				{
 					return 0;
@@ -444,6 +448,7 @@ protected function numberFormat($data, $params)
 		{
 			$thousand_sep = ' ';
 		}
+
 		return number_format((float) $data, $decimal_length, $decimal_sep, $thousand_sep);
 	}