Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant

# Conflicts: # app/models/order_item.rb
2017-06-04 16:37:13 +06:30
parent ad44d9d0e3 db904739ac
commit eb74eb2a2d
33 changed files with 365 additions and 108 deletions
--- a/app/models/order_item.rb
+++ b/app/models/order_item.rb
@@ -41,6 +41,7 @@ class OrderItem < ApplicationRecord
    order_details = OrderItem.select("order_items.item_name,order_items.qty,order_items.price,(order_items.qty*order_items.price) as total_price")
         .joins("left join orders on orders.id = order_items.order_id")
         .where("order_items.order_id=?",order_id)
+          
  end

  private