piggybak 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/app/models/piggybak/line_item.rb

@@ -5,6 +5,8 @@ module Piggybak
   
     validates_presence_of :variant_id
     validates_presence_of :total
+    validates_presence_of :price
+    validates_presence_of :description
     validates_presence_of :quantity
     validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
 

data/app/models/piggybak/order.rb

@@ -71,6 +71,7 @@ module Piggybak
         line_item = Piggybak::LineItem.new({ :variant_id => item[:variant].id,
           :price => item[:variant].price,
           :total => item[:variant].price*item[:quantity],
+          :description => item[:variant].description,
           :quantity => item[:quantity] })
         self.line_items << line_item
       end

data/app/views/piggybak/orders/_details.html.erb

@@ -7,8 +7,8 @@
 	</tr>
 	<% order.line_items.each do |line_item| %>
 	<tr>
-		<td><%= line_item.variant.description %></td>
-		<td><%= line_item.price %></td>
+		<td><%= line_item.description %></td>
+		<td><%= number_to_currency line_item.price %></td>
 		<td><%= line_item.quantity %></td>
 		<td><%= number_to_currency line_item.total %></td>
 	</tr>

data/app/views/piggybak/orders/_google_analytics.html.erb

@@ -13,8 +13,8 @@ _gaq.push(['_addTrans',
 <% @order.line_items.each do |line_item| -%>
 _gaq.push(['_addItem',
   '<%= @order.id %>',
-  '<%= line_item.variant.sku %>',
-  '<%= line_item.variant.description %>', 
+  '<%= line_item.variant.try(:sku) %>',
+  '<%= line_item.description %>', 
   '',   // category or variation
   '<%= line_item.price %>', //unit price
   '<%= line_item.quantity %>'

data/app/views/piggybak/orders/download.text.erb

@@ -4,7 +4,7 @@ Email: <%= @order.email %>
 Phone: <%= @order.phone %>
 
 <% @order.line_items.each do |line_item| %>
-<%= line_item.quantity %> x <%= raw line_item.variant.description %> (<%= number_to_currency line_item.total %>)
+<%= line_item.quantity %> x <%= raw line_item.description %> (<%= number_to_currency line_item.total %>)
 <% end -%>
 
 Subtotal: <%= number_to_currency @order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %>

data/db/migrate/20120627173754_add_description_to_line_item.rb

@@ -0,0 +1,13 @@
+class AddDescriptionToLineItem < ActiveRecord::Migration
+  def up
+    add_column :line_items, :description, :string, :null => false, :default => ''
+
+    Piggybak::LineItem.all.each do |line_item|
+      line_item.update_attribute(:description, line_item.variant.description)
+    end
+  end
+
+  def down
+    remove_column :line_items, :description
+  end
+end

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
@@ -90,6 +90,7 @@ Gem::Specification.new do |s|
     "db/migrate/20120107135459_add_active_to_countries.rb",
     "db/migrate/20120111195534_drop_cc_fields.rb",
     "db/migrate/20120627144001_add_price_to_line_item.rb",
+    "db/migrate/20120627173754_add_description_to_line_item.rb",
     "lib/acts_as_orderer/base.rb",
     "lib/acts_as_variant/base.rb",
     "lib/currency.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &26270020 !ruby/object:Gem::Requirement
+  requirement: &24213280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26270020
+  version_requirements: *24213280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26269120 !ruby/object:Gem::Requirement
+  requirement: &24212800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26269120
+  version_requirements: *24212800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &26267620 !ruby/object:Gem::Requirement
+  requirement: &24212140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *26267620
+  version_requirements: *24212140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26266700 !ruby/object:Gem::Requirement
+  requirement: &24211440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26266700
+  version_requirements: *24211440
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26265840 !ruby/object:Gem::Requirement
+  requirement: &24210660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *26265840
+  version_requirements: *24210660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &26265280 !ruby/object:Gem::Requirement
+  requirement: &24226200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26265280
+  version_requirements: *24226200
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &26264660 !ruby/object:Gem::Requirement
+  requirement: &24225600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26264660
+  version_requirements: *24225600
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &26263780 !ruby/object:Gem::Requirement
+  requirement: &24224900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26263780
+  version_requirements: *24224900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &26278820 !ruby/object:Gem::Requirement
+  requirement: &24224080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26278820
+  version_requirements: *24224080
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &26276680 !ruby/object:Gem::Requirement
+  requirement: &24223360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26276680
+  version_requirements: *24223360
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &26275980 !ruby/object:Gem::Requirement
+  requirement: &24222840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26275980
+  version_requirements: *24222840
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &26275280 !ruby/object:Gem::Requirement
+  requirement: &24222200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26275280
+  version_requirements: *24222200
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &26274300 !ruby/object:Gem::Requirement
+  requirement: &24221460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26274300
+  version_requirements: *24221460
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &26273560 !ruby/object:Gem::Requirement
+  requirement: &24220960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26273560
+  version_requirements: *24220960
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &26272840 !ruby/object:Gem::Requirement
+  requirement: &24220440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26272840
+  version_requirements: *24220440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26271960 !ruby/object:Gem::Requirement
+  requirement: &24219860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26271960
+  version_requirements: *24219860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26271400 !ruby/object:Gem::Requirement
+  requirement: &24219160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26271400
+  version_requirements: *24219160
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &26286900 !ruby/object:Gem::Requirement
+  requirement: &24218540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26286900
+  version_requirements: *24218540
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &26285000 !ruby/object:Gem::Requirement
+  requirement: &24233780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26285000
+  version_requirements: *24233780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &26283000 !ruby/object:Gem::Requirement
+  requirement: &24232980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26283000
+  version_requirements: *24232980
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -313,6 +313,7 @@ files:
 - db/migrate/20120107135459_add_active_to_countries.rb
 - db/migrate/20120111195534_drop_cc_fields.rb
 - db/migrate/20120627144001_add_price_to_line_item.rb
+- db/migrate/20120627173754_add_description_to_line_item.rb
 - lib/acts_as_orderer/base.rb
 - lib/acts_as_variant/base.rb
 - lib/currency.rb
@@ -390,7 +391,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2087436880465464047
+      hash: -3201553479829606141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: