spree_core 0.30.0.beta1 → 0.30.0

data/app/models/payment.rb

@@ -3,14 +3,13 @@ class Payment < ActiveRecord::Base
   belongs_to :source, :polymorphic => true
   belongs_to :payment_method
 
-  has_many :transactions
-  alias :txns :transactions
-  has_many :offsets, :class_name => 'Payment', :foreign_key => 'source_id', :conditions => "source_type = 'Payment' AND amount < 0"
+  has_many :offsets, :class_name => 'Payment', :foreign_key => 'source_id', :conditions => "source_type = 'Payment' AND amount < 0 AND state = 'completed'"
+  has_many :log_entries, :as => :source
 
   after_save :create_payment_profile, :if => :payment_profiles_supported?
 
   # update the order totals, etc.
-  after_save {order.try(:update!)}
+  after_save :update_order
 
   #after_save :check_payments
   #after_destroy :check_payments
@@ -18,12 +17,13 @@ class Payment < ActiveRecord::Base
   accepts_nested_attributes_for :source
 
   #validate :amount_is_valid_for_outstanding_balance_or_credit
-  validates :payment_method, :presence => true, :if => Proc.new { |payable| payable.is_a? Checkout }
+  #validates :payment_method, :presence => true, :if => Proc.new { |payable| payable.is_a? Checkout }
 
   scope :from_creditcard, where(:source_type => 'Creditcard')
   scope :with_state, lambda {|s| where(:state => s)}
   scope :completed, with_state('completed')
-
+  scope :pending, with_state('pending')
+  scope :failed, with_state('failed')
 
 
   # order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -45,7 +45,7 @@ class Payment < ActiveRecord::Base
       transition :from => ['processing', 'pending'], :to => 'completed'
     end
     event :void do
-      transition :from => ['pending', 'complete'], :to => 'void'
+      transition :from => ['pending', 'completed'], :to => 'void'
     end
   end
 
@@ -64,7 +64,7 @@ class Payment < ActiveRecord::Base
 
   def credit(amount)
     return if amount > credit_allowed
-    started_processing! 
+    started_processing!
     source.credit(self, amount)
   end
 
@@ -83,8 +83,12 @@ class Payment < ActiveRecord::Base
   end
 
   def actions
-    return [] unless source and source.respond_to? :actions
-    source.actions.select { |action| !source.respond_to?("can_#{action}?") or source.send("can_#{action}?", self) }
+    return [] unless payment_source and payment_source.respond_to? :actions
+    payment_source.actions.select { |action| !payment_source.respond_to?("can_#{action}?") or payment_source.send("can_#{action}?", self) }
+  end
+
+  def payment_source
+    source.is_a?(Payment) ? source.source : source
   end
 
   private
@@ -111,14 +115,8 @@ class Payment < ActiveRecord::Base
 
     def amount_is_valid_for_outstanding_balance_or_credit
       return unless order
-      if amount < 0
-        if amount.abs > order.outstanding_credit
-          errors.add(:amount, "Is greater than the credit owed (#{order.outstanding_credit})")
-        end
-      else
-        if amount > order.outstanding_balance
-          errors.add(:amount, "Is greater than the outstanding balance (#{order.outstanding_balance})")
-        end
+      if amount != order.outstanding_balance
+        errors.add(:amount, "does not match outstanding balance (#{order.outstanding_balance})")
       end
     end
 
@@ -133,4 +131,9 @@ class Payment < ActiveRecord::Base
       gateway_error I18n.t(:unable_to_connect_to_gateway)
     end
 
+    def update_order
+      order.payments.reload
+      order.update!
+    end
+
 end

data/app/models/payment_method.rb

@@ -23,8 +23,8 @@ class PaymentMethod < ActiveRecord::Base
     raise "You must implement payment_source_class method for this gateway."
   end
 
