diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2f5b5df2..7c27b267 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -47,11 +47,29 @@ font-size:20px; color:white; } +.payment{ + height:70px;line-height:70px;align:center;color:white;font-size:16px;margin-bottom:1px; +} + +.cash-color{ + background-color:#80CBC4; +} + +.credit-color{ + background-color:#FFCCBC; +} +.other-payment-color{ + background-color:#E1BEE7; +} .cashier_number:hover{ background:#A9F5F2; } +.style2 { + border-top: 3px double #8c8b8b; +} + .long{ width:49%; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 42c53b59..bfde77c9 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,7 +19,6 @@ class ApplicationController < ActionController::Base def current_login_employee @employee = Employee.find_by_token_session(session[:session_token]) - @time = Time.now end private diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 6b83702a..fe36277b 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -90,31 +90,30 @@