piggybak 0.4.30 → 0.4.31

data/VERSION

@@ -1 +1 @@
-0.4.30
+0.4.31

data/app/controllers/piggybak/orders_controller.rb

@@ -112,20 +112,17 @@ module Piggybak
       order.recorded_changer = current_user.id
 
       if can?(:cancel, order)
-        order.adjustments << Piggybak::Adjustment.new(:total => -1*order.total,
-                                                     :note => "Cancelled order.", 
-                                                     :source_id => current_user.id,
-                                                     :source_type => "User")
         order.line_items.each do |line_item|
           line_item.destroy
         end
         order.shipments.each do |shipment|
           shipment.destroy
         end
-        order.update_attribute(:status, "cancelled")
         order.update_attribute(:tax_charge, 0.00)
         order.update_attribute(:total, 0.00)
-        order.update_attribute(:total_due, 0.00)
+        order.update_attribute(:to_be_cancelled, true)
+
+        OrderNote.create(:order_id => order.id, :note => "Order cancelled.", :user_id => current_user.id)
         
         flash[:notice] = "Order #{order.id} cancelled"
       end

data/app/models/piggybak/order.rb

@@ -75,20 +75,15 @@ module Piggybak
         end
       end
 
-      adjustment_total = 0
+      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
+
       adjustments.each do |adjustment|
         if !adjustment._destroy
-          adjustment_total += adjustment.total
+          payments_total += adjustment.total.round(2)
         end
       end
 
-      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
-
-      if adjustment_total > 0
-        self.total_due = (self.total + adjustment_total - payments_total).round(2)
-      else
-        self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
-      end
+      self.total_due = (self.total - payments_total).round(2)
 
       !has_errors
     end
@@ -150,7 +145,7 @@ module Piggybak
       self.total += self.tax_charge
 
       shipments.each do |shipment|
-        if !shipment._destroy && shipment.new_record? && shipment.shipping_method
+        if !shipment._destroy && (shipment.new_record? || shipment.status != 'shipped') && shipment.shipping_method
           calculator = shipment.shipping_method.klass.constantize
           shipment.total = calculator.rate(shipment.shipping_method, self)
         end
@@ -158,20 +153,15 @@ module Piggybak
         self.total += shipping_cast
       end
 
-      adjustment_total = 0
+      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
+
       adjustments.each do |adjustment|
         if !adjustment._destroy
-          adjustment_total += adjustment.total
+          payments_total += adjustment.total.round(2)
         end
       end
 
-      payments_total = self.payments.inject(0) { |s, payment| s + payment.total }
-
-      if adjustment_total > 0
-        self.total_due = (self.total + adjustment_total - payments_total).round(2)
-      else
-        self.total_due = (self.total - (adjustment_total + payments_total)).round(2)
-      end
+      self.total_due = (self.total - payments_total).round(2)
     end
 
     def update_status
@@ -180,7 +170,9 @@ module Piggybak
       if self.total_due != 0.00
         self.status = "unbalanced" 
       else
-        if self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
+        if self.to_be_cancelled
+          self.status = "cancelled"
+        elsif self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
           self.status = "shipped"
         elsif self.shipments.any? && self.shipments.all? { |s| s.status == "processing" }
           self.status = "processing"

data/db/migrate/20120815205207_add_to_be_cancelled_to_orders.rb

@@ -0,0 +1,5 @@
+class AddToBeCancelledToOrders < ActiveRecord::Migration
+  def change
+    add_column :orders, :to_be_cancelled, :boolean, :nil => false, :default => false
+  end
+end

data/lib/piggybak.rb

@@ -146,13 +146,6 @@ module Piggybak
               active true
               help ""
             end
-            field :refund_amt do
-              label "Refund Amount"
-              visible do
-                !bindings[:object].new_record?
-              end 
-              help "This does not interact with the payment gateway."
-            end
             field :payments do
               active true
               help ""
