From 4899e624efd2237bb7d8d63f58e13bcea00e593a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 17 Nov 2017 09:56:40 +0630
Subject: [PATCH 1/5] change dashboard ui

---
 app/controllers/home_controller.rb |  2 +-
 app/models/sale.rb                 |  2 +-
 app/views/home/dashboard.html.erb  | 74 ++++++++++++------------------
 3 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 74cc9ba9..d8592664 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -91,7 +91,7 @@ class HomeController < ApplicationController
       end
     end
     @summ_sale              = Sale.summary_sale_receipt(today)
-
+    p @summ_sale
     @total_customer         = Sale.total_customer(today)
     @total_dinein           = Sale.total_dinein(today)
     @total_takeaway         = Sale.total_takeaway(today)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 696e0598..ef00fb6a 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -954,7 +954,7 @@ end
   end
 
   def self.summary_sale_receipt(today)
-    query = Sale.select('count(sale_id) as total_receipt, sum(total_amount) as total_amount, sum(grand_total) as grand_total, sum(total_discount) as total_discount, sum(total_tax) as total_tax')
+    query = Sale.select('count(sale_id) as total_receipt, (case when sum(total_amount) > 0 then sum(total_amount) else 0.0 end) as total_amount, (case when sum(grand_total) > 0 then sum(grand_total) else 0.0 end) as grand_total, (case when sum(total_discount) > 0 then sum(total_discount) else 0.0 end) as total_discount, (case when sum(total_tax) > 0 then sum(total_tax) else 0.0 end) as total_tax')
           .where('sale_status = "completed" and DATE_FORMAT(receipt_date,"%Y-%m-%d") = ?',today)
           .first()
   end
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index fa0c9c72..2de6f67d 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -103,9 +103,9 @@
       </div>
     </div>
     <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
+    <% if !@summ_sale.nil? %>
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-          <% if !@summ_sale.nil? %>
           <div class="card">
             <div class="body">
               <h6>Sale</h6>
@@ -157,9 +157,9 @@
               </table>
             </div>
           </div>
-          <% end %>
         </div>
       </div>
+      <% end %>
 
       <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
@@ -168,44 +168,34 @@
               <h6>Customer</h6>
               <table class="table">
                 <% if !@total_customer.nil? %>
-                  <% if @total_customer.total_cus > 0 %>
-                    <tr>
-                      <td>Total Customer : </td>
-                      <td align="right"><%= @total_customer.total_cus %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Total Customer : </td>
+                    <td align="right"><%= @total_customer.total_cus %></td>
+                  </tr>
                 <% end %>
                 <% if !@total_dinein.nil? %>
-                  <% if @total_dinein.total_dinein_cus > 0 %>
-                    <tr>
-                      <td>Dine in : </td>
-                      <td align="right"><%= @total_dinein.total_dinein_cus %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Dine in : </td>
+                    <td align="right"><%= @total_dinein.total_dinein_cus %></td>
+                  </tr>
                 <% end %>
                 <% if !@total_takeaway.nil? %>
-                  <% if @total_takeaway.total_take_cus > 0 %>
-                    <tr>
-                      <td>Takeaway : </td>
-                      <td align="right"><%= @total_takeaway.total_take_cus %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Takeaway : </td>
+                    <td align="right"><%= @total_takeaway.total_take_cus %></td>
+                  </tr>
                 <% end %>
                 <% if !@total_other_customer.nil? %>
-                  <% if @total_other_customer.total_cus > 0 %>
-                    <tr>
-                      <td>Customer : </td>
-                      <td align="right"><%= @total_other_customer.total_cus %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Customer : </td>
+                    <td align="right"><%= @total_other_customer.total_cus %></td>
+                  </tr>
                 <% end %>
                 <% if !@total_membership.nil? %>
-                  <% if @total_membership.total_memb_cus > 0 %>
-                    <tr>
-                      <td>Membership : </td>
-                      <td align="right"><%= @total_membership.total_memb_cus %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Membership : </td>
+                    <td align="right"><%= @total_membership.total_memb_cus %></td>
+                  </tr>
                 <% end %>
               </table>
             </div>
