Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

app/models/product.rb

@@ -0,0 +1,3 @@
+class Product < ApplicationRecord
+  validates_presence_of :name
+end

app/models/promotion.rb

@@ -0,0 +1,2 @@
+class Promotion < ApplicationRecord
+end

app/models/sale.rb

@@ -267,7 +267,7 @@ class Sale < ApplicationRecord
     rounding_adjustment = 0
 
     sales_items.each do |item|
-      if item.remark != 'void'
+      if item.remark != 'void' && item.remark != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
         total_taxable = total_taxable + item.price