Skip to content

Merge dev branch into master for version 2.0.2 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smallpaes merged 3 commits into from
Nov 18, 2019
Merged

Merge dev branch into master for version 2.0.2 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c5cd1a
fix user total counts
windate3411 Nov 18, 2019
4aa4dfb
tries to fix ownerDashboard
windate3411 Nov 18, 2019
58d8fbe
Merge pull request #80 from smallpaes/Hotfix/heroku#2
smallpaes Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/controllers/adminController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ let adminController = {
labels: ['訂閱中', '未訂閱'],
data: [users[0].dataValues.subscribeUsers, users[0].dataValues.nonsubscribeUsers],
tableName: '會員',
total: users[0].dataValues.subscribeUsers + users[0].dataValues.nonsubscribeUsers
total: Number(users[0].dataValues.subscribeUsers) + Number(users[0].dataValues.nonsubscribeUsers)
}

// adjust subscriptions data format for front-end
Expand Down
8 changes: 5 additions & 3 deletions server/controllers/ownerController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ let ownerController = {
}
}]
})
if (!restaurant) return res.status(200).json({ status: 'success',meals: [], options: [], message: 'you do not have your restaurant info filled or a meal yet' })
if (!restaurant) return res.status(200).json({ status: 'success', meals: [], options: [], message: 'you do not have your restaurant info filled or a meal yet' })
let whereQuery = {}
let message = ''
if (req.query.ran !== 'thisWeek' && req.query.ran !== 'nextWeek') {
Expand Down Expand Up @@ -396,18 +396,20 @@ let ownerController = {
// query過去一個月內每日的訂單
let orders = await Order.findAll({
include: [
{ model: Meal, as: 'meals', where: { RestaurantId: restaurant.id }, attributes: ['id', 'name', 'image'] }
{ model: Meal, as: 'meals', where: { RestaurantId: restaurant.id }, attributes: [] }
],
where: {
require_date: {
[Op.gte]: pass_one_month
}
},
attributes: [
'id',
customQuery.char.date_for_dashboard,
[sequelize.literal(`COUNT(*)`), 'count']
],
group: ['date']
group: ['date'],

})
// find all dates a month from now
var dateArray = [];
Expand Down