From 38bedf6129dfe9a8d08a08a60637f3ecc36a9c74 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 22 Feb 2018 09:42:55 +0630
Subject: [PATCH] change split bill btn

---
 app/views/origami/home/show.html.erb  | 11 +++++------
 app/views/origami/rooms/show.html.erb | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 3acbe738..8f17c2c4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -454,6 +454,11 @@
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> active="true"> Void</button>
                   <button type="button" id="discount" class="btn btn-block bg-blue waves-effect" <%= (can? :index, :discount)? ' ': 'disabled=' %> active="true">Discount</button>
                   <button type="button" id="other-charges" class="btn btn-block bg-blue waves-effect">Charges</button>
+                  <% if !@split_bill.nil? %>
+                    <% if @split_bill == '1' %>
+                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+                    <% end %>
+                  <% end %>
                    <!-- first bill not used in cloud -->
                   <% if ENV["SERVER_MODE"] == "cloud" %>
                     <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -465,12 +470,6 @@
                     <%end%> 
                   <% end %> 
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
-                  <% if !@split_bill.nil? %>
-                    <% if @split_bill == '1' %>
-                      <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
-                    <% end %>
-                  <% end %>
-                  
               <% end %>
               <!-- Cashier Buttons -->
 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 74c81b77..4434d45d 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -427,6 +427,11 @@
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
+        <% if !@split_bill.nil? %>
+          <% if @split_bill == '1' %>
+            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
+          <% end %>
+        <% end %>
          <!-- first bill not used in cloud -->
          <% if ENV["SERVER_MODE"] == "cloud" %>
          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
@@ -437,11 +442,6 @@
             <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
          <%end%>
          <%end%>
-         <% if !@split_bill.nil? %>
-          <% if @split_bill == '1' %>
-            <button type="button" id="split_bills" class="btn btn-block bg-blue waves-effect">Split Bill</button>
-          <% end %>
-        <% end %>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
        <!--  <button type="button" id="void" class="btn bg-blue btn-block" > Void </button> -->
      <% end %>