Remove double update_order call for order.cancel()
cleanup/clarify return view redirect code