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_material_ui

Browse Source
This commit is contained in:
Aung Myo
2017-12-12 18:06:52 +06:30
parent fa5a9053ac 5ba010c1e6
commit 15bfe11fc0
10 changed files with 351 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/home_controller.rb
View File

@@ -86,10 +86,10 @@ class HomeController < ApplicationController
@total_payment_methods.each do |payment|
if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
pay = Sale.payment_sale('card', today)
@sale_data.push({'card' => pay})
@sale_data.push({'card' => pay.payment_amount})
else
pay = Sale.payment_sale(payment.payment_method, today)
@sale_data.push({payment.payment_method => pay})
@sale_data.push({payment.payment_method => pay.payment_amount})
end
end
@summ_sale = Sale.summary_sale_receipt(today)