piggybak 0.6.3 → 0.6.4

data/Gemfile.lock

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

data/README.md

@@ -69,7 +69,7 @@ TODO
 
 * Add/check validation to ensure sufficient inventory
 
-* Add copy from billing above shipping address section button
+* Add copy from billing above shipping address section button in admin
 
 Copyright
 ========

data/app/models/piggybak/line_item.rb

@@ -7,6 +7,8 @@ module Piggybak
     validates_presence_of :price, :description, :quantity
     validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
 
+    default_scope :order => 'created_at ASC'
+
     after_create :decrease_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
     after_destroy :increase_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
     after_update :update_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
@@ -17,9 +19,13 @@ module Piggybak
     before_validation :preprocess
     before_destroy :destroy_associated_item
 
+    # TODO: Possibly replace all initializers below with database defaults
     def initialize_line_item
       self.quantity ||= 1
       self.price ||= 0
+
+      # TODO: Fix this, should default in database
+      self.created_at ||= Time.now 
     end
 
     def preprocess
@@ -129,5 +135,9 @@ module Piggybak
         self.sellable.update_inventory(quantity_diff)
       end
     end
+
+    def self.sorted_line_item_types
+      Piggybak::Config.line_item_types.sort { |a, b| a[1][:sort] <=> b[1][:sort] }.collect { |a| a[0] }
+    end
   end
 end

data/app/models/piggybak/order.rb

@@ -193,17 +193,5 @@ module Piggybak
     def admin_label
       "Order ##{self.id}"    
     end
-
-    def subtotal
-      v = 0
-
-      self.line_items.select { |li| li.line_item_type == "sellable" }.each do |line_item|
-        if !line_item._destroy
-          v += line_item.price
-        end
-      end
-
-      v
-    end
   end
 end

data/app/views/rails_admin/main/_order_details.html.erb

@@ -2,30 +2,16 @@
 N/A
 <% else -%>
 <table cellpadding="5" cellspacing="0">
+        <% Piggybak::LineItem.sorted_line_item_types.each do |type| -%>
 	<tr>
-		<td width="150">Subtotal (Sellables)</td>
-		<td><%= number_to_currency form.object.subtotal %></td>
-	</tr>
-	<tr>
-		<td>Shipping</td>
-		<td><%= number_to_currency form.object.shipment_charge %></td>
-	</tr>
-	<tr>
-		<td>Tax</td>
-		<td><%= number_to_currency form.object.tax_charge %></td>
-	</tr>
-	<tr>
-		<td>Adjustments</td>
-		<td><%= number_to_currency form.object.adjustment_charge %></td>
+		<td width="150"><%= type.to_s.pluralize.titleize %></td>
+		<td><%= number_to_currency form.object.send("#{type}_charge") %></td>
 	</tr>
+	<% end -%>
 	<tr>
 		<td>Total</td>
 		<td><%= number_to_currency form.object.total %></td>
 	</tr>
-	<tr>
-		<td>Payments</td>
-		<td><%= number_to_currency form.object.payment_charge %></td>
-	</tr>
 	<tr>
 		<td>Balance Due</td>
 		<td><%= number_to_currency form.object.total_due %></td>

data/db/migrate/20121018213421_drop_sort_from_line_items.rb

@@ -0,0 +1,9 @@
+class DropSortFromLineItems < ActiveRecord::Migration
+  def up
+    remove_column :line_items, :sort
+  end
+
+  def down
+    add_column :line_items, :sort, :integer, :null => false, :default => 0
+  end
+end

data/lib/piggybak.rb

@@ -40,7 +40,7 @@ module Piggybak
         plural_k = k.to_s.pluralize.to_sym
         if v[:nested_attrs]
           Piggybak::LineItem.class_eval do
-            # TODO: dependent destroy destroys all line items. Figure out why
+            # TODO: dependent destroy destroys all line items. Fix and remove after_destroy on line items
             has_one k, :class_name => v[:class_name] #, :dependent => :destroy
             accepts_nested_attributes_for k
             attr_accessible "#{k}_attributes".to_sym
@@ -51,10 +51,21 @@ module Piggybak
         end
         Piggybak::Order.class_eval do
           define_method "#{k}_charge" do
-            self.line_items.send(plural_k).inject(0) { |subtotal, li| subtotal + li.price }
+            # Scope doesn't work here for lookup of unsaved elements
+            # TODO: Figure out if we can fix, or specify behavior
+            charge = 0
+            self.line_items.each do |li|
+              next if li._destroy || li.line_item_type.to_sym != k
+              charge += li.price 
+            end
+            charge
           end
         end
       end
+      # Define method subtotal on order, alias to sellable_charge
+      Piggybak::Order.class_eval do
+        alias :subtotal :sellable_charge 
+      end
     end
 
     initializer "piggybak.rails_admin_config" do |app|
@@ -62,8 +73,8 @@ module Piggybak
         plural_k = k.to_s.pluralize.to_sym
         if v[:nested_attrs]
           Piggybak::LineItem.class_eval do
-            # TODO: dependent destroy destroys all line items. Figure out why
-            has_one k, :class_name => v[:class_name] #, :dependent => :destroy
+            # TODO: See above
+            has_one k, :class_name => v[:class_name]
             accepts_nested_attributes_for k
             attr_accessible "#{k}_attributes".to_sym
           end

data/lib/piggybak/config.rb

@@ -26,22 +26,27 @@ module Piggybak
 
         @line_item_types = { :sellable => { :visible => true,
                                             :fields => ["sellable_id", "quantity"],
-                                            :allow_destroy => true },
+                                            :allow_destroy => true,
+                                            :sort => 1 },
                              :payment => { :visible => true,
                                            :nested_attrs => true,
                                            :fields => ["payment"],
                                            :allow_destroy => false,
-                                           :class_name => "::Piggybak::Payment" },
+                                           :class_name => "::Piggybak::Payment",
+                                           :sort => 5 },
                              :shipment => { :visible => true, 
                                             :nested_attrs => true, 
                                             :fields => ["shipment"], 
                                             :allow_destroy => true,
-                                            :class_name => "::Piggybak::Shipment" },
+                                            :class_name => "::Piggybak::Shipment", 
+                                            :sort => 2 },
                              :adjustment => { :visible => true, 
                                               :fields => ["description", "price"],
-                                              :allow_destroy => true },
+                                              :allow_destroy => true,
+                                              :sort => 4 },
                              :tax => { :visible => false, 
-                                       :allow_destroy => false }
+                                       :allow_destroy => false,
+                                       :sort => 3 }
                            }
 
         @default_country = "US"

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,7 @@ files:
 - db/migrate/20120716191225_add_masked_credit_card_numbers.rb
 - db/migrate/20111227150106_create_orders.rb
 - db/migrate/20111228231806_create_payment_methods.rb
+- db/migrate/20121018213421_drop_sort_from_line_items.rb
 - db/migrate/20111228231838_create_shipments.rb
 - db/migrate/20120104020930_populate_countries_and_states.rb
 - db/migrate/20111227213558_create_variants.rb
@@ -207,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 364248551342590092
+      hash: 32961448645574721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -216,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 364248551342590092
+      hash: 32961448645574721
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23