piggybak 0.6.10 → 0.6.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.10)
+    piggybak (0.6.11)
       activemerchant
       countries
       devise

data/app/assets/javascripts/piggybak/piggybak.js

@@ -6,7 +6,6 @@ var shipping_field;
 $(function() {
 	piggybak.prevent_double_click();
 	shipping_field = $('#piggybak_order_line_items_attributes_0_shipment_attributes_shipping_method_id');
-	shipping_els = $('#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip');
 	piggybak.initialize_listeners();
 	piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'), function() {
 		$('#piggybak_order_shipments_attributes_0_shipping_method_id').val(previous_shipping);
@@ -15,6 +14,7 @@ $(function() {
 });
 
 var piggybak = {
+	shipping_els: $('#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip'),
 	prevent_double_click: function() {
 		$('#new_piggybak_order').find('input:submit').removeAttr('disabled');
 		$('#new_piggybak_order').submit(function() {
@@ -22,7 +22,7 @@ var piggybak = {
 		});
 	},
 	initialize_listeners: function() {
-		shipping_els.live('change', function() {
+		piggybak.shipping_els.live('change', function() {
 			piggybak.update_shipping_options($(this));
 		});
 		$('#piggybak_order_billing_address_attributes_state_id').live('change', function() {
@@ -123,11 +123,12 @@ var piggybak = {
 			shipping_total = $('#shipping select option:selected').data('rate');
 		}
 		$('#shipping_total').html('$' + shipping_total.toFixed(2));
-		var order_total = subtotal + tax_total + shipping_total;
+		var order_total = parseFloat((subtotal + tax_total + shipping_total).toFixed(2));
 		$.each($('.extra_totals'), function(i, el) {
 			order_total += parseFloat($(el).html().replace(/\$/, ''));
-		});	
-		$('#order_total').html('$' + order_total.toFixed(2));	
+		});
+		$('#order_total').html('$' + order_total.toFixed(2));
+		return order_total;
 	},
 	retrieve_shipping_data: function() {
 		var shipping_data = {};

data/app/helpers/piggybak_helper.rb

@@ -4,7 +4,7 @@ module PiggybakHelper
   end
   def cart_link
     cart = Piggybak::Cart.new(request.cookies["cart"]) 
-    nitems = cart.items.inject(0) { |nitems, item| nitems + item[:quantity] }
+    nitems = cart.sellables.inject(0) { |nitems, item| nitems + item[:quantity] }
     if nitems > 0 && !["piggybak/orders", "piggybak/cart"].include?(params[:controller])
       link_to "#{pluralize(nitems, 'item')}: #{number_to_currency(cart.total)}", piggybak.cart_url
     end

data/app/models/piggybak/cart.rb

@@ -1,22 +1,23 @@
 module Piggybak
   class Cart
-    attr_accessor :items
+    attr_accessor :sellables
     attr_accessor :total
     attr_accessor :errors
     attr_accessor :extra_data
     alias :subtotal :total
+    alias :items :sellables
   
     def initialize(cookie='')
-      self.items = []
+      self.sellables = []
       self.errors = []
       cookie ||= ''
       cookie.split(';').each do |item|
         item_sellable = Piggybak::Sellable.find_by_id(item.split(':')[0])
         if item_sellable.present?
-          self.items << { :sellable => item_sellable, :quantity => (item.split(':')[1]).to_i }
+          self.sellables << { :sellable => item_sellable, :quantity => (item.split(':')[1]).to_i }
         end
       end
-      self.total = self.items.sum { |item| item[:quantity]*item[:sellable].price }
+      self.total = self.sellables.sum { |item| item[:quantity]*item[:sellable].price }
 
       self.extra_data = {}
     end
@@ -58,7 +59,7 @@ module Piggybak
  
     def to_cookie
       cookie = ''
-      self.items.each do |item|
+      self.sellables.each do |item|
         cookie += "#{item[:sellable].id.to_s}:#{item[:quantity].to_s};" if item[:quantity].to_i > 0
       end
       cookie
@@ -66,22 +67,22 @@ module Piggybak
   
     def update_quantities
       self.errors = []
-      new_items = []
-      self.items.each do |item|
+      new_sellables = []
+      self.sellables.each do |item|
         if !item[:sellable].active
           self.errors << ["Sorry, #{item[:sellable].description} is no longer for sale"]
         elsif item[:sellable].unlimited_inventory || item[:sellable].quantity >= item[:quantity]
-          new_items << item
+          new_sellables << item
         elsif item[:sellable].quantity == 0
           self.errors << ["Sorry, #{item[:sellable].description} is no longer available"]
         else
           self.errors << ["Sorry, only #{item[:sellable].quantity} available for #{item[:sellable].description}"]
           item[:quantity] = item[:sellable].quantity
-          new_items << item if item[:quantity] > 0
+          new_sellables << item if item[:quantity] > 0
         end
       end
-      self.items = new_items
-      self.total = self.items.sum { |item| item[:quantity]*item[:sellable].price }
+      self.sellables = new_sellables
+      self.total = self.sellables.sum { |item| item[:quantity]*item[:sellable].price }
     end
 
     def set_extra_data(form_params)

data/app/models/piggybak/order.rb

@@ -46,10 +46,10 @@ module Piggybak
     end
 
     def number_payments
-      number_payments = self.line_items.select { |li| li.new_record? && li.line_item_type == "payment" }.size
-      if number_payments > 1
+      new_payments = self.line_items.payments.select { |li| li.new_record? }
+      if new_payments.size > 1
         self.errors.add(:base, "Only one payment may be created at a time.")
-        self.line_items.select { |li| li.new_record? && li.line_item_type == "payment" }.each do |li|
+        new_payments.each do |li|
           li.errors.add(:line_item_type, "Only one payment may be created at a time.")
         end
       end
@@ -75,15 +75,15 @@ module Piggybak
       # If a tax line item doesn't, create
       # If tax is 0, destroy tax line item
       tax = TaxMethod.calculate_tax(self)
-      tax_line_item = self.line_items.detect { |line_item| line_item.line_item_type == "tax" }
+      tax_line_item = self.line_items.taxes
       if tax > 0
-        if tax_line_item
-          tax_line_item.price = tax
+        if tax_line_item.any?
+          tax_line_item.first.price = tax
         else
           self.line_items << LineItem.new({ :line_item_type => "tax", :description => "Tax Charge", :price => tax })
         end
-      elsif tax_line_item
-        tax_line_item.mark_for_destruction
+      elsif tax_line_item.any?
+        tax_line_item.first.mark_for_destruction
       end
 
       # Postprocess everything but payments first
@@ -107,11 +107,10 @@ module Piggybak
       self.total_due = self.total
 
       # Postprocess payment last
-      self.line_items.each do |line_item|
-        next if line_item.line_item_type != "payment"
-        method = "postprocess_#{line_item.line_item_type}"
-        if line_item.respond_to?(method)
-          if !line_item.send(method)
+      self.line_items.payments.each do |line_item|
+        method = "postprocess_payment"
+        if line_item.respond_to?("postprocess_payment")
+          if !line_item.postprocess_payment
             return false
           end
         end
@@ -155,7 +154,7 @@ module Piggybak
     def add_line_items(cart)
       cart.update_quantities
 
-      cart.items.each do |item|
+      cart.sellables.each do |item|
         self.line_items << Piggybak::LineItem.new({ :sellable_id => item[:sellable].id,
           :unit_price => item[:sellable].price,
           :price => item[:sellable].price*item[:quantity],
@@ -172,9 +171,9 @@ module Piggybak
       else
         if self.to_be_cancelled
           self.status = "cancelled"
-        elsif line_items.select { |li| li.line_item_type == "shipment" }.any? && line_items.select { |li| li.line_item_type == "shipment" }.all? { |s| s.shipment.status == "shipped" }
+        elsif line_items.shipments.any? && line_items.shipments.all? { |li| li.shipment.status == "shipped" }
           self.status = "shipped"
-        elsif line_items.select { |li| li.line_item_type == "shipment" }.any? && line_items.select { |li| li.line_item_type == "shipment" }.all? { |s| s.shipment.status == "processing" }
+        elsif line_items.shipments.any? && line_items.shipments.all? { |li| li.shipment.status == "processing" }
           self.status = "processing"
         else
           self.status = "new"

data/app/models/piggybak/tax_calculator/percent.rb

@@ -19,15 +19,7 @@ module Piggybak
     end
 
     def self.rate(method, object)
-      taxable_total = 0
-
-      if object.is_a?(Cart)
-        taxable_total = object.total
-      else
-        taxable_total = object.subtotal
-      end
-
-      (method.metadata.detect { |m| m.key == "rate" }.value.to_f * taxable_total).to_c
+      (method.metadata.detect { |m| m.key == "rate" }.value.to_f * object.subtotal).to_c
     end
   end
 end

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

@@ -1,4 +1,4 @@
-<% if @cart.items.any? -%>
+<% if @cart.sellables.any? -%>
 <%= form_tag piggybak.cart_update_url do -%>
 <table cellpadding="5" cellspacing="0" width="100%">
 	<tr>
@@ -10,7 +10,7 @@
 		<th></th>
 		<% end -%>
 	</tr>
-	<% @cart.items.each do |item| %>
+	<% @cart.sellables.each do |item| %>
 	<tr>
 		<td><%= item[:sellable].description %></td>
 		<td><%= number_to_currency item[:sellable].price %></td>

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

@@ -9,7 +9,7 @@
 
 <%= render "items", :page => "cart" %>
 
-<% if @cart.items.any? -%>
+<% if @cart.sellables.any? -%>
 <%= link_to "Proceed to Checkout", piggybak.orders_url, :id => "checkout" %>
 <% end -%>
 </div>

data/lib/piggybak.rb

@@ -46,22 +46,24 @@ module Piggybak
             attr_accessible "#{k}_attributes".to_sym
           end
         end
-        Piggybak::LineItem.class_eval do
-          scope plural_k, where(:line_item_type => "#{k}" )
-        end
         Piggybak::Order.class_eval do
           define_method "#{k}_charge" do
-            charge = 0
-            self.line_items.each do |li|
-              next if li._destroy || li.line_item_type.to_sym != k
-              charge += li.price 
-            end
-            charge
+            self.line_items.send(plural_k).map(&:price).reduce(:+) || 0
           end
         end
       end
-      # Define method subtotal on order, alias to sellable_charge
       Piggybak::Order.class_eval do
+        has_many :line_items, :inverse_of => :order do
+          Piggybak.config.line_item_types.each do |k, v|
+            # Define proxy association method for line items
+            # e.g. self.line_items.sellables
+            # e.g. self.line_items.taxes
+            define_method "#{k.to_s.pluralize}" do
+              proxy_association.proxy.select { |li| li.line_item_type == "#{k}" }
+            end
+          end
+        end
+        # Define method subtotal on order, alias to sellable_charge
         alias :subtotal :sellable_charge 
       end
     end

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3715131893246281747
+      hash: 151945934985011992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3715131893246281747
+      hash: 151945934985011992
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23