piggybak 0.4.15 → 0.4.16

data/VERSION

@@ -1 +1 @@
-0.4.15
+0.4.16

data/app/controllers/piggybak/orders_controller.rb

@@ -89,6 +89,7 @@ module Piggybak
       if can?(:email, order)
         Piggybak::Notifier.order_notification(order).deliver
         flash[:notice] = "Email notification sent."
+        OrderNote.create(:order_id => order.id, :note => "Email confirmation manually sent.", :user_id => current_user.id)
       end
 
       redirect_to rails_admin.edit_path('Piggybak::Order', order.id)
@@ -96,9 +97,11 @@ module Piggybak
 
     def restore
       order = Order.find(params[:id])
+      order.recorded_changer = current_user.id
 
       if can?(:restore, order)
-        order.update_attribute(:status, "new")
+        order.status = "new"
+        order.save
       end
 
       redirect_to rails_admin.edit_path('Piggybak::Order', order.id)
@@ -106,11 +109,10 @@ module Piggybak
 
     def cancel
       order = Order.find(params[:id])
+      order.recorded_changer = current_user.id
 
       if can?(:cancel, order)
-        cancelled_items = []
         order.line_items.each do |line_item|
-          cancelled_items << "#{line_item.quantity}:#{line_item.variant.sku}"
           line_item.destroy
         end
         order.payments.each do |payment|

data/app/controllers/piggybak/payments_controller.rb

@@ -2,6 +2,7 @@ module Piggybak
   class PaymentsController < ApplicationController
     def refund
       payment = Payment.find(params[:id])
+      payment.order.recorded_changer = current_user.id
 
       if can?(:refund, payment)
         flash[:notice] = payment.refund

data/app/models/piggybak/adjustment.rb

@@ -0,0 +1,29 @@
+module Piggybak
+  class Adjustment < ActiveRecord::Base
+    belongs_to :order
+    belongs_to :source, :polymorphic => true
+    attr_accessor :user_id
+    acts_as_changer
+
+    validates_presence_of :order_id, :total
+    validates_numericality_of :total
+    validates_presence_of :source
+
+    before_validation :set_source
+
+    def set_source
+      if self.source.nil? && self.user_id.present?
+        self.source = User.find(self.user_id)
+      end
+    end
+
+    def admin_label
+      if !self.new_record? 
+        return "Adjustment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")}): " + 
+          "$#{"%.2f" % self.total}"
+      else
+        return ""
+      end
+    end
+  end
+end

data/app/models/piggybak/order.rb

@@ -3,7 +3,7 @@ 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
+    has_many :adjustments, :inverse_of => :order
     has_many :order_notes, :inverse_of => :order
 
     belongs_to :billing_address, :class_name => "Piggybak::Address"
@@ -15,6 +15,7 @@ module Piggybak
     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 :adjustments, :allow_destroy => true
     accepts_nested_attributes_for :order_notes
 
     attr_accessor :recorded_changes
@@ -132,9 +133,10 @@ module Piggybak
         self.total += shipment.total
       end
 
-      # Hook in credits, TBD
-      credits.each do |credit|
-        self.total -= credit.total
+      adjustments.each do |adjustment|
+        if !adjustment._destroy
+          self.total += adjustment.total
+        end
       end
 
       self.total_due = self.total

data/app/models/piggybak/order_note.rb

@@ -5,6 +5,7 @@ module Piggybak
 
     belongs_to :order
     belongs_to :user
+    validates_presence_of :user_id
 
     def details
       "<b>#{created_at.strftime("%m-%d-%Y %H:%M")}</b> by #{user.email}:<br />#{note}"

data/app/models/piggybak/payment.rb

@@ -84,7 +84,7 @@ module Piggybak
 
     def admin_label
       if !self.new_record? 
-        return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")})<br />" + 
+        return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")}): " + 
           "$#{"%.2f" % self.total}"
       else
         return ""

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

@@ -14,6 +14,10 @@ N/A
 		<td>Tax</td>
 		<td>$<%= "%.2f" % form.object.tax_charge %></td>
 	</tr>
+	<tr>
+		<td>Adjustments</td>
+		<td>$<%= "%.2f" % form.object.adjustments.inject(0) { |total, adj| total + adj.total } %></td>
+	</tr>
 	<tr>
 		<td>Order Total</td>
 		<td>$<%= "%.2f" % form.object.total %></td>

data/db/migrate/20120718142841_modify_credits.rb

@@ -0,0 +1,6 @@
+class ModifyCredits < ActiveRecord::Migration
+  def change
+    rename_table :credits, :adjustments
+    add_column :adjustments, :note, :text
+  end
+end

data/lib/formatted_changes.rb

@@ -21,11 +21,11 @@ module Piggybak
       def formatted_changes
         text = "#{self.class.to_s.gsub(/Piggybak::/, '')} ##{self.id} changes:<br />"
         self.changes.each do |k, v|
-          if k != "updated_at"
+          if !["updated_at", "id", "billing_address_id", "shipping_address_id", "created_at"].include?(k)
             if v[0].is_a?(BigDecimal)
-              text += "#{k} from $#{format("%.2f", v[0])} to $#{format("%.2f", v[1])}<br />"
+              text += "#{k}: $#{format("%.2f", v[0])} to $#{format("%.2f", v[1])}<br />"
             else
