diff --git a/.gitignore b/.gitignore index b6d9a051..38026948 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,7 @@ config/deploy/config/* /dump.rdb # Fonts -public/fonts/* +# public/fonts/* # Ruby-Mine IDE folder /.idea diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index fa61114f..c211b8e6 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,17 +1,15 @@
+ <% if current_login_employee.role == "admin" %> - <% if current_login_employee.role = "admin" %> - - <% elsif current_login_employee.role = "cashier" %> + <% elsif current_login_employee.role == "cashier" %> <%= link_to "Cashier Station", origami_path %> - <% elsif current_login_employee = "account" %> + <% elsif current_login_employee.role == "account" %> <%= link_to "Cashier Station", oishi_path %> <% else %> <%= link_to "Cashier Station", oishi_path %> <% end %> <% shop = Shop.first %> -
diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/public/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 00000000..1413fc60 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.ttf differ diff --git a/public/fonts/glyphicons-halflings-regular.woff b/public/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 00000000..9e612858 Binary files /dev/null and b/public/fonts/glyphicons-halflings-regular.woff differ