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

Merge branch 'master' into cloud

Browse Source
This commit is contained in:
Yan
2017-12-14 10:25:41 +06:30
parent 9def0756b3 00615a4443
commit 342bd54780
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/base_origami_controller.rb
View File

@@ -16,6 +16,6 @@ class BaseOrigamiController < ActionController::Base
end
def checkin_process
CheckinJob.set(wait: 30.seconds).perform_later()
CheckinJob.set(wait: 1.minute).perform_later()
end
end

2
app/controllers/home_controller.rb
View File

@@ -72,7 +72,7 @@ class HomeController < ApplicationController
@hourly_sales = Sale.hourly_sales(today).sum(:grand_total)
# .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p')
# .sum(:grand_total)
@employee_sales = Sale.employee_sales(today).sum('total_amount')
@employee_sales = Sale.employee_sales(today).sum('payment_amount')
@inventories = StockJournal.inventory_balances(today).sum(:balance)
@total_sale = Sale.total_sale(today)