-              text += "#{k} from #{v[0]} to #{v[1]}<br />"
+              text += "#{k}: #{v[0]} to #{v[1]}<br />"
             end
           end
         end

data/lib/piggybak.rb

@@ -143,6 +143,7 @@ module Piggybak
             field :payments do
               active true
             end
+            field :adjustments
             field :order_notes do
               active true
             end
@@ -237,7 +238,42 @@ module Piggybak
             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 "A negative value will add credit to an order. A positive value will add charges to the order."
+              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

data/piggybak.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.15"
+  s.version = "0.4.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
     "app/helpers/piggybak_helper.rb",
     "app/mailers/piggybak/notifier.rb",
     "app/models/piggybak/address.rb",
+    "app/models/piggybak/adjustment.rb",
     "app/models/piggybak/cart.rb",
     "app/models/piggybak/country.rb",
-    "app/models/piggybak/credit.rb",
     "app/models/piggybak/line_item.rb",
     "app/models/piggybak/order.rb",
     "app/models/piggybak/order_note.rb",
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
     "db/migrate/20120716191225_add_masked_credit_card_numbers.rb",
     "db/migrate/20120716195806_order_debugging.rb",
     "db/migrate/20120717022155_create_order_notes.rb",
+    "db/migrate/20120718142841_modify_credits.rb",
     "lib/acts_as_changer.rb",
     "lib/acts_as_orderer.rb",
     "lib/acts_as_variant.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.16
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &14312400 !ruby/object:Gem::Requirement
+  requirement: &16546740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14312400
+  version_requirements: *16546740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14311520 !ruby/object:Gem::Requirement
+  requirement: &16545900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14311520
+  version_requirements: *16545900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14327080 !ruby/object:Gem::Requirement
+  requirement: &16544940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *14327080
+  version_requirements: *16544940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14326440 !ruby/object:Gem::Requirement
+  requirement: &16560360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14326440
+  version_requirements: *16560360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14325640 !ruby/object:Gem::Requirement
+  requirement: &16559280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *14325640
+  version_requirements: *16559280
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &14324620 !ruby/object:Gem::Requirement
+  requirement: &16557500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14324620
+  version_requirements: *16557500
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &14323400 !ruby/object:Gem::Requirement
+  requirement: &16555960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14323400
+  version_requirements: *16555960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &14322860 !ruby/object:Gem::Requirement
+  requirement: &16554200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14322860
+  version_requirements: *16554200
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &14321860 !ruby/object:Gem::Requirement
+  requirement: &16568640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14321860
+  version_requirements: *16568640
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &14320340 !ruby/object:Gem::Requirement
+  requirement: &16567680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14320340
+  version_requirements: *16567680
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14335080 !ruby/object:Gem::Requirement
+  requirement: &16566440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14335080
+  version_requirements: *16566440
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &14334480 !ruby/object:Gem::Requirement
+  requirement: &16565060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14334480
+  version_requirements: *16565060
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &14333580 !ruby/object:Gem::Requirement
+  requirement: &16563860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14333580
+  version_requirements: *16563860
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &14332240 !ruby/object:Gem::Requirement
+  requirement: &16562720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14332240
+  version_requirements: *16562720
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &14331360 !ruby/object:Gem::Requirement
+  requirement: &16561060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14331360
+  version_requirements: *16561060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14330460 !ruby/object:Gem::Requirement
+  requirement: &16576040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14330460
+  version_requirements: *16576040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &14329600 !ruby/object:Gem::Requirement
+  requirement: &16574740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14329600
+  version_requirements: *16574740
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &14328820 !ruby/object:Gem::Requirement
+  requirement: &16572740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14328820
+  version_requirements: *16572740
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &14327900 !ruby/object:Gem::Requirement
+  requirement: &16570240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14327900
+  version_requirements: *16570240
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &14343600 !ruby/object:Gem::Requirement
+  requirement: &16583140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14343600
+  version_requirements: *16583140
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -255,9 +255,9 @@ files:
 - app/helpers/piggybak_helper.rb
 - app/mailers/piggybak/notifier.rb
 - app/models/piggybak/address.rb
+- app/models/piggybak/adjustment.rb
 - app/models/piggybak/cart.rb
 - app/models/piggybak/country.rb
-- app/models/piggybak/credit.rb
 - app/models/piggybak/line_item.rb
 - app/models/piggybak/order.rb
 - app/models/piggybak/order_note.rb
@@ -318,6 +318,7 @@ files:
 - db/migrate/20120716191225_add_masked_credit_card_numbers.rb
 - db/migrate/20120716195806_order_debugging.rb
 - db/migrate/20120717022155_create_order_notes.rb
+- db/migrate/20120718142841_modify_credits.rb
 - lib/acts_as_changer.rb
 - lib/acts_as_orderer.rb
 - lib/acts_as_variant.rb
@@ -398,7 +399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1793729587236370867
+      hash: -1651129113805460590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/models/piggybak/credit.rb

@@ -1,8 +0,0 @@
-module Piggybak
-  class Credit < ActiveRecord::Base
-    belongs_to :order
-    belongs_to :source, :polymorphic => true
-
-    validates_presence_of :total
-  end
-end