spree_core 0.30.0.beta1 → 0.30.0

data/app/controllers/admin/return_authorizations_controller.rb

@@ -1,10 +1,6 @@
 class Admin::ReturnAuthorizationsController < Admin::BaseController
   resource_controller
   belongs_to :order
-  ssl_required
-
-  new_action.before :returnable_units
-  edit.before :returnable_units
 
   update.wants.html { redirect_to collection_url }
   create.wants.html { redirect_to collection_url }
@@ -21,16 +17,7 @@ class Admin::ReturnAuthorizationsController < Admin::BaseController
   end
 
   private
-  def returnable_units
-    @returnable_units = @return_authorization.order.returnable_units
-    @returnable_units = {} if @returnable_units.nil?
-
-    @returned_units =  @return_authorization.inventory_units.group_by(&:variant_id)
-  end
-
-
-
-  def associate_inventory_units
-    params[:return_quantity].each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
-  end
+    def associate_inventory_units
+      params[:return_quantity].each { |variant_id, qty| @return_authorization.add_variant(variant_id.to_i, qty.to_i) }
+    end
 end

data/app/controllers/admin/shipments_controller.rb

@@ -1,15 +1,14 @@
 class Admin::ShipmentsController < Admin::BaseController
-  before_filter :load_data, :except => :country_changed
-  before_filter :require_object_editable_by_current_user, :only => [:update]
+  before_filter :load_data, :except => [:country_changed, :index]
 
   resource_controller
   belongs_to :order
 
   update.wants.html do
-    if @order.in_progress?
-      redirect_to admin_order_adjustments_url(@order)
-    else
+    if @order.completed?
       redirect_to edit_object_url
+    else
+      redirect_to admin_order_adjustments_url(@order)
     end
   end
 
@@ -23,7 +22,6 @@ class Admin::ShipmentsController < Admin::BaseController
   update.after :update_after
 
   create.before :assign_inventory_units
-  create.after :recalculate_order
 
   destroy.success.wants.js { render_js_for_destroy }
 
@@ -45,35 +43,27 @@ class Admin::ShipmentsController < Admin::BaseController
 
   def load_data
     load_object
-    @selected_country_id = params[:shipment_presenter][:address_country_id].to_i if params.has_key?('shipment_presenter')
     @selected_country_id ||= @order.bill_address.country_id unless @order.nil? || @order.bill_address.nil?
     @selected_country_id ||= Spree::Config[:default_country_id]
     @shipping_methods = ShippingMethod.all_available(@order, :back_end)
 
     @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')
-    @countries = Checkout.countries.sort
-    @countries = [Country.find(Spree::Config[:default_country_id])] if @countries.empty?
+    @countries = available_countries
   end
 
   def edit_before # copy into instance variable before editing
-    @shipment.special_instructions = @order.checkout.special_instructions
+    @shipment.special_instructions = @order.special_instructions
   end
 
   def update_after # copy back to order if instructions are enabled
-    @order.checkout.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
-    @order.checkout.shipping_method = @order.shipment.shipping_method
+    @order.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
+    @order.shipping_method = @order.shipment.shipping_method
     @order.save
-    recalculate_order
   end
 
   def assign_inventory_units
     return unless params.has_key? :inventory_units
-    #params[:inventory_units].each { |id, value| @shipment.inventory_units << InventoryUnit.find(id) }
     @shipment.inventory_unit_ids = params[:inventory_units].keys
   end
 
-  def recalculate_order
-    @shipment.recalculate_order if params[:recalculate]
-  end
-
 end

data/app/controllers/admin/taxons_controller.rb

@@ -38,13 +38,13 @@ class Admin::TaxonsController < Admin::BaseController
     @product.taxons.delete(@taxon)
     @product.save
     @taxons = @product.taxons
-    render :layout => false
+    render_js_for_destroy
   end
 
   def select
     @product = Product.find_by_param!(params[:product_id])
-    taxon = Taxon.find(params[:id])
-    @product.taxons << taxon
+    @taxon = Taxon.find(params[:id])
+    @product.taxons << @taxon
     @product.save
     @taxons = @product.taxons
     render :layout => false

