From a2e7ef0e5a661a48235fecc2d2ad986270cb1371 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 10 May 2018 13:59:19 +0630 Subject: [PATCH 1/2] change print settings for cloud --- .../settings/cashier_terminals_controller.rb | 2 ++ .../order_queue_stations_controller.rb | 2 ++ app/views/print_settings/_form.html.erb | 2 +- .../settings/cashier_terminals/_form.html.erb | 24 ++++++++++++++++-- .../order_queue_stations/_form.html.erb | 25 ++++++++++++++++--- 5 files changed, 49 insertions(+), 6 deletions(-) diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb index 31e8da04..1d1c5497 100755 --- a/app/controllers/settings/cashier_terminals_controller.rb +++ b/app/controllers/settings/cashier_terminals_controller.rb @@ -16,10 +16,12 @@ class Settings::CashierTerminalsController < ApplicationController # GET /settings/cashier_terminals/new def new @settings_cashier_terminal = CashierTerminal.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/cashier_terminals/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/cashier_terminals diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index adcbc507..2458096e 100755 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -18,10 +18,12 @@ class Settings::OrderQueueStationsController < ApplicationController # GET /settings/order_queue_stations/new def new @settings_order_queue_station = OrderQueueStation.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/order_queue_stations/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/order_queue_stations diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index e07da111..436035aa 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -16,7 +16,7 @@ <% if(@server_mode != 'cloud') %> <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> <% else %> - <%= f.input :printer_name %> + <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> <% end %> <%= f.input :brand_name %> <%= f.input :printer_type %> diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb index d5693561..3ba13d97 100755 --- a/app/views/settings/cashier_terminals/_form.html.erb +++ b/app/views/settings/cashier_terminals/_form.html.erb @@ -12,7 +12,11 @@ <%= f.input :auto_print_receipt %> <%= f.label "Select Zones", :class => 'control-label' %> <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox form-group'%> - <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% if(@server_mode != 'cloud') %> + <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% else %> + <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> + <% end %> <%= f.input :font %> <%= f.input :font_size %> <%= f.input :show_tax %> @@ -58,4 +62,20 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb index 0ffa8f9a..adab922a 100755 --- a/app/views/settings/order_queue_stations/_form.html.erb +++ b/app/views/settings/order_queue_stations/_form.html.erb @@ -15,8 +15,11 @@ div.form-inputs span{
<%= f.input :station_name %> <%= f.input :is_active %> - - <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% if(@server_mode != 'cloud') %> + <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> + <% else %> + <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %> + <% end %> <%= f.input :print_copy %> <%= f.hidden_field :processing_items %> @@ -63,4 +66,20 @@ div.form-inputs span{
- + From 7b5c04c797f378b5ab30da48e454ab8fddd66690 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 10 May 2018 14:28:28 +0630 Subject: [PATCH 2/2] update add order cache menu --- app/assets/javascripts/addorder.js | 2 +- .../origami/addorders_controller.rb | 19 ++--- app/controllers/origami/home_controller.rb | 8 +- .../origami/quick_service_controller.rb | 24 ++++-- app/views/origami/addorders/detail.html.erb | 85 ++++++++++++------- app/views/origami/dashboard/index.html.erb | 1 + app/views/origami/home/show.html.erb | 1 + config/routes.rb | 2 +- 8 files changed, 83 insertions(+), 59 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 59b1081a..19f56c35 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1,6 +1,6 @@ $(function() { var role = $('#role').val(); - localStorage.removeItem("menus") + type = window.location.href.indexOf("quick_service"); modify_order = window.location.href.indexOf("modify_order"); diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index e4e17328..b7c9b1b6 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -18,17 +18,14 @@ class Origami::AddordersController < BaseOrigamiController if check_mobile @webview = true end -puts params[:menu] -puts "sssssssssssssssssssssssssss" - if params[:menus].present? - @menus = JSON.parse(params[:menus], object_class: OpenStruct) - @menu = JSON.parse(params[:category], object_class: OpenStruct) - puts @menus.to_json - puts @menu.to_json - else - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - end + + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end @table_id = params[:id] @table = DiningFacility.find(@table_id) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index e2f15d19..81724ff5 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -30,9 +30,9 @@ class Origami::HomeController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - bookings = Booking.all - if !bookings.today.nil? - @order_items_count = Hash.new + # bookings = Booking.all + # if !bookings.today.nil? + # @order_items_count = Hash.new # bookings.each do |booking| # if booking.sale_id.nil? && booking.booking_status != 'moved' # if !booking.booking_orders.empty? @@ -60,7 +60,7 @@ class Origami::HomeController < BaseOrigamiController # end # end # end - end + # end @dining.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index d5d3437b..86433417 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -10,24 +10,30 @@ class Origami::QuickServiceController < ApplicationController def index today = DateTime.now day = Date.today.wday - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - # @tables = Table.all.active.order('zone_id asc').group("zone_id") - # @rooms = Room.all.active.order('zone_id asc').group("zone_id") - # @all_table = Table.all.active.order('status desc') - # @all_room = Room.all.active.order('status desc') - render "origami/addorders/detail" + render "origami/addorders/detail" end def modify_order today = DateTime.now day = Date.today.wday - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end if(params[:id][0,3] == "BKI") @table_id = nil @table = nil diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 76b18ca1..5a9ff8ec 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -11,10 +11,15 @@
-