@@ -220,12 +210,10 @@
               <h6>Order</h6>
               <table class="table">
                 <% if !@total_order.nil? %>
-                  <% if @total_order.total_order > 0 %>
-                    <tr>
-                      <td>Total Order : </td>
-                      <td align="right"><%= @total_order.total_order %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Total Order : </td>
+                    <td align="right"><%= @total_order.total_order %></td>
+                  </tr>
                 <% end %>
         
                 <% if !(@total_accounts.nil?) %>
@@ -249,12 +237,10 @@
                 </tr>
                 <% end %>
                 <% if !@total_foc_items.nil? %>
-                  <% if @total_foc_items > 0 %>
-                    <tr>
-                      <td>Total FOC Item : </td>
-                      <td align="right"><%= @total_foc_items %></td>
-                    </tr>
-                  <% end %>
+                  <tr>
+                    <td>Total FOC Item : </td>
+                    <td align="right"><%= @total_foc_items %></td>
+                  </tr>
                 <% end %>
               </table>
             </div>

From f333aa9a664650d3fc7f8ee2efa0cc66210bb9c1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 17 Nov 2017 10:22:04 +0630
Subject: [PATCH 2/5] add top10 and bottom10 products in dashboard

---
 app/controllers/home_controller.rb |  1 +
 app/models/sale.rb                 | 12 +++++++++++-
 app/views/home/dashboard.html.erb  | 11 ++++++++++-
 config/locales/en.yml              |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d8592664..bc621bd7 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -68,6 +68,7 @@ class HomeController < ApplicationController
     @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count()
 
     @top_products = Sale.top_products(today).sum('i.qty')
+    @bottom_products = Sale.bottom_products(today).sum('i.qty')
     @hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
     # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
     # .sum(:grand_total)
diff --git a/app/models/sale.rb b/app/models/sale.rb
index ef00fb6a..7e68e771 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -907,7 +907,17 @@ end
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(5)
+                .order("SUM(i.qty) DESC").limit(10)
+  end
+
+  def self.bottom_products(today)
+    query = Sale.select("(SUM(i.qty) * i.price) as grand_total,SUM(i.qty) as total_item," +
+                        " i.price as unit_price,mi.name as product_name")
+                .joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN menu_items mi ON i.product_code = mi.item_code")
+                .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
+                      "and payment_status='paid' and sale_status= 'completed'")
+                .group('mi.name')
+                .order("SUM(i.qty) ASC").limit(10)
   end
 
   def self.hourly_sales(today)
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 2de6f67d..bf4321be 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -58,7 +58,7 @@
   <div class="row">
     <div class="col-xs-9 col-sm-9 col-md-9 col-lg-9">
       <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
           <div class="card">
             <div class="body">
               <h4><i class="material-icons md-24">dashboard</i><%= (t :top) + " " + (t :products) %></h4>
@@ -67,6 +67,15 @@
             </div>
           </div>
         </div>
+        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
+          <div class="card">
+            <div class="body">
+              <h4><i class="material-icons md-24">dashboard</i><%= (t :bottom) + " " + (t :products) %></h4>
+              <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
+              <%= pie_chart @bottom_products %>
+            </div>
+          </div>
+        </div>
       </div>
           <!-- <div class="row">
           <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95ee7115..f6cf640b 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,6 +68,7 @@ en:
   booking_details: "Booking Details"
   inventory_definitions: "Inventory Definitions"
   sale_audits: "Sale Audits"
+  bottom: "Bottom"
 
   views:
     btn:

From e7cd8deb8e9f2ff5f8dd8a3557660f352da74132 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 17 Nov 2017 15:51:20 +0630
Subject: [PATCH 3/5] fix tester bugs

---
 app/controllers/origami/discounts_controller.rb | 9 +++++----
 app/models/sale_item.rb                         | 2 +-
 app/pdf/close_cashier_pdf.rb                    | 2 +-
 app/pdf/crm_order_pdf.rb                        | 2 +-
 app/pdf/stock_result_pdf.rb                     | 2 +-
 app/views/origami/discounts/index.html.erb      | 7 +++++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index c1319bfe..f3bd218f 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -114,7 +114,8 @@ class Origami::DiscountsController < BaseOrigamiController
     if Sale.exists?(sale_id)
       sale = Sale.find(sale_id)    
       table_id = sale.bookings[0].dining_facility_id
