Skip to content

Commit

Permalink
order generation from cart done, destroying pending orders when new o…
Browse files Browse the repository at this point in the history
…rder is created in same cart
  • Loading branch information
vala committed Mar 25, 2013
1 parent 6962e64 commit 3df92d4
Show file tree
Hide file tree
Showing 22 changed files with 234 additions and 442 deletions.
64 changes: 0 additions & 64 deletions app/controllers/glysellin/orders_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module Glysellin
class OrdersController < MainController
protect_from_forgery :except => :gateway_response
before_filter :init_order!

def index
@orders = Order.from_customer(current_user)
Expand All @@ -17,63 +16,6 @@ def show
end
end

def create_from_cart
order = Order.create_from_cart(current_cart, current_user)

if order.save
redirect_to :action => order.next_step, :id => order.ref
else
redirect_to :back
end
end

def process_order
@order = Order.from_sub_forms(params[:glysellin_order], params[:id])

if @order.save
next_step = @order.next_step

if @order.next_step == ORDER_STEP_PAYMENT
if Glysellin.send_email_on_check_order_placed && @order.paid_by_check?
OrderAdminMailer.send_check_order_created_email(@order).deliver
end
p @order
OrderCustomerMailer.send_order_created_email(@order).deliver
end
redirect_to :action => @order.next_step.to_s, :id => @order.ref
else
render @order.next_step.to_s
end
end


def cart
end

def validate
end

def addresses
@order.init_addresses!
end

def validate_addresses
end

def shipping_method
@shipping_methods = Glysellin::ShippingMethod.all
end

def payment_method
@order.init_payment!
end

def payment
cookies["glysellin.cart"] = { :value => '', :path => '/' }
end

def offline_payment
end

def gateway_response
g = PaymentMethod.gateway(params[:goid] ? {:order_id => params[:goid]} : {:raw_post => request.raw_post, :gateway => params[:gateway]})
Expand All @@ -98,11 +40,5 @@ def payment_response
@order = Order.find_by_ref(params[:id])
end
end

protected

def init_order!
@order = Order.find_by_ref(params[:id]) if params[:id]
end
end
end
Loading

0 comments on commit 3df92d4

Please sign in to comment.