-  def self.available(display_on=nil)
-    PaymentMethod.all.select { |p| p.active && (p.display_on == display_on.to_s || p.display_on.blank?) &&  (p.environment == ENV['RAILS_ENV'] || p.environment.blank?) }
+  def self.available(display_on='both')
+    PaymentMethod.all.select { |p| p.active && (p.display_on == display_on.to_s || p.display_on.blank?) &&  (p.environment == Rails.env || p.environment.blank?) }
   end
 
   def self.active?
@@ -32,7 +32,7 @@ class PaymentMethod < ActiveRecord::Base
   end
 
   def self.current
-    PaymentMethod.find(:first, :conditions => {:active => true, :environment => ENV['RAILS_ENV']})
+    PaymentMethod.find(:first, :conditions => {:active => true, :environment => Rails.env})
   end
 
   def method_type

data/app/models/return_authorization.rb

@@ -1,14 +1,14 @@
 class ReturnAuthorization < ActiveRecord::Base
   belongs_to :order
   has_many :inventory_units
-  before_save :generate_number
+  before_create :generate_number
 
   validates :order, :presence => true
   validates :amount, :numericality => true
   validate :must_have_shipped_units
 
   state_machine :initial => 'authorized' do
-    after_transition :to => 'received', :do => :add_credit
+    after_transition :to => 'received', :do => :process_return
 
     event :receive do
       transition :to => 'received', :from => 'authorized', :if => :allow_receive?
@@ -42,15 +42,17 @@ class ReturnAuthorization < ActiveRecord::Base
       end
     end
 
-    self.order.return_authorized! if self.inventory_units.reload.size > 0 && !self.order.awaiting_return?
+    self.order.authorize_return! if self.inventory_units.reload.size > 0 && !self.order.awaiting_return?
   end
 
   private
   def must_have_shipped_units
-    errors.add(:order, I18n.t("has_no_shipped_units")) if order.nil? || order.shipped_units.nil?
+    errors.add(:order, I18n.t("has_no_shipped_units")) if order.nil? || !order.inventory_units.any?(&:shipped?)
   end
 
   def generate_number
+    return if self.number
+
     record = true
     while record
       random = "RMA#{Array.new(9){rand(9)}.join}"
@@ -59,9 +61,11 @@ class ReturnAuthorization < ActiveRecord::Base
     self.number = random
   end
 
-  def add_credit
-    credit = ReturnAuthorizationCredit.create(:adjustment_source => self, :order_id => self.order.id, :amount => self.amount, :description => I18n.t("rma_credit"))
-    self.order.update_totals!
+  def process_return
+    inventory_units.each &:return!
+
+    credit = Adjustment.create(:source => self, :order_id => self.order.id, :amount => (self.amount > 0 ? self.amount * -1 : self.amount), :label => I18n.t("rma_credit"))
+    self.order.update!
   end
 
   def allow_receive?

data/app/models/shipment.rb

@@ -3,25 +3,26 @@ class Shipment < ActiveRecord::Base
   belongs_to :order
   belongs_to :shipping_method
   belongs_to :address
-  has_one    :shipping_charge,   :as => :adjustment_source
-  alias charge shipping_charge
   has_many :state_events, :as => :stateful
   has_many :inventory_units
+  has_one :adjustment, :as => :source
+
   before_create :generate_shipment_number
-  after_create :set_correct_state
-  # after_save :create_shipping_charge
   after_destroy :release_inventory_units
+  after_save :ensure_correct_adjustment, :update_order
 
   attr_accessor :special_instructions
   accepts_nested_attributes_for :address
   accepts_nested_attributes_for :inventory_units
 
-  validates :inventory_units, :presence => true, :if => Proc.new { |shipment| shipment.order.complete? && !shipment.order.canceled? }
+  validates :inventory_units, :presence => true, :if => :require_inventory
+  validates :shipping_method, :presence => true
+
   make_permalink :field => :number