@@ -271,7 +264,7 @@ module Piggybak
               end 
             end
             field :total do
-              help "A negative value represents credit. A positive value represents charge."
+              help "<ul><li>Enter a negative value representing a refund given (process in payment gateway). <i>ADDITIONAL INSTRUCTIONS HERE</i></li></ul>".html_safe
               read_only do 
                 !bindings[:object].new_record?
               end

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.30"
+  s.version = "0.4.31"
 
   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-10"
+  s.date = "2012-08-15"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
@@ -97,6 +97,7 @@ Gem::Specification.new do |s|
     "db/migrate/20120716195806_order_debugging.rb",
     "db/migrate/20120717022155_create_order_notes.rb",
     "db/migrate/20120718142841_modify_credits.rb",
+    "db/migrate/20120815205207_add_to_be_cancelled_to_orders.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.30
+  version: 0.4.31
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &20786020 !ruby/object:Gem::Requirement
+  requirement: &16323540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20786020
+  version_requirements: *16323540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20785460 !ruby/object:Gem::Requirement
+  requirement: &16321940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20785460
+  version_requirements: *16321940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20784380 !ruby/object:Gem::Requirement
+  requirement: &16320800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *20784380
+  version_requirements: *16320800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20861900 !ruby/object:Gem::Requirement
+  requirement: &16336400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20861900
+  version_requirements: *16336400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20861240 !ruby/object:Gem::Requirement
+  requirement: &16334740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *20861240
+  version_requirements: *16334740
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &20860560 !ruby/object:Gem::Requirement
+  requirement: &16334100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20860560
+  version_requirements: *16334100
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &20859980 !ruby/object:Gem::Requirement
+  requirement: &16333480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20859980
+  version_requirements: *16333480
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20857540 !ruby/object:Gem::Requirement
+  requirement: &16332640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20857540
+  version_requirements: *16332640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20854340 !ruby/object:Gem::Requirement
+  requirement: &16330860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20854340
+  version_requirements: *16330860
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &20165480 !ruby/object:Gem::Requirement
+  requirement: &16329640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20165480
+  version_requirements: *16329640
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &20163780 !ruby/object:Gem::Requirement
+  requirement: &16344700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20163780
+  version_requirements: *16344700
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &20162420 !ruby/object:Gem::Requirement
+  requirement: &16342700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20162420
+  version_requirements: *16342700
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &20161360 !ruby/object:Gem::Requirement
+  requirement: &16341220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20161360
+  version_requirements: *16341220
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &20947240 !ruby/object:Gem::Requirement
+  requirement: &16340040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20947240
+  version_requirements: *16340040
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &20945640 !ruby/object:Gem::Requirement
+  requirement: &16339480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20945640
+  version_requirements: *16339480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20944600 !ruby/object:Gem::Requirement
+  requirement: &16338940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20944600
+  version_requirements: *16338940
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &20943180 !ruby/object:Gem::Requirement
+  requirement: &16338380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20943180
+  version_requirements: *16338380
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &20942020 !ruby/object:Gem::Requirement
+  requirement: &16337680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20942020
+  version_requirements: *16337680
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &20940720 !ruby/object:Gem::Requirement
+  requirement: &16336980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20940720
+  version_requirements: *16336980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &20939980 !ruby/object:Gem::Requirement
+  requirement: &16352220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20939980
+  version_requirements: *16352220
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -320,6 +320,7 @@ files:
 - db/migrate/20120716195806_order_debugging.rb
 - db/migrate/20120717022155_create_order_notes.rb
 - db/migrate/20120718142841_modify_credits.rb
+- db/migrate/20120815205207_add_to_be_cancelled_to_orders.rb
 - lib/acts_as_changer.rb
 - lib/acts_as_orderer.rb
 - lib/acts_as_variant.rb
@@ -400,7 +401,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2520099593681375365
+      hash: -1745694921164564524
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: