fix oqs css and oqs edit turbolink control

app/assets/javascripts/OQS.js

@@ -25,6 +25,9 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
+	$('#back').on('click', function () {
+        window.location.href = '/oqs/';
+    });
 
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
@@ -96,7 +99,7 @@ $(document).on('turbolinks:load', function() {
 	                    +'</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="edit_'+ data[field]["assigned_order_item_id"] + '" data-no-turbolink="true" 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>'
 

app/assets/stylesheets/OQS.scss

@@ -9,6 +9,37 @@
 @import "BSBMaterial/style";
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
+
+/* Reset */
+.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{
+  padding-left: 1px ;
+  padding-right: 1px ;
+}
+
+.table {
+	margin-bottom: 0px;
+}
+
+select.form-control {
+  height: inherit !important;
+}
+
+.form-horizontal .form-group {
+	margin-right: 0px !important;
+}
+
+.card-columns {
+	font-size: 18px !important;
+}
+
+@media (min-width:769px) and (max-width:1024px) {
+  .btn-block {
+      font-size: 11px !important;
+  }
+}
+
+/* End Reset */
+
 .order-completed {
   background-color: #CCFFDD;
 }

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

@@ -55,9 +55,9 @@
       <div class="body">
         <h6><i class="material-icons md-18">view_headline  QUEUE DETAILs</i> </h6>
         <p>
-        1) Latest Queue No - <%= @complete_queue.last.queue_no%> <br>
+        1) Latest Queue No - <%= @complete_queue.last.queue_no  rescue 0 %> <br>
-        2) Next Queue No - <% @next = @complete_queue.last.queue_no.to_i + 1%>  
+        2) Next Queue No - <% @next = (@complete_queue.last.queue_no.to_i rescue 0) + 1%>  
-         <%= @next%> <br>
+         <%= @next rescue 0 %> <br>
         3) Today Completed Queue - <strong> <%= @complete_queue.count %> </strong><br>
 
         <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>

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

@@ -1,15 +1,3 @@
-
-  <!-- <div class="page-header">
-    <ul class="breadcrumb">
-      <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
-      <li class="breadcrumb-item active"><%= t :OQS %></li>
-        <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> 
-      <span class="float-right">
-        <%= link_to 'Back', dashboard_path %>
-      </span>
-    </ul>
-  </div> -->
-
 <!-- Column One -->
 <div class="row clearfix">
   <div class="col-lg-8 col-md-8 col-sm-8">  
@@ -172,247 +160,20 @@
             </tbody>
           </table>
         </div>
-
       </div>
     </div>
   </div>
 
-  <!-- Column Three--->
+  <!-- Column Three -->
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
-    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+    <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+      <i class="material-icons m-t--10">reply</i>
+      Back
+    </button>
+    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</button>
     <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
    <!--    <a href="<%= dashboard_path %>" class="btn bg-blue btn-block btn-lg waves-effect" role="button" aria-haspopup="true"> Back </a> -->
       <!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
-
   </div>
 </div>