-  validate :shipping_method
 
   scope :shipped, where(:state => 'shipped')
   scope :ready, where(:state => 'ready')
+  scope :pending, where(:state => 'pending')
 
   def to_param
     self.number if self.number
@@ -34,24 +35,14 @@ class Shipment < ActiveRecord::Base
     self.shipped_at = Time.now
   end
 
-  # def create_shipping_charge
-  #   if shipping_method
-  #     self.shipping_charge ||= ShippingCharge.create({
-  #         :order => order,
-  #         :description => description_for_shipping_charge,
-  #         :adjustment_source => self,
-  #       })
-
-  #     self.shipping_charge.update_attribute(:description, description_for_shipping_charge) unless self.shipping_charge.description == description_for_shipping_charge
-  #   end
-  # end
-
+  # The adjustment amount associated with this shipment (if any.)  Returns only the first adjustment to match
+  # the shipment but there should never really be more than one.
   def cost
-    shipping_charge.amount if shipping_charge
+    adjustment ? adjustment.amount : 0
   end
 
   # shipment state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
-  state_machine :initial => 'ready', :use_transactions => false do
+  state_machine :initial => 'pending', :use_transactions => false do
     event :ready do
       transition :from => 'pending', :to => 'ready'
     end
@@ -62,7 +53,7 @@ class Shipment < ActiveRecord::Base
       transition :from => 'ready', :to => 'shipped'
     end
 
-    #after_transition :to => 'shipped', :do => :transition_order
+    after_transition :to => 'shipped', :do => :after_ship
   end
 
   def editable_by?(user)
@@ -75,21 +66,23 @@ class Shipment < ActiveRecord::Base
     end
   end
 
+
   def line_items
-    if order.complete?
+    if order.complete? and Spree::Config[:track_inventory_levels]
       order.line_items.select {|li| inventory_units.map(&:variant_id).include?(li.variant_id)}
     else
       order.line_items
     end
   end
 
-  def recalculate_needed?
-    changed? or !address.same_as?(Address.find(address.id))
-  end
-
-  def recalculate_order
-    shipping_charge.update_attribute(:description, description_for_shipping_charge)
-    order.update_totals!
+  # Updates various aspects of the Shipment while bypassing any callbacks.  Note that this method takes an explicit reference to the
+  # Order object.  This is necessary because the association actually has a stale (and unsaved) copy of the Order and so it will not
+  # yield the correct results.
+  def update!(order)
+    old_state = self.state
+    new_state = determine_state(order)
+    update_attribute_without_callbacks "state", determine_state(order)
+    after_ship if new_state == 'shipped' and old_state != 'shipped'
   end
 
   private
@@ -104,21 +97,15 @@ class Shipment < ActiveRecord::Base
     self.number = random
   end
 
-  def set_correct_state
-    if pending? and order.checkout_complete and !order.outstanding_balance?
-      ready
-    end
-  end
-
   def description_for_shipping_charge
     "#{I18n.t(:shipping)} (#{shipping_method.name})"
   end
 
-  def transition_order
-    update_attribute(:shipped_at, Time.now)
-    # transition order to shipped if all shipments have been shipped
-    order.ship! if order.shipments.all?(&:shipped?)
-  end
+  # def transition_order
+  #   update_attribute(:shipped_at, Time.now)
+  #   # transition order to shipped if all shipments have been shipped
+  #   order.ship! if order.shipments.all?(&:shipped?)
+  # end
 
   def validate_shipping_method
     unless shipping_method.nil?
@@ -130,4 +117,41 @@ class Shipment < ActiveRecord::Base
     inventory_units.each {|unit| unit.update_attribute(:shipment_id, nil)}
   end
 
