piggybak 0.1.1 → 0.2.0

data/app/models/piggybak/line_item.rb

@@ -1,9 +1,9 @@
 module Piggybak
   class LineItem < ActiveRecord::Base
     belongs_to :order
-    belongs_to :product
+    belongs_to :variant
   
-    validates_presence_of :product_id
+    validates_presence_of :variant_id
     validates_presence_of :total
     validates_presence_of :quantity
     validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
@@ -13,19 +13,26 @@ module Piggybak
     after_update :update_inventory
         
     def admin_label
-      "#{self.quantity} x #{self.product.description}"
+      "#{self.quantity} x #{self.variant.description}"
     end
 
     def decrease_inventory
-      self.product.update_inventory(-1 * self.quantity)
+      self.variant.update_inventory(-1 * self.quantity)
     end
 
     def increase_inventory
-      self.product.update_inventory(self.quantity)
+      self.variant.update_inventory(self.quantity)
     end
 
     def update_inventory
-      Rails.logger.warn "steph inside update inventory: #{self.inspect}"
+      if self.variant_id != self.variant_id_was
+        old_variant = Variant.find(self.variant_id_was)
+        old_variant.update_inventory(self.quantity_was)
+        self.variant.update_inventory(-1*self.quantity)
+      else
+        quantity_diff = self.quantity_was - self.quantity
+        self.variant.update_inventory(quantity_diff)
+      end
     end
   end
 end

data/app/models/piggybak/order.rb

@@ -3,6 +3,8 @@ module Piggybak
     has_many :line_items, :inverse_of => :order
     has_many :payments, :inverse_of => :order
     has_many :shipments, :inverse_of => :order
+    has_many :credits, :inverse_of => :order
+
     belongs_to :billing_address, :class_name => "Piggybak::Address"
     belongs_to :shipping_address, :class_name => "Piggybak::Address"
     belongs_to :user
@@ -11,7 +13,7 @@ module Piggybak
     accepts_nested_attributes_for :shipping_address, :allow_destroy => true
     accepts_nested_attributes_for :shipments, :allow_destroy => true
     accepts_nested_attributes_for :line_items, :allow_destroy => true
-    accepts_nested_attributes_for :payments
+    accepts_nested_attributes_for :payments # test :allow_destroy
 
     validates_presence_of :status  
     validates_presence_of :email
@@ -58,8 +60,8 @@ module Piggybak
     def add_line_items(cart)
       cart.update_quantities
       cart.items.each do |item|
