merge with origin

app/assets/javascripts/application.js

@@ -21,7 +21,8 @@
 //= require settings/processing_items
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
-//= require bootstrap-select/js/bootstrap-select
+//= require bootstrap/js/bootstrap.js
+//= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
@@ -58,20 +59,6 @@ $(document).on('turbolinks:load', function() {
    
 });
 
-function showConfirmMessage() {
-    swal({
-        title: "Information",
-        text: "You will not be able to recover this imaginary file!",
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "OK",
-        closeOnConfirm: true
-    }, function () {
-        swal("Deleted!", "Your imaginary file has been deleted.", "success");
-    });
-}
-
 $(function(){
 
   $('body').bootstrapMaterialDesign();
@@ -139,11 +126,10 @@ $(function(){
   $('.delete').click(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
-    var html = $( this ).siblings( "#delete_text" ).html();
+    var html_text = $( this ).siblings( "#delete_text" ).html();
-    console.log(html);
     swal({
         title: "Confirmation",
-        text: html,
+        text: html_text,
         type: "warning",
         showCancelButton: true,
         confirmButtonColor: "#DD6B55",

app/assets/stylesheets/application.scss

@@ -3,9 +3,8 @@
 @import "node-waves/waves";
 @import "animate-css/animate";
 @import "sweetalert/sweetalert.css";
-@import "multi-select/css/multi-select";
+@import "multi-select/css/multi-select.css";
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
-@import "bootstrap-select/css/bootstrap-select";
 @import "morrisjs/morris";
 @import "fileinput.min";
 @import "BSBMaterial/style";
@@ -62,7 +61,7 @@
 }
 
 section.content {
-  margin: 50px 15px 0 225px;
+  margin: 60px 15px 0 225px;
 }
 
 .sidebar {
@@ -81,10 +80,6 @@ section.content {
   top: 50px;
 }
 
-.nav-tabs li a.active {
-  color: #000 !important; 
-}
-
 .info-box {
   margin-bottom: 20px;
 }
@@ -148,7 +143,43 @@ section.content {
   top: 0px; 
   margin-left: 0px; 
 }
+.nav {
+    padding-left: 0;
+    margin-bottom: 0;
+    list-style: none;
+}
 
+.nav > li > a {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+}
+
+.nav-tabs > li {
+    float: left;
+    margin-bottom: -1px;
+}
+
+.nav-tabs li a.active {
+  color: #000 !important; 
+   border-bottom: 2px solid #2196F3 !important;
+}
+
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+    color: #555;
+    cursor: default;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-bottom-color: transparent;
+}
+.nav-tabs > li > a {
+    margin-right: 2px;
+    line-height: 1.42857143;
+    text-decoration:none;
+}
+.nav-tabs .nav-link {
+    padding: 0.7286em .8575em;
+}
 /* End Reset Theme */
 /* *************************************************** */
 

app/controllers/api/orders_controller.rb

@@ -68,8 +68,7 @@ class Api::OrdersController <  Api::ApiController
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
               sale_status = check_order_with_booking(booking)
-               # puts "WWwwWWWWWWww"
+
-               # puts sale_status
               if sale_status
                 return return_json_status_with_code(400, "bill requested")
               end
@@ -79,8 +78,7 @@ class Api::OrdersController <  Api::ApiController
             end
           else
               sale_status = check_order_with_table(params[:table_id])
-               # puts "OOOOOOOOO"
+
-               # puts sale_status
               if sale_status
                 return return_json_status_with_code(400, "bill requested")
               end
@@ -88,8 +86,7 @@ class Api::OrdersController <  Api::ApiController
         end #booking exists
       else
         sale_status = check_order_with_table(params[:table_id])
-         # puts "MMMMMMMM"
+
-         # puts sale_status
         if sale_status
           # return false , @message = "bill requested"
           return return_json_status_with_code(400, "bill requested")

app/views/crm/customers/index.html.erb

@@ -9,7 +9,7 @@
   </span>
  </ul>
 </div>
-<br />
+
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">
       <!-- <div class="main-box-body clearfix"> -->

app/views/crm/customers/show.html.erb

@@ -1,18 +1,17 @@
 <div class="row">
   <div class="col-lg-11 col-md-11 col-sm-11">
     <!-- Column One -->
-  
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs tab-col-purple" role="tablist">
+    <ul class="nav nav-tabs tab-nav-right" role="tablist">
       
-      <li role="presentation" class="nav-item">
+      <li role="presentation" class="active nav-item">
-        <a class="nav-link active" data-toggle="tab" href="#customer" aria-expanded="true">Customer Details</a>
+        <a class="nav-link" data-toggle="tab" href="#customer" >Customer Details</a>
       </li>
-      <li class="nav-item" role="presentation">
+      <li role="presentation" class="nav-item" >
-        <a class="nav-link " data-toggle="tab" href="#order" aria-expanded="true">Order Details</a>
+        <a class="nav-link" data-toggle="tab" href="#order" >Order Details</a>
       </li>
-      <li class="nav-item" role="presentation">
+      <li role="presentation" class="nav-item" >
-        <a class="nav-link" data-toggle="tab" href="#sale" aria-expanded="true">Sale Details</a>
+        <a class="nav-link" data-toggle="tab" href="#sale" >Sale Details</a>
       </li>
     </ul>
     <!-- Nav tabs - End -->

app/views/layouts/_header.html.erb

@@ -1,4 +1,4 @@
-Search Bar -->
+<!-- Search Bar -->
 <!-- <div class="search-bar">
     <div class="search-icon">
         <i class="material-icons">search</i>
@@ -32,15 +32,12 @@ Search Bar -->
             <ul class="dropdown-menu">
                 <li>
                     <%if current_login_employee.role !="waiter" %>
-                    <%= link_to (t :logout),logout_path, method: :delete,"data-no-turbolink" => true, data: {confirm: 'Are you sure?'} %>
+                        <p class="delete  waves-effect waves-block" style="margin:0.5rem 1rem !important;" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
-                    <%end%>
-                    
-                    <p class="delete" style="" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
                          <span class="hidden" id="delete_text">
                             <h6>Are you sure you want to Logout ?</h6>
                             <!-- <h6>This action can't be undo. </h6> -->
                         </span>
-                    
+                    <%end%>
                 </li>   
             </ul>
             <a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
@@ -49,9 +46,3 @@ Search Bar -->
         </div>
     </div>
 </nav>
-<!-- #Top Bar
-
- <!-- <form action="<%=logout_path%>" method="DELETE">
-                <button type="text" class="delete" value="x" >DELETE</button>
-           </form> -->
-                <!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a>

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

@@ -20,7 +20,7 @@
    </ul>
    <!-- Nav tabs - End -->
 
-   <div class="tab-content" id="custom-slimscroll">
+   <div class="tab-content m-t-10"  id="custom-slimscroll">
      <!--- Panel 0 - Completed Orders -->
      <div class="tab-pane dining" id="Completed " role="tabpanel">
        <div class="card-columns">

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

@@ -2,13 +2,10 @@
     <div class="row clearfix">
         <!-- Column One -->
         <div class="col-lg-6 col-md-6 col-sm-6">
-
           <!-- Nav tabs -->
-
           <ul class="nav nav-tabs tab-col-teal" role="tablist">
             <li class="nav-item">
               <a class="nav-link" data-toggle="tab" href="#completed" role="tab">Completed</a>
-
             </li>
             <li class="nav-item">
               <a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Tables</a>
@@ -22,9 +19,8 @@
           </ul>
           <!-- Nav tabs - End -->
           <div id="custom-slimscroll">
-          <div class="tab-content" >
+            <div class="tab-content m-t-10">
               <!--- Panel 0 - Completed Orders -->
-
               <div class="tab-pane dining" id="completed" role="tabpanel">
                 <div class="card-columns">
                   <% @complete.each do |sale| %>

app/views/origami/rooms/show.html.erb

@@ -20,7 +20,7 @@
    </ul>
    <!-- Nav tabs - End -->
    <div id="custom-slimscroll">
-     <div class="tab-content" >
+     <div class="tab-content m-t-10" >
        <!--- Panel 0 - Completed Orders -->
        <div class="tab-pane dining" id="completed" role="tabpanel">
          <div class="card-columns">

app/views/settings/employees/_form.html.erb

@@ -1,5 +1,3 @@
-
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <%= simple_form_for([:settings,@employee]) do |f| %>
@@ -7,7 +5,7 @@
 
   <div class="form-inputs">
     <%= f.input :name %>
-    <%= f.input :role, :collection => Lookup.collection_of("employee_roles") %>
+    <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
     <%= f.input :emp_id, :as => :integer, :label => "Employee Numberic ID (*Unique)" %>
     <%= f.input :password %>
 

app/views/settings/employees/edit.html.erb

@@ -9,5 +9,4 @@
     </span>
   </ol>
 </div>
-
  <%= render 'form', employee: @employee %>

app/views/settings/employees/new.html.erb

@@ -9,5 +9,4 @@
     </span>
   </ol>
 </div>
-
  <%= render 'form', employee: @employee %>