git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verfication controller

Browse Source
This commit is contained in:
Nweni
2019-12-03 18:22:38 +06:30
parent bb698789e4
commit 15361fe4e1
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/verifications_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::VerificationsController < ActionController::API class Api::VerificationsController < Api::ApiController
def new def new
phone_number = params[:phone_number] phone_number = params[:phone_number]

2
app/controllers/foodcourt/food_court_controller.rb
View File

@@ -39,7 +39,7 @@ class Foodcourt::FoodCourtController < ApplicationController
.joins("JOIN orders ON orders.order_id=booking_orders.order_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id")
.joins("JOIN order_items ON orders.order_id=order_items.order_id") .joins("JOIN order_items ON orders.order_id=order_items.order_id")
.joins("JOIN customers ON orders.customer_id=customers.customer_id") .joins("JOIN customers ON orders.customer_id=customers.customer_id")
.where("orders.source='app' and bookings.shop_code='#{@shop.shop_code}' and bookings.booking_status='assign'").uniq.length .where("orders.source='app' and bookings.shop_code='#{Shop.current_shop.shop_code}' and bookings.booking_status='assign'").uniq.length
puts @app_order_new_count puts @app_order_new_count
render "foodcourt/addorders/detail" render "foodcourt/addorders/detail"
end end

10
app/controllers/origami/quick_service_controller.rb
View File

@@ -13,12 +13,12 @@ class Origami::QuickServiceController < ApplicationController
# if params[:menu] == "true" # if params[:menu] == "true"
@menus = [] @menus = []
@menu = [] @menu = []
@zone = Zone.all.where("shop_code='#{@shop.shop_code}'") @zone = Zone.all
@customer = Customer.all @customer = Customer.all
@tables = Table.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @tables = Table.all.active.order('status desc')
@rooms = Room.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @rooms = Room.all.active.order('status desc')
@cashier_type = "quick_service" @cashier_type = "quick_service"
display_type = Lookup.find_by_lookup_type_and_shop_code("display_type",@shop.shop_code) display_type = Lookup.find_by_lookup_type("display_type")
if !display_type.nil? && display_type.value.to_i ==2 if !display_type.nil? && display_type.value.to_i ==2
@display_type = display_type.value @display_type = display_type.value
else else
@@ -27,7 +27,7 @@ class Origami::QuickServiceController < ApplicationController
#checked quick_service only #checked quick_service only
@quick_service_only = false @quick_service_only = false
lookup_dine_in = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('quickservice_add_order') lookup_dine_in = Lookup.where("shop_code='#{Shop.current_shop.shop_code}'").collection_of('quickservice_add_order')
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 == "quickserviceaddorder" if dine_in[0].downcase == "quickserviceaddorder"

22
config/puma.rb
View File

@@ -1,11 +1,11 @@
# 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!
# threads 1,1 threads 1,1