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

2018-03-15 10:31:38 +06:30
parent 6ec03e3454 68a27ffcc7
commit a2d1fc06be
6 changed files with 83 additions and 30 deletions
--- a/db/migrate/20170628103624_create_print_settings.rb
+++ b/db/migrate/20170628103624_create_print_settings.rb
@@ -6,13 +6,13 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
      t.string  :template  
      t.string  :font, :default => ""    
      t.string  :printer_name, :null => false
-      t.string  :api_settings,
+      t.string  :api_settings
      t.string  :brand_name
      t.string  :type
      t.decimal :page_width, :null => false, :default => 210
      t.decimal :page_height, :null => false, :default => 1450
      t.integer :print_copies, :null => false, :default => 1
-      t.string :precision
+      t.string  :precision
      t.boolean :delimiter
      t.integer :heading_space