From ed3ae8bbd6f45eb9527d36d029a8191c4ff9b456 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 28 Apr 2018 21:35:00 +1200 Subject: [PATCH 1/2] Remove some old currency methods from application helper --- app/helpers/application_helper.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7ef7bc02f..e08df568d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,26 +1,9 @@ module ApplicationHelper - def price_in_dollars(price) - format('%.2f', price / 100.0) - end - - # 999 cents becomes 9.99 AUD -- for products/orders/etc - def price_with_currency(price) - format('%.2f %s', price / 100.0, Growstuff::Application.config.currency) - end - def parse_date(str) str ||= '' # Date.parse barfs on nil str == '' ? nil : Date.parse(str) end - def forex_link(price) - pid = price_in_dollars(price) - currency = Growstuff::Application.config.currency - link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}" - - link_to "(convert)", link, target: "_blank", rel: "noopener noreferrer" - end - def build_alert_classes(alert_type = :info) classes = 'alert alert-dismissable ' case alert_type.to_sym From 152cdace75615832895958b60645ca940d8dd067 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 28 Apr 2018 22:21:35 +1200 Subject: [PATCH 2/2] Removed spec for currency helpers --- spec/helpers/application_helper_spec.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index b3ea0ce52..d1eae5cf6 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -1,11 +1,6 @@ require 'rails_helper' describe ApplicationHelper do - it "formats prices" do - price_in_dollars(999).should eq '9.99' - price_with_currency(999).should eq format('9.99 %s', Growstuff::Application.config.currency) - end - it "parses dates" do parse_date(nil).should eq nil parse_date('').should eq nil