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

merge with r-19

Browse Source
This commit is contained in:
NyanLinHtut
2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/customers_controller.rb
View File

@@ -55,7 +55,7 @@ class Origami::CustomersController < BaseOrigamiController
@cashier_type = params[:type]
@page = params[:dir_page]
if(@sale_id[0,3] == "SAL")
if @sale_id.include? "SAL"
@booking = Booking.find_by_sale_id(@sale_id)
if @booking.dining_facility_id.to_i > 0
@dining_facility = DiningFacility.find(@booking.dining_facility_id)
@@ -117,7 +117,7 @@ class Origami::CustomersController < BaseOrigamiController
def update_sale_by_customer
id = params[:sale_id][0,3]
id = params[:sale_id]
customer_id = params[:customer_id]
customer = Customer.find(customer_id)
order_source = params[:type]
@@ -129,7 +129,7 @@ class Origami::CustomersController < BaseOrigamiController
# end
# end
if(id == "SAL")
if id.include? "SAL"
sale = Sale.find(params[:sale_id])
status = sale.update_attributes(customer_id: customer_id)
sale.sale_orders.each do |sale_order|
@@ -153,7 +153,7 @@ class Origami::CustomersController < BaseOrigamiController
if status == true
render json: JSON.generate({:status => true})
if(id == "SAL")
if id.include? "SAL"
sale.compute_by_sale_items(sale.total_discount, nil, order_source)
end
else