-</div>
-
-<!-- <script type="text/javascript">
-  $(document).ready(function(){
-
-  $(".nav-completed").on("click", function(){
-       $("#completed").removeClass('hide')
-       $(".oqs_append").addClass('hide')
-    });
-
-    $(".oqs_click").on("click", function(){
-       $(".oqs_click").removeClass('oqs_active');
-       $(".queue_station").removeClass('queue_station_box');
-       $("#completed").addClass('hide');
-       $(".oqs_append").removeClass('hide');
-       $(this).addClass('oqs_active');
-       $(".queue_station").addClass('queue_station_box');
-       var oqs_id = $(this).find(".oqs-id").text();
-       var url    = 'oqs/get_items/'+oqs_id;
-      
-       show_details(url);
-
-    }); //End Click
- 
-  function show_details(url){  
-     var oqs_append = $('.oqs_append');
-     oqs_append.empty();
-     var filter = $('.filter').text();
-    //Start Ajax
-    $.ajax({      
-      type: "GET",         
-      url: url, 
-      data: {'filter':filter},
-      dataType: "json",
-      success: function(data) {
-          for(var field in data) {
-            var price = parseFloat(data[field].price).toFixed(2);
-
-            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
-             var options = "";
-            }else{
-             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);
-          }
-          
-       }
-    });
-    //end Ajax 
-
-  }
-
-  $(document).on('click', '.queue_station', function(event){ 
-      var orderZone=$(this).children().children().children('.order-zone').text().trim();
-      // var orderItem=$(this).children().children().children('.order-item').text();
-      var assigned_item_id = $(this).children().find(".assigned-order-item").text();
-      var orderQty = $(this).children().children().children('.order-qty').text();   
-      var orderBy = $(this).children().children().children().children('.order-by').text();
-      var orderAt = $(this).children().children().children().children('.order-at').text();
-      var orderCustomer = $(this).children().children('.order-customer').text();
-      var order_status = $(this).children().children('.order-status').text();
-
-      $('#order-title').text("ORDER DETAILS - " + orderZone);
-      $('#order-by').text(orderBy);
-      $('#order-at').text(orderAt);
-      $('#order-customer').text(orderCustomer);
-      $('#order-from').text(orderZone);
-      // clear order items
-    $("#oqs-order-details-table").children("tbody").empty();
-      // Call get_order_items() for Order Items by dining
-      $.ajax({
-        type: 'GET',
-        url: '/oqs/' + orderZone,
-        data: { 'status' : order_status },
-        success: function(res){         
-          for (i = 0; i < res.length; i++) {            
-            var data = JSON.stringify(res[i]);  
-              var parse_data = JSON.parse(data); 
-              
-            var order_item_row = "<tr>" +
-                              "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + "</td>" +
-                              "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
-                             "</tr>";
-                  $("#oqs-order-details-table").children("tbody").append(order_item_row);
-          }         
-        }
-      })
-
-      // $('#order-items').text(orderItem);
-      // $('#order-qty').text(orderQty);
-
-      $('.queue_station').removeClass('selected-item');
-      $(this).addClass('selected-item');
-  });
-
-    $(document).on('click', '.order-item-edit', function(event){ 
-    var _self = $(this);  // To know in ajax return
-      var assigned_item_id=$(this).attr('id').substr(5);
-      window.location.href = '/oqs/'+ assigned_item_id  + "/edit"
-  });
-
-    // complete for queue item
- 
-    $(document).on('click', '.order-complete', function(event){ 
-      //e.preventDefault();
-      var _self = $(this);  // To know in ajax return
-      var assigned_item_id=$(this).attr('id').substr(15);
-      var params = { 'id':assigned_item_id };
-      
-      // Call update_delivery_status() for changed delivery and move to delivery   
-      $.ajax({
-        type: 'POST',
-        url: '/oqs/update_delivery',
-        data: params,
-        dataType: 'json',
-        success: function(data){
-          for (i = 0; i < data.length; i++) {
-            var queue_station = $('#assigned_queue_' + data[i]).parent().parent(".queue_station");
-            var station = queue_station.parent().parent().attr('id');
-
-            // Remove a queue card from current station
-            queue_station.remove();
-
-            // Remove a queue card from current station
-            queue_station.children('.card-footer').remove();
-
-            // Add removed queue card from station to completed
-            $("#completed").children('.card-columns').append(queue_station);
-
-            // update queue item count in each station
-            var station_count=parseInt($("#"+station+"_count").text()) - 1;
-            $("#"+station+"_count").text(station_count);
-          }
-
-          // update queue item count in completed station
-          $("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
-
-          alert("updated!");
-          // Page reload
-        location.reload();
-        }
-      });
-    });
-
-    // Print Order Item
-    $(document).on('click', '#print_order_item', function(event){ 
-      var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
-      var options = $('.selected-item').children('.card-block').find('.item-options').text();
-      var params = { 'options':options };
-
-      $.ajax({
-      type: 'GET',
-        url: '/oqs/print/print/'+assigned_item_id,
-        success: function(data){  }
-      });
-    });
-
-    // Print Order Summary
-    // $('#print_order_summary').on('click',function(){
-    $(document).on('click', '#print_order_summary', function(event){
-      var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
-      var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-      var params = { 'table_name':table_name };
-      $.ajax({
-      type: 'GET',
-        url: '/oqs/print/print_order_summary/'+assigned_item_id,
-        data: params,
-        success: function(data){  }
-      });
-    });
-
-  // Qty update for OQS Edit Controller
-  $('#qty-update').on('click', function(){
-    var qty_weight = $("input[name='qty_weight']").val();
-    var remarks = $("textarea[name='remarks']").val();
-    var order_items_id = $(this).attr('data-id');
-    var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
-    $.ajax({
-      type: 'POST',
-      url: '/oqs/' + order_items_id,
-      data: params,
-      success: function(result){
-        alert("Updated!");
-        window.location.href = '/oqs';
-      }
-    });
-  });
-});
-</script> -->