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

puma deleted by sqa-1804-001

Browse Source
This commit is contained in:
phyusin
2018-04-25 15:14:40 +06:30
parent 76531535d0 631c94a63a
commit 314058282e
28 changed files with 263 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -184,6 +184,18 @@ For MoveTablePdf in print settings
Add Kitchen Role of Employee
=> 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen }
Add Base URL for DOEMAL
1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' }
2) settings/lookups => { type:order_reservation, name: Token, value:'{doemal token}' }
Add Feature for Quick Service
** '0' means can not use quick service and '1' means can use quick service **
=> settings/lookups => { type:quick_service, name: QuickService, value:'{0 or 1}' }
Add Feature for Order and Reservation
** '0' means can not use order reservation and '1' means can use order reservation **
=> settings/lookups => { type:order_reservation, name: OrderReservation, value:'{0 or 1}' }
* ToDo list
1. Migration

7
app/assets/javascripts/channels/order_reservation.js
View File

@@ -18,13 +18,16 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', {
var time = [date.getHours() - (isPM && !isMidday ? 12 : 0),
date.getMinutes() || '00'].join(':') +
(isPM ? ' PM' : 'AM');
var requested_date = date.getDate() + '-' + date.getMonth() + '-' + date.getFullYear()
row = '<tr class="custom-tr first-'+rowCount+'" style="" data-id="'+order.order_reservation_id+'" data-sr-no="'+rowCount+'">'
+'<td width ="5%" class="align-left">'+rowCount
+'</td>'
+'<td width ="30%" class="align-center">'+time
+'<td width ="20%" class="align-center">'+requested_date
+'</td>'
+'<td width ="30%" class="align-center">'+order.grand_total
+'<td width ="20%" class="align-center">'+time
+'</td>'
+'<td width ="20%" class="align-center">'+order.grand_total
+'</td>'
+'<td width ="30%" class="align-center">'
+'<span class="font-10 col-blue">'+ order.status +'</span>'

73
app/controllers/api/api_controller.rb
View File

@@ -23,46 +23,45 @@ class Api::ApiController < ActionController::API
@employee = Employee.find_by_token_session(current_token)
end
def lookup_domain
if request.subdomain.present? && request.subdomain != "www"
from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?)
logger.info "Location - " + @license.dbhost
ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
else
# reconnect_default_db
logger.info 'License is nil'
# redirect_to root_url(:host => request.domain) + "store_error"
render :json => [{ status: false, message: 'Invalid Access!'}]
end
end
end
# def lookup_domain
# if request.subdomain.present? && request.subdomain != "www"
# from = request.subdomain.downcase + "." + request.domain.downcase
# @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
# if (!@license.nil?)
# logger.info "Location - " + @license.dbhost
# ActiveRecord::Base.establish_connection(website_connection(@license))
# # authenticate_session_token
# # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
# else
# # reconnect_default_db
# logger.info 'License is nil'
# # redirect_to root_url(:host => request.domain) + "store_error"
# render :json => [{ status: false, message: 'Invalid Access!'}]
# end
# end
# end
def website_connection(license)
default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
:username => license.dbusername, :password => license.dbpassword)
# def website_connection(license)
# default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
# :username => license.dbusername, :password => license.dbpassword)
# end
end
# def reconnect_default_db
# ActiveRecord::Base.establish_connection(Rails.env)
# end
def reconnect_default_db
ActiveRecord::Base.establish_connection(Rails.env)
end
# # Regular database.yml configuration hash
# def default_connection
# @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
# end
# Regular database.yml configuration hash
def default_connection
@default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
end
# def cache_license(url, lookup)
# @license = License.new(url, lookup)
def cache_license(url, lookup)
@license = License.new(url, lookup)
if (@license.detail_with_local_cache(lookup) == true)
return @license
else
return nil
end
end
# if (@license.detail_with_local_cache(lookup) == true)
# return @license
# else
# return nil
# end
# end
end

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

@@ -47,7 +47,9 @@ class Api::BillController < Api::ApiController
Promotion.promo_activate(@sale)
#BillBroadcastJob.perform_later(table)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
#end
else
@status = false
@error_message = "No Current Open Shift"

3
app/controllers/api/call_waiters_controller.rb
View File

@@ -6,8 +6,9 @@ class Api::CallWaitersController < ActionController::API
@time = params[:time]
@table = DiningFacility.find(@table_id)
# CallWaiterJob.perform_later(@table,@time)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
#end
# get printer info
@shop = Shop.first
unique_code = "CallWaiterPdf"

