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

2018-01-23 15:14:20 +06:30
parent 4248e53517 f6b92ad111
commit 46c6998738
3 changed files with 10 additions and 10 deletions
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -37,11 +37,11 @@ if (@booking)

    json.order_items order_items do |item|
      # For YGN BBQ
-      if item.item_code == "P00001"
+      if item.item_code.include? ("PSA_")
        adult_count += item.qty 
        adult_spent += (item.price * item.qty)       
      end
-      if item.item_code == "P00002"
+      if item.item_code.include? ("PSC_")
        child_count += item.qty
        child_spent += (item.price * item.qty)  
      end