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

improvement

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-02-07 09:31:20 +06:30
parent 0582587f75
commit a645e3348d
8 changed files with 96 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/induties/assign_in_duties.scss
View File

@@ -85,10 +85,10 @@
font-size: 14px !important; font-size: 14px !important;
font-weight:bold; font-weight:bold;
} }
.sweet-alert { // .sweet-alert {
top :0; // top :0;
margin-top: 20px !important; // margin-top: 20px !important;
} // }
.add_to_charges{ .add_to_charges{
width:100%; width:100%;
padding:1rem; padding:1rem;

33
app/controllers/api/orders_controller.rb
View File

@@ -114,28 +114,19 @@ class Api::OrdersController < Api::ApiController
} }
#end extra time #end extra time
Order.transaction do Order.transaction do
@order =Order.create(source: params[:order_source],
order_type: params[:order_type],
customer_id: params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id, # for no customer id from mobile
items: items_arr,
guest: params[:guest_info],
table_id: params[:table_id],
new_booking: true,
waiters: @user.name,
employee_name: @user.name,
is_extra_time: is_extra_time,
extra_time: extra_time
)
# begin # begin
@order = Order.new
@order.source = params[:order_source]
@order.order_type = params[:order_type]
@order.customer_id = params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id # for no customer id from mobile
@order.items = items_arr
@order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true
@order.waiters = @user.name
@order.employee_name = @user.name
@order.is_extra_time = is_extra_time
@order.extra_time = extra_time
#Create Table Booking or Room Booking
if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved'
@order.new_booking = true
else
@order.new_booking = false
@order.booking_id = booking.booking_id
end
@status, @booking = @order.generate @status, @booking = @order.generate

31
app/controllers/api/payments_controller.rb
View File

@@ -61,32 +61,13 @@ class Api::PaymentsController < Api::ApiController
end end
# For Print # For Print
receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf if Lookup.collection_of("print_settings").any? { |x| x == ["ReceiptBillA5Pdf", "1"] } #print_settings with name:ReceiptBillA5Pdf
unique_code = "ReceiptBillPdf" unique_code = "ReceiptBillA5Pdf"
print_settings = PrintSetting.all else
if !print_settings.nil? unique_code = PrintSetting.where("unique_code REGEXP ?", "receipt.*bill.*pdf").first.unique_code
print_settings.each do |setting| end
if setting.unique_code == 'ReceiptBillPdf'
unique_code = "ReceiptBillPdf"
elsif setting.unique_code == 'ReceiptBillStarPdf'
unique_code = "ReceiptBillStarPdf"
end
end
end
if !receipt_bill_a5_pdf.empty? customer = sale.customer
receipt_bill_a5_pdf.each do |receipt_bilA5|
if receipt_bilA5[0] == 'ReceiptBillA5Pdf'
if receipt_bilA5[1] == '1'
unique_code = "ReceiptBillA5Pdf"
# else
end
end
end
end
customer= Customer.find(sale.customer_id)
# get member information # get member information
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)

59
app/controllers/crm/customers_controller.rb
View File

@@ -9,25 +9,15 @@ class Crm::CustomersController < BaseCrmController
filter = params[:filter] filter = params[:filter]
filter_card_no = params[:filter_card_no] filter_card_no = params[:filter_card_no]
type = params[:type] type = params[:type]
puts "type :"
puts type
puts "filter :"
puts filter
puts "filter card no"
puts filter_card_no
@customer_update_phone_email_membertype =false @customer_update_phone_email_membertype =false
if filter_card_no=="" if filter_card_no==""
@crm_customers = Customer.all @crm_customers = Customer.all
puts "Filter card no"
elsif !filter_card_no.nil? elsif !filter_card_no.nil?
@crm_customers=Customer.where("card_no=?",filter_card_no) @crm_customers=Customer.where("card_no=?",filter_card_no)
puts "Null filter card no"
elsif filter.nil? || filter_card_no=="" elsif filter.nil? || filter_card_no==""
@crm_customers = Customer.all @crm_customers = Customer.all
puts "filter null filter card no nulll"
else else
@crm_customers = Customer.search(filter) @crm_customers = Customer.search(filter)
puts "else"
# paymal_customer = Customer.search_paypar_account_no(filter) # paymal_customer = Customer.search_paypar_account_no(filter)
# search account no from paypar # search account no from paypar
if type == "card" if type == "card"
@@ -35,20 +25,21 @@ class Crm::CustomersController < BaseCrmController
response = Customer.search_paypar_account_no(filter) response = Customer.search_paypar_account_no(filter)
if !@crm_customers.present? if !@crm_customers.present?
if response["status"] == true if response["status"] == true
@crm_customers = Customer.new tax_ids =[]
@crm_customers.name = response["customer_data"]["name"] TaxProfile.all.each {|tax| tax_ids << "#{tax.id}"}
@crm_customers.contact_no = response["customer_data"]["phone"] @crm_customers =Customer.create(name: response["customer_data"]["name"],
@crm_customers.email = response["customer_data"]["email"] contact_no: response["customer_data"]["phone"],
@crm_customers.date_of_birth = response["customer_data"]["DOB"] email: response["customer_data"]["email"],
@crm_customers.nrc_no = response["customer_data"]["NRC"] date_of_birth: response["customer_data"]["DOB"],
@crm_customers.address = response["customer_data"]["address"] nrc_no: response["customer_data"]["NRC"],
@crm_customers.card_no = response["customer_data"]["customer_card_no"] address: response["customer_data"]["address"],
@crm_customers.paypar_account_no = filter card_no: response["customer_data"]["customer_card_no"],
@crm_customers.membership_id = response["customer_data"]["id"] paypar_account_no: filter,
@crm_customers.membership_type = response["customer_data"]["member_group_id"] membership_id: response["customer_data"]["id"],
@crm_customers.customer_type = "Dinein" membership_type: response["customer_data"]["member_group_id"],
@crm_customers.tax_profiles = ["1", "2"] customer_type: "Dinein",
@crm_customers.save tax_profiles: tax_ids
)
@crm_customers = Customer.search(filter) @crm_customers = Customer.search(filter)
flash[:member_notice]='Customer was successfully created.' flash[:member_notice]='Customer was successfully created.'
else else
@@ -207,7 +198,8 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue Errno::ECONNREFUSED
response = {"status" => false, "message" => "No internet connection "}
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "} response = {"status" => false, "message" => "No internet connection "}
@@ -307,7 +299,8 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue Errno::ECONNREFUSED
response = {"status" => false, "message" => "No internet connection "}
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "} response = {"status" => false, "message" => "No internet connection "}
@@ -457,6 +450,8 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue Errno::ECONNREFUSED
response = {"status" => false, "message" => "No internet connection "}
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "} response = {"status" => false, "message" => "No internet connection "}
@@ -522,6 +517,8 @@ class Crm::CustomersController < BaseCrmController
}, },
:timeout => 10 :timeout => 10
) )
rescue Errno::ECONNREFUSED
response = {"status" => false, "message" => "No internet connection "}
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "} response = {"status" => false, "message" => "No internet connection "}
@@ -593,11 +590,11 @@ class Crm::CustomersController < BaseCrmController
@customer = Customer.find(params[:id]) @customer = Customer.find(params[:id])
response = Customer.search_paypar_account_no(@customer.paypar_account_no) response = Customer.search_paypar_account_no(@customer.paypar_account_no)
if response["status"] == true if response["status"] == true
@customer.name =response["customer_data"]["name"] @customer.update_attributes(name: response["customer_data"]["name"],
@customer.contact_no =response["customer_data"]["phone"] contact_no: response["customer_data"]["phone"],
@customer.email =response["customer_data"]["email"] email: response["customer_data"]["email"],
@customer.membership_type =response["customer_data"]["member_group_id"] membership_type: response["customer_data"]["member_group_id"]
@customer.save )
respond_to do |format| respond_to do |format|
format.html { redirect_to crm_customers_path } format.html { redirect_to crm_customers_path }
flash[:member_notice]='Membership was successfully updated' flash[:member_notice]='Membership was successfully updated'

