Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

app/assets/javascripts/OQS.js

@@ -46,72 +46,71 @@ $(document).ready(function(){
     }); //End Click
  
 	function show_details(url){  
-	   var oqs_append = $('.oqs_append');
+	     var oqs_append = $('.oqs_append');
-	   oqs_append.empty();
+	     oqs_append.empty();
-	   var filter = $('.filter').text();
+	     var filter = $('.filter').text();
-	  //Start Ajax
+	    //Start Ajax
-	  $.ajax({      
+	    $.ajax({      
-	    type: "GET",         
+	      type: "GET",         
-	    url: url, 
+	      url: url, 
-	    data: {'filter':filter},
+	      data: {'filter':filter},
-	    dataType: "json",
+	      dataType: "json",
-	    success: function(data) {
+	      success: function(data) {
-	        for(var field in data) {
+	          for(var field in data) {
-	          var price = parseFloat(data[field].price).toFixed(2);
+	            var price = parseFloat(data[field].price).toFixed(2);
 
-	          if (data[field]["options"] == "[]" || data[field]["options"] == "") {
+	            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
-	           var options = "";
+	             var options = "";
-	          }else{
+	            }else{
-	           var options = data.options;
+	             var options = data.options;
+	            }
+
+	            var date = new Date(data[field]["created_at"]); 
+	          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	             
+	            row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+	                    +'<div class="card-block">'
+	                        +'<h6 class="card-">'
+	                          +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+	                          +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+	                          +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+	                        +'</h6>'
+
+	                        +'<h6>'
+	                          +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+	                          +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+	                        +'</h6>'
+
+	                        +'<p class="card-text item-options">'+ options +'</p>'
+
+	                        +'<p class="card-text">'
+	                          +'<small class="text-muted">Order at'
+	                            +'<span class="order-at">'+ show_date +'</span> - '
+
+	                            +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+	                            +'</small> '
+	                        +'</p>'
+
+	                        +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
+	                        +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
+	                    +'</div>'
+
+	                    +'<div class="card-footer">'
+	                        +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+	                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+	                    +'</div>'
+
+	                +'</div>'; 
+	                    
+	                   
+	                   
+	              $('.oqs_append').append(row);
 	          }
 	          
-	          var date = new Date(data[field]["created_at"]); 
+	       }
-          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+	    });
-	           
+	    //end Ajax 
-	          row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+	  }
-	                  +'<div class="card-block">'
-	                      +'<h4 class="card-title">'
-	                        +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
-	                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
-	                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
-	                      +'</h4>'
-
-	                      +'<h4>'
-	                        +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
-	                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
-	                      +'</h4>'
-
-	                      +'<p class="card-text item-options">'+ options +'</p>'
-
-	                      +'<p class="card-text">'
-	                        +'<small class="text-muted">Order at'
-	                          +'<span class="order-at">'+ show_date +'</span> - '
-
-	                          +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
-	                          +'</small> '
-	                      +'</p>'
-
-	                      +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
-	                      +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
-	                  +'</div>'
-
-	                  +'<div class="card-footer">'
-	                      +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
-	                      +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
-	                  +'</div>'
-
-	              +'</div>'; 
-	                  
-	                 
-	                 
-	            $('.oqs_append').append(row);
-	        }
-	        
-	     }
-	  });
-	  //end Ajax 
-
-	}
 
 	$(document).on('click', '.queue_station', function(event){ 
 	    var orderZone=$(this).children().children().children('.order-zone').text().trim();
@@ -198,7 +197,20 @@ $(document).ready(function(){
 	      	// update queue item count in completed station
 	      	$("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
 
-	      	alert("updated!");
+	      	swal({
+		          title: "Infomation !",
+		          text: 'Order has been successfully created',
+		          confirmButtonColor: "green",
+		          confirmButtonText: "Yes!",
+		          closeOnConfirm: false,
+		        }, function () {
+		          if(table_type == "Table"){
+		                  window.location.href = "/origami/table/" + table_id
+		                }
+		                else {
+		                  window.location.href = "/origami/room/" + table_id
+		                }    
+		        });
 	      	// Page reload
 	    	location.reload();
 	      }

app/assets/javascripts/addorder.js

@@ -664,23 +664,19 @@ $(function(){
       dataType: "json",
       success:function(result){ 
         $("#loading_wrapper").hide(); 
-        $.confirm({
+        swal({
-          title: 'Infomation!',
+          title: "Infomation !",
-          content: "Order has been successfully created",
+          text: 'Order has been successfully created',
-          buttons: {
+          confirmButtonColor: "green",
-            confirm: {
+          confirmButtonText: "Yes!",
-              text: 'Ok',
+          closeOnConfirm: false,
-              btnClass: 'btn-green',
+        }, function () {
-              action: function(){
+          if(table_type == "Table"){
-                if(table_type == "Table"){
                   window.location.href = "/origami/table/" + table_id
                 }
                 else {
                   window.location.href = "/origami/room/" + table_id
                 }    
-              }
-            }
-          }
         });                 
       }
     });

app/assets/javascripts/custom.js

@@ -26,6 +26,9 @@ $(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
     var html_text = $( this ).siblings( "#delete_text" ).html();
+    console.log(method);
+    console.log(url);
+    console.log(html_text);
     swal({
         title: "Confirmation",
         text: html_text,

app/assets/stylesheets/addorder.scss

@@ -1,9 +1,3 @@
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-@import "jquery-ui";
-@import "bootstrap-datepicker3";
-
 .custom-card-head{
     height: 40px;
     background-color: #54A5AF;
@@ -11,7 +5,6 @@
     color :#fff;
 
 }
-
 .custom-card {
     border: 2px solid rgba(0, 0, 0, 0.125) !important;
 }
@@ -126,6 +119,10 @@ element.style {
   margin-bottom:10px;
 }
 
+section.content{
+  padding-top:-50px !important;
+}
+
 /*Loading gif for payment*/
 
 #loading_wrapper{

app/assets/stylesheets/reset.css

@@ -187,7 +187,9 @@ section.content {
 .hidden{
   display: none !important;
 }
-
+.hide{
+  display: none !important;
+}
 .sidebar .menu .list a {
   padding: 5px 13px;
 }

app/controllers/origami/addorders_controller.rb

@@ -34,7 +34,6 @@ class Origami::AddordersController < BaseOrigamiController
 
   def get_menu_category ()
     if (params[:id])
-      puts "sssssssssssss"
       puts params[:id]
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])

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

@@ -1,4 +1,4 @@
-<div class="container-fluid">
+
   <div class="page-header">
     <ul class="breadcrumb">
       <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -13,7 +13,7 @@
   <!-- Column One -->
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">  
-      <div class="body">
+      <div class="body p-l-10">
         <%= form_tag oqs_root_path, :method => :get do %>
         <div class="row clearfix">
           <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
@@ -76,26 +76,26 @@
        <div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:">
         <!--- Panel 0 - Completed -->
 
-        <div class="tab-pane fade in active" id="completed" role="tabpanel">
+        <div class="tab-pane in active" id="completed" role="tabpanel">
           <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
             <%   
             @queue_completed_item.each do |qid|                               
               %>
               <div class="card queue_station">
                 <div class="card-block">
-                  <h4 class="card-title">
+                  <h5 class="card-">
                     <span class="order-zone-type"><%= qid.type %> - </span>
                     <span class="order-zone"><%= qid.zone %></span>
                     <small class="pull-right"><%= qid.order_id %></small>
-                  </h4> 
+                  </h5> 
-                  <h4>
+                  <h5>
                     <span class="order-item">
                       <%= qid.item_name %>
                     </span> [x
                     <span class="order-qty">
                       <%= qid.qty %>
                     </span> ]   
-                  </h4>                  
+                  </h5>                  
 
                   <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
 
@@ -187,7 +187,7 @@
     </div>
   </div>
 </div>
-<script type="text/javascript">
+<!-- <script type="text/javascript">
   $(document).ready(function(){
 
   $(".nav-completed").on("click", function(){
@@ -413,4 +413,4 @@
     });
   });
 });
-</script>
+</script> -->

app/views/settings/accounts/index.html.erb

@@ -39,17 +39,8 @@
             <td><%= account.bonus %></td>
             <td><%= account.rebate %></td>
             <td>
+              <%= link_to t("views.btn.show"), settings_account_path(account),:class => 'btn btn-info btn-sm waves-effect' %>
               <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %> 
-              
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(account)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
-
-              <span class="hidden" id="delete_text">
-                  <h6>Are you sure you want to delete this row ?</h6>
-                  <h6>This action can't be undo. </h6> 
-              </span>
-              
             </td>
           </tr>
           <% end %>

app/views/settings/accounts/show.html.erb

@@ -1,11 +1,13 @@
 <!--  -->
 <div class="page-header">
- <ul class="breadcrumb">
+  <ol class="breadcrumb">
-  <li><a href="<%=  %>">Home</a></li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-  <li>Account</li>
+    <li class="breadcrumb-item"><a href="<%= settings_account_path %>">Account</a></li>
-  <span style="float: right">
+    <li class="breadcrumb-item active">Details</li>
-  </span>
+    <span class="float-right">
- </ul>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_account_path %>
+    </span>
+  </ol>
 </div>
 
 <br/>
@@ -34,7 +36,16 @@
           <!-- <td><%= @settings_account.bonus %></td> -->
           <td><%= @settings_account.rebate %></td>
 
-          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %></td>
+          <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %>
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
+                <%= t("views.btn.delete") %>
+            </button>
+
+            <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+            </span>
+          </td>
         </tr>
       </tbody>
     </table>

app/views/settings/membership_actions/show.html.erb

@@ -48,7 +48,14 @@
         <tr>
           <td colspan="2" align="right">
             <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
-            <%= link_to t("views.btn.delete"), settings_membership_action_path(@settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect', :disabled => "disabled" %>
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_action_path(@settings_membership_action)%>" data-method="delete">
+                <%= t("views.btn.delete") %>
+            </button>
+
+            <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+            </span>
           </td>
         </tr>
       </tbody>