piggybak 0.4.31 → 0.4.32

data/VERSION

@@ -1 +1 @@
-0.4.31
+0.4.32

data/app/controllers/piggybak/orders_controller.rb

@@ -109,22 +109,24 @@ module Piggybak
 
     def cancel
       order = Order.find(params[:id])
-      order.recorded_changer = current_user.id
 
       if can?(:cancel, order)
+        order.recorded_changer = current_user.id
+        order.disable_order_notes = true
+
         order.line_items.each do |line_item|
-          line_item.destroy
+          line_item.mark_for_destruction
         end
         order.shipments.each do |shipment|
-          shipment.destroy
+          shipment.mark_for_destruction
         end
         order.update_attribute(:tax_charge, 0.00)
         order.update_attribute(:total, 0.00)
         order.update_attribute(:to_be_cancelled, true)
 
-        OrderNote.create(:order_id => order.id, :note => "Order cancelled.", :user_id => current_user.id)
+        OrderNote.create(:order_id => order.id, :note => "Order set to cancelled. Line items, shipments, tax removed.", :user_id => current_user.id)
         
-        flash[:notice] = "Order #{order.id} cancelled"
+        flash[:notice] = "Order #{order.id} set to cancelled. Order is now in unbalanced state."
       end
 
       redirect_to rails_admin.edit_path('Piggybak::Order', order.id)

data/app/models/piggybak/order.rb

@@ -21,12 +21,12 @@ module Piggybak
     attr_accessor :recorded_changes
     attr_accessor :recorded_changer
     attr_accessor :was_new_record
-    attr_accessor :refund_amt
+    attr_accessor :disable_order_notes
 
     validates_presence_of :status, :email, :phone, :total, :total_due, :tax_charge, :created_at, :ip_address, :user_agent
 
     after_initialize :initialize_nested, :initialize_request
-    before_validation :set_defaults, :manage_adjustments
+    before_validation :set_defaults
     after_validation :update_totals
     before_save :process_payments, :update_status, :set_new_record
     after_save :record_order_note
@@ -57,15 +57,6 @@ module Piggybak
       end
     end
 
-    def manage_adjustments
-      if self.refund_amt.present?
-        self.adjustments << Piggybak::Adjustment.new(:total => -1*self.refund_amt.to_f,
-                                                     :note => "Refund recorded.",
-                                                     :source_id => self.recorded_changer,
-                                                     :source_type => "User")
-      end
-    end
-
     def process_payments
       has_errors = false
 
@@ -89,13 +80,11 @@ module Piggybak
     end
 
     def record_order_note
-      if self.changed?
-        if !self.was_new_record
-          self.recorded_changes << self.formatted_changes
-        end
+      if self.changed? && !self.was_new_record
+        self.recorded_changes << self.formatted_changes
       end
 
-      if self.recorded_changes.any?
+      if self.recorded_changes.any? && !self.disable_order_notes
         OrderNote.create(:order_id => self.id, :note => self.recorded_changes.join("<br />"), :user_id => self.recorded_changer.to_i)
       end
     end
@@ -118,6 +107,9 @@ module Piggybak
       self.total = 0
       self.total_due = 0
       self.tax_charge = 0
+      self.disable_order_notes = false
+
+      return if self.to_be_cancelled
 
       self.line_items.each do |line_item|
         if self.status != "shipped"

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.31"
+  s.version = "0.4.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-08-15"
+  s.date = "2012-08-16"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.31
+  version: 0.4.32
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &16323540 !ruby/object:Gem::Requirement
+  requirement: &25437000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16323540
+  version_requirements: *25437000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16321940 !ruby/object:Gem::Requirement
+  requirement: &25435540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16321940
+  version_requirements: *25435540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16320800 !ruby/object:Gem::Requirement
+  requirement: &25450800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *16320800
+  version_requirements: *25450800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16336400 !ruby/object:Gem::Requirement
+  requirement: &25448020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16336400
+  version_requirements: *25448020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16334740 !ruby/object:Gem::Requirement
+  requirement: &25444940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *16334740
+  version_requirements: *25444940
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &16334100 !ruby/object:Gem::Requirement
+  requirement: &25459580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16334100
+  version_requirements: *25459580
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &16333480 !ruby/object:Gem::Requirement
+  requirement: &25455620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16333480
+  version_requirements: *25455620
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16332640 !ruby/object:Gem::Requirement
+  requirement: &25467980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16332640
+  version_requirements: *25467980
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &16330860 !ruby/object:Gem::Requirement
+  requirement: &25466640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16330860
+  version_requirements: *25466640
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &16329640 !ruby/object:Gem::Requirement
+  requirement: &25465280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16329640
+  version_requirements: *25465280
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16344700 !ruby/object:Gem::Requirement
+  requirement: &25464140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16344700
+  version_requirements: *25464140
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &16342700 !ruby/object:Gem::Requirement
+  requirement: &25462140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16342700
+  version_requirements: *25462140
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16341220 !ruby/object:Gem::Requirement
+  requirement: &25476060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16341220
+  version_requirements: *25476060
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &16340040 !ruby/object:Gem::Requirement
+  requirement: &25472460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16340040
+  version_requirements: *25472460
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &16339480 !ruby/object:Gem::Requirement
+  requirement: &25470520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16339480
+  version_requirements: *25470520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16338940 !ruby/object:Gem::Requirement
+  requirement: &25469740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16338940
+  version_requirements: *25469740
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16338380 !ruby/object:Gem::Requirement
+  requirement: &25484600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16338380
+  version_requirements: *25484600
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &16337680 !ruby/object:Gem::Requirement
+  requirement: &25482820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16337680
+  version_requirements: *25482820
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &16336980 !ruby/object:Gem::Requirement
+  requirement: &25481440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16336980
+  version_requirements: *25481440
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16352220 !ruby/object:Gem::Requirement
+  requirement: &25480680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16352220
+  version_requirements: *25480680
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -401,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1745694921164564524
+      hash: 4589883472526104963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: