Fixes for blank data

master
Mark Moffat 2019-12-30 23:06:06 +10:30
parent 7cef58dae3
commit e7cbed7132
2 changed files with 13 additions and 6 deletions

View File

@ -151,10 +151,7 @@ router.get('/admin/dashboard', restrict, async (req, res) => {
_id: '$o.v.productId', _id: '$o.v.productId',
title: { $last: '$o.v.title' }, title: { $last: '$o.v.title' },
productImage: { $last: '$o.v.productImage' }, productImage: { $last: '$o.v.productImage' },
count: count: { $sum: '$o.v.quantity' }
{
$sum: '$o.v.quantity'
}
} }, } },
{ $sort: { count: -1 } }, { $sort: { count: -1 } },
{ $limit: 5 } { $limit: 5 }
@ -162,8 +159,14 @@ router.get('/admin/dashboard', restrict, async (req, res) => {
}; };
// Fix aggregate data // Fix aggregate data
if(dashboardData.ordersAmount.length > 0){
dashboardData.ordersAmount = dashboardData.ordersAmount[0].sum; dashboardData.ordersAmount = dashboardData.ordersAmount[0].sum;
}
if(dashboardData.productsSold.length > 0){
dashboardData.productsSold = dashboardData.productsSold[0].sum; dashboardData.productsSold = dashboardData.productsSold[0].sum;
}else{
dashboardData.productsSold = 0;
}
res.render('dashboard', { res.render('dashboard', {
title: 'Cart dashboard', title: 'Cart dashboard',

View File

@ -53,6 +53,7 @@
<div class="card-body text-center"> <div class="card-body text-center">
<h5 class="card-title">Top products sold</h5> <h5 class="card-title">Top products sold</h5>
<ul class="list-unstyled"> <ul class="list-unstyled">
{{#if dashboardData.topProducts}}
{{#each dashboardData.topProducts}} {{#each dashboardData.topProducts}}
<li class="media my-4 align-middle"> <li class="media my-4 align-middle">
<img src="{{this.productImage}}" class="col-2 mr-3 img-fluid" alt=""> <img src="{{this.productImage}}" class="col-2 mr-3 img-fluid" alt="">
@ -62,6 +63,9 @@
</div> </div>
</li> </li>
{{/each}} {{/each}}
{{else}}
<h5 class="mt-3 mb-1 text-danger">Nothing to see yet. Do some orders.</h5>
{{/if}}
</ul> </ul>
</div> </div>
</div> </div>