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

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

@@ -114,28 +114,19 @@ class Api::OrdersController < Api::ApiController
}
#end extra time
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
@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

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

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