+  # Determines the appropriate +state+ according to the following logic:
+  #
+  # pending    unless +order.payment_state+ is +paid+
+  # shipped    if already shipped (ie. does not change the state)
+  # ready      all other cases
+  def determine_state(order)
+    return "pending" if self.inventory_units.any? {|unit| unit.backordered?}
+    return "shipped" if state == "shipped"
+    order.payment_state == "balance_due" ? "pending" : "ready"
+  end
+
+  # Determines whether or not inventory units should be associated with the shipment.  This is always +false+ when
+  # +Spree::Config[:track_inventory_levels]+ is set to +false.+  Otherwise its +true+ whenever the order is completed
+  # (and not canceled.)
+  def require_inventory
+    return false unless Spree::Config[:track_inventory_levels]
+    order.completed? && !order.canceled?
+  end
+
+  def after_ship
+    inventory_units.each &:ship!
+    ShipmentMailer.shipped_email(self).deliver
+  end
+
+  def ensure_correct_adjustment
+    if adjustment
+      adjustment.originator = shipping_method
+      adjustment.save
+    else
+      shipping_method.create_adjustment(I18n.t(:shipping), order, self, true)
+      reload #ensure adjustment is present on later saves
+    end
+  end
+
+  def update_order
+    order.update!
+  end
 end

data/app/models/user.rb

@@ -7,7 +7,7 @@ class User < ActiveRecord::Base
 
   # Creates an anonymous user
   def self.anonymous!
-    User.create(:anonymous => true)
+    User.create
   end
 
 end

data/app/models/variant.rb

@@ -32,18 +32,18 @@ class Variant < ActiveRecord::Base
   # Adjusts the inventory units to match the given new level.
   def on_hand=(new_level)
     if Spree::Config[:track_inventory_levels]
-      delta_units = new_level.to_i - on_hand
+      new_level = new_level.to_i
 
-      # increase Inventory when positive delta
-      if delta_units > 0
+      # increase Inventory when
+      if new_level > on_hand
         # fill backordered orders before creating new units
-        inventory_units.with_state("backordered").slice(0, delta_units).each do |iu|
+        inventory_units.with_state("backordered").slice(0, new_level).each do |iu|
           iu.fill_backorder
-          delta_units -= 1
+          new_level -= 1
         end
       end
 
-      self.count_on_hand += delta_units
+      self.count_on_hand = new_level
     else
       raise "Cannot set on_hand value when Spree::Config[:track_inventory_levels] is false"
     end

data/app/views/admin/adjustments/index.html.erb

@@ -1,34 +1,4 @@
-<div class='toolbar'>
-  <ul class='actions'>
-    <li>
-      <%= button_link_to t("new_adjustment"), new_admin_order_adjustment_url(@order), :icon => 'add' %>
-    </li>
-  </ul>
-  <br class='clear' />
-</div>
-
+<%= render 'admin/shared/new_adjustment_button' %>
 <%= render :partial => 'admin/shared/order_tabs', :locals => {:current => "Adjustments"} %>
-
-<table class="index">
-  <tr>
-    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t("description") %></th>
-    <th><%= t("amount") %></th>
-    <th></th>
-  </tr>
-  <% @adjustments.each do |adjustment| %>
-    <tr id="<%= dom_id(adjustment) %>">
-      <td><%= adjustment.created_at.to_s(:date_time24) %></td>
-      <td><%= adjustment.label %></td>
-      <td><%= number_to_currency(adjustment.amount) %></td>
-      <td>
-        <%= link_to_edit adjustment %>
-        &nbsp;
-        <%= link_to_delete adjustment %>
-      </td>
-
-    </tr>
-  <% end %>
-</table>
-
+<%= render 'admin/shared/adjustments_table' %>
 <%= button_link_to t('continue'), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url %>

data/app/views/admin/configurations/index.html.erb

@@ -14,7 +14,7 @@
         <td><%= t("general_settings_description") %></td>
       </tr>
       <tr>
-        <td><%= link_to t("mail_server_settings"), admin_mail_settings_path %></td>
+        <td><%= link_to t("mail_methods"), admin_mail_methods_path %></td>
         <td><%= t("email_server_settings_description") %></td>
       </tr>
       <tr>
