Merge branch 'quick_service'

2018-03-05 13:56:23 +06:30
parent c1b112636c 01d217fd0f
commit 87b51dbf82
11 changed files with 75 additions and 167 deletions
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -52,7 +52,7 @@ class MenuCategory < ApplicationRecord
    if from > to
      h = to_t.hour
      if h < 12 # before noon
-        if h = 0
+        if h == 0
          to = 24
          to = to * 3600 + to_t.min* 60 + to_t.sec
        end