-      table_type = DiningFacility.find(table_id).type 
+      dining = DiningFacility.find(table_id)
+      table_type = dining.type 
 
       discount_items = []                
       #destroy all discount sale item
@@ -133,14 +134,14 @@ class Origami::DiscountsController < BaseOrigamiController
       sale.sale_items.destroy(discount_items)
 
       action_by = current_user.id
-      remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{table.name} "
+      remark = "Remove Discount Sale Id [#{sale.sale_id}]| Receipt No #{sale.receipt_no} | Table- #{dining.name} "
       sale_audit = SaleAudit.record_audit_discount(sale.sale_id,sale.cashier_id, action_by,remark,"REMOVEALLDISCOUNT" )
       
       # Re-calc All Amount in Sale
       sale.compute_by_sale_items(sale_id, sale.sale_items, 0)
-      result = {:status=> "Success", :table_id => table_id, :table_type => table_type }
+      result = {:status=> "Success", :table_id => table_id, :dining => dining.name, :table_type => table_type }
     else 
-      result = {:status=> "Please, Check Again!", :table_id => table_id, :table_type => table_type }
+      result = {:status=> "Please, Check Again!", :table_id => table_id, :dining => dining.name, :table_type => table_type }
     end  
 
     render :json => result.to_json
diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index c4aae1fa..d4aaf5ee 100755
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -39,7 +39,7 @@ class SaleItem < ApplicationRecord
 
       # Check for actual sale items
       sale_items.each do |si|
-        if si.account_id == a.id
+        if si.account_id == a.id          
           account_price[:price] = account_price[:price] + si.price
         end
       end
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 71969440..1f456a07 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -22,7 +22,7 @@ class CloseCashierPdf < Prawn::Document
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
-    if printer_settings.font != nil
+    if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
             :normal => "public/fonts/#{printer_settings.font}.ttf",
             :italic => "public/fonts/#{printer_settings.font}.ttf",
diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb
index dca0ab9b..a33b5fce 100755
--- a/app/pdf/crm_order_pdf.rb
+++ b/app/pdf/crm_order_pdf.rb
@@ -20,7 +20,7 @@ class CrmOrderPdf < Prawn::Document
     super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height])
 
     # db font setup
-    if printer_settings.font != nil
+    if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
             :normal => "public/fonts/#{printer_settings.font}.ttf",
             :italic => "public/fonts/#{printer_settings.font}.ttf",
diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb
index 4787e9b1..510ab317 100755
--- a/app/pdf/stock_result_pdf.rb
+++ b/app/pdf/stock_result_pdf.rb
@@ -22,7 +22,7 @@ class StockResultPdf < Prawn::Document
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
-    if printer_settings.font != nil
+    if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
             :normal => "public/fonts/#{printer_settings.font}.ttf",
             :italic => "public/fonts/#{printer_settings.font}.ttf",
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb
index 23b83054..2549849a 100755
--- a/app/views/origami/discounts/index.html.erb
+++ b/app/views/origami/discounts/index.html.erb
@@ -424,9 +424,11 @@
 
 		// Selected Items		
 		var sale_items = get_selected_sale_items();	
+		console.log(sale_items.length);
 		if(sale_items.length == 0){
 			//swal("Information!", "You have no selected item!");
-			swal ( "Oops" ,  "You have no selected item!" ,  "error" );						
+			swal ( "Oops" ,  "You have no selected item!" ,  "error" );		
+			return;				
 		}
 
 		for(var i=0;i < sale_items.length;i++){
@@ -434,7 +436,8 @@
 				discount_items.push(sale_items[i]);
 			}
 			else {
-				swal ("Oops" , "You have no selected item!" ,  "error" );	
+				swal ("Oops" , "You have no selected item!" ,  "error" );
+				return;	
 			}
 		}
 

