From cb753ed4e44e80f6f8af0e2bdacfcdcdd0a77879 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Sat, 1 Jul 2017 15:25:34 +0630
Subject: [PATCH] shift | cash In | cash out

---
 app/views/origami/cash_ins/new.html.erb  | 35 ++++++++++++------------
 app/views/origami/cash_outs/new.html.erb | 21 ++++++++------
 app/views/origami/payments/show.html.erb |  6 ++--
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb
index 1c513895..41330fc5 100644
--- a/app/views/origami/cash_ins/new.html.erb
+++ b/app/views/origami/cash_ins/new.html.erb
@@ -24,26 +24,24 @@
               <button class='btn btn-primary payment-type' data-id='jcb' id='jcb'>JCB</button>
           </td>
         </tr>
+
+        <tr>
+          <td> Reference Number
+          </td>
+          <td><input type='text' id='payment_method_reference'/></td>
+        </tr>
+        <tr>
+          <td> Amount
+          </td>
+          <td><input type='text' id='amount'/></td>
+        </tr>
       </table>
-      <div class='row'>
-        <div class='col-md-2'></div>
-        <div class='col-md-2'>Reference Number </div>
-        <div class='col-md-4'><input type='text' id='payment_method_reference'/> </div>
-      </div>
-      <br>
-      <div class='row'>
-        <div class='col-md-2'></div>
-        <div class='col-md-2'>Amount</div>
-        <div class='col-md-4'><input type='text' id='amount'/></div>
-      </div>
-      <br><br>
-      <div class='row'>
-        <div class='col-md-3'></div>
-        <div class='col-md-4'><button class='btn btn-primary btn-lg' id='cash_in' style='width:200px;'> Cash In</button></div>
-      </div>
+    
+
     </div>
     <div class="col-lg-1 col-md-1 col-sm-1">
-      <button class='btn btn-primary ' id='cash_in' style='width:100px;'> Back </button>
+      <button type="button" class="btn btn-primary btn-block" id='back'> Back </button>
+      <button type="button" class="btn btn-primary btn-block" id='cash_in'> Cash In </button>
     </div>
 </div>
 
@@ -76,4 +74,7 @@ $('#cash_in').on('click',function(){
     }
   });
 })
+$('#back').on('click',function(){
+   window.location.href = '/origami';
+})
 </script>
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb
index 17f9bdf8..9d628f24 100644
--- a/app/views/origami/cash_outs/new.html.erb
+++ b/app/views/origami/cash_outs/new.html.erb
@@ -1,6 +1,8 @@
-<h2>Payment Debit</h2>
+
+
 <div class='row'>
-    <div class='col-md-9'>
+  <div class="col-lg-11 col-md-11 col-sm-11">
+    <h2>Payment Debit</h2>
       <table class='table table-striped'>
         <tr>
           <td> Payment Reference
@@ -20,13 +22,12 @@
       </table>
 
     </div>
+    <div class="col-lg-1 col-md-1 col-sm-1">
+      <button type="button" class="btn btn-primary btn-block" id='back'> Back </button>
+      <button type="button" class="btn btn-primary btn-block" id='cash_out'> Cash Out </button>
+    </div>
+</div>
 
-</div>
-<br><br>
-<div class='row'>
-  <div class='col-md-3'></div>
-  <div class='col-md-4'><button class='btn btn-primary btn-lg' id='cash_out'> Cash Out</button></div>
-</div>
 <script>
 
 $('#cash_out').on('click',function(){
@@ -41,4 +42,8 @@ $('#cash_out').on('click',function(){
     }
   });
 })
+
+$('#back').on('click',function(){
+    window.location.href = '/origami';
+})
 </script>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 4004e9cf..860633a4 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -188,10 +188,10 @@
         <div class="col-md-4" id="mastercount">0.0</div>
       </div>
       <% end %>
-      <hr class="style2">
+      <br>
     <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 class="col-md-8"><strong style="font-size:18px;">Balance</strong></div>
+      <div class="col-md-4"><strong style="font-size:18px;"><span id='balance'><%= @sale_data.grand_total %></span></strong></div>
     </div>
     <br>