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

update report and view

Browse Source
This commit is contained in:
Aung Myo
2017-07-28 17:07:16 +06:30
parent 24fd399c17
commit 98c04f21d8
14 changed files with 815 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/home_controller.rb
View File

@@ -15,7 +15,7 @@ class Origami::HomeController < BaseOrigamiController
@rooms = Room.all.active.order('status desc')
@complete = Sale.where("sale_status != 'new'")
@orders = Order.all.order('date desc')
@shop = Shop.find_by_id(1)
@status_order = ""
@status_sale = ""
@sale_array = Array.new

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

@@ -166,7 +166,14 @@ class Origami::PaymentsController < BaseOrigamiController
def rounding_adj
saleObj = Sale.find(params[:sale_id])
new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
@shop = Shop.find_by_id(1)
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(saleObj.grand_total)
else
new_total = saleObj.grand_total
end
rounding_adj = new_total-saleObj.grand_total
saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)