5
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -56,10 +56,13 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end
if status == true
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
order_reservation = params
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
order_reservation = OrderReservation.find(order_reservation_id)
if flag #&& ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
end
if flag
render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }

3
app/controllers/concerns/token_verification.rb
View File

@@ -24,7 +24,8 @@ module TokenVerification
end
end
@user = Employee.authenticate_by_token(token)
@user = Employee.
(token)
if @user
return true
#Maybe log - login?

6
app/controllers/origami/addorders_controller.rb
View File

@@ -184,11 +184,9 @@ puts items_arr.to_json
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
# for second display
if ENV["SERVER_MODE"] != 'cloud'
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
end
#end
result = {:status=> @status, :data => @sale }
render :json => result.to_json
end

16
app/controllers/origami/dashboard_controller.rb
View File

@@ -56,6 +56,22 @@ class Origami::DashboardController < BaseOrigamiController
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
@current_user = current_user
#quick service
quick_service = Lookup.collection_of('quick_service')
@quick_service = 0
if !quick_service[0].nil?
@quick_service = quick_service[0][1]
end
#order reservation
order_reservation = Lookup.collection_of('order_reservation')
@order_reservation = 0
if !order_reservation.empty?
order_reservation.each do |order_reserve|
if order_reserve[0] == 'OrderReservation'
@order_reservation = order_reserve[1]
end
end
end
end
end

2
app/controllers/origami/order_reservation_controller.rb
View File

@@ -1,7 +1,7 @@
class Origami::OrderReservationController < BaseOrigamiController
def index
@order = OrderReservation.all
@order = OrderReservation.latest_order
end
def update

2
app/controllers/origami/payments_controller.rb
View File

@@ -6,7 +6,7 @@ class Origami::PaymentsController < BaseOrigamiController
def first_bill
sale_id = params[:sale_id] # sale_id
sale_data = Sale.find_by_sale_id(sale_id)
sale_items = SaleItem.where("sale_id=?",sale_id)
sale_items = SaleItem.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,unit_price,taxable_price,price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,price")
member_info = nil
# For Cashier by Zone

2
app/controllers/origami/request_bills_controller.rb
View File

@@ -39,7 +39,9 @@ class Origami::RequestBillsController < ApplicationController
# Promotion Activation
Promotion.promo_activate(@sale)
#bill channel
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
#end
if order.source == "quick_service"
result = {:status=> @status, :data => @sale.sale_id }
render :json => result.to_json

4
app/controllers/origami/second_display_controller.rb
View File

@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
else
tax_profiles = nil
end
if ENV["SERVER_MODE"] != 'cloud'
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
end
# end
end
#Shop Name in Navbor
helper_method :shop_detail

4
app/controllers/origami/split_bill_controller.rb
View File

@@ -335,9 +335,9 @@ class Origami::SplitBillController < BaseOrigamiController
end
Promotion.promo_activate(sale)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
#end
render :json => { status: status }
else
render :json => { status: false, error_message: 'No Current Open Shift!'}

4
app/models/dining_facility.rb
View File

@@ -156,14 +156,18 @@ class DiningFacility < ApplicationRecord
table = DiningFacility.find(table_id)
#Send to background job for processing
# CheckInBookingJob.perform_later(table)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "check_in_booking_channel",table: table
#end
end
def self.checkin_time
table = DiningFacility.get_checkin_booking
if table.length > 0
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "checkin_channel",table: table
end
end
end
end

4
app/models/license.rb
View File

@@ -60,8 +60,8 @@ class License
return true
end
else
# @license = Marshal.load(cache_license)
# assign(aes_key, aes_iv)
@license = Marshal.load(cache_license)
assign(aes_key, aes_iv)
# Rails.logger.info 'API License'
return true
end

1
app/models/my_aes_crypt.rb
View File

@@ -63,6 +63,7 @@ class MyAesCrypt
shop_json = JSON.parse(shop_data)
shop_json["data"].each do |j|
if j["lookup"] == from
# add [0...44] for production cloud for remove \n
if(j["value"]["key"] == token)
return true
end

8
app/models/order.rb
View File