From 11f040b14298b7bd39581c07e9d653aa650d3c43 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 17 Nov 2017 16:31:03 +0630
Subject: [PATCH 4/5] fix oqs css and oqs edit turbolink control

---
 app/assets/javascripts/OQS.js              |   5 +-
 app/assets/stylesheets/OQS.scss            |  31 ++
 app/views/crm/dining_queues/index.html.erb |   6 +-
 app/views/oqs/edit/index.html.erb          |   8 +-
 app/views/oqs/home/index.html.erb          | 575 ++++++---------------
 5 files changed, 210 insertions(+), 415 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 831f2f5f..d2bb42bc 100755
--- a/app/assets/javascripts/OQS.js
+++ b/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>'
 
diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss
index 8258a2df..12fbd548 100755
--- a/app/assets/stylesheets/OQS.scss
+++ b/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;
 }
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb
index fab41cdc..17c7e7c8 100755
--- a/app/views/crm/dining_queues/index.html.erb
+++ b/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>
-        2) Next Queue No - <% @next = @complete_queue.last.queue_no.to_i + 1%>  
-         <%= @next%> <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 rescue 0) + 1%>  
+         <%= @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>
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 99541e8a..4d018249 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -89,10 +89,10 @@
       </div>
   </div>
   <div class="col-md-1">
-     <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" class="btn btn-block btn-default waves-effect" id='back'>
+      <i class="material-icons m-t--10">reply</i>
+      Back
+    </button>
   </div>
 </div>
 
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index f3a94be5..39e84227 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -1,418 +1,179 @@
-
-  <!-- <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">  
-      <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">
-             <input type="text" name="filter" class="form-control" placeholder="Search">
-            
-          </div>
-          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-            <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
-          </div>
-
+<!-- Column One -->
+<div class="row clearfix">
+  <div class="col-lg-8 col-md-8 col-sm-8">  
+    <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">
+           <input type="text" name="filter" class="form-control" placeholder="Search">
+          
         </div>
-        <% end %>
-      </div>
-     
-      <!-- Nav tabs -->
-      <ul class="nav nav-tabs" role="tablist">
-        <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
-          <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
-        </li> -->
-        <li class="nav-item nav-completed">
-          <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
-          <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
-        </li>
-        <% # For Tab Disable for Station is inactive
-        status=""
-        i=0
-        @queue_stations.each do |qsi|  
-          if qsi.is_active == false   
-            status="disabled"    
-            end %>
-            <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
-              <p class="hidden oqs-id"><%= qsi.id  %></p>
-              <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
-                <%= qsi.station_name %>
-                <% if @filter.nil? %>
-                <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
-                <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
-                </span> 
-                <%else%>
-                <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
-                 <% @count.each do |c|%>    
-                 <% if qsi.id == c.station_id %>
-                 <%= c.total %>                
-                 <%end %>  
-                 <%end %>    
-               </span>
-               <%end%>
-               <% if qsi.auto_print %>
-               <span>(ap)</span>
-               <% end %>  
-             </a>
-           </li>
-           <% i+=1%>
-
-           <% end %>      
-        </ul>
-       <!-- Nav tabs - End -->
-       <p class="hidden filter"><%= @filter %></p>
-
-       <div class="tab-content" id="custom-slimscroll" style="">
-        <!--- Panel 0 - Completed -->
-
-        <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">
-                  <div class="row">
-                    <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
-                    <span class="order-zone hidden font-13"><%= qid.zone %></span>
-                    <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
-                  </div> 
-                 <p class="m-b--10">
-                    <span class="order-item font-16">
-                      <%= qid.item_name %>
-                    </span> [x
-                    <span class="order-qty">
-                      <%= qid.qty %>
-                    </span> ]   
-                  </p>                  
-
-                  <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
-
-                  <span class="card-text">
-                    <span class="text-muted">Order at - 
-                      <span class="order-at font-13">
-                        <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
-                      </span> <br> 
-                       Order By - <span class="order-by font-13">
-                      <%= qid.item_order_by %>
-                      </span> 
-                    </span>
-                  </span>
-                
-                  <p class="hidden order-status">completed</p>
-                  <p class="hidden order-customer"><%= qid.customer_name %></p>
-                  <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
-                </div>
-              </div> 
-              <%                                      
-            end
-            %>    
-          </div>
-        </div>
-
-
-        <!-- End Panel 0 - Completed -->
-        <!--- Order Items -->
-        <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
-        </div>
-        <!--- end of Items-->
+        <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
+          <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
+        </div>
+
       </div>