-        line_item = Piggybak::LineItem.new({ :product_id => item[:product].id,
-          :total => item[:product].price*item[:quantity],
+        line_item = Piggybak::LineItem.new({ :variant_id => item[:variant].id,
+          :total => item[:variant].price*item[:quantity],
           :quantity => item[:quantity] })
         self.line_items << line_item
       end
@@ -73,7 +75,7 @@ module Piggybak
       self.tax_charge = 0
 
       self.line_items.each do |line_item|
-        line_item.total = line_item.product.price * line_item.quantity
+        line_item.total = line_item.variant.price * line_item.quantity
       end
     end
 
@@ -92,10 +94,14 @@ module Piggybak
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
         end
-logger.warn "steph shipment total is #{shipment.total}"
         self.total += shipment.total
       end
-logger.warn "steph: total is #{self.total}"
+
+      # Hook in credits, TBD
+      credits.each do |credit|
+        self.total -= credit.total
+      end
+
       self.total = self.total.to_c
 
       self.total_due = self.total

data/app/models/piggybak/payment.rb

@@ -10,7 +10,7 @@ module Piggybak
     validates_presence_of :year
 
     def status_enum
-      ["paid"]
+      ["paid", "refunded"]
     end
 
     def month_enum
@@ -39,7 +39,8 @@ module Piggybak
         if gateway_response.success?
           self.attributes = { :total => self.order.total_due, 
                               :number => 'hidden',
-                              :verification_value => 'hidden' }
+                              :verification_value => 'hidden',
+                              :transaction_id => payment_gateway.transaction_id(gateway_response) } 
           gateway.capture(1000, gateway_response.authorization)
           return true
   	    else
@@ -56,6 +57,7 @@ module Piggybak
         return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")})<br />" + 
           "Payment Method: #{self.payment_method.description}<br />" +
           "Status: #{self.status}<br />" +
+          "Transaction ID: #{self.transaction_id}<br />" + 
           "$#{"%.2f" % self.total}"
       else
         return ""
@@ -70,7 +72,7 @@ module Piggybak
         if !credit_card.valid?
           credit_card.errors.each do |key, value|
             if value.any? && !["first_name", "last_name", "type"].include?(key)
-              record.errors.add key, value
+              record.errors.add key, (value.is_a?(Array) ? value.join(', ') : value)
             end
           end
         end

data/app/models/piggybak/payment_calculator/authorize_net.rb

@@ -2,5 +2,9 @@ module Piggybak
   class PaymentCalculator::AuthorizeNet < PaymentCalculator
     KEYS = ["login", "password"]
     KLASS = ::ActiveMerchant::Billing::AuthorizeNetGateway
+
+    def self.transaction_id(gateway_response)
+      gateway_response.params["transaction_id"]
+    end
   end
 end

data/app/models/piggybak/payment_calculator/fake.rb

@@ -20,5 +20,9 @@ module Piggybak
 
     def self.capture(*args)
     end
+
+    def self.transaction_id(*args)
+      "N/A"
+    end
   end
 end

data/app/models/piggybak/payment_method.rb

@@ -1,5 +1,12 @@
 module Piggybak 
   class PaymentMethod < ActiveRecord::Base
+    
+    # klass_enum requires the ShippingCalculator subclasses to be loaded
+    shipping_calcs_path = File.expand_path("../payment_calculator", __FILE__)
+    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
+      ActiveSupport::Dependencies.require_or_load subclass
+    end 
+    
     has_many :payment_method_values, :dependent => :destroy
     alias :metadata :payment_method_values
 
@@ -9,9 +16,7 @@ module Piggybak
     validates_presence_of :description
 
     def klass_enum 
-      #TODO: Troubleshoot use of subclasses here instead
-      [Piggybak::PaymentCalculator::AuthorizeNet,
-       Piggybak::PaymentCalculator::Fake]
+       Piggybak::PaymentCalculator.subclasses
     end
 
     validates_each :payment_method_values do |record, attr, value|

data/app/models/piggybak/shipping_calculator/free.rb

@@ -0,0 +1,13 @@
+module Piggybak
+  class ShippingCalculator::Free < ShippingCalculator
+    KEYS = []
+
+    def self.available?(method, object)
+      true
+    end
+
+    def self.rate(method, object)
+      0.00
+    end
+  end
+end

data/app/models/piggybak/shipping_calculator/pickup.rb

@@ -7,7 +7,7 @@ module Piggybak
 
       if object.is_a?(Cart)
         state = State.find(object.extra_data["state_id"])
-        return true if state.abbr == abbr
+        return true if state && state.abbr == abbr
       else
         if object.billing_address && object.billing_address.state 
           return object.billing_address.state.abbr == abbr

data/app/models/piggybak/shipping_method.rb

@@ -1,5 +1,12 @@
 module Piggybak
   class ShippingMethod < ActiveRecord::Base
+    
+    # klass_enum requires the ShippingCalculator subclasses to be loaded
+    shipping_calcs_path = File.expand_path("../shipping_calculator", __FILE__)
+    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
+      ActiveSupport::Dependencies.require_or_load subclass
+    end 
+    
     has_many :shipping_method_values, :dependent => :destroy
     alias :metadata :shipping_method_values
 
@@ -18,11 +25,8 @@ module Piggybak
       end
     end
 
-    def klass_enum 
-      #TODO: Troubleshoot use of subclasses here instead
-      [Piggybak::ShippingCalculator::FlatRate,
-       Piggybak::ShippingCalculator::Range,
-       Piggybak::ShippingCalculator::Pickup]
+    def klass_enum
+      Piggybak::ShippingCalculator.subclasses
     end
 
     def self.available_methods(cart)
@@ -36,10 +40,8 @@ module Piggybak
 
       active_methods.inject([]) do |arr, method|
         klass = method.klass.constantize
-logger.warn "steph: inside here!! #{method.inspect}"
         if klass.available?(method, cart)
           rate = klass.rate(method, cart)
-logger.warn "steph rate is #{rate.inspect}"
           arr << {
             :label => "#{method.description} $#{"%.2f" % rate}",
 			:id => method.id,

data/app/models/piggybak/state.rb

@@ -1,4 +1,5 @@
 module Piggybak
   class State < ActiveRecord::Base
+    belongs_to :country
   end
 end

data/app/models/piggybak/tax_calculator/{flat_rate.rb → percent.rb}

@@ -1,5 +1,5 @@
 module Piggybak
-  class TaxCalculator::FlatRate < TaxCalculator
+  class TaxCalculator::Percent < TaxCalculator
     KEYS = ["state_abbr", "rate"]
 
     def self.available?(method, object)

data/app/models/piggybak/tax_method.rb

@@ -1,5 +1,12 @@
 module Piggybak
   class TaxMethod < ActiveRecord::Base
+    
+    # klass_enum requires the ShippingCalculator subclasses to be loaded
+    shipping_calcs_path = File.expand_path("../tax_calculator", __FILE__)
+    Dir.glob(shipping_calcs_path + "**/*.rb").each do |subclass|
+      ActiveSupport::Dependencies.require_or_load subclass
+    end 
+    
     has_many :tax_method_values, :dependent => :destroy
     alias :metadata :tax_method_values
 
@@ -19,8 +26,7 @@ module Piggybak
     end
 
     def klass_enum 
-      #TODO: Troubleshoot use of subclasses here instead
-      [Piggybak::TaxCalculator::FlatRate]
+      Piggybak::TaxCalculator.subclasses
     end
 
     def self.calculate_tax(object)

data/app/models/piggybak/{product.rb → variant.rb}

@@ -1,6 +1,7 @@
-class Piggybak::Product < ActiveRecord::Base
-  belongs_to :item, :polymorphic => true, :inverse_of => :piggybak_product
-  attr_accessible :sku, :description, :price, :quantity, :active, :unlimited_inventory, :item_id, :item_type
+class Piggybak::Variant < ActiveRecord::Base
+  belongs_to :item, :polymorphic => true, :inverse_of => :piggybak_variant
+  attr_accessible :sku, :description, :price, :quantity, :active, :unlimited_inventory, :item_id, :item_type 
+  attr_accessible :item # to allow direct assignment from code or console
 
   validates_presence_of :sku
   validates_uniqueness_of :sku
@@ -10,7 +11,7 @@ class Piggybak::Product < ActiveRecord::Base
   validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
     
   def admin_label
-    "Product: #{self.description}"
+    "Variant: #{self.description}"
   end
 
   def update_inventory(purchased)

data/app/views/piggybak/cart/_form.html.erb

@@ -1,14 +1,14 @@
-<% if object.reflections.keys.include?(:piggybak_product) -%>
-	<% if object.piggybak_product && object.piggybak_product.active -%>
-		<% if object.piggybak_product.quantity > 0 -%>
+<% if object.reflections.keys.include?(:piggybak_variant) -%>
+	<% if object.piggybak_variant && object.piggybak_variant.active -%>
+		<% if object.piggybak_variant.quantity > 0 || object.piggybak_variant.unlimited_inventory -%>
 			<%= form_tag piggybak.cart_add_url do -%>
-			<div id="product_details">
-			<span id="title"><%= object.piggybak_product.description %></span>
-			<span id="price"><%= number_to_currency object.piggybak_product.price %></span>
+			<div id="variant_details">
+			<span id="title"><%= object.piggybak_variant.description %></span>
+			<span id="price"><%= number_to_currency object.piggybak_variant.price %></span>
 			</div>
 			<label>Quantity</label>
 			<%= text_field_tag :quantity %>
-			<%= hidden_field_tag :product_id, object.piggybak_product.id %>
+			<%= hidden_field_tag :variant_id, object.piggybak_variant.id %>
 			<%= submit_tag "Add to Cart", :id => "submit" %>
 			<% end -%>
 			<% else -%>

data/app/views/piggybak/cart/_items.html.erb

@@ -2,29 +2,29 @@
 <%= form_tag piggybak.cart_update_url do -%>
 <table cellpadding="5" cellspacing="0" width="100%">
 	<tr>
-		<th>Item</th>
-		<th>Price</th>
-		<th>Quantity</th>
-		<th>Subtotal</th>
+		<th id="item_col">Item</th>
+		<th id="price_col">Price</th>
+		<th id="quantity_col">Quantity</th>
+		<th id="subtotal_col">Subtotal</th>
 		<% if page == "cart" -%>
 		<th></th>
 		<% end -%>
 	</tr>
 	<% @cart.items.each do |item| %>
 	<tr>
-		<td><%= item[:product].description %></td>
-		<td><%= number_to_currency item[:product].price %></td>
+		<td><%= item[:variant].description %></td>
+		<td><%= number_to_currency item[:variant].price %></td>
 		<td>
 			<% if page == "cart" -%>
-			<%= text_field_tag "quantity[#{item[:product].id}]", item[:quantity] %>
+			<%= text_field_tag "quantity[#{item[:variant].id}]", item[:quantity] %>
             <% else -%>
 			<%= item[:quantity] %>
 			<% end -%>
 		</td>
-		<td><%= number_to_currency item[:quantity]*item[:product].price %></td>
+		<td><%= number_to_currency item[:quantity]*item[:variant].price %></td>
 		<% if page == "cart" -%>
 		<td>
-			<%= link_to "Remove", piggybak.remove_item_url(item[:product].id), :method => :delete %>
+			<%= link_to "Remove", piggybak.remove_item_url(item[:variant].id), :method => :delete %>
 		</td>
 		<% end -%>
 	</tr>

data/app/views/piggybak/cart/show.html.erb

@@ -2,7 +2,9 @@
 
 <h1>Shopping Cart</h1>
 <% if @cart.errors.any? -%>
+<div id="cart_error">
 <%= raw @cart.errors.join('<br />') %>
+</div>
 <% end -%>
 
 <%= render "items", :page => "cart" %>

data/app/views/piggybak/notifier/order_notification.text.erb

@@ -3,7 +3,7 @@ Thanks for your order!
 Items
 
 <% @order.line_items.each do |line_item| %>
-<%= line_item.product.description %> x <%= line_item.quantity %> = <%= number_to_currency line_item.total %>
+<%= line_item.variant.description %> x <%= line_item.quantity %> = <%= number_to_currency line_item.total %>
 <% end -%>
 
 Total

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

@@ -1,24 +1,28 @@
-<p>
+<div class="item">
 	<%= address.label :firstname %>
 	<%= address.text_field :firstname %>
-</p>
-<p>
+</div>
+<div class="item">
 	<%= address.label :lastname %>
 	<%= address.text_field :lastname %>
-</p>
-<p>
+</div>
+<div class="item">
 	<%= address.label :address1 %>
 	<%= address.text_field :address1 %>
-</p>
-<p>
+</div>
+<div class="item">
 	<%= address.label :city %>
 	<%= address.text_field :city %>
-</p>
-<p>
-	<%= address.label :state %>
-	<%= address.select :state_id, ::Piggybak::State.all.collect {|p| [ p.name, p.id ] }, {:include_blank => false} %>
-</p>
-<p>
+</div>
+<div class="item">
+  <%= address.label :country_id %>
+  <%= address.collection_select :country_id, Piggybak::Country.all, :id, :name, { :selected => address.object.country_id.to_s } %>
+</div>
+<div class="item">
+	<%= address.label :state_id %>
+	<%= address.collection_select :state_id, address.object.country.states, :id, :name, { :selected => address.object.state_id.to_s } %>
+</div>
+<div class="item">
 	<%= address.label :zip %>
 	<%= address.text_field :zip %>
-</p>
+</div>

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

@@ -0,0 +1,48 @@
+<table id="items" cellpadding="5" cellspacing="0">
+	<tr>
+		<th>Item</th>
+		<th>Price</th>
+		<th>Quantity</th>
+		<th>Subtotal</th>
+	</tr>
+	<% order.line_items.each do |line_item| %>
+	<tr>
+		<td><%= line_item.variant.description %></td>
+		<td><%= line_item.variant.price %></td>
+		<td><%= line_item.quantity %></td>
+		<td><%= number_to_currency line_item.total %></td>
+	</tr>
+	<% end -%>
+	<tr>
+		<td colspan="4"></td>
+	</tr>
+	<tr>
+		<td colspan="2"></td>
+		<td>Subtotal</td>
+		<td><%= number_to_currency order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
+	</tr>
+	<tr>
+		<td colspan="2"></td>
+		<td>Tax</td>
+		<td><%= number_to_currency order.tax_charge %></td>
+	</tr>
+	<tr>
+		<td colspan="2"></td>
+		<td>Shipping</td>
+		<td><%= number_to_currency order.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %></td>
+	</tr>
+	<tr>
+		<td colspan="2"></td>
+		<td>Total</td>
+		<td><%= number_to_currency order.total %></td>
+	</tr>
+</table>
+
+Email: <%= order.email %><br />
+Phone: <%= order.phone %>
+
+<h3>Billing Information</h3>
+<%= raw order.billing_address.display %>
+
+<h3>Shipping Information</h3>
+<%= raw order.shipping_address.display %>