fixed conflict

app/views/origami/home/index.html.erb

@@ -1,7 +1,7 @@
 <div class="container-fluid">
 <div class="row">
  <!-- Column One -->
- <div class="col-lg-10 col-md-10 col-sm-10">
+ <div class="<%= @webview==true ? 'col-lg-12 col-md-12 col-sm-12' : 'col-lg-10 col-md-10 col-sm-10' %>">
 
    <!-- Nav tabs -->
    <ul class="nav nav-tabs tab-col-teal" role="tablist">
@@ -80,8 +80,12 @@
        <div class="card-columns">
          <% @rooms.each do |room| %>
            <% if room.status == 'occupied' %>
+            <% if room.get_booking.nil? %>
              <div class="card rooms red text-white" data-id="<%= room.id %>">
-               <div class="card-block">
+            <% else %>
+              <div class="card rooms blue text-white" data-id="<%= room.id %>">
+            <% end %>
+              <div class="card-block">
                   <%= room.name %>
                </div>
              </div>
@@ -112,11 +116,15 @@
    </div>
    <!-- tabs - End -->
  </div>
- <div class="col-lg-2 col-md-2 col-sm-2">
+ <div class="<%= @webview==true ? 'hidden' : 'col-lg-2 col-md-2 col-sm-2' %>">
    <!-- <button id="refreshbutton" type="button" class="btn btn-block radius-btn"> Refresh off </button> -->
+   <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+            <i class="material-icons">reply</i>
+             <%= t("views.btn.back") %>
+          </button>
    <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
-      <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
-      </button>
+      <!-- <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
+      </button> -->
    <%end%>
    <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
@@ -131,6 +139,10 @@
  <!-- Column One -->
 <script>
 $(document).ready(function(){
+  var webview = <%= @webview %>;
+
+  showHideNavbar(webview,"index");
+
   $(".tables").on('click', function(){
       var dining_id = $(this).attr("data-id");
       window.location.href = '/origami/table/' + dining_id;
@@ -231,10 +243,25 @@ $('#cash_out').on('click',function(){
   window.location.href  = '/origami/cash_outs/new';
 })
 
-$('#close_cashier').on('click',function(){
-  window.location.href = '/origami/shift/close';
+$('#close_cashier').on('click',function(e){
+    e.preventDefault(); // Prevent the href from redirecting directly
+    var linkURL = '/origami/shift/cashier/close';
+    warnBeforeRedirect(linkURL);
 })
+
 $('#back').on('click',function(){
-  window.location.href = '/dashboard';
+  window.location.href = '/origami/dashboard';
 })
+
+function warnBeforeRedirect(linkURL) {
+    swal({
+      title: "Alert!", 
+      text: "Are you sure you want to close cashier?", 
+      type: "warning",
+      showCancelButton: true
+    }, function() {
+      // Redirect the user
+      window.location.href = linkURL;
+    });
+  }
 </script>