+      <% end %>
     </div>
+   
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist">
+      <!-- <li class="nav-item nav-search <%= @filter.to_s.length > 0? " " : "hide"%>">
+        <a class="nav-link <%= @filter.to_s.length > 0? "active" : " "%>" data-toggle="tab" href="#search" role="tab">Searching .. <span class="badge badge-pill badge-default" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li> -->
+      <li class="nav-item nav-completed">
+        <a class="nav-link active" data-toggle="tab" href="#completed" role="tab">Processed 
+        <span class="badge bg-blue-grey" id="completed_count"><%= @queue_completed_item.length %></span></a>
+      </li>
+      <% # For Tab Disable for Station is inactive
+      status=""
+      i=0
+      @queue_stations.each do |qsi|  
+        if qsi.is_active == false   
+          status="disabled"    
+          end %>
+          <li class="nav-item oqs_click" data-id="<%= qsi.id %>">
+            <p class="hidden oqs-id"><%= qsi.id  %></p>
+            <a class="nav-link" data-id="<%= qsi.id  %>" data-toggle="tab" href="" role="tab" <%= status %>>
+              <%= qsi.station_name %>
+              <% if @filter.nil? %>
+              <span class="badge bg-blue-grey oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>" id="completed_count">
+              <!-- <span class="badge badge-pill badge-default oqs_count<%= i%> oqs_count" data-id="<%= qsi.id  %>"> --> <%= qsi.assigned_order_items.where("delivery_status=0 AND created_at >= '#{Time.now.beginning_of_day.utc}'").count %>                
+              </span> 
+              <%else%>
+              <span class="label-count badge bg-blue-grey" data-id="<%= qsi.id  %>">
+               <% @count.each do |c|%>    
+               <% if qsi.id == c.station_id %>
+               <%= c.total %>                
+               <%end %>  
+               <%end %>    
+             </span>
+             <%end%>
+             <% if qsi.auto_print %>
+             <span>(ap)</span>
+             <% end %>  
+           </a>
+         </li>
+         <% i+=1%>
 
-    <!-- Column Two -->
-    <div class="col-lg-3 col-md-3 col-sm-3">
-      <div class="card"  >
-        <div class="card-header">
-          <div><strong id="order-title">ORDER DETAILS</strong></div>
-        </div>
-        <div class="card-block">
-          <div class="card-title">
-            <table class="">
-              <thead>
-                <tr>
-                <th style="width:33%; text-align:">Order By</th>
-                  <th style="width:33%; text-align:">Order At</th>
-                  <!-- <th style="width:33%; text-align:">Customer</th> -->
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td id="order-by" style="width:33%; text-align:"></td>
-                  <td id="order-at" style="width:33%; text-align:"></td>
-                  <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
-                    </tr>
-                    <tr>
-                      <td><strong class="hidden cus_name">Customer</strong></td>
-                      <td id="order-customer" colspan="2"></td>
-                    </tr>
-                  </tbody>
-                </table>                  
+         <% end %>      
+      </ul>
+     <!-- Nav tabs - End -->
+     <p class="hidden filter"><%= @filter %></p>
+
+     <div class="tab-content" id="custom-slimscroll" style="">
+      <!--- Panel 0 - Completed -->
+
+      <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">
+                <div class="row">
+                  <span class="col-md-4 order-zone-type font-13"><%= qid.type %>-<%= qid.zone %></span>
+                  <span class="order-zone hidden font-13"><%= qid.zone %></span>
+                  <span class="col-md-8"><small class="float-right font-13"><%= qid.order_id %></small></span>
+                </div> 
+               <p class="m-b--10">
+                  <span class="order-item font-16">
+                    <%= qid.item_name %>
+                  </span> [x
+                  <span class="order-qty">
+                    <%= qid.qty %>
+                  </span> ]   
+                </p>                  
+
+                <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+
+                <span class="card-text">
+                  <span class="text-muted">Order at - 
+                    <span class="order-at font-13">
+                      <%= qid.created_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %>
+                    </span> <br> 
+                     Order By - <span class="order-by font-13">
+                    <%= qid.item_order_by %>
+                    </span> 
+                  </span>
+                </span>
+              
+                <p class="hidden order-status">completed</p>
+                <p class="hidden order-customer"><%= qid.customer_name %></p>
+                <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>                
               </div>
