Merge pull request #524 from sparc-request/jl-dashboard-subsidy-displ…

…ay-bug Copied over custom currency formatter from proper to dashboard.
sparc-request · Jun 29, 2016 · 72ecf07 · 72ecf07
2 parents d3f639f + e6a9ae0
commit 72ecf07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/assets/javascripts/dashboard/subsidies.js.coffee b/app/assets/javascripts/dashboard/subsidies.js.coffee
@@ -90,8 +90,11 @@ $(document).ready ->
     return if isNaN(percentage) then 0 else percentage
   redisplay_form_values = (percent_subsidy, pi_contribution, current_cost) ->
     $("#current_percent_subsidy_of_total").val( (percent_subsidy*100.0).toFixed(2) )
-    $("#pending_subsidy_pi_contribution").val( formatMoney(pi_contribution, ',', '.', '') )
-    $("#subsidy_form_table_subsidy_cost").text( formatMoney(current_cost) )
+    $("#pending_subsidy_pi_contribution").val( format_currency(pi_contribution) )
+    $("#subsidy_form_table_subsidy_cost").text( format_currency(current_cost) )
+
+  format_currency = (total) ->
+    (parseFloat(total, 10).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,").toString())
 
 
 

diff --git a/app/views/dashboard/subsidies/_form.html.haml b/app/views/dashboard/subsidies/_form.html.haml
@@ -50,7 +50,7 @@
               = form.label "pi_contribution", t(:dashboard)[:subsidies][:form][:pi], class: "col-sm-4 control-label"
               .input-group.col-sm-7
                 %span.input-group-addon $
-                = form.text_field "pi_contribution", { class: 'form-control', value: cents_to_dollars_float(subsidy.pi_contribution) }
+                = form.text_field "pi_contribution", { class: 'form-control', value: (cents_to_dollars_float(subsidy.pi_contribution)).to_s }
             .row
               .col-md-12
                 %table.table.table-condensed.table-bordered