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

fixed conflit

Browse Source
This commit is contained in:
NyanLinHtut
2019-09-11 13:30:45 +06:30
parent 90d0a4ebb1 a4e8869234
commit 26f537a42d
28 changed files with 262 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ class Crm::CustomersController < BaseCrmController
# GET /crm/customers
# GET /crm/customers.json
def index
@no_need_validation =false
filter = params[:filter]
filter_card_no = params[:filter_card_no]
type = params[:type]
@@ -39,24 +40,37 @@ class Crm::CustomersController < BaseCrmController
@crm_customers.tax_profiles = ["1", "2"]
@crm_customers.save
@crm_customers = Customer.search(filter)
flash[:notice]='Customer was successfully created.'
flash[:member_notice]='Customer was successfully created.'
else
flash[:error]=response["message"]
flash[:member_error]=response["message"]
end
else
@crm_customers.each do |customer|
if customer.contact_no != response["customer_data"]["phone"]
@customer_update_phone_email_membertype =true
if response["status"] ==true
@crm_customers.each do |customer|
if !response["customer_data"].nil?
if customer.contact_no != response["customer_data"]["phone"]
@customer_update_phone_email_membertype =true
end
if customer.email != response["customer_data"]["email"]
@customer_update_phone_email_membertype =true
end
if customer.name != response["customer_data"]["name"]
@customer_update_phone_email_membertype =true
end
if customer.membership_type.to_i != response["customer_data"]["member_group_id"]
@customer_update_phone_email_membertype =true
end
else
flash[:member_error]=response["message"]
end
end
if customer.email != response["customer_data"]["email"]
@customer_update_phone_email_membertype =true
end
if customer.name != response["customer_data"]["name"]
@customer_update_phone_email_membertype =true
end
if customer.membership_type.to_i != response["customer_data"]["member_group_id"]
@customer_update_phone_email_membertype =true
else
if response["message"] =='No internet connection '
flash[:member_error]=response["message"]
else
flash[:member_error]="Need to press sync button "
end
end
end
end
@@ -190,14 +204,18 @@ class Crm::CustomersController < BaseCrmController
},
:timeout => 10
)
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout
response = { status: false }
response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
rescue SocketError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
end
customer = Customer.find(@crm_customer.customer_id)
Rails.logger.debug "--------Sync Member response -------"
@@ -222,6 +240,9 @@ class Crm::CustomersController < BaseCrmController
customer.destroy
format.html { redirect_to crm_customers_path }
flash[:member_error] ='Member cannot created.Invalid Account.'
else
format.html { redirect_to crm_customers_path }
flash[:member_error] =response["message"]
end
format.html { redirect_to crm_customers_path }
flash[:member_error] =response["message"]
@@ -286,16 +307,16 @@ class Crm::CustomersController < BaseCrmController
)
rescue HTTParty::Error
response = {"status" => false, "message" => "Can't open membership server "}
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout
response = {"status" => false, "message" => "Can't open membership server "}
response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError
response = {"status" => false, "message" => "Can't open membership server "}
response = {"status" => false, "message" => "No internet connection "}
rescue SocketError
response = {"status" => false, "message" => "Can't open membership server "}
response = {"status" => false, "message" => "No internet connection "}
end
Rails.logger.debug "--------------Create Member---------"
Rails.logger.debug response.to_json
@@ -332,6 +353,9 @@ class Crm::CustomersController < BaseCrmController
format.html { redirect_to crm_customers_path }
flash[:member_error]='Member cannot created.Invalid Account.'
end
else
format.html { redirect_to crm_customers_path }
flash[:member_error]=response["message"]
end
if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] }
@@ -431,14 +455,17 @@ class Crm::CustomersController < BaseCrmController
},
:timeout => 10
)
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout
response = { status: false }
response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
rescue SocketError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
end
customer = Customer.find(@crm_customer.customer_id)
Rails.logger.debug "--------Update Member response -------"
@@ -493,14 +520,17 @@ class Crm::CustomersController < BaseCrmController
},
:timeout => 10
)
rescue HTTParty::Error
response = {"status" => false, "message" => "No internet connection "}
rescue Net::OpenTimeout
response = { status: false }
response = {"status" => false, "message" => "No internet connection "}
rescue OpenURI::HTTPError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
rescue SocketError
response = { status: false}
response = {"status" => false, "message" => "No internet connection "}
end
Rails.logger.debug "--------Update Member response -------"
Rails.logger.debug response.to_json

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

@@ -3,6 +3,8 @@ class Origami::DiscountsController < BaseOrigamiController
#discount page show from origami index with selected order
def index
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
@webview = false
if check_mobile
@webview = true

3
app/controllers/origami/home_controller.rb
View File

@@ -17,7 +17,8 @@ class Origami::HomeController < BaseOrigamiController
# origami table detail
def show
# get printer info
@print_settings = PrintSetting.get_precision_delimiter()
@webview = check_mobile
@tables = Table.unscoped.all.active.order('status desc')

1
app/controllers/origami/void_controller.rb
View File

@@ -8,7 +8,6 @@ class Origami::VoidController < BaseOrigamiController
access_code = params[:access_code]
if Sale.exists?(sale_id)
sale = Sale.find_by_sale_id(sale_id)
if sale.discount_type == "member_discount"
sale.update_attributes(total_discount: 0)
sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)

1
app/controllers/reports/hourly_saleitem_controller.rb
View File

@@ -59,6 +59,7 @@ class Reports::HourlySaleitemController < BaseReportController
# @hourly_total_qty = @sale_data.group_by {|s| s.date_format }.collect{|key,qty| {"date" => key , "total_qty" => qty.sum{|d| d.qty.to_i}}}
@hourly_total_qty = @sale_data.group_by(&:date_format).map { |k,v|{"date" => k , "total_qty" => v.count }}
puts @hourly_total_qty.to_json
respond_to do |format|
format.html
format.xls

5
app/controllers/reports/saleitem_controller.rb
View File

@@ -54,8 +54,7 @@ class Reports::SaleitemController < BaseReportController
@shift_data = sh
end
end
respond_to do |format|
respond_to do |format|
format.html
format.xls
end
@@ -64,7 +63,7 @@ class Reports::SaleitemController < BaseReportController
def show
from, to, report_type = get_date_range_from_params
@sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
sale_data = @sale_data
date_arr = Array.new
@sale_data.each do |sale|
local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")

3
app/controllers/settings/employees_controller.rb
View File

@@ -30,9 +30,6 @@ class Settings::EmployeesController < ApplicationController
# POST /employees
# POST /employees.json
def create
puts "puts ssssssssssssssssssssssssss"
puts employee_params.to_json
@employee = Employee.new(employee_params)
respond_to do |format|