-              <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
-                <table class="table" id="oqs-order-details-table">
-                  <thead>
-                    <tr>
-                      <th style="width:80%; text-align:left">Items</th>
-                      <th style="width:20%; text-align:right">QTY</th>
-                    </tr>
-                  </thead>
-                  <tbody>              
-                    <!-- Bind With JS -->
-                  </tbody>
-                </table>
-              </div>
-
-            </div>
-          </div>
+            </div> 
+            <%                                      
+          end
+          %>    
         </div>
+      </div>
 
-  <!-- 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 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> -->
 
+      <!-- End Panel 0 - Completed -->
+      <!--- Order Items -->
+      <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
+      </div>
+      <!--- end of Items-->
     </div>
   </div>
+
+  <!-- Column Two -->
+  <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="card"  >
+      <div class="card-header">
+        <div><strong id="order-title">ORDER DETAILS</strong></div>
+      </div>
+      <div class="card-block">
+        <div class="card-title">
+          <table class="">
+            <thead>
+              <tr>
+              <th style="width:33%; text-align:">Order By</th>
+                <th style="width:33%; text-align:">Order At</th>
+                <!-- <th style="width:33%; text-align:">Customer</th> -->
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td id="order-by" style="width:33%; text-align:"></td>
+                <td id="order-at" style="width:33%; text-align:"></td>
+                <!-- <td id="order-customer" style="width:33%; text-align:"></td> -->
+                  </tr>
+                  <tr>
+                    <td><strong class="hidden cus_name">Customer</strong></td>
+                    <td id="order-customer" colspan="2"></td>
+                  </tr>
+                </tbody>
+              </table>                  
+        </div>
+        <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
+          <table class="table" id="oqs-order-details-table">
+            <thead>
+              <tr>
+                <th style="width:80%; text-align:left">Items</th>
+                <th style="width:20%; text-align:right">QTY</th>
+              </tr>
+            </thead>
+            <tbody>              
+              <!-- Bind With JS -->
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Column Three -->
+  <div class="col-lg-1 col-md-1 col-sm-1">
+    <!-- OQS Buttons -->
+    <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>
-
-<!-- <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> -->

From c56fb1b0f4103958652919da7bbd279e3fbf0cfc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 17 Nov 2017 16:39:37 +0630
Subject: [PATCH 5/5] oqs back turbolink control

---
 app/assets/javascripts/OQS.js     | 4 ----
 app/views/oqs/edit/index.html.erb | 3 ++-
 app/views/oqs/home/index.html.erb | 8 ++++++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d2bb42bc..2f670146 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -25,10 +25,6 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
-	$('#back').on('click', function () {
-        window.location.href = '/oqs/';
-    });
-
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 4d018249..0cae40ce 100755
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -115,8 +115,9 @@ $(document).ready(function(){
       }
     });
   });
+
    $('#back').on('click', function () {
-        window.location.href = '/oqs/';
+        window.location.href = '/oqs';
     })
 
    // number key pad
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 39e84227..96074792 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -177,3 +177,11 @@
       <!-- <button type="button" class="" id="print_order_summary">Print <br/>Order<br/>Summary</button> -->
   </div>
 </div>
+
+<script type="text/javascript">
+  $(document).on('turbolinks:load', function() {
+    $('#back').on('click', function () {
+        window.location.href = '/dashboard';
+    });
+  });
+</script>