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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm

Browse Source
This commit is contained in:
Aung Myo
2017-07-03 10:29:07 +06:30
parent 39ba5d5e86 15cbac995f
commit 6c3c863fce
16 changed files with 194 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,10 @@ class Api::BillController < Api::ApiController
@status = false
@error_message = "No Current Open Shift"
end
#@sale_data = Sale.find_by_sale_id(@sale_id)
#@sale_items = SaleItem.where("sale_id=?",@sale_id)
# Not Use for these printed bill cannot give customer
# @sale_data = Sale.find_by_sale_id(@sale_id)
# @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -47,11 +51,12 @@ class Api::BillController < Api::ApiController
# # Calculate Price by accounts
# item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
#customer= Customer.find(@sale_data.customer_id)
# get member information
#member_info = Customer.get_member_account(customer)
# printer = Printer::ReceiptPrinter.new(print_settings)
# printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
end

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

@@ -115,18 +115,22 @@ class Crm::CustomersController < BaseCrmController
'Content-Type' => 'application/json',
'Accept' => 'application/json'
},
:timeout => 10
:timeout => 100
)
rescue Net::OpenTimeout
response = { status: false }
rescue OpenURI::HTTPError
response = { status: false}
rescue HTTParty::Error
response = {status: false, message: "Can't open embership server "}
rescue SocketError
response = { status: false}
end
rescue Net::OpenTimeout
response = { status: false , message: "Can't open embership server "}
rescue OpenURI::HTTPError
response = { status: false, message: "Can't open embership server "}
rescue SocketError
response = { status: false, message: "Can't open embership server "}
end
if response["status"] == true
customer = Customer.find(@crm_customers.customer_id)
status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -141,14 +145,14 @@ class Crm::CustomersController < BaseCrmController
customer = Customer.find(@crm_customers.customer_id)
status = customer.update_attributes(membership_type:member_group_id )
if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '}
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]}
else
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' }
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] }
end
end
else
if params[:sale_id]
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '}
format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. noted'}
else
format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' }
end
@@ -252,7 +256,7 @@ end
)
rescue Net::OpenTimeout
response = { status: false }
rescue OpenURI::HTTPError
response = { status: false}

2
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -77,7 +77,7 @@ class Settings::OrderQueueStationsController < ApplicationController
# params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by)
# =======
# Don't Know { zone_ids: [] }
params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] })
params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :auto_print, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] })
# >>>>>>> b093a993ba002c92659bbb34338c55c031c11d87
end
end