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

app/views/origami/surveys/_form.html.erb

@@ -9,7 +9,7 @@
             <div class="row clearfix">
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">
                 <div class="form-group p-l-10 p-r-10">
-    
+                   <%= f.input :child, input_html: { value: @survey_data.child, class: 'col-md-10', :onChange => "total_customer();" }%>
                 </div>
               </div>
               <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 ">

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end