Merge pull request #243 from lucymclaughlin/forex_link

Forex link

app/helpers/application_helper.rb

@@ -15,5 +15,14 @@ def parse_date(str)
     return 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}"
+    return link_to "(convert)",
+      link,
+      :target => "_blank"
+  end 
+
 end
 

app/models/order.rb

@@ -8,7 +8,12 @@ class Order < ActiveRecord::Base
 
   # total price of an order
   def total
-    order_items.to_a.sum(&:price)
+    sum = 0
+    for i in order_items do
+      subtotal = i.price * i.quantity
+      sum += subtotal 
+    end
+    return sum
   end
 
   # return items in the format ActiveMerchant/PayPal want them

app/views/orders/show.html.haml

@@ -51,6 +51,7 @@
     %td
       %strong
         = price_with_currency(@order.total)
+        = forex_link(@order.total)
 
 %p
   - if can? :destroy, @order

app/views/shop/index.html.haml

@@ -55,10 +55,12 @@
       Pay what you want, starting at
       =succeed "." do
         =price_with_currency(p.min_price)
+        =forex_link(p.min_price)
       - if p.recommended_price
         Recommended price:
         =succeed "." do
           =price_with_currency(p.recommended_price)
+          =forex_link(p.recommended_price)
 
     %div
       - if can? :create, Order

spec/models/order_spec.rb

@@ -45,9 +45,23 @@
     # we force an order to only have one item at present. Add more if wanted
     # later.
     @order_item1 = FactoryGirl.create(:order_item,
-      :order_id => @order.id, :product_id => @product.id, :price => 1111)
+      :order_id => @order.id, :product_id => @product.id, :price => 1111, :quantity => 1)
+
+    @order.total.should eq 1111 
+  end
+
+  it "gives the correct total for quantities more than 1" do
+    @member = FactoryGirl.create(:member)
+    @order = FactoryGirl.create(:order, :member => @member)
+    @product = FactoryGirl.create(:product,
+      :min_price => 1000
+    )
+    # we force an order to only have one item at present. Add more if wanted
+    # later.
+    @order_item1 = FactoryGirl.create(:order_item,
+      :order_id => @order.id, :product_id => @product.id, :price => 1111, :quantity => 2)
 
-    @order.total.should eq 1111
+    @order.total.should eq 2222 
   end
 
   it "formats order items for activemerchant" do

spec/views/orders/show.html.haml_spec.rb

@@ -29,7 +29,12 @@
 
     it "shows the total" do
       rendered.should contain "Total:"
-      rendered.should contain "198.00"
+      assert_select "strong", /198.00/
+    end
+
+    it "shows a foreign exchange link for the total" do
+      currency = Growstuff::Application.config.currency
+      assert_select("a[href=http://www.wolframalpha.com/input/?i=198.00+#{currency}]")
     end
 
     it "shows a checkout button" do

spec/views/shop/index_spec.rb

@@ -23,10 +23,20 @@
       rendered.should contain '9.99 AUD'
     end
 
+    it 'should contain an exchange rate link' do
+      currency = Growstuff::Application.config.currency
+      assert_select("a[href=http://www.wolframalpha.com/input/?i=9.99+#{currency}]")
+    end
+
     it 'shows recommended price for products that have it' do
       rendered.should contain '12.00 AUD'
     end
 
+    it 'should contain an exchange rate link for recommended price' do
+      currency = Growstuff::Application.config.currency
+      assert_select("a[href=http://www.wolframalpha.com/input/?i=12.00+#{currency}]")
+    end
+
     it 'displays the order form' do
       assert_select "form", :count => 2
     end