data/app/controllers/admin/users_controller.rb

@@ -1,5 +1,6 @@
 class Admin::UsersController < Admin::BaseController
   resource_controller
+  before_filter :check_json_authenticity, :only => :index
   before_filter :load_roles, :only => [:edit, :new, :update, :create]
 
   create.after :save_user_roles
@@ -9,7 +10,7 @@ class Admin::UsersController < Admin::BaseController
     wants.html { render :action => :index }
     wants.json { render :json => json_data }
   end
-  
+
   destroy.success.wants.js { render_js_for_destroy }
 
   private
@@ -21,12 +22,12 @@ class Admin::UsersController < Admin::BaseController
     when 'basic'
       collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
     else
-      collection.to_json(:include => 
-        {:bill_address => {:include => [:state, :country]}, 
+      collection.to_json(:include =>
+        {:bill_address => {:include => [:state, :country]},
         :ship_address => {:include => [:state, :country]}})
     end
   end
-  
+
   def collection
     return @collection if @collection.present?
     unless request.xhr?

data/app/controllers/checkout_controller.rb

@@ -2,21 +2,40 @@
 # Checkout object.  There's enough distinct logic specific to checkout which has nothing to do with updating an
 # order that this approach is waranted.
 class CheckoutController < Spree::BaseController
+  ssl_required
 
   before_filter :load_order
 
   # Updates the order and advances to the next state (when possible.)
   def update
     if @order.update_attributes(object_params)
-      if @order.can_next? and @order.next
+      if @order.next
+        state_callback(:after)
+      else
+        flash[:error] = I18n.t(:payment_processing_failed)
         redirect_to checkout_state_path(@order.state) and return
       end
+
+      if @order.state == "complete" or @order.completed?
+        flash[:notice] = I18n.t(:order_processed_successfully)
+        flash[:commerce_tracking] = "nothing special"
+        redirect_to completion_route
+      else
+        redirect_to checkout_state_path(@order.state)
+      end
+
+    else
+      render :edit
     end
-    render :edit
   end
 
   private
 
+  # Provides a route to redirect after order completion
+  def completion_route
+    order_path(@order)
+  end
+
   def object_params
     # For payment step, filter order parameters to produce the expected nested attributes for a single payment and its source, discarding attributes for payment methods other than the one selected
     if @order.payment?
@@ -33,12 +52,7 @@ class CheckoutController < Spree::BaseController
   def load_order
     @order = current_order
     redirect_to cart_path and return unless @order and @order.checkout_allowed?
-    if @order.complete?
-      session[:order_id] = nil
-      unless params[:state] == 'complete'
-        redirect_to cart_path and return
-      end
-    end
+    redirect_to cart_path and return if @order.completed?
     @order.state = params[:state] if params[:state]
     state_callback(:before)
   end
@@ -61,6 +75,10 @@ class CheckoutController < Spree::BaseController
     current_order.payments.destroy_all if request.put?
   end
 
+  def after_complete
+    session[:order_id] = nil
+  end
+
   def default_country
     Country.find Spree::Config[:default_country_id]
   end

data/app/controllers/orders_controller.rb

@@ -1,11 +1,15 @@
 class OrdersController < Spree::BaseController
-  ssl_required :show
 
   helper :products
 
+  def show
+    @order = Order.find_by_number(params[:id])
+  end
+
   def update
     @order = current_order
     if @order.update_attributes(params[:order])
+      @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
       redirect_to cart_path
     else
       render :edit
@@ -14,7 +18,7 @@ class OrdersController < Spree::BaseController
 
   # Shows the current incomplete order from the session
   def edit
-    @order = current_order
+    @order = current_order(true)
   end
 
   # Adds a new item to the order (creating a new order if none already exists)
@@ -24,14 +28,23 @@ class OrdersController < Spree::BaseController
   # * Single variant/quantity pairing
   # +:variants => {variant_id => quantity}+
   #
-  # * Multiple products at once (TODO double check this is correct)
-  # +:products => {product_id => {variant_id => {:quantity => quantity}, variant_id => {:quantity => quantity}, ...} +
-  # +:products => {product_id => {variant_id => {:quantity => [:variant_id => quantity, :variant_id => quantity, ...] }+
+  # * Multiple products at once
+  # +:products => {product_id => variant_id, product_id => variant_id}, :quantity => quantity +
+  # +:products => {product_id => variant_id, product_id => variant_id}}, :quantity => {variant_id => quantity, variant_id => quantity}+
   def populate
     @order = current_order(true)
+
+    params[:products].each do |product_id,variant_id|
+      quantity = params[:quantity].to_i if !params[:quantity].is_a?(Hash)
+      quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Hash)
+      @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
+    end if params[:products]
+
     params[:variants].each do |variant_id, quantity|
-      @order.add_variant(Variant.find(variant_id), quantity.to_i) #if quantity > 0
+      quantity = quantity.to_i
+      @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
     end if params[:variants]
+
     redirect_to cart_path
   end
 
@@ -42,8 +55,7 @@ class OrdersController < Spree::BaseController
     redirect_to cart_path
   end
 
-  #
-  # def accurate_title
-  #   I18n.t(:shopping_cart)
-  # end
+  def accurate_title
+    I18n.t(:shopping_cart)
+  end
 end

data/app/controllers/password_resets_controller.rb

@@ -1,5 +1,4 @@
 class PasswordResetsController < Spree::BaseController
-  before_filter :require_no_user
   before_filter :load_user_using_perishable_token, :only => [:edit, :update]
 
   def new

data/app/controllers/products_controller.rb

@@ -8,8 +8,6 @@ class ProductsController < Spree::BaseController
   helper :taxons
   actions :show, :index
 
-  include Spree::Search
-
   private
 
   def load_data
@@ -29,7 +27,8 @@ class ProductsController < Spree::BaseController
   end
 
   def collection
-    retrieve_products
+    @searcher = Spree::Config.searcher_class.new(params)
+    @products = @searcher.retrieve_products
   end
 
   def accurate_title

data/app/controllers/spree/base_controller.rb

@@ -108,4 +108,12 @@ class Spree::BaseController < ActionController::Base
     locale = I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
     I18n.locale = locale.to_sym
   end
+  
+  helper_method :available_countries
+  
+  def available_countries
+    return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
+    zone.country_list
+  end
+  
 end

data/app/controllers/taxons_controller.rb

@@ -1,16 +1,16 @@
 class TaxonsController < Spree::BaseController
-  prepend_before_filter :reject_unknown_object, :only => [:show]
+  #prepend_before_filter :reject_unknown_object, :only => [:show]
   before_filter :load_data, :only => :show
   resource_controller
   actions :show
   helper :products
 
-  include Spree::Search
-
   private
   def load_data
     @taxon ||= object
-    retrieve_products
+    params[:taxon] = @taxon.id
+    @searcher = Spree::Config.searcher_class.new(params)
+    @products = @searcher.retrieve_products
   end
 
   def object

data/app/helpers/admin/navigation_helper.rb

@@ -48,16 +48,17 @@ module Admin::NavigationHelper
   end
 
   def link_to_delete(resource, options = {})
-    options.assert_valid_keys(:url, :caption, :title, :dataType, :success)
+    options.assert_valid_keys(:url, :caption, :title, :dataType, :success, :name)
 
     options.reverse_merge! :url => object_url(resource) unless options.key? :url
     options.reverse_merge! :caption => t('are_you_sure')
     options.reverse_merge! :title => t('confirm_delete')
     options.reverse_merge! :dataType => 'script'
     options.reverse_merge! :success => "function(r){ jQuery('##{dom_id resource}').fadeOut('hide'); }"
+    options.reverse_merge! :name => icon("delete") + ' ' + t("delete")
 
     #link_to_with_icon('delete', t("delete"), object_url(resource), :confirm => t('are_you_sure'), :method => :delete )
-    link_to_function icon("delete") + ' ' + t("delete"), "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
+    link_to_function options[:name], "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
       if(r){
         jQuery.ajax({
           type: 'POST',
@@ -134,7 +135,7 @@ module Admin::NavigationHelper
       <td>#{link_to(link_text, url)}</td>
       <td>#{description}</td>
     </tr>
-    )
+    ).html_safe
   end
 
 end

data/app/helpers/checkout_helper.rb

@@ -3,7 +3,7 @@ module CheckoutHelper
   def checkout_progress
     states = %w(address delivery payment confirm complete)
     items = states.map do |state|
-      text = t("checkout_steps.#{state}")
+      text = t("order_state.#{state}").titleize
 
       css_classes = []
       current_index = states.index(@order.state)
@@ -24,9 +24,4 @@ module CheckoutHelper
     content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@order.state}")
   end
 
-  def available_countries
-    return Country.all unless zone = Zone.find_by_name(Spree::Config[:checkout_zone])
-    zone.country_list
-  end
-
 end

data/app/helpers/spree/base_helper.rb

@@ -8,6 +8,7 @@ module Spree::BaseHelper
       css_class = 'empty'
     else
       text = "#{text}: (#{current_order.item_count}) #{order_price(current_order)}"
+      css_class = 'full'
     end
     link_to text, cart_path, :class => css_class
   end
@@ -88,4 +89,5 @@ module Spree::BaseHelper
   def logo(image_path=Spree::Config[:logo])
     link_to image_tag(image_path), root_path
   end
+  
 end

data/app/mailers/order_mailer.rb

@@ -0,0 +1,19 @@
+class OrderMailer < ActionMailer::Base
+  helper "spree/base"
+
+  def confirm_email(order, resend=false)
+    @order = order
+    subject = (resend ? "[RESEND] " : "")
+    subject += "#{Spree::Config[:site_name]} Order Confirmation ##{order.number}"
+    mail(:to => order.email,
+         :subject => subject)
+  end
+
+  def cancel_email(order, resend=false)
+    @order = order
+    subject = (resend ? "[RESEND] " : "")
+    subject += "#{Spree::Config[:site_name]} Cancellation of Order ##{order.number}"
+    mail(:to => order.email,
+         :subject => subject)
+  end
+end

data/app/mailers/shipment_mailer.rb

@@ -0,0 +1,11 @@
+class ShipmentMailer < ActionMailer::Base
+  helper "spree/base"
+
+  def shipped_email(shipment, resend=false)
+    @shipment = shipment
+    subject = (resend ? "[RESEND] " : "")
+    subject += "#{Spree::Config[:site_name]} Shipment Notification ##{shipment.order.number}"
+    mail(:to => shipment.order.email,
+         :subject => subject)
+  end
+end

data/app/models/address.rb

@@ -2,8 +2,6 @@ class Address < ActiveRecord::Base
   belongs_to :country
   belongs_to :state
 
-  has_many :billing_checkouts, :foreign_key => "bill_address_id", :class_name => "Checkout"
-  has_many :shipping_checkouts, :foreign_key => "ship_address_id", :class_name => "Checkout"
   has_many :shipments
 
   validates :firstname, :lastname, :address1, :city, :zipcode, :country, :phone, :presence => true
@@ -11,10 +9,6 @@ class Address < ActiveRecord::Base
   validates :state_name, :presence => true, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
   validate :state_name_validate, :if => Proc.new { |address| address.state.blank? && Spree::Config[:address_requires_state] }
 
-  def checkouts
-    (billing_checkouts + shipping_checkouts).uniq
-  end
-
   # disconnected since there's no code to display error messages yet OR matching client-side validation
   def phone_validate
     return if phone.blank?
@@ -38,9 +32,9 @@ class Address < ActiveRecord::Base
   end
 
   # can modify an address if it's not been used in an order (but checkouts controller has finer control)
-  def editable?
-    new_record? || (shipments.empty? && checkouts.empty?)
-  end
+  # def editable?
+  #   new_record? || (shipments.empty? && checkouts.empty?)
+  # end
 
   def full_name
     self.firstname + " " + self.lastname