diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index cc5fac3f..ef213ddd 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -8,8 +8,10 @@ class Origami::OrdersController < BaseOrigamiController @order = Order.find(params[:order_id]) sale_order = SaleOrder.find_by_order_id(@order.order_id) if sale_order - sale = Sale.find(sale_order.sale_id) - @sale_status = sale.sale_status + unless sale_order.sale_id.nil? + sale = Sale.find(sale_order.sale_id) + @sale_status = sale.sale_status + end end end end diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index d2c065a1..5ecb56d1 100644 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -95,10 +95,12 @@ order_status = "" sale_order = SaleOrder.find_by_order_id(order) if sale_order - sale = Sale.find(sale_order.sale_id) - order_status = sale.sale_status - if order_status == 'new' - order_status = order.status + unless sale_order.sale_id.nil? + sale = Sale.find(sale_order.sale_id) + order_status = sale.sale_status + if order_status == 'new' + order_status = order.status + end end else order_status = order.status