@@ -9,7 +9,7 @@ class OrdersController < Spree::BaseController helper :products - create.after do + create.before do params[:products].each do |product_id,variant_id| quantity = params[:quantity].to_i if !params[:quantity].is_a?(Array) quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Array) @@ -20,9 +20,7 @@ class OrdersController < Spree::BaseController quantity = quantity.to_i @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0 end if params[:variants] - - @order.save - + # store order token in the session session[:order_token] = @order.token end @@ -30,15 +28,17 @@ class OrdersController < Spree::BaseController # override the default r_c behavior (remove flash - redirect to edit details instead of show) create do flash nil - wants.html {redirect_to edit_order_url(@order)} + success.wants.html {redirect_to edit_order_url(@order)} + failure.wants.html { render :template => "orders/edit" } end - + # override the default r_c flash behavior - update.flash nil - update.response do |wants| - wants.html {redirect_to edit_order_url(object)} + update do + flash nil + success.wants.html { redirect_to edit_order_url(object) } + failure.wants.html { render :template => "orders/edit" } end - + #override r_c default b/c we don't want to actually destroy, we just want to clear line items def destroy flash[:notice] = I18n.t(:basket_successfully_cleared) @@ -60,13 +60,13 @@ class OrdersController < Spree::BaseController end private - def build_object + def build_object @object ||= find_order end def object - return Order.find_by_number(params[:id]) if params[:id] - find_order + @object ||= Order.find_by_number(params[:id]) if params[:id] + return @object || find_order end def prevent_editing_complete_order app/controllers/orders_controller.rb @@ -11,7 +11,7 @@ class LineItem < ActiveRecord::Base validates_numericality_of :quantity, :only_integer => true, :message => "must be an integer" validates_numericality_of :price - attr_accessible :quantity + attr_accessible :quantity, :variant_id, :order_id def copy_price self.price = variant.price if variant && self.price.nil? app/models/line_item.rb @@ -41,8 +41,7 @@ class Order < ActiveRecord::Base delegate :email, :to => :checkout delegate :ip_address, :to => :checkout delegate :special_instructions, :to => :checkout - - validates_associated :line_items, :message => "are not valid" + validates_numericality_of :item_total validates_numericality_of :total app/models/order.rb @@ -1,3 +1,4 @@ +<%= error_messages_for :order %> <table id="cart"> <thead> <tr> app/views/orders/_form.html.erb @@ -1,5 +1,7 @@ <tr class="<%= cycle('', 'alt') %>"> <td> + <%= item_form.hidden_field :variant_id %> + <%= item_form.hidden_field :order_id %> <% if variant.images.length == 0 %> <%= small_image(variant.product) %> <% else %> app/views/orders/_line_item.html.erb 40c5598ece6b20d0f270a5fe9519c8b618054e48 Brian Quinn briandquinn@gmail.com http://github.com/railsdog/spree/commit/14f5c79b6c0dc71dca2314a1caabf0c66d328477 14f5c79b6c0dc71dca2314a1caabf0c66d328477 2009-11-04T10:23:10-08:00 2009-11-04T10:23:10-08:00 Ensure AR errors are displayed on add/update of cart [#862 state:resolved] f12af0e50e40b1b92b623ff13df3b359898a733b Brian Quinn briandquinn@gmail.com