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

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-07-25 16:06:48 +06:30
parent c19828d0e3
commit 196946401d
11 changed files with 224 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/home_controller.rb
View File

@@ -119,8 +119,17 @@ class HomeController < ApplicationController
@hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time).sum(:grand_total)
# .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
# .sum(:grand_total)
@employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time)
.sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time)
# .sum("(CASE WHEN sp.payment_method='cash' THEN ((sp.payment_amount) - (sales.amount_changed)) ELSE (sp.payment_amount) END)")
@employee_sales = []
if !employee_sales.nil?
employee_sales.each do |emp|
emp_data = []
emp_data.push([emp.e_name, emp.payment_amount])
@employee_sales.push({'name' => emp.payment_method, 'data' => emp_data})
end
end
@inventories = StockJournal.inventory_balances(today,@from,@to,@from_time,@to_time).sum(:balance)
@total_trans = Sale.total_trans(today,current_user,@from,@to,@from_time,@to_time)

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

@@ -11,6 +11,7 @@ class Origami::HomeController < BaseOrigamiController
@customers = Customer.pluck("customer_id, name")
@shop = shop_detail
@occupied_table = DiningFacility.where("status='occupied'").count;
# @shift = ShiftSale.current_open_shift(current_user.id)
end

11
app/controllers/origami/pending_order_controller.rb
View File

@@ -6,12 +6,17 @@ class Origami::PendingOrderController < BaseOrigamiController
@order = Sale.pending_order
@completed = Sale.completed_sale("quick_service")
@customers = Customer.pluck("customer_id, name")
@occupied_table = @sale.count.length + @order.count.length
end
def show
@sales = Sale.pending_sale
@orders = Sale.pending_order
@completed = Sale.completed_sale("quick_service")
@customers = Customer.pluck("customer_id, name")
@occupied_table = @sales.count.length + @orders.count.length
@id = params[:sale_id]
if(@id[0,3] == "SAL")
@sale = Sale.find(@id)
@@ -50,6 +55,9 @@ class Origami::PendingOrderController < BaseOrigamiController
@orders = Sale.pending_order
@completed = Sale.completed_sale("quick_service")
@customers = Customer.pluck("customer_id, name")
@occupied_table = @sales.count.length + @orders.count.length
@id = params[:sale_id]
@sale = Sale.find(@id)
@@ -78,6 +86,9 @@ class Origami::PendingOrderController < BaseOrigamiController
@sales = Sale.pending_sale
@orders = Sale.pending_order
@completed = Sale.completed_sale("quick_service")
@occupied_table = @sales.count.length + @orders.count.length
@id = params[:sale_id]
@customers = Customer.pluck("customer_id, name")