app/models/exchange.rb in artfully_ose-1.0.0.rc4 vs app/models/exchange.rb in artfully_ose-1.1.0.rc1

@@ -1,22 +1,27 @@
 class Exchange
+  include Adjustments
   include ActiveModel::Validations
 
-  attr_accessor :order, :items, :tickets
+  attr_accessor :order, :items, :tickets, :service_fee
 
   validates_presence_of :order
   validates_length_of :items,   :minimum => 1
   validates_length_of :tickets, :minimum => 1
   validate :items_are_exchangeable
   validate :tickets_match_items
   validate :tickets_are_available
   validate :tickets_belong_to_organization
 
+  #The original order
+  #The items to exchange
+  #The tickets that they are being exchanged for
   def initialize(order, items, tickets = [])
-    self.order =        order
-    self.items =        items
-    self.tickets =      tickets
+    self.order        = order
+    self.items        = items
+    self.tickets      = tickets
+    self.service_fee  = number_of_non_free_items(items) * service_fee_per_item(order.items)
   end
 
   def items_are_exchangeable
     errors.add(:items, "are not available to exchange") unless items.all?(&:exchangeable?)
   end
@@ -32,36 +37,42 @@
   def tickets_belong_to_organization
     errors.add(:tickets, "do not belong to this organization") unless tickets.all? { |ticket| order.organization.can? :manage, ticket }
   end
 
   def submit
-    return_items
-    sell_new_items
+    ActiveRecord::Base.transaction do
+      sell_new_items
+      return_old_items
+      adjust_original_order
+    end
   end
 
-  def return_items
-    items.map(&:return!)
+  def return_old_items
+    items.map(&:exchange!)
   end
 
+  def adjust_original_order
+    order.service_fee = order.service_fee - service_fee
+    order.save
+  end
+
   def sell_new_items
     exchange_order_timestamp = Time.now
     tickets.each { |ticket| ticket.exchange_to(order.person, exchange_order_timestamp) }
     create_order(exchange_order_timestamp)
   end
 
   def create_order(time=Time.now)
-    ::Rails.logger.debug("CREATING EXCHANGE ORDER")
-    exchange_order = ApplicationOrder.new.tap do |exchange_order|
+    exchange_order = ExchangeOrder.new.tap do |exchange_order|
       exchange_order.person = order.person
       exchange_order.parent = order
+      exchange_order.payment_method = order.payment_method
       exchange_order.created_at = time
+      exchange_order.service_fee = service_fee
       exchange_order.for_organization order.organization
+      exchange_order.details = "Order is the result of an exchange on #{I18n.l time, :format => :slashed_date}"
       exchange_order << tickets
     end
-    ::Rails.logger.debug("RECORDING EXCHANGE")
-    exchange_order.record_exchange!
-    ::Rails.logger.debug("SAVING ORDER")
+    exchange_order.record_exchange! items
     exchange_order.save!
-    
-    ::Rails.logger.debug("ORDER SAV'D: " + exchange_order.to_s)
   end
 end
\ No newline at end of file