piggybak 0.5.5 → 0.6.0

data/bin/piggybak

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+
+begin
+  require 'piggybak/cli'
+rescue LoadError => e
+warn 'Could not load "piggybak/cli"'
+  exit -1
+end
+
+Piggybak::CLI.start

data/config/routes.rb

@@ -20,7 +20,5 @@ Piggybak::Engine.routes.draw do
     match "/admin/orders/:id/email" => "orders#email", :as => :email_order
     match "/admin/orders/:id/download" => "orders#download", :as => :download_order, :format => "txt"
     match "/admin/orders/:id/cancel" => "orders#cancel", :as => :cancel_order
-    match "/admin/orders/:id/restore" => "orders#restore", :as => :restore_order
-    match "/admin/payments/:id/refund" => "payments#refund", :as => :refund_payment
   end
 end

data/db/migrate/20121008160425_rename_variants_to_sellables.rb

@@ -0,0 +1,11 @@
+class RenameVariantsToSellables < ActiveRecord::Migration
+  def up
+    rename_table :variants, :sellables
+    rename_column :line_items, :variant_id, :sellable_id
+  end
+
+  def down
+    rename_table :sellables, :variants
+    rename_column :line_items, :sellable_id, :variant_id
+  end
+end

data/db/migrate/20121008175144_line_item_rearchitecture.rb

@@ -0,0 +1,96 @@
+class LineItemRearchitecture < ActiveRecord::Migration
+  def up
+    add_column :line_items, :line_item_type, :string, :null => false, :default => "sellable"
+    rename_column :line_items, :price, :unit_price
+    rename_column :line_items, :total, :price
+    change_column :line_items, :sellable_id, :integer, :null => true
+    add_column :line_items, :sort, :integer, :null => false, :default => 0
+    change_table(:line_items) do |t|
+      t.timestamps
+    end
+
+    add_column :shipments, :line_item_id, :integer
+    add_column :payments, :line_item_id, :integer
+
+    [Piggybak::Shipment, Piggybak::Payment, Piggybak::Adjustment].each do |klass|
+      klass.all.each do |item|
+        description = ''
+        if klass == Piggybak::Shipment
+          description = item.shipping_method.description
+        elsif klass == Piggybak::Payment
+          description = "Payment"
+        elsif klass == Piggybak::Adjustment
+          description = item.note || "Adjustment"
+        end
+        li = Piggybak::LineItem.new({ :line_item_type => klass.to_s.demodulize.downcase,
+          :price => 0.00,
+          :description => description,
+          :quantity => 1, 
+          :order_id => item.order_id })
+        li.save
+
+        if [Piggybak::Shipment, Piggybak::Payment].include?(klass)
+          item.update_attribute(:line_item_id, li.id)
+        end
+
+        li.update_attribute(:price, item.total)
+      end
+    end
+
+    remove_column :shipments, :total
+    remove_column :payments, :total
+    remove_column :adjustments, :total
+    remove_column :shipments, :order_id
+    remove_column :payments, :order_id
+    remove_column :adjustments, :order_id
+
+    Piggybak::Order.all.each do |o|
+      next if o.attributes["tax_charge"] == 0.00
+      o.line_items << Piggybak::LineItem.new({ :line_item_type => "tax",
+        :price => o.attributes["tax_charge"],
+        :description => "Tax Charge",
+        :quantity => 1 })
+    end
+
+    remove_column :orders, :tax_charge
+  end
+
+  def down
+    add_column :shipments, :total, :decimal, :null => false, :default => 0.0
+    add_column :payments, :total, :decimal, :null => false, :default => 0.0
+    add_column :adjustments, :total, :decimal
+    add_column :shipments, :order_id, :integer, :null => false, :default => 0
+    add_column :payments, :order_id, :integer, :null => false, :default => 0
+    add_column :adjustments, :order_id, :integer, :null => false, :default => 0
+
+    add_column :orders, :tax_charge, :decimal, :null => false, :default => 0.0
+
+    to_delete = []
+    Piggybak::LineItem.all.each do |line_item|
+      if line_item.line_item_type == "payment"
+        line_item.payment.update_attributes({ :order_id => line_item.order_id, :total => line_item.price }) 
+        to_delete << line_item
+      elsif line_item.line_item_type == "shipment"
+        line_item.shipment.update_attributes({ :order_id => line_item.order_id, :total => line_item.price }) 
+        to_delete << line_item
+      elsif line_item.line_item_type == "adjustment"
+        to_delete << line_item
+        line_item.adjustment.update_attributes({ :order_id => line_item.order_id, :total => line_item.price }) 
+      elsif line_item.line_item_type == "tax"
+        line_item.order.update_attribute(:tax_charge, line_item.price)
+        to_delete << line_item
+      end
+    end
+    Piggybak::LineItem.destroy(to_delete)
+
+    remove_column :shipments, :line_item_id
+    remove_column :payments, :line_item_id
+
+    remove_column :line_items, :line_item_type
+    remove_column :line_items, :updated_at
+    remove_column :line_items, :created_at
+    remove_column :line_items, :sort
+    rename_column :line_items, :price, :total
+    rename_column :line_items, :unit_price, :price
+  end
+end