38
app/controllers/foodcourt/addorders_controller.rb
View File

@@ -87,6 +87,8 @@ class Foodcourt::AddordersController < BaseFoodcourtController
end end
def create def create
new_booking =true
booking_id =nil
if params[:booking_id].present? if params[:booking_id].present?
booking = Booking.find(params[:booking_id]) booking = Booking.find(params[:booking_id])
end end
@@ -124,27 +126,25 @@ class Foodcourt::AddordersController < BaseFoodcourtController
else else
customer_id = params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id # for no customer id from mobile customer_id = params[:customer_id].present? ? params[:customer_id] : Customer.walkin.customer_id # for no customer id from mobile
end end
@order = Order.new
@order.source = params[:order_source]
@order.order_type = params[:order_type]
@order.customer_id = customer_id
@order.items = items_arr
@order.guest = params[:guest_info]
@order.table_id = params[:table_id] # this is dining facilities's id
@order.new_booking = true
@order.waiters = current_login_employee.name
@order.employee_name = current_login_employee.name
@order.is_extra_time = is_extra_time
@order.extra_time = extra_time
if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved' if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved'
@order.new_booking = true new_booking = true
else else
@order.new_booking = false new_booking = false
@order.booking_id = booking.booking_id booking_id = booking.booking_id
end end
@order =Order.create(source: params[:order_source],
order_type: params[:order_type],
customer_id: customer_id,
items: items_arr,
guest: params[:guest_info],
table_id: params[:table_id],
new_booking: new_booking,
waiters: current_login_employee.name,
employee_name: current_login_employee.name,
is_extra_time: is_extra_time,
extra_time: extra_time,
booking_id: booking_id
)
@status, @booking = @order.generate @status, @booking = @order.generate
if @status && @booking if @status && @booking
@@ -162,8 +162,6 @@ class Foodcourt::AddordersController < BaseFoodcourtController
end end
end end
# Order.send_customer_view(@booking)
if current_user.role != "waiter" && params[:create_type] == "create_pay" if current_user.role != "waiter" && params[:create_type] == "create_pay"
if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court') if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court')

31
app/controllers/foodcourt/payments_controller.rb
View File

@@ -64,32 +64,13 @@ class Foodcourt::PaymentsController < BaseFoodcourtController
# For Print # For Print
# if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf if Lookup.collection_of("print_settings").any? { |x| x == ["ReceiptBillA5Pdf", "1"] } #print_settings with name:ReceiptBillA5Pdf
unique_code = "ReceiptBillPdf" unique_code = "ReceiptBillA5Pdf"
print_settings = PrintSetting.all else
if !print_settings.nil? unique_code = PrintSetting.where("unique_code REGEXP ?", "receipt.*bill.*pdf").first.unique_code
print_settings.each do |setting| end
if setting.unique_code == 'ReceiptBillPdf'
unique_code = "ReceiptBillPdf"
elsif setting.unique_code == 'ReceiptBillStarPdf'
unique_code = "ReceiptBillStarPdf"
end
end
end
if !receipt_bill_a5_pdf.empty? customer = saleObj.customer
receipt_bill_a5_pdf.each do |receipt_bilA5|
if receipt_bilA5[0] == 'ReceiptBillA5Pdf'
if receipt_bilA5[1] == '1'
unique_code = "ReceiptBillA5Pdf"
# else
end
end
end
end
customer= Customer.find(saleObj.customer_id)
# get member information # get member information
rebate = MembershipSetting.find_by_rebate(1) rebate = MembershipSetting.find_by_rebate(1)

6
app/models/customer.rb
View File

