fixed routes.rb
displays error messages with labels when you update cart poorly
total price for order updates when order item quantity updates
merging order
Merge branch 'order'