data/lib/acts_as_sellable.rb

@@ -0,0 +1,21 @@
+module Piggybak
+  module ActsAsSellable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      
+      def acts_as_sellable
+        
+        has_one :piggybak_sellable, :as => "item", :class_name => "::Piggybak::Sellable"
+        
+        accepts_nested_attributes_for :piggybak_sellable, :allow_destroy => true
+
+      end      
+
+    end
+  end
+end
+
+::ActiveRecord::Base.send :include, Piggybak::ActsAsSellable
+
+

data/lib/formatted_changes.rb

@@ -5,7 +5,7 @@ module Piggybak
     def new_destroy_changes(type)
       text = "#{self.class.to_s.gsub(/Piggybak::/, '')} ##{self.id} #{type}:<br />"
       self.attributes.each do |k, v|
-        if !["upated_at", "created_at", "id", "order_id", "billing_address_id", "shipping_address_id"].include?(k)
+        if !["updated_at", "created_at", "id", "order_id", "billing_address_id", "shipping_address_id", "sellable_id", "line_item_type", "unit_price", "sort"].include?(k)
           if v.is_a?(BigDecimal)
             text += "#{k}: $#{format("%.2f", v)}<br />"
           else
@@ -20,7 +20,7 @@ module Piggybak
     def formatted_changes
       text = "#{self.class.to_s.gsub(/Piggybak::/, '')} ##{self.id} changes:<br />"
       self.changes.each do |k, v|
-        if !["updated_at", "id", "billing_address_id", "shipping_address_id", "created_at"].include?(k)
+        if !["updated_at", "id", "billing_address_id", "shipping_address_id", "created_at", "sellable_id", "line_item_type", "unit_price", "sort"].include?(k)
           if v[0].is_a?(BigDecimal)
             text += "#{k}: $#{format("%.2f", v[0])} to $#{format("%.2f", v[1])}<br />"
           else

data/lib/piggybak.rb

@@ -1,5 +1,5 @@
 require 'piggybak/config'
-require 'acts_as_variant'
+require 'acts_as_sellable'
 require 'acts_as_orderer'
 require 'acts_as_changer'
 require 'active_merchant'
@@ -9,6 +9,7 @@ require 'mask_submissions'
 
 module Piggybak
   def self.config(entity = nil, &block)
+
     if entity
       Piggybak::Config.model(entity, &block)
     elsif block_given? && ENV['SKIP_RAILS_ADMIN_INITIALIZER'] != "true"
@@ -23,17 +24,83 @@ module Piggybak
   end
 
   class Engine < Rails::Engine
+      
     initializer "piggybak.add_helper" do |app|
       ApplicationController.class_eval do
         helper :piggybak
       end
     end
 
+    # Needed for development
+    config.to_prepare do
+      Piggybak.config.line_item_types.each do |k, v|
+        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
+            accepts_nested_attributes_for k
+            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
+            self.line_items.send(plural_k).inject(0) { |subtotal, li| subtotal + li.price }
+          end
+        end
+      end
+    end
+
     initializer "piggybak.rails_admin_config" do |app|
-      # RailsAdmin config file. Generated on December 21, 2011 13:04
-      # See github.com/sferik/rails_admin for more informations
+      Piggybak.config.line_item_types.each do |k, v|
+        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
+            accepts_nested_attributes_for k
+            attr_accessible "#{k}_attributes".to_sym
+          end
+        end
+      end
+      RailsAdmin::Config.reset_model(Piggybak::LineItem)
 
       RailsAdmin.config do |config|
+        config.model Piggybak::LineItem do
+          label "Line Item"
+          object_label_method :admin_label
+          visible false
+
+          edit do
+            field :line_item_type do
+              label "Line Item Type"
+              partial "polymorphic_nested"
+              help ""
+            end
+            Piggybak.config.line_item_types.each do |k, v|
+              if v[:nested_attrs]
+                field k do
+                  active true
+                end
+              end
+            end
+            field :sellable_id, :enum do
+              label "Sellable"
+              help "Required"
+            end
+            field :price 
+            field :quantity
+            field :description  
+          end
+        end
+
+        config.model Piggybak::Sellable do
+          visible false
+        end
+
         config.model Piggybak::Order do
           label "Order"
           navigation_label "Orders"
@@ -47,11 +114,6 @@ module Piggybak
                 "$%.2f" % value
               end
             end
