| Index: branches/wmf-deployment/extensions/ContributionReporting/ContributionTrackingStatistics_body.php |
| — | — | @@ -103,7 +103,7 @@ |
| 104 | 104 | continue; |
| 105 | 105 | } |
| 106 | 106 | // Pull together templates, clicks, donations, conversion rate |
| 107 | | - $conversion_rate = ( $template[1] == 0 ) ? 0 : ( $template[2] / $template[1] ) * 100; |
| | 107 | + $conversion_rate = ( $template[2] == 0 ) ? 0 : ( $template[2] / ( $template[1] + $template[2] ) ) * 100; |
| 108 | 108 | $amount = ( $template[3] == 0 ) ? 0 : $template[3]; |
| 109 | 109 | |
| 110 | 110 | $link = $wgContributionReportingBaseURL.$expanded_template[0]; |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | Xml::tags( 'td', array( 'align' => 'left'), $template_link ) . |
| 121 | 121 | Xml::element( 'td', array( 'align' => 'left'), $expanded_template[1] ) . |
| 122 | 122 | Xml::element( 'td', array( 'align' => 'left'), $expanded_template[2] ) . |
| 123 | | - Xml::element( 'td', array( 'align' => 'right'), $template[1] ) . |
| | 123 | + Xml::element( 'td', array( 'align' => 'right'), $template[1] + $template[2] ) . |
| 124 | 124 | Xml::element( 'td', array( 'align' => 'right'), $template[2] ) . |
| 125 | 125 | Xml::element( 'td', array( 'align' => 'right'), $amount ) . |
| 126 | 126 | Xml::element( 'td', array( 'align' => 'right'), round($average, 2) ) . |
| Property changes on: branches/wmf-deployment/extensions/ContributionReporting |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 127 | 127 | - /branches/REL1_15/phase3/extensions/ContributionReporting:51646 |
| /trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59176 |
| /trunk/extensions/ContributionTracking:58684 |
| /trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816 |
| 128 | 128 | + /branches/REL1_15/phase3/extensions/ContributionReporting:51646 |
| /trunk/extensions/ContributionReporting:56151-57449,58684,58687-59049,59134-59163,59176,59690 |
| /trunk/extensions/ContributionTracking:58684 |
| /trunk/phase3/extensions/ContributionReporting:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57541,57916,58151,58219,58633,58816 |