@@ -321,7 +321,9 @@ class Order < ApplicationRecord
end
else
msg = ' Print Error ! Please contact to service'
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error'
#end
if !sidekiq.nil?
OrderQueueProcessorJob.perform_later(self.id, self.table_id)
else
@@ -335,7 +337,9 @@ class Order < ApplicationRecord
end
end
assign_order = AssignedOrderItem.assigned_order_item_by_job(self.id)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_queue_station_channel",order: assign_order
#end
end
end
@@ -372,7 +376,9 @@ class Order < ApplicationRecord
type = 'order'
#Send to background job for processing
# OrderBroadcastJob.perform_later(table,type)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_channel",table: table,type:type
#end
end
end
@@ -526,7 +532,9 @@ class Order < ApplicationRecord
end
end
end
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status
#end
end
private

71
app/models/order_reservation.rb
View File

@@ -7,45 +7,48 @@ class OrderReservation < ApplicationRecord
has_many :order_reservation_items
belongs_to :delivery
scope :latest_order, -> { order("order_reservation_id desc, requested_time asc") }
SEND_TO_KITCHEN = "send_to_kitchen"
READY_TO_DELIVERY = "ready_to_deliver"
DELIVERED = "delivered"
COMPLETED = "completed"
def self.addOrderReservationInfo(params)
check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference])
def self.addOrderReservationInfo(order_reserve)
Rails.logger.debug order_reserve.to_s
check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference])
if check_order_reservation.empty?
order_reservation = OrderReservation.new
order_reservation.order_reservation_type = params[:order_type]
order_reservation.customer_id = params[:cus_info]
order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
order_reservation.callback_url = params[:callback_url]
order_reservation.transaction_ref = params[:reference]
if params[:order_info]
order_reservation.item_count = params[:order_info][:items].count
order_reservation.payment_type = params[:payment_info][:payment_type]
order_reservation.payment_status = params[:payment_info][:payment_status]
order_reservation.payment_ref = params[:payment_info][:payment_ref]
order_reservation.total_amount = params[:payment_info][:sub_total]
order_reservation.total_tax = params[:payment_info][:total_tax]
order_reservation.discount_amount = params[:payment_info][:discount_amount]
order_reservation.grand_total = params[:payment_info][:grand_total]
order_reservation.order_remark = params[:order_info][:order_remark]
order_reservation.order_reservation_type = order_reserve[:order_type]
order_reservation.customer_id = order_reserve[:cus_info]
order_reservation.requested_time = DateTime.parse(order_reserve[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
order_reservation.callback_url = order_reserve[:callback_url]
order_reservation.transaction_ref = order_reserve[:reference]
if order_reserve[:order_info]
order_reservation.item_count = order_reserve[:order_info][:items].count
order_reservation.payment_type = order_reserve[:payment_info][:payment_type]
order_reservation.payment_status = order_reserve[:payment_info][:payment_status]
order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref]
order_reservation.total_amount = order_reserve[:payment_info][:sub_total]
order_reservation.total_tax = order_reserve[:payment_info][:total_tax]
order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount]
order_reservation.grand_total = order_reserve[:payment_info][:grand_total]
order_reservation.order_remark = order_reserve[:order_info][:order_remark]
end
if params[:reservation_info]
order_reservation.total_customer = params[:reservation_info][:total_user]
order_reservation.reservation_remark = params[:reservation_info][:reservation_note]
if order_reserve[:reservation_info]
order_reservation.total_customer = order_reserve[:reservation_info][:total_user]
order_reservation.reservation_remark = order_reserve[:reservation_info][:reservation_note]
end
order_reservation.save!
if params[:order_info][:items]
params[:order_info][:items].each do |oritem|
if order_reserve[:order_info][:items]
order_reserve[:order_info][:items].each do |oritem|
OrderReservationItem.process_order_reservation_item(oritem[:product_code],oritem[:item_instance_code],oritem[:product_name],oritem[:product_alt_name],
oritem[:account_id],oritem[:qty],oritem[:price],oritem[:unit_price],
oritem[:options],nil,order_reservation.id)
end
end
if params[:delivery_info]
Delivery.addDeliveryInfo(params[:delivery_info],order_reservation.id)
if order_reserve[:delivery_info]
Delivery.addDeliveryInfo(order_reserve[:delivery_info],order_reservation.id)
end
return order_reservation.id, true
else
@@ -219,14 +222,30 @@ class OrderReservation < ApplicationRecord
end
def self.send_status_to_ordering(url,ref_no,status)
base_url = "http://192.168.1.186:3002"
base_url = 'https://api.doemal.com'
token = '3T-tnlYtFJ-5Z1vY6XQqxQ'
order_reservation = Lookup.collection_of("order_reservation")
if !order_reservation.empty?
order_reservation.each do |order_reserve|
if order_reserve[0] == 'BaseURL'
base_url = order_reserve[1]
elsif order_reserve[0] == 'Token'
token = order_reserve[1]
end
end
else
Rails.logger.debug "Add order reservation BaseURL "
response = {status: false}
end
Rails.logger.debug "Doemal URL" + base_url
post_url = base_url + url
begin
response = HTTParty.post(post_url,
:body => { id: ref_no, status: status}.to_json,
:headers => {
'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ',
'Authorization' => 'Token token='+token,
'Content-Type' => 'application/json',
'Accept' => 'application/json; version=3'
}, :timeout => 10

2
app/models/sale_payment.rb
View File

@@ -607,7 +607,9 @@ class SalePayment < ApplicationRecord
type = 'payment'
#Send to background job for processing
# OrderBroadcastJob.perform_later(table,type)
#if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "order_channel",table: table,type:type
#end
end
end
end

4
app/views/origami/dashboard/index.html.erb
View File

@@ -18,6 +18,7 @@
<!-- Widgets -->
<div class="row clearfix">
<% if @quick_service == '1' %>
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 qs_view">
<div class="info-box bg-purple">
<div class="icon" >
@@ -26,6 +27,7 @@
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :quick_service %></div>
</div>
</div>
<% end %>
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 cashier_view">
<div class="info-box bg-green">
<div class="icon" >
@@ -34,6 +36,7 @@
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :dine_in_cashier %></div>
</div>
</div>
<% if @order_reservation == '1' %>
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-12 order_reservation">
<div class="info-box bg-blue">
<div class="icon" >
@@ -42,6 +45,7 @@
<div class="text font-20 m-l-5" style="line-height: 80px;"><%= t :order_reservation %></div>
</div>
</div>
<% end %>
</div>
<!-- #END# Widgets -->
<% if !@current_user.nil? && @current_user.role != 'waiter' %>

28
app/views/origami/order_reservation/index.html.erb
View File

@@ -31,10 +31,13 @@
<td width ="5%" class="align-left">
<%=i%>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%=order.grand_total%>
</td>
<td width ="30%" class="align-center">
@@ -63,10 +66,13 @@
<td width ="5%" class="align-left">
<%=i%>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%=order.grand_total%>
</td>
<td width ="30%" class="align-center">
@@ -94,10 +100,13 @@
<td width ="5%" class="align-left">
<%=i%>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%=order.grand_total%>
</td>
<td width ="30%" class="align-center">
@@ -125,10 +134,13 @@
<td width ="5%" class="align-left">
<%=i%>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="30%" class="align-center">
<td width ="20%" class="align-center">
<%=order.grand_total%>
</td>
<td width ="30%" class="align-center">

2
app/views/print_settings/_form.html.erb
View File

@@ -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, :as => :select, :collection => [] %>
<%= f.input :printer_name %>
<% end %>
<%= f.input :brand_name %>
<%= f.input :printer_type %>

61
config/initializers/action_controller.rb
View File

@@ -86,3 +86,64 @@ class ActionController::Base
end
end
class ActionController::API
before_action :lookup_domain
private
def lookup_domain
if request.subdomain.present? && request.subdomain != "www"
from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?)
# logger.info "Location - " + @license.dbhost
ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
else
# reconnect_default_db
logger.info 'License is nil'
# redirect_to root_url(:host => request.domain) + "store_error"
render :json => [{ status: false, message: 'Invalid Access!'}]
end
end
end
def cache_license(url, lookup)
@license = License.new(url, lookup)
if (@license.detail_with_local_cache(lookup) == true)
return @license
else
return nil
end
end
def website_connection(license)
default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
:username => license.dbusername, :password => license.dbpassword)
end
def reconnect_default_db
ActiveRecord::Base.establish_connection(Rails.env)
end
# Regular database.yml configuration hash
def default_connection
@default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup
end
#change locallization
def set_locale
I18n.locale = params[:locale] || I18n.default_locale
end
# RESTful url for localize
def default_url_options
{ locale: I18n.locale }
end
end

2
config/initializers/mysql2_adapter.rb
View File

@@ -24,7 +24,7 @@ module ActiveRecord
end
client = Mysql2::Client.new(config.symbolize_keys)
options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:pool], config[:wait_timeout], 0]
ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
end
end

2
config/secrets.yml
View File

@@ -13,7 +13,7 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application
server_mode: cloud
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L