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 sqa-1804-001

Browse Source
This commit is contained in:
Aung Myo
2018-05-16 14:23:36 +06:30
parent 33d5a0ad80 29434f2df9
commit c386fcfa03
11 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/oqs/edit_controller.rb
View File

@@ -39,8 +39,10 @@ class Oqs::EditController < BaseOqsController
if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server
# print
assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
assigned_items = nil
if !assigned_item.nil?
assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'")
end
if !assigned_items.nil?
assigned_items.each do |assign_item|
# order queue stations

7
app/controllers/origami/payments_controller.rb
View File

@@ -335,10 +335,13 @@ class Origami::PaymentsController < BaseOrigamiController
end
@sale_data.sale_payments.each do |spay|
if spay.payment_method == "cash"
if spay.payment_method == "cash"
@cash = spay.payment_amount
end
@other_payment += spay.payment_amount
if spay.payment_method !="creditnote"
@other_payment += spay.payment_amount
end
if spay.payment_method == "mpu"
@other += spay.payment_amount
elsif spay.payment_method == "paypar"

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

@@ -114,7 +114,8 @@ class Origami::VoidController < BaseOrigamiController
if customer.membership_id != nil && rebate
member_info = Customer.get_member_account(customer)
rebate_amount = Customer.get_membership_transactions(customer,sale.receipt_no)
current_balance = SaleAudit.paymal_search(sale_id)
# current_balance = SaleAudit.paymal_search(sale_id)
current_balance = 0
end
# get printer info