From b889603ce658343c58ceafbb34514c727d36f7cd Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Wed, 21 Jun 2017 09:33:39 +0630
Subject: [PATCH] update

---
 app/assets/stylesheets/origami.scss       | 18 ++++++++++++++++++
 app/controllers/application_controller.rb |  1 -
 app/views/origami/payments/show.html.erb  | 19 +++++++++----------
 3 files changed, 27 insertions(+), 11 deletions(-)

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 @@
       <div class="col-md-8"><strong style="font-size:18px;">Amount Due</strong></div>
       <div class="col-md-4"><strong><span id="amount_due" style="font-size:18px;"><%= @sale_data.grand_total %></span></strong></div>
     </div>
-    <hr>
-    <div class="row">
+    <br>
+    <div class="row payment cash-color">
       <div class="col-md-8">Cash</div>
       <div class="col-md-4" id="cash" ><%= @cash %></div>
     </div>
-    <hr>
-    <div class="row" id="credit_payment">
+
+    <div class="row payment credit-color" id="credit_payment" >
       <div class="col-md-8">Credit</div>
       <div class="col-md-4" id="credit">0.0</div>
     </div>
-      <hr>
     <% if @other == 0.0 && @ppamount == 0.0 && @visacount == 0.0 && @jcbcount == 0.0 && @mastercount == 0.0%>
-      <div class="row" id="card_payment">
+      <div class="row payment other-payment-color" id="card_payment" >
         <div class="col-md-8">Other Payments</div>
         <div class="col-md-4" id="others"><%= @other %></div>
       </div>
     <% else %>
-      <div class="row" id="card_payment">
+      <div class="row payment other-payment-color" id="card_payment" >
         <div class="col-md-12">Other Payments</div>
       </div>
     <% end %>
 
        <!-- mpu -->
       <% if @other != 0.0 %>
-        <div class="row">
+        <div class="row payment other-payment-color" >
           <div class="col-md-5"></div>
           <div class="col-md-3">MPU</div>
           <div class="col-md-4" id="others"><%= @other %></div>
@@ -182,12 +181,12 @@
         <div class="col-md-4" id="mastercount">0.0</div>
       </div>
       <% end %>
-      <hr>
+      <hr class="style2">
     <div class="row">
       <div class="col-md-8">Balance</div>
       <div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
     </div>
-      <hr>
+    <br>
 
       <div class="row">
          <div class="col-lg-6 col-md-1 col-sm-1">