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

.gitignore

@@ -42,7 +42,7 @@ pickle-email-*.html
 /config/initializers/*
 config/deploy/config/*
 config/puma.rb
-#config/shops.json
+config/shops.json
 !/log/.keep
 !/tmp/.keep
 .ruby-version

app/assets/javascripts/addorder.js

@@ -1,6 +1,7 @@
 $(function() { 
   var role = $('#role').val();
-
+  var second_display_lookup = $("#display_type");
+  console.log(second_display_lookup)
   type = window.location.href.indexOf("quick_service");
   modify_order = window.location.href.indexOf("modify_order");
   
@@ -428,7 +429,7 @@ $(function() {
 
     var items  = $('.selected-set');
     if (items.length >= min_qty) {
-     if ($('#server_mode').val() != "cloud") {
+     if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
       item = get_set_item(items);
       customer_display_view(item,"set_add");
      }
@@ -756,7 +757,7 @@ $(function() {
     $('.add_to_order').attr('data-options',JSON.stringify(option_arr));
     $('.add_to_order').attr('data-opt',JSON.stringify(option_arr));
     var item_data = $(this);
-    if ($('#server_mode').val() != "cloud") {
+    if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
       item = get_item(item_data,"add_to_order");
       customer_display_view(item,"add");
     }
@@ -768,7 +769,7 @@ $(function() {
   // click plus icon for add 
   $(document).on('click', '.add_icon', function(event){ 
     var item_data = $(this);
-    if ($('#server_mode').val() != "cloud") {
+    if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) {
       item = get_item(item_data,"add_icon");
       customer_display_view(item,"add");
     }
@@ -895,7 +896,7 @@ $(function() {
                    window.location.href = "/origami/room/" + table_id
                 } 
               }
-              if ($('#server_mode').val() != "cloud") {
+              if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){
                 customer_display_view(null,"reload");
               }
            }

app/controllers/home_controller.rb

@@ -20,6 +20,7 @@ class HomeController < ApplicationController
   def index
     # @employees = Employee.all_emp_except_waiter.order("name asc")
     @employees = Employee.all.where("is_active = true").order("name asc")
+    @roles = Lookup.collection_of("employee_roles")
     @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end

app/controllers/origami/addorders_controller.rb

@@ -18,7 +18,12 @@ class Origami::AddordersController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-
+    display_type = Lookup.find_by_lookup_type("display_type")
+     if !display_type.nil? && display_type.value==2
+        @display_type = display_type.value
+      else
+        @display_type = nil
+     end
    # if params[:menu] == "true"
      @menus    = []
      @menu     = []

app/controllers/origami/second_display_controller.rb

@@ -8,24 +8,27 @@ class Origami::SecondDisplayController < BaseOrigamiController
   end
 
   def customer_view
-   if params[:status]!= "billed"
-     tax_profiles = TaxProfile.all.order("order_by asc")
-   else
-     tax_profiles = nil
-   end
-   if ENV["SERVER_MODE"] == 'cloud'
-        from = request.subdomain  + "." + request.domain
-      else 
-        from = ""
+    display_type = Lookup.find_by_lookup_type("display_type")
+     if !display_type.nil? && display_type.value==2
+         if params[:status]!= "billed"
+       tax_profiles = TaxProfile.all.order("order_by asc")
+     else
+       tax_profiles = nil
+     end
+     if ENV["SERVER_MODE"] == 'cloud'
+          from = request.subdomain  + "." + request.domain
+        else 
+          from = ""
+        end
+        ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
       end
-      ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from
   # end
   end
   #Shop Name in Navbor
-  helper_method :shop_detail
-  def shop_detail
-    @shop = Shop.first
-  end
+  # helper_method :shop_detail
+  # def shop_detail
+  #   @shop = Shop.first
+  # end
 
 
 end

app/models/assigned_order_item.rb

@@ -8,14 +8,14 @@ class AssignedOrderItem < ApplicationRecord
   belongs_to :order_queue_station
 
   def self.assigned_order_item (order, item_code, instance_code, order_queue_station )
-    assigned_order_item = AssignedOrderItem.new()
-    assigned_order_item.order = order
-    assigned_order_item.item_code = item_code
-    assigned_order_item.instance_code = instance_code
-    assigned_order_item.order_queue_station = order_queue_station
-    assigned_order_item.print_status = false
-    assigned_order_item.delivery_status = false
-    assigned_order_item.save
+      assigned_order_item = AssignedOrderItem.new()
+      assigned_order_item.order = order
+      assigned_order_item.item_code = item_code
+      assigned_order_item.instance_code = instance_code
+      assigned_order_item.order_queue_station = order_queue_station
+      assigned_order_item.print_status = false
+      assigned_order_item.delivery_status = false
+      assigned_order_item.save!
   end
 
   def self.assigned_order_item_by_job(order_id)

app/models/order_queue_station.rb

@@ -207,7 +207,7 @@ class OrderQueueStation < ApplicationRecord
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)
-    printer = PrintSetting.all
+    printer = PrintSetting.all.order("id ASC")
     unique_code="OrderSummaryPdf"
 
     if !printer.empty?
@@ -245,7 +245,7 @@ class OrderQueueStation < ApplicationRecord
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, order, assigned_items)
-    printer = PrintSetting.all
+    printer = PrintSetting.all.order("id ASC")
     unique_code="OrderItemPdf"
 
     if !printer.empty?

app/models/printer/order_queue_printer.rb

@@ -70,7 +70,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
-    print_setting = PrintSetting.all
+    print_setting = PrintSetting.all.order("id ASC")
     order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
@@ -170,7 +170,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
-    print_setting = PrintSetting.all
+    print_setting = PrintSetting.all.order("id ASC")
 
     order=print_query('booking_summary', booking_id)
     # For Print Per Item

app/models/sale.rb

@@ -415,10 +415,12 @@ class Sale < ApplicationRecord
     shop = Shop.first
 
     #if tax is not apply create new record
-    SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
-      #delete existing and create new
-      existing_tax.delete
-    end
+    # SaleTax.where("sale_id='#{sale.sale_id}'").find_each do |existing_tax|
+    #   #delete existing and create new
+    #   existing_tax.delete
+    # end
+    taxes = SaleTax.where("sale_id='#{sale.sale_id}'").pluck(:sale_tax_id)
+    SaleTax.where("sale_tax_id IN (?)", taxes).destroy_all
 
     total_tax_amount = 0
     tax_incl_exec = "exclusive"

app/models/sale_order.rb

@@ -7,11 +7,11 @@ class SaleOrder < ApplicationRecord
   belongs_to :sale
   belongs_to :order
 
-  def create_sale_order(sale, order)
-    sale_order = SaleOrder.new
-    sale_order.sale_id = sale
-    sale_order.order_id = order
-    sale_order.save!
+  def create_sale_order(sale, order) 
+      sale_order = SaleOrder.new
+      sale_order.sale_id = sale
+      sale_order.order_id = order
+      sale_order.save!
   end
 
   private

app/views/layouts/login_dashboard.html.erb

@@ -112,49 +112,14 @@
             </div>      
             <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">    
                 <ul class="nav nav-tabs" role="tablist">
-                    <% @employees.each do |employee| %>
-                        <%if employee.role == "manager" %>
-                            <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#manager" role="tab"><b>Manager</b></a>
-                                <% break %>
-                            </li>
-                        <% end %>
-                    <% end %>
-                    <% @employees.each do |employee| %>
-                        <%if employee.role == "supervisor" %>
-                            <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#supervisor" role="tab"><b>Supervisor</b></a>
-                                <% break %>
-                            </li>
-                        <% end %>
-                    <% end %>
-                    <% @employees.each do |employee| %>
-
-                        <%if employee.role == "cashier" %>
-                            <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#cashier" role="tab"><b>Cashier</b></a>
-                                <% break %>
-                            </li>
-                        <% end %>
-                    <% end %>
-
-                    <% @employees.each do |employee| %>
-                        <%if employee.role == "account" %>
-                            <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#account" role="tab"><b>Accountant</b></a>
-                                <% break %>
-                            </li>
-                        <% end %>
-                    <% end %>
-
-                    <% @employees.each do |employee| %>
-                        <%if employee.role == "waiter" %>
-                            <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#waiter" role="tab"><b>Waiter</b></a>
-                                <% break %>
+                    <% @roles.each do |role| %>
+                        <%if role[1] != "administrator" %>
+                            <li class="nav-item">role
+                                <a class="nav-link" data-toggle="tab" href="#<%=role[1]%>" role="tab"><b><%=role[0]%></b></a>
                             </li>
                         <% end %>
                     <% end %>
+                    
                 </ul>  
 
                 <div class="tab-content" style="max-height:650px; overflow:auto">

app/views/origami/addorders/detail.html.erb

@@ -11,6 +11,7 @@
   </div>
   <input type="hidden" name="type" id="role" value="<%= current_user.role%>">
   <input type="hidden" name="cashier_type" id="cashier_type" value="<%= type%>">
+  <input type="hidden" name="display_type" id="display_type" value="<%= @display_type%>">
   <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_data"> 
         <li class="list-menu">