diff --git a/.gitignore b/.gitignore
index 5dafee53..42a48b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,6 @@ dump.rdb
 
 # Fonts 
 public/fonts/*
+
+# Ruby-Mine IDE folder
+/.idea
diff --git a/.idea/.generators b/.idea/.generators
index 16189766..d2c02fb2 100644
--- a/.idea/.generators
+++ b/.idea/.generators
@@ -5,4 +5,4 @@ You are allowed to:
 2. Remove generators
 3. Add installed generators
 To add new installed generators automatically delete this file and reload the project.
---><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
+--><GeneratorsGroup><Generator name="assets" /><Generator name="cancan:ability" /><Generator name="channel" /><Generator name="coffee:assets" /><Generator name="controller" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="js:assets" /><Generator name="kaminari:config" /><Generator name="kaminari:views" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="resource" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="sidekiq:worker" /><Generator name="simple_form:install" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></GeneratorsGroup></Settings>
diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks
index 3577d8ad..bc783dc5 100644
--- a/.idea/.rakeTasks
+++ b/.idea/.rakeTasks
@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="app"><RakeTask description="Applies the template supplied by LOCATION=(/path/to/template) or URL" fullCmd="app:template" taksId="template" /><RakeTask description="Update configs and some other initially generated files (or use just update:configs or update:bin)" fullCmd="app:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="app:templates:copy" taksId="copy" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="app:update:bin" taksId="bin" /><RakeTask description="" fullCmd="app:update:configs" taksId="configs" /><RakeTask description="" fullCmd="app:update:upgrade_guide_info" taksId="upgrade_guide_info" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="assets"><RakeTask description="Remove old compiled assets" fullCmd="assets:clean[keep]" taksId="clean[keep]" /><RakeTask description="Remove compiled assets" fullCmd="assets:clobber" taksId="clobber" /><RakeTask description="Load asset compile environment" fullCmd="assets:environment" taksId="environment" /><RakeTask description="Compile all the assets named in config.assets.precompile" fullCmd="assets:precompile" taksId="precompile" /><RakeTask description="" fullCmd="assets:clean" taksId="clean" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="autoprefixer"><RakeTask description="Show selected browsers and prefixed CSS properties and values" fullCmd="autoprefixer:info" taksId="info" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="cache_digests"><RakeTask description="Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="cache_digests:dependencies" taksId="dependencies" /><RakeTask description="Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="cache_digests:nested_dependencies" taksId="nested_dependencies" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="clear"><RakeTask description="Clear Data" fullCmd="clear:data" taksId="data" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="environment"><RakeTask description="Set the environment value for the database" fullCmd="db:environment:set" taksId="set" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Loads fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="Clears a db/schema_cache.yml file" fullCmd="db:schema:cache:clear" taksId="clear" /><RakeTask description="Creates a db/schema_cache.yml file" fullCmd="db:schema:cache:dump" taksId="dump" /></RakeGroup><RakeTask description="Creates a db/schema.rb file that is portable against any DB supported by Active Record" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Loads a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /><RakeTask description="" fullCmd="db:schema:load_if_ruby" taksId="load_if_ruby" /></RakeGroup><RakeTask description="Loads the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Creates the database, loads the schema, and initializes with the seed data (use db:reset to also drop the database first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dumps the database structure to db/structure.sql" fullCmd="db:structure:dump" taksId="dump" /><RakeTask description="Recreates the databases from the structure.sql file" fullCmd="db:structure:load" taksId="load" /><RakeTask description="" fullCmd="db:structure:load_if_sql" taksId="load_if_sql" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeTask description="" fullCmd="db:_dump" taksId="_dump" /><RakeTask description="" fullCmd="db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="db:charset" taksId="charset" /><RakeTask description="" fullCmd="db:check_protected_environments" taksId="check_protected_environments" /><RakeTask description="" fullCmd="db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:_unsafe" taksId="_unsafe" /><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:forward" taksId="forward" /><RakeTask description="" fullCmd="db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="db:purge" taksId="purge" /><RakeGroup description="" fullCmd="" taksId="purge"><RakeTask description="" fullCmd="db:purge:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="db:test:load" taksId="load" /><RakeTask description="" fullCmd="db:test:load_schema" taksId="load_schema" /><RakeTask description="" fullCmd="db:test:load_structure" taksId="load_structure" /><RakeTask description="" fullCmd="db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="dev"><RakeTask description="Toggle development mode caching on/off" fullCmd="dev:cache" taksId="cache" /></RakeGroup><RakeTask description="Print out all defined initializers in the order they are invoked by Rails" fullCmd="initializers" taksId="initializers" /><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)" fullCmd="log:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="menu"><RakeTask description="Clear Data" fullCmd="menu:bitp" taksId="bitp" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="notes:custom" taksId="custom" /><RakeTask description="" fullCmd="notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="notes:todo" taksId="todo" /></RakeGroup><RakeTask description="Restart app by touching tmp/restart.txt" fullCmd="restart" taksId="restart" /><RakeTask description="Print out all defined routes in match order, with names" fullCmd="routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="secret" taksId="secret" /><RakeTask description="Run all specs in spec directory (excluding plugin specs)" fullCmd="spec" taksId="spec" /><RakeGroup description="" fullCmd="" taksId="spec"><RakeTask description="Run the code examples in spec/controllers" fullCmd="spec:controllers" taksId="controllers" /><RakeTask description="Run the code examples in spec/helpers" fullCmd="spec:helpers" taksId="helpers" /><RakeTask description="Run the code examples in spec/jobs" fullCmd="spec:jobs" taksId="jobs" /><RakeTask description="Run the code examples in spec/models" fullCmd="spec:models" taksId="models" /><RakeTask description="Run the code examples in spec/requests" fullCmd="spec:requests" taksId="requests" /><RakeTask description="Run the code examples in spec/routing" fullCmd="spec:routing" taksId="routing" /><RakeTask description="Run the code examples in spec/views" fullCmd="spec:views" taksId="views" /><RakeTask description="" fullCmd="spec:prepare" taksId="prepare" /><RakeTask description="" fullCmd="spec:statsetup" taksId="statsetup" /></RakeGroup><RakeTask description="Report code statistics (KLOCs, etc) from the application or engine" fullCmd="stats" taksId="stats" /><RakeTask description="Runs all tests in test folder except system ones" fullCmd="test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests quickly, but also reset db" fullCmd="test:db" taksId="db" /><RakeTask description="" fullCmd="test:controllers" taksId="controllers" /><RakeTask description="" fullCmd="test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="test:generators" taksId="generators" /><RakeTask description="" fullCmd="test:helpers" taksId="helpers" /><RakeTask description="" fullCmd="test:integration" taksId="integration" /><RakeTask description="" fullCmd="test:jobs" taksId="jobs" /><RakeTask description="" fullCmd="test:mailers" taksId="mailers" /><RakeTask description="" fullCmd="test:models" taksId="models" /><RakeTask description="" fullCmd="test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="test:run" taksId="run" /><RakeTask description="" fullCmd="test:system" taksId="system" /><RakeTask description="" fullCmd="test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeTask description="List all time zones, list by two-letter country code (`rails time:zones[US]`), or list by UTC offset (`rails time:zones[-8]`)" fullCmd="time:zones[country_or_offset]" taksId="zones[country_or_offset]" /><RakeTask description="" fullCmd="time:zones" taksId="zones" /><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="" fullCmd="time:zones:all" taksId="all" /><RakeTask description="" fullCmd="time:zones:local" taksId="local" /><RakeTask description="" fullCmd="time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear cache and socket files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear)" fullCmd="tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for cache, sockets, and pids" fullCmd="tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="yarn"><RakeTask description="Install all JavaScript dependencies as specified via Yarn" fullCmd="yarn:install" taksId="install" /></RakeGroup><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeGroup description="" fullCmd="" taksId="railties"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="railties:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="tmp" taksId="tmp" /><RakeTask description="" fullCmd="tmp/cache" taksId="tmp/cache" /><RakeTask description="" fullCmd="tmp/cache/assets" taksId="tmp/cache/assets" /><RakeTask description="" fullCmd="tmp/pids" taksId="tmp/pids" /><RakeTask description="" fullCmd="tmp/sockets" taksId="tmp/sockets" /></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="List versions of all Rails frameworks and the environment" fullCmd="about" taksId="about" /><RakeGroup description="" fullCmd="" taksId="app"><RakeTask description="Applies the template supplied by LOCATION=(/path/to/template) or URL" fullCmd="app:template" taksId="template" /><RakeTask description="Update configs and some other initially generated files (or use just update:configs or update:bin)" fullCmd="app:update" taksId="update" /><RakeGroup description="" fullCmd="" taksId="templates"><RakeTask description="" fullCmd="app:templates:copy" taksId="copy" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="update"><RakeTask description="" fullCmd="app:update:bin" taksId="bin" /><RakeTask description="" fullCmd="app:update:configs" taksId="configs" /><RakeTask description="" fullCmd="app:update:upgrade_guide_info" taksId="upgrade_guide_info" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="assets"><RakeTask description="Remove old compiled assets" fullCmd="assets:clean[keep]" taksId="clean[keep]" /><RakeTask description="Remove compiled assets" fullCmd="assets:clobber" taksId="clobber" /><RakeTask description="Load asset compile environment" fullCmd="assets:environment" taksId="environment" /><RakeTask description="Compile all the assets named in config.assets.precompile" fullCmd="assets:precompile" taksId="precompile" /><RakeTask description="" fullCmd="assets:clean" taksId="clean" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="autoprefixer"><RakeTask description="Show selected browsers and prefixed CSS properties and values" fullCmd="autoprefixer:info" taksId="info" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="cache_digests"><RakeTask description="Lookup first-level dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="cache_digests:dependencies" taksId="dependencies" /><RakeTask description="Lookup nested dependencies for TEMPLATE (like messages/show or comments/_comment.html)" fullCmd="cache_digests:nested_dependencies" taksId="nested_dependencies" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="clear"><RakeTask description="Clear Data" fullCmd="clear:data" taksId="data" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="db"><RakeTask description="Creates the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:create:all to create all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to creating the development and test databases" fullCmd="db:create" taksId="create" /><RakeTask description="Drops the database from DATABASE_URL or config/database.yml for the current RAILS_ENV (use db:drop:all to drop all databases in the config). Without RAILS_ENV or when RAILS_ENV is development, it defaults to dropping the development and test databases" fullCmd="db:drop" taksId="drop" /><RakeGroup description="" fullCmd="" taksId="environment"><RakeTask description="Set the environment value for the database" fullCmd="db:environment:set" taksId="set" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="fixtures"><RakeTask description="Loads fixtures into the current environment's database" fullCmd="db:fixtures:load" taksId="load" /><RakeTask description="" fullCmd="db:fixtures:identify" taksId="identify" /></RakeGroup><RakeTask description="Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)" fullCmd="db:migrate" taksId="migrate" /><RakeGroup description="" fullCmd="" taksId="migrate"><RakeTask description="Display status of migrations" fullCmd="db:migrate:status" taksId="status" /><RakeTask description="" fullCmd="db:migrate:down" taksId="down" /><RakeTask description="" fullCmd="db:migrate:redo" taksId="redo" /><RakeTask description="" fullCmd="db:migrate:reset" taksId="reset" /><RakeTask description="" fullCmd="db:migrate:up" taksId="up" /></RakeGroup><RakeTask description="Rolls the schema back to the previous version (specify steps w/ STEP=n)" fullCmd="db:rollback" taksId="rollback" /><RakeGroup description="" fullCmd="" taksId="schema"><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="Clears a db/schema_cache.yml file" fullCmd="db:schema:cache:clear" taksId="clear" /><RakeTask description="Creates a db/schema_cache.yml file" fullCmd="db:schema:cache:dump" taksId="dump" /></RakeGroup><RakeTask description="Creates a db/schema.rb file that is portable against any DB supported by Active Record" fullCmd="db:schema:dump" taksId="dump" /><RakeTask description="Loads a schema.rb file into the database" fullCmd="db:schema:load" taksId="load" /><RakeTask description="" fullCmd="db:schema:load_if_ruby" taksId="load_if_ruby" /></RakeGroup><RakeTask description="Loads the seed data from db/seeds.rb" fullCmd="db:seed" taksId="seed" /><RakeTask description="Creates the database, loads the schema, and initializes with the seed data (use db:reset to also drop the database first)" fullCmd="db:setup" taksId="setup" /><RakeGroup description="" fullCmd="" taksId="structure"><RakeTask description="Dumps the database structure to db/structure.sql" fullCmd="db:structure:dump" taksId="dump" /><RakeTask description="Recreates the databases from the structure.sql file" fullCmd="db:structure:load" taksId="load" /><RakeTask description="" fullCmd="db:structure:load_if_sql" taksId="load_if_sql" /></RakeGroup><RakeTask description="Retrieves the current schema version number" fullCmd="db:version" taksId="version" /><RakeTask description="" fullCmd="db:_dump" taksId="_dump" /><RakeTask description="" fullCmd="db:abort_if_pending_migrations" taksId="abort_if_pending_migrations" /><RakeTask description="" fullCmd="db:charset" taksId="charset" /><RakeTask description="" fullCmd="db:check_protected_environments" taksId="check_protected_environments" /><RakeTask description="" fullCmd="db:collation" taksId="collation" /><RakeGroup description="" fullCmd="" taksId="create"><RakeTask description="" fullCmd="db:create:all" taksId="all" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="drop"><RakeTask description="" fullCmd="db:drop:_unsafe" taksId="_unsafe" /><RakeTask description="" fullCmd="db:drop:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:forward" taksId="forward" /><RakeTask description="" fullCmd="db:load_config" taksId="load_config" /><RakeTask description="" fullCmd="db:purge" taksId="purge" /><RakeGroup description="" fullCmd="" taksId="purge"><RakeTask description="" fullCmd="db:purge:all" taksId="all" /></RakeGroup><RakeTask description="" fullCmd="db:reset" taksId="reset" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="" fullCmd="db:test:load" taksId="load" /><RakeTask description="" fullCmd="db:test:load_schema" taksId="load_schema" /><RakeTask description="" fullCmd="db:test:load_structure" taksId="load_structure" /><RakeTask description="" fullCmd="db:test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="db:test:purge" taksId="purge" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="dev"><RakeTask description="Toggle development mode caching on/off" fullCmd="dev:cache" taksId="cache" /></RakeGroup><RakeTask description="Print out all defined initializers in the order they are invoked by Rails" fullCmd="initializers" taksId="initializers" /><RakeGroup description="" fullCmd="" taksId="log"><RakeTask description="Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)" fullCmd="log:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="menu"><RakeTask description="Menu Bitp" fullCmd="menu:bitp" taksId="bitp" /><RakeTask description="Menu Osaka" fullCmd="menu:osaka" taksId="osaka" /></RakeGroup><RakeTask description="Prints out your Rack middleware stack" fullCmd="middleware" taksId="middleware" /><RakeTask description="Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)" fullCmd="notes" taksId="notes" /><RakeGroup description="" fullCmd="" taksId="notes"><RakeTask description="Enumerate a custom annotation, specify with ANNOTATION=CUSTOM" fullCmd="notes:custom" taksId="custom" /><RakeTask description="" fullCmd="notes:fixme" taksId="fixme" /><RakeTask description="" fullCmd="notes:optimize" taksId="optimize" /><RakeTask description="" fullCmd="notes:todo" taksId="todo" /></RakeGroup><RakeTask description="Restart app by touching tmp/restart.txt" fullCmd="restart" taksId="restart" /><RakeTask description="Print out all defined routes in match order, with names" fullCmd="routes" taksId="routes" /><RakeTask description="Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions)" fullCmd="secret" taksId="secret" /><RakeTask description="Run all specs in spec directory (excluding plugin specs)" fullCmd="spec" taksId="spec" /><RakeGroup description="" fullCmd="" taksId="spec"><RakeTask description="Run the code examples in spec/controllers" fullCmd="spec:controllers" taksId="controllers" /><RakeTask description="Run the code examples in spec/helpers" fullCmd="spec:helpers" taksId="helpers" /><RakeTask description="Run the code examples in spec/jobs" fullCmd="spec:jobs" taksId="jobs" /><RakeTask description="Run the code examples in spec/models" fullCmd="spec:models" taksId="models" /><RakeTask description="Run the code examples in spec/requests" fullCmd="spec:requests" taksId="requests" /><RakeTask description="Run the code examples in spec/routing" fullCmd="spec:routing" taksId="routing" /><RakeTask description="Run the code examples in spec/views" fullCmd="spec:views" taksId="views" /><RakeTask description="" fullCmd="spec:prepare" taksId="prepare" /><RakeTask description="" fullCmd="spec:statsetup" taksId="statsetup" /></RakeGroup><RakeTask description="Report code statistics (KLOCs, etc) from the application or engine" fullCmd="stats" taksId="stats" /><RakeTask description="Runs all tests in test folder except system ones" fullCmd="test" taksId="test" /><RakeGroup description="" fullCmd="" taksId="test"><RakeTask description="Run tests quickly, but also reset db" fullCmd="test:db" taksId="db" /><RakeTask description="Run system tests only" fullCmd="test:system" taksId="system" /><RakeTask description="" fullCmd="test:controllers" taksId="controllers" /><RakeTask description="" fullCmd="test:functionals" taksId="functionals" /><RakeTask description="" fullCmd="test:generators" taksId="generators" /><RakeTask description="" fullCmd="test:helpers" taksId="helpers" /><RakeTask description="" fullCmd="test:integration" taksId="integration" /><RakeTask description="" fullCmd="test:jobs" taksId="jobs" /><RakeTask description="" fullCmd="test:mailers" taksId="mailers" /><RakeTask description="" fullCmd="test:models" taksId="models" /><RakeTask description="" fullCmd="test:prepare" taksId="prepare" /><RakeTask description="" fullCmd="test:run" taksId="run" /><RakeTask description="" fullCmd="test:units" taksId="units" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="time"><RakeTask description="List all time zones, list by two-letter country code (`rails time:zones[US]`), or list by UTC offset (`rails time:zones[-8]`)" fullCmd="time:zones[country_or_offset]" taksId="zones[country_or_offset]" /><RakeTask description="" fullCmd="time:zones" taksId="zones" /><RakeGroup description="" fullCmd="" taksId="zones"><RakeTask description="" fullCmd="time:zones:all" taksId="all" /><RakeTask description="" fullCmd="time:zones:local" taksId="local" /><RakeTask description="" fullCmd="time:zones:us" taksId="us" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="tmp"><RakeTask description="Clear cache and socket files from tmp/ (narrow w/ tmp:cache:clear, tmp:sockets:clear)" fullCmd="tmp:clear" taksId="clear" /><RakeTask description="Creates tmp directories for cache, sockets, and pids" fullCmd="tmp:create" taksId="create" /><RakeGroup description="" fullCmd="" taksId="cache"><RakeTask description="" fullCmd="tmp:cache:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="pids"><RakeTask description="" fullCmd="tmp:pids:clear" taksId="clear" /></RakeGroup><RakeGroup description="" fullCmd="" taksId="sockets"><RakeTask description="" fullCmd="tmp:sockets:clear" taksId="clear" /></RakeGroup></RakeGroup><RakeGroup description="" fullCmd="" taksId="yarn"><RakeTask description="Install all JavaScript dependencies as specified via Yarn" fullCmd="yarn:install" taksId="install" /></RakeGroup><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="environment" taksId="environment" /><RakeGroup description="" fullCmd="" taksId="railties"><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="" fullCmd="railties:install:migrations" taksId="migrations" /></RakeGroup></RakeGroup><RakeTask description="" fullCmd="tmp" taksId="tmp" /><RakeTask description="" fullCmd="tmp/cache" taksId="tmp/cache" /><RakeTask description="" fullCmd="tmp/cache/assets" taksId="tmp/cache/assets" /><RakeTask description="" fullCmd="tmp/pids" taksId="tmp/pids" /><RakeTask description="" fullCmd="tmp/sockets" taksId="tmp/sockets" /></RakeGroup></Settings>
diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml
index 586fd380..169f839c 100644
--- a/.idea/sxrestaurant.iml
+++ b/.idea/sxrestaurant.iml
@@ -124,14 +124,14 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actioncable (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activejob (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activemodel (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activerecord (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actioncable (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionmailer (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activejob (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activemodel (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activerecord (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="arel (v8.0.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="autoprefixer-rails (v7.1.1.2, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.3.3) [gem]" level="application" />
@@ -142,6 +142,7 @@
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.14.6, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="byebug (v9.0.6, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="cancancan (v1.17.0, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="chronic (v0.10.2, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="coffee-rails (v4.2.2, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="coffee-script (v2.4.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="coffee-script-source (v1.12.2, rbenv: 2.3.3) [gem]" level="application" />
@@ -150,7 +151,7 @@
     <orderEntry type="library" scope="PROVIDED" name="cups (v0.0.7, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.6.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.0, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="erubi (v1.6.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.8.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.8.0, rbenv: 2.3.3) [gem]" level="application" />
@@ -160,7 +161,7 @@
     <orderEntry type="library" scope="PROVIDED" name="font-awesome-rails (v4.7.0.2, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="httparty (v0.15.5, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.4, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.6, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.3.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-ui-rails (v6.0.1, rbenv: 2.3.3) [gem]" level="application" />
@@ -175,7 +176,7 @@
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.2.0, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.10.2, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="minitest (v5.10.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_xml (v0.6.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.4.6, rbenv: 2.3.3) [gem]" level="application" />
@@ -190,10 +191,10 @@
     <orderEntry type="library" scope="PROVIDED" name="rack-cors (v0.4.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack-protection (v2.0.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.3, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rails (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rails (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, rbenv: 2.3.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v5.1.1, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v5.1.3, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v12.0.0, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.9.8, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, rbenv: 2.3.3) [gem]" level="application" />
@@ -228,6 +229,7 @@
     <orderEntry type="library" scope="PROVIDED" name="web-console (v3.5.1, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.6.5, rbenv: 2.3.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.2, rbenv: 2.3.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="whenever (v0.9.7, rbenv: 2.3.3) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="0" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 34b4f3b1..f494bdeb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="89ca96af-a0e4-4fe4-b9a3-9969f22d7079" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/dump.rdb" afterPath="$PROJECT_DIR$/dump.rdb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/sale.rb" afterPath="$PROJECT_DIR$/app/models/sale.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb" afterPath="$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
     </list>
     <ignored path="$PROJECT_DIR$/.bundle/" />
     <ignored path="$PROJECT_DIR$/components/" />
@@ -18,141 +23,51 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="home_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/home_controller.rb">
+      <file leaf-file-name="sale_edit_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="292">
-              <caret line="27" column="42" lean-forward="true" selection-start-line="27" selection-start-column="42" selection-end-line="27" selection-end-column="42" />
+            <state relative-caret-position="372">
+              <caret line="40" column="60" lean-forward="true" selection-start-line="40" selection-start-column="60" selection-end-line="40" selection-end-column="60" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/payments/show.html.erb">
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="359" column="43" lean-forward="false" selection-start-line="359" selection-start-column="43" selection-end-line="359" selection-end-column="43" />
+            <state relative-caret-position="254">
+              <caret line="51" column="8" lean-forward="true" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb">
+      <file leaf-file-name="sale.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2160">
-              <caret line="144" column="16" lean-forward="false" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
+            <state relative-caret-position="321">
+              <caret line="270" column="45" lean-forward="true" selection-start-line="270" selection-start-column="45" selection-end-line="270" selection-end-column="45" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
+      <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="void_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/void_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+            <state relative-caret-position="213">
+              <caret line="58" column="112" lean-forward="false" selection-start-line="58" selection-start-column="112" selection-end-line="58" selection-end-column="112" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb">
+      <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/config/routes.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
-              <folding>
-                <marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
-                <marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
-                <marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
-                <marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
-                <marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
-                <marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
-                <marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
-                <marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
-                <marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
-                <marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="249">
-              <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="payments_controller.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/controllers/origami/payments_controller.rb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="34" lean-forward="false" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/origami/rooms/show.html.erb">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
+            <state relative-caret-position="204">
+              <caret line="83" column="43" lean-forward="false" selection-start-line="83" selection-start-column="43" selection-end-line="83" selection-end-column="43" />
               <folding />
             </state>
           </provider>
@@ -165,6 +80,8 @@
       <find>origami</find>
       <find>table_invoice</find>
       <find>sale_id</find>
+      <find>oqs</find>
+      <find>void</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -173,7 +90,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/config/routes.rb" />
         <option value="$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" />
         <option value="$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" />
         <option value="$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
@@ -184,6 +100,15 @@
         <option value="$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
         <option value="$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
+        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
+        <option value="$PROJECT_DIR$/app/views/home/show.html.erb" />
+        <option value="$PROJECT_DIR$/app/models/ability.rb" />
+        <option value="$PROJECT_DIR$/app/views/home/dashboard.html.erb" />
+        <option value="$PROJECT_DIR$/config/routes.rb" />
+        <option value="$PROJECT_DIR$/app/models/sale.rb" />
+        <option value="$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb" />
+        <option value="$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb" />
+        <option value="$PROJECT_DIR$/.gitignore" />
       </list>
     </option>
   </component>
@@ -194,15 +119,16 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
+    <option name="x" value="1440" />
     <option name="y" value="22" />
-    <option name="width" value="1440" />
-    <option name="height" value="833" />
+    <option name="width" value="1920" />
+    <option name="height" value="724" />
   </component>
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -229,340 +155,6 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="transactions">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="reports">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="table_invoices">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sales">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="rooms">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="payments">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="orders">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="views">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="home">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="models">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="controllers">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="controllers">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="origami">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="sxrestaurant">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="app">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="controllers">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="api">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scratches" />
@@ -578,6 +170,60 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controllers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sxrestaurant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controllers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="origami" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -585,6 +231,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="add_unversioned_files" value="$PROJECT_DIR$/config/database.yml" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -908,31 +555,34 @@
       <updated>1498458293643</updated>
       <workItem from="1498458295318" duration="2552000" />
       <workItem from="1498465879846" duration="18792000" />
+      <workItem from="1502681128282" duration="12098000" />
+      <workItem from="1502780405774" duration="2251000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="21344000" />
+    <option name="totallyTimeSpent" value="40110000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1440" height="833" extended-state="6" />
+    <frame x="1440" y="22" width="1920" height="724" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22986111" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17518637" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978722" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32911393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4924012" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32911393" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
@@ -948,312 +598,100 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sales_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sales_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/models/sale_payment.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/customers/index.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/master_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/models/dining_facility.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/movetable_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/orders_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/payments/create.json.jbuilder" />
+    <entry file="file://$PROJECT_DIR$/app/models/printer/receipt_printer.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/request_bills_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/api/bill_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/models/booking.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sales_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/payments_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/models/sale_payment.rb" />
+    <entry file="file://$PROJECT_DIR$/app/models/sale_audit.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/void_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/home_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/payments/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/rooms/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="36" lean-forward="false" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
-          <folding />
+        <state relative-caret-position="265">
+          <caret line="16" column="39" lean-forward="false" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/sale_payment.rb">
+    <entry file="file://$USER_HOME$/.rbenv/versions/2.3.3/lib/ruby/gems/2.3.0/gems/cancancan-1.17.0/lib/generators/cancan/ability/templates/ability.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3720">
-          <caret line="248" column="50" lean-forward="true" selection-start-line="248" selection-start-column="50" selection-end-line="248" selection-end-column="50" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/void_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4305">
-          <caret line="287" column="93" lean-forward="false" selection-start-line="287" selection-start-column="93" selection-end-line="287" selection-end-column="93" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2070">
-          <caret line="138" column="0" lean-forward="true" selection-start-line="138" selection-start-column="0" selection-end-line="138" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/database.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="42" column="16" lean-forward="true" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="18" column="40" lean-forward="false" selection-start-line="18" selection-start-column="40" selection-end-line="18" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/customers/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2013">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/master_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/dining_facility.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/movetable_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="750">
-          <caret line="50" column="25" lean-forward="false" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/orders_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/payments/create.json.jbuilder">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/printer/receipt_printer.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="74" column="38" lean-forward="true" selection-start-line="74" selection-start-column="38" selection-end-line="74" selection-end-column="38" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/request_bills_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="35" lean-forward="true" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/api/bill_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" column="29" lean-forward="false" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="29" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/booking.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sales_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/table_invoices_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="17" column="7" lean-forward="true" selection-start-line="17" selection-start-column="7" selection-end-line="17" selection-end-column="7" />
-          <folding />
+        <state relative-caret-position="144">
+          <caret line="8" column="19" lean-forward="true" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/home_controller.rb" />
+    <entry file="file://$PROJECT_DIR$/config/database.yml" />
+    <entry file="file://$PROJECT_DIR$/app/views/home/destroy.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/home/create.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/home/index.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/home/show.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/views/home/dashboard.html.erb" />
+    <entry file="file://$PROJECT_DIR$/app/models/ability.rb" />
     <entry file="file://$PROJECT_DIR$/config/routes.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="120" column="47" lean-forward="false" selection-start-line="120" selection-start-column="47" selection-end-line="120" selection-end-column="47" />
+        <state relative-caret-position="204">
+          <caret line="83" column="43" lean-forward="false" selection-start-line="83" selection-start-column="43" selection-end-line="83" selection-end-column="43" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/payments_controller.rb">
+    <entry file="file://$PROJECT_DIR$/app/models/sale.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="34" lean-forward="false" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
+        <state relative-caret-position="321">
+          <caret line="270" column="45" lean-forward="true" selection-start-line="270" selection-start-column="45" selection-end-line="270" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/sale_payment.rb">
+    <entry file="file://$PROJECT_DIR$/app/views/origami/sale_edit/edit.html.erb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="411">
-          <caret line="60" column="34" lean-forward="false" selection-start-line="60" selection-start-column="34" selection-end-line="60" selection-end-column="34" />
+        <state relative-caret-position="213">
+          <caret line="58" column="112" lean-forward="false" selection-start-line="58" selection-start-column="112" selection-end-line="58" selection-end-column="112" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/models/sale_audit.rb">
+    <entry file="file://$PROJECT_DIR$/app/controllers/origami/sale_edit_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="57" column="11" lean-forward="false" selection-start-line="57" selection-start-column="11" selection-end-line="57" selection-end-column="11" />
+        <state relative-caret-position="372">
+          <caret line="40" column="60" lean-forward="true" selection-start-line="40" selection-start-column="60" selection-end-line="40" selection-end-column="60" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/void_controller.rb">
+    <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/origami/home_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="27" column="42" lean-forward="true" selection-start-line="27" selection-start-column="42" selection-end-line="27" selection-end-column="42" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/payments/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="359" column="43" lean-forward="false" selection-start-line="359" selection-start-column="43" selection-end-line="359" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/index.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/table_invoices/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2160">
-          <caret line="144" column="16" lean-forward="false" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/home/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/rooms/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/orders/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="28" column="128" lean-forward="false" selection-start-line="28" selection-start-column="128" selection-end-line="28" selection-end-column="128" />
-          <folding>
-            <marker date="1498539948000" expanded="true" signature="3450:4239" ph="do ... end" />
-            <marker date="1498539948000" expanded="true" signature="3598:4131" ph="&lt;%...%&gt;" />
-            <marker date="1498539948000" expanded="true" signature="3714:4114" ph="if ... end" />
-            <marker date="1498539948000" expanded="true" signature="4005:4027" ph="if ... end" />
-            <marker date="1498539948000" expanded="true" signature="4395:6842" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4419:6833" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4454:4539" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4571:6821" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4609:5000" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4661:4756" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4678:4738" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4713:4734" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="4819:4984" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5059:5210" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5111:5193" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5243:6180" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5313:6164" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5334:5545" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5354:5523" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5566:6144" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="5583:5749" ph="&lt;%...%&gt;" />
-            <marker date="1498539948000" expanded="true" signature="5817:6041" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6058:6123" ph="&lt;%...%&gt;" />
-            <marker date="1498539948000" expanded="true" signature="6215:6807" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6284:6791" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6302:6491" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6509:6725" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6908:7237" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="6999:7127" ph="if ... end" />
-            <marker date="1498539948000" expanded="true" signature="7253:8136" ph="..." />
-            <marker date="1498539948000" expanded="true" signature="7283:7870" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="7322:7434" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="7471:7574" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="7612:7723" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="7761:7867" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="7905:8012" ph="{...}" />
-            <marker date="1498539948000" expanded="true" signature="8047:8088" ph="{...}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/origami/sales/show.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="249">
-          <caret line="139" column="30" lean-forward="true" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
+        <state relative-caret-position="254">
+          <caret line="51" column="8" lean-forward="true" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
           <folding />
         </state>
       </provider>
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 209ec4c0..900b0431 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,31 +1,50 @@
 class Origami::SaleEditController < BaseOrigamiController
   authorize_resource :class => false
-   # Index for sale item void OR edit
-   def edit
-     sale_id = params[:sale_id]
-     @table_id = params[:table_id]
-     @saleobj = Sale.find(sale_id)
-   end
+  # Index for sale item void OR edit
+  def edit
+    sale_id = params[:sale_id]
+    @table_id = params[:table_id]
+    @saleobj = Sale.find(sale_id)
+  end
 
-   # create item void. make duplicate old record and update qty and price
-   def item_void
-     saleitemId = params[:sale_item_id]
-     saleitemObj = SaleItem.find(saleitemId)
-     saleitemObj.remark = 'void'
-     saleitemObj.save
-     @newsaleitem = SaleItem.new
-     @newsaleitem = saleitemObj.dup
-     @newsaleitem.save
-     @newsaleitem.qty = saleitemObj.qty * -1
-     @newsaleitem.price = saleitemObj.price * -1
-     @newsaleitem.is_taxable = 1
-     @newsaleitem.product_name = saleitemObj.product_name + " - void"
-     @newsaleitem.save
+  # create item void. make duplicate old record and update qty and price
+  def item_void
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    saleitemObj.remark = 'void'
+    saleitemObj.save
+    @newsaleitem = SaleItem.new
+    @newsaleitem = saleitemObj.dup
+    @newsaleitem.save
+    @newsaleitem.qty = saleitemObj.qty * -1
+    @newsaleitem.price = saleitemObj.price * -1
+    @newsaleitem.is_taxable = 1
+    @newsaleitem.product_name = saleitemObj.product_name + " - void"
+    @newsaleitem.save
 
-     # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end
+
+  def item_foc
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    saleitemObj.remark = 'foc'
+    saleitemObj.save
+    @newsaleitem = SaleItem.new
+    @newsaleitem = saleitemObj.dup
+    @newsaleitem.save
+    @newsaleitem.qty = saleitemObj.qty * -1
+    @newsaleitem.price = saleitemObj.price * -1
+    @newsaleitem.is_taxable = 1
+    @newsaleitem.product_name = saleitemObj.product_name + ' foc'
+    @newsaleitem.save
+
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end
 
   # def item_edit
   #   saleitemId = params[:sale_item_id]
@@ -48,63 +67,63 @@ class Origami::SaleEditController < BaseOrigamiController
   # end
 
   def item_edit
-    saleitemId   = params[:sale_item_id]
-    update_qty   = params[:update_qty]
+    saleitemId = params[:sale_item_id]
+    update_qty = params[:update_qty]
     update_price = params[:update_price]
-    saleitemObj  = SaleItem.find(saleitemId)
+    saleitemObj = SaleItem.find(saleitemId)
 
-    saleitemObj.qty           = update_qty
-    saleitemObj.price         = update_qty.to_f * update_price.to_f
-    saleitemObj.unit_price    = update_price
+    saleitemObj.qty = update_qty
+    saleitemObj.price = update_qty.to_f * update_price.to_f
+    saleitemObj.unit_price = update_price
     saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
     # saleitemObj.remark        = 'edit'
-    saleitemObj.product_name  = saleitemObj.product_name + " - updated"
+    saleitemObj.product_name = saleitemObj.product_name + " - updated"
     saleitemObj.save
 
-     # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
   end
 
 
-   # make cancel void item
-   def item_void_cancel
-     saleitemId = params[:sale_item_id]
-     saleitemObj = SaleItem.find(saleitemId)
-     both = SaleItem.where('product_code=?',saleitemObj.product_code)
-     both.each do |item|
-       if item.qty.to_i > 0
-         item.remark = nil
-         item.save
-       end
-     end
-     saleitemObj.destroy
+  # make cancel void item
+  def item_void_cancel
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    both = SaleItem.where('product_code=?', saleitemObj.product_code)
+    both.each do |item|
+      if item.qty.to_i > 0
+        item.remark = nil
+        item.save
+      end
+    end
+    saleitemObj.destroy
 
-      # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end
 
-   # remove all void items
-   def cancel_all_void
-     sale_id = params[:sale_id]
-     saleObj = Sale.find(sale_id)
-     saleObj.sale_items.each do |item|
-       if item.qty.to_i < 0
-          item.destroy
-       else
-         item.remark = nil
-       end
-       item.save
-     end
+  # remove all void items
+  def cancel_all_void
+    sale_id = params[:sale_id]
+    saleObj = Sale.find(sale_id)
+    saleObj.sale_items.each do |item|
+      if item.qty.to_i < 0
+        item.destroy
+      else
+        item.remark = nil
+      end
+      item.save
+    end
 
-      # re-calc tax
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj.compute_without_void
+  end
 
-   def apply_void
-     sale_id = params[:sale_id]
-     saleObj =  Sale.find(sale_id)
-     saleObj.compute_without_void
-   end
+  def apply_void
+    sale_id = params[:sale_id]
+    saleObj = Sale.find(sale_id)
+    saleObj.compute_without_void
+  end
 end
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index 8efb9dd5..5bf654ef 100644
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def print_setting_params
-      params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
+      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
     end
 end
diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb
index 6de504bf..31763b02 100644
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -16,6 +16,9 @@ class Settings::DiningChargesController < ApplicationController
   # GET /dining_charges/new
   def new
     @dining_charge = DiningCharge.new
+    @dining_charge.minimum_free_time="00:30"
+    @dining_charge.charge_block="02:00"
+    @dining_charge.time_rounding_block="00:15"
   end
 
   # GET /dining_charges/1/edit
@@ -29,7 +32,11 @@ class Settings::DiningChargesController < ApplicationController
     @dining_charge.dining_facility_id = @settings_dining_facility.id
     respond_to do |format|
       if @dining_charge.save
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        if @table
+          format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        else
+          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        end
         format.json { render :show, status: :created, location: @dining_charge }
       else
         format.html { render :new }
@@ -44,7 +51,11 @@ class Settings::DiningChargesController < ApplicationController
     respond_to do |format|
       @dining_charge.dining_facility_id = @settings_dining_facility.id
       if @dining_charge.update(dining_charge_params)
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        if @table
+          format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        else
+          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        end
         format.json { render :show, status: :ok, location: @dining_charge }
       else
         format.html { render :edit }
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 7b9ba1de..9c1f5b68 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -5,11 +5,8 @@ class Ability
     user ||= Employee.new
 
     if user.role == "administrator"
-
         can :manage, :all
-
     elsif user.role == "manager"
-
         can :manage, Menu
         can :manage, MenuCategory
         can :manage, MenuItemAttribute
@@ -98,7 +95,6 @@ class Ability
         can :create, :payment
         can :reprint, :payment
         can :rounding_adj, :payment
-        can :foc, :payment
 
         can :move_dining, :movetable 
         can :moving, :movetable
@@ -132,7 +128,5 @@ class Ability
         can :reprint, :payment
         can :rounding_adj, :payment
     end
-
   end
-
 end
diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb
index e1d70278..75cf7d7b 100644
--- a/app/models/dining_charge.rb
+++ b/app/models/dining_charge.rb
@@ -2,40 +2,75 @@ class DiningCharge < ApplicationRecord
   belongs_to :table
   belongs_to :room
 
-  def amount_calculate(dining_charges_obj, checkin , checkout)
+  def self.amount_calculate(dining_charges_obj, checkin , checkout)
 
     if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil?
-
-      minutes = ((checkin - checkout) * 24 * 60).to_i # stay minutes
-      dining_minutes = minutes - dining_charges_obj.minimum_free_time # stayminutes - free minutes
+      price = 0
+      minutes = DiningCharge.time_diff(checkout, checkin)
+      free_time = DiningCharge.convert_to_minutes(dining_charges_obj.minimum_free_time.strftime('%H:%M'))
+      dining_minutes = minutes - free_time # stayminutes - free minutes
       charge_type = dining_charges_obj.charge_type
       if charge_type == 'hr'
-
+        price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'hr')
       elsif charge_type == 'day'
-        price = charge_by_day
+        price = charges(dining_charges_obj, dining_minutes, 'day')
       end
+
+      return price
+    else
+      puts "<<<<<<<< NO"
     end
 
   end
 
-  def charge_by_hour
-
-  end
-
-  def charge_by_day(chargesObj, dining_minutes)
-    minues_per_day =  12 * 60
-    result = dining_minutes / minues_per_day
-    if result < 1
+  def self.charges(chargesObj, dining_minutes, type)
+    solid_price = 0
+    block = DiningCharge.convert_to_minutes(chargesObj.charge_block.strftime('%H:%M'))
+    result = dining_minutes / block
+    if result.to_i < 1
       return chargesObj.unit_price
-    elsif result > 1
+    elsif result.to_i >= 1
        solid_price = result * chargesObj.unit_price
-
-       remain_value = dining_minutes % minues_per_day
-       roundingblock = remain_value / chargesObj.time_rounding_block
-       if roundingblock > 1
-
+       remain_value = dining_minutes % block
+       rounding_block = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.strftime('%H:%M'))
+       roundingblock = remain_value / rounding_block
+       if roundingblock.to_i < 1
+          return DiningCharge.check_rounding(chargesObj, solid_price)
+       else
+          solid_price += roundingblock * chargesObj.time_rounding_block_price
+          remain_rounding = dining_minutes % block
+          if remain_rounding.to_i < 1
+             return DiningCharge.check_rounding(chargesObj, solid_price)
+          else
+             return solid_price
+          end
        end
     end
   end
 
+  def self.check_rounding(chargesObj)
+     if chargesObj.time_rounding == "down"
+       return solid_price
+     else
+       return solid_price += chargesObj.time_rounding_block_price
+     end
+  end
+
+  def self.time_diff(start_time, end_time)
+    seconds_diff = (start_time - end_time).to_i.abs
+    hours = seconds_diff / 3600
+    seconds_diff -= hours * 3600
+
+    minutes = seconds_diff / 60
+    seconds_diff -= minutes * 60
+
+    seconds = seconds_diff
+    return hours * 60 + minutes
+  end
+
+  def self.convert_to_minutes(time)
+    arr = time.split(":")
+    hour = arr[0].to_i * 60
+    return hour + arr[1].to_i
+  end
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 2be20523..71994ca1 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -109,6 +109,14 @@ class Sale < ApplicationRecord
       booking.checkout_by = requested_by.name
       booking.save
 
+      # dining charges
+      charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take
+      if !charges.nil?
+        diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at)
+        dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s
+        create_saleitem_diningcharges(charges, diningprice, booking.dining_facility.name, dining_time)
+      end
+
       return true, self.id
     end
 
@@ -162,6 +170,20 @@ class Sale < ApplicationRecord
     self.sale_items << sale_item
   end
 
+  def create_saleitem_diningcharges(chargeObj, diningprice, dining_name, dining_time)
+    sale_item = SaleItem.new
+    sale_item.product_code = chargeObj.item_code
+    sale_item.product_name = dining_name.to_s + " ( " + dining_time.to_s + " )"
+    # sale_item.account_id = item.account_id
+    sale_item.product_alt_name = "-"
+    sale_item.qty = 1
+    sale_item.unit_price = chargeObj.unit_price
+    sale_item.taxable_price = diningprice
+    sale_item.is_taxable = chargeObj.taxable
+    sale_item.sale_id = self.id
+    sale_item.price = diningprice
+    sale_item.save
+  end
 
   def update_item (item)
     #save sale_audit
@@ -245,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
@@ -318,7 +340,8 @@ class Sale < ApplicationRecord
     tax_profiles = TaxProfile.all.order("order_by asc")
     
     customer = Customer.find(self.customer_id)
-    # #Create new tax records
+
+    #Create new tax records
     tax_profiles.each do |tax|
       customer.tax_profiles.each do |cus_tax|      
         if cus_tax.to_i == tax.id          
@@ -396,7 +419,7 @@ class Sale < ApplicationRecord
     else
         keyword = "receipt_no LIKE ? OR cashier_name LIKE ? OR sale_status ='#{filter}'","%#{filter}%","%#{filter}%"
     end
-    
+
     if from.present? && to.present?
        sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and NOT sale_status = 'void' ", from,to)
        query = sale.where(keyword)
@@ -556,97 +579,95 @@ def self.get_by_shift_sale(from,to,status)
   query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,
                           shift_closed_at As closing_date," +
                           " grand_total AS grand_total, cash_sales AS cash," +
-                          "total_taxes AS total_tax,total_discounts As total_discount")    
+                          "total_taxes AS total_tax,total_discounts As total_discount")
                           .order("shift_sales.id DESC")
   return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
 def self.get_item_query()
-      query = Sale.select("acc.title as account_name,mi.account_id, mi.item_code as item_code, " + 
+      query = Sale.select("acc.title as account_name,mi.account_id, mi.item_code as item_code, " +
                           "(SUM(i.qty * i.unit_price)) as grand_total,SUM(i.qty) as total_item," +
                           " i.unit_price as unit_price,mi.name as product_name, mc.name as" +
                           " menu_category_name,mc.id as menu_category_id ")
-      
-      query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code" + 
+
+      query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code" +
                 " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
                 # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
 
     query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
     query = query.group('i.product_code ').order("mi.account_id, mi.menu_category_id")
 end  
-  
-    
-  def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
-    
-    # date_type_selection = get_sql_function_for_report_type(report_type)
-    
-    query = self.get_item_query()
-    discount_query = 0
-    total_card_amount = 0
-    total_cash_amount = 0
-    total_credit_amount = 0
-    total_foc_amount = 0
-    total_grand_total = 0   
 
-    if shift.present?
-        query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
-        discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)   
-        change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)   
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
-                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
-                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
-                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
-                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                     .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a)       
-        sale_cash.each do |s_c|
-          total_cash_amount += s_c.cash_amount.to_f
-          total_card_amount += s_c.card_amount.to_f
-          total_credit_amount += s_c.credit_amount.to_f
-          total_foc_amount += s_c.foc_amount.to_f
-        end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f 
-    
-        ### => get all sales range in shift_sales
-    elsif shift_sale_range.present?
-        query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
-        discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
-        change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
-                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
-                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
-                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
-                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                     .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a) 
-        sale_cash.each do |s_c|
-          total_cash_amount += s_c.cash_amount.to_f
-          total_card_amount += s_c.card_amount.to_f
-          total_credit_amount += s_c.credit_amount.to_f
-          total_foc_amount += s_c.foc_amount.to_f
-        end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-    
-    else
-        query          = query.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
-        discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
-        change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
-                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
-                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
-                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
-                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                     .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to) 
-        sale_cash.each do |s_c|
-          total_cash_amount += s_c.cash_amount.to_f
-          total_card_amount += s_c.card_amount.to_f
-          total_credit_amount += s_c.credit_amount.to_f
-          total_foc_amount += s_c.foc_amount.to_f
-        end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-    
-    end
+def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
+  # date_type_selection = get_sql_function_for_report_type(report_type)
 
-    return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
-end 
+  query = self.get_item_query()
+  discount_query = 0
+  total_card_amount = 0
+  total_cash_amount = 0
+  total_credit_amount = 0
+  total_foc_amount = 0
+  total_grand_total = 0
+
+  if shift.present?
+      query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
+      discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)
+      change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+                                    SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
+                                    SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
+                                    SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
+                                   .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a)
+      sale_cash.each do |s_c|
+        total_cash_amount += s_c.cash_amount.to_f
+        total_card_amount += s_c.card_amount.to_f
+        total_credit_amount += s_c.credit_amount.to_f
+        total_foc_amount += s_c.foc_amount.to_f
+      end
+      total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+
+      ### => get all sales range in shift_sales
+  elsif shift_sale_range.present?
+      query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
+      discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
+      change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+                                    SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
+                                    SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
+                                    SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
+                                   .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                                   .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a)
+      sale_cash.each do |s_c|
+        total_cash_amount += s_c.cash_amount.to_f
+        total_card_amount += s_c.card_amount.to_f
+        total_credit_amount += s_c.credit_amount.to_f
+        total_foc_amount += s_c.foc_amount.to_f
+      end
+      total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+
+  else
+      query          = query.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to)
+      discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount)
+      change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed)
+      sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+                                    SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount,
+                                    SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount,
+                                    SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
+                                   .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+                                   .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to)
+      sale_cash.each do |s_c|
+        total_cash_amount += s_c.cash_amount.to_f
+        total_card_amount += s_c.card_amount.to_f
+        total_credit_amount += s_c.credit_amount.to_f
+        total_foc_amount += s_c.foc_amount.to_f
+      end
+      total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
+
+  end
+
+  return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
+end
 
 def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
     ## => left join -> show all sales although no orders
@@ -659,7 +680,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
         payment_type = " and sale_payments.payment_method = '#{payment_type}'"
       end
     end
-    
+
     query = Sale.all
     if shift.present?
 
@@ -678,10 +699,10 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-    end                                
+    end
 end
 
-def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) 
+def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)
     query = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
                                 s.cashier_name as cashier_name")
                       .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
@@ -693,16 +714,16 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to)
     else
       query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to)
     end
-end  
+end
 
  def self.get_void_sale(shift,from,to)
      sale_arr = Array.new
-    
+
      query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")
                          # .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id")
-                         # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? 
+                         # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ?
                          #  OR sh.shift_closed_at between ? and ? )", from ,to, from, to)
-    
+
     if shift.present?
       query = query.where("sales.sale_status = 'void' and sales.shift_sale_id in (?)",shift.to_a)
     else
@@ -729,10 +750,10 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   if shift.present?
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
-           .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") 
-           .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) 
+           .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+           .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")           
+           .order("sale_taxes.sale_tax_id asc")
   elsif shift_sale_range.present?
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
@@ -747,9 +768,18 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
            .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", from,to)
            .group("sale_taxes.tax_name")
            .order("sale_taxes.sale_tax_id asc")
-  end 
+  end
 end
 
+# def self.get_separate_tax(from,to,payment_method=nil)
+
+#     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+#                   .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+#                   .group("sale_taxes.tax_name")
+
+#       return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
+# end
+
 def grand_total_after_rounding
     return self.old_grand_total.to_f + self.rounding_adjustment.to_f
 end
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 73db5e9d..8e56bed3 100644
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -1,8 +1,9 @@
 class CloseCashierPdf < Prawn::Document
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width
-  def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
-    self.page_width = 210
-    self.page_height = 7000
+
+  def initialize(printer_settings, shift_sale,shop_details,sale_taxes)
+    self.page_width = printer_settings.page_width  #PrintSetting.where("name = ?","Close Cashier").first.page_width
+    self.page_height = printer_settings.page_height
     self.margin = 5
     self.price_width = 40
     self.qty_width = 20
@@ -170,11 +171,9 @@ class CloseCashierPdf < Prawn::Document
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "#{shift_sale.credit_sales}", :size => self.item_font_size, :align => :right
         end
-#start other payment details 
+        #start other payment details 
         if shift_sale.other_sales > 0
-
             other_payment.each do |other|
-
               y_position = cursor
               bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
                text "Other Payment Details", :size => self.item_font_size, :align => :right
@@ -232,9 +231,7 @@ class CloseCashierPdf < Prawn::Document
               end
 
             end
-
         else
-
             y_position = cursor
             bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
              text "Other Payment :", :size => self.item_font_size, :align => :right
@@ -242,15 +239,14 @@ class CloseCashierPdf < Prawn::Document
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
              text "#{shift_sale.other_sales}", :size => self.item_font_size, :align => :right
             end
-
         end
+
         # end other payment details 
         move_down -5
         stroke_horizontal_rule
         move_down 7
         #start total amount by Account Like Food / Beverage /..
-        total_amount_by_account.each do |amount|
-        
+        total_amount_by_account.each do |amount|        
           y_position = cursor
           bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
            text "Total #{amount.account_name} Amount:", :size => self.item_font_size, :align => :right
@@ -381,8 +377,6 @@ class CloseCashierPdf < Prawn::Document
         stroke_horizontal_rule
         move_down 5
 		move_down 5
-
   end
-
 end
 
diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb
index 55d08ecc..a7f85098 100644
--- a/app/pdf/crm_order_pdf.rb
+++ b/app/pdf/crm_order_pdf.rb
@@ -1,8 +1,8 @@
 class CrmOrderPdf < Prawn::Document
   attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width
    def initialize(booking,order_items,printer_settings)
-    self.p_width = 200
-    self.page_height = 1450
+    self.page_width = PrintSetting.where("name = ?","CRM Order").first.page_width
+    self.page_height = PrintSetting.where("name = ?","CRM Order").first.page_height
     self.margin = 10
     # self.price_width = self.p_width / 2
     self.price_width=80
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 20a4537c..7b2e350b 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -2,8 +2,8 @@ class OrderItemPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order_item, print_status, options, alt_name)
-    self.page_width = 185
-    self.page_height = 1450
+    self.page_width = PrintSetting.where("name = ?","OrderItemPdf").first.page_width
+    self.page_height = PrintSetting.where("name = ?","OrderItemPdf").first.page_height
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 244fbdfa..902c68ad 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -2,8 +2,8 @@ class OrderSummaryPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(print_settings,order, print_status, order_items = nil,alt_name)
-    self.page_width = 190
-    self.page_height = 1450
+    self.page_width = PrintSetting.where("name = ?","Order Summary").first.page_width
+    self.page_height = PrintSetting.where("name = ?","Order Summary").first.page_height
     self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 40
diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb
index 0963f55e..cda410ca 100644
--- a/app/pdf/queue_no_pdf.rb
+++ b/app/pdf/queue_no_pdf.rb
@@ -1,8 +1,8 @@
 class QueueNoPdf < Prawn::Document
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width
   def initialize(printer_settings, queue)
-    self.page_width = 210
-    self.page_height = 1450
+    self.page_width = PrintSetting.where("name = ?","Queue No").first.page_width
+    self.page_height = PrintSetting.where("name = ?","Queue No").first.page_height
     self.margin = 5
     self.price_width = 35
     self.qty_width = 20
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index de18adc9..809f7678 100644
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -2,8 +2,8 @@ class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width
   def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status)
-    self.page_width = 210
-    self.page_height = 1450
+    self.page_width = PrintSetting.where("name = ?","Receipt Bill").first.page_width
+    self.page_height = PrintSetting.where("name = ?","Receipt Bill").first.page_height
     self.margin = 5
     self.price_width = 40
     self.qty_width = 20
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index d9595c70..511cd500 100644
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -1,21 +1,228 @@
-  <div class="row">
-        <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
+<div class="row">
+  <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
 
-            <% if current_login_employee.role = "admin" %>
+    <% if current_login_employee.role = "admin" %>
 
-            <% elsif current_login_employee.role = "cashier" %>
-            <%= link_to "Cashier Station", origami_path %>
+    <% elsif current_login_employee.role = "cashier" %>
+        <%= link_to "Cashier Station", origami_path %>
+    <% elsif current_login_employee = "account" %>
+        <%= link_to "Cashier Station", oishi_path %>
+    <% else %>
+        <%= link_to "Cashier Station", oishi_path %>
+    <% end %>
+    <% shop = Shop.first %>
 
-            <% elsif current_login_employee = "account" %>
-            <%= link_to "Cashier Station", oishi_path %>
-
-            <% else %>
-            <%= link_to "Cashier Station", oishi_path %>
-
-            <% end %>
-            <% shop = Shop.first %>
-      </div>
+  </div>
 </div>
+
+<div class="col-md-2 container pull-right" style="margin: 0px !important;">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card" id="oqs" onclick="location.href='<%= oqs_root_path %>'">
+        <div class="card-content">
+          <span class="card-title">OQS</span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card" id="origami" onclick="location.href='<%= origami_root_path %>'">
+        <div class="card-content">
+          <span class="card-title">Origami</span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card" id="crm" onclick="location.href='<%= crm_root_path %>'">
+        <div class="card-content">
+          <span class="card-title">CRM</span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card" id="backend" onclick="location.href='<%= dashboard_path %>'">
+        <div class="card-content">
+          <span class="card-title">Backend</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="col-md-8 col-lg-8">
+  <div class="" style="max-height:550px; overflow:auto;padding: 15px">
+    <h4 class="card-title"><strong>Role Features</strong></h4>
+    <!--  <p><strong>Note:</strong> The <strong>data-parent</strong> attribute makes sure that all collapsible elements under the specified parent will be closed when one of the collapsible item is shown.</p> -->
+    <div class="panel-group" id="accordion">
+      <% if current_user.role == 'administrator' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" data-parent="#accordion" href="#admin">Administrator
+                  <span class="glyphicon glyphicon-plus"></span></a>
+              </h4>
+            </div>
+            <div id="admin" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="col-md-4">
+                  <li class="">All Settings</li>
+                  <ul class="">
+                    <li>Zone</li>
+                    <li>OQS</li>
+                    <li>Menu</li>
+                    <li>Cashier Terminal</li>
+                    <li>Payment</li>
+                    <li>Merbership</li>
+                    <li>Print</li>
+                    <li>Employees</li>
+                    <li>Accounts</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li class="">Transactions</li>
+                  <ul class="">
+                    <li>Order</li>
+                    <li>Sale</li>
+                    <li>Credit Note</li>
+                  </ul><br>
+                  <li>Reports</li>
+                  <ul class="">
+                    <li>Daily Sale</li>
+                    <li>Sale Item</li>
+                    <li>Receipt</li>
+                    <li>Shift Sale</li>
+                    <li>Credit Sale</li>
+                    <li>Void Sale</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li>OQS</li><br>
+                  <li>Origami</li><br>
+                  <li>CRM</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+      <% elsif current_user.role == 'manager' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" data-parent="#accordion" href="#manager">Manager
+                  <span class="glyphicon glyphicon-plus"></span></a>
+              </h4>
+            </div>
+            <div id="admin" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="col-md-4">
+                  <li class="">All Settings</li>
+                  <ul class="">
+                    <li>Zone</li>
+                    <li>OQS</li>
+                    <li>Menu</li>
+                    <li>Cashier Terminal</li>
+                    <li>Print</li>
+                    <li>Employees</li>
+                    <li>Accounts</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li class="">Transactions</li>
+                  <ul class="">
+                    <li>Order</li>
+                    <li>Sale</li>
+                    <li>Credit Note</li>
+                  </ul><br>
+                  <li>Reports</li>
+                  <ul class="">
+                    <li>Daily Sale</li>
+                    <li>Sale Item</li>
+                    <li>Receipt</li>
+                    <li>Shift Sale</li>
+                    <li>Credit Sale</li>
+                    <li>Void Sale</li>
+                  </ul>
+                </ul>
+                <ul class="col-md-4">
+                  <li>OQS</li><br>
+                  <li>Origami</li><br>
+                  <li>CRM</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+      <% elsif current_user.role == 'supervisour' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" data-parent="#accordion" href="#supervisor">Supervisor
+                  <span class="glyphicon glyphicon-plus"></span></a>
+              </h4>
+            </div>
+            <div id="supervisor" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li>OQS</li>
+                  <ul>
+                    <li class="">Void</li>
+                    <li class="">FOC</li>
+                    <li class="">Edit</li>
+                    <li class="">Credit</li>
+                    <li class="">Payment</li>
+                  </ul>
+                </ul>
+              </div>
+            </div>
+          </div>
+      <% elsif current_user.role == 'cashier' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" data-parent="#accordion" href="#cashier">Cashier
+                  <span class="glyphicon glyphicon-plus"></span></a>
+              </h4>
+            </div>
+            <div id="cashier" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li class="">Orgami Panel except Edit and Void</li>
+                  <li class="">Sale and Order</li>
+                  <li class="">and Queue in CRM</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+      <% elsif current_user.role == 'account' %>
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <a data-toggle="collapse" data-parent="#accordion" href="#accountant">Accountant
+                  <span class="glyphicon glyphicon-plus"></span></a>
+              </h4>
+            </div>
+            <div id="accountant" class="panel-collapse collapse in">
+              <div class="panel-body">
+                <ul class="">
+                  <li class="">Daily Sale Report</li>
+                  <li class="">Sale Item Report</li>
+                  <li class="">Receipt No Report</li>
+                  <li class="">ShiftSale Report</li>
+                </ul>
+              </div>
+            </div>
+          </div>
+      <% end %>
+    </div> <!-- end accordion id -->
+  </div>
+</div> <!-- end col-md-4 -->
+
 <div class="footer">
   <div class="card">
     <div class="page-header center-text">
@@ -31,4 +238,45 @@
     </div>
   </div>
 </div>
-  
\ No newline at end of file
+
+<style type="text/css">
+  .card {
+    margin-top: 10px;
+    box-sizing: border-box;
+    border-radius: 2px;
+    background-clip: padding-box;
+    transition: 0.3s ease;
+    background-color: white;
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+  }
+
+  .card span.card-title {
+    color: purple;
+    font-size: 28px;
+    font-weight: 400;
+    text-transform: uppercase;
+    transition: color 0.3s ease;
+    line-height: 48px;
+  }
+
+  .card .card-content {
+    padding: 15%;
+    border-radius: 0 0 2px 2px;
+    background-clip: padding-box;
+    box-sizing: border-box;
+    height: 120px;
+    transition: color 0.3s ease;
+    text-align: center;
+  }
+
+  .card .card-content p {
+    margin: 0;
+    color: inherit;
+  }
+
+  .card:hover {
+    box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.16), 0 10px 20px 0 rgba(0, 0, 0, 0.12);
+  }
+
+</style>
+
diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb
index 7a19a68f..84593142 100644
--- a/app/views/home/show.html.erb
+++ b/app/views/home/show.html.erb
@@ -1,86 +1,91 @@
 <style>
   .pin_pad {
     width: 30%;
-  	height:70px;
-  	line-height:70px;
-  	text-align:center;
-  	background:#54A5AF;
-  	font-size:20px;
-  	color:white;
+    height: 70px;
+    line-height: 70px;
+    text-align: center;
+    background: #54A5AF;
+    font-size: 20px;
+    color: white;
   }
-  .bottom{
-  	margin-bottom: 1px;
+
+  .bottom {
+    margin-bottom: 1px;
   }
-  .left{
-  	margin-left:1px;
+
+  .left {
+    margin-left: 1px;
   }
-  .orange{
-  	 background-color:#FF7F50;
+
+  .orange {
+    background-color: #FF7F50;
   }
+
   .purple {
-  	background-color:#7a62d3;
+    background-color: #7a62d3;
   }
 </style>
 
 <div class="row">
-    <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
-        <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %>
-          <div class="card">
-                <div class="content" style="margin:10px">
-                    <div class="form-group">
-                      <%= f.input :emp_id,as: :hidden, label: "Access PIN", required: false, class: "form-control" %>
+  <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
+    <%= simple_form_for(@login_form, url: emp_login_update_path, method: "PATCH") do |f| %>
+        <div class="card">
+          <div class="content" style="margin:10px">
+            <div class="form-group">
+              <%= f.input :emp_id, as: :hidden, label: "Access PIN", required: false, class: "form-control" %>
 
-                        <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
-                    </div>
-                </div>
-                <div class="content row" style="padding-left:10px;margin-left:10px; margin-top:0px; text-align:center">
-                  <div class='col-md-12'>
-                  <div class='row bottom'>
-                    <div class="pin_pad " data-value="1">1</div>
-                    <div class="pin_pad left" data-value="2">2</div>
-                    <div class="pin_pad left" data-value="3">3</div>
-                 </div>
-                 <div class='row bottom'>
-                    <div class="pin_pad" data-value="4">4</div>
-                    <div class="pin_pad left" data-value="5">5</div>
-                    <div class="pin_pad left" data-value="6">6</div>
-                 </div>
-                 <div class='row bottom'>
-                  <div class="pin_pad" data-value="7">7</div>
-                  <div class="pin_pad left" data-value="8">8</div>
-                  <div class="pin_pad left" data-value="9">9</div>
-                </div>
-                <div class='row bottom'>
-                  <div class="pin_pad orange" data-value="CLR">CLR</div>
-                  <div class="pin_pad left" data-value="0">0</div>
-                  <div class="pin_pad left purple" data-value="ENT">ENT</div>
-                </div>
+              <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
+            </div>
+          </div>
+          <div class="content row" style="padding-left:10px;margin-left:10px; margin-top:0px; text-align:center">
+            <div class='col-md-12'>
+              <div class='row bottom'>
+                <div class="pin_pad " data-value="1">1</div>
+                <div class="pin_pad left" data-value="2">2</div>
+                <div class="pin_pad left" data-value="3">3</div>
               </div>
-                <div class="footer text-center" style="margin:10px">
-
-                </div>
+              <div class='row bottom'>
+                <div class="pin_pad" data-value="4">4</div>
+                <div class="pin_pad left" data-value="5">5</div>
+                <div class="pin_pad left" data-value="6">6</div>
+              </div>
+              <div class='row bottom'>
+                <div class="pin_pad" data-value="7">7</div>
+                <div class="pin_pad left" data-value="8">8</div>
+                <div class="pin_pad left" data-value="9">9</div>
+              </div>
+              <div class='row bottom'>
+                <div class="pin_pad orange" data-value="CLR">CLR</div>
+                <div class="pin_pad left" data-value="0">0</div>
+                <div class="pin_pad left purple" data-value="ENT">ENT</div>
+              </div>
+            </div>
+            <div class="footer text-center" style="margin:10px">
 
             </div>
 
-      <% end %>
+          </div>
+
+    <% end %>
     </div>
+  </div>
 </div>
 
 <script type="text/javascript">
-$(document).on('turbolinks:load', function() {
-  $(".pin_pad").click(function(event){
-    event.preventDefault();
-    console.log($(this).data("value"));
-    var value = $(this).data("value");
+    $(document).on('turbolinks:load', function () {
+        $(".pin_pad").click(function (event) {
+            event.preventDefault();
+            console.log($(this).data("value"));
+            var value = $(this).data("value");
 
-    if (value == "CLR") {
-      $("#login_form_password").val("");
-    } else if(value == "ENT") {
-      $("#new_login_form").submit();
-    } else {
-      var old_value = $("#login_form_password").val();
-      $("#login_form_password").val(old_value + value);
-    }
-  });
-});
+            if (value == "CLR") {
+                $("#login_form_password").val("");
+            } else if (value == "ENT") {
+                $("#new_login_form").submit();
+            } else {
+                var old_value = $("#login_form_password").val();
+                $("#login_form_password").val(old_value + value);
+            }
+        });
+    });
 </script>
diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb
index 6ba861a8..bdcf2069 100644
--- a/app/views/origami/sale_edit/edit.html.erb
+++ b/app/views/origami/sale_edit/edit.html.erb
@@ -1,216 +1,235 @@
 <div class="row">
- <!-- Column Two -->
+  <!-- Column Two -->
   <div class="col-lg-10 col-md-10 col-sm-10">
-     <div class="card"  >
-       <div class="card-header">
-          <div><strong id="order-title">INVOICE DETAILS </strong></div>
-       </div>
-       <div class="card-block">
-         <div class="card-title row">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+    <div class="card">
+      <div class="card-header">
+        <div><strong id="order-title">INVOICE DETAILS </strong></div>
+      </div>
+      <div class="card-block">
+        <div class="card-title row">
+          <div class="col-lg-6 col-md-6 col-sm-6">
+            <p> Receipt No: <span id="receipt_no">
                 <%= @saleobj.receipt_no rescue '' %>
              </span></p>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
-           </div>
-         </div>
-         <div class="card-title row customer_detail hide">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p>Customer : <span id="customer_name"></span></p>
-           </div>
+          </div>
+          <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+            <p>Date:
+              <span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+            </p>
+          </div>
+        </div>
+        <div class="card-title row customer_detail hide">
+          <div class="col-lg-6 col-md-6 col-sm-6">
+            <p>Customer : <span id="customer_name"></span></p>
+          </div>
 
-         </div>
-         <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
-           <table class="table " id="order-items-table">
-             <thead>
-               <tr>
-                 <th width="4%">#</th>
-                 <th class="" width="30%">Items</th>
-                 <th style="" width="13%">QTY</td>
-                 <th class="" width="13%">Price</td>
-                 <!-- <th class='' width="17%"> Total </th> -->
-                 <th class='' width="17%"> Action </th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-                 count = 0
-                 sub_total = 0
-                  @saleobj.sale_items.each do |sale_item|
-                    count += 1
-                  sub_total = sub_total + sale_item.price
-               %>
-               <input type="hidden" id="sale_id" value="<%= @saleobj.sale_id %>">
-               <%
-               # Can't check for discount
-                unless sale_item.price == 0
+        </div>
+        <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
+          <table class="table " id="order-items-table">
+            <thead>
+            <tr>
+              <th width="4%">#</th>
+              <th class="" width="30%">Items</th>
+              <th style="" width="13%">QTY
+              </td>
+              <th class="" width="13%">Price
+              </td>
+              <!-- <th class='' width="17%"> Total </th> -->
+              <th class='' width="17%"> Action</th>
+            </tr>
+            </thead>
+            <tbody>
+            <%
+              count = 0
+              sub_total = 0
+              @saleobj.sale_items.each do |sale_item|
+                count += 1
+                sub_total = sub_total + sale_item.price
+            %>
+                <input type="hidden" id="sale_id" value="<%= @saleobj.sale_id %>">
+                <%
+                  # Can't check for discount
+                  unless sale_item.price == 0
                 %>
-               <tr>
-                 <td width="4%"><%= count %></td>
-                 <td class='' width="30%">
-                     <%= sale_item.product_name %>
-                </td>
-                 <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
-                    <td class='' width="13%">
-                        <input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
-                    </td>
-                    <td class='' width="13%">
-                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
-                    </td>
-                    <!-- <td class='' width="17%">
-                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
+                    <tr>
+                      <td width="4%"><%= count %></td>
+                      <td class='' width="30%">
+                        <%= sale_item.product_name %>
+                      </td>
+                      <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
+                          <td class='' width="13%">
+                            <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
+                          </td>
+                          <td class='' width="13%">
+                            <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
+                          </td>
+                          <!-- <td class='' width="17%">
+                        <input id="<%= sale_item.id %>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
                     </td> -->
-                   <td class='' width="17%">
-                       <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md update'>Update
-                       </button>
-                       <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-md void'>Void</button>
-                   </td>
+                          <td class='' width="17%">
+                            <button data-id="<%= sale_item.id %>" class='btn btn-primary btn-md update'>Update</button>
+                            <button data-id="<%= sale_item.id %>" class='btn btn-danger btn-md void'>Void</button>
+                            <button data-id="<%= sale_item.id %>" class='btn btn-info btn-md foc'>FOC</button>
+                          </td>
 
-                 <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
-                 <td class='' width="13%">
-                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
-                 </td>
-                 <td class='' width="13%">
-                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
-                 </td>
-                 <!-- <td class='' width="17%">
+                      <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
+                          </td>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
+                          </td>
+                          <!-- <td class='' width="17%">
                     <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
                  </td> -->
-                 <td class='' width="17%">
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md cancel'>Cancel Void/Update</button>
-                 </td>
-                 <% else %>
-                 <td class='' width="13%">
-                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
-                </td>
-                 <td class='' width="13%">
-                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
-                 </td>
-                 <td></td>
-                 <% end %>
-               </tr>
-               <%
-                   end
-                 end
-               %>
-             </tbody>
-           </table>
-         </div>
-         <div class="card-footer">
-           <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
-           </table>
-         </div>
-       </div>
-     </div>
+                          <td class='' width="17%">
+                            <button data-id="<%= sale_item.id %>" class='btn btn-primary btn-md cancel'>Cancel
+                              Void/Update
+                            </button>
+                          </td>
+                      <% else %>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
+                          </td>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
+                          </td>
+                          <td></td>
+                      <% end %>
+                    </tr>
+                <%
+                  end
+                  end
+                %>
+            </tbody>
+          </table>
+        </div>
+        <div class="card-footer">
+          <table class="table" id="order-charges-table" border="0">
+            <tr>
+              <td class="charges-name"><strong>Sub Total:</strong></td>
+              <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+            </tr>
+            <tr class="rebate_amount"></tr>
+          </table>
+        </div>
+      </div>
+    </div>
   </div>
 
- <!-- Column Three -->
- <div class="col-lg-2 col-md-2 col-sm-2">
-   <!-- Waiter Buttons -->
-   <button type="button" class="btn btn-primary btn-block" id='back' >Back</button>
-   <button type="button" class="btn btn-primary btn-block" id='cancel_all_void' >Cancel All Void</button>
-   <button type="button" class="btn btn-primary btn-block" id='apply' >Apply</button>
- </div>
+  <!-- Column Three -->
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <!-- Waiter Buttons -->
+    <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+    <button type="button" class="btn btn-primary btn-block" id='cancel_all_void'>Cancel All Void</button>
+    <button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>
+  </div>
 </div>
 <script>
-// Bill Request
-$(document).ready(function(){
-  
-  $(".update").on('click',function() {
-    var sale_item_id = $(this).attr('data-id');
-    var qty = $('#'+sale_item_id + "_qty").val();
-    var price = $('#'+ sale_item_id + "_price").val();
-    console.log(qty + "|" + price)
-    var ajax_url = "/origami/item_edit";
-    $.ajax({
-     type: "POST",
-     url: ajax_url,
-     data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
-     success:function(result){
-      $.confirm({
-        title: 'Alert!',
-        content: 'Qty and Price was successfully Updated',
-        buttons: {
+    // Bill Request
+    $(document).ready(function () {
 
-          confirm: {
-            text: 'Ok',
-            btnClass: 'btn-green btn-lg',
-            action: function(){
-              location.reload();
+        $(".update").on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var qty = $('#' + sale_item_id + "_qty").val();
+            var price = $('#' + sale_item_id + "_price").val();
+            console.log(qty + "|" + price)
+            var ajax_url = "/origami/item_edit";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price,
+                success: function (result) {
+                    $.confirm({
+                        title: 'Alert!',
+                        content: 'Qty and Price was successfully Updated',
+                        buttons: {
+
+                            confirm: {
+                                text: 'Ok',
+                                btnClass: 'btn-green btn-lg',
+                                action: function () {
+                                    location.reload();
+                                }
+                            }
+                        }
+                    });
+
+                }
+            });
+        });
+
+        $('.void').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_void";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+        $('.foc').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_foc";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+        $('.cancel').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_void_cancel";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+
+    })
+
+    $('#back').on('click', function () {
+        var table_id = '<%= @table_id %>'
+        window.location.href = '/origami/table/' + table_id;
+    })
+
+    $('#cancel_all_void').on('click', function () {
+        var sale_id = "<%= @saleobj.sale_id %>"
+        var ajax_url = "/origami/cancel_all_void";
+        $.ajax({
+            type: "POST",
+            url: ajax_url,
+            data: 'sale_id=' + sale_id,
+            success: function (result) {
+                location.reload();
             }
-          }  
-        }
-      });
+        });
+    })
 
-    }
-  });
-  });
-
-  $('.void').on('click',function(){
-    var sale_item_id = $(this).attr('data-id');
-    var ajax_url = "/origami/item_void";
-    $.ajax({
-      type: "POST",
-        url: ajax_url,
-        data: 'sale_item_id='+ sale_item_id,
-        success:function(result){
-          location.reload();
-        }
-    });
-  })
-
-  $('.cancel').on('click',function(){
-    var sale_item_id = $(this).attr('data-id');
-    var ajax_url = "/origami/item_void_cancel";
-    $.ajax({
-      type: "POST",
-        url: ajax_url,
-        data: 'sale_item_id='+ sale_item_id,
-        success:function(result){
-          location.reload();
-        }
-    });
-  })
-
-
-})
-
-$('#back').on('click',function(){
-  var table_id = '<%= @table_id %>'
-  window.location.href = '/origami/table/'+ table_id;
-})
-
-$('#cancel_all_void').on('click',function(){
-  var sale_id = "<%= @saleobj.sale_id %>"
-  var ajax_url = "/origami/cancel_all_void";
-  $.ajax({
-    type: "POST",
-      url: ajax_url,
-      data: 'sale_id='+ sale_id,
-      success:function(result){
-        location.reload();
-      }
-  });
-})
-
-$('#apply').on('click',function(){
-  var sale_id = "<%= @saleobj.sale_id %>"
-  var ajax_url = "/origami/apply_void";
-  var table_id = '<%= @table_id %>'
-  $.ajax({
-    type: "POST",
-      url: ajax_url,
-      data: 'sale_id='+ sale_id,
-      success:function(result){
-        window.location.href = '/origami/table/'+ table_id ;
-      }
-  });
-})
+    $('#apply').on('click', function () {
+        var sale_id = "<%= @saleobj.sale_id %>"
+        var ajax_url = "/origami/apply_void";
+        var table_id = '<%= @table_id %>'
+        $.ajax({
+            type: "POST",
+            url: ajax_url,
+            data: 'sale_id=' + sale_id,
+            success: function (result) {
+                window.location.href = '/origami/table/' + table_id;
+            }
+        });
+    })
 </script>
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index ba703aae..f9079f99 100644
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -5,10 +5,6 @@
     <%= f.input :name %>
     <%= f.input :unique_code %>
     <%= f.input :template %>
-    <%= f.input :db_name %>
-    <%= f.input :db_type %>
-    <%= f.input :db_username %>
-    <%= f.input :db_password %>
     <%= f.input :printer_name %>
     <%= f.input :api_settings %>
     <%= f.input :page_width %>
diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb
index 9c8ce0b0..c16a28c2 100644
--- a/app/views/print_settings/index.html.erb
+++ b/app/views/print_settings/index.html.erb
@@ -16,11 +16,7 @@
       <tr>
         <th>Name</th>
         <th>Unique code</th>
-        <!--<th>Template</th>
-         <th>Db name</th>
-        <th>Db type</th>
-        <th>Db username</th>
-        <th>Db password</th> -->
+        <th>Template</th>
         <th>Printer name</th>
         <th>Api settings</th>
         <th>Page width</th>
@@ -38,11 +34,7 @@
         <tr>
           <td><%= print_setting.name %></td>
           <td><%= print_setting.unique_code %></td>
-          <!--<td><%= print_setting.template %></td>
-           <td><%= print_setting.db_name %></td>
-          <td><%= print_setting.db_type %></td>
-          <td><%= print_setting.db_username %></td>
-          <td><%= print_setting.db_password %></td> -->
+          <td><%= print_setting.template %></td>
           <td><%= print_setting.printer_name %></td>
           <td><%= print_setting.api_settings %></td>
           <td><%= print_setting.page_width %></td>
diff --git a/app/views/print_settings/show.html.erb b/app/views/print_settings/show.html.erb
index 71d74950..46126c4b 100644
--- a/app/views/print_settings/show.html.erb
+++ b/app/views/print_settings/show.html.erb
@@ -29,22 +29,6 @@
           <th>Template</th>
           <td><%= @print_setting.template %></td>
         </tr>
-        <tr>
-          <th>Db name</th>
-          <td><%= @print_setting.db_name %></td>
-        </tr>
-        <tr>
-          <th>Db type</th>
-          <td><%= @print_setting.db_type %></td>
-        </tr>
-        <tr>
-          <th>Db username</th>
-          <td><%= @print_setting.db_username %></td>
-        </tr>
-        <tr>
-          <th>Db password</th>
-          <td><%= @print_setting.db_password %></td>
-        </tr>
         <tr>
           <th>Printer name</th>
           <td><%= @print_setting.printer_name %></td>
diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb
index 47801ef6..2349025a 100644
--- a/app/views/settings/dining_charges/_form.html.erb
+++ b/app/views/settings/dining_charges/_form.html.erb
@@ -2,10 +2,10 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :item_code %>
+    <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
     <%= f.input :unit_price %>
     <%= f.input :taxable %>
-    <%= f.input :charge_type %>
+    <%= f.input :charge_type, :collection => [:hr, :day] %>
     <%= f.input :minimum_free_time %>
     <%= f.input :charge_block %>
     <%= f.input :time_rounding %>
@@ -16,3 +16,4 @@
     <%= f.button :submit %>
   </div>
 <% end %>
+
diff --git a/app/views/settings/dining_charges/new.html.erb b/app/views/settings/dining_charges/new.html.erb
index 1caba288..2aa13a4b 100644
--- a/app/views/settings/dining_charges/new.html.erb
+++ b/app/views/settings/dining_charges/new.html.erb
@@ -16,3 +16,17 @@
 		</div>
     <%= render 'form', dining_charge: @dining_charge %>
 </div>
+<script>
+function randomNumber(len) {
+    var randomNumber;
+    var n = '';
+
+    for(var count = 0; count < len; count++) {
+        randomNumber = Math.floor(Math.random() * 10);
+        n += randomNumber.toString();
+    }
+    return n;
+}
+
+document.getElementById("item_code").value = "<%= @zone.id %>"+"<%= @settings_dining_facility.id %>"+"_"+randomNumber(5);
+</script>
\ No newline at end of file
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 25af618c..a0118e61 100644
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -7,6 +7,28 @@
     <%= f.input :seater %>
     <%= f.input :order_by %>
     <%= f.input :is_active %>
+    <% if @settings_room.dining_charges.length == 0 %>
+     <% if @settings_room.id != nil %>
+        <div class="div-border">
+              <div class="col-md-10">
+                  <%= link_to 'Add For Extra Charges', new_settings_zone_room_dining_charge_path(@zone,@settings_room),:class => 'btn btn-primary' %>
+              </div>
+        </div>
+      <% end %>
+    <% else %>
+      <%  @settings_room.dining_charges.each do |dc| %>
+      <div class="div-border">
+            <div class="col-md-10"><b><u>Dining Charge</u></b></div>
+            <div class="col-md-10">item code   :  <%= dc.item_code %></div>
+            <div class="col-md-10">Unit price  :  <%= dc.unit_price %></div>
+            <div class="col-md-10">Charge type :  <%= dc.charge_type %></div>
+            <div class="col-md-10">
+              <%= link_to 'Edit Charges', edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc),:class => 'btn btn-primary' %>
+              <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_room_dining_charge_path(@zone,@settings_room,dc) %>">Edit Charge</button> -->
+            </div>
+      </div>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="form-actions">
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 3d641592..9736f523 100644
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -8,11 +8,13 @@
     <%= f.input :order_by %>
     <%= f.input :is_active %>
     <% if @settings_table.dining_charges.length == 0 %>
-    <div class="div-border">
-          <div class="col-md-10">
-              <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
-          </div>
-    </div>
+      <% if @settings_table.id != nil %>
+        <div class="div-border">
+              <div class="col-md-10">
+                  <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
+              </div>
+        </div>
+      <% end %>
     <% else %>
       <%  @settings_table.dining_charges.each do |dc| %>
       <div class="div-border">
diff --git a/config/routes.rb b/config/routes.rb
index 4286303d..5a1a8aaa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     post 'moving' => "movetable#moving"
     get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
+    post 'item_foc' => "sale_edit#item_foc"
     post 'item_edit' => "sale_edit#item_edit"
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
diff --git a/db/migrate/20170811052036_create_dining_charges.rb b/db/migrate/20170811052036_create_dining_charges.rb
index 3a77ad18..d4ef2a2c 100644
--- a/db/migrate/20170811052036_create_dining_charges.rb
+++ b/db/migrate/20170811052036_create_dining_charges.rb
@@ -10,6 +10,7 @@ class CreateDiningCharges < ActiveRecord::Migration[5.1]
       t.time :charge_block
       t.string :time_rounding, :default => "down"
       t.time :time_rounding_block
+      t.integer :time_rounding_block_price, :default => 0
       t.timestamps
     end
   end
diff --git a/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb
new file mode 100644
index 00000000..48a7de5d
--- /dev/null
+++ b/db/migrate/20170814041543_remove_d_bcols_from_print_settings.rb
@@ -0,0 +1,8 @@
+class RemoveDBcolsFromPrintSettings < ActiveRecord::Migration[5.1]
+  def change
+  	remove_column :print_settings, :db_name, :string
+  	remove_column :print_settings, :db_type, :string
+  	remove_column :print_settings, :db_username, :string
+  	remove_column :print_settings, :db_password, :string
+  end
+end