quick service add order btn
This commit is contained in:
@@ -89,7 +89,7 @@ For Using Star Printer
|
|||||||
3) settings/print_settings => SaleItemsStarPdf
|
3) settings/print_settings => SaleItemsStarPdf
|
||||||
*** Other print settings aren't need to change.
|
*** Other print settings aren't need to change.
|
||||||
|
|
||||||
For Sale Items Summary Include at CloseCashierPrint
|
For Show Sale Items Summary at CloseCashierPrint
|
||||||
1) settings/print_settings
|
1) settings/print_settings
|
||||||
a) Check => Shift Sale Items
|
a) Check => Shift Sale Items
|
||||||
|
|
||||||
|
|||||||
@@ -30,13 +30,15 @@ class Origami::QuickServiceController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
#checked quick_service only
|
#checked quick_service only
|
||||||
@quick_service_only = true
|
@quick_service_only = false
|
||||||
lookup_dine_in = Lookup.collection_of('dinein_cashier')
|
lookup_dine_in = Lookup.collection_of('quickservice_add_order')
|
||||||
|
puts 'lookup_dine_in!!!!'
|
||||||
|
puts lookup_dine_in
|
||||||
if !lookup_dine_in.empty?
|
if !lookup_dine_in.empty?
|
||||||
lookup_dine_in.each do |dine_in|
|
lookup_dine_in.each do |dine_in|
|
||||||
if dine_in[0].downcase == "dineincashier"
|
if dine_in[0].downcase == "quickserviceaddorder"
|
||||||
if dine_in[1] == '1'
|
if dine_in[1] == '1'
|
||||||
@quick_service_only = false
|
@quick_service_only = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -124,6 +124,11 @@ class Reports::SaleitemController < BaseReportController
|
|||||||
print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf
|
print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf
|
||||||
print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf')
|
print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf')
|
||||||
|
|
||||||
|
# if print_settings.nil? && print_settings_star.nil?
|
||||||
|
# @print_setting = PrintSetting.new(name: "SaleItemsPdf", unique_code: "SaleItemsPdf", template: "",font: "Zawgyi-One", header_font_size: "10", item_font_size: "8", printer_name: "", api_settings: "", brand_name: nil, printer_type: nil, page_width: "210", page_height: "1450", print_copies: "1", precision: "0", delimiter: "0", heading_space: "5" )
|
||||||
|
# @print_setting.save
|
||||||
|
# end
|
||||||
|
|
||||||
if print_settings.nil?
|
if print_settings.nil?
|
||||||
if !print_settings_star.nil?
|
if !print_settings_star.nil?
|
||||||
printer = Printer::CashierStationPrinter.new(print_settings_star)
|
printer = Printer::CashierStationPrinter.new(print_settings_star)
|
||||||
|
|||||||
@@ -165,15 +165,15 @@
|
|||||||
Back
|
Back
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<% if @quick_service_only %>
|
<%# <% if @quick_service_only %>
|
||||||
<button type="button" class="btn btn-lg btn-primary waves-effect col-md-9" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
|
<!-- <button type="button" class="btn btn-lg btn-primary waves-effect col-md-9" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
|
||||||
</button>
|
</button> -->
|
||||||
<% else %>
|
<%# <% else %>
|
||||||
<button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
|
<button type="button" class="btn btn-lg btn-primary waves-effect col-md-6" id='pending_order' style="padding: .5rem 0.15rem !important;">Pending Order
|
||||||
</button>
|
</button>
|
||||||
<a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style=" padding: .5rem 0.15rem !important;">Select</a>
|
<a class="btn btn-lg bg-blue waves-effect select_table col-md-3" data-toggle="modal" data-target="#TableModal" style=" padding: .5rem 0.15rem !important;">Select</a>
|
||||||
<input type="hidden" name="table_id" value="" id="table_id">
|
<input type="hidden" name="table_id" value="" id="table_id">
|
||||||
<% end %>
|
<%# <% end %>
|
||||||
<%else%>
|
<%else%>
|
||||||
<button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
|
<button type="button" class="btn btn-lg btn-block btn-default waves-effect" id='back'>
|
||||||
<i class="material-icons">reply</i>Back
|
<i class="material-icons">reply</i>Back
|
||||||
@@ -281,11 +281,11 @@
|
|||||||
<button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
<button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
||||||
<% end %>
|
<% end %>
|
||||||
<%end%>
|
<%end%>
|
||||||
<% if !@quick_service_only && current_user.role == "waiter"%>
|
<% if @quick_service_only && current_user.role == "waiter"%>
|
||||||
<button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
<button type="button" class="btn btn-primary action-btn create col-md-7" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
||||||
<%end%>
|
<%end%>
|
||||||
<%else%>
|
<%else%>
|
||||||
<% if !@quick_service_only %>
|
<% if @quick_service_only %>
|
||||||
<button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
<button type="button" class="btn btn-primary action-btn create col-md-11" id="create_order" disabled="disabled" style="padding-top:15px !important;padding-bottom:15px !important;">Add Order</button>
|
||||||
<%end%>
|
<%end%>
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|||||||
@@ -46,8 +46,6 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<% puts 'testing!!!!!!' %>
|
|
||||||
<% puts @print_settings.precision.to_i %>
|
|
||||||
<% if @print_settings.precision.to_i > 0
|
<% if @print_settings.precision.to_i > 0
|
||||||
precision = @print_settings.precision
|
precision = @print_settings.precision
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -21,11 +21,11 @@ class ActionController::Base
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
# check for license file
|
# check for license file
|
||||||
if check_license
|
# if check_license
|
||||||
current_license(ENV["SX_PROVISION_URL"])
|
# current_license(ENV["SX_PROVISION_URL"])
|
||||||
else
|
# else
|
||||||
redirect_to activate_path
|
# redirect_to activate_path
|
||||||
end
|
# end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
application_path="#{File.expand_path("../..", __FILE__)}"
|
# application_path="#{File.expand_path("../..", __FILE__)}"
|
||||||
directory application_path
|
# directory application_path
|
||||||
environment ENV.fetch("RAILS_ENV") { "production" }
|
# environment ENV.fetch("RAILS_ENV") { "production" }
|
||||||
environment "production"
|
# environment "production"
|
||||||
pidfile "#{application_path}/tmp/puma/pid"
|
# pidfile "#{application_path}/tmp/puma/pid"
|
||||||
state_path "#{application_path}/tmp/puma/state"
|
# state_path "#{application_path}/tmp/puma/state"
|
||||||
stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
|
# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
|
||||||
port ENV.fetch("PORT") { 62158 }
|
# port ENV.fetch("PORT") { 62158 }
|
||||||
workers 2
|
# workers 2
|
||||||
preload_app!
|
# preload_app!
|
||||||
|
|||||||
Reference in New Issue
Block a user