@@ -32,11 +32,11 @@
       <tr>
         <td><%= link_to t("payment_methods"), admin_payment_methods_path %></td>
         <td><%= t("payment_methods_setting_description") %></td>
-      </tr>   
+      </tr>
       <tr>
         <td><%= link_to t("taxonomies"), admin_taxonomies_path %></td>
         <td><%= t("taxonomies_setting_description") %></td>
-      </tr> 
+      </tr>
       <tr>
         <td><%= link_to t("shipping_methods"), admin_shipping_methods_path %></td>
         <td><%= t("shipping_methods_description") %></td>

data/app/views/admin/mail_methods/_form.html.erb

@@ -0,0 +1,96 @@
+<div class="yui-g">
+
+  <div class="yui-u first">
+
+    <fieldset>
+      <legend><%= t('general') %></legend>
+
+      <p>
+        <label><%=t("environment")%></label>
+        <br/>
+        <%= f.collection_select(:environment,
+                                Configuration.configurations.keys.sort,
+                                :to_s, :titleize,
+                                {}, {:id => "gtwy-env"}) %>
+      </p>
+
+      <p>
+        <%= f.check_box :preferred_enable_mail_delivery, {:style => "vertical-align:middle;"} %>
+        <label>
+          <%= t('enable_mail_delivery') %>
+        </label>
+      </p>
+
+      <p>
+        <label><%= t('send_mails_as') %></label><br />
+        <%= f.text_field :preferred_mails_from, :size => 40, :maxlength => 256 %>
+        <br/>
+        <span class="info">
+          <%= t("smtp_send_all_emails_as_from_following_address") %>
+        </span>
+      </p>
+
+      <p>
+        <label><%= t('send_copy_of_all_mails_to') %></label><br />
+        <%= f.text_field :preferred_mail_bcc, :size => 40, :maxlength => 256 %>
+        <br/>
+        <span class="info">
+          <%= t("smtp_send_copy_to_this_addresses") %>
+        </span>
+      </p>
+
+      <p>
+        <label><%= t('intercept_email_address') %></label><br />
+        <%= f.text_field :preferred_intercept_email, :size => 40, :maxlength => 256 %>
+        <br/>
+        <span class="info">
+          <%= t("intercept_email_instructions") %>
+        </span>
+      </p>
+
+    </fieldset>
+
+  </div>
+
+  <div class="yui-u">
+
+    <fieldset>
+      <legend><%= t('smtp') %></legend>
+      <p>
+        <label><%= t("smtp_domain") %></label><br />
+        <%= f.text_field :preferred_mail_domain %>
+      </p>
+      <p>
+        <label><%= t('smtp_mail_host') %></label><br />
+        <%= f.text_field :preferred_mail_host %>
+      </p>
+      <p>
+        <label><%= t('smtp_port') %></label><br />
+        <%= f.text_field :preferred_mail_port %>
+      </p>
+      <p>
+        <label><%= t('secure_connection_type')  %></label><br />
+        <%= f.collection_select(:preferred_secure_connection_type,
+                                MailMethod::SECURE_CONNECTION_TYPES,
+                                :to_s, :to_s,
+                                {}, {"style" => "width:200px"}) %>
+      <p>
+        <label><%= t('smtp_authentication_type') %></label><br />
+        <%= f.collection_select(:preferred_mail_auth_type,
+                                MailMethod::MAIL_AUTH,
+                                :to_s, :to_s,
+                                {}, {"style" => "width:200px"}) %>
+      </p>
+      <p>
+        <label><%= t('smtp_username') %></label><br />
+        <%= f.text_field :preferred_smtp_username %>
+      </p>
+      <p>
+        <label><%= t('smtp_password') %></label><br />
+        <%= f.password_field :preferred_smtp_password %>
+      </p>
+    </fieldset>
+
+  </div>
+
+</div>