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

app/models/print_setting.rb

@@ -1,6 +1,6 @@
 class PrintSetting < ApplicationRecord
 	# validations
-	validates_presence_of :name, :unique_code, :printer_name, :brand_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size
+	validates_presence_of :name, :unique_code, :printer_name, :api_settings, :page_width, :page_height, :print_copies, :header_font_size, :item_font_size
 
 	def self.get_precision_delimiter
 		PrintSetting.find_by_unique_code("ReceiptBillPdf")

app/views/origami/home/index.html.erb

@@ -140,9 +140,7 @@
 <script>
 $(document).ready(function(){
   var webview = <%= @webview %>;
-  if(webview){
-    code2lab.checkMobile(webview); //js func: for mobile login
-  }
+
   showHideNavbar(webview,"index");
 
   $(".tables").on('click', function(){