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 adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2017-12-08 18:29:11 +06:30
parent 863349092f d80c7840cc
commit c4c5ac5eab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ class Origami::DiscountsController < BaseOrigamiController
# Check for Card Payment # Check for Card Payment
is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments) is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
if is_card != "true" # if is_card != "true"
account_types = Account.where("discount=?",true) account_types = Account.where("discount=?",true)
table_id = sale.bookings[0].dining_facility_id table_id = sale.bookings[0].dining_facility_id
table_type = DiningFacility.find(table_id).type table_type = DiningFacility.find(table_id).type
@@ -239,7 +239,7 @@ class Origami::DiscountsController < BaseOrigamiController
render :json => result.to_json render :json => result.to_json
end #end Is Card Payment # end #end Is Card Payment
end end
#discount for selected order #discount for selected order