-            field :tax_charge do
-              formatted_value do
-                "$%.2f" % value
-              end
-            end
             field :total_due do
               formatted_value do
                 "$%.2f" % value
@@ -60,13 +122,12 @@ module Piggybak
             field :created_at
             field :email
             field :phone
-            field :user
+
+            field :user if defined?(User)
 
             field :line_items
             field :billing_address
             field :shipping_address
-            field :shipments
-            field :payments
             field :order_notes do
               pretty_value do
                 value.inject([]) { |arr, o| arr << o.details }.join("<br /><br />").html_safe
@@ -99,12 +160,6 @@ module Piggybak
             field :recorded_changer, :hidden do
               partial "recorded_changer"
             end
-            # TODO: Figure out why this doesn't work here
-            #field :recorded_changer, :hidden do
-            #  default_value do
-            #    bindings[:view]._current_user.id
-            #  end
-            #end
             field :status do
               visible do
                 !bindings[:object].new_record?
@@ -122,7 +177,7 @@ module Piggybak
               end
             end
 
-            field :user
+            field :user if defined?(User)
             field :email
             field :phone
             field :ip_address do
@@ -131,28 +186,18 @@ module Piggybak
             field :user_agent do
               read_only true
             end
-            field :billing_address do 
-             help "Required"
+            field :billing_address do
+              active true
+              help "Required"
             end
             field :shipping_address do
+              active true
               help "Required"
             end
             field :line_items do
               active true
               help ""
             end
-            field :shipments do
-              active true
-              help ""
-            end
-            field :adjustments do
-              active true
-              help ""
-            end
-            field :payments do
-              active true
-              help ""
-            end
             field :order_notes do
               active true
             end
@@ -163,7 +208,7 @@ module Piggybak
           object_label_method :admin_label
           visible false
           list do
-            field :user
+            field :user if defined?(User)
             field :note
             field :created_at
           end
@@ -211,26 +256,7 @@ module Piggybak
           end
         end
       
-        config.model Piggybak::LineItem do
-          label "Line Item"
-          object_label_method :admin_label
-          visible false
-
-          edit do
-            field :variant
-            field :quantity
-            field :total do
-              read_only true
-              formatted_value do
-                value ? "$%.2f" % value : '-'
-              end
-              help "This will automatically be calculated at the time of processing."
-            end
-          end
-        end
-      
         config.model Piggybak::Shipment do
-          object_label_method :admin_label
           visible false
 
           edit do
@@ -242,53 +268,14 @@ module Piggybak
             field :status do
               label "Shipping Status"
             end
-            field :total do
-              read_only true
-              formatted_value do
-                "$%.2f" % value
-              end
-              help "This will automatically be calculated at the time of processing."
-            end
           end
         end
-     
+    
         config.model Piggybak::Adjustment do
-          object_label_method :admin_label
           visible false
-          edit do
-            field :user_id, :hidden do
-              default_value do
-                bindings[:view]._current_user.id
-              end
-            end
-            field :source do
-              help "Source of adjustment."
-              visible do
-                !bindings[:object].new_record?
-              end 
-              read_only do 
-                !bindings[:object].new_record?
-              end 
-            end
-            field :total do
-              help "<ul><li>Enter a negative value representing the customer refund amount. (This should be done AFTER completing a refund in the payment gateway) This will balance the invoice and remove the unbalanced status.</li></ul>".html_safe
-              read_only do 
-                !bindings[:object].new_record?
-              end
-              formatted_value do
-                "$%.2f" % value
-              end 
-            end
-            field :note do
-              read_only do 
-                !bindings[:object].new_record?
-              end 
-            end
-          end
         end
- 
+
         config.model Piggybak::Payment do
-          object_label_method :admin_label
           visible false
 
           edit do
@@ -331,16 +318,6 @@ module Piggybak
                 !bindings[:object].new_record?
               end 
             end
-            field :total do
-              read_only true
-              visible do
-                !bindings[:object].new_record?
-              end 
-              formatted_value do
-                "$%.2f" % value
-              end
-              help "This will automatically be calculated at the time of processing."
-            end
           end
         end
       
@@ -470,29 +447,6 @@ module Piggybak
             field :country
           end
         end
-      
-        config.model Piggybak::Variant do
-          label "Variant"
-		  navigation_label "Orders"
-          object_label_method :admin_label
-          edit do
-            field :item do
-              read_only do
-                !bindings[:object].new_record?
-              end
-            end
-            include_all_fields
-            field :unlimited_inventory do
-              help "If true, backorders on this variant will be allowed, regardless of quantity on hand."
-            end
-          end
-          list do
-            field :description
-            field :price
-            field :quantity
-            field :active
-          end
-        end
       end
     end
   end