@@ -169,8 +169,10 @@ class Customer < ApplicationRecord
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Accept' => 'application/json; version=3' 'Accept' => 'application/json; version=3'
}) })
rescue Errno::ECONNREFUSED
response = {status: false, message: "Can't connect server" }
rescue Net::OpenTimeout rescue Net::OpenTimeout
response = { status: false, message: "Server Time out" } response = { status: false, message: "Server Time out" }
rescue OpenURI::HTTPError rescue OpenURI::HTTPError
response = { status: false, message: "Can't connect server"} response = { status: false, message: "Can't connect server"}
@@ -359,6 +361,8 @@ class Customer < ApplicationRecord
}, },
:timeout => 10 :timeout => 10
) )
rescue Errno::ECONNREFUSED
response = {"status" => false, "message" => "No internet connection "}
rescue HTTParty::Error rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "} response = {"status" => false, "message" => "No internet connection "}

41
config/initializers/action_controller.rb
View File

@@ -1,12 +1,12 @@
class ActionController::Base class ActionController::Base
before_action :lookup_domain if Rails.env.production? before_action :lookup_domain, :set_locale
before_action :set_locale
private private
def lookup_domain def lookup_domain
if request.subdomains.last && request.subdomains.last != "www" && ENV["SERVER_MODE"] == "cloud" if request.subdomain.present? && request.subdomain != "www"
@license = cache_license(ENV["SX_PROVISION_URL"], request.host) # request.subdomain.downcase from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?) if (!@license.nil?)
logger.info "Location - " + @license.dbschema logger.info "Location - " + @license.dbschema
ActiveRecord::Base.establish_connection(website_connection(@license)) ActiveRecord::Base.establish_connection(website_connection(@license))
@@ -18,34 +18,26 @@ class ActionController::Base
# redirect_to root_url(:host => request.domain) + "store_error" # redirect_to root_url(:host => request.domain) + "store_error"
render :json => [{ status: false, message: 'Invalid Access!'}] render :json => [{ status: false, message: 'Invalid Access!'}]
end end
elsif request.subdomains.last && request.subdomains.last != "www" || ENV["SERVER_MODE"] == "application" else
# check for license file # check for license file
if check_license(request.host) if check_license
current_license(ENV["SX_PROVISION_URL"], request.host) current_license(ENV["SX_PROVISION_URL"])
else else
redirect_to activate_path redirect_to activate_path
end end
else
not_found
end end
end end
def not_found def current_license(url)
respond_to do |format| @license = License.new(url)
format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found }
format.json { head :not_found }
end
end
def current_license(url, lookup)
@license = License.new(url, lookup)
flag = @license.detail_with_local_file() flag = @license.detail_with_local_file()
if (flag == 0) if (flag == 0)
flash[:notice] = 'Expired or No License!' flash[:notice] = 'Expired or No License!'
elsif (flag == 2) elsif (flag == 2)
flash[:notice] = 'Expiring! Please, License extend...' flash[:notice] = 'Expiring! Please, License extend...'
else else
Rails.logger.info "Run License" puts "RUN SAY BYAR"
end end
end end
@@ -59,8 +51,8 @@ class ActionController::Base
end end
end end
def check_license(lookup) def check_license
License.check_license_file(lookup) License.check_license_file
end end
def check_installation def check_installation
@@ -97,13 +89,14 @@ class ActionController::Base
end end
class ActionController::API class ActionController::API
before_action :lookup_domain if Rails.env.production? before_action :lookup_domain
private private
def lookup_domain def lookup_domain
if request.subdomains.last && request.subdomains.last != "www" && ENV["SERVER_CODE"] == "cloud" if request.subdomain.present? && request.subdomain != "www"
@license = cache_license(ENV["SX_PROVISION_URL"], request.host) # request.subdomain.downcase from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?) if (!@license.nil?)
logger.info "Location - " + @license.dbschema logger.info "Location - " + @license.dbschema
ActiveRecord::Base.establish_connection(website_connection(@license)) ActiveRecord::Base